e_aes_cbc_hmac_sha[1|256].c: fix compiler warning.
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index b14d837..09f9281 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -208,6 +208,9 @@
unsigned int frag, last, packlen, i, x4=4*n4x;
size_t ret = 0;
u8 *IVs;
+#if defined(BSWAP8)
+ u64 seqnum;
+#endif
ctx = (SHA1_MB_CTX *)(storage+32-((size_t)storage%32)); /* align */
@@ -221,6 +224,10 @@
hash_d[0].ptr = inp;
for (i=1;i<x4;i++) hash_d[i].ptr = hash_d[i-1].ptr+frag;
+#if defined(BSWAP8)
+ memcpy(blocks[0].c,key->md.data,8);
+ seqnum = BSWAP8(blocks[0].q[0]);
+#endif
for (i=0;i<x4;i++) {
unsigned int len = (i==(x4-1)?last:frag);
@@ -232,7 +239,7 @@
/* fix seqnum */
#if defined(BSWAP8)
- blocks[i].q[0] = BSWAP8(BSWAP8(*(u64*)key->md.data)+i);
+ blocks[i].q[0] = BSWAP8(seqnum+i);
#else
blocks[i].c[7] += ((u8*)key->md.data)[7]+i;
if (blocks[i].c[7] < i) {
diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index 01823d2..95bdd42 100644
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -204,6 +204,9 @@
unsigned int frag, last, packlen, i, x4=4*n4x;
size_t ret = 0;
u8 *IVs;
+#if defined(BSWAP8)
+ u64 seqnum;
+#endif
ctx = (SHA256_MB_CTX *)(storage+32-((size_t)storage%32)); /* align */
@@ -217,6 +220,10 @@
hash_d[0].ptr = inp;
for (i=1;i<x4;i++) hash_d[i].ptr = hash_d[i-1].ptr+frag;
+#if defined(BSWAP8)
+ memcpy(blocks[0].c,key->md.data,8);
+ seqnum = BSWAP8(blocks[0].q[0]);
+#endif
for (i=0;i<x4;i++) {
unsigned int len = (i==(x4-1)?last:frag);
@@ -231,7 +238,7 @@
/* fix seqnum */
#if defined(BSWAP8)
- blocks[i].q[0] = BSWAP8(BSWAP8(*(u64*)key->md.data)+i);
+ blocks[i].q[0] = BSWAP8(seqnum+i);
#else
blocks[i].c[7] += ((u8*)key->md.data)[7]+i;
if (blocks[i].c[7] < i) {
