aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/signify/main.go4
-rw-r--r--keys.go4
2 files changed, 6 insertions, 2 deletions
diff --git a/cmd/signify/main.go b/cmd/signify/main.go
index 6937894..9cdb6cd 100644
--- a/cmd/signify/main.go
+++ b/cmd/signify/main.go
@@ -111,12 +111,12 @@ func OpenSec(fname string) (*signify.EncKey, error) {
if err := signify.Unmarshal(f.RawKey, encKey); err != nil {
return nil, err
}
- if encKey.KDFRounds > 0 {
+ if rounds := encKey.Rounds(); rounds > 0 {
pass, err := signify.AskPassword(false)
if err != nil {
return nil, err
}
- encKey.Kdf(pass, int(encKey.KDFRounds))
+ encKey.Kdf(pass, rounds)
}
if err := encKey.Check(); err != nil {
return nil, err
diff --git a/keys.go b/keys.go
index 08c3ff4..c0429b5 100644
--- a/keys.go
+++ b/keys.go
@@ -105,6 +105,10 @@ func (e *EncKey) Kdf(pass string, rounds int) {
e.KDFRounds = uint32(rounds)
}
+func (e *EncKey) Rounds() int {
+ return int(e.KDFRounds)
+}
+
func Unmarshal(b []byte, v interface{}) error {
buf := bytes.NewReader(b)
if err := binary.Read(buf, binary.BigEndian, v); err != nil {