/*
NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2020 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/v5"
+ "go.cypherpunks.ru/nncp/v8"
"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.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])
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 {
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)
}
if _, err := xdr.Unmarshal(bytes.NewReader(data), &eblob); err != nil {
log.Fatalln(err)
}
- if eblob.Magic != nncp.MagicNNCPBv3 {
+ switch eblob.Magic {
+ case nncp.MagicNNCPBv1.B:
+ log.Fatalln(nncp.MagicNNCPBv1.TooOld())
+ case nncp.MagicNNCPBv2.B:
+ log.Fatalln(nncp.MagicNNCPBv2.TooOld())
+ case nncp.MagicNNCPBv3.B:
+ default:
log.Fatalln(errors.New("Unknown eblob type"))
}
fmt.Println("Strengthening function: Balloon with BLAKE2b-256")
return
}
- os.Stderr.WriteString("Passphrase:") // #nosec G104
- password, err := terminal.ReadPassword(0)
+ os.Stderr.WriteString("Passphrase:")
+ password1, err := term.ReadPassword(0)
if err != nil {
log.Fatalln(err)
}
- os.Stderr.WriteString("\n") // #nosec G104
-
if *decrypt {
- cfgRaw, err := nncp.DeEBlob(data, password)
+ cfgRaw, err := nncp.DeEBlob(data, password1)
if err != nil {
log.Fatalln(err)
}
- os.Stdout.Write(cfgRaw) // #nosec G104
+ os.Stdout.Write(cfgRaw)
return
}
-
- password1, err := terminal.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)
+ 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)
}