From 088135569acd6617c929b64e644e377e316f7df1 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 23 Jul 2017 01:34:40 +0200 Subject: unexport block --- generate.go | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'generate.go') diff --git a/generate.go b/generate.go index aa57018..d912ada 100644 --- a/generate.go +++ b/generate.go @@ -1,9 +1,7 @@ package main import ( - "encoding" "flag" - "os" "dim13.org/signify/ask" "dim13.org/signify/file" @@ -39,23 +37,11 @@ func generate(args []string) error { return err } - if err := writeFile(*secFile, *comment+" secret key", secKey, file.ModeSec); err != nil { + if err := file.EncodeFile(*secFile, file.ModeSec, secKey, *comment+" secret key", nil); err != nil { return err } - if err := writeFile(*pubFile, *comment+" public key", pubKey, file.ModePub); err != nil { + if err := file.EncodeFile(*pubFile, file.ModePub, pubKey, *comment+" public key", nil); err != nil { return err } return nil } - -func writeFile(fname, comment string, v encoding.BinaryMarshaler, mode os.FileMode) error { - raw, err := v.MarshalBinary() - if err != nil { - return err - } - block := &file.Block{ - Comment: comment, - Bytes: raw, - } - return file.EncodeFile(fname, mode, block) -} -- cgit v1.2.3