go vet/lint

[govpn.git] / src / cypherpunks.ru / govpn / cmd / govpn-verifier / main.go

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
index bdea0791f3d165101ece4219997d1edc21d23665..aac36bafb664d5bce876f60bd25a9d105eaa216e 100644 (file)
--- a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2016 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2017 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ import (
        "bytes"
        "flag"
        "fmt"
+       "io"
        "log"
 
        "cypherpunks.ru/govpn"
@@ -31,10 +32,11 @@ import (
 var (
        keyPath  = flag.String("key", "", "Path to passphrase file")
        verifier = flag.String("verifier", "", "Optional verifier")
-       mOpt     = flag.Int("m", govpn.DefaultM, "Argon2d memory parameter (KiBs)")
-       tOpt     = flag.Int("t", govpn.DefaultT, "Argon2d iteration parameter")
-       pOpt     = flag.Int("p", govpn.DefaultP, "Argon2d parallelizm parameter")
+       sOpt     = flag.Int("s", govpn.DefaultS, "Balloon space cost")
+       tOpt     = flag.Int("t", govpn.DefaultT, "Balloon time cost")
+       pOpt     = flag.Int("p", govpn.DefaultP, "Balloon parallel jobs")
        egdPath  = flag.String("egd", "", "Optional path to EGD socket")
+       version  = flag.Bool("version", false, "Print version information")
        warranty = flag.Bool("warranty", false, "Print warranty information")
 )
 
@@ -44,6 +46,10 @@ func main() {
                fmt.Println(govpn.Warranty)
                return
        }
+       if *version {
+               fmt.Println(govpn.VersionGet())
+               return
+       }
        if *egdPath != "" {
                govpn.EGDInit(*egdPath)
        }
@@ -53,11 +59,11 @@ func main() {
        }
        if *verifier == "" {
                id := new([govpn.IDSize]byte)
-               if _, err := govpn.Rand.Read(id[:]); err != nil {
+               if _, err = io.ReadFull(govpn.Rand, id[:]); err != nil {
                        log.Fatalln(err)
                }
-               pid := govpn.PeerId(*id)
-               v := govpn.VerifierNew(*mOpt, *tOpt, *pOpt, &pid)
+               pid := govpn.PeerID(*id)
+               v := govpn.VerifierNew(*sOpt, *tOpt, *pOpt, &pid)
                v.PasswordApply(key)
                fmt.Println(v.LongForm())
                fmt.Println(v.ShortForm())