X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-verifier%2Fmain.go;h=a83f9d15f18f75ea73a0951fd119db26940ba9df;hb=f9209136cff0331fc2293f25061971f6c77ff213;hp=bdea0791f3d165101ece4219997d1edc21d23665;hpb=cee89cfdfbc6b2b429d56f0b420bc5b981e475b8;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
index bdea079..a83f9d1 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go
@@ -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)
+		v := govpn.VerifierNew(*sOpt, *tOpt, *pOpt, &pid)
 		v.PasswordApply(key)
 		fmt.Println(v.LongForm())
 		fmt.Println(v.ShortForm())