From 01c913285b95afe9c53e26776e1149553b809e0a Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 4 Dec 2017 17:21:20 +0100 Subject: combine writeFile --- generate.go | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/generate.go b/generate.go index adc94b8..81a8104 100644 --- a/generate.go +++ b/generate.go @@ -1,7 +1,9 @@ package main import ( + "encoding" "flag" + "os" "dim13.org/signify/ask" "dim13.org/signify/b64file" @@ -37,29 +39,20 @@ func generate(args []string) error { return err } - if err := encodeSec(*secFile, *comment+" secret key", secKey); err != nil { + if err := writeFile(*secFile, *comment+" secret key", secKey, ModeSec); err != nil { return err } - if err := encodePub(*pubFile, *comment+" public key", pubKey); err != nil { + if err := writeFile(*pubFile, *comment+" public key", pubKey, ModePub); err != nil { return err } return nil } -func encodeSec(fname, comment string, sig *key.Sec) error { - fd, err := Create(fname, ModeSec) +func writeFile(fname, comment string, u encoding.BinaryMarshaler, mode os.FileMode) error { + fd, err := Create(fname, mode) if err != nil { return err } defer fd.Close() - return b64file.Encode(fd, sig, comment+" secret key", nil) -} - -func encodePub(fname, comment string, pub *key.Pub) error { - fd, err := Create(fname, ModePub) - if err != nil { - return err - } - defer fd.Close() - return b64file.Encode(fd, pub, comment+" public key", nil) + return b64file.Encode(fd, u, comment, nil) } -- cgit v1.2.3