"os"
xdr "github.com/davecgh/go-xdr/xdr2"
- "go.cypherpunks.ru/nncp/v6"
+ "go.cypherpunks.ru/nncp/v7"
"golang.org/x/crypto/blake2b"
"golang.org/x/term"
)
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 := term.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 := term.ReadPassword(0)
- if err != nil {
- log.Fatalln(err)
- }
- os.Stderr.WriteString("\n") // #nosec G104
- os.Stderr.WriteString("Repeat 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
+ os.Stderr.WriteString("\n")
if bytes.Compare(password1, password2) != 0 {
log.Fatalln(errors.New("Passphrases do not match"))
}
if err != nil {
log.Fatalln(err)
}
- os.Stdout.Write(eblob) // #nosec G104
+ os.Stdout.Write(eblob)
}