Fix copyright years

[govpn.git] / src / cypherpunks.ru / govpn / encless.go

diff --git a/src/cypherpunks.ru/govpn/encless.go b/src/cypherpunks.ru/govpn/encless.go
index 966a2dde65aac3498de3dddcebd5c8f5b1f7d9fe..b1bf29ce7e698186757945efead9613e4beb58ec 100644 (file)
--- a/src/cypherpunks.ru/govpn/encless.go
+++ b/src/cypherpunks.ru/govpn/encless.go
@@ -21,15 +21,16 @@ package govpn
 import (
        "io"
 
+       "github.com/pkg/errors"
+
        "cypherpunks.ru/govpn/aont"
        "cypherpunks.ru/govpn/cnw"
 )
 
-const (
-       EnclessEnlargeSize = aont.HSize + aont.RSize*cnw.EnlargeFactor
-)
+// EnclessEnlargeSize is number of bytes overhead for each message
+const EnclessEnlargeSize = aont.HSize + aont.RSize*cnw.EnlargeFactor
 
-// Confidentiality preserving (but encryptionless) encoding.
+// EnclessEncode is encryptionless, but confidentiality preserving encoding.
 //
 // It uses Chaffing-and-Winnowing technology (it is neither
 // encryption nor steganography) over All-Or-Nothing-Transformed data.
@@ -39,11 +40,11 @@ func EnclessEncode(authKey *[32]byte, nonce *[16]byte, in []byte) ([]byte, error
        r := new([aont.RSize]byte)
        var err error
        if _, err = io.ReadFull(Rand, r[:]); err != nil {
-               return nil, err
+               return nil, errors.Wrapf(err, wrapIoReadFull, "Rand")
        }
        aonted, err := aont.Encode(r, in)
        if err != nil {
-               return nil, err
+               return nil, errors.Wrap(err, "aont.Encode")
        }
        out := append(
                cnw.Chaff(authKey, nonce[8:], aonted[:aont.RSize]),
@@ -53,21 +54,21 @@ func EnclessEncode(authKey *[32]byte, nonce *[16]byte, in []byte) ([]byte, error
        return out, nil
 }
 
-// Decode EnclessEncode-ed data.
+// EnclessDecode decodes EnclessEncode-ed data.
 func EnclessDecode(authKey *[32]byte, nonce *[16]byte, in []byte) ([]byte, error) {
        var err error
        winnowed, err := cnw.Winnow(
                authKey, nonce[8:], in[:aont.RSize*cnw.EnlargeFactor],
        )
        if err != nil {
-               return nil, err
+               return nil, errors.Wrap(err, "cnw.Winnow")
        }
        out, err := aont.Decode(append(
                winnowed, in[aont.RSize*cnw.EnlargeFactor:]...,
        ))
        SliceZero(winnowed)
        if err != nil {
-               return nil, err
+               return nil, errors.Wrap(err, "aont.Decode")
        }
        return out, nil
 }