diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-04 20:48:42 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-04 20:48:42 +0000 |
| commit | e2aa86b3e0ff324ada97a15ae735d3453236ed3a (patch) | |
| tree | 013bef850232b186bf2e75ebeab4de6a62550567 /main/aescrypt.c | |
| parent | 529951d632c2b49177bc9c382293a66492bb8678 (diff) | |
Spacing changes only
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180259 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/aescrypt.c')
| -rw-r--r-- | main/aescrypt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/aescrypt.c b/main/aescrypt.c index 7b34809bb..86aeb2133 100644 --- a/main/aescrypt.c +++ b/main/aescrypt.c @@ -122,7 +122,7 @@ aes_rval aes_encrypt(const void *in_blk, void *out_blk, const aes_encrypt_ctx cx aes_32t nr = (kp[45] ^ kp[52] ^ kp[53] ? kp[52] : 14); #ifdef AES_ERR_CHK - if( (nr != 10 || !(kp[0] | kp[3] | kp[4])) + if( (nr != 10 || !(kp[0] | kp[3] | kp[4])) && (nr != 12 || !(kp[0] | kp[5] | kp[6])) && (nr != 14 || !(kp[0] | kp[7] | kp[8])) ) return aes_error; @@ -246,7 +246,7 @@ aes_rval aes_decrypt(const void *in_blk, void *out_blk, const aes_decrypt_ctx cx const aes_32t *kp = cx->ks + nr * N_COLS; #ifdef AES_ERR_CHK - if( (nr != 10 || !(cx->ks[0] | cx->ks[3] | cx->ks[4])) + if( (nr != 10 || !(cx->ks[0] | cx->ks[3] | cx->ks[4])) && (nr != 12 || !(cx->ks[0] | cx->ks[5] | cx->ks[6])) && (nr != 14 || !(cx->ks[0] | cx->ks[7] | cx->ks[8])) ) return aes_error; |