From f6c49d3e907ce2ea1e1bfdebcc8e6d0160aecaa0 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 20 Jul 2017 00:49:51 +0200 Subject: Rename Enc to Sec --- sign.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sign.go') diff --git a/sign.go b/sign.go index 6138289..ee4bace 100644 --- a/sign.go +++ b/sign.go @@ -18,14 +18,14 @@ func sign(args []string) error { embedded = opts.Bool("e", false, "Embed the message") zip = opts.Bool("z", false, "Sign gzip archive") // TODO sigFile = opts.String("x", "", "Signature file") - encFile = opts.String("s", "", "Secret file (required)") + secFile = opts.String("s", "", "Secret file (required)") msgFile = opts.String("m", "", "Message file (required)") ) opts.Parse(args) if *embedded && *zip { return errors.New("can't combine -e and -z options") } - if *encFile == "" || *msgFile == "" { + if *secFile == "" || *msgFile == "" { opts.Usage() return nil } @@ -34,7 +34,7 @@ func sign(args []string) error { } _ = zip // TODO - encKey, err := openEnc(*encFile) + secKey, err := openSec(*secFile) if err != nil { return err } @@ -42,13 +42,13 @@ func sign(args []string) error { if err != nil { return err } - sig := encKey.Sign(body) + sig := secKey.Sign(body) raw, err := sig.MarshalBinary() if err != nil { return err } block := &file.Block{ - Comment: file.VerifyWith(*encFile), + Comment: file.VerifyWith(*secFile), Bytes: raw, } if *embedded { @@ -60,10 +60,10 @@ func sign(args []string) error { return nil } -func openEnc(fname string) (*key.Enc, error) { +func openSec(fname string) (*key.Sec, error) { block, err := file.DecodeFile(fname) if err != nil { return nil, err } - return key.NewEnc(block.Bytes, ask.Passphrase{}) + return key.NewSec(block.Bytes, ask.Passphrase{}) } -- cgit v1.2.3