From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 31 Jan 2016 15:50:02 +0000 (+0300)
Subject: Check that verifier is provided for client
X-Git-Tag: 5.4^2
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=4c8e5a136aba85dea639103c6618be46f7c41d49

Check that verifier is provided for client

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---

diff --git a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
index 8991462..10da969 100644
--- a/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
+++ b/src/cypherpunks.ru/govpn/cmd/govpn-client/main.go
@@ -71,6 +71,9 @@ func main() {
 		govpn.EGDInit(*egdPath)
 	}
 
+	if *verifierRaw == "" {
+		log.Fatalln("No verifier specified")
+	}
 	verifier, err := govpn.VerifierFromString(*verifierRaw)
 	if err != nil {
 		log.Fatalln(err)
diff --git a/src/cypherpunks.ru/govpn/verifier.go b/src/cypherpunks.ru/govpn/verifier.go
index a452a50..15955e7 100644
--- a/src/cypherpunks.ru/govpn/verifier.go
+++ b/src/cypherpunks.ru/govpn/verifier.go
@@ -73,7 +73,7 @@ func (v *Verifier) PasswordApply(password string) *[ed25519.PrivateKeySize]byte
 // Parse either short or long verifier form.
 func VerifierFromString(input string) (*Verifier, error) {
 	s := strings.Split(input, "$")
-	if !(len(s) != 4 || len(s) != 5) || s[1] != "argon2d" {
+	if len(s) < 4 || s[1] != "argon2d" {
 		return nil, errors.New("Invalid verifier structure")
 	}
 	var m, t, p int