MTH

[nncp.git] / src / cmd / nncp-cfgenc / main.go

diff --git a/src/cmd/nncp-cfgenc/main.go b/src/cmd/nncp-cfgenc/main.go
index 036a4c8e967d304a28a58820cc44c2cc8c6624df..d960d28b2a1365def2a093f488cb2fb33012cabf 100644 (file)
--- 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-2020 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2021 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,9 +28,9 @@ import (
        "os"
 
        xdr "github.com/davecgh/go-xdr/xdr2"
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v7"
        "golang.org/x/crypto/blake2b"
-       "golang.org/x/crypto/ssh/terminal"
+       "golang.org/x/term"
 )
 
 func usage() {
@@ -53,6 +53,7 @@ func main() {
                version  = flag.Bool("version", false, "Print version information")
                warranty = flag.Bool("warranty", false, "Print warranty information")
        )
+       log.SetFlags(log.Lshortfile)
        flag.Usage = usage
        flag.Parse()
        if *warranty {
@@ -90,7 +91,7 @@ func main() {
        }
 
        os.Stderr.WriteString("Passphrase:") // #nosec G104
-       password, err := terminal.ReadPassword(0)
+       password, err := term.ReadPassword(0)
        if err != nil {
                log.Fatalln(err)
        }
@@ -105,13 +106,13 @@ func main() {
                return
        }
 
-       password1, err := terminal.ReadPassword(0)
+       password1, err := term.ReadPassword(0)
        if err != nil {
                log.Fatalln(err)
        }
        os.Stderr.WriteString("\n")                 // #nosec G104
        os.Stderr.WriteString("Repeat passphrase:") // #nosec G104
-       password2, err := terminal.ReadPassword(0)
+       password2, err := term.ReadPassword(0)
        if err != nil {
                log.Fatalln(err)
        }