Turn on strict alignment #define's, because racoon reliably core
dumps on machines which require strict alignment such as sparc64.
This commit is contained in:
parent
40a72a2371
commit
f07ce00ec5
|
@ -112,7 +112,7 @@ int rijndael_blockEncrypt(cipherInstance *cipher, keyInstance *key,
|
|||
break;
|
||||
|
||||
case MODE_CBC:
|
||||
#if 0 /*STRICT_ALIGN*/
|
||||
#if 1 /*STRICT_ALIGN*/
|
||||
bcopy(cipher->IV, block, 16);
|
||||
bcopy(input, iv, 16);
|
||||
((word32*)block)[0] ^= ((word32*)iv)[0];
|
||||
|
@ -128,8 +128,9 @@ int rijndael_blockEncrypt(cipherInstance *cipher, keyInstance *key,
|
|||
rijndaelEncrypt(block, outBuffer, key->keySched, key->ROUNDS);
|
||||
input += 16;
|
||||
for (i = numBlocks - 1; i > 0; i--) {
|
||||
#if 0 /*STRICT_ALIGN*/
|
||||
#if 1 /*STRICT_ALIGN*/
|
||||
bcopy(outBuffer, block, 16);
|
||||
bcopy(input, iv, 16);
|
||||
((word32*)block)[0] ^= ((word32*)iv)[0];
|
||||
((word32*)block)[1] ^= ((word32*)iv)[1];
|
||||
((word32*)block)[2] ^= ((word32*)iv)[2];
|
||||
|
@ -147,7 +148,7 @@ int rijndael_blockEncrypt(cipherInstance *cipher, keyInstance *key,
|
|||
break;
|
||||
|
||||
case MODE_CFB1:
|
||||
#if 0 /*STRICT_ALIGN*/
|
||||
#if 1 /*STRICT_ALIGN*/
|
||||
bcopy(cipher->IV, iv, 16);
|
||||
#else /* !STRICT_ALIGN */
|
||||
*((word32*)iv[0]) = *((word32*)(cipher->IV ));
|
||||
|
@ -294,7 +295,7 @@ int rijndael_blockDecrypt(cipherInstance *cipher, keyInstance *key,
|
|||
break;
|
||||
|
||||
case MODE_CBC:
|
||||
#if 0 /*STRICT_ALIGN */
|
||||
#if 1 /*STRICT_ALIGN */
|
||||
bcopy(cipher->IV, iv, 16);
|
||||
#else
|
||||
*((word32*)iv[0]) = *((word32*)(cipher->IV ));
|
||||
|
@ -308,7 +309,7 @@ int rijndael_blockDecrypt(cipherInstance *cipher, keyInstance *key,
|
|||
((word32*)block)[1] ^= *((word32*)iv[1]);
|
||||
((word32*)block)[2] ^= *((word32*)iv[2]);
|
||||
((word32*)block)[3] ^= *((word32*)iv[3]);
|
||||
#if 0 /*STRICT_ALIGN*/
|
||||
#if 1 /*STRICT_ALIGN*/
|
||||
bcopy(input, iv, 16);
|
||||
bcopy(block, outBuffer, 16);
|
||||
#else
|
||||
|
@ -323,7 +324,7 @@ int rijndael_blockDecrypt(cipherInstance *cipher, keyInstance *key,
|
|||
break;
|
||||
|
||||
case MODE_CFB1:
|
||||
#if 0 /*STRICT_ALIGN */
|
||||
#if 1 /*STRICT_ALIGN */
|
||||
bcopy(cipher->IV, iv, 16);
|
||||
#else
|
||||
*((word32*)iv[0]) = *((word32*)(cipher->IV));
|
||||
|
|
Loading…
Reference in New Issue