X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcmd%2Fgovpn-verifier%2Fmain.go;h=9b38bcbade68e7c14b3a871aad68f1500f2fb534;hb=70e70dfded87dc2d737160444829c58ed8ed2fa0;hp=d5dcfa584d4686fd20c74f2f6b1dae421fbab4b8;hpb=4cc7cf27a64355bbe1f64418a55e860baeb63ac0;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 d5dcfa5..9b38bcb 100644
--- 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-2018 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
@@ -32,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")
 )
 
@@ -45,6 +46,10 @@ func main() {
 		fmt.Println(govpn.Warranty)
 		return
 	}
+	if *version {
+		fmt.Println(govpn.VersionGet())
+		return
+	}
 	if *egdPath != "" {
 		govpn.EGDInit(*egdPath)
 	}
@@ -57,8 +62,8 @@ func main() {
 		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())