aboutsummaryrefslogtreecommitdiff
path: root/sign.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-23 00:53:01 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-23 00:53:01 +0200
commit517383f806898378c4840657521cc60eb969e9d3 (patch)
tree435385342c6cefc9823fd96c073cb95dfcea0451 /sign.go
parent25e9c9f19f90aea367ae9831df1e7208e3f5f0b5 (diff)
bikeshadding
Diffstat (limited to 'sign.go')
-rw-r--r--sign.go12
1 files changed, 9 insertions, 3 deletions
diff --git a/sign.go b/sign.go
index ee4bace..ed2091d 100644
--- a/sign.go
+++ b/sign.go
@@ -61,9 +61,15 @@ func sign(args []string) error {
}
func openSec(fname string) (*key.Sec, error) {
- block, err := file.DecodeFile(fname)
- if err != nil {
+ sec := new(key.Sec)
+ if _, _, err := file.DecodeFile(fname, sec); err != nil {
+ return nil, err
+ }
+ if err := sec.Crypt(ask.Passphrase{}); err != nil {
+ return nil, err
+ }
+ if err := sec.Validate(); err != nil {
return nil, err
}
- return key.NewSec(block.Bytes, ask.Passphrase{})
+ return sec, nil
}