CEF/grumble
1
0
Fork 0
forked from External/grumble
Code Pull requests Activity

Small cleanups in cryptstate

Browse source
This commit is contained in:
Benjamin Jemlich 2011-01-02 11:14:20 +08:00 • committed by Mikkel Krautz
parent 4594562304
commit b8d8f71780
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pkg/cryptstate/cryptstate.go
View file

@ -36,10 +36,6 @@ type CryptState struct {
func New() (cs *CryptState, err os.Error) { func New() (cs *CryptState, err os.Error) {
cs = new(CryptState) cs = new(CryptState)
for i := 0; i < DecryptHistorySize; i++ {
cs.decryptHistory[i] = 0
}
return return
} }
@ -212,25 +208,25 @@ func (cs *CryptState) Encrypt(dst, src []byte) {
var tag [AESBlockSize]byte var tag [AESBlockSize]byte
// First, increase our IV // First, increase our IV
for i := 0; i < AESBlockSize; i++ { for i := range cs.EncryptIV {
cs.EncryptIV[i] += 1; cs.EncryptIV[i] += 1
if cs.EncryptIV[i] > 0 { if cs.EncryptIV[i] > 0 {
break; break
} }
} }
cs.OCBEncrypt(dst[4:], src, cs.EncryptIV[0:], tag[0:]) cs.OCBEncrypt(dst[4:], src, cs.EncryptIV[0:], tag[0:])
dst[0] = cs.EncryptIV[0] dst[0] = cs.EncryptIV[0]
dst[1] = tag[0]; dst[1] = tag[0]
dst[2] = tag[1]; dst[2] = tag[1]
dst[3] = tag[2]; dst[3] = tag[2]
return return
} }
func zeros(block []byte) { func zeros(block []byte) {
for i := 0; i < AESBlockSize; i++ { for i := range block {
block[i] = 0 block[i] = 0
} }
} }
@ -336,9 +332,7 @@ func (cs *CryptState) OCBDecrypt(plain []byte, encrypted []byte, nonce []byte, t
tmp[AESBlockSize-1] = uint8(num & 0xff) tmp[AESBlockSize-1] = uint8(num & 0xff)
xor(tmp[0:], tmp[0:], delta[0:]) xor(tmp[0:], tmp[0:], delta[0:])
cs.cipher.Encrypt(pad[0:], tmp[0:]) cs.cipher.Encrypt(pad[0:], tmp[0:])
for i := 0; i < AESBlockSize; i++ { zeros(tmp[0:])
tmp[i] = 0
}
copied := copy(tmp[0:remain], encrypted[off:off+remain]) copied := copy(tmp[0:remain], encrypted[off:off+remain])
if copied != remain { if copied != remain {
err = os.NewError("Copy failed") err = os.NewError("Copy failed")