/*
NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2023 Sergey Matveev <stargrave@stargrave.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
"errors"
"flag"
"fmt"
- "io/ioutil"
"log"
"os"
xdr "github.com/davecgh/go-xdr/xdr2"
- "go.cypherpunks.ru/nncp/v7"
+ "go.cypherpunks.ru/nncp/v8"
"golang.org/x/crypto/blake2b"
"golang.org/x/term"
)
func usage() {
- fmt.Fprintf(os.Stderr, nncp.UsageHeader())
- fmt.Fprintf(os.Stderr, "nncp-cfgenc -- encrypt/decrypt configuration file\n\n")
+ fmt.Fprint(os.Stderr, "nncp-cfgenc -- encrypt/decrypt configuration file\n\n")
fmt.Fprintf(os.Stderr, "Usage: %s [options] cfg.hjson > cfg.hjson.eblob\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s [options] -d cfg.hjson.eblob > cfg.hjson\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s [options] -dump cfg.hjson.eblob\n", os.Args[0])
os.Exit(1)
}
- data, err := ioutil.ReadFile(flag.Arg(0))
+ data, err := os.ReadFile(flag.Arg(0))
if err != nil {
log.Fatalln("Can not read data:", err)
}
log.Fatalln(err)
}
os.Stderr.WriteString("\n")
- if bytes.Compare(password1, password2) != 0 {
+ if !bytes.Equal(password1, password2) {
log.Fatalln(errors.New("Passphrases do not match"))
}
eblob, err := nncp.NewEBlob(*sOpt, *tOpt, *pOpt, password1, data)