This commit was generated by cvs2git to track changes on a CVS vendor

branch.

9 files changed, 221 insertions, 74 deletions

diff --git a/src/lib/libcrypto/modes/asm/ghash-alpha.pl b/src/lib/libcrypto/modes/asm/ghash-alpha.pl
index 6358b2750f..aa36029386 100644
--- a/src/lib/libcrypto/modes/asm/ghash-alpha.pl
+++ b/src/lib/libcrypto/modes/asm/ghash-alpha.pl
@@ -266,8 +266,8 @@ gcm_gmult_4bit:
         ldq     $Xlo,8($Xi)
         ldq     $Xhi,0($Xi)
 
-        br      $rem_4bit,.Lpic1
-.Lpic1: lda     $rem_4bit,rem_4bit-.Lpic1($rem_4bit)
+        bsr     $t0,picmeup
+        nop
 ___
 
         &loop();
@@ -341,8 +341,8 @@ gcm_ghash_4bit:
         ldq     $Xhi,0($Xi)
         ldq     $Xlo,8($Xi)
 
-        br      $rem_4bit,.Lpic2
-.Lpic2: lda     $rem_4bit,rem_4bit-.Lpic2($rem_4bit)
+        bsr     $t0,picmeup
+        nop
 
 .Louter:
         extql   $inhi,$inp,$inhi
@@ -436,11 +436,20 @@ $code.=<<___;
 .end    gcm_ghash_4bit
 
 .align  4
+.ent    picmeup
+picmeup:
+        .frame  sp,0,$t0
+        .prologue 0
+        br      $rem_4bit,.Lpic
+.Lpic:  lda     $rem_4bit,12($rem_4bit)
+        ret     ($t0)
+.end    picmeup
+        nop
 rem_4bit:
-        .quad   0x0000<<48, 0x1C20<<48, 0x3840<<48, 0x2460<<48
-        .quad   0x7080<<48, 0x6CA0<<48, 0x48C0<<48, 0x54E0<<48
-        .quad   0xE100<<48, 0xFD20<<48, 0xD940<<48, 0xC560<<48
-        .quad   0x9180<<48, 0x8DA0<<48, 0xA9C0<<48, 0xB5E0<<48
+        .long   0,0x0000<<16, 0,0x1C20<<16, 0,0x3840<<16, 0,0x2460<<16
+        .long   0,0x7080<<16, 0,0x6CA0<<16, 0,0x48C0<<16, 0,0x54E0<<16
+        .long   0,0xE100<<16, 0,0xFD20<<16, 0,0xD940<<16, 0,0xC560<<16
+        .long   0,0x9180<<16, 0,0x8DA0<<16, 0,0xA9C0<<16, 0,0xB5E0<<16
 .ascii  "GHASH for Alpha, CRYPTOGAMS by <appro\@openssl.org>"
 .align  4
 
diff --git a/src/lib/libcrypto/modes/asm/ghash-parisc.pl b/src/lib/libcrypto/modes/asm/ghash-parisc.pl
index 8c7454ee93..d5ad96b403 100644
--- a/src/lib/libcrypto/modes/asm/ghash-parisc.pl
+++ b/src/lib/libcrypto/modes/asm/ghash-parisc.pl
@@ -724,6 +724,7 @@ foreach (split("\n",$code)) {
                 s/cmpb,\*/comb,/;
                 s/,\*/,/;
         }
+        s/\bbv\b/bve/   if ($SIZE_T==8);
         print $_,"\n";
 }
 
diff --git a/src/lib/libcrypto/modes/asm/ghash-x86.pl b/src/lib/libcrypto/modes/asm/ghash-x86.pl
index 6b09669d47..83c727e07f 100644
--- a/src/lib/libcrypto/modes/asm/ghash-x86.pl
+++ b/src/lib/libcrypto/modes/asm/ghash-x86.pl
@@ -635,7 +635,7 @@ sub mmx_loop() {
     { my @lo  = ("mm0","mm1","mm2");
       my @hi  = ("mm3","mm4","mm5");
       my @tmp = ("mm6","mm7");
-      my $off1=0,$off2=0,$i;
+      my ($off1,$off2,$i) = (0,0,);
 
       &add      ($Htbl,128);                    # optimize for size
       &lea      ("edi",&DWP(16+128,"esp"));
@@ -883,7 +883,7 @@ sub reduction_alg9 {	# 17/13 times faster than Intel version
 my ($Xhi,$Xi) = @_;
 
         # 1st phase
-        &movdqa         ($T1,$Xi)               #
+        &movdqa         ($T1,$Xi);              #
         &psllq          ($Xi,1);
         &pxor           ($Xi,$T1);              #
         &psllq          ($Xi,5);                #
@@ -1019,7 +1019,7 @@ my ($Xhi,$Xi) = @_;
         &movdqa         ($Xhn,$Xn);
          &pxor          ($Xhi,$T1);             # "Ii+Xi", consume early
 
-          &movdqa       ($T1,$Xi)               #&reduction_alg9($Xhi,$Xi); 1st phase
+          &movdqa       ($T1,$Xi);              #&reduction_alg9($Xhi,$Xi); 1st phase
           &psllq        ($Xi,1);
           &pxor         ($Xi,$T1);              #
           &psllq        ($Xi,5);                #
diff --git a/src/lib/libcrypto/modes/asm/ghash-x86_64.pl b/src/lib/libcrypto/modes/asm/ghash-x86_64.pl
index a5ae180882..38d779edbc 100644
--- a/src/lib/libcrypto/modes/asm/ghash-x86_64.pl
+++ b/src/lib/libcrypto/modes/asm/ghash-x86_64.pl
@@ -50,7 +50,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
 ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
 die "can't locate x86_64-xlate.pl";
 
-open STDOUT,"| $^X $xlate $flavour $output";
+open OUT,"| \"$^X\" $xlate $flavour $output";
+*STDOUT=*OUT;
 
 # common register layout
 $nlo="%rax";
diff --git a/src/lib/libcrypto/modes/cbc128.c b/src/lib/libcrypto/modes/cbc128.c
index 3d3782cbe1..0e54f75470 100644
--- a/src/lib/libcrypto/modes/cbc128.c
+++ b/src/lib/libcrypto/modes/cbc128.c
@@ -117,7 +117,7 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
                         unsigned char ivec[16], block128_f block)
 {
         size_t n;
-        union { size_t align; unsigned char c[16]; } tmp;
+        union { size_t t[16/sizeof(size_t)]; unsigned char c[16]; } tmp;
 
         assert(in && out && key && ivec);
 
@@ -137,11 +137,13 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
                                 out += 16;
                         }
                 }
-                else {
+                else  if (16%sizeof(size_t) == 0) { /* always true */
                         while (len>=16) {
+                                size_t *out_t=(size_t *)out, *iv_t=(size_t *)iv;
+
                                 (*block)(in, out, key);
-                                for(n=0; n<16; n+=sizeof(size_t))
-                                        *(size_t *)(out+n) ^= *(size_t *)(iv+n);
+                                for(n=0; n<16/sizeof(size_t); n++)
+                                        out_t[n] ^= iv_t[n];
                                 iv = in;
                                 len -= 16;
                                 in  += 16;
@@ -165,15 +167,16 @@ void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
                                 out += 16;
                         }
                 }
-                else {
-                        size_t c;
+                else if (16%sizeof(size_t) == 0) { /* always true */
                         while (len>=16) {
+                                size_t c, *out_t=(size_t *)out, *ivec_t=(size_t *)ivec;
+                                const size_t *in_t=(const size_t *)in;
+
                                 (*block)(in, tmp.c, key);
-                                for(n=0; n<16; n+=sizeof(size_t)) {
-                                        c = *(size_t *)(in+n);
-                                        *(size_t *)(out+n) =
-                                        *(size_t *)(tmp.c+n) ^ *(size_t *)(ivec+n);
-                                        *(size_t *)(ivec+n) = c;
+                                for(n=0; n<16/sizeof(size_t); n++) {
+                                        c = in_t[n];
+                                        out_t[n] = tmp.t[n] ^ ivec_t[n];
+                                        ivec_t[n] = c;
                                 }
                                 len -= 16;
                                 in  += 16;
diff --git a/src/lib/libcrypto/modes/ccm128.c b/src/lib/libcrypto/modes/ccm128.c
index c9b35e5b35..3ce11d0d98 100644
--- a/src/lib/libcrypto/modes/ccm128.c
+++ b/src/lib/libcrypto/modes/ccm128.c
@@ -87,7 +87,7 @@ int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx,
                 ctx->nonce.c[11] = (u8)(mlen>>(32%(sizeof(mlen)*8)));
         }
         else
-                *(u32*)(&ctx->nonce.c[8]) = 0;
+                ctx->nonce.u[1] = 0;
 
         ctx->nonce.c[12] = (u8)(mlen>>24);
         ctx->nonce.c[13] = (u8)(mlen>>16);
diff --git a/src/lib/libcrypto/modes/cts128.c b/src/lib/libcrypto/modes/cts128.c
index c0e1f3696c..2d583de6f6 100644
--- a/src/lib/libcrypto/modes/cts128.c
+++ b/src/lib/libcrypto/modes/cts128.c
@@ -108,12 +108,8 @@ size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
         (*cbc)(in,out-16,residue,key,ivec,1);
         memcpy(out,tmp.c,residue);
 #else
-        {
-        size_t n;
-        for (n=0; n<16; n+=sizeof(size_t))
-                *(size_t *)(tmp.c+n) = 0;
+        memset(tmp.c,0,sizeof(tmp));
         memcpy(tmp.c,in,residue);
-        }
         memcpy(out,out-16,residue);
         (*cbc)(tmp.c,out-16,16,key,ivec,1);
 #endif
@@ -144,12 +140,8 @@ size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
 #if defined(CBC_HANDLES_TRUNCATED_IO)
         (*cbc)(in,out-16+residue,residue,key,ivec,1);
 #else
-        {
-        size_t n;
-        for (n=0; n<16; n+=sizeof(size_t))
-                *(size_t *)(tmp.c+n) = 0;
+        memset(tmp.c,0,sizeof(tmp));
         memcpy(tmp.c,in,residue);
-        }
         (*cbc)(tmp.c,out-16+residue,16,key,ivec,1);
 #endif
         return len+residue;
@@ -177,8 +169,7 @@ size_t CRYPTO_cts128_decrypt_block(const unsigned char *in, unsigned char *out,
 
         (*block)(in,tmp.c+16,key);
 
-        for (n=0; n<16; n+=sizeof(size_t))
-                *(size_t *)(tmp.c+n) = *(size_t *)(tmp.c+16+n);
+        memcpy(tmp.c,tmp.c+16,16);
         memcpy(tmp.c,in+16,residue);
         (*block)(tmp.c,tmp.c,key);
 
@@ -220,8 +211,7 @@ size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in, unsigned char *o
 
         (*block)(in+residue,tmp.c+16,key);
 
-        for (n=0; n<16; n+=sizeof(size_t))
-                *(size_t *)(tmp.c+n) = *(size_t *)(tmp.c+16+n);
+        memcpy(tmp.c,tmp.c+16,16);
         memcpy(tmp.c,in,residue);
         (*block)(tmp.c,tmp.c,key);
 
@@ -240,7 +230,7 @@ size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in, unsigned char *o
 size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
                         size_t len, const void *key,
                         unsigned char ivec[16], cbc128_f cbc)
-{       size_t residue, n;
+{       size_t residue;
         union { size_t align; unsigned char c[32]; } tmp;
 
         assert (in && out && key && ivec);
@@ -257,8 +247,7 @@ size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
                 out += len;
         }
 
-        for (n=16; n<32; n+=sizeof(size_t))
-                *(size_t *)(tmp.c+n) = 0;
+        memset(tmp.c,0,sizeof(tmp));
         /* this places in[16] at &tmp.c[16] and decrypted block at &tmp.c[0] */
         (*cbc)(in,tmp.c,16,key,tmp.c+16,0);
 
@@ -275,7 +264,7 @@ size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
 size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
                         size_t len, const void *key,
                         unsigned char ivec[16], cbc128_f cbc)
-{       size_t residue, n;
+{       size_t residue;
         union { size_t align; unsigned char c[32]; } tmp;
 
         assert (in && out && key && ivec);
@@ -297,8 +286,7 @@ size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
                 out += len;
         }
 
-        for (n=16; n<32; n+=sizeof(size_t))
-                *(size_t *)(tmp.c+n) = 0;
+        memset(tmp.c,0,sizeof(tmp));
         /* this places in[16] at &tmp.c[16] and decrypted block at &tmp.c[0] */
         (*cbc)(in+residue,tmp.c,16,key,tmp.c+16,0);
 
diff --git a/src/lib/libcrypto/modes/gcm128.c b/src/lib/libcrypto/modes/gcm128.c
index 7d6d034970..e1dc2b0f47 100644
--- a/src/lib/libcrypto/modes/gcm128.c
+++ b/src/lib/libcrypto/modes/gcm128.c
@@ -723,7 +723,7 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx,void *key,block128_f block)
 #  endif
         gcm_init_4bit(ctx->Htable,ctx->H.u);
 #  if   defined(GHASH_ASM_X86)                  /* x86 only */
-#   if defined(OPENSSL_IA32_SSE2)
+#   if  defined(OPENSSL_IA32_SSE2)
         if (OPENSSL_ia32cap_P[0]&(1<<25)) {     /* check SSE bit */
 #   else
         if (OPENSSL_ia32cap_P[0]&(1<<23)) {     /* check MMX bit */
@@ -810,7 +810,11 @@ void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx,const unsigned char *iv,size_t len)
                 GCM_MUL(ctx,Yi);
 
                 if (is_endian.little)
+#ifdef BSWAP4
+                        ctr = BSWAP4(ctx->Yi.d[3]);
+#else
                         ctr = GETU32(ctx->Yi.c+12);
+#endif
                 else
                         ctr = ctx->Yi.d[3];
         }
@@ -818,7 +822,11 @@ void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx,const unsigned char *iv,size_t len)
         (*ctx->block)(ctx->Yi.c,ctx->EK0.c,ctx->key);
         ++ctr;
         if (is_endian.little)
+#ifdef BSWAP4
+                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
         else
                 ctx->Yi.d[3] = ctr;
 }
@@ -913,7 +921,11 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
         }
 
         if (is_endian.little)
+#ifdef BSWAP4
+                ctr = BSWAP4(ctx->Yi.d[3]);
+#else
                 ctr = GETU32(ctx->Yi.c+12);
+#endif
         else
                 ctr = ctx->Yi.d[3];
 
@@ -941,15 +953,21 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                     size_t j=GHASH_CHUNK;
 
                     while (j) {
+                        size_t *out_t=(size_t *)out;
+                        const size_t *in_t=(const size_t *)in;
+
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
-                        for (i=0; i<16; i+=sizeof(size_t))
-                                *(size_t *)(out+i) =
-                                *(size_t *)(in+i)^*(size_t *)(ctx->EKi.c+i);
+                        for (i=0; i<16/sizeof(size_t); ++i)
+                                out_t[i] = in_t[i] ^ ctx->EKi.t[i];
                         out += 16;
                         in  += 16;
                         j   -= 16;
@@ -961,15 +979,21 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                     size_t j=i;
 
                     while (len>=16) {
+                        size_t *out_t=(size_t *)out;
+                        const size_t *in_t=(const size_t *)in;
+
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
-                        for (i=0; i<16; i+=sizeof(size_t))
-                                *(size_t *)(out+i) =
-                                *(size_t *)(in+i)^*(size_t *)(ctx->EKi.c+i);
+                        for (i=0; i<16/sizeof(size_t); ++i)
+                                out_t[i] = in_t[i] ^ ctx->EKi.t[i];
                         out += 16;
                         in  += 16;
                         len -= 16;
@@ -978,16 +1002,22 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                 }
 #else
                 while (len>=16) {
+                        size_t *out_t=(size_t *)out;
+                        const size_t *in_t=(const size_t *)in;
+
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
-                        for (i=0; i<16; i+=sizeof(size_t))
-                                *(size_t *)(ctx->Xi.c+i) ^=
-                                *(size_t *)(out+i) =
-                                *(size_t *)(in+i)^*(size_t *)(ctx->EKi.c+i);
+                        for (i=0; i<16/sizeof(size_t); ++i)
+                                ctx->Xi.t[i] ^=
+                                out_t[i] = in_t[i]^ctx->EKi.t[i];
                         GCM_MUL(ctx,Xi);
                         out += 16;
                         in  += 16;
@@ -998,7 +1028,11 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
                         while (len--) {
@@ -1016,7 +1050,11 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
                 }
@@ -1060,7 +1098,11 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
         }
 
         if (is_endian.little)
+#ifdef BSWAP4
+                ctr = BSWAP4(ctx->Yi.d[3]);
+#else
                 ctr = GETU32(ctx->Yi.c+12);
+#endif
         else
                 ctr = ctx->Yi.d[3];
 
@@ -1091,15 +1133,21 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
 
                     GHASH(ctx,in,GHASH_CHUNK);
                     while (j) {
+                        size_t *out_t=(size_t *)out;
+                        const size_t *in_t=(const size_t *)in;
+
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
-                        for (i=0; i<16; i+=sizeof(size_t))
-                                *(size_t *)(out+i) =
-                                *(size_t *)(in+i)^*(size_t *)(ctx->EKi.c+i);
+                        for (i=0; i<16/sizeof(size_t); ++i)
+                                out_t[i] = in_t[i]^ctx->EKi.t[i];
                         out += 16;
                         in  += 16;
                         j   -= 16;
@@ -1109,15 +1157,21 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                 if ((i = (len&(size_t)-16))) {
                     GHASH(ctx,in,i);
                     while (len>=16) {
+                        size_t *out_t=(size_t *)out;
+                        const size_t *in_t=(const size_t *)in;
+
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
-                        for (i=0; i<16; i+=sizeof(size_t))
-                                *(size_t *)(out+i) =
-                                *(size_t *)(in+i)^*(size_t *)(ctx->EKi.c+i);
+                        for (i=0; i<16/sizeof(size_t); ++i)
+                                out_t[i] = in_t[i]^ctx->EKi.t[i];
                         out += 16;
                         in  += 16;
                         len -= 16;
@@ -1125,16 +1179,23 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                 }
 #else
                 while (len>=16) {
+                        size_t *out_t=(size_t *)out;
+                        const size_t *in_t=(const size_t *)in;
+
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
-                        for (i=0; i<16; i+=sizeof(size_t)) {
-                                size_t c = *(size_t *)(in+i);
-                                *(size_t *)(out+i) = c^*(size_t *)(ctx->EKi.c+i);
-                                *(size_t *)(ctx->Xi.c+i) ^= c;
+                        for (i=0; i<16/sizeof(size_t); ++i) {
+                                size_t c = in[i];
+                                out[i] = c^ctx->EKi.t[i];
+                                ctx->Xi.t[i] ^= c;
                         }
                         GCM_MUL(ctx,Xi);
                         out += 16;
@@ -1146,7 +1207,11 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
                         while (len--) {
@@ -1167,7 +1232,11 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
                         (*block)(ctx->Yi.c,ctx->EKi.c,key);
                         ++ctr;
                         if (is_endian.little)
+#ifdef BSWAP4
+                                ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                                 PUTU32(ctx->Yi.c+12,ctr);
+#endif
                         else
                                 ctx->Yi.d[3] = ctr;
                 }
@@ -1212,7 +1281,11 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
         }
 
         if (is_endian.little)
+#ifdef BSWAP4
+                ctr = BSWAP4(ctx->Yi.d[3]);
+#else
                 ctr = GETU32(ctx->Yi.c+12);
+#endif
         else
                 ctr = ctx->Yi.d[3];
 
@@ -1234,7 +1307,11 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
                 (*stream)(in,out,GHASH_CHUNK/16,key,ctx->Yi.c);
                 ctr += GHASH_CHUNK/16;
                 if (is_endian.little)
+#ifdef BSWAP4
+                        ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                         PUTU32(ctx->Yi.c+12,ctr);
+#endif
                 else
                         ctx->Yi.d[3] = ctr;
                 GHASH(ctx,out,GHASH_CHUNK);
@@ -1249,7 +1326,11 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
                 (*stream)(in,out,j,key,ctx->Yi.c);
                 ctr += (unsigned int)j;
                 if (is_endian.little)
+#ifdef BSWAP4
+                        ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                         PUTU32(ctx->Yi.c+12,ctr);
+#endif
                 else
                         ctx->Yi.d[3] = ctr;
                 in  += i;
@@ -1269,7 +1350,11 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
                 (*ctx->block)(ctx->Yi.c,ctx->EKi.c,key);
                 ++ctr;
                 if (is_endian.little)
+#ifdef BSWAP4
+                        ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                         PUTU32(ctx->Yi.c+12,ctr);
+#endif
                 else
                         ctx->Yi.d[3] = ctr;
                 while (len--) {
@@ -1311,7 +1396,11 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
         }
 
         if (is_endian.little)
+#ifdef BSWAP4
+                ctr = BSWAP4(ctx->Yi.d[3]);
+#else
                 ctr = GETU32(ctx->Yi.c+12);
+#endif
         else
                 ctr = ctx->Yi.d[3];
 
@@ -1336,7 +1425,11 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
                 (*stream)(in,out,GHASH_CHUNK/16,key,ctx->Yi.c);
                 ctr += GHASH_CHUNK/16;
                 if (is_endian.little)
+#ifdef BSWAP4
+                        ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                         PUTU32(ctx->Yi.c+12,ctr);
+#endif
                 else
                         ctx->Yi.d[3] = ctr;
                 out += GHASH_CHUNK;
@@ -1362,7 +1455,11 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
                 (*stream)(in,out,j,key,ctx->Yi.c);
                 ctr += (unsigned int)j;
                 if (is_endian.little)
+#ifdef BSWAP4
+                        ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                         PUTU32(ctx->Yi.c+12,ctr);
+#endif
                 else
                         ctx->Yi.d[3] = ctr;
                 out += i;
@@ -1373,7 +1470,11 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
                 (*ctx->block)(ctx->Yi.c,ctx->EKi.c,key);
                 ++ctr;
                 if (is_endian.little)
+#ifdef BSWAP4
+                        ctx->Yi.d[3] = BSWAP4(ctr);
+#else
                         PUTU32(ctx->Yi.c+12,ctr);
+#endif
                 else
                         ctx->Yi.d[3] = ctr;
                 while (len--) {
@@ -1398,7 +1499,7 @@ int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx,const unsigned char *tag,
         void (*gcm_gmult_p)(u64 Xi[2],const u128 Htable[16])    = ctx->gmult;
 #endif
 
-        if (ctx->mres)
+        if (ctx->mres || ctx->ares)
                 GCM_MUL(ctx,Xi);
 
         if (is_endian.little) {
@@ -1669,6 +1770,46 @@ static const u8	IV18[]={0x93,0x13,0x22,0x5d,0xf8,0x84,0x06,0xe5,0x55,0x90,0x9c,0
                         0xa2,0x41,0x89,0x97,0x20,0x0e,0xf8,0x2e,0x44,0xae,0x7e,0x3f},
                 T18[]= {0xa4,0x4a,0x82,0x66,0xee,0x1c,0x8e,0xb0,0xc8,0xb5,0xd4,0xcf,0x5a,0xe9,0xf1,0x9a};
 
+/* Test Case 19 */
+#define K19 K1
+#define P19 P1
+#define IV19 IV1
+#define C19 C1
+static const u8 A19[]= {0xd9,0x31,0x32,0x25,0xf8,0x84,0x06,0xe5,0xa5,0x59,0x09,0xc5,0xaf,0xf5,0x26,0x9a,
+                        0x86,0xa7,0xa9,0x53,0x15,0x34,0xf7,0xda,0x2e,0x4c,0x30,0x3d,0x8a,0x31,0x8a,0x72,
+                        0x1c,0x3c,0x0c,0x95,0x95,0x68,0x09,0x53,0x2f,0xcf,0x0e,0x24,0x49,0xa6,0xb5,0x25,
+                        0xb1,0x6a,0xed,0xf5,0xaa,0x0d,0xe6,0x57,0xba,0x63,0x7b,0x39,0x1a,0xaf,0xd2,0x55,
+                        0x52,0x2d,0xc1,0xf0,0x99,0x56,0x7d,0x07,0xf4,0x7f,0x37,0xa3,0x2a,0x84,0x42,0x7d,
+                        0x64,0x3a,0x8c,0xdc,0xbf,0xe5,0xc0,0xc9,0x75,0x98,0xa2,0xbd,0x25,0x55,0xd1,0xaa,
+                        0x8c,0xb0,0x8e,0x48,0x59,0x0d,0xbb,0x3d,0xa7,0xb0,0x8b,0x10,0x56,0x82,0x88,0x38,
+                        0xc5,0xf6,0x1e,0x63,0x93,0xba,0x7a,0x0a,0xbc,0xc9,0xf6,0x62,0x89,0x80,0x15,0xad},
+                T19[]= {0x5f,0xea,0x79,0x3a,0x2d,0x6f,0x97,0x4d,0x37,0xe6,0x8e,0x0c,0xb8,0xff,0x94,0x92};
+
+/* Test Case 20 */
+#define K20 K1
+#define A20 A1
+static const u8 IV20[64]={0xff,0xff,0xff,0xff}, /* this results in 0xff in counter LSB */
+                P20[288],
+                C20[]= {0x56,0xb3,0x37,0x3c,0xa9,0xef,0x6e,0x4a,0x2b,0x64,0xfe,0x1e,0x9a,0x17,0xb6,0x14,
+                        0x25,0xf1,0x0d,0x47,0xa7,0x5a,0x5f,0xce,0x13,0xef,0xc6,0xbc,0x78,0x4a,0xf2,0x4f,
+                        0x41,0x41,0xbd,0xd4,0x8c,0xf7,0xc7,0x70,0x88,0x7a,0xfd,0x57,0x3c,0xca,0x54,0x18,
+                        0xa9,0xae,0xff,0xcd,0x7c,0x5c,0xed,0xdf,0xc6,0xa7,0x83,0x97,0xb9,0xa8,0x5b,0x49,
+                        0x9d,0xa5,0x58,0x25,0x72,0x67,0xca,0xab,0x2a,0xd0,0xb2,0x3c,0xa4,0x76,0xa5,0x3c,
+                        0xb1,0x7f,0xb4,0x1c,0x4b,0x8b,0x47,0x5c,0xb4,0xf3,0xf7,0x16,0x50,0x94,0xc2,0x29,
+                        0xc9,0xe8,0xc4,0xdc,0x0a,0x2a,0x5f,0xf1,0x90,0x3e,0x50,0x15,0x11,0x22,0x13,0x76,
+                        0xa1,0xcd,0xb8,0x36,0x4c,0x50,0x61,0xa2,0x0c,0xae,0x74,0xbc,0x4a,0xcd,0x76,0xce,
+                        0xb0,0xab,0xc9,0xfd,0x32,0x17,0xef,0x9f,0x8c,0x90,0xbe,0x40,0x2d,0xdf,0x6d,0x86,
+                        0x97,0xf4,0xf8,0x80,0xdf,0xf1,0x5b,0xfb,0x7a,0x6b,0x28,0x24,0x1e,0xc8,0xfe,0x18,
+                        0x3c,0x2d,0x59,0xe3,0xf9,0xdf,0xff,0x65,0x3c,0x71,0x26,0xf0,0xac,0xb9,0xe6,0x42,
+                        0x11,0xf4,0x2b,0xae,0x12,0xaf,0x46,0x2b,0x10,0x70,0xbe,0xf1,0xab,0x5e,0x36,0x06,
+                        0x87,0x2c,0xa1,0x0d,0xee,0x15,0xb3,0x24,0x9b,0x1a,0x1b,0x95,0x8f,0x23,0x13,0x4c,
+                        0x4b,0xcc,0xb7,0xd0,0x32,0x00,0xbc,0xe4,0x20,0xa2,0xf8,0xeb,0x66,0xdc,0xf3,0x64,
+                        0x4d,0x14,0x23,0xc1,0xb5,0x69,0x90,0x03,0xc1,0x3e,0xce,0xf4,0xbf,0x38,0xa3,0xb6,
+                        0x0e,0xed,0xc3,0x40,0x33,0xba,0xc1,0x90,0x27,0x83,0xdc,0x6d,0x89,0xe2,0xe7,0x74,
+                        0x18,0x8a,0x43,0x9c,0x7e,0xbc,0xc0,0x67,0x2d,0xbd,0xa4,0xdd,0xcf,0xb2,0x79,0x46,
+                        0x13,0xb0,0xbe,0x41,0x31,0x5e,0xf7,0x78,0x70,0x8a,0x70,0xee,0x7d,0x75,0x16,0x5c},
+                T20[]= {0x8b,0x30,0x7f,0x6b,0x33,0x28,0x6d,0x0a,0xb0,0x26,0xa9,0xed,0x3f,0xe1,0xe8,0x5f};
+
 #define TEST_CASE(n)    do {                                    \
         u8 out[sizeof(P##n)];                                   \
         AES_set_encrypt_key(K##n,sizeof(K##n)*8,&key);          \
@@ -1713,6 +1854,8 @@ int main()
         TEST_CASE(16);
         TEST_CASE(17);
         TEST_CASE(18);
+        TEST_CASE(19);
+        TEST_CASE(20);
 
 #ifdef OPENSSL_CPUID_OBJ
         {
@@ -1743,11 +1886,16 @@ int main()
                         ctr_t/(double)sizeof(buf),
                         (gcm_t-ctr_t)/(double)sizeof(buf));
 #ifdef GHASH
-        GHASH(&ctx,buf.c,sizeof(buf));
+        {
+        void (*gcm_ghash_p)(u64 Xi[2],const u128 Htable[16],
+                                const u8 *inp,size_t len)       = ctx.ghash;
+
+        GHASH((&ctx),buf.c,sizeof(buf));
         start = OPENSSL_rdtsc();
-        for (i=0;i<100;++i) GHASH(&ctx,buf.c,sizeof(buf));
+        for (i=0;i<100;++i) GHASH((&ctx),buf.c,sizeof(buf));
         gcm_t = OPENSSL_rdtsc() - start;
         printf("%.2f\n",gcm_t/(double)sizeof(buf)/(double)i);
+        }
 #endif
         }
 #endif
diff --git a/src/lib/libcrypto/modes/modes_lcl.h b/src/lib/libcrypto/modes/modes_lcl.h
index b6dc3c336f..9d83e12844 100644
--- a/src/lib/libcrypto/modes/modes_lcl.h
+++ b/src/lib/libcrypto/modes/modes_lcl.h
@@ -29,10 +29,7 @@ typedef unsigned char u8;
 #if defined(__i386)     || defined(__i386__)    || \
     defined(__x86_64)   || defined(__x86_64__)  || \
     defined(_M_IX86)    || defined(_M_AMD64)    || defined(_M_X64) || \
-    defined(__s390__)   || defined(__s390x__)   || \
-    ( (defined(__arm__) || defined(__arm)) && \
-      (defined(__ARM_ARCH_7__)  || defined(__ARM_ARCH_7A__) || \
-       defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__)) )
+    defined(__s390__)   || defined(__s390x__)
 # undef STRICT_ALIGNMENT
 #endif
 
@@ -101,8 +98,8 @@ typedef struct { u64 hi,lo; } u128;
 
 struct gcm128_context {
         /* Following 6 names follow names in GCM specification */
-        union { u64 u[2]; u32 d[4]; u8 c[16]; } Yi,EKi,EK0,len,
-                                                Xi,H;
+        union { u64 u[2]; u32 d[4]; u8 c[16]; size_t t[16/sizeof(size_t)]; }
+          Yi,EKi,EK0,len,Xi,H;
         /* Relative position of Xi, H and pre-computed Htable is used
          * in some assembler modules, i.e. don't change the order! */
 #if TABLE_BITS==8