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: get rid of ocb2.NonceSize hard-coding.

Browse source
This commit is contained in:
Mikkel Krautz 2012-12-08 22:39:24 +01:00
parent 33a7e1304d
commit 2b12adc014
1 changed files with 17 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

53
pkg/cryptstate/cryptstate.go
View file

@ -82,32 +82,24 @@ func (cs *CryptState) SetKey(key []byte, eiv []byte, div []byte) error {
return nil return nil
} }
func (cs *CryptState) Decrypt(dst, src []byte) (err error) { func (cs *CryptState) Decrypt(dst, src []byte) error {
if len(src) < 4 { if len(src) < 4 {
err = errors.New("Crypted length too short to decrypt") return errors.New("cryptstate: crypted length too short to decrypt")
return
} }
plain_len := len(src) - 4 plain_len := len(src) - 4
if len(dst) != plain_len { if len(dst) != plain_len {
err = errors.New("plain_len and src len mismatch") return errors.New("cryptstate: plain_len and src len mismatch")
return
} }
var saveiv [ocb2.NonceSize]byte
var tag [ocb2.TagSize]byte var tag [ocb2.TagSize]byte
var ivbyte byte ivbyte := src[0]
var restore bool restore := false
lost := 0 lost := 0
late := 0 late := 0
ivbyte = src[0] saveiv := make([]byte, len(cs.DecryptIV))
restore = false copy(saveiv, cs.DecryptIV)
if copy(saveiv[:], cs.DecryptIV) != ocb2.NonceSize {
err = errors.New("Copy failed")
return
}
if byte(cs.DecryptIV[0]+1) == ivbyte { if byte(cs.DecryptIV[0]+1) == ivbyte {
// In order as expected // In order as expected
@ -115,14 +107,14 @@ 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 < ocb2.NonceSize; i++ { for i := 1; i < len(cs.DecryptIV); i++ {
cs.DecryptIV[i] += 1 cs.DecryptIV[i] += 1
if cs.DecryptIV[i] > 0 { if cs.DecryptIV[i] > 0 {
break break
} }
} }
} else { } else {
err = errors.New("invalid ivbyte") return errors.New("cryptstate: invalid ivbyte")
} }
} else { } else {
// Out of order or repeat // Out of order or repeat
@ -145,7 +137,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 < ocb2.NonceSize; i++ { for i := 1; i < len(cs.DecryptIV); i++ {
cs.DecryptIV[i] -= 1 cs.DecryptIV[i] -= 1
if cs.DecryptIV[i] > 0 { if cs.DecryptIV[i] > 0 {
break break
@ -160,22 +152,18 @@ 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 < ocb2.NonceSize; i++ { for i := 1; i < len(cs.DecryptIV); i++ {
cs.DecryptIV[i] += 1 cs.DecryptIV[i] += 1
if cs.DecryptIV[i] > 0 { if cs.DecryptIV[i] > 0 {
break break
} }
} }
} else { } else {
err = errors.New("No matching ivbyte") return errors.New("cryptstate: no matching ivbyte")
return
} }
if cs.decryptHistory[cs.DecryptIV[0]] == cs.DecryptIV[0] { if cs.decryptHistory[cs.DecryptIV[0]] == cs.DecryptIV[0] {
if copy(cs.DecryptIV, saveiv[:]) != ocb2.NonceSize { cs.DecryptIV = saveiv
err = errors.New("Failed to copy ocb2.NonceSize bytes")
return
}
} }
} }
@ -183,22 +171,15 @@ 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, saveiv[:]) != ocb2.NonceSize { cs.DecryptIV = saveiv
err = errors.New("Error while trying to recover from error") return errors.New("tag mismatch")
return
}
err = errors.New("tag mismatch")
return
} }
} }
cs.decryptHistory[cs.DecryptIV[0]] = cs.DecryptIV[0] cs.decryptHistory[cs.DecryptIV[0]] = cs.DecryptIV[0]
if restore { if restore {
if copy(cs.DecryptIV, saveiv[:]) != ocb2.NonceSize { cs.DecryptIV = saveiv
err = errors.New("Error while trying to recover IV")
return
}
} }
cs.Good += 1 cs.Good += 1
@ -215,7 +196,7 @@ func (cs *CryptState) Decrypt(dst, src []byte) (err error) {
cs.LastGoodTime = time.Now().Unix() cs.LastGoodTime = time.Now().Unix()
return return nil
} }
func (cs *CryptState) Encrypt(dst, src []byte) { func (cs *CryptState) Encrypt(dst, src []byte) {