From 3b56cfe9d98d2bb28ec65b7aa47c978e13e5da9f Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 3 Jan 2016 17:35:59 +0300
Subject: [PATCH] Make SliceZero function public

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---
 src/govpn/common.go    |  2 +-
 src/govpn/handshake.go | 16 ++++++++--------
 src/govpn/peer.go      | 10 +++++-----
 src/govpn/verifier.go  |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/govpn/common.go b/src/govpn/common.go
index fabcebe..e1bd28c 100644
--- 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 c67256f..13f1a6c 100644
--- 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 feb0ea4..5864444 100644
--- 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 779e949..ba51846 100644
--- 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 {
-- 
2.44.0