Replace golang.org/x/ssh/terminal with golang.org/x/term

[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 a77eaed1e84c44aa0b4aaf362b7e3c2d22033695..7fdb5d7e8914518be144900f06842a304b095289 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-2019 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
@@ -27,18 +27,18 @@ import (
        "log"
        "os"
 
-       "github.com/davecgh/go-xdr/xdr2"
-       "go.cypherpunks.ru/nncp/v4"
+       xdr "github.com/davecgh/go-xdr/xdr2"
+       "go.cypherpunks.ru/nncp/v5"
        "golang.org/x/crypto/blake2b"
-       "golang.org/x/crypto/ssh/terminal"
+       "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.Fprintf(os.Stderr, "Usage: %s [options] cfg.yaml > cfg.yaml.eblob\n", os.Args[0])
-       fmt.Fprintf(os.Stderr, "       %s [options] -d cfg.yaml.eblob > cfg.yaml\n", os.Args[0])
-       fmt.Fprintf(os.Stderr, "       %s [options] -dump cfg.yaml.eblob\n", os.Args[0])
+       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])
        fmt.Fprintln(os.Stderr, "Options:")
        flag.PrintDefaults()
 }
@@ -86,40 +86,42 @@ func main() {
                fmt.Printf("Number of rounds: %d\n", eblob.TCost)
                fmt.Printf("Number of parallel jobs: %d\n", eblob.PCost)
                fmt.Printf("Blob size: %d\n", len(eblob.Blob))
-               os.Exit(0)
+               return
+       }
+
+       os.Stderr.WriteString("Passphrase:") // #nosec G104
+       password, err := term.ReadPassword(0)
+       if err != nil {
+               log.Fatalln(err)
        }
+       os.Stderr.WriteString("\n") // #nosec G104
+
        if *decrypt {
-               os.Stderr.WriteString("Passphrase:")
-               password, err := terminal.ReadPassword(0)
-               if err != nil {
-                       log.Fatalln(err)
-               }
-               os.Stderr.WriteString("\n")
                cfgRaw, err := nncp.DeEBlob(data, password)
                if err != nil {
                        log.Fatalln(err)
                }
-               os.Stdout.Write(cfgRaw)
-       } else {
-               os.Stderr.WriteString("Passphrase:")
-               password1, err := terminal.ReadPassword(0)
-               if err != nil {
-                       log.Fatalln(err)
-               }
-               os.Stderr.WriteString("\n")
-               os.Stderr.WriteString("Repeat passphrase:")
-               password2, err := terminal.ReadPassword(0)
-               if err != nil {
-                       log.Fatalln(err)
-               }
-               os.Stderr.WriteString("\n")
-               if bytes.Compare(password1, password2) != 0 {
-                       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)
+               os.Stdout.Write(cfgRaw) // #nosec G104
+               return
+       }
+
+       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 := term.ReadPassword(0)
+       if err != nil {
+               log.Fatalln(err)
+       }
+       os.Stderr.WriteString("\n") // #nosec G104
+       if bytes.Compare(password1, password2) != 0 {
+               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
 }