From 48108bcbf1bf680c10d79462d5905dc2e4e3a081 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 1 May 2017 17:18:12 +0200 Subject: Rename --- main.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 9bee437..6d57343 100644 --- a/main.go +++ b/main.go @@ -106,13 +106,13 @@ func Generate(pubFile, secFile, comment string, nopass bool) error { return nil } -func OpenEnc(fname string) (*signify.EncKey, error) { - f, err := file.DecodeFile(fname) +func OpenEnc(fname string) (*signify.Enc, error) { + block, err := file.DecodeFile(fname) if err != nil { return nil, err } - encKey := new(signify.EncKey) - if err := signify.Unmarshal(f.Bytes, encKey); err != nil { + encKey := new(signify.Enc) + if err := signify.Unmarshal(block.Bytes, encKey); err != nil { return nil, err } encKey.Kdf(ask.Password) @@ -122,13 +122,13 @@ func OpenEnc(fname string) (*signify.EncKey, error) { return encKey, nil } -func OpenPub(fname string) (*signify.PubKey, error) { - f, err := file.DecodeFile(fname) +func OpenPub(fname string) (*signify.Pub, error) { + block, err := file.DecodeFile(fname) if err != nil { return nil, err } - pubKey := new(signify.PubKey) - if err := signify.Unmarshal(f.Bytes, pubKey); err != nil { + pubKey := new(signify.Pub) + if err := signify.Unmarshal(block.Bytes, pubKey); err != nil { return nil, err } if err := pubKey.Check(); err != nil { @@ -138,19 +138,19 @@ func OpenPub(fname string) (*signify.PubKey, error) { } func OpenSig(fname string) (*signify.Sig, []byte, error) { - f, err := file.DecodeFile(fname + ".sig") + block, err := file.DecodeFile(fname + ".sig") if err != nil { return nil, nil, err } sig := new(signify.Sig) - if err := signify.Unmarshal(f.Bytes, sig); err != nil { + if err := signify.Unmarshal(block.Bytes, sig); err != nil { return nil, nil, err } if err := sig.Check(); err != nil { return nil, nil, err } - if len(f.Message) > 0 { - return sig, f.Message, nil + if len(block.Message) > 0 { + return sig, block.Message, nil } msg, err := ioutil.ReadFile(fname) if err != nil { -- cgit v1.2.3