External/grumble
1
0
Fork 1
mirror of https://github.com/mumble-voip/grumble.git synced 2025-12-19 21:59:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkg/cryptstate: use new OCB2 consts for array definitions.

Browse source
This commit is contained in:
Mikkel Krautz 2012-12-01 17:32:24 +01:00
parent 94c7cc2be0
commit 5c54c17247
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pkg/cryptstate/cryptstate.go
View file

@ -18,8 +18,8 @@ const DecryptHistorySize = 0x100
type CryptState struct { type CryptState struct {
RawKey [aes.BlockSize]byte RawKey [aes.BlockSize]byte
EncryptIV [aes.BlockSize]byte EncryptIV [ocb2.NonceSize]byte
DecryptIV [aes.BlockSize]byte DecryptIV [ocb2.NonceSize]byte
decryptHistory [DecryptHistorySize]byte decryptHistory [DecryptHistorySize]byte
LastGoodTime int64 LastGoodTime int64
@ -61,12 +61,12 @@ func (cs *CryptState) SetKey(key []byte, eiv []byte, div []byte) (err error) {
return return
} }
if copy(cs.EncryptIV[0:], eiv[0:]) != aes.BlockSize { if copy(cs.EncryptIV[0:], eiv[0:]) != ocb2.NonceSize {
err = errors.New("Unable to copy EIV") err = errors.New("Unable to copy EIV")
return return
} }
if copy(cs.DecryptIV[0:], div[0:]) != aes.BlockSize { if copy(cs.DecryptIV[0:], div[0:]) != ocb2.NonceSize {
err = errors.New("Unable to copy DIV") err = errors.New("Unable to copy DIV")
return return
} }
@ -91,8 +91,8 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
return return
} }
var saveiv [aes.BlockSize]byte var saveiv [ocb2.NonceSize]byte
var tag [aes.BlockSize]byte var tag [ocb2.TagSize]byte
var ivbyte byte var ivbyte byte
var restore bool var restore bool
lost := 0 lost := 0
@ -101,7 +101,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
ivbyte = src[0] ivbyte = src[0]
restore = false restore = false
if copy(saveiv[0:], cs.DecryptIV[0:]) != aes.BlockSize { if copy(saveiv[0:], cs.DecryptIV[0:]) != ocb2.NonceSize {
err = errors.New("Copy failed") err = errors.New("Copy failed")
return return
} }
@ -112,7 +112,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
cs.DecryptIV[0] = ivbyte cs.DecryptIV[0] = ivbyte
} else if ivbyte < cs.DecryptIV[0] { } else if ivbyte < cs.DecryptIV[0] {
cs.DecryptIV[0] = ivbyte cs.DecryptIV[0] = ivbyte
for i := 1; i < aes.BlockSize; i++ { for i := 1; i < ocb2.NonceSize; i++ {
cs.DecryptIV[i] += 1 cs.DecryptIV[i] += 1
if cs.DecryptIV[i] > 0 { if cs.DecryptIV[i] > 0 {
break break
@ -142,7 +142,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
late = 1 late = 1
lost = -1 lost = -1
cs.DecryptIV[0] = ivbyte cs.DecryptIV[0] = ivbyte
for i := 1; i < aes.BlockSize; i++ { for i := 1; i < ocb2.NonceSize; i++ {
cs.DecryptIV[i] -= 1 cs.DecryptIV[i] -= 1
if cs.DecryptIV[i] > 0 { if cs.DecryptIV[i] > 0 {
break break
@ -157,7 +157,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
// Lost a few packets, and wrapped around // Lost a few packets, and wrapped around
lost = int(256 - int(cs.DecryptIV[0]) + int(ivbyte) - 1) lost = int(256 - int(cs.DecryptIV[0]) + int(ivbyte) - 1)
cs.DecryptIV[0] = ivbyte cs.DecryptIV[0] = ivbyte
for i := 1; i < aes.BlockSize; i++ { for i := 1; i < ocb2.NonceSize; i++ {
cs.DecryptIV[i] += 1 cs.DecryptIV[i] += 1
if cs.DecryptIV[i] > 0 { if cs.DecryptIV[i] > 0 {
break break
@ -169,8 +169,8 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
} }
if cs.decryptHistory[cs.DecryptIV[0]] == cs.DecryptIV[0] { if cs.decryptHistory[cs.DecryptIV[0]] == cs.DecryptIV[0] {
if copy(cs.DecryptIV[0:], saveiv[0:]) != aes.BlockSize { if copy(cs.DecryptIV[0:], saveiv[0:]) != ocb2.NonceSize {
err = errors.New("Failed to copy aes.BlockSize bytes") err = errors.New("Failed to copy ocb2.NonceSize bytes")
return return
} }
} }
@ -180,7 +180,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
if tag[i] != src[i+1] { if tag[i] != src[i+1] {
if copy(cs.DecryptIV[0:], saveiv[0:]) != aes.BlockSize { if copy(cs.DecryptIV[0:], saveiv[0:]) != ocb2.NonceSize {
err = errors.New("Error while trying to recover from error") err = errors.New("Error while trying to recover from error")
return return
} }
@ -192,7 +192,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
cs.decryptHistory[cs.DecryptIV[0]] = cs.DecryptIV[0] cs.decryptHistory[cs.DecryptIV[0]] = cs.DecryptIV[0]
if restore { if restore {
if copy(cs.DecryptIV[0:], saveiv[0:]) != aes.BlockSize { if copy(cs.DecryptIV[0:], saveiv[0:]) != ocb2.NonceSize {
err = errors.New("Error while trying to recover IV") err = errors.New("Error while trying to recover IV")
return return
} }
@ -216,7 +216,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
} }
func (cs *CryptState) Encrypt(dst, src []byte) { func (cs *CryptState) Encrypt(dst, src []byte) {
var tag [aes.BlockSize]byte var tag [ocb2.TagSize]byte
// First, increase our IV // First, increase our IV
for i := range cs.EncryptIV { for i := range cs.EncryptIV {