From cd6f888802f217ca0cd0509a999696f6c4235c20 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 17 Jul 2017 23:55:23 +0200 Subject: Refactor ask --- sign.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'sign.go') diff --git a/sign.go b/sign.go index 571ee5a..77c008d 100644 --- a/sign.go +++ b/sign.go @@ -65,15 +65,5 @@ func OpenEnc(fname string) (*key.Enc, error) { if err != nil { return nil, err } - encKey := new(key.Enc) - if err := key.Unmarshal(block.Bytes, encKey); err != nil { - return nil, err - } - if err := Kdf(encKey, ask.Password); err != nil { - return nil, err - } - if err := encKey.Check(); err != nil { - return nil, err - } - return encKey, nil + return key.ParseEnc(block.Bytes, ask.Passphrase{}) } -- cgit v1.2.3