Make SliceZero function public

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

diff --git a/src/govpn/common.go b/src/govpn/common.go
index fabcebe67d0c3f9355f6c247aa794d9a4ea41445..e1bd28ce9c88af2f1e98a6e1fa8dd6f5b2767826 100644 (file)
--- a/src/govpn/common.go
+++ b/src/govpn/common.go
@@ -54,7 +54,7 @@ func ScriptCall(path, ifaceName string) ([]byte, error) {
 }
 
 // Zero each byte.
-func sliceZero(data []byte) {
+func SliceZero(data []byte) {
        for i := 0; i < len(data); i++ {
                data[i] = 0
        }

diff --git a/src/govpn/handshake.go b/src/govpn/handshake.go
index c67256f3c41019b9df2718b9753bc0369bb6eea4..13f1a6cdace24d268f63d08ac6fc91039b7372b7 100644 (file)
--- a/src/govpn/handshake.go
+++ b/src/govpn/handshake.go
@@ -69,28 +69,28 @@ func HApply(data *[32]byte) {
 // Zero handshake's memory state
 func (h *Handshake) Zero() {
        if h.rNonce != nil {
-               sliceZero(h.rNonce[:])
+               SliceZero(h.rNonce[:])
        }
        if h.dhPriv != nil {
-               sliceZero(h.dhPriv[:])
+               SliceZero(h.dhPriv[:])
        }
        if h.key != nil {
-               sliceZero(h.key[:])
+               SliceZero(h.key[:])
        }
        if h.dsaPubH != nil {
-               sliceZero(h.dsaPubH[:])
+               SliceZero(h.dsaPubH[:])
        }
        if h.rServer != nil {
-               sliceZero(h.rServer[:])
+               SliceZero(h.rServer[:])
        }
        if h.rClient != nil {
-               sliceZero(h.rClient[:])
+               SliceZero(h.rClient[:])
        }
        if h.sServer != nil {
-               sliceZero(h.sServer[:])
+               SliceZero(h.sServer[:])
        }
        if h.sClient != nil {
-               sliceZero(h.sClient[:])
+               SliceZero(h.sClient[:])
        }
 }
 

diff --git a/src/govpn/peer.go b/src/govpn/peer.go
index feb0ea45db855ad2fc6e12c397bc87fbc92b128e..586444438c6eec127cba39333a2210b8ece91b9f 100644 (file)
--- a/src/govpn/peer.go
+++ b/src/govpn/peer.go
@@ -127,11 +127,11 @@ func (p *Peer) String() string {
 func (p *Peer) Zero() {
        p.BusyT.Lock()
        p.BusyR.Lock()
-       sliceZero(p.Key[:])
-       sliceZero(p.bufR)
-       sliceZero(p.bufT)
-       sliceZero(p.keyAuthR[:])
-       sliceZero(p.keyAuthT[:])
+       SliceZero(p.Key[:])
+       SliceZero(p.bufR)
+       SliceZero(p.bufT)
+       SliceZero(p.keyAuthR[:])
+       SliceZero(p.keyAuthT[:])
        p.BusyT.Unlock()
        p.BusyR.Unlock()
 }

diff --git a/src/govpn/verifier.go b/src/govpn/verifier.go
index 779e949133c1da19907a88c8e7911d623f9a5aac..ba51846ce23eb17c42b4a9b9fcc5d0333f848bbc 100644 (file)
--- a/src/govpn/verifier.go
+++ b/src/govpn/verifier.go
@@ -58,7 +58,7 @@ func (v *Verifier) PasswordApply(password string) *[ed25519.PrivateKeySize]byte
        if err != nil {
                log.Fatalln("Unable to apply Argon2d", err)
        }
-       defer sliceZero(r)
+       defer SliceZero(r)
        src := bytes.NewBuffer(r)
        pub, prv, err := ed25519.GenerateKey(src)
        if err != nil {