aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--check.go8
-rw-r--r--generate.go18
-rw-r--r--sign.go28
-rw-r--r--verify.go36
4 files changed, 45 insertions, 45 deletions
diff --git a/check.go b/check.go
index 78c1e66..1ae36f5 100644
--- a/check.go
+++ b/check.go
@@ -10,12 +10,12 @@ import (
func check(args []string) error {
opts := flag.NewFlagSet("check", flag.ExitOnError)
var (
- quiet = opts.Bool("q", false, "Quiet mode")
- pubFile = opts.String("p", "", "Public key file (required)")
- sigFile = opts.String("x", "", "Signature file (required)")
+ quiet = *opts.Bool("q", false, "Quiet mode")
+ pubFile = *opts.String("p", "", "Public key file (required)")
+ sigFile = *opts.String("x", "", "Signature file (required)")
)
opts.Parse(args)
- if *pubFile == "" || *sigFile == "" {
+ if pubFile == "" || sigFile == "" {
opts.Usage()
return nil
}
diff --git a/generate.go b/generate.go
index e1406bd..9a2056a 100644
--- a/generate.go
+++ b/generate.go
@@ -14,17 +14,17 @@ import (
func generate(args []string) error {
opts := flag.NewFlagSet("generate", flag.ExitOnError)
var (
- nopass = opts.Bool("n", false, "No key passphrase")
- comment = opts.String("c", "signify", "Comment")
- pubFile = opts.String("p", "", "Public key file (required)")
- encFile = opts.String("s", "", "Secret key file (required)")
+ nopass = *opts.Bool("n", false, "No key passphrase")
+ comment = *opts.String("c", "signify", "Comment")
+ pubFile = *opts.String("p", "", "Public key file (required)")
+ encFile = *opts.String("s", "", "Secret key file (required)")
)
opts.Parse(args)
- if *pubFile == "" || *encFile == "" {
+ if pubFile == "" || encFile == "" {
opts.Usage()
return nil
}
- if err := file.CheckNames(*pubFile, *encFile); err != nil {
+ if err := file.CheckNames(pubFile, encFile); err != nil {
return err
}
pubKey, encKey, err := key.NewKey()
@@ -33,17 +33,17 @@ func generate(args []string) error {
}
askFn := ask.Confirmed
- if *nopass {
+ if nopass {
askFn = nil
}
if err := Kdf(encKey, askFn); err != nil {
return err
}
- if err := writeFile(*encFile, *comment+" secret key", encKey, file.EncMode); err != nil {
+ if err := writeFile(encFile, comment+" secret key", encKey, file.EncMode); err != nil {
return err
}
- if err := writeFile(*pubFile, *comment+" public key", pubKey, file.PubMode); err != nil {
+ if err := writeFile(pubFile, comment+" public key", pubKey, file.PubMode); err != nil {
return err
}
return nil
diff --git a/sign.go b/sign.go
index 571ee5a..36d8b32 100644
--- a/sign.go
+++ b/sign.go
@@ -15,30 +15,30 @@ import (
func sign(args []string) error {
opts := flag.NewFlagSet("sign", flag.ExitOnError)
var (
- embedded = opts.Bool("e", false, "Embed the message")
- zip = opts.Bool("z", false, "Sign gzip archive") // TODO
- sigFile = opts.String("x", "", "Signature file")
- encFile = opts.String("s", "", "Secret file (required)")
- msgFile = opts.String("m", "", "Message file (required)")
+ embedded = *opts.Bool("e", false, "Embed the message")
+ zip = *opts.Bool("z", false, "Sign gzip archive") // TODO
+ sigFile = *opts.String("x", "", "Signature file")
+ encFile = *opts.String("s", "", "Secret file (required)")
+ msgFile = *opts.String("m", "", "Message file (required)")
)
opts.Parse(args)
- if *embedded && *zip {
+ if embedded && zip {
return errors.New("can't combine -e and -z options")
}
- if *encFile == "" || *msgFile == "" {
+ if encFile == "" || msgFile == "" {
opts.Usage()
return nil
}
- if *sigFile == "" {
- *sigFile = file.SigName(*msgFile)
+ if sigFile == "" {
+ sigFile = file.SigName(msgFile)
}
_ = zip // TODO
- encKey, err := OpenEnc(*encFile)
+ encKey, err := OpenEnc(encFile)
if err != nil {
return err
}
- body, err := ioutil.ReadFile(*msgFile)
+ body, err := ioutil.ReadFile(msgFile)
if err != nil {
return err
}
@@ -48,13 +48,13 @@ func sign(args []string) error {
return err
}
block := &file.Block{
- Comment: file.VerifyWith(*encFile),
+ Comment: file.VerifyWith(encFile),
Bytes: raw,
}
- if *embedded {
+ if embedded {
block.Message = body
}
- if err := file.EncodeFile(*sigFile, file.SigMode, block); err != nil {
+ if err := file.EncodeFile(sigFile, file.SigMode, block); err != nil {
return err
}
return nil
diff --git a/verify.go b/verify.go
index b76a8fa..9908665 100644
--- a/verify.go
+++ b/verify.go
@@ -15,40 +15,40 @@ import (
func verify(args []string) error {
opts := flag.NewFlagSet("verify", flag.ExitOnError)
var (
- embedded = opts.Bool("e", false, "Embed message")
- quiet = opts.Bool("q", false, "Quiet mode")
- zip = opts.Bool("z", false, "Verify gzip archive") // TODO
- pubFile = opts.String("p", "", "Public key file")
- keyType = opts.String("t", "", "Key type") // TODO
- sigFile = opts.String("x", "", "Signature file")
- msgFile = opts.String("m", "", "Message file (required)")
+ embedded = *opts.Bool("e", false, "Embed message")
+ quiet = *opts.Bool("q", false, "Quiet mode")
+ zip = *opts.Bool("z", false, "Verify gzip archive") // TODO
+ pubFile = *opts.String("p", "", "Public key file")
+ keyType = *opts.String("t", "", "Key type") // TODO
+ sigFile = *opts.String("x", "", "Signature file")
+ msgFile = *opts.String("m", "", "Message file (required)")
)
opts.Parse(args)
- if *embedded && *zip {
+ if embedded && zip {
return errors.New("can't combine -e and -z options")
}
- if *msgFile == "" {
+ if msgFile == "" {
opts.Usage()
return nil
}
- if *sigFile == "" {
- *sigFile = file.SigName(*msgFile)
+ if sigFile == "" {
+ sigFile = file.SigName(msgFile)
}
_ = keyType // TODO
- sig, msg, verifyWith, err := OpenSig(*sigFile)
+ sig, msg, verifyWith, err := OpenSig(sigFile)
if err != nil {
return err
}
- if *pubFile == "" {
- *pubFile = verifyWith
+ if pubFile == "" {
+ pubFile = verifyWith
}
- pubKey, err := OpenPub(*pubFile)
+ pubKey, err := OpenPub(pubFile)
if err != nil {
return err
}
- if !*embedded {
- msg, err = ioutil.ReadFile(*msgFile)
+ if !embedded {
+ msg, err = ioutil.ReadFile(msgFile)
if err != nil {
return err
}
@@ -56,7 +56,7 @@ func verify(args []string) error {
if err := pubKey.Verify(msg, sig); err != nil {
return err
}
- if !*quiet {
+ if !quiet {
fmt.Println("Signature Verified")
}
return nil