This commit is contained in:
akulij 2025-02-26 21:44:34 +00:00
parent c935f4ba81
commit 7527faa139

View File

@ -35,17 +35,17 @@ func main() {
errorf("internal error: %v", err) errorf("internal error: %v", err)
} }
// if user is not seeing private keyfile, which also contains public key, // if user is not seeing private keyfile, which also contains public key,
// also duplicate public key it to stderr, // also duplicate public key it to stderr,
// but if user sees public key via stdout, no need for duplication // but if user sees public key via stdout, no need for duplication
if !term.IsTerminal(int(os.Stdout.Fd())) { if !term.IsTerminal(int(os.Stdout.Fd())) {
fmt.Fprintf(os.Stderr, "Public key: %s\n", k.Recipient()) fmt.Fprintf(os.Stderr, "Public key: %s\n", k.Recipient())
} }
err = writeSecretKey(os.Stdout, k) err = writeSecretKey(os.Stdout, k)
if err != nil { if err != nil {
fmt.Printf("Failed to write secret key to file, error: %s\n", err) fmt.Printf("Failed to write secret key to file, error: %s\n", err)
} }
} }
func getPasswordBytes() ([]byte, error) { func getPasswordBytes() ([]byte, error) {
@ -60,18 +60,24 @@ func getPasswordBytes() ([]byte, error) {
} }
func writeSecretKey(f *os.File, key *age.X25519Identity) error { func writeSecretKey(f *os.File, key *age.X25519Identity) error {
var err error var err error
_, err = fmt.Fprintf(f, "# created: %s\n", time.Now().Format(time.RFC3339)) _, err = fmt.Fprintf(f, "# created: %s\n", time.Now().Format(time.RFC3339))
if err != nil { return err; } if err != nil {
return err
}
_, err = fmt.Fprintf(f, "# public key: %s\n", key.Recipient()) _, err = fmt.Fprintf(f, "# public key: %s\n", key.Recipient())
if err != nil { return err; } if err != nil {
return err
}
_, err = fmt.Fprintf(f, "%s\n", key) _, err = fmt.Fprintf(f, "%s\n", key)
if err != nil { return err; } if err != nil {
return err
}
return nil return nil
} }
// almost a copy of private function in age/x25519.go // almost a copy of private function in age/x25519.go