aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--generate.go16
-rw-r--r--kdf.go21
-rw-r--r--main.go3
-rw-r--r--sign.go3
-rw-r--r--verify.go3
5 files changed, 25 insertions, 21 deletions
diff --git a/generate.go b/generate.go
index 2f90b2c..58b35cb 100644
--- a/generate.go
+++ b/generate.go
@@ -6,7 +6,6 @@ import (
"os"
"dim13.org/signify/ask"
- "dim13.org/signify/bhash"
"dim13.org/signify/file"
"dim13.org/signify/key"
)
@@ -70,18 +69,3 @@ func generate() error {
return nil
}
-
-func Kdf(enc *key.Enc, ask func() (string, error)) error {
- if enc.KDFRounds == 0 {
- return nil
- }
- pass, err := ask()
- if err != nil {
- return err
- }
- xor := bhash.Pbkdf([]byte(pass), enc.Salt[:], int(enc.KDFRounds), len(enc.Key))
- for i := range xor {
- enc.Key[i] ^= xor[i]
- }
- return nil
-}
diff --git a/kdf.go b/kdf.go
new file mode 100644
index 0000000..8926216
--- /dev/null
+++ b/kdf.go
@@ -0,0 +1,21 @@
+package main
+
+import (
+ "dim13.org/signify/bhash"
+ "dim13.org/signify/key"
+)
+
+func Kdf(enc *key.Enc, ask func() (string, error)) error {
+ if enc.KDFRounds == 0 {
+ return nil
+ }
+ pass, err := ask()
+ if err != nil {
+ return err
+ }
+ xor := bhash.Pbkdf([]byte(pass), enc.Salt[:], int(enc.KDFRounds), len(enc.Key))
+ for i := range xor {
+ enc.Key[i] ^= xor[i]
+ }
+ return nil
+}
diff --git a/main.go b/main.go
index 48942bd..c26a914 100644
--- a/main.go
+++ b/main.go
@@ -1,13 +1,10 @@
package main
import (
- "errors"
"fmt"
"os"
)
-var ErrEZ = errors.New("can't combine -e and -z options")
-
func usage() {
fmt.Print("Usage:")
fmt.Println("\tsignify -C [-q] -p pubkey -x sigfile [file ...]")
diff --git a/sign.go b/sign.go
index 57f8c0e..c81cf1c 100644
--- a/sign.go
+++ b/sign.go
@@ -1,6 +1,7 @@
package main
import (
+ "errors"
"flag"
"io/ioutil"
"os"
@@ -23,7 +24,7 @@ func sign() error {
)
args.Parse(os.Args[2:])
if *embedded && *zip {
- return ErrEZ
+ return errors.New("can't combine -e and -z options")
}
if *encFile == "" || *msgFile == "" {
args.Usage()
diff --git a/verify.go b/verify.go
index b5990c9..1e35f23 100644
--- a/verify.go
+++ b/verify.go
@@ -1,6 +1,7 @@
package main
import (
+ "errors"
"flag"
"fmt"
"io/ioutil"
@@ -25,7 +26,7 @@ func verify() error {
)
args.Parse(os.Args[2:])
if *embedded && *zip {
- return ErrEZ
+ return errors.New("can't combine -e and -z options")
}
if *msgFile == "" {
args.Usage()