govpn-verifier can also use EGD

[govpn.git] / src / govpn / egd.go

diff --git a/src/govpn/egd.go b/src/govpn/egd.go
index 08dff8318a8b1ec3d06120dee910d672f0328bba..04ec87b9678cf2dfa10c576c84bfc66bbe4ef493 100644 (file)
--- a/src/govpn/egd.go
+++ b/src/govpn/egd.go
@@ -1,6 +1,6 @@
 /*
 GoVPN -- simple secure free software virtual private network daemon
-Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2016 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
@@ -19,32 +19,38 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package govpn
 
 import (
+       "crypto/rand"
        "errors"
+       "io"
        "net"
 )
 
 var (
-       egdPath string
+       Rand io.Reader = rand.Reader
 )
 
-func EGDInit(path string) {
-       egdPath = path
-}
+type EGDRand string
 
 // Read n bytes from EGD, blocking mode.
-func EGDRead(b []byte) error {
-       c, err := net.Dial("unix", egdPath)
+func (egdPath EGDRand) Read(b []byte) (int, error) {
+       conn, err := net.Dial("unix", string(egdPath))
        if err != nil {
-               return err
+               return 0, err
        }
-       defer c.Close()
-       c.Write([]byte{0x02, byte(len(b))})
-       r, err := c.Read(b)
+       conn.Write([]byte{0x02, byte(len(b))})
+       read, err := conn.Read(b)
        if err != nil {
-               return err
+               conn.Close()
+               return read, err
        }
-       if r != len(b) {
-               return errors.New("Got less bytes than expected from EGD")
+       if read != len(b) {
+               conn.Close()
+               return read, errors.New("Got less bytes than expected from EGD")
        }
-       return nil
+       conn.Close()
+       return read, nil
+}
+
+func EGDInit(path string) {
+       Rand = EGDRand(path)
 }