X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-cfgenc%2Fmain.go;h=5fc83e2a519ee6ccece1e17dd861d1c061c895e2;hb=d386e5b28dc603ac4ffac10337f322e15bc92d80;hp=7c41ee097943bf05a679c3fde8c71b5eb957d5d9;hpb=1cc0df98a8d949b9f8137081b875d98a1aae2e67;p=nncp.git

diff --git a/src/cmd/nncp-cfgenc/main.go b/src/cmd/nncp-cfgenc/main.go
index 7c41ee0..5fc83e2 100644
--- a/src/cmd/nncp-cfgenc/main.go
+++ b/src/cmd/nncp-cfgenc/main.go
@@ -1,6 +1,6 @@
 /*
 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
@@ -28,14 +28,14 @@ import (
 	"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.UsageHeader())
+	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])
@@ -96,7 +96,7 @@ func main() {
 		return
 	}
 
-	os.Stderr.WriteString("Passphrase:") // #nosec G104
+	os.Stderr.WriteString("Passphrase:")
 	password1, err := term.ReadPassword(0)
 	if err != nil {
 		log.Fatalln(err)
@@ -106,21 +106,21 @@ func main() {
 		if err != nil {
 			log.Fatalln(err)
 		}
-		os.Stdout.Write(cfgRaw) // #nosec G104
+		os.Stdout.Write(cfgRaw)
 		return
 	}
-	os.Stderr.WriteString("\nRepeat passphrase:") // #nosec G104
+	os.Stderr.WriteString("\nRepeat passphrase:")
 	password2, err := term.ReadPassword(0)
 	if err != nil {
 		log.Fatalln(err)
 	}
-	os.Stderr.WriteString("\n") // #nosec G104
-	if bytes.Compare(password1, password2) != 0 {
+	os.Stderr.WriteString("\n")
+	if !bytes.Equal(password1, password2) {
 		log.Fatalln(errors.New("Passphrases do not match"))
 	}
 	eblob, err := nncp.NewEBlob(*sOpt, *tOpt, *pOpt, password1, data)
 	if err != nil {
 		log.Fatalln(err)
 	}
-	os.Stdout.Write(eblob) // #nosec G104
+	os.Stdout.Write(eblob)
 }