Use ssh/terminal package for reading passwords directly from terminal

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

diff --git a/src/govpn/cmd/govpn-verifier/main.go b/src/govpn/cmd/govpn-verifier/main.go
index 5a62b220f34efade316e812f0aa914bca22bee88..10bd90b0902e2c934c8c435cc3b5e5e9dbce1a48 100644 (file)
--- a/src/govpn/cmd/govpn-verifier/main.go
+++ b/src/govpn/cmd/govpn-verifier/main.go
@@ -20,8 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-       "crypto/rand"
-       "crypto/subtle"
+       "bytes"
        "flag"
        "fmt"
        "log"
@@ -35,18 +34,26 @@ var (
        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")
+       egdPath  = flag.String("egd", "", "Optional path to EGD socket")
 )
 
 func main() {
        flag.Parse()
+       if *egdPath != "" {
+               govpn.EGDInit(*egdPath)
+       }
+       key, err := govpn.KeyRead(*keyPath)
+       if err != nil {
+               log.Fatalln("Unable to read the key", err)
+       }
        if *verifier == "" {
                id := new([govpn.IDSize]byte)
-               if _, err := rand.Read(id[:]); err != nil {
+               if _, err := govpn.Rand.Read(id[:]); err != nil {
                        log.Fatalln(err)
                }
                pid := govpn.PeerId(*id)
                v := govpn.VerifierNew(*mOpt, *tOpt, *pOpt, &pid)
-               v.PasswordApply(govpn.StringFromFile(*keyPath))
+               v.PasswordApply(key)
                fmt.Println(v.LongForm())
                fmt.Println(v.ShortForm())
                return
@@ -59,6 +66,6 @@ func main() {
                log.Fatalln("Verifier does not contain public key")
        }
        pub := *v.Pub
-       v.PasswordApply(govpn.StringFromFile(*keyPath))
-       fmt.Println(subtle.ConstantTimeCompare(v.Pub[:], pub[:]) == 1)
+       v.PasswordApply(key)
+       fmt.Println(bytes.Equal(v.Pub[:], pub[:]))
 }