Print this page
6717509 Need to use bswap/bswapq for byte swap of 64-bit integer on x32/x64 (fix lint)

*** 1486,1496 **** bcopy(cipherKey, keyarr.ka32, keysize); } #else /* byte swap */ for (i = 0, j = 0; j < keysize; i++, j += 4) { ! keyarr.ka32[i] = htonl(*(uint32_t *)&cipherKey[j]); } #endif aes_setupkeys(newbie, keyarr.ka32, keyBits); /* EXPORT DELETE END */ --- 1486,1496 ---- bcopy(cipherKey, keyarr.ka32, keysize); } #else /* byte swap */ for (i = 0, j = 0; j < keysize; i++, j += 4) { ! keyarr.ka32[i] = htonl(*(uint32_t *)(void *)&cipherKey[j]); } #endif aes_setupkeys(newbie, keyarr.ka32, keyBits); /* EXPORT DELETE END */
*** 1523,1536 **** /* Copy input block into buffer */ #ifndef AES_BYTE_SWAP bcopy(pt, &buffer, AES_BLOCK_LEN); #else /* byte swap */ ! buffer[0] = htonl(*(uint32_t *)&pt[0]); ! buffer[1] = htonl(*(uint32_t *)&pt[4]); ! buffer[2] = htonl(*(uint32_t *)&pt[8]); ! buffer[3] = htonl(*(uint32_t *)&pt[12]); #endif AES_ENCRYPT_IMPL(&ksch->encr_ks.ks32[0], ksch->nr, buffer, buffer); --- 1523,1536 ---- /* Copy input block into buffer */ #ifndef AES_BYTE_SWAP bcopy(pt, &buffer, AES_BLOCK_LEN); #else /* byte swap */ ! buffer[0] = htonl(*(uint32_t *)(void *)&pt[0]); ! buffer[1] = htonl(*(uint32_t *)(void *)&pt[4]); ! buffer[2] = htonl(*(uint32_t *)(void *)&pt[8]); ! buffer[3] = htonl(*(uint32_t *)(void *)&pt[12]); #endif AES_ENCRYPT_IMPL(&ksch->encr_ks.ks32[0], ksch->nr, buffer, buffer);
*** 1538,1551 **** #ifndef AES_BYTE_SWAP bcopy(&buffer, ct, AES_BLOCK_LEN); } #else /* byte swap */ ! *(uint32_t *)&ct[0] = htonl(buffer[0]); ! *(uint32_t *)&ct[4] = htonl(buffer[1]); ! *(uint32_t *)&ct[8] = htonl(buffer[2]); ! *(uint32_t *)&ct[12] = htonl(buffer[3]); #endif /* EXPORT DELETE END */ return (CRYPTO_SUCCESS); } --- 1538,1551 ---- #ifndef AES_BYTE_SWAP bcopy(&buffer, ct, AES_BLOCK_LEN); } #else /* byte swap */ ! *(uint32_t *)(void *)&ct[0] = htonl(buffer[0]); ! *(uint32_t *)(void *)&ct[4] = htonl(buffer[1]); ! *(uint32_t *)(void *)&ct[8] = htonl(buffer[2]); ! *(uint32_t *)(void *)&ct[12] = htonl(buffer[3]); #endif /* EXPORT DELETE END */ return (CRYPTO_SUCCESS); }
*** 1576,1589 **** /* Copy input block into buffer */ #ifndef AES_BYTE_SWAP bcopy(ct, &buffer, AES_BLOCK_LEN); #else /* byte swap */ ! buffer[0] = htonl(*(uint32_t *)&ct[0]); ! buffer[1] = htonl(*(uint32_t *)&ct[4]); ! buffer[2] = htonl(*(uint32_t *)&ct[8]); ! buffer[3] = htonl(*(uint32_t *)&ct[12]); #endif AES_DECRYPT_IMPL(&ksch->decr_ks.ks32[0], ksch->nr, buffer, buffer); --- 1576,1589 ---- /* Copy input block into buffer */ #ifndef AES_BYTE_SWAP bcopy(ct, &buffer, AES_BLOCK_LEN); #else /* byte swap */ ! buffer[0] = htonl(*(uint32_t *)(void *)&ct[0]); ! buffer[1] = htonl(*(uint32_t *)(void *)&ct[4]); ! buffer[2] = htonl(*(uint32_t *)(void *)&ct[8]); ! buffer[3] = htonl(*(uint32_t *)(void *)&ct[12]); #endif AES_DECRYPT_IMPL(&ksch->decr_ks.ks32[0], ksch->nr, buffer, buffer);
*** 1591,1604 **** #ifndef AES_BYTE_SWAP bcopy(&buffer, pt, AES_BLOCK_LEN); } #else /* byte swap */ ! *(uint32_t *)&pt[0] = htonl(buffer[0]); ! *(uint32_t *)&pt[4] = htonl(buffer[1]); ! *(uint32_t *)&pt[8] = htonl(buffer[2]); ! *(uint32_t *)&pt[12] = htonl(buffer[3]); #endif /* EXPORT DELETE END */ return (CRYPTO_SUCCESS); } --- 1591,1604 ---- #ifndef AES_BYTE_SWAP bcopy(&buffer, pt, AES_BLOCK_LEN); } #else /* byte swap */ ! *(uint32_t *)(void *)&pt[0] = htonl(buffer[0]); ! *(uint32_t *)(void *)&pt[4] = htonl(buffer[1]); ! *(uint32_t *)(void *)&pt[8] = htonl(buffer[2]); ! *(uint32_t *)(void *)&pt[12] = htonl(buffer[3]); #endif /* EXPORT DELETE END */ return (CRYPTO_SUCCESS); }