X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fgovpn%2Fencless.go;h=c25c8d77447fab85119b2f7298678406c73803b1;hb=aaf6870a568560b560e1c6fcb52da2e699c14543;hp=d29e5d35680d76deb47d7f7fcd28901b9f88191b;hpb=cff5b8a47280d2cc373cd0fcf078f5c27607a27d;p=govpn.git

diff --git a/src/govpn/encless.go b/src/govpn/encless.go
index d29e5d3..c25c8d7 100644
--- a/src/govpn/encless.go
+++ b/src/govpn/encless.go
@@ -20,11 +20,11 @@ package govpn
 
 import (
 	"govpn/aont"
-	"govpn/chaffing"
+	"govpn/cnw"
 )
 
 const (
-	EncLessEnlargeSize = aont.HSize + aont.RSize*chaffing.EnlargeFactor
+	EncLessEnlargeSize = aont.HSize + aont.RSize*cnw.EnlargeFactor
 )
 
 // Confidentiality preserving (but encryptionless) encoding.
@@ -44,7 +44,7 @@ func EncLessEncode(authKey *[32]byte, nonce, in []byte) ([]byte, error) {
 		return nil, err
 	}
 	out := append(
-		chaffing.Chaff(authKey, nonce, aonted[:aont.RSize]),
+		cnw.Chaff(authKey, nonce, aonted[:aont.RSize]),
 		aonted[aont.RSize:]...,
 	)
 	SliceZero(aonted[:aont.RSize])
@@ -54,14 +54,14 @@ func EncLessEncode(authKey *[32]byte, nonce, in []byte) ([]byte, error) {
 // Decode EncLessEncode-ed data.
 func EncLessDecode(authKey *[32]byte, nonce, in []byte) ([]byte, error) {
 	var err error
-	winnowed, err := chaffing.Winnow(
-		authKey, nonce, in[:aont.RSize*chaffing.EnlargeFactor],
+	winnowed, err := cnw.Winnow(
+		authKey, nonce, in[:aont.RSize*cnw.EnlargeFactor],
 	)
 	if err != nil {
 		return nil, err
 	}
 	out, err := aont.Decode(append(
-		winnowed, in[aont.RSize*chaffing.EnlargeFactor:]...,
+		winnowed, in[aont.RSize*cnw.EnlargeFactor:]...,
 	))
 	SliceZero(winnowed)
 	if err != nil {