Move more comments that confuse indent

[openssl.git] / crypto / evp / e_aes_cbc_hmac_sha1.c

diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
index b2d797dba2ebf0aeeede0faead3bbc154fd8f870..3e41f5d4198bf071f231ed2331f50c5cc2d6a168 100644 (file)
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
@@ -210,11 +210,10 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
        u8              *IVs;
 #if defined(BSWAP8)
        u64             seqnum;
-#else
-       unsigned int    carry,j;
 #endif
 
-       if (RAND_bytes((IVs=blocks[0].c),16*x4)<=0)     /* ask for IVs in bulk */
+       /* ask for IVs in bulk */
+       if (RAND_bytes((IVs=blocks[0].c),16*x4)<=0)
                return 0;
 
        ctx = (SHA1_MB_CTX *)(storage+32-((size_t)storage%32)); /* align */
@@ -231,7 +230,8 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
        /* populate descriptors with pointers and IVs */
        hash_d[0].ptr = inp;
        ciph_d[0].inp = inp;
-       ciph_d[0].out = out+5+16;       /* 5+16 is place for header and explicit IV */
+       /* 5+16 is place for header and explicit IV */
+       ciph_d[0].out = out+5+16;
        memcpy(ciph_d[0].out-16,IVs,16);
        memcpy(ciph_d[0].iv,IVs,16);    IVs += 16;
 
@@ -248,6 +248,9 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
 #endif
        for (i=0;i<x4;i++) {
                unsigned int len = (i==(x4-1)?last:frag);
+#if !defined(BSWAP8)
+               unsigned int carry, j;
+#endif
 
                ctx->A[i] = key->md.h0;
                ctx->B[i] = key->md.h1;
@@ -329,10 +332,18 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
                len += 64+13;           /* 64 is HMAC header */
                len *= 8;               /* convert to bits */
                if (off<(64-8)) {
+#ifdef BSWAP4
+                       blocks[i].d[15] = BSWAP4(len);
+#else
                        PUTU32(blocks[i].c+60,len);
+#endif
                        edges[i].blocks = 1;                    
                } else {
+#ifdef BSWAP4
+                       blocks[i].d[31] = BSWAP4(len);
+#else
                        PUTU32(blocks[i].c+124,len);
+#endif
                        edges[i].blocks = 2;
                }
                edges[i].ptr = blocks[i].c;
@@ -343,6 +354,15 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
 
        memset(blocks,0,sizeof(blocks));
        for (i=0;i<x4;i++) {
+#ifdef BSWAP4
+               blocks[i].d[0] = BSWAP4(ctx->A[i]);     ctx->A[i] = key->tail.h0;
+               blocks[i].d[1] = BSWAP4(ctx->B[i]);     ctx->B[i] = key->tail.h1;
+               blocks[i].d[2] = BSWAP4(ctx->C[i]);     ctx->C[i] = key->tail.h2;
+               blocks[i].d[3] = BSWAP4(ctx->D[i]);     ctx->D[i] = key->tail.h3;
+               blocks[i].d[4] = BSWAP4(ctx->E[i]);     ctx->E[i] = key->tail.h4;
+               blocks[i].c[20] = 0x80;
+               blocks[i].d[15] = BSWAP4((64+20)*8);
+#else
                PUTU32(blocks[i].c+0,ctx->A[i]);        ctx->A[i] = key->tail.h0;
                PUTU32(blocks[i].c+4,ctx->B[i]);        ctx->B[i] = key->tail.h1;
                PUTU32(blocks[i].c+8,ctx->C[i]);        ctx->C[i] = key->tail.h2;
@@ -350,6 +370,7 @@ static size_t tls1_1_multi_block_encrypt(EVP_AES_HMAC_SHA1 *key,
                PUTU32(blocks[i].c+16,ctx->E[i]);       ctx->E[i] = key->tail.h4;
                blocks[i].c[20] = 0x80;
                PUTU32(blocks[i].c+60,(64+20)*8);
+#endif
                edges[i].ptr = blocks[i].c;
                edges[i].blocks = 1;
        }