110 files changed, 1337 insertions, 830 deletions

diff --git a/src/lib/libcrypto/aes/aes_wrap.c b/src/lib/libcrypto/aes/aes_wrap.c
index 9feacd65d8..e2d73d37ce 100644
--- a/src/lib/libcrypto/aes/aes_wrap.c
+++ b/src/lib/libcrypto/aes/aes_wrap.c
@@ -85,9 +85,9 @@ int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
                         A[7] ^= (unsigned char)(t & 0xff);
                         if (t > 0xff)   
                                 {
-                                A[6] ^= (unsigned char)((t & 0xff) >> 8);
-                                A[5] ^= (unsigned char)((t & 0xff) >> 16);
-                                A[4] ^= (unsigned char)((t & 0xff) >> 24);
+                                A[6] ^= (unsigned char)((t >> 8) & 0xff);
+                                A[5] ^= (unsigned char)((t >> 16) & 0xff);
+                                A[4] ^= (unsigned char)((t >> 24) & 0xff);
                                 }
                         memcpy(R, B + 8, 8);
                         }
@@ -119,9 +119,9 @@ int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
                         A[7] ^= (unsigned char)(t & 0xff);
                         if (t > 0xff)   
                                 {
-                                A[6] ^= (unsigned char)((t & 0xff) >> 8);
-                                A[5] ^= (unsigned char)((t & 0xff) >> 16);
-                                A[4] ^= (unsigned char)((t & 0xff) >> 24);
+                                A[6] ^= (unsigned char)((t >> 8) & 0xff);
+                                A[5] ^= (unsigned char)((t >> 16) & 0xff);
+                                A[4] ^= (unsigned char)((t >> 24) & 0xff);
                                 }
                         memcpy(B + 8, R, 8);
                         AES_decrypt(B, B, key);
diff --git a/src/lib/libcrypto/aes/asm/aes-armv4.pl b/src/lib/libcrypto/aes/asm/aes-armv4.pl
index 690244111a..c51ee1fbf6 100644
--- a/src/lib/libcrypto/aes/asm/aes-armv4.pl
+++ b/src/lib/libcrypto/aes/asm/aes-armv4.pl
@@ -16,12 +16,20 @@
 # allows to merge logical or arithmetic operation with shift or rotate
 # in one instruction and emit combined result every cycle. The module
 # is endian-neutral. The performance is ~42 cycles/byte for 128-bit
-# key.
+# key [on single-issue Xscale PXA250 core].
 
 # May 2007.
 #
 # AES_set_[en|de]crypt_key is added.
 
+# July 2010.
+#
+# Rescheduling for dual-issue pipeline resulted in 12% improvement on
+# Cortex A8 core and ~25 cycles per byte processed with 128-bit key.
+
+while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
+open STDOUT,">$output";
+
 $s0="r0";
 $s1="r1";
 $s2="r2";
@@ -164,24 +172,24 @@ AES_encrypt:
         ldrb    $t2,[$rounds,#1]
         ldrb    $t3,[$rounds,#0]
         orr     $s0,$s0,$t1,lsl#8
-        orr     $s0,$s0,$t2,lsl#16
-        orr     $s0,$s0,$t3,lsl#24
         ldrb    $s1,[$rounds,#7]
+        orr     $s0,$s0,$t2,lsl#16
         ldrb    $t1,[$rounds,#6]
+        orr     $s0,$s0,$t3,lsl#24
         ldrb    $t2,[$rounds,#5]
         ldrb    $t3,[$rounds,#4]
         orr     $s1,$s1,$t1,lsl#8
-        orr     $s1,$s1,$t2,lsl#16
-        orr     $s1,$s1,$t3,lsl#24
         ldrb    $s2,[$rounds,#11]
+        orr     $s1,$s1,$t2,lsl#16
         ldrb    $t1,[$rounds,#10]
+        orr     $s1,$s1,$t3,lsl#24
         ldrb    $t2,[$rounds,#9]
         ldrb    $t3,[$rounds,#8]
         orr     $s2,$s2,$t1,lsl#8
-        orr     $s2,$s2,$t2,lsl#16
-        orr     $s2,$s2,$t3,lsl#24
         ldrb    $s3,[$rounds,#15]
+        orr     $s2,$s2,$t2,lsl#16
         ldrb    $t1,[$rounds,#14]
+        orr     $s2,$s2,$t3,lsl#24
         ldrb    $t2,[$rounds,#13]
         ldrb    $t3,[$rounds,#12]
         orr     $s3,$s3,$t1,lsl#8
@@ -196,24 +204,24 @@ AES_encrypt:
         mov     $t3,$s0,lsr#8
         strb    $t1,[$rounds,#0]
         strb    $t2,[$rounds,#1]
-        strb    $t3,[$rounds,#2]
-        strb    $s0,[$rounds,#3]
         mov     $t1,$s1,lsr#24
+        strb    $t3,[$rounds,#2]
         mov     $t2,$s1,lsr#16
+        strb    $s0,[$rounds,#3]
         mov     $t3,$s1,lsr#8
         strb    $t1,[$rounds,#4]
         strb    $t2,[$rounds,#5]
-        strb    $t3,[$rounds,#6]
-        strb    $s1,[$rounds,#7]
         mov     $t1,$s2,lsr#24
+        strb    $t3,[$rounds,#6]
         mov     $t2,$s2,lsr#16
+        strb    $s1,[$rounds,#7]
         mov     $t3,$s2,lsr#8
         strb    $t1,[$rounds,#8]
         strb    $t2,[$rounds,#9]
-        strb    $t3,[$rounds,#10]
-        strb    $s2,[$rounds,#11]
         mov     $t1,$s3,lsr#24
+        strb    $t3,[$rounds,#10]
         mov     $t2,$s3,lsr#16
+        strb    $s2,[$rounds,#11]
         mov     $t3,$s3,lsr#8
         strb    $t1,[$rounds,#12]
         strb    $t2,[$rounds,#13]
@@ -230,141 +238,137 @@ AES_encrypt:
 .align  2
 _armv4_AES_encrypt:
         str     lr,[sp,#-4]!            @ push lr
-        ldr     $t1,[$key],#16
-        ldr     $t2,[$key,#-12]
-        ldr     $t3,[$key,#-8]
-        ldr     $i1,[$key,#-4]
-        ldr     $rounds,[$key,#240-16]
+        ldmia   $key!,{$t1-$i1}
         eor     $s0,$s0,$t1
+        ldr     $rounds,[$key,#240-16]
         eor     $s1,$s1,$t2
         eor     $s2,$s2,$t3
         eor     $s3,$s3,$i1
         sub     $rounds,$rounds,#1
         mov     lr,#255
 
-.Lenc_loop:
+        and     $i1,lr,$s0
         and     $i2,lr,$s0,lsr#8
         and     $i3,lr,$s0,lsr#16
-        and     $i1,lr,$s0
         mov     $s0,$s0,lsr#24
+.Lenc_loop:
         ldr     $t1,[$tbl,$i1,lsl#2]    @ Te3[s0>>0]
-        ldr     $s0,[$tbl,$s0,lsl#2]    @ Te0[s0>>24]
-        ldr     $t2,[$tbl,$i2,lsl#2]    @ Te2[s0>>8]
-        ldr     $t3,[$tbl,$i3,lsl#2]    @ Te1[s0>>16]
-
         and     $i1,lr,$s1,lsr#16       @ i0
+        ldr     $t2,[$tbl,$i2,lsl#2]    @ Te2[s0>>8]
         and     $i2,lr,$s1
+        ldr     $t3,[$tbl,$i3,lsl#2]    @ Te1[s0>>16]
         and     $i3,lr,$s1,lsr#8
+        ldr     $s0,[$tbl,$s0,lsl#2]    @ Te0[s0>>24]
         mov     $s1,$s1,lsr#24
+
         ldr     $i1,[$tbl,$i1,lsl#2]    @ Te1[s1>>16]
-        ldr     $s1,[$tbl,$s1,lsl#2]    @ Te0[s1>>24]
         ldr     $i2,[$tbl,$i2,lsl#2]    @ Te3[s1>>0]
         ldr     $i3,[$tbl,$i3,lsl#2]    @ Te2[s1>>8]
         eor     $s0,$s0,$i1,ror#8
-        eor     $s1,$s1,$t1,ror#24
-        eor     $t2,$t2,$i2,ror#8
-        eor     $t3,$t3,$i3,ror#8
-
+        ldr     $s1,[$tbl,$s1,lsl#2]    @ Te0[s1>>24]
         and     $i1,lr,$s2,lsr#8        @ i0
+        eor     $t2,$t2,$i2,ror#8
         and     $i2,lr,$s2,lsr#16       @ i1
+        eor     $t3,$t3,$i3,ror#8
         and     $i3,lr,$s2
-        mov     $s2,$s2,lsr#24
+        eor     $s1,$s1,$t1,ror#24
         ldr     $i1,[$tbl,$i1,lsl#2]    @ Te2[s2>>8]
+        mov     $s2,$s2,lsr#24
+
         ldr     $i2,[$tbl,$i2,lsl#2]    @ Te1[s2>>16]
-        ldr     $s2,[$tbl,$s2,lsl#2]    @ Te0[s2>>24]
         ldr     $i3,[$tbl,$i3,lsl#2]    @ Te3[s2>>0]
         eor     $s0,$s0,$i1,ror#16
-        eor     $s1,$s1,$i2,ror#8
-        eor     $s2,$s2,$t2,ror#16
-        eor     $t3,$t3,$i3,ror#16
-
+        ldr     $s2,[$tbl,$s2,lsl#2]    @ Te0[s2>>24]
         and     $i1,lr,$s3              @ i0
+        eor     $s1,$s1,$i2,ror#8
         and     $i2,lr,$s3,lsr#8        @ i1
+        eor     $t3,$t3,$i3,ror#16
         and     $i3,lr,$s3,lsr#16       @ i2
-        mov     $s3,$s3,lsr#24
+        eor     $s2,$s2,$t2,ror#16
         ldr     $i1,[$tbl,$i1,lsl#2]    @ Te3[s3>>0]
+        mov     $s3,$s3,lsr#24
+
         ldr     $i2,[$tbl,$i2,lsl#2]    @ Te2[s3>>8]
         ldr     $i3,[$tbl,$i3,lsl#2]    @ Te1[s3>>16]
-        ldr     $s3,[$tbl,$s3,lsl#2]    @ Te0[s3>>24]
         eor     $s0,$s0,$i1,ror#24
+        ldr     $s3,[$tbl,$s3,lsl#2]    @ Te0[s3>>24]
         eor     $s1,$s1,$i2,ror#16
+        ldr     $i1,[$key],#16
         eor     $s2,$s2,$i3,ror#8
+        ldr     $t1,[$key,#-12]
         eor     $s3,$s3,$t3,ror#8
 
-        ldr     $t1,[$key],#16
-        ldr     $t2,[$key,#-12]
-        ldr     $t3,[$key,#-8]
-        ldr     $i1,[$key,#-4]
-        eor     $s0,$s0,$t1
-        eor     $s1,$s1,$t2
-        eor     $s2,$s2,$t3
-        eor     $s3,$s3,$i1
+        ldr     $t2,[$key,#-8]
+        eor     $s0,$s0,$i1
+        ldr     $t3,[$key,#-4]
+        and     $i1,lr,$s0
+        eor     $s1,$s1,$t1
+        and     $i2,lr,$s0,lsr#8
+        eor     $s2,$s2,$t2
+        and     $i3,lr,$s0,lsr#16
+        eor     $s3,$s3,$t3
+        mov     $s0,$s0,lsr#24
 
         subs    $rounds,$rounds,#1
         bne     .Lenc_loop
 
         add     $tbl,$tbl,#2
 
-        and     $i1,lr,$s0
-        and     $i2,lr,$s0,lsr#8
-        and     $i3,lr,$s0,lsr#16
-        mov     $s0,$s0,lsr#24
         ldrb    $t1,[$tbl,$i1,lsl#2]    @ Te4[s0>>0]
-        ldrb    $s0,[$tbl,$s0,lsl#2]    @ Te4[s0>>24]
-        ldrb    $t2,[$tbl,$i2,lsl#2]    @ Te4[s0>>8]
-        ldrb    $t3,[$tbl,$i3,lsl#2]    @ Te4[s0>>16]
-
         and     $i1,lr,$s1,lsr#16       @ i0
+        ldrb    $t2,[$tbl,$i2,lsl#2]    @ Te4[s0>>8]
         and     $i2,lr,$s1
+        ldrb    $t3,[$tbl,$i3,lsl#2]    @ Te4[s0>>16]
         and     $i3,lr,$s1,lsr#8
+        ldrb    $s0,[$tbl,$s0,lsl#2]    @ Te4[s0>>24]
         mov     $s1,$s1,lsr#24
+
         ldrb    $i1,[$tbl,$i1,lsl#2]    @ Te4[s1>>16]
-        ldrb    $s1,[$tbl,$s1,lsl#2]    @ Te4[s1>>24]
         ldrb    $i2,[$tbl,$i2,lsl#2]    @ Te4[s1>>0]
         ldrb    $i3,[$tbl,$i3,lsl#2]    @ Te4[s1>>8]
         eor     $s0,$i1,$s0,lsl#8
-        eor     $s1,$t1,$s1,lsl#24
-        eor     $t2,$i2,$t2,lsl#8
-        eor     $t3,$i3,$t3,lsl#8
-
+        ldrb    $s1,[$tbl,$s1,lsl#2]    @ Te4[s1>>24]
         and     $i1,lr,$s2,lsr#8        @ i0
+        eor     $t2,$i2,$t2,lsl#8
         and     $i2,lr,$s2,lsr#16       @ i1
+        eor     $t3,$i3,$t3,lsl#8
         and     $i3,lr,$s2
-        mov     $s2,$s2,lsr#24
+        eor     $s1,$t1,$s1,lsl#24
         ldrb    $i1,[$tbl,$i1,lsl#2]    @ Te4[s2>>8]
+        mov     $s2,$s2,lsr#24
+
         ldrb    $i2,[$tbl,$i2,lsl#2]    @ Te4[s2>>16]
-        ldrb    $s2,[$tbl,$s2,lsl#2]    @ Te4[s2>>24]
         ldrb    $i3,[$tbl,$i3,lsl#2]    @ Te4[s2>>0]
         eor     $s0,$i1,$s0,lsl#8
-        eor     $s1,$s1,$i2,lsl#16
-        eor     $s2,$t2,$s2,lsl#24
-        eor     $t3,$i3,$t3,lsl#8
-
+        ldrb    $s2,[$tbl,$s2,lsl#2]    @ Te4[s2>>24]
         and     $i1,lr,$s3              @ i0
+        eor     $s1,$s1,$i2,lsl#16
         and     $i2,lr,$s3,lsr#8        @ i1
+        eor     $t3,$i3,$t3,lsl#8
         and     $i3,lr,$s3,lsr#16       @ i2
-        mov     $s3,$s3,lsr#24
+        eor     $s2,$t2,$s2,lsl#24
         ldrb    $i1,[$tbl,$i1,lsl#2]    @ Te4[s3>>0]
+        mov     $s3,$s3,lsr#24
+
         ldrb    $i2,[$tbl,$i2,lsl#2]    @ Te4[s3>>8]
         ldrb    $i3,[$tbl,$i3,lsl#2]    @ Te4[s3>>16]
-        ldrb    $s3,[$tbl,$s3,lsl#2]    @ Te4[s3>>24]
         eor     $s0,$i1,$s0,lsl#8
+        ldrb    $s3,[$tbl,$s3,lsl#2]    @ Te4[s3>>24]
+        ldr     $i1,[$key,#0]
         eor     $s1,$s1,$i2,lsl#8
+        ldr     $t1,[$key,#4]
         eor     $s2,$s2,$i3,lsl#16
+        ldr     $t2,[$key,#8]
         eor     $s3,$t3,$s3,lsl#24
+        ldr     $t3,[$key,#12]
 
-        ldr     lr,[sp],#4              @ pop lr
-        ldr     $t1,[$key,#0]
-        ldr     $t2,[$key,#4]
-        ldr     $t3,[$key,#8]
-        ldr     $i1,[$key,#12]
-        eor     $s0,$s0,$t1
-        eor     $s1,$s1,$t2
-        eor     $s2,$s2,$t3
-        eor     $s3,$s3,$i1
+        eor     $s0,$s0,$i1
+        eor     $s1,$s1,$t1
+        eor     $s2,$s2,$t2
+        eor     $s3,$s3,$t3
 
         sub     $tbl,$tbl,#2
-        mov     pc,lr                   @ return
+        ldr     pc,[sp],#4              @ pop and return
 .size   _armv4_AES_encrypt,.-_armv4_AES_encrypt
 
 .global AES_set_encrypt_key
@@ -399,31 +403,31 @@ AES_set_encrypt_key:
         ldrb    $t2,[$rounds,#1]
         ldrb    $t3,[$rounds,#0]
         orr     $s0,$s0,$t1,lsl#8
-        orr     $s0,$s0,$t2,lsl#16
-        orr     $s0,$s0,$t3,lsl#24
         ldrb    $s1,[$rounds,#7]
+        orr     $s0,$s0,$t2,lsl#16
         ldrb    $t1,[$rounds,#6]
+        orr     $s0,$s0,$t3,lsl#24
         ldrb    $t2,[$rounds,#5]
         ldrb    $t3,[$rounds,#4]
         orr     $s1,$s1,$t1,lsl#8
-        orr     $s1,$s1,$t2,lsl#16
-        orr     $s1,$s1,$t3,lsl#24
         ldrb    $s2,[$rounds,#11]
+        orr     $s1,$s1,$t2,lsl#16
         ldrb    $t1,[$rounds,#10]
+        orr     $s1,$s1,$t3,lsl#24
         ldrb    $t2,[$rounds,#9]
         ldrb    $t3,[$rounds,#8]
         orr     $s2,$s2,$t1,lsl#8
-        orr     $s2,$s2,$t2,lsl#16
-        orr     $s2,$s2,$t3,lsl#24
         ldrb    $s3,[$rounds,#15]
+        orr     $s2,$s2,$t2,lsl#16
         ldrb    $t1,[$rounds,#14]
+        orr     $s2,$s2,$t3,lsl#24
         ldrb    $t2,[$rounds,#13]
         ldrb    $t3,[$rounds,#12]
         orr     $s3,$s3,$t1,lsl#8
-        orr     $s3,$s3,$t2,lsl#16
-        orr     $s3,$s3,$t3,lsl#24
         str     $s0,[$key],#16
+        orr     $s3,$s3,$t2,lsl#16
         str     $s1,[$key,#-12]
+        orr     $s3,$s3,$t3,lsl#24
         str     $s2,[$key,#-8]
         str     $s3,[$key,#-4]
 
@@ -437,27 +441,26 @@ AES_set_encrypt_key:
 .L128_loop:
         and     $t2,lr,$s3,lsr#24
         and     $i1,lr,$s3,lsr#16
-        and     $i2,lr,$s3,lsr#8
-        and     $i3,lr,$s3
         ldrb    $t2,[$tbl,$t2]
+        and     $i2,lr,$s3,lsr#8
         ldrb    $i1,[$tbl,$i1]
+        and     $i3,lr,$s3
         ldrb    $i2,[$tbl,$i2]
-        ldrb    $i3,[$tbl,$i3]
-        ldr     $t1,[$t3],#4                    @ rcon[i++]
         orr     $t2,$t2,$i1,lsl#24
+        ldrb    $i3,[$tbl,$i3]
         orr     $t2,$t2,$i2,lsl#16
+        ldr     $t1,[$t3],#4                    @ rcon[i++]
         orr     $t2,$t2,$i3,lsl#8
         eor     $t2,$t2,$t1
         eor     $s0,$s0,$t2                     @ rk[4]=rk[0]^...
         eor     $s1,$s1,$s0                     @ rk[5]=rk[1]^rk[4]
-        eor     $s2,$s2,$s1                     @ rk[6]=rk[2]^rk[5]
-        eor     $s3,$s3,$s2                     @ rk[7]=rk[3]^rk[6]
         str     $s0,[$key],#16
+        eor     $s2,$s2,$s1                     @ rk[6]=rk[2]^rk[5]
         str     $s1,[$key,#-12]
+        eor     $s3,$s3,$s2                     @ rk[7]=rk[3]^rk[6]
         str     $s2,[$key,#-8]
-        str     $s3,[$key,#-4]
-
         subs    $rounds,$rounds,#1
+        str     $s3,[$key,#-4]
         bne     .L128_loop
         sub     r2,$key,#176
         b       .Ldone
@@ -468,16 +471,16 @@ AES_set_encrypt_key:
         ldrb    $t2,[$rounds,#17]
         ldrb    $t3,[$rounds,#16]
         orr     $i2,$i2,$t1,lsl#8
-        orr     $i2,$i2,$t2,lsl#16
-        orr     $i2,$i2,$t3,lsl#24
         ldrb    $i3,[$rounds,#23]
+        orr     $i2,$i2,$t2,lsl#16
         ldrb    $t1,[$rounds,#22]
+        orr     $i2,$i2,$t3,lsl#24
         ldrb    $t2,[$rounds,#21]
         ldrb    $t3,[$rounds,#20]
         orr     $i3,$i3,$t1,lsl#8
         orr     $i3,$i3,$t2,lsl#16
-        orr     $i3,$i3,$t3,lsl#24
         str     $i2,[$key],#8
+        orr     $i3,$i3,$t3,lsl#24
         str     $i3,[$key,#-4]
 
         teq     lr,#192
@@ -491,27 +494,26 @@ AES_set_encrypt_key:
 .L192_loop:
         and     $t2,lr,$i3,lsr#24
         and     $i1,lr,$i3,lsr#16
-        and     $i2,lr,$i3,lsr#8
-        and     $i3,lr,$i3
         ldrb    $t2,[$tbl,$t2]
+        and     $i2,lr,$i3,lsr#8
         ldrb    $i1,[$tbl,$i1]
+        and     $i3,lr,$i3
         ldrb    $i2,[$tbl,$i2]
-        ldrb    $i3,[$tbl,$i3]
-        ldr     $t1,[$t3],#4                    @ rcon[i++]
         orr     $t2,$t2,$i1,lsl#24
+        ldrb    $i3,[$tbl,$i3]
         orr     $t2,$t2,$i2,lsl#16
+        ldr     $t1,[$t3],#4                    @ rcon[i++]
         orr     $t2,$t2,$i3,lsl#8
         eor     $i3,$t2,$t1
         eor     $s0,$s0,$i3                     @ rk[6]=rk[0]^...
         eor     $s1,$s1,$s0                     @ rk[7]=rk[1]^rk[6]
-        eor     $s2,$s2,$s1                     @ rk[8]=rk[2]^rk[7]
-        eor     $s3,$s3,$s2                     @ rk[9]=rk[3]^rk[8]
         str     $s0,[$key],#24
+        eor     $s2,$s2,$s1                     @ rk[8]=rk[2]^rk[7]
         str     $s1,[$key,#-20]
+        eor     $s3,$s3,$s2                     @ rk[9]=rk[3]^rk[8]
         str     $s2,[$key,#-16]
-        str     $s3,[$key,#-12]
-
         subs    $rounds,$rounds,#1
+        str     $s3,[$key,#-12]
         subeq   r2,$key,#216
         beq     .Ldone
 
@@ -529,16 +531,16 @@ AES_set_encrypt_key:
         ldrb    $t2,[$rounds,#25]
         ldrb    $t3,[$rounds,#24]
         orr     $i2,$i2,$t1,lsl#8
-        orr     $i2,$i2,$t2,lsl#16
-        orr     $i2,$i2,$t3,lsl#24
         ldrb    $i3,[$rounds,#31]
+        orr     $i2,$i2,$t2,lsl#16
         ldrb    $t1,[$rounds,#30]
+        orr     $i2,$i2,$t3,lsl#24
         ldrb    $t2,[$rounds,#29]
         ldrb    $t3,[$rounds,#28]
         orr     $i3,$i3,$t1,lsl#8
         orr     $i3,$i3,$t2,lsl#16
-        orr     $i3,$i3,$t3,lsl#24
         str     $i2,[$key],#8
+        orr     $i3,$i3,$t3,lsl#24
         str     $i3,[$key,#-4]
 
         mov     $rounds,#14
@@ -550,52 +552,51 @@ AES_set_encrypt_key:
 .L256_loop:
         and     $t2,lr,$i3,lsr#24
         and     $i1,lr,$i3,lsr#16
-        and     $i2,lr,$i3,lsr#8
-        and     $i3,lr,$i3
         ldrb    $t2,[$tbl,$t2]
+        and     $i2,lr,$i3,lsr#8
         ldrb    $i1,[$tbl,$i1]
+        and     $i3,lr,$i3
         ldrb    $i2,[$tbl,$i2]
-        ldrb    $i3,[$tbl,$i3]
-        ldr     $t1,[$t3],#4                    @ rcon[i++]
         orr     $t2,$t2,$i1,lsl#24
+        ldrb    $i3,[$tbl,$i3]
         orr     $t2,$t2,$i2,lsl#16
+        ldr     $t1,[$t3],#4                    @ rcon[i++]
         orr     $t2,$t2,$i3,lsl#8
         eor     $i3,$t2,$t1
         eor     $s0,$s0,$i3                     @ rk[8]=rk[0]^...
         eor     $s1,$s1,$s0                     @ rk[9]=rk[1]^rk[8]
-        eor     $s2,$s2,$s1                     @ rk[10]=rk[2]^rk[9]
-        eor     $s3,$s3,$s2                     @ rk[11]=rk[3]^rk[10]
         str     $s0,[$key],#32
+        eor     $s2,$s2,$s1                     @ rk[10]=rk[2]^rk[9]
         str     $s1,[$key,#-28]
+        eor     $s3,$s3,$s2                     @ rk[11]=rk[3]^rk[10]
         str     $s2,[$key,#-24]
-        str     $s3,[$key,#-20]
-
         subs    $rounds,$rounds,#1
+        str     $s3,[$key,#-20]
         subeq   r2,$key,#256
         beq     .Ldone
 
         and     $t2,lr,$s3
         and     $i1,lr,$s3,lsr#8
-        and     $i2,lr,$s3,lsr#16
-        and     $i3,lr,$s3,lsr#24
         ldrb    $t2,[$tbl,$t2]
+        and     $i2,lr,$s3,lsr#16
         ldrb    $i1,[$tbl,$i1]
+        and     $i3,lr,$s3,lsr#24
         ldrb    $i2,[$tbl,$i2]
-        ldrb    $i3,[$tbl,$i3]
         orr     $t2,$t2,$i1,lsl#8
+        ldrb    $i3,[$tbl,$i3]
         orr     $t2,$t2,$i2,lsl#16
+        ldr     $t1,[$key,#-48]
         orr     $t2,$t2,$i3,lsl#24
 
-        ldr     $t1,[$key,#-48]
         ldr     $i1,[$key,#-44]
         ldr     $i2,[$key,#-40]
-        ldr     $i3,[$key,#-36]
         eor     $t1,$t1,$t2                     @ rk[12]=rk[4]^...
+        ldr     $i3,[$key,#-36]
         eor     $i1,$i1,$t1                     @ rk[13]=rk[5]^rk[12]
-        eor     $i2,$i2,$i1                     @ rk[14]=rk[6]^rk[13]
-        eor     $i3,$i3,$i2                     @ rk[15]=rk[7]^rk[14]
         str     $t1,[$key,#-16]
+        eor     $i2,$i2,$i1                     @ rk[14]=rk[6]^rk[13]
         str     $i1,[$key,#-12]
+        eor     $i3,$i3,$i2                     @ rk[15]=rk[7]^rk[14]
         str     $i2,[$key,#-8]
         str     $i3,[$key,#-4]
         b       .L256_loop
@@ -816,24 +817,24 @@ AES_decrypt:
         ldrb    $t2,[$rounds,#1]
         ldrb    $t3,[$rounds,#0]
         orr     $s0,$s0,$t1,lsl#8
-        orr     $s0,$s0,$t2,lsl#16
-        orr     $s0,$s0,$t3,lsl#24
         ldrb    $s1,[$rounds,#7]
+        orr     $s0,$s0,$t2,lsl#16
         ldrb    $t1,[$rounds,#6]
+        orr     $s0,$s0,$t3,lsl#24
         ldrb    $t2,[$rounds,#5]
         ldrb    $t3,[$rounds,#4]
         orr     $s1,$s1,$t1,lsl#8
-        orr     $s1,$s1,$t2,lsl#16
-        orr     $s1,$s1,$t3,lsl#24
         ldrb    $s2,[$rounds,#11]
+        orr     $s1,$s1,$t2,lsl#16
         ldrb    $t1,[$rounds,#10]
+        orr     $s1,$s1,$t3,lsl#24
         ldrb    $t2,[$rounds,#9]
         ldrb    $t3,[$rounds,#8]
         orr     $s2,$s2,$t1,lsl#8
-        orr     $s2,$s2,$t2,lsl#16
-        orr     $s2,$s2,$t3,lsl#24
         ldrb    $s3,[$rounds,#15]
+        orr     $s2,$s2,$t2,lsl#16
         ldrb    $t1,[$rounds,#14]
+        orr     $s2,$s2,$t3,lsl#24
         ldrb    $t2,[$rounds,#13]
         ldrb    $t3,[$rounds,#12]
         orr     $s3,$s3,$t1,lsl#8
@@ -848,24 +849,24 @@ AES_decrypt:
         mov     $t3,$s0,lsr#8
         strb    $t1,[$rounds,#0]
         strb    $t2,[$rounds,#1]
-        strb    $t3,[$rounds,#2]
-        strb    $s0,[$rounds,#3]
         mov     $t1,$s1,lsr#24
+        strb    $t3,[$rounds,#2]
         mov     $t2,$s1,lsr#16
+        strb    $s0,[$rounds,#3]
         mov     $t3,$s1,lsr#8
         strb    $t1,[$rounds,#4]
         strb    $t2,[$rounds,#5]
-        strb    $t3,[$rounds,#6]
-        strb    $s1,[$rounds,#7]
         mov     $t1,$s2,lsr#24
+        strb    $t3,[$rounds,#6]
         mov     $t2,$s2,lsr#16
+        strb    $s1,[$rounds,#7]
         mov     $t3,$s2,lsr#8
         strb    $t1,[$rounds,#8]
         strb    $t2,[$rounds,#9]
-        strb    $t3,[$rounds,#10]
-        strb    $s2,[$rounds,#11]
         mov     $t1,$s3,lsr#24
+        strb    $t3,[$rounds,#10]
         mov     $t2,$s3,lsr#16
+        strb    $s2,[$rounds,#11]
         mov     $t3,$s3,lsr#8
         strb    $t1,[$rounds,#12]
         strb    $t2,[$rounds,#13]
@@ -882,146 +883,143 @@ AES_decrypt:
 .align  2
 _armv4_AES_decrypt:
         str     lr,[sp,#-4]!            @ push lr
-        ldr     $t1,[$key],#16
-        ldr     $t2,[$key,#-12]
-        ldr     $t3,[$key,#-8]
-        ldr     $i1,[$key,#-4]
-        ldr     $rounds,[$key,#240-16]
+        ldmia   $key!,{$t1-$i1}
         eor     $s0,$s0,$t1
+        ldr     $rounds,[$key,#240-16]
         eor     $s1,$s1,$t2
         eor     $s2,$s2,$t3
         eor     $s3,$s3,$i1
         sub     $rounds,$rounds,#1
         mov     lr,#255
 
-.Ldec_loop:
         and     $i1,lr,$s0,lsr#16
         and     $i2,lr,$s0,lsr#8
         and     $i3,lr,$s0
         mov     $s0,$s0,lsr#24
+.Ldec_loop:
         ldr     $t1,[$tbl,$i1,lsl#2]    @ Td1[s0>>16]
-        ldr     $s0,[$tbl,$s0,lsl#2]    @ Td0[s0>>24]
-        ldr     $t2,[$tbl,$i2,lsl#2]    @ Td2[s0>>8]
-        ldr     $t3,[$tbl,$i3,lsl#2]    @ Td3[s0>>0]
-
         and     $i1,lr,$s1              @ i0
+        ldr     $t2,[$tbl,$i2,lsl#2]    @ Td2[s0>>8]
         and     $i2,lr,$s1,lsr#16
+        ldr     $t3,[$tbl,$i3,lsl#2]    @ Td3[s0>>0]
         and     $i3,lr,$s1,lsr#8
+        ldr     $s0,[$tbl,$s0,lsl#2]    @ Td0[s0>>24]
         mov     $s1,$s1,lsr#24
+
         ldr     $i1,[$tbl,$i1,lsl#2]    @ Td3[s1>>0]
-        ldr     $s1,[$tbl,$s1,lsl#2]    @ Td0[s1>>24]
         ldr     $i2,[$tbl,$i2,lsl#2]    @ Td1[s1>>16]
         ldr     $i3,[$tbl,$i3,lsl#2]    @ Td2[s1>>8]
         eor     $s0,$s0,$i1,ror#24
-        eor     $s1,$s1,$t1,ror#8
-        eor     $t2,$i2,$t2,ror#8
-        eor     $t3,$i3,$t3,ror#8
-
+        ldr     $s1,[$tbl,$s1,lsl#2]    @ Td0[s1>>24]
         and     $i1,lr,$s2,lsr#8        @ i0
+        eor     $t2,$i2,$t2,ror#8
         and     $i2,lr,$s2              @ i1
+        eor     $t3,$i3,$t3,ror#8
         and     $i3,lr,$s2,lsr#16
-        mov     $s2,$s2,lsr#24
+        eor     $s1,$s1,$t1,ror#8
         ldr     $i1,[$tbl,$i1,lsl#2]    @ Td2[s2>>8]
+        mov     $s2,$s2,lsr#24
+
         ldr     $i2,[$tbl,$i2,lsl#2]    @ Td3[s2>>0]
-        ldr     $s2,[$tbl,$s2,lsl#2]    @ Td0[s2>>24]
         ldr     $i3,[$tbl,$i3,lsl#2]    @ Td1[s2>>16]
         eor     $s0,$s0,$i1,ror#16
-        eor     $s1,$s1,$i2,ror#24
-        eor     $s2,$s2,$t2,ror#8
-        eor     $t3,$i3,$t3,ror#8
-
+        ldr     $s2,[$tbl,$s2,lsl#2]    @ Td0[s2>>24]
         and     $i1,lr,$s3,lsr#16       @ i0
+        eor     $s1,$s1,$i2,ror#24
         and     $i2,lr,$s3,lsr#8        @ i1
+        eor     $t3,$i3,$t3,ror#8
         and     $i3,lr,$s3              @ i2
-        mov     $s3,$s3,lsr#24
+        eor     $s2,$s2,$t2,ror#8
         ldr     $i1,[$tbl,$i1,lsl#2]    @ Td1[s3>>16]
+        mov     $s3,$s3,lsr#24
+
         ldr     $i2,[$tbl,$i2,lsl#2]    @ Td2[s3>>8]
         ldr     $i3,[$tbl,$i3,lsl#2]    @ Td3[s3>>0]
-        ldr     $s3,[$tbl,$s3,lsl#2]    @ Td0[s3>>24]
         eor     $s0,$s0,$i1,ror#8
+        ldr     $s3,[$tbl,$s3,lsl#2]    @ Td0[s3>>24]
         eor     $s1,$s1,$i2,ror#16
         eor     $s2,$s2,$i3,ror#24
+        ldr     $i1,[$key],#16
         eor     $s3,$s3,$t3,ror#8
 
-        ldr     $t1,[$key],#16
-        ldr     $t2,[$key,#-12]
-        ldr     $t3,[$key,#-8]
-        ldr     $i1,[$key,#-4]
-        eor     $s0,$s0,$t1
-        eor     $s1,$s1,$t2
-        eor     $s2,$s2,$t3
-        eor     $s3,$s3,$i1
+        ldr     $t1,[$key,#-12]
+        ldr     $t2,[$key,#-8]
+        eor     $s0,$s0,$i1
+        ldr     $t3,[$key,#-4]
+        and     $i1,lr,$s0,lsr#16
+        eor     $s1,$s1,$t1
+        and     $i2,lr,$s0,lsr#8
+        eor     $s2,$s2,$t2
+        and     $i3,lr,$s0
+        eor     $s3,$s3,$t3
+        mov     $s0,$s0,lsr#24
 
         subs    $rounds,$rounds,#1
         bne     .Ldec_loop
 
         add     $tbl,$tbl,#1024
 
-        ldr     $t1,[$tbl,#0]           @ prefetch Td4
-        ldr     $t2,[$tbl,#32]
-        ldr     $t3,[$tbl,#64]
-        ldr     $i1,[$tbl,#96]
-        ldr     $i2,[$tbl,#128]
-        ldr     $i3,[$tbl,#160]
-        ldr     $t1,[$tbl,#192]
-        ldr     $t2,[$tbl,#224]
+        ldr     $t2,[$tbl,#0]           @ prefetch Td4
+        ldr     $t3,[$tbl,#32]
+        ldr     $t1,[$tbl,#64]
+        ldr     $t2,[$tbl,#96]
+        ldr     $t3,[$tbl,#128]
+        ldr     $t1,[$tbl,#160]
+        ldr     $t2,[$tbl,#192]
+        ldr     $t3,[$tbl,#224]
 
-        and     $i1,lr,$s0,lsr#16
-        and     $i2,lr,$s0,lsr#8
-        and     $i3,lr,$s0
-        ldrb    $s0,[$tbl,$s0,lsr#24]   @ Td4[s0>>24]
+        ldrb    $s0,[$tbl,$s0]          @ Td4[s0>>24]
         ldrb    $t1,[$tbl,$i1]          @ Td4[s0>>16]
-        ldrb    $t2,[$tbl,$i2]          @ Td4[s0>>8]
-        ldrb    $t3,[$tbl,$i3]          @ Td4[s0>>0]
-
         and     $i1,lr,$s1              @ i0
+        ldrb    $t2,[$tbl,$i2]          @ Td4[s0>>8]
         and     $i2,lr,$s1,lsr#16
+        ldrb    $t3,[$tbl,$i3]          @ Td4[s0>>0]
         and     $i3,lr,$s1,lsr#8
+
         ldrb    $i1,[$tbl,$i1]          @ Td4[s1>>0]
         ldrb    $s1,[$tbl,$s1,lsr#24]   @ Td4[s1>>24]
         ldrb    $i2,[$tbl,$i2]          @ Td4[s1>>16]
-        ldrb    $i3,[$tbl,$i3]          @ Td4[s1>>8]
         eor     $s0,$i1,$s0,lsl#24
+        ldrb    $i3,[$tbl,$i3]          @ Td4[s1>>8]
         eor     $s1,$t1,$s1,lsl#8
-        eor     $t2,$t2,$i2,lsl#8
-        eor     $t3,$t3,$i3,lsl#8
-
         and     $i1,lr,$s2,lsr#8        @ i0
+        eor     $t2,$t2,$i2,lsl#8
         and     $i2,lr,$s2              @ i1
-        and     $i3,lr,$s2,lsr#16
+        eor     $t3,$t3,$i3,lsl#8
         ldrb    $i1,[$tbl,$i1]          @ Td4[s2>>8]
+        and     $i3,lr,$s2,lsr#16
+
         ldrb    $i2,[$tbl,$i2]          @ Td4[s2>>0]
         ldrb    $s2,[$tbl,$s2,lsr#24]   @ Td4[s2>>24]
-        ldrb    $i3,[$tbl,$i3]          @ Td4[s2>>16]
         eor     $s0,$s0,$i1,lsl#8
+        ldrb    $i3,[$tbl,$i3]          @ Td4[s2>>16]
         eor     $s1,$i2,$s1,lsl#16
-        eor     $s2,$t2,$s2,lsl#16
-        eor     $t3,$t3,$i3,lsl#16
-
         and     $i1,lr,$s3,lsr#16       @ i0
+        eor     $s2,$t2,$s2,lsl#16
         and     $i2,lr,$s3,lsr#8        @ i1
-        and     $i3,lr,$s3              @ i2
+        eor     $t3,$t3,$i3,lsl#16
         ldrb    $i1,[$tbl,$i1]          @ Td4[s3>>16]
+        and     $i3,lr,$s3              @ i2
+
         ldrb    $i2,[$tbl,$i2]          @ Td4[s3>>8]
         ldrb    $i3,[$tbl,$i3]          @ Td4[s3>>0]
         ldrb    $s3,[$tbl,$s3,lsr#24]   @ Td4[s3>>24]
         eor     $s0,$s0,$i1,lsl#16
+        ldr     $i1,[$key,#0]
         eor     $s1,$s1,$i2,lsl#8
+        ldr     $t1,[$key,#4]
         eor     $s2,$i3,$s2,lsl#8
+        ldr     $t2,[$key,#8]
         eor     $s3,$t3,$s3,lsl#24
+        ldr     $t3,[$key,#12]
 
-        ldr     lr,[sp],#4              @ pop lr
-        ldr     $t1,[$key,#0]
-        ldr     $t2,[$key,#4]
-        ldr     $t3,[$key,#8]
-        ldr     $i1,[$key,#12]
-        eor     $s0,$s0,$t1
-        eor     $s1,$s1,$t2
-        eor     $s2,$s2,$t3
-        eor     $s3,$s3,$i1
+        eor     $s0,$s0,$i1
+        eor     $s1,$s1,$t1
+        eor     $s2,$s2,$t2
+        eor     $s3,$s3,$t3
 
         sub     $tbl,$tbl,#1024
-        mov     pc,lr                   @ return
+        ldr     pc,[sp],#4              @ pop and return
 .size   _armv4_AES_decrypt,.-_armv4_AES_decrypt
 .asciz  "AES for ARMv4, CRYPTOGAMS by <appro\@openssl.org>"
 .align  2
@@ -1029,3 +1027,4 @@ ___
 
 $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm;    # make it possible to compile with -march=armv4
 print $code;
+close STDOUT;   # enforce flush
diff --git a/src/lib/libcrypto/alphacpuid.pl b/src/lib/libcrypto/alphacpuid.pl
new file mode 100644
index 0000000000..4b3cbb9827
--- /dev/null
+++ b/src/lib/libcrypto/alphacpuid.pl
@@ -0,0 +1,126 @@
+#!/usr/bin/env perl
+print <<'___';
+.text
+
+.set    noat
+
+.globl  OPENSSL_cpuid_setup
+.ent    OPENSSL_cpuid_setup
+OPENSSL_cpuid_setup:
+        .frame  $30,0,$26
+        .prologue 0
+        ret     ($26)
+.end    OPENSSL_cpuid_setup
+
+.globl  OPENSSL_wipe_cpu
+.ent    OPENSSL_wipe_cpu
+OPENSSL_wipe_cpu:
+        .frame  $30,0,$26
+        .prologue 0
+        clr     $1
+        clr     $2
+        clr     $3
+        clr     $4
+        clr     $5
+        clr     $6
+        clr     $7
+        clr     $8
+        clr     $16
+        clr     $17
+        clr     $18
+        clr     $19
+        clr     $20
+        clr     $21
+        clr     $22
+        clr     $23
+        clr     $24
+        clr     $25
+        clr     $27
+        clr     $at
+        clr     $29
+        fclr    $f0
+        fclr    $f1
+        fclr    $f10
+        fclr    $f11
+        fclr    $f12
+        fclr    $f13
+        fclr    $f14
+        fclr    $f15
+        fclr    $f16
+        fclr    $f17
+        fclr    $f18
+        fclr    $f19
+        fclr    $f20
+        fclr    $f21
+        fclr    $f22
+        fclr    $f23
+        fclr    $f24
+        fclr    $f25
+        fclr    $f26
+        fclr    $f27
+        fclr    $f28
+        fclr    $f29
+        fclr    $f30
+        mov     $sp,$0
+        ret     ($26)
+.end    OPENSSL_wipe_cpu
+
+.globl  OPENSSL_atomic_add
+.ent    OPENSSL_atomic_add
+OPENSSL_atomic_add:
+        .frame  $30,0,$26
+        .prologue 0
+1:      ldl_l   $0,0($16)
+        addl    $0,$17,$1
+        stl_c   $1,0($16)
+        beq     $1,1b
+        addl    $0,$17,$0
+        ret     ($26)
+.end    OPENSSL_atomic_add
+
+.globl  OPENSSL_rdtsc
+.ent    OPENSSL_rdtsc
+OPENSSL_rdtsc:
+        .frame  $30,0,$26
+        .prologue 0
+        rpcc    $0
+        ret     ($26)
+.end    OPENSSL_rdtsc
+
+.globl  OPENSSL_cleanse
+.ent    OPENSSL_cleanse
+OPENSSL_cleanse:
+        .frame  $30,0,$26
+        .prologue 0
+        beq     $17,.Ldone
+        and     $16,7,$0
+        bic     $17,7,$at
+        beq     $at,.Little
+        beq     $0,.Laligned
+
+.Little:
+        subq    $0,8,$0
+        ldq_u   $1,0($16)
+        mov     $16,$2
+.Lalign:
+        mskbl   $1,$16,$1
+        lda     $16,1($16)
+        subq    $17,1,$17
+        addq    $0,1,$0
+        beq     $17,.Lout
+        bne     $0,.Lalign
+.Lout:  stq_u   $1,0($2)
+        beq     $17,.Ldone
+        bic     $17,7,$at
+        beq     $at,.Little
+
+.Laligned:
+        stq     $31,0($16)
+        subq    $17,8,$17
+        lda     $16,8($16)
+        bic     $17,7,$at
+        bne     $at,.Laligned
+        bne     $17,.Little
+.Ldone: ret     ($26)
+.end    OPENSSL_cleanse
+___
diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c
index c6fd204ae3..3348b8762c 100644
--- a/src/lib/libcrypto/asn1/a_int.c
+++ b/src/lib/libcrypto/asn1/a_int.c
@@ -273,7 +273,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
         {
         ASN1_INTEGER *ret=NULL;
         const unsigned char *p;
-        unsigned char *to,*s;
+        unsigned char *s;
         long len;
         int inf,tag,xclass;
         int i;
@@ -308,7 +308,6 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
                 i=ERR_R_MALLOC_FAILURE;
                 goto err;
                 }
-        to=s;
         ret->type=V_ASN1_INTEGER;
         if(len) {
                 if ((*p == 0) && (len != 1))
diff --git a/src/lib/libcrypto/asn1/a_object.c b/src/lib/libcrypto/asn1/a_object.c
index e5fbe7cbb1..3978c9150d 100644
--- a/src/lib/libcrypto/asn1/a_object.c
+++ b/src/lib/libcrypto/asn1/a_object.c
@@ -139,7 +139,7 @@ int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num)
                                 ASN1err(ASN1_F_A2D_ASN1_OBJECT,ASN1_R_INVALID_DIGIT);
                                 goto err;
                                 }
-                        if (!use_bn && l > (ULONG_MAX / 10L))
+                        if (!use_bn && l >= ((ULONG_MAX - 80) / 10L))
                                 {
                                 use_bn = 1;
                                 if (!bl)
@@ -293,7 +293,7 @@ ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
         /* Sanity check OID encoding: can't have leading 0x80 in
          * subidentifiers, see: X.690 8.19.2
          */
-        for (i = 0, p = *pp + 1; i < len - 1; i++, p++)
+        for (i = 0, p = *pp; i < len; i++, p++)
                 {
                 if (*p == 0x80 && (!i || !(p[-1] & 0x80)))
                         {
diff --git a/src/lib/libcrypto/asn1/a_strex.c b/src/lib/libcrypto/asn1/a_strex.c
index 7fc14d3296..264ebf2393 100644
--- a/src/lib/libcrypto/asn1/a_strex.c
+++ b/src/lib/libcrypto/asn1/a_strex.c
@@ -74,6 +74,11 @@
 
 #define CHARTYPE_BS_ESC         (ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)
 
+#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \
+                  ASN1_STRFLGS_ESC_QUOTE | \
+                  ASN1_STRFLGS_ESC_CTRL | \
+                  ASN1_STRFLGS_ESC_MSB)
+
 
 /* Three IO functions for sending data to memory, a BIO and
  * and a FILE pointer.
@@ -148,6 +153,13 @@ static int do_esc_char(unsigned long c, unsigned char flags, char *do_quotes, ch
                 if(!io_ch(arg, tmphex, 3)) return -1;
                 return 3;
         }
+        /* If we get this far and do any escaping at all must escape 
+         * the escape character itself: backslash.
+         */
+        if (chtmp == '\\' && flags & ESC_FLAGS) {
+                if(!io_ch(arg, "\\\\", 2)) return -1;
+                return 2;
+        }
         if(!io_ch(arg, &chtmp, 1)) return -1;
         return 1;
 }
@@ -292,11 +304,6 @@ static const signed char tag2nbyte[] = {
         4, -1, 2                /* 28-30 */
 };
 
-#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \
-                  ASN1_STRFLGS_ESC_QUOTE | \
-                  ASN1_STRFLGS_ESC_CTRL | \
-                  ASN1_STRFLGS_ESC_MSB)
-
 /* This is the main function, print out an
  * ASN1_STRING taking note of various escape
  * and display options. Returns number of
diff --git a/src/lib/libcrypto/asn1/a_strnid.c b/src/lib/libcrypto/asn1/a_strnid.c
index 753021a7a2..2fc48c1551 100644
--- a/src/lib/libcrypto/asn1/a_strnid.c
+++ b/src/lib/libcrypto/asn1/a_strnid.c
@@ -95,7 +95,7 @@ unsigned long ASN1_STRING_get_default_mask(void)
  * default:   the default value, Printable, T61, BMP.
  */
 
-int ASN1_STRING_set_default_mask_asc(char *p)
+int ASN1_STRING_set_default_mask_asc(const char *p)
 {
         unsigned long mask;
         char *end;
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c
index 9a8b6cc222..5a581b90ea 100644
--- a/src/lib/libcrypto/asn1/ameth_lib.c
+++ b/src/lib/libcrypto/asn1/ameth_lib.c
@@ -172,7 +172,6 @@ static const EVP_PKEY_ASN1_METHOD *pkey_asn1_find(int type)
 const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type)
         {
         const EVP_PKEY_ASN1_METHOD *t;
-        ENGINE *e;
 
         for (;;)
                 {
@@ -184,6 +183,7 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type)
         if (pe)
                 {
 #ifndef OPENSSL_NO_ENGINE
+                ENGINE *e;
                 /* type will contain the final unaliased type */
                 e = ENGINE_get_pkey_asn1_meth_engine(type);
                 if (e)
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index f7718b5a94..59540e4e79 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1067,7 +1067,7 @@ ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
 ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it, ASN1_OCTET_STRING **oct);
 
 void ASN1_STRING_set_default_mask(unsigned long mask);
-int ASN1_STRING_set_default_mask_asc(char *p);
+int ASN1_STRING_set_default_mask_asc(const char *p);
 unsigned long ASN1_STRING_get_default_mask(void);
 int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
                                         int inform, unsigned long mask);
diff --git a/src/lib/libcrypto/asn1/bio_ndef.c b/src/lib/libcrypto/asn1/bio_ndef.c
index 370389b1e6..b91f97a1b1 100644
--- a/src/lib/libcrypto/asn1/bio_ndef.c
+++ b/src/lib/libcrypto/asn1/bio_ndef.c
@@ -57,9 +57,6 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 
-#ifndef OPENSSL_SYSNAME_NETWARE
-#include <memory.h>
-#endif
 #include <stdio.h>
 
 /* Experimental NDEF ASN1 BIO support routines */
diff --git a/src/lib/libcrypto/asn1/n_pkey.c b/src/lib/libcrypto/asn1/n_pkey.c
index 60bc437938..e7d0439062 100644
--- a/src/lib/libcrypto/asn1/n_pkey.c
+++ b/src/lib/libcrypto/asn1/n_pkey.c
@@ -242,7 +242,7 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
                  int sgckey)
         {
         RSA *ret=NULL;
-        const unsigned char *p, *kp;
+        const unsigned char *p;
         NETSCAPE_ENCRYPTED_PKEY *enckey = NULL;
 
         p = *pp;
@@ -265,7 +265,6 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
                 ASN1err(ASN1_F_D2I_RSA_NET,ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM);
                 goto err;
         }
-        kp = enckey->enckey->digest->data;
         if (cb == NULL)
                 cb=EVP_read_pw_string;
         if ((ret=d2i_RSA_NET_2(a, enckey->enckey->digest,cb, sgckey)) == NULL) goto err;
diff --git a/src/lib/libcrypto/asn1/t_crl.c b/src/lib/libcrypto/asn1/t_crl.c
index bdb244c015..ee5a687ce8 100644
--- a/src/lib/libcrypto/asn1/t_crl.c
+++ b/src/lib/libcrypto/asn1/t_crl.c
@@ -87,7 +87,7 @@ int X509_CRL_print(BIO *out, X509_CRL *x)
         STACK_OF(X509_REVOKED) *rev;
         X509_REVOKED *r;
         long l;
-        int i, n;
+        int i;
         char *p;
 
         BIO_printf(out, "Certificate Revocation List (CRL):\n");
@@ -107,7 +107,6 @@ int X509_CRL_print(BIO *out, X509_CRL *x)
         else BIO_printf(out,"NONE");
         BIO_printf(out,"\n");
 
-        n=X509_CRL_get_ext_count(x);
         X509V3_extensions_print(out, "CRL extensions",
                                                 x->crl->extensions, 0, 8);
 
diff --git a/src/lib/libcrypto/asn1/tasn_dec.c b/src/lib/libcrypto/asn1/tasn_dec.c
index 3bee439968..87d7dfdf5c 100644
--- a/src/lib/libcrypto/asn1/tasn_dec.c
+++ b/src/lib/libcrypto/asn1/tasn_dec.c
@@ -168,7 +168,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
         int i;
         int otag;
         int ret = 0;
-        ASN1_VALUE *pchval, **pchptr, *ptmpval;
+        ASN1_VALUE **pchptr, *ptmpval;
         if (!pval)
                 return 0;
         if (aux && aux->asn1_cb)
@@ -319,7 +319,6 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
                         goto err;
                         }
                 /* CHOICE type, try each possibility in turn */
-                pchval = NULL;
                 p = *in;
                 for (i = 0, tt=it->templates; i < it->tcount; i++, tt++)
                         {
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
index caa4409feb..49be08b4da 100644
--- a/src/lib/libcrypto/asn1/x_name.c
+++ b/src/lib/libcrypto/asn1/x_name.c
@@ -214,7 +214,9 @@ static int x509_name_ex_d2i(ASN1_VALUE **val,
         *val = nm.a;
         *in = p;
         return ret;
-        err:
+err:
+        if (nm.x != NULL)
+                X509_NAME_free(nm.x);
         ASN1err(ASN1_F_X509_NAME_EX_D2I, ERR_R_NESTED_ASN1_ERROR);
         return 0;
 }
@@ -464,7 +466,8 @@ static int asn1_string_canon(ASN1_STRING *out, ASN1_STRING *in)
                         }
                 else
                         {
-                        *to++ = tolower(*from++);
+                        *to++ = tolower(*from);
+                        from++;
                         i++;
                         }
                 }
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c
index dafd3cc921..de3df9eb51 100644
--- a/src/lib/libcrypto/asn1/x_x509.c
+++ b/src/lib/libcrypto/asn1/x_x509.c
@@ -63,7 +63,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-ASN1_SEQUENCE(X509_CINF) = {
+ASN1_SEQUENCE_enc(X509_CINF, enc, 0) = {
         ASN1_EXP_OPT(X509_CINF, version, ASN1_INTEGER, 0),
         ASN1_SIMPLE(X509_CINF, serialNumber, ASN1_INTEGER),
         ASN1_SIMPLE(X509_CINF, signature, X509_ALGOR),
@@ -74,7 +74,7 @@ ASN1_SEQUENCE(X509_CINF) = {
         ASN1_IMP_OPT(X509_CINF, issuerUID, ASN1_BIT_STRING, 1),
         ASN1_IMP_OPT(X509_CINF, subjectUID, ASN1_BIT_STRING, 2),
         ASN1_EXP_SEQUENCE_OF_OPT(X509_CINF, extensions, X509_EXTENSION, 3)
-} ASN1_SEQUENCE_END(X509_CINF)
+} ASN1_SEQUENCE_END_enc(X509_CINF, X509_CINF)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_CINF)
 /* X509 top level structure needs a bit of customisation */
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c
index 12b0a53a81..d47310d650 100644
--- a/src/lib/libcrypto/bio/b_sock.c
+++ b/src/lib/libcrypto/bio/b_sock.c
@@ -551,7 +551,30 @@ int BIO_socket_ioctl(int fd, long type, void *arg)
 #ifdef __DJGPP__
         i=ioctlsocket(fd,type,(char *)arg);
 #else
-        i=ioctlsocket(fd,type,arg);
+# if defined(OPENSSL_SYS_VMS)
+        /* 2011-02-18 SMS.
+         * VMS ioctl() can't tolerate a 64-bit "void *arg", but we
+         * observe that all the consumers pass in an "unsigned long *",
+         * so we arrange a local copy with a short pointer, and use
+         * that, instead.
+         */
+#  if __INITIAL_POINTER_SIZE == 64
+#   define ARG arg_32p
+#   pragma pointer_size save
+#   pragma pointer_size 32
+        unsigned long arg_32;
+        unsigned long *arg_32p;
+#   pragma pointer_size restore
+        arg_32p = &arg_32;
+        arg_32 = *((unsigned long *) arg);
+#  else /* __INITIAL_POINTER_SIZE == 64 */
+#   define ARG arg
+#  endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+# else /* defined(OPENSSL_SYS_VMS) */
+#  define ARG arg
+# endif /* defined(OPENSSL_SYS_VMS) [else] */
+
+        i=ioctlsocket(fd,type,ARG);
 #endif /* __DJGPP__ */
         if (i < 0)
                 SYSerr(SYS_F_IOCTLSOCKET,get_last_socket_error());
@@ -660,6 +683,7 @@ int BIO_get_accept_socket(char *host, int bind_mode)
          * note that commonly IPv6 wildchard socket can service
          * IPv4 connections just as well...  */
         memset(&hint,0,sizeof(hint));
+        hint.ai_flags = AI_PASSIVE;
         if (h)
                 {
                 if (strchr(h,':'))
@@ -672,7 +696,10 @@ int BIO_get_accept_socket(char *host, int bind_mode)
 #endif
                         }
                 else if (h[0]=='*' && h[1]=='\0')
+                        {
+                        hint.ai_family = AF_INET;
                         h=NULL;
+                        }
                 }
 
         if ((*p_getaddrinfo.f)(h,p,&hint,&res)) break;
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c
index c72a23c2e1..028616c064 100644
--- a/src/lib/libcrypto/bio/bf_nbio.c
+++ b/src/lib/libcrypto/bio/bf_nbio.c
@@ -125,7 +125,6 @@ static int nbiof_free(BIO *a)
         
 static int nbiof_read(BIO *b, char *out, int outl)
         {
-        NBIO_TEST *nt;
         int ret=0;
 #if 1
         int num;
@@ -134,7 +133,6 @@ static int nbiof_read(BIO *b, char *out, int outl)
 
         if (out == NULL) return(0);
         if (b->next_bio == NULL) return(0);
-        nt=(NBIO_TEST *)b->ptr;
 
         BIO_clear_retry_flags(b);
 #if 1
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index 77f4de9c32..e12bc3a2ca 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -110,7 +110,7 @@ int BIO_set(BIO *bio, BIO_METHOD *method)
 
 int BIO_free(BIO *a)
         {
-        int ret=0,i;
+        int i;
 
         if (a == NULL) return(0);
 
@@ -133,7 +133,7 @@ int BIO_free(BIO *a)
         CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data);
 
         if ((a->method == NULL) || (a->method->destroy == NULL)) return(1);
-        ret=a->method->destroy(a);
+        a->method->destroy(a);
         OPENSSL_free(a);
         return(1);
         }
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 826f761143..5d49e1a72b 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -340,7 +340,6 @@ static int acpt_write(BIO *b, const char *in, int inl)
 
 static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
         {
-        BIO *dbio;
         int *ip;
         long ret=1;
         BIO_ACCEPT *data;
@@ -437,8 +436,8 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
                 ret=(long)data->bind_mode;
                 break;
         case BIO_CTRL_DUP:
-                dbio=(BIO *)ptr;
-/*              if (data->param_port) EAY EAY
+/*              dbio=(BIO *)ptr;
+                if (data->param_port) EAY EAY
                         BIO_set_port(dbio,data->param_port);
                 if (data->param_hostname)
                         BIO_set_hostname(dbio,data->param_hostname);
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index eb7e365467..71ebe987b6 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -57,7 +57,6 @@
  *
  */
 
-#ifndef OPENSSL_NO_DGRAM
 
 #include <stdio.h>
 #include <errno.h>
@@ -65,6 +64,7 @@
 #include "cryptlib.h"
 
 #include <openssl/bio.h>
+#ifndef OPENSSL_NO_DGRAM
 
 #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
 #include <sys/timeb.h>
@@ -308,7 +308,6 @@ static int dgram_read(BIO *b, char *out, int outl)
                         OPENSSL_assert(sa.len.s<=sizeof(sa.peer));
                         sa.len.i = (int)sa.len.s;
                         }
-                dgram_reset_rcv_timeout(b);
 
                 if ( ! data->connected  && ret >= 0)
                         BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &sa.peer);
@@ -322,6 +321,8 @@ static int dgram_read(BIO *b, char *out, int outl)
                                 data->_errno = get_last_socket_error();
                                 }
                         }
+
+                dgram_reset_rcv_timeout(b);
                 }
         return(ret);
         }
@@ -340,7 +341,7 @@ static int dgram_write(BIO *b, const char *in, int inl)
 
                 if (data->peer.sa.sa_family == AF_INET)
                         peerlen = sizeof(data->peer.sa_in);
-#if OPENSSL_USE_IVP6
+#if OPENSSL_USE_IPV6
                 else if (data->peer.sa.sa_family == AF_INET6)
                         peerlen = sizeof(data->peer.sa_in6);
 #endif
@@ -745,9 +746,13 @@ static int BIO_dgram_should_retry(int i)
                 {
                 err=get_last_socket_error();
 
-#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
-                if ((i == -1) && (err == 0))
-                        return(1);
+#if defined(OPENSSL_SYS_WINDOWS)
+        /* If the socket return value (i) is -1
+         * and err is unexpectedly 0 at this point,
+         * the error code was overwritten by
+         * another system call before this error
+         * handling is called.
+         */
 #endif
 
                 return(BIO_dgram_non_fatal_error(err));
@@ -810,7 +815,6 @@ int BIO_dgram_non_fatal_error(int err)
                 }
         return(0);
         }
-#endif
 
 static void get_current_time(struct timeval *t)
         {
@@ -828,3 +832,5 @@ static void get_current_time(struct timeval *t)
         gettimeofday(t, NULL);
 #endif
         }
+
+#endif
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 8bfa0bcd97..b954fe7ebc 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -123,6 +123,7 @@ BIO *BIO_new_file(const char *filename, const char *mode)
 
 #if defined(_WIN32) && defined(CP_UTF8)
         int sz, len_0 = (int)strlen(filename)+1;
+        DWORD flags;
 
         /*
          * Basically there are three cases to cover: a) filename is
@@ -136,17 +137,22 @@ BIO *BIO_new_file(const char *filename, const char *mode)
          * ERROR_NO_UNICODE_TRANSLATION, in which case we fall
          * back to fopen...
          */
-        if ((sz=MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
+        if ((sz=MultiByteToWideChar(CP_UTF8,(flags=MB_ERR_INVALID_CHARS),
+                                        filename,len_0,NULL,0))>0 ||
+            (GetLastError()==ERROR_INVALID_FLAGS &&
+             (sz=MultiByteToWideChar(CP_UTF8,(flags=0),
                                         filename,len_0,NULL,0))>0)
+           )
                 {
                 WCHAR  wmode[8];
                 WCHAR *wfilename = _alloca(sz*sizeof(WCHAR));
 
-                if (MultiByteToWideChar(CP_UTF8,MB_ERR_INVALID_CHARS,
+                if (MultiByteToWideChar(CP_UTF8,flags,
                                         filename,len_0,wfilename,sz) &&
                     MultiByteToWideChar(CP_UTF8,0,mode,strlen(mode)+1,
                                         wmode,sizeof(wmode)/sizeof(wmode[0])) &&
-                    (file=_wfopen(wfilename,wmode))==NULL && errno==ENOENT
+                    (file=_wfopen(wfilename,wmode))==NULL &&
+                    (errno==ENOENT || errno==EBADF)
                    )    /* UTF-8 decode succeeded, but no file, filename
                          * could still have been locale-ized... */
                         file = fopen(filename,mode);
diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c
index 7ead044b37..b7dce5c1a2 100644
--- a/src/lib/libcrypto/bio/bss_log.c
+++ b/src/lib/libcrypto/bio/bss_log.c
@@ -75,6 +75,15 @@
 #  include <descrip.h>
 #  include <lib$routines.h>
 #  include <starlet.h>
+/* Some compiler options may mask the declaration of "_malloc32". */
+#  if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
+#    if __INITIAL_POINTER_SIZE == 64
+#      pragma pointer_size save
+#      pragma pointer_size 32
+    void * _malloc32  (__size_t);
+#      pragma pointer_size restore
+#    endif /* __INITIAL_POINTER_SIZE == 64 */
+#  endif /* __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE */
 #elif defined(__ultrix)
 #  include <sys/syslog.h>
 #elif defined(OPENSSL_SYS_NETWARE)
@@ -300,7 +309,24 @@ static void xopenlog(BIO* bp, char* name, int level)
 static void xsyslog(BIO *bp, int priority, const char *string)
 {
         struct dsc$descriptor_s opc_dsc;
+
+/* Arrange 32-bit pointer to opcdef buffer and malloc(), if needed. */
+#if __INITIAL_POINTER_SIZE == 64
+# pragma pointer_size save
+# pragma pointer_size 32
+# define OPCDEF_TYPE __char_ptr32
+# define OPCDEF_MALLOC _malloc32
+#else /* __INITIAL_POINTER_SIZE == 64 */
+# define OPCDEF_TYPE char *
+# define OPCDEF_MALLOC OPENSSL_malloc
+#endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+
         struct opcdef *opcdef_p;
+
+#if __INITIAL_POINTER_SIZE == 64
+# pragma pointer_size restore
+#endif /* __INITIAL_POINTER_SIZE == 64 */
+
         char buf[10240];
         unsigned int len;
         struct dsc$descriptor_s buf_dsc;
@@ -326,8 +352,8 @@ static void xsyslog(BIO *bp, int priority, const char *string)
 
         lib$sys_fao(&fao_cmd, &len, &buf_dsc, priority_tag, string);
 
-        /* we know there's an 8 byte header.  That's documented */
-        opcdef_p = (struct opcdef *) OPENSSL_malloc(8 + len);
+        /* We know there's an 8-byte header.  That's documented. */
+        opcdef_p = OPCDEF_MALLOC( 8+ len);
         opcdef_p->opc$b_ms_type = OPC$_RQ_RQST;
         memcpy(opcdef_p->opc$z_ms_target_classes, &VMS_OPC_target, 3);
         opcdef_p->opc$l_ms_rqstid = 0;
@@ -335,7 +361,7 @@ static void xsyslog(BIO *bp, int priority, const char *string)
 
         opc_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
         opc_dsc.dsc$b_class = DSC$K_CLASS_S;
-        opc_dsc.dsc$a_pointer = (char *)opcdef_p;
+        opc_dsc.dsc$a_pointer = (OPCDEF_TYPE) opcdef_p;
         opc_dsc.dsc$w_length = len + 8;
 
         sys$sndopr(opc_dsc, 0);
diff --git a/src/lib/libcrypto/bn/asm/alpha-mont.pl b/src/lib/libcrypto/bn/asm/alpha-mont.pl
index f7e0ca1646..03596e2014 100644
--- a/src/lib/libcrypto/bn/asm/alpha-mont.pl
+++ b/src/lib/libcrypto/bn/asm/alpha-mont.pl
@@ -41,8 +41,12 @@ $j="s4";
 $m1="s5";
 
 $code=<<___;
+#ifdef __linux__
+#include <asm/regdef.h>
+#else
 #include <asm.h>
 #include <regdef.h>
+#endif
 
 .text
 
@@ -76,7 +80,7 @@ bn_mul_mont:
         ldq     $aj,8($ap)
         subq    sp,AT,sp
         ldq     $bi,0($bp)      # bp[0]
-        mov     -4096,AT
+        lda     AT,-4096(zero)  # mov   -4096,AT
         ldq     $n0,0($n0)
         and     sp,AT,sp
 
@@ -106,9 +110,9 @@ bn_mul_mont:
 .align  4
 .L1st:
         .set    noreorder
-        ldq     $aj,($aj)
+        ldq     $aj,0($aj)
         addl    $j,1,$j
-        ldq     $nj,($nj)
+        ldq     $nj,0($nj)
         lda     $tp,8($tp)
 
         addq    $alo,$hi0,$lo0
@@ -159,12 +163,12 @@ bn_mul_mont:
 .align  4
 .Louter:
         s8addq  $i,$bp,$bi
-        ldq     $hi0,($ap)
+        ldq     $hi0,0($ap)
         ldq     $aj,8($ap)
-        ldq     $bi,($bi)
-        ldq     $hi1,($np)
+        ldq     $bi,0($bi)
+        ldq     $hi1,0($np)
         ldq     $nj,8($np)
-        ldq     $tj,(sp)
+        ldq     $tj,0(sp)
 
         mulq    $hi0,$bi,$lo0
         umulh   $hi0,$bi,$hi0
@@ -195,10 +199,10 @@ bn_mul_mont:
         .set    noreorder
         ldq     $tj,8($tp)      #L0
         nop                     #U1
-        ldq     $aj,($aj)       #L1
+        ldq     $aj,0($aj)      #L1
         s8addq  $j,$np,$nj      #U0
 
-        ldq     $nj,($nj)       #L0
+        ldq     $nj,0($nj)      #L0
         nop                     #U1
         addq    $alo,$hi0,$lo0  #L1
         lda     $tp,8($tp)
@@ -247,7 +251,7 @@ bn_mul_mont:
         addq    $hi1,v0,$hi1
 
         addq    $hi1,$hi0,$lo1
-        stq     $j,($tp)
+        stq     $j,0($tp)
         cmpult  $lo1,$hi0,$hi1
         addq    $lo1,$tj,$lo1
         cmpult  $lo1,$tj,AT
@@ -265,8 +269,8 @@ bn_mul_mont:
         mov     0,$hi0          # clear borrow bit
 
 .align  4
-.Lsub:  ldq     $lo0,($tp)
-        ldq     $lo1,($np)
+.Lsub:  ldq     $lo0,0($tp)
+        ldq     $lo1,0($np)
         lda     $tp,8($tp)
         lda     $np,8($np)
         subq    $lo0,$lo1,$lo1  # tp[i]-np[i]
@@ -274,7 +278,7 @@ bn_mul_mont:
         subq    $lo1,$hi0,$lo0
         cmpult  $lo1,$lo0,$hi0
         or      $hi0,AT,$hi0
-        stq     $lo0,($rp)
+        stq     $lo0,0($rp)
         cmpult  $tp,$tj,v0
         lda     $rp,8($rp)
         bne     v0,.Lsub
@@ -288,7 +292,7 @@ bn_mul_mont:
         bis     $bp,$ap,$ap     # ap=borrow?tp:rp
 
 .align  4
-.Lcopy: ldq     $aj,($ap)       # copy or in-place refresh
+.Lcopy: ldq     $aj,0($ap)      # copy or in-place refresh
         lda     $tp,8($tp)
         lda     $rp,8($rp)
         lda     $ap,8($ap)
@@ -309,8 +313,8 @@ bn_mul_mont:
         lda     sp,48(sp)
         ret     (ra)
 .end    bn_mul_mont
-.rdata
-.asciiz "Montgomery Multiplication for Alpha, CRYPTOGAMS by <appro\@openssl.org>"
+.ascii  "Montgomery Multiplication for Alpha, CRYPTOGAMS by <appro\@openssl.org>"
+.align  2
 ___
 
 print $code;
diff --git a/src/lib/libcrypto/bn/asm/s390x-mont.pl b/src/lib/libcrypto/bn/asm/s390x-mont.pl
index d23251033b..f61246f5b6 100644
--- a/src/lib/libcrypto/bn/asm/s390x-mont.pl
+++ b/src/lib/libcrypto/bn/asm/s390x-mont.pl
@@ -69,8 +69,8 @@ bn_mul_mont:
         cghi    $num,16         #
         lghi    %r2,0           #
         blr     %r14            # if($num<16) return 0;
-        cghi    $num,128        #
-        bhr     %r14            # if($num>128) return 0;
+        cghi    $num,96         #
+        bhr     %r14            # if($num>96) return 0;
 
         stmg    %r3,%r15,24($sp)
 
diff --git a/src/lib/libcrypto/bn/asm/s390x.S b/src/lib/libcrypto/bn/asm/s390x.S
index 8f45f5d513..43fcb79bc0 100755
--- a/src/lib/libcrypto/bn/asm/s390x.S
+++ b/src/lib/libcrypto/bn/asm/s390x.S
@@ -1,4 +1,4 @@
-.ident "s390x.S, version 1.0"
+.ident "s390x.S, version 1.1"
 // ====================================================================
 // Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
 // project.
@@ -24,67 +24,67 @@ bn_mul_add_words:
         bler    %r14            // if (len<=0) return 0;
 
         stmg    %r6,%r10,48(%r15)
+        lghi    %r10,3
         lghi    %r8,0           // carry = 0
-        srag    %r10,%r4,2      // cnt=len/4
-        jz      .Loop1_madd
+        nr      %r10,%r4        // len%4
+        sra     %r4,2           // cnt=len/4
+        jz      .Loop1_madd     // carry is incidentally cleared if branch taken
+        algr    zero,zero       // clear carry
 
 .Loop4_madd:
         lg      %r7,0(%r2,%r3)  // ap[i]
         mlgr    %r6,%r5         // *=w
-        algr    %r7,%r8         // +=carry
+        alcgr   %r7,%r8         // +=carry
         alcgr   %r6,zero
         alg     %r7,0(%r2,%r1)  // +=rp[i]
-        alcgr   %r6,zero
         stg     %r7,0(%r2,%r1)  // rp[i]=
 
         lg      %r9,8(%r2,%r3)
         mlgr    %r8,%r5
-        algr    %r9,%r6
+        alcgr   %r9,%r6
         alcgr   %r8,zero
         alg     %r9,8(%r2,%r1)
-        alcgr   %r8,zero
         stg     %r9,8(%r2,%r1)
 
         lg      %r7,16(%r2,%r3)
         mlgr    %r6,%r5
-        algr    %r7,%r8
+        alcgr   %r7,%r8
         alcgr   %r6,zero
         alg     %r7,16(%r2,%r1)
-        alcgr   %r6,zero
         stg     %r7,16(%r2,%r1)
 
         lg      %r9,24(%r2,%r3)
         mlgr    %r8,%r5
-        algr    %r9,%r6
+        alcgr   %r9,%r6
         alcgr   %r8,zero
         alg     %r9,24(%r2,%r1)
-        alcgr   %r8,zero
         stg     %r9,24(%r2,%r1)
 
         la      %r2,32(%r2)     // i+=4
-        brct    %r10,.Loop4_madd
+        brct    %r4,.Loop4_madd
 
-        lghi    %r10,3
-        nr      %r4,%r10        // cnt=len%4
-        jz      .Lend_madd
+        la      %r10,1(%r10)            // see if len%4 is zero ...
+        brct    %r10,.Loop1_madd        // without touching condition code:-)
+
+.Lend_madd:
+        alcgr   %r8,zero        // collect carry bit
+        lgr     %r2,%r8
+        lmg     %r6,%r10,48(%r15)
+        br      %r14
 
 .Loop1_madd:
         lg      %r7,0(%r2,%r3)  // ap[i]
         mlgr    %r6,%r5         // *=w
-        algr    %r7,%r8         // +=carry
+        alcgr   %r7,%r8         // +=carry
         alcgr   %r6,zero
         alg     %r7,0(%r2,%r1)  // +=rp[i]
-        alcgr   %r6,zero
         stg     %r7,0(%r2,%r1)  // rp[i]=
 
         lgr     %r8,%r6
         la      %r2,8(%r2)      // i++
-        brct    %r4,.Loop1_madd
+        brct    %r10,.Loop1_madd
 
-.Lend_madd:
-        lgr     %r2,%r8
-        lmg     %r6,%r10,48(%r15)
-        br      %r14
+        j       .Lend_madd
 .size   bn_mul_add_words,.-bn_mul_add_words
 
 // BN_ULONG bn_mul_words(BN_ULONG *r2,BN_ULONG *r3,int r4,BN_ULONG r5);
@@ -99,57 +99,57 @@ bn_mul_words:
         bler    %r14            // if (len<=0) return 0;
 
         stmg    %r6,%r10,48(%r15)
+        lghi    %r10,3
         lghi    %r8,0           // carry = 0
-        srag    %r10,%r4,2      // cnt=len/4
-        jz      .Loop1_mul
+        nr      %r10,%r4        // len%4
+        sra     %r4,2           // cnt=len/4
+        jz      .Loop1_mul      // carry is incidentally cleared if branch taken
+        algr    zero,zero       // clear carry
 
 .Loop4_mul:
         lg      %r7,0(%r2,%r3)  // ap[i]
         mlgr    %r6,%r5         // *=w
-        algr    %r7,%r8         // +=carry
-        alcgr   %r6,zero
+        alcgr   %r7,%r8         // +=carry
         stg     %r7,0(%r2,%r1)  // rp[i]=
 
         lg      %r9,8(%r2,%r3)
         mlgr    %r8,%r5
-        algr    %r9,%r6
-        alcgr   %r8,zero
+        alcgr   %r9,%r6
         stg     %r9,8(%r2,%r1)
 
         lg      %r7,16(%r2,%r3)
         mlgr    %r6,%r5
-        algr    %r7,%r8
-        alcgr   %r6,zero
+        alcgr   %r7,%r8
         stg     %r7,16(%r2,%r1)
 
         lg      %r9,24(%r2,%r3)
         mlgr    %r8,%r5
-        algr    %r9,%r6
-        alcgr   %r8,zero
+        alcgr   %r9,%r6
         stg     %r9,24(%r2,%r1)
 
         la      %r2,32(%r2)     // i+=4
-        brct    %r10,.Loop4_mul
+        brct    %r4,.Loop4_mul
 
-        lghi    %r10,3
-        nr      %r4,%r10        // cnt=len%4
-        jz      .Lend_mul
+        la      %r10,1(%r10)            // see if len%4 is zero ...
+        brct    %r10,.Loop1_mul         // without touching condition code:-)
+
+.Lend_mul:
+        alcgr   %r8,zero        // collect carry bit
+        lgr     %r2,%r8
+        lmg     %r6,%r10,48(%r15)
+        br      %r14
 
 .Loop1_mul:
         lg      %r7,0(%r2,%r3)  // ap[i]
         mlgr    %r6,%r5         // *=w
-        algr    %r7,%r8         // +=carry
-        alcgr   %r6,zero
+        alcgr   %r7,%r8         // +=carry
         stg     %r7,0(%r2,%r1)  // rp[i]=
 
         lgr     %r8,%r6
         la      %r2,8(%r2)      // i++
-        brct    %r4,.Loop1_mul
+        brct    %r10,.Loop1_mul
 
-.Lend_mul:
-        lgr     %r2,%r8
-        lmg     %r6,%r10,48(%r15)
-        br      %r14
+        j       .Lend_mul
 .size   bn_mul_words,.-bn_mul_words
 
 // void bn_sqr_words(BN_ULONG *r2,BN_ULONG *r2,int r4)
diff --git a/src/lib/libcrypto/bn/bn.h b/src/lib/libcrypto/bn/bn.h
index e484b7fc11..a0bc47837d 100644
--- a/src/lib/libcrypto/bn/bn.h
+++ b/src/lib/libcrypto/bn/bn.h
@@ -253,6 +253,24 @@ extern "C" {
 #define BN_HEX_FMT2     "%08X"
 #endif
 
+/* 2011-02-22 SMS.
+ * In various places, a size_t variable or a type cast to size_t was
+ * used to perform integer-only operations on pointers.  This failed on
+ * VMS with 64-bit pointers (CC /POINTER_SIZE = 64) because size_t is
+ * still only 32 bits.  What's needed in these cases is an integer type
+ * with the same size as a pointer, which size_t is not certain to be. 
+ * The only fix here is VMS-specific.
+ */
+#if defined(OPENSSL_SYS_VMS)
+# if __INITIAL_POINTER_SIZE == 64
+#  define PTR_SIZE_INT long long
+# else /* __INITIAL_POINTER_SIZE == 64 */
+#  define PTR_SIZE_INT int
+# endif /* __INITIAL_POINTER_SIZE == 64 [else] */
+#else /* defined(OPENSSL_SYS_VMS) */
+# define PTR_SIZE_INT size_t
+#endif /* defined(OPENSSL_SYS_VMS) [else] */
+
 #define BN_DEFAULT_BITS 1280
 
 #define BN_FLG_MALLOCED         0x01
diff --git a/src/lib/libcrypto/bn/bn_exp2.c b/src/lib/libcrypto/bn/bn_exp2.c
index b3f43cec8c..bd0c34b91b 100644
--- a/src/lib/libcrypto/bn/bn_exp2.c
+++ b/src/lib/libcrypto/bn/bn_exp2.c
@@ -301,7 +301,8 @@ int BN_mod_exp2_mont(BIGNUM *rr, const BIGNUM *a1, const BIGNUM *p1,
                         r_is_one = 0;
                         }
                 }
-        BN_from_montgomery(rr,r,mont,ctx);
+        if (!BN_from_montgomery(rr,r,mont,ctx))
+                goto err;
         ret=1;
 err:
         if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
diff --git a/src/lib/libcrypto/bn/bn_gf2m.c b/src/lib/libcrypto/bn/bn_gf2m.c
index 527b0fa15b..432a3aa338 100644
--- a/src/lib/libcrypto/bn/bn_gf2m.c
+++ b/src/lib/libcrypto/bn/bn_gf2m.c
@@ -545,6 +545,7 @@ int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
                 {
                 while (!BN_is_odd(u))
                         {
+                        if (BN_is_zero(u)) goto err;
                         if (!BN_rshift1(u, u)) goto err;
                         if (BN_is_odd(b))
                                 {
diff --git a/src/lib/libcrypto/bn/bn_mont.c b/src/lib/libcrypto/bn/bn_mont.c
index 7224637ab3..1a866880f5 100644
--- a/src/lib/libcrypto/bn/bn_mont.c
+++ b/src/lib/libcrypto/bn/bn_mont.c
@@ -277,7 +277,7 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
         m1|=m2;                 /* (al!=ri) */
         m1|=(0-(size_t)v);      /* (al!=ri || v) */
         m1&=~m2;                /* (al!=ri || v) && !al>ri */
-        nrp=(BN_ULONG *)(((size_t)rp&~m1)|((size_t)ap&m1));
+        nrp=(BN_ULONG *)(((PTR_SIZE_INT)rp&~m1)|((PTR_SIZE_INT)ap&m1));
         }
 
         /* 'i<ri' is chosen to eliminate dependency on input data, even
diff --git a/src/lib/libcrypto/bn/bn_mul.c b/src/lib/libcrypto/bn/bn_mul.c
index a0e9ec3b46..12e5be80eb 100644
--- a/src/lib/libcrypto/bn/bn_mul.c
+++ b/src/lib/libcrypto/bn/bn_mul.c
@@ -551,7 +551,7 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
              int tna, int tnb, BN_ULONG *t)
         {
         int i,j,n2=n*2;
-        int c1,c2,neg,zero;
+        int c1,c2,neg;
         BN_ULONG ln,lo,*p;
 
 # ifdef BN_COUNT
@@ -567,7 +567,7 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
         /* r=(a[0]-a[1])*(b[1]-b[0]) */
         c1=bn_cmp_part_words(a,&(a[n]),tna,n-tna);
         c2=bn_cmp_part_words(&(b[n]),b,tnb,tnb-n);
-        zero=neg=0;
+        neg=0;
         switch (c1*3+c2)
                 {
         case -4:
@@ -575,7 +575,6 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
                 bn_sub_part_words(&(t[n]),b,      &(b[n]),tnb,n-tnb); /* - */
                 break;
         case -3:
-                zero=1;
                 /* break; */
         case -2:
                 bn_sub_part_words(t,      &(a[n]),a,      tna,tna-n); /* - */
@@ -585,7 +584,6 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
         case -1:
         case 0:
         case 1:
-                zero=1;
                 /* break; */
         case 2:
                 bn_sub_part_words(t,      a,      &(a[n]),tna,n-tna); /* + */
@@ -593,7 +591,6 @@ void bn_mul_part_recursive(BN_ULONG *r, BN_ULONG *a, BN_ULONG *b, int n,
                 neg=1;
                 break;
         case 3:
-                zero=1;
                 /* break; */
         case 4:
                 bn_sub_part_words(t,      a,      &(a[n]),tna,n-tna);
@@ -1012,7 +1009,6 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
                 {
                 if (i >= -1 && i <= 1)
                         {
-                        int sav_j =0;
                         /* Find out the power of two lower or equal
                            to the longest of the two numbers */
                         if (i >= 0)
@@ -1023,7 +1019,6 @@ int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
                                 {
                                 j = BN_num_bits_word((BN_ULONG)bl);
                                 }
-                        sav_j = j;
                         j = 1<<(j-1);
                         assert(j <= al || j <= bl);
                         k = j+j;
diff --git a/src/lib/libcrypto/bn/bn_nist.c b/src/lib/libcrypto/bn/bn_nist.c
index 2ca5b01391..c6de032696 100644
--- a/src/lib/libcrypto/bn/bn_nist.c
+++ b/src/lib/libcrypto/bn/bn_nist.c
@@ -354,7 +354,7 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                  buf[BN_NIST_192_TOP],
                  c_d[BN_NIST_192_TOP],
                 *res;
-        size_t   mask;
+        PTR_SIZE_INT mask;
         static const BIGNUM _bignum_nist_p_192_sqr = {
                 (BN_ULONG *)_nist_p_192_sqr,
                 sizeof(_nist_p_192_sqr)/sizeof(_nist_p_192_sqr[0]),
@@ -405,9 +405,10 @@ int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
          * 'tmp=result-modulus; if (!carry || !borrow) result=tmp;'
          * this is what happens below, but without explicit if:-) a.
          */
-        mask  = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_192[0],BN_NIST_192_TOP);
-        mask &= 0-(size_t)carry;
-        res   = (BN_ULONG *)(((size_t)c_d&~mask) | ((size_t)r_d&mask));
+        mask  = 0-(PTR_SIZE_INT)bn_sub_words(c_d,r_d,_nist_p_192[0],BN_NIST_192_TOP);
+        mask &= 0-(PTR_SIZE_INT)carry;
+        res   = (BN_ULONG *)
+         (((PTR_SIZE_INT)c_d&~mask) | ((PTR_SIZE_INT)r_d&mask));
         nist_cp_bn(r_d, res, BN_NIST_192_TOP);
         r->top = BN_NIST_192_TOP;
         bn_correct_top(r);
@@ -438,8 +439,8 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                  buf[BN_NIST_224_TOP],
                  c_d[BN_NIST_224_TOP],
                 *res;
-        size_t   mask;
-        union { bn_addsub_f f; size_t p; } u;
+        PTR_SIZE_INT mask;
+        union { bn_addsub_f f; PTR_SIZE_INT p; } u;
         static const BIGNUM _bignum_nist_p_224_sqr = {
                 (BN_ULONG *)_nist_p_224_sqr,
                 sizeof(_nist_p_224_sqr)/sizeof(_nist_p_224_sqr[0]),
@@ -510,16 +511,18 @@ int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                  * to be compared to the modulus and conditionally
                  * adjusted by *subtracting* the latter. */
                 carry = (int)bn_add_words(r_d,r_d,_nist_p_224[-carry-1],BN_NIST_224_TOP);
-                mask = 0-(size_t)carry;
-                u.p = ((size_t)bn_sub_words&mask) | ((size_t)bn_add_words&~mask);
+                mask = 0-(PTR_SIZE_INT)carry;
+                u.p = ((PTR_SIZE_INT)bn_sub_words&mask) |
+                 ((PTR_SIZE_INT)bn_add_words&~mask);
                 }
         else
                 carry = 1;
 
         /* otherwise it's effectively same as in BN_nist_mod_192... */
-        mask  = 0-(size_t)(*u.f)(c_d,r_d,_nist_p_224[0],BN_NIST_224_TOP);
-        mask &= 0-(size_t)carry;
-        res   = (BN_ULONG *)(((size_t)c_d&~mask) | ((size_t)r_d&mask));
+        mask  = 0-(PTR_SIZE_INT)(*u.f)(c_d,r_d,_nist_p_224[0],BN_NIST_224_TOP);
+        mask &= 0-(PTR_SIZE_INT)carry;
+        res   = (BN_ULONG *)(((PTR_SIZE_INT)c_d&~mask) |
+         ((PTR_SIZE_INT)r_d&mask));
         nist_cp_bn(r_d, res, BN_NIST_224_TOP);
         r->top = BN_NIST_224_TOP;
         bn_correct_top(r);
@@ -549,8 +552,8 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                  buf[BN_NIST_256_TOP],
                  c_d[BN_NIST_256_TOP],
                 *res;
-        size_t   mask;
-        union { bn_addsub_f f; size_t p; } u;
+        PTR_SIZE_INT mask;
+        union { bn_addsub_f f; PTR_SIZE_INT p; } u;
         static const BIGNUM _bignum_nist_p_256_sqr = {
                 (BN_ULONG *)_nist_p_256_sqr,
                 sizeof(_nist_p_256_sqr)/sizeof(_nist_p_256_sqr[0]),
@@ -629,15 +632,17 @@ int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         else if (carry < 0)
                 {
                 carry = (int)bn_add_words(r_d,r_d,_nist_p_256[-carry-1],BN_NIST_256_TOP);
-                mask = 0-(size_t)carry;
-                u.p = ((size_t)bn_sub_words&mask) | ((size_t)bn_add_words&~mask);
+                mask = 0-(PTR_SIZE_INT)carry;
+                u.p = ((PTR_SIZE_INT)bn_sub_words&mask) |
+                 ((PTR_SIZE_INT)bn_add_words&~mask);
                 }
         else
                 carry = 1;
 
-        mask  = 0-(size_t)(*u.f)(c_d,r_d,_nist_p_256[0],BN_NIST_256_TOP);
-        mask &= 0-(size_t)carry;
-        res   = (BN_ULONG *)(((size_t)c_d&~mask) | ((size_t)r_d&mask));
+        mask  = 0-(PTR_SIZE_INT)(*u.f)(c_d,r_d,_nist_p_256[0],BN_NIST_256_TOP);
+        mask &= 0-(PTR_SIZE_INT)carry;
+        res   = (BN_ULONG *)(((PTR_SIZE_INT)c_d&~mask) |
+         ((PTR_SIZE_INT)r_d&mask));
         nist_cp_bn(r_d, res, BN_NIST_256_TOP);
         r->top = BN_NIST_256_TOP;
         bn_correct_top(r);
@@ -671,8 +676,8 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
                  buf[BN_NIST_384_TOP],
                  c_d[BN_NIST_384_TOP],
                 *res;
-        size_t   mask;
-        union { bn_addsub_f f; size_t p; } u;
+        PTR_SIZE_INT mask;
+        union { bn_addsub_f f; PTR_SIZE_INT p; } u;
         static const BIGNUM _bignum_nist_p_384_sqr = {
                 (BN_ULONG *)_nist_p_384_sqr,
                 sizeof(_nist_p_384_sqr)/sizeof(_nist_p_384_sqr[0]),
@@ -754,15 +759,17 @@ int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         else if (carry < 0)
                 {
                 carry = (int)bn_add_words(r_d,r_d,_nist_p_384[-carry-1],BN_NIST_384_TOP);
-                mask = 0-(size_t)carry;
-                u.p = ((size_t)bn_sub_words&mask) | ((size_t)bn_add_words&~mask);
+                mask = 0-(PTR_SIZE_INT)carry;
+                u.p = ((PTR_SIZE_INT)bn_sub_words&mask) |
+                 ((PTR_SIZE_INT)bn_add_words&~mask);
                 }
         else
                 carry = 1;
 
-        mask  = 0-(size_t)(*u.f)(c_d,r_d,_nist_p_384[0],BN_NIST_384_TOP);
-        mask &= 0-(size_t)carry;
-        res   = (BN_ULONG *)(((size_t)c_d&~mask) | ((size_t)r_d&mask));
+        mask  = 0-(PTR_SIZE_INT)(*u.f)(c_d,r_d,_nist_p_384[0],BN_NIST_384_TOP);
+        mask &= 0-(PTR_SIZE_INT)carry;
+        res   = (BN_ULONG *)(((PTR_SIZE_INT)c_d&~mask) |
+         ((PTR_SIZE_INT)r_d&mask));
         nist_cp_bn(r_d, res, BN_NIST_384_TOP);
         r->top = BN_NIST_384_TOP;
         bn_correct_top(r);
@@ -781,7 +788,7 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         BN_ULONG *r_d, *a_d = a->d,
                  t_d[BN_NIST_521_TOP],
                  val,tmp,*res;
-        size_t  mask;
+        PTR_SIZE_INT mask;
         static const BIGNUM _bignum_nist_p_521_sqr = {
                 (BN_ULONG *)_nist_p_521_sqr,
                 sizeof(_nist_p_521_sqr)/sizeof(_nist_p_521_sqr[0]),
@@ -826,8 +833,9 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
         r_d[i] &= BN_NIST_521_TOP_MASK;
 
         bn_add_words(r_d,r_d,t_d,BN_NIST_521_TOP);
-        mask = 0-(size_t)bn_sub_words(t_d,r_d,_nist_p_521,BN_NIST_521_TOP);
-        res  = (BN_ULONG *)(((size_t)t_d&~mask) | ((size_t)r_d&mask));
+        mask = 0-(PTR_SIZE_INT)bn_sub_words(t_d,r_d,_nist_p_521,BN_NIST_521_TOP);
+        res  = (BN_ULONG *)(((PTR_SIZE_INT)t_d&~mask) |
+         ((PTR_SIZE_INT)r_d&mask));
         nist_cp_bn(r_d,res,BN_NIST_521_TOP);
         r->top = BN_NIST_521_TOP;
         bn_correct_top(r);
diff --git a/src/lib/libcrypto/comp/c_rle.c b/src/lib/libcrypto/comp/c_rle.c
index efd366fa22..18bceae51e 100644
--- a/src/lib/libcrypto/comp/c_rle.c
+++ b/src/lib/libcrypto/comp/c_rle.c
@@ -46,7 +46,7 @@ static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
         {
         int i;
 
-        if (olen < (ilen-1))
+        if (ilen == 0 || olen < (ilen-1))
                 {
                 /* ZZZZZZZZZZZZZZZZZZZZZZ */
                 return(-1);
@@ -59,4 +59,3 @@ static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
                 }
         return(ilen-1);
         }
-
diff --git a/src/lib/libcrypto/conf/conf_api.c b/src/lib/libcrypto/conf/conf_api.c
index 22617e5fa1..f5fcbb9f6b 100644
--- a/src/lib/libcrypto/conf/conf_api.c
+++ b/src/lib/libcrypto/conf/conf_api.c
@@ -64,6 +64,7 @@
 #endif
 
 #include <assert.h>
+#include <stdlib.h>
 #include <string.h>
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
@@ -285,7 +286,7 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section)
         v->value=(char *)sk;
         
         vv=lh_CONF_VALUE_insert(conf->data,v);
-        assert(vv == NULL);
+        OPENSSL_assert(vv == NULL);
         ok=1;
 err:
         if (!ok)
diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index 0b571b0394..cf951320af 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -213,13 +213,12 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
         int bufnum=0,i,ii;
         BUF_MEM *buff=NULL;
         char *s,*p,*end;
-        int again,n;
+        int again;
         long eline=0;
         char btmp[DECIMAL_SIZE(eline)+1];
         CONF_VALUE *v=NULL,*tv;
         CONF_VALUE *sv=NULL;
         char *section=NULL,*buf;
-        STACK_OF(CONF_VALUE) *section_sk=NULL,*ts;
         char *start,*psection,*pname;
         void *h = (void *)(conf->data);
 
@@ -250,7 +249,6 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                                         CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
                 goto err;
                 }
-        section_sk=(STACK_OF(CONF_VALUE) *)sv->value;
 
         bufnum=0;
         again=0;
@@ -309,7 +307,6 @@ static int def_load_bio(CONF *conf, BIO *in, long *line)
                 buf=buff->data;
 
                 clear_comments(conf, buf);
-                n=strlen(buf);
                 s=eat_ws(conf, buf);
                 if (IS_EOF(conf,*s)) continue; /* blank line */
                 if (*s == '[')
@@ -343,7 +340,6 @@ again:
                                         CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
                                 goto err;
                                 }
-                        section_sk=(STACK_OF(CONF_VALUE) *)sv->value;
                         continue;
                         }
                 else
@@ -406,13 +402,9 @@ again:
                                            CONF_R_UNABLE_TO_CREATE_NEW_SECTION);
                                         goto err;
                                         }
-                                ts=(STACK_OF(CONF_VALUE) *)tv->value;
                                 }
                         else
-                                {
                                 tv=sv;
-                                ts=section_sk;
-                                }
 #if 1
                         if (_CONF_add_string(conf, tv, v) == 0)
                                 {
@@ -465,9 +457,6 @@ err:
 
 static void clear_comments(CONF *conf, char *p)
         {
-        char *to;
-
-        to=p;
         for (;;)
                 {
                 if (IS_FCOMMENT(conf,*p))
diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index b4449b86d6..24fe123e14 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/cryptlib.c
@@ -731,7 +731,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
         case DLL_THREAD_ATTACH:
                 break;
         case DLL_THREAD_DETACH:
-                ERR_remove_state(0);
                 break;
         case DLL_PROCESS_DETACH:
                 break;
@@ -743,6 +742,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include <tchar.h>
 #include <signal.h>
+#ifdef __WATCOMC__
+#if defined(_UNICODE) || defined(__UNICODE__)
+#define _vsntprintf _vsnwprintf
+#else
+#define _vsntprintf _vsnprintf
+#endif
+#endif
+#ifdef _MSC_VER
+#define alloca _alloca
+#endif
 
 #if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
 int OPENSSL_isservice(void)
@@ -773,11 +782,7 @@ int OPENSSL_isservice(void)
 
     if (len>512) return -1;             /* paranoia */
     len++,len&=~1;                      /* paranoia */
-#ifdef _MSC_VER
-    name=(WCHAR *)_alloca(len+sizeof(WCHAR));
-#else
     name=(WCHAR *)alloca(len+sizeof(WCHAR));
-#endif
     if (!GetUserObjectInformationW (h,UOI_NAME,name,len,&len))
         return -1;
 
@@ -822,11 +827,7 @@ void OPENSSL_showfatal (const char *fmta,...)
       size_t len_0=strlen(fmta)+1,i;
       WCHAR *fmtw;
 
-#ifdef _MSC_VER
-        fmtw = (WCHAR *)_alloca (len_0*sizeof(WCHAR));
-#else
-        fmtw = (WCHAR *)alloca (len_0*sizeof(WCHAR));
-#endif
+        fmtw = (WCHAR *)alloca(len_0*sizeof(WCHAR));
         if (fmtw == NULL) { fmt=(const TCHAR *)L"no stack?"; break; }
 
 #ifndef OPENSSL_NO_MULTIBYTE
diff --git a/src/lib/libcrypto/doc/EVP_PKEY_verify.pod b/src/lib/libcrypto/doc/EVP_PKEY_verify.pod
index 10633da3f2..f93e5fc6c3 100644
--- a/src/lib/libcrypto/doc/EVP_PKEY_verify.pod
+++ b/src/lib/libcrypto/doc/EVP_PKEY_verify.pod
@@ -69,7 +69,7 @@ Verify signature using PKCS#1 and SHA256 digest:
         /* Error */
 
  /* Perform operation */
- ret = EVP_PKEY_verify(ctx, md, mdlen, sig, siglen);
+ ret = EVP_PKEY_verify(ctx, sig, siglen, md, mdlen);
 
  /* ret == 1 indicates success, 0 verify failure and < 0 for some
   * other error.
diff --git a/src/lib/libcrypto/dsa/dsa_gen.c b/src/lib/libcrypto/dsa/dsa_gen.c
index 0fcd25f8b0..cb0b4538a4 100644
--- a/src/lib/libcrypto/dsa/dsa_gen.c
+++ b/src/lib/libcrypto/dsa/dsa_gen.c
@@ -120,7 +120,7 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
         BIGNUM *r0,*W,*X,*c,*test;
         BIGNUM *g=NULL,*q=NULL,*p=NULL;
         BN_MONT_CTX *mont=NULL;
-        int i, k,n=0,b,m=0, qsize = qbits >> 3;
+        int i, k, n=0, m=0, qsize = qbits >> 3;
         int counter=0;
         int r=0;
         BN_CTX *ctx=NULL;
@@ -232,7 +232,6 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
                 /* "offset = 2" */
 
                 n=(bits-1)/160;
-                b=(bits-1)-n*160;
 
                 for (;;)
                         {
diff --git a/src/lib/libcrypto/dsa/dsa_ossl.c b/src/lib/libcrypto/dsa/dsa_ossl.c
index 4fead07e80..a3ddd7d281 100644
--- a/src/lib/libcrypto/dsa/dsa_ossl.c
+++ b/src/lib/libcrypto/dsa/dsa_ossl.c
@@ -148,15 +148,6 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
 
         s=BN_new();
         if (s == NULL) goto err;
-
-        /* reject a excessive digest length (currently at most
-         * dsa-with-SHA256 is supported) */
-        if (dlen > SHA256_DIGEST_LENGTH)
-                {
-                reason=DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE;
-                goto err;
-                }
-
         ctx=BN_CTX_new();
         if (ctx == NULL) goto err;
 
@@ -185,7 +176,7 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
         if (!BN_mod_mul(&xr,dsa->priv_key,r,dsa->q,ctx)) goto err;/* s = xr */
         if (!BN_add(s, &xr, &m)) goto err;              /* s = m + xr */
         if (BN_cmp(s,dsa->q) > 0)
-                BN_sub(s,s,dsa->q);
+                if (!BN_sub(s,s,dsa->q)) goto err;
         if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err;
 
         ret=DSA_SIG_new();
@@ -325,15 +316,6 @@ static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
                 DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE);
                 return -1;
                 }
-
-        /* reject a excessive digest length (currently at most
-         * dsa-with-SHA256 is supported) */
-        if (dgst_len > SHA256_DIGEST_LENGTH)
-                {
-                DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-                return -1;
-                }
-
         BN_init(&u1);
         BN_init(&u2);
         BN_init(&t1);
diff --git a/src/lib/libcrypto/dsa/dsa_pmeth.c b/src/lib/libcrypto/dsa/dsa_pmeth.c
index 4ce91e20c6..e2df54fec6 100644
--- a/src/lib/libcrypto/dsa/dsa_pmeth.c
+++ b/src/lib/libcrypto/dsa/dsa_pmeth.c
@@ -187,6 +187,7 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                 case EVP_PKEY_CTRL_MD:
                 if (EVP_MD_type((const EVP_MD *)p2) != NID_sha1   &&
                     EVP_MD_type((const EVP_MD *)p2) != NID_dsa    &&
+                    EVP_MD_type((const EVP_MD *)p2) != NID_dsaWithSHA    &&
                     EVP_MD_type((const EVP_MD *)p2) != NID_sha224 &&
                     EVP_MD_type((const EVP_MD *)p2) != NID_sha256)
                         {
diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c
index 14bd322fb8..c2bc61760b 100644
--- a/src/lib/libcrypto/dso/dso_dlfcn.c
+++ b/src/lib/libcrypto/dso/dso_dlfcn.c
@@ -85,6 +85,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
 # define HAVE_DLINFO 1
 # if defined(_AIX) || defined(__CYGWIN__) || \
      defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
+     (defined(__osf__) && !defined(RTLD_NEXT))     || \
      (defined(__OpenBSD__) && !defined(RTLD_SELF))
 #  undef HAVE_DLINFO
 # endif
diff --git a/src/lib/libcrypto/ec/ec2_mult.c b/src/lib/libcrypto/ec/ec2_mult.c
index ab631a50a2..e12b9b284a 100644
--- a/src/lib/libcrypto/ec/ec2_mult.c
+++ b/src/lib/libcrypto/ec/ec2_mult.c
@@ -319,6 +319,7 @@ int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
         int ret = 0;
         size_t i;
         EC_POINT *p=NULL;
+        EC_POINT *acc = NULL;
 
         if (ctx == NULL)
                 {
@@ -338,15 +339,16 @@ int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
                 }
 
         if ((p = EC_POINT_new(group)) == NULL) goto err;
+        if ((acc = EC_POINT_new(group)) == NULL) goto err;
 
-        if (!EC_POINT_set_to_infinity(group, r)) goto err;
+        if (!EC_POINT_set_to_infinity(group, acc)) goto err;
 
         if (scalar)
                 {
                 if (!ec_GF2m_montgomery_point_multiply(group, p, scalar, group->generator, ctx)) goto err;
-                if (BN_is_negative(scalar)) 
+                if (BN_is_negative(scalar))
                         if (!group->meth->invert(group, p, ctx)) goto err;
-                if (!group->meth->add(group, r, r, p, ctx)) goto err;
+                if (!group->meth->add(group, acc, acc, p, ctx)) goto err;
                 }
 
         for (i = 0; i < num; i++)
@@ -354,13 +356,16 @@ int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
                 if (!ec_GF2m_montgomery_point_multiply(group, p, scalars[i], points[i], ctx)) goto err;
                 if (BN_is_negative(scalars[i]))
                         if (!group->meth->invert(group, p, ctx)) goto err;
-                if (!group->meth->add(group, r, r, p, ctx)) goto err;
+                if (!group->meth->add(group, acc, acc, p, ctx)) goto err;
                 }
 
+        if (!EC_POINT_copy(r, acc)) goto err;
+
         ret = 1;
 
   err:
         if (p) EC_POINT_free(p);
+        if (acc) EC_POINT_free(acc);
         if (new_ctx != NULL)
                 BN_CTX_free(new_ctx);
         return ret;
diff --git a/src/lib/libcrypto/ec/ec2_smpl.c b/src/lib/libcrypto/ec/ec2_smpl.c
index cf357b462a..af94458ca7 100644
--- a/src/lib/libcrypto/ec/ec2_smpl.c
+++ b/src/lib/libcrypto/ec/ec2_smpl.c
@@ -937,6 +937,9 @@ int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT
                 {
                 return EC_POINT_is_at_infinity(group, b) ? 0 : 1;
                 }
+
+        if (EC_POINT_is_at_infinity(group, b))
+                return 1;
         
         if (a->Z_is_one && b->Z_is_one)
                 {
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c
index 12fb0e6d6d..522802c07a 100644
--- a/src/lib/libcrypto/ec/ec_key.c
+++ b/src/lib/libcrypto/ec/ec_key.c
@@ -304,7 +304,13 @@ int EC_KEY_check_key(const EC_KEY *eckey)
                 ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_PASSED_NULL_PARAMETER);
                 return 0;
                 }
-        
+
+        if (EC_POINT_is_at_infinity(eckey->group, eckey->pub_key))
+                {
+                ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_AT_INFINITY);
+                goto err;
+                }
+
         if ((ctx = BN_CTX_new()) == NULL)
                 goto err;
         if ((point = EC_POINT_new(eckey->group)) == NULL)
diff --git a/src/lib/libcrypto/ec/ec_mult.c b/src/lib/libcrypto/ec/ec_mult.c
index f05df5332e..19f21675fb 100644
--- a/src/lib/libcrypto/ec/ec_mult.c
+++ b/src/lib/libcrypto/ec/ec_mult.c
@@ -169,11 +169,13 @@ static void ec_pre_comp_clear_free(void *pre_)
                 EC_POINT **p;
 
                 for (p = pre->points; *p != NULL; p++)
+                        {
                         EC_POINT_clear_free(*p);
-                OPENSSL_cleanse(pre->points, sizeof pre->points);
+                        OPENSSL_cleanse(p, sizeof *p);
+                        }
                 OPENSSL_free(pre->points);
                 }
-        OPENSSL_cleanse(pre, sizeof pre);
+        OPENSSL_cleanse(pre, sizeof *pre);
         OPENSSL_free(pre);
         }
 
diff --git a/src/lib/libcrypto/ec/ecp_smpl.c b/src/lib/libcrypto/ec/ecp_smpl.c
index 4d26f8bdf6..66a92e2a90 100644
--- a/src/lib/libcrypto/ec/ecp_smpl.c
+++ b/src/lib/libcrypto/ec/ecp_smpl.c
@@ -1406,6 +1406,9 @@ int ec_GFp_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *
                 {
                 return EC_POINT_is_at_infinity(group, b) ? 0 : 1;
                 }
+
+        if (EC_POINT_is_at_infinity(group, b))
+                return 1;
         
         if (a->Z_is_one && b->Z_is_one)
                 {
diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c
index e89b1d4772..4d8ea03d3d 100644
--- a/src/lib/libcrypto/ecdh/ech_lib.c
+++ b/src/lib/libcrypto/ecdh/ech_lib.c
@@ -96,7 +96,6 @@ const ECDH_METHOD *ECDH_get_default_method(void)
 
 int ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth)
         {
-        const ECDH_METHOD *mtmp;
         ECDH_DATA *ecdh;
 
         ecdh = ecdh_check(eckey);
@@ -104,8 +103,8 @@ int ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth)
         if (ecdh == NULL)
                 return 0;
 
-        mtmp = ecdh->meth;
 #if 0
+        mtmp = ecdh->meth;
         if (mtmp->finish)
                 mtmp->finish(eckey);
 #endif
diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c
index 85e8a3a7ed..2ebae3aa27 100644
--- a/src/lib/libcrypto/ecdsa/ecs_lib.c
+++ b/src/lib/libcrypto/ecdsa/ecs_lib.c
@@ -83,7 +83,6 @@ const ECDSA_METHOD *ECDSA_get_default_method(void)
 
 int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth)
 {
-        const ECDSA_METHOD *mtmp;
         ECDSA_DATA *ecdsa;
 
         ecdsa = ecdsa_check(eckey);
@@ -91,7 +90,6 @@ int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth)
         if (ecdsa == NULL)
                 return 0;
 
-        mtmp = ecdsa->meth;
 #ifndef OPENSSL_NO_ENGINE
         if (ecdsa->engine)
         {
diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c
index 551cf5068f..1bbf328de5 100644
--- a/src/lib/libcrypto/ecdsa/ecs_ossl.c
+++ b/src/lib/libcrypto/ecdsa/ecs_ossl.c
@@ -144,6 +144,14 @@ static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
                         }
                 while (BN_is_zero(k));
 
+                /* We do not want timing information to leak the length of k,
+                 * so we compute G*k using an equivalent scalar of fixed
+                 * bit-length. */
+
+                if (!BN_add(k, k, order)) goto err;
+                if (BN_num_bits(k) <= BN_num_bits(order))
+                        if (!BN_add(k, k, order)) goto err;
+
                 /* compute r the x-coordinate of generator * k */
                 if (!EC_POINT_mul(group, tmp_point, k, NULL, NULL, ctx))
                 {
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index 7fbd95f634..943aeae215 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -677,6 +677,7 @@ typedef struct st_dynamic_fns {
  * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */
 typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
 #define IMPLEMENT_DYNAMIC_CHECK_FN() \
+        OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
         OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
                 if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
                 return 0; }
@@ -700,6 +701,8 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
                                 const dynamic_fns *fns);
 #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
         OPENSSL_EXPORT \
+        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
+        OPENSSL_EXPORT \
         int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
                 if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
                 if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
diff --git a/src/lib/libcrypto/evp/encode.c b/src/lib/libcrypto/evp/encode.c
index b42c747249..28546a84bc 100644
--- a/src/lib/libcrypto/evp/encode.c
+++ b/src/lib/libcrypto/evp/encode.c
@@ -235,7 +235,7 @@ void EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
 int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
              const unsigned char *in, int inl)
         {
-        int seof= -1,eof=0,rv= -1,ret=0,i,v,tmp,n,ln,tmp2,exp_nl;
+        int seof= -1,eof=0,rv= -1,ret=0,i,v,tmp,n,ln,exp_nl;
         unsigned char *d;
 
         n=ctx->num;
@@ -319,7 +319,6 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
                          * lines.  We process the line and then need to
                          * accept the '\n' */
                         if ((v != B64_EOF) && (n >= 64)) exp_nl=1;
-                        tmp2=v;
                         if (n > 0)
                                 {
                                 v=EVP_DecodeBlock(out,d,n);
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c
index bead6a2170..c268d25cb4 100644
--- a/src/lib/libcrypto/evp/evp_enc.c
+++ b/src/lib/libcrypto/evp/evp_enc.c
@@ -204,6 +204,7 @@ skip_to_init:
                         case EVP_CIPH_OFB_MODE:
 
                         ctx->num = 0;
+                        /* fall-through */
 
                         case EVP_CIPH_CBC_MODE:
 
diff --git a/src/lib/libcrypto/evp/m_sigver.c b/src/lib/libcrypto/evp/m_sigver.c
index f0b7f95059..7e2731f4a4 100644
--- a/src/lib/libcrypto/evp/m_sigver.c
+++ b/src/lib/libcrypto/evp/m_sigver.c
@@ -137,7 +137,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
                 sctx = 0;
         if (sigret)
                 {
-                MS_STATIC EVP_MD_CTX tmp_ctx;
+                EVP_MD_CTX tmp_ctx;
                 unsigned char md[EVP_MAX_MD_SIZE];
                 unsigned int mdlen;
                 EVP_MD_CTX_init(&tmp_ctx);
@@ -173,7 +173,7 @@ int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, size_t *siglen)
 
 int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen)
         {
-        MS_STATIC EVP_MD_CTX tmp_ctx;
+        EVP_MD_CTX tmp_ctx;
         unsigned char md[EVP_MAX_MD_SIZE];
         int r;
         unsigned int mdlen;
diff --git a/src/lib/libcrypto/evp/p_lib.c b/src/lib/libcrypto/evp/p_lib.c
index 1916c61699..e26ccd0d08 100644
--- a/src/lib/libcrypto/evp/p_lib.c
+++ b/src/lib/libcrypto/evp/p_lib.c
@@ -411,7 +411,10 @@ void EVP_PKEY_free(EVP_PKEY *x)
 static void EVP_PKEY_free_it(EVP_PKEY *x)
         {
         if (x->ameth && x->ameth->pkey_free)
+                {
                 x->ameth->pkey_free(x);
+                x->pkey.ptr = NULL;
+                }
 #ifndef OPENSSL_NO_ENGINE
         if (x->engine)
                 {
diff --git a/src/lib/libcrypto/evp/p_sign.c b/src/lib/libcrypto/evp/p_sign.c
index 8df6d48a7e..bb893f5bde 100644
--- a/src/lib/libcrypto/evp/p_sign.c
+++ b/src/lib/libcrypto/evp/p_sign.c
@@ -81,7 +81,7 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret, unsigned int *siglen,
         unsigned char m[EVP_MAX_MD_SIZE];
         unsigned int m_len;
         int i,ok=0,v;
-        MS_STATIC EVP_MD_CTX tmp_ctx;
+        EVP_MD_CTX tmp_ctx;
 
         *siglen=0;
         EVP_MD_CTX_init(&tmp_ctx);
diff --git a/src/lib/libcrypto/evp/p_verify.c b/src/lib/libcrypto/evp/p_verify.c
index 8db46412f3..41d4b67130 100644
--- a/src/lib/libcrypto/evp/p_verify.c
+++ b/src/lib/libcrypto/evp/p_verify.c
@@ -68,7 +68,7 @@ int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
         unsigned char m[EVP_MAX_MD_SIZE];
         unsigned int m_len;
         int i,ok=0,v;
-        MS_STATIC EVP_MD_CTX tmp_ctx;
+        EVP_MD_CTX tmp_ctx;
 
         EVP_MD_CTX_init(&tmp_ctx);
         EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);     
diff --git a/src/lib/libcrypto/evp/pmeth_lib.c b/src/lib/libcrypto/evp/pmeth_lib.c
index b2d8de3a8d..5481d4b8a5 100644
--- a/src/lib/libcrypto/evp/pmeth_lib.c
+++ b/src/lib/libcrypto/evp/pmeth_lib.c
@@ -134,6 +134,8 @@ static EVP_PKEY_CTX *int_ctx_new(EVP_PKEY *pkey, ENGINE *e, int id)
                 id = pkey->ameth->pkey_id;
                 }
 #ifndef OPENSSL_NO_ENGINE
+        if (pkey && pkey->engine)
+                e = pkey->engine;
         /* Try to find an ENGINE which implements this method */
         if (e)
                 {
diff --git a/src/lib/libcrypto/hmac/hm_pmeth.c b/src/lib/libcrypto/hmac/hm_pmeth.c
index 985921ca1a..71e8567a14 100644
--- a/src/lib/libcrypto/hmac/hm_pmeth.c
+++ b/src/lib/libcrypto/hmac/hm_pmeth.c
@@ -147,6 +147,8 @@ static int int_update(EVP_MD_CTX *ctx,const void *data,size_t count)
 
 static int hmac_signctx_init(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx)
         {
+        HMAC_PKEY_CTX *hctx = ctx->data;
+        HMAC_CTX_set_flags(&hctx->ctx, mctx->flags & ~EVP_MD_CTX_FLAG_NO_INIT);
         EVP_MD_CTX_set_flags(mctx, EVP_MD_CTX_FLAG_NO_INIT);
         mctx->update = int_update;
         return 1;
diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c
index 45015fe754..6c98fc43a3 100644
--- a/src/lib/libcrypto/hmac/hmac.c
+++ b/src/lib/libcrypto/hmac/hmac.c
@@ -138,12 +138,9 @@ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
 
 int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
         {
-        int j;
         unsigned int i;
         unsigned char buf[EVP_MAX_MD_SIZE];
 
-        j=EVP_MD_block_size(ctx->md);
-
         if (!EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i))
                 goto err;
         if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx))
diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h
index 1cb783944e..bb7381952a 100644
--- a/src/lib/libcrypto/md32_common.h
+++ b/src/lib/libcrypto/md32_common.h
@@ -165,7 +165,7 @@
                                 asm (                   \
                                 "roll %1,%0"            \
                                 : "=r"(ret)             \
-                                : "I"(n), "0"(a)        \
+                                : "I"(n), "0"((unsigned int)(a))        \
                                 : "cc");                \
                            ret;                         \
                         })
@@ -383,6 +383,7 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
         }
 
 #ifndef MD32_REG_T
+#if defined(__alpha) || defined(__sparcv9) || defined(__mips)
 #define MD32_REG_T long
 /*
  * This comment was originaly written for MD5, which is why it
@@ -400,9 +401,15 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
  * Well, to be honest it should say that this *prevents* 
  * performance degradation.
  *                              <appro@fy.chalmers.se>
- * Apparently there're LP64 compilers that generate better
- * code if A-D are declared int. Most notably GCC-x86_64
- * generates better code.
+ */
+#else
+/*
+ * Above is not absolute and there are LP64 compilers that
+ * generate better code if MD32_REG_T is defined int. The above
+ * pre-processor condition reflects the circumstances under which
+ * the conclusion was made and is subject to further extension.
  *                              <appro@fy.chalmers.se>
  */
+#define MD32_REG_T int
+#endif
 #endif
diff --git a/src/lib/libcrypto/o_time.c b/src/lib/libcrypto/o_time.c
index eecbdd19f0..9030fdef7a 100644
--- a/src/lib/libcrypto/o_time.c
+++ b/src/lib/libcrypto/o_time.c
@@ -64,12 +64,18 @@
 #include "o_time.h"
 
 #ifdef OPENSSL_SYS_VMS
-# include <libdtdef.h>
-# include <lib$routines.h>
-# include <lnmdef.h>
-# include <starlet.h>
-# include <descrip.h>
-# include <stdlib.h>
+# if __CRTL_VER >= 70000000 && \
+     (defined _POSIX_C_SOURCE || !defined _ANSI_C_SOURCE)
+#  define VMS_GMTIME_OK
+# endif
+# ifndef VMS_GMTIME_OK
+#  include <libdtdef.h>
+#  include <lib$routines.h>
+#  include <lnmdef.h>
+#  include <starlet.h>
+#  include <descrip.h>
+#  include <stdlib.h>
+# endif /* ndef VMS_GMTIME_OK */
 #endif
 
 struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
@@ -81,7 +87,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
            so we don't even look at the return value */
         gmtime_r(timer,result);
         ts = result;
-#elif !defined(OPENSSL_SYS_VMS)
+#elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
         ts = gmtime(timer);
         if (ts == NULL)
                 return NULL;
@@ -89,7 +95,7 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
         memcpy(result, ts, sizeof(struct tm));
         ts = result;
 #endif
-#ifdef OPENSSL_SYS_VMS
+#if defined( OPENSSL_SYS_VMS) && !defined( VMS_GMTIME_OK)
         if (ts == NULL)
                 {
                 static $DESCRIPTOR(tabnam,"LNM$DCL_LOGICAL");
diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c
index 12bbfcffd1..af5fc16691 100644
--- a/src/lib/libcrypto/ocsp/ocsp_ht.c
+++ b/src/lib/libcrypto/ocsp/ocsp_ht.c
@@ -397,11 +397,12 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
 
 
                 case OHS_ASN1_HEADER:
-                /* Now reading ASN1 header: can read at least 6 bytes which
-                 * is more than enough for any valid ASN1 SEQUENCE header
+                /* Now reading ASN1 header: can read at least 2 bytes which
+                 * is enough for ASN1 SEQUENCE header and either length field
+                 * or at least the length of the length field.
                  */
                 n = BIO_get_mem_data(rctx->mem, &p);
-                if (n < 6)
+                if (n < 2)
                         goto next_io;
 
                 /* Check it is an ASN1 SEQUENCE */
@@ -414,6 +415,11 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
                 /* Check out length field */
                 if (*p & 0x80)
                         {
+                        /* If MSB set on initial length octet we can now
+                         * always read 6 octets: make sure we have them.
+                         */
+                        if (n < 6)
+                                goto next_io;
                         n = *p & 0x7F;
                         /* Not NDEF or excessive length */
                         if (!n || (n > 4))
diff --git a/src/lib/libcrypto/ocsp/ocsp_lib.c b/src/lib/libcrypto/ocsp/ocsp_lib.c
index 36905d76cd..e92b86c060 100644
--- a/src/lib/libcrypto/ocsp/ocsp_lib.c
+++ b/src/lib/libcrypto/ocsp/ocsp_lib.c
@@ -170,14 +170,14 @@ int OCSP_parse_url(char *url, char **phost, char **pport, char **ppath, int *pss
 
         char *host, *port;
 
-        /* dup the buffer since we are going to mess with it */
-        buf = BUF_strdup(url);
-        if (!buf) goto mem_err;
-
         *phost = NULL;
         *pport = NULL;
         *ppath = NULL;
 
+        /* dup the buffer since we are going to mess with it */
+        buf = BUF_strdup(url);
+        if (!buf) goto mem_err;
+
         /* Check for initial colon */
         p = strchr(buf, ':');
 
diff --git a/src/lib/libcrypto/ocsp/ocsp_prn.c b/src/lib/libcrypto/ocsp/ocsp_prn.c
index 1695c9c4ad..87608ff399 100644
--- a/src/lib/libcrypto/ocsp/ocsp_prn.c
+++ b/src/lib/libcrypto/ocsp/ocsp_prn.c
@@ -182,7 +182,6 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
         {
         int i, ret = 0;
         long l;
-        unsigned char *p;
         OCSP_CERTID *cid = NULL;
         OCSP_BASICRESP *br = NULL;
         OCSP_RESPID *rid = NULL;
@@ -207,7 +206,6 @@ int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
                 return 1;
                 }
 
-        p = ASN1_STRING_data(rb->response);
         i = ASN1_STRING_length(rb->response);
         if (!(br = OCSP_response_get1_basic(o))) goto err;
         rd = br->tbsResponseData;
diff --git a/src/lib/libcrypto/opensslv.h b/src/lib/libcrypto/opensslv.h
index 2fb110fa0e..310a3387be 100644
--- a/src/lib/libcrypto/opensslv.h
+++ b/src/lib/libcrypto/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER  0x1000001fL
+#define OPENSSL_VERSION_NUMBER  0x1000005fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0a-fips 1 Jun 2010"
+#define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0e-fips 6 Sep 2011"
 #else
-#define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0a 1 Jun 2010"
+#define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0e 6 Sep 2011"
 #endif
 #define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 42e4861bc1..cfc89a9921 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -482,7 +482,6 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
 
 int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
         {
-        int o;
         const EVP_CIPHER *enc=NULL;
         char *p,c;
         char **header_pp = &header;
@@ -522,7 +521,6 @@ int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
                 header++;
                 }
         *header='\0';
-        o=OBJ_sn2nid(p);
         cipher->cipher=enc=EVP_get_cipherbyname(p);
         *header=c;
         header++;
diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c
index d998a67fa5..5f130c4528 100644
--- a/src/lib/libcrypto/pem/pvkfmt.c
+++ b/src/lib/libcrypto/pem/pvkfmt.c
@@ -662,7 +662,7 @@ static int do_PVK_header(const unsigned char **in, unsigned int length,
                 
         {
         const unsigned char *p = *in;
-        unsigned int pvk_magic, keytype, is_encrypted;
+        unsigned int pvk_magic, is_encrypted;
         if (skip_magic)
                 {
                 if (length < 20)
@@ -689,7 +689,7 @@ static int do_PVK_header(const unsigned char **in, unsigned int length,
                 }
         /* Skip reserved */
         p += 4;
-        keytype = read_ledword(&p);
+        /*keytype = */read_ledword(&p);
         is_encrypted = read_ledword(&p);
         *psaltlen = read_ledword(&p);
         *pkeylen = read_ledword(&p);
@@ -839,7 +839,7 @@ EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u)
 static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
                 pem_password_cb *cb, void *u)
         {
-        int outlen = 24, noinc, pklen;
+        int outlen = 24, pklen;
         unsigned char *p, *salt = NULL;
         if (enclevel)
                 outlen += PVK_SALTLEN;
@@ -850,10 +850,7 @@ static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
         if (!out)
                 return outlen;
         if (*out)
-                {
                 p = *out;
-                noinc = 0;
-                }
         else
                 {
                 p = OPENSSL_malloc(outlen);
@@ -863,7 +860,6 @@ static int i2b_PVK(unsigned char **out, EVP_PKEY*pk, int enclevel,
                         return -1;
                         }
                 *out = p;
-                noinc = 1;
                 }
 
         write_ledword(&p, MS_PVKMAGIC);
diff --git a/src/lib/libcrypto/perlasm/cbc.pl b/src/lib/libcrypto/perlasm/cbc.pl
index e43dc9ae15..6fc2510905 100644
--- a/src/lib/libcrypto/perlasm/cbc.pl
+++ b/src/lib/libcrypto/perlasm/cbc.pl
@@ -158,7 +158,6 @@ sub cbc
         &jmp_ptr($count);
 
 &set_label("ej7");
-        &xor("edx",             "edx") if $ppro; # ppro friendly
         &movb(&HB("edx"),       &BP(6,$in,"",0));
         &shl("edx",8);
 &set_label("ej6");
@@ -170,7 +169,6 @@ sub cbc
         &jmp(&label("ejend"));
 &set_label("ej3");
         &movb(&HB("ecx"),       &BP(2,$in,"",0));
-        &xor("ecx",             "ecx") if $ppro; # ppro friendly
         &shl("ecx",8);
 &set_label("ej2");
         &movb(&HB("ecx"),       &BP(1,$in,"",0));
diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
index 354673acc1..e47116b74b 100755
--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
@@ -167,7 +167,7 @@ my %globals;
             } elsif ($self->{op} =~ /^(pop|push)f/) {
                 $self->{op} .= $self->{sz};
             } elsif ($self->{op} eq "call" && $current_segment eq ".CRT\$XCU") {
-                $self->{op} = "ALIGN\t8\n\tDQ";
+                $self->{op} = "\tDQ";
             } 
             $self->{op};
         }
@@ -545,6 +545,8 @@ my %globals;
                                         if ($line=~/\.([px])data/) {
                                             $v.=" rdata align=";
                                             $v.=$1 eq "p"? 4 : 8;
+                                        } elsif ($line=~/\.CRT\$/i) {
+                                            $v.=" rdata align=8";
                                         }
                                     } else {
                                         $v="$current_segment\tENDS\n" if ($current_segment);
@@ -552,6 +554,8 @@ my %globals;
                                         if ($line=~/\.([px])data/) {
                                             $v.=" READONLY";
                                             $v.=" ALIGN(".($1 eq "p" ? 4 : 8).")" if ($masm>=$masmref);
+                                        } elsif ($line=~/\.CRT\$/i) {
+                                            $v.=" READONLY DWORD";
                                         }
                                     }
                                     $current_segment = $line;
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c
index a29794bbbc..424203f648 100644
--- a/src/lib/libcrypto/pkcs12/p12_key.c
+++ b/src/lib/libcrypto/pkcs12/p12_key.c
@@ -107,6 +107,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
         unsigned char *B, *D, *I, *p, *Ai;
         int Slen, Plen, Ilen, Ijlen;
         int i, j, u, v;
+        int ret = 0;
         BIGNUM *Ij, *Bpl1;      /* These hold Ij and B + 1 */
         EVP_MD_CTX ctx;
 #ifdef  DEBUG_KEYGEN
@@ -144,10 +145,8 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
         I = OPENSSL_malloc (Ilen);
         Ij = BN_new();
         Bpl1 = BN_new();
-        if (!D || !Ai || !B || !I || !Ij || !Bpl1) {
-                PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI,ERR_R_MALLOC_FAILURE);
-                return 0;
-        }
+        if (!D || !Ai || !B || !I || !Ij || !Bpl1)
+                goto err;
         for (i = 0; i < v; i++) D[i] = id;
         p = I;
         for (i = 0; i < Slen; i++) *p++ = salt[i % saltlen];
@@ -164,28 +163,22 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                 }
                 memcpy (out, Ai, min (n, u));
                 if (u >= n) {
-                        OPENSSL_free (Ai);
-                        OPENSSL_free (B);
-                        OPENSSL_free (D);
-                        OPENSSL_free (I);
-                        BN_free (Ij);
-                        BN_free (Bpl1);
-                        EVP_MD_CTX_cleanup(&ctx);
 #ifdef DEBUG_KEYGEN
                         fprintf(stderr, "Output KEY (length %d)\n", tmpn);
                         h__dump(tmpout, tmpn);
 #endif
-                        return 1;       
+                        ret = 1;
+                        goto end;
                 }
                 n -= u;
                 out += u;
                 for (j = 0; j < v; j++) B[j] = Ai[j % u];
                 /* Work out B + 1 first then can use B as tmp space */
-                BN_bin2bn (B, v, Bpl1);
-                BN_add_word (Bpl1, 1);
+                if (!BN_bin2bn (B, v, Bpl1)) goto err;
+                if (!BN_add_word (Bpl1, 1)) goto err;
                 for (j = 0; j < Ilen ; j+=v) {
-                        BN_bin2bn (I + j, v, Ij);
-                        BN_add (Ij, Ij, Bpl1);
+                        if (!BN_bin2bn (I + j, v, Ij)) goto err;
+                        if (!BN_add (Ij, Ij, Bpl1)) goto err;
                         BN_bn2bin (Ij, B);
                         Ijlen = BN_num_bytes (Ij);
                         /* If more than 2^(v*8) - 1 cut off MSB */
@@ -201,6 +194,19 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                         } else BN_bn2bin (Ij, I + j);
                 }
         }
+
+err:
+        PKCS12err(PKCS12_F_PKCS12_KEY_GEN_UNI,ERR_R_MALLOC_FAILURE);
+
+end:
+        OPENSSL_free (Ai);
+        OPENSSL_free (B);
+        OPENSSL_free (D);
+        OPENSSL_free (I);
+        BN_free (Ij);
+        BN_free (Bpl1);
+        EVP_MD_CTX_cleanup(&ctx);
+        return ret;
 }
 #ifdef DEBUG_KEYGEN
 void h__dump (unsigned char *p, int len)
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index 451de84489..3bf1a367bb 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -422,7 +422,6 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
         X509_ALGOR *enc_alg=NULL;
         STACK_OF(X509_ALGOR) *md_sk=NULL;
         STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
-        X509_ALGOR *xalg=NULL;
         PKCS7_RECIP_INFO *ri=NULL;
 
         i=OBJ_obj2nid(p7->type);
@@ -445,7 +444,6 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                         PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
                         goto err;
                         }
-                xalg=p7->d.signed_and_enveloped->enc_data->algorithm;
                 break;
         case NID_pkcs7_enveloped:
                 rsk=p7->d.enveloped->recipientinfo;
@@ -457,7 +455,6 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                         PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CIPHER_TYPE);
                         goto err;
                         }
-                xalg=p7->d.enveloped->enc_data->algorithm;
                 break;
         default:
                 PKCS7err(PKCS7_F_PKCS7_DATADECODE,PKCS7_R_UNSUPPORTED_CONTENT_TYPE);
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index 3ca0952792..d411269b50 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -591,7 +591,6 @@ X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si)
 int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
         {
         int i;
-        ASN1_OBJECT *objtmp;
         PKCS7_ENC_CONTENT *ec;
 
         i=OBJ_obj2nid(p7->type);
@@ -614,7 +613,6 @@ int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher)
                 PKCS7err(PKCS7_F_PKCS7_SET_CIPHER,PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER);
                 return(0);
         }
-        objtmp = OBJ_nid2obj(i);
 
         ec->cipher = cipher;
         return 1;
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index 4ed40b7b70..bc7d9c5804 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -144,7 +144,9 @@ int RAND_load_file(const char *file, long bytes)
            * I/O because we will waste system entropy. 
            */
           bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */
+#ifndef OPENSSL_NO_SETVBUF_IONBF
           setvbuf(in, NULL, _IONBF, 0); /* don't do buffered reads */
+#endif /* ndef OPENSSL_NO_SETVBUF_IONBF */
         }
 #endif
         for (;;)
@@ -269,7 +271,6 @@ err:
 const char *RAND_file_name(char *buf, size_t size)
         {
         char *s=NULL;
-        int ok = 0;
 #ifdef __OpenBSD__
         struct stat sb;
 #endif
@@ -298,7 +299,6 @@ const char *RAND_file_name(char *buf, size_t size)
                         BUF_strlcat(buf,"/",size);
 #endif
                         BUF_strlcat(buf,RFILE,size);
-                        ok = 1;
                         }
                 else
                         buf[0] = '\0'; /* no file name */
@@ -312,7 +312,7 @@ const char *RAND_file_name(char *buf, size_t size)
          * to something hopefully decent if that isn't available. 
          */
 
-        if (!ok)
+        if (!buf[0])
                 if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) {
                         return(NULL);
                 }       
diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index c5eaeeae6b..7c941885f0 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -675,7 +675,7 @@ static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
                 rsa->_method_mod_n)) goto err;
 
         if ((padding == RSA_X931_PADDING) && ((ret->d[0] & 0xf) != 12))
-                BN_sub(ret, rsa->n, ret);
+                if (!BN_sub(ret, rsa->n, ret)) goto err;
 
         p=buf;
         i=BN_bn2bin(ret,p);
diff --git a/src/lib/libcrypto/rsa/rsa_oaep.c b/src/lib/libcrypto/rsa/rsa_oaep.c
index e238d10e5c..18d307ea9e 100644
--- a/src/lib/libcrypto/rsa/rsa_oaep.c
+++ b/src/lib/libcrypto/rsa/rsa_oaep.c
@@ -189,34 +189,40 @@ int PKCS1_MGF1(unsigned char *mask, long len,
         EVP_MD_CTX c;
         unsigned char md[EVP_MAX_MD_SIZE];
         int mdlen;
+        int rv = -1;
 
         EVP_MD_CTX_init(&c);
         mdlen = EVP_MD_size(dgst);
         if (mdlen < 0)
-                return -1;
+                goto err;
         for (i = 0; outlen < len; i++)
                 {
                 cnt[0] = (unsigned char)((i >> 24) & 255);
                 cnt[1] = (unsigned char)((i >> 16) & 255);
                 cnt[2] = (unsigned char)((i >> 8)) & 255;
                 cnt[3] = (unsigned char)(i & 255);
-                EVP_DigestInit_ex(&c,dgst, NULL);
-                EVP_DigestUpdate(&c, seed, seedlen);
-                EVP_DigestUpdate(&c, cnt, 4);
+                if (!EVP_DigestInit_ex(&c,dgst, NULL)
+                        || !EVP_DigestUpdate(&c, seed, seedlen)
+                        || !EVP_DigestUpdate(&c, cnt, 4))
+                        goto err;
                 if (outlen + mdlen <= len)
                         {
-                        EVP_DigestFinal_ex(&c, mask + outlen, NULL);
+                        if (!EVP_DigestFinal_ex(&c, mask + outlen, NULL))
+                                goto err;
                         outlen += mdlen;
                         }
                 else
                         {
-                        EVP_DigestFinal_ex(&c, md, NULL);
+                        if (!EVP_DigestFinal_ex(&c, md, NULL))
+                                goto err;
                         memcpy(mask + outlen, md, len - outlen);
                         outlen = len;
                         }
                 }
+        rv = 0;
+        err:
         EVP_MD_CTX_cleanup(&c);
-        return 0;
+        return rv;
         }
 
 static int MGF1(unsigned char *mask, long len, const unsigned char *seed,
diff --git a/src/lib/libcrypto/sha/asm/sha1-armv4-large.pl b/src/lib/libcrypto/sha/asm/sha1-armv4-large.pl
index 88861af641..6e65fe3e01 100644
--- a/src/lib/libcrypto/sha/asm/sha1-armv4-large.pl
+++ b/src/lib/libcrypto/sha/asm/sha1-armv4-large.pl
@@ -37,9 +37,18 @@
 #       modes are limited. As result it takes more instructions to do
 #       the same job in Thumb, therefore the code is never twice as
 #       small and always slower.
-# [***] which is also ~35% better than compiler generated code.
+# [***] which is also ~35% better than compiler generated code. Dual-
+#       issue Cortex A8 core was measured to process input block in
+#       ~990 cycles.
 
-$output=shift;
+# August 2010.
+#
+# Rescheduling for dual-issue pipeline resulted in 13% improvement on
+# Cortex A8 core and in absolute terms ~870 cycles per input block
+# [or 13.6 cycles per byte].
+
+
+while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
 open STDOUT,">$output";
 
 $ctx="r0";
@@ -58,43 +67,22 @@ $t3="r12";
 $Xi="r14";
 @V=($a,$b,$c,$d,$e);
 
-# One can optimize this for aligned access on big-endian architecture,
-# but code's endian neutrality makes it too pretty:-)
-sub Xload {
-my ($a,$b,$c,$d,$e)=@_;
-$code.=<<___;
-        ldrb    $t0,[$inp],#4
-        ldrb    $t1,[$inp,#-3]
-        ldrb    $t2,[$inp,#-2]
-        ldrb    $t3,[$inp,#-1]
-        add     $e,$K,$e,ror#2                  @ E+=K_00_19
-        orr     $t0,$t1,$t0,lsl#8
-        add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
-        orr     $t0,$t2,$t0,lsl#8
-        eor     $t1,$c,$d                       @ F_xx_xx
-        orr     $t0,$t3,$t0,lsl#8
-        add     $e,$e,$t0                       @ E+=X[i]
-        str     $t0,[$Xi,#-4]!
-___
-}
 sub Xupdate {
-my ($a,$b,$c,$d,$e,$flag)=@_;
+my ($a,$b,$c,$d,$e,$opt1,$opt2)=@_;
 $code.=<<___;
         ldr     $t0,[$Xi,#15*4]
         ldr     $t1,[$Xi,#13*4]
         ldr     $t2,[$Xi,#7*4]
-        ldr     $t3,[$Xi,#2*4]
         add     $e,$K,$e,ror#2                  @ E+=K_xx_xx
+        ldr     $t3,[$Xi,#2*4]
         eor     $t0,$t0,$t1
-        eor     $t0,$t0,$t2
-        eor     $t0,$t0,$t3
-        add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
-___
-$code.=<<___ if (!defined($flag));
-        eor     $t1,$c,$d                       @ F_xx_xx, but not in 40_59
-___
-$code.=<<___;
+        eor     $t2,$t2,$t3
+        eor     $t1,$c,$d                       @ F_xx_xx
         mov     $t0,$t0,ror#31
+        add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
+        eor     $t0,$t0,$t2,ror#31
+        $opt1                                   @ F_xx_xx
+        $opt2                                   @ F_xx_xx
         add     $e,$e,$t0                       @ E+=X[i]
         str     $t0,[$Xi,#-4]!
 ___
@@ -102,19 +90,29 @@ ___
 
 sub BODY_00_15 {
 my ($a,$b,$c,$d,$e)=@_;
-        &Xload(@_);
 $code.=<<___;
+        ldrb    $t0,[$inp],#4
+        ldrb    $t1,[$inp,#-1]
+        ldrb    $t2,[$inp,#-2]
+        add     $e,$K,$e,ror#2                  @ E+=K_00_19
+        ldrb    $t3,[$inp,#-3]
+        add     $e,$e,$a,ror#27                 @ E+=ROR(A,27)
+        orr     $t0,$t1,$t0,lsl#24
+        eor     $t1,$c,$d                       @ F_xx_xx
+        orr     $t0,$t0,$t2,lsl#8
+        orr     $t0,$t0,$t3,lsl#16
         and     $t1,$b,$t1,ror#2
+        add     $e,$e,$t0                       @ E+=X[i]
         eor     $t1,$t1,$d,ror#2                @ F_00_19(B,C,D)
+        str     $t0,[$Xi,#-4]!
         add     $e,$e,$t1                       @ E+=F_00_19(B,C,D)
 ___
 }
 
 sub BODY_16_19 {
 my ($a,$b,$c,$d,$e)=@_;
-        &Xupdate(@_);
+        &Xupdate(@_,"and $t1,$b,$t1,ror#2");
 $code.=<<___;
-        and     $t1,$b,$t1,ror#2
         eor     $t1,$t1,$d,ror#2                @ F_00_19(B,C,D)
         add     $e,$e,$t1                       @ E+=F_00_19(B,C,D)
 ___
@@ -122,22 +120,18 @@ ___
 
 sub BODY_20_39 {
 my ($a,$b,$c,$d,$e)=@_;
-        &Xupdate(@_);
+        &Xupdate(@_,"eor $t1,$b,$t1,ror#2");
 $code.=<<___;
-        eor     $t1,$b,$t1,ror#2                @ F_20_39(B,C,D)
         add     $e,$e,$t1                       @ E+=F_20_39(B,C,D)
 ___
 }
 
 sub BODY_40_59 {
 my ($a,$b,$c,$d,$e)=@_;
-        &Xupdate(@_,1);
+        &Xupdate(@_,"and $t1,$b,$t1,ror#2","and $t2,$c,$d");
 $code.=<<___;
-        and     $t1,$b,$c,ror#2
-        orr     $t2,$b,$c,ror#2
-        and     $t2,$t2,$d,ror#2
-        orr     $t1,$t1,$t2                     @ F_40_59(B,C,D)
         add     $e,$e,$t1                       @ E+=F_40_59(B,C,D)
+        add     $e,$e,$t2,ror#2
 ___
 }
 
diff --git a/src/lib/libcrypto/sha/asm/sha1-sparcv9.pl b/src/lib/libcrypto/sha/asm/sha1-sparcv9.pl
index 8306fc88cc..5c161cecd6 100644
--- a/src/lib/libcrypto/sha/asm/sha1-sparcv9.pl
+++ b/src/lib/libcrypto/sha/asm/sha1-sparcv9.pl
@@ -276,6 +276,7 @@ $code.=<<___;
 .type   sha1_block_data_order,#function
 .size   sha1_block_data_order,(.-sha1_block_data_order)
 .asciz  "SHA1 block transform for SPARCv9, CRYPTOGAMS by <appro\@openssl.org>"
+.align  4
 ___
 
 $code =~ s/\`([^\`]*)\`/eval $1/gem;
diff --git a/src/lib/libcrypto/sha/asm/sha1-sparcv9a.pl b/src/lib/libcrypto/sha/asm/sha1-sparcv9a.pl
index 15eb854bad..85e8d68086 100644
--- a/src/lib/libcrypto/sha/asm/sha1-sparcv9a.pl
+++ b/src/lib/libcrypto/sha/asm/sha1-sparcv9a.pl
@@ -539,6 +539,7 @@ $code.=<<___;
 .type   sha1_block_data_order,#function
 .size   sha1_block_data_order,(.-sha1_block_data_order)
 .asciz  "SHA1 block transform for SPARCv9a, CRYPTOGAMS by <appro\@openssl.org>"
+.align  4
 ___
 
 # Purpose of these subroutines is to explicitly encode VIS instructions,
diff --git a/src/lib/libcrypto/sha/asm/sha256-armv4.pl b/src/lib/libcrypto/sha/asm/sha256-armv4.pl
index 48d846deec..492cb62bc0 100644
--- a/src/lib/libcrypto/sha/asm/sha256-armv4.pl
+++ b/src/lib/libcrypto/sha/asm/sha256-armv4.pl
@@ -11,9 +11,14 @@
 
 # Performance is ~2x better than gcc 3.4 generated code and in "abso-
 # lute" terms is ~2250 cycles per 64-byte block or ~35 cycles per
-# byte.
+# byte [on single-issue Xscale PXA250 core].
 
-$output=shift;
+# July 2010.
+#
+# Rescheduling for dual-issue pipeline resulted in 22% improvement on
+# Cortex A8 core and ~20 cycles per processed byte.
+
+while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
 open STDOUT,">$output";
 
 $ctx="r0";      $t0="r0";
@@ -52,27 +57,27 @@ $code.=<<___ if ($i<16);
 ___
 $code.=<<___;
         ldr     $t2,[$Ktbl],#4                  @ *K256++
-        str     $T1,[sp,#`$i%16`*4]
         mov     $t0,$e,ror#$Sigma1[0]
+        str     $T1,[sp,#`$i%16`*4]
         eor     $t0,$t0,$e,ror#$Sigma1[1]
-        eor     $t0,$t0,$e,ror#$Sigma1[2]       @ Sigma1(e)
-        add     $T1,$T1,$t0
         eor     $t1,$f,$g
+        eor     $t0,$t0,$e,ror#$Sigma1[2]       @ Sigma1(e)
         and     $t1,$t1,$e
+        add     $T1,$T1,$t0
         eor     $t1,$t1,$g                      @ Ch(e,f,g)
-        add     $T1,$T1,$t1
         add     $T1,$T1,$h
-        add     $T1,$T1,$t2
         mov     $h,$a,ror#$Sigma0[0]
+        add     $T1,$T1,$t1
         eor     $h,$h,$a,ror#$Sigma0[1]
+        add     $T1,$T1,$t2
         eor     $h,$h,$a,ror#$Sigma0[2]         @ Sigma0(a)
         orr     $t0,$a,$b
-        and     $t0,$t0,$c
         and     $t1,$a,$b
+        and     $t0,$t0,$c
+        add     $h,$h,$T1
         orr     $t0,$t0,$t1                     @ Maj(a,b,c)
-        add     $h,$h,$t0
         add     $d,$d,$T1
-        add     $h,$h,$T1
+        add     $h,$h,$t0
 ___
 }
 
@@ -80,19 +85,19 @@ sub BODY_16_XX {
 my ($i,$a,$b,$c,$d,$e,$f,$g,$h) = @_;
 
 $code.=<<___;
-        ldr     $t1,[sp,#`($i+1)%16`*4] @ $i
+        ldr     $t1,[sp,#`($i+1)%16`*4]         @ $i
         ldr     $t2,[sp,#`($i+14)%16`*4]
         ldr     $T1,[sp,#`($i+0)%16`*4]
-        ldr     $inp,[sp,#`($i+9)%16`*4]
         mov     $t0,$t1,ror#$sigma0[0]
+        ldr     $inp,[sp,#`($i+9)%16`*4]
         eor     $t0,$t0,$t1,ror#$sigma0[1]
         eor     $t0,$t0,$t1,lsr#$sigma0[2]      @ sigma0(X[i+1])
         mov     $t1,$t2,ror#$sigma1[0]
+        add     $T1,$T1,$t0
         eor     $t1,$t1,$t2,ror#$sigma1[1]
+        add     $T1,$T1,$inp
         eor     $t1,$t1,$t2,lsr#$sigma1[2]      @ sigma1(X[i+14])
-        add     $T1,$T1,$t0
         add     $T1,$T1,$t1
-        add     $T1,$T1,$inp
 ___
         &BODY_00_15(@_);
 }
diff --git a/src/lib/libcrypto/sha/asm/sha512-armv4.pl b/src/lib/libcrypto/sha/asm/sha512-armv4.pl
index 4fbb94a914..3a35861ac6 100644
--- a/src/lib/libcrypto/sha/asm/sha512-armv4.pl
+++ b/src/lib/libcrypto/sha/asm/sha512-armv4.pl
@@ -10,7 +10,13 @@
 # SHA512 block procedure for ARMv4. September 2007.
 
 # This code is ~4.5 (four and a half) times faster than code generated
-# by gcc 3.4 and it spends ~72 clock cycles per byte. 
+# by gcc 3.4 and it spends ~72 clock cycles per byte [on single-issue
+# Xscale PXA250 core].
+#
+# July 2010.
+#
+# Rescheduling for dual-issue pipeline resulted in 6% improvement on
+# Cortex A8 core and ~40 cycles per processed byte.
 
 # Byte order [in]dependence. =========================================
 #
@@ -22,7 +28,7 @@ $hi=0;
 $lo=4;
 # ====================================================================
 
-$output=shift;
+while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {}
 open STDOUT,">$output";
 
 $ctx="r0";
@@ -73,33 +79,31 @@ $code.=<<___;
         eor     $t0,$t0,$Elo,lsl#23
         eor     $t1,$t1,$Ehi,lsl#23     @ Sigma1(e)
         adds    $Tlo,$Tlo,$t0
-        adc     $Thi,$Thi,$t1           @ T += Sigma1(e)
-        adds    $Tlo,$Tlo,$t2
-        adc     $Thi,$Thi,$t3           @ T += h
-
         ldr     $t0,[sp,#$Foff+0]       @ f.lo
+        adc     $Thi,$Thi,$t1           @ T += Sigma1(e)
         ldr     $t1,[sp,#$Foff+4]       @ f.hi
+        adds    $Tlo,$Tlo,$t2
         ldr     $t2,[sp,#$Goff+0]       @ g.lo
+        adc     $Thi,$Thi,$t3           @ T += h
         ldr     $t3,[sp,#$Goff+4]       @ g.hi
-        str     $Elo,[sp,#$Eoff+0]
-        str     $Ehi,[sp,#$Eoff+4]
-        str     $Alo,[sp,#$Aoff+0]
-        str     $Ahi,[sp,#$Aoff+4]
 
         eor     $t0,$t0,$t2
+        str     $Elo,[sp,#$Eoff+0]
         eor     $t1,$t1,$t3
+        str     $Ehi,[sp,#$Eoff+4]
         and     $t0,$t0,$Elo
+        str     $Alo,[sp,#$Aoff+0]
         and     $t1,$t1,$Ehi
+        str     $Ahi,[sp,#$Aoff+4]
         eor     $t0,$t0,$t2
-        eor     $t1,$t1,$t3             @ Ch(e,f,g)
-
         ldr     $t2,[$Ktbl,#4]          @ K[i].lo
+        eor     $t1,$t1,$t3             @ Ch(e,f,g)
         ldr     $t3,[$Ktbl,#0]          @ K[i].hi
-        ldr     $Elo,[sp,#$Doff+0]      @ d.lo
-        ldr     $Ehi,[sp,#$Doff+4]      @ d.hi
 
         adds    $Tlo,$Tlo,$t0
+        ldr     $Elo,[sp,#$Doff+0]      @ d.lo
         adc     $Thi,$Thi,$t1           @ T += Ch(e,f,g)
+        ldr     $Ehi,[sp,#$Doff+4]      @ d.hi
         adds    $Tlo,$Tlo,$t2
         adc     $Thi,$Thi,$t3           @ T += K[i]
         adds    $Elo,$Elo,$Tlo
diff --git a/src/lib/libcrypto/sha/asm/sha512-sparcv9.pl b/src/lib/libcrypto/sha/asm/sha512-sparcv9.pl
index 54241aab50..ec5d78135e 100644
--- a/src/lib/libcrypto/sha/asm/sha512-sparcv9.pl
+++ b/src/lib/libcrypto/sha/asm/sha512-sparcv9.pl
@@ -586,6 +586,7 @@ $code.=<<___;
 .type   sha${label}_block_data_order,#function
 .size   sha${label}_block_data_order,(.-sha${label}_block_data_order)
 .asciz  "SHA${label} block transform for SPARCv9, CRYPTOGAMS by <appro\@openssl.org>"
+.align  4
 ___
 
 $code =~ s/\`([^\`]*)\`/eval $1/gem;
diff --git a/src/lib/libcrypto/sparccpuid.S b/src/lib/libcrypto/sparccpuid.S
index aa8b11efc9..ae61f7f5ce 100644
--- a/src/lib/libcrypto/sparccpuid.S
+++ b/src/lib/libcrypto/sparccpuid.S
@@ -225,13 +225,95 @@ _sparcv9_rdtick:
         xor     %o0,%o0,%o0
         .word   0x91410000      !rd     %tick,%o0
         retl
-        .word   0x93323020      !srlx   %o2,32,%o1
+        .word   0x93323020      !srlx   %o0,32,%o1
 .notick:
         retl
         xor     %o1,%o1,%o1
 .type   _sparcv9_rdtick,#function
 .size   _sparcv9_rdtick,.-_sparcv9_rdtick
 
+.global _sparcv9_vis1_probe
+.align  8
+_sparcv9_vis1_probe:
+        .word   0x81b00d80      !fxor   %f0,%f0,%f0
+        add     %sp,BIAS+2,%o1
+        retl
+        .word   0xc19a5a40      !ldda   [%o1]ASI_FP16_P,%f0
+.type   _sparcv9_vis1_probe,#function
+.size   _sparcv9_vis1_probe,.-_sparcv9_vis1_probe
+
+! Probe and instrument VIS1 instruction. Output is number of cycles it
+! takes to execute rdtick and pair of VIS1 instructions. US-Tx VIS unit
+! is slow (documented to be 6 cycles on T2) and the core is in-order
+! single-issue, it should be possible to distinguish Tx reliably...
+! Observed return values are:
+!
+!       UltraSPARC IIe          7
+!       UltraSPARC III          7
+!       UltraSPARC T1           24
+!
+! Numbers for T2 and SPARC64 V-VII are more than welcomed.
+!
+! It would be possible to detect specifically US-T1 by instrumenting
+! fmul8ulx16, which is emulated on T1 and as such accounts for quite
+! a lot of %tick-s, couple of thousand on Linux...
+.global _sparcv9_vis1_instrument
+.align  8
+_sparcv9_vis1_instrument:
+        .word   0x91410000      !rd     %tick,%o0
+        .word   0x81b00d80      !fxor   %f0,%f0,%f0
+        .word   0x85b08d82      !fxor   %f2,%f2,%f2
+        .word   0x93410000      !rd     %tick,%o1
+        .word   0x81b00d80      !fxor   %f0,%f0,%f0
+        .word   0x85b08d82      !fxor   %f2,%f2,%f2
+        .word   0x95410000      !rd     %tick,%o2
+        .word   0x81b00d80      !fxor   %f0,%f0,%f0
+        .word   0x85b08d82      !fxor   %f2,%f2,%f2
+        .word   0x97410000      !rd     %tick,%o3
+        .word   0x81b00d80      !fxor   %f0,%f0,%f0
+        .word   0x85b08d82      !fxor   %f2,%f2,%f2
+        .word   0x99410000      !rd     %tick,%o4
+
+        ! calculate intervals
+        sub     %o1,%o0,%o0
+        sub     %o2,%o1,%o1
+        sub     %o3,%o2,%o2
+        sub     %o4,%o3,%o3
+
+        ! find minumum value
+        cmp     %o0,%o1
+        .word   0x38680002      !bgu,a  %xcc,.+8
+        mov     %o1,%o0
+        cmp     %o0,%o2
+        .word   0x38680002      !bgu,a  %xcc,.+8
+        mov     %o2,%o0
+        cmp     %o0,%o3
+        .word   0x38680002      !bgu,a  %xcc,.+8
+        mov     %o3,%o0
+
+        retl
+        nop
+.type   _sparcv9_vis1_instrument,#function
+.size   _sparcv9_vis1_instrument,.-_sparcv9_vis1_instrument
+
+.global _sparcv9_vis2_probe
+.align  8
+_sparcv9_vis2_probe:
+        retl
+        .word   0x81b00980      !bshuffle       %f0,%f0,%f0
+.type   _sparcv9_vis2_probe,#function
+.size   _sparcv9_vis2_probe,.-_sparcv9_vis2_probe
+
+.global _sparcv9_fmadd_probe
+.align  8
+_sparcv9_fmadd_probe:
+        .word   0x81b00d80      !fxor   %f0,%f0,%f0
+        .word   0x85b08d82      !fxor   %f2,%f2,%f2
+        retl
+        .word   0x81b80440      !fmaddd %f0,%f0,%f2,%f0
+.type   _sparcv9_fmadd_probe,#function
+.size   _sparcv9_fmadd_probe,.-_sparcv9_fmadd_probe
+
 .global OPENSSL_cleanse
 .align  32
 OPENSSL_cleanse:
diff --git a/src/lib/libcrypto/sparcv9cap.c b/src/lib/libcrypto/sparcv9cap.c
index 5f31d20bd0..ed195ab402 100644
--- a/src/lib/libcrypto/sparcv9cap.c
+++ b/src/lib/libcrypto/sparcv9cap.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <setjmp.h>
+#include <signal.h>
 #include <sys/time.h>
 #include <openssl/bn.h>
 
@@ -9,6 +11,7 @@
 #define SPARCV9_VIS1            (1<<2)
 #define SPARCV9_VIS2            (1<<3)  /* reserved */
 #define SPARCV9_FMADD           (1<<4)  /* reserved for SPARC64 V */
+
 static int OPENSSL_sparcv9cap_P=SPARCV9_TICK_PRIVILEGED;
 
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0, int num)
@@ -23,10 +26,14 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
                 return bn_mul_mont_int(rp,ap,bp,np,n0,num);
         }
 
+unsigned long   _sparcv9_rdtick(void);
+void            _sparcv9_vis1_probe(void);
+unsigned long   _sparcv9_vis1_instrument(void);
+void            _sparcv9_vis2_probe(void);
+void            _sparcv9_fmadd_probe(void);
+
 unsigned long OPENSSL_rdtsc(void)
         {
-        unsigned long _sparcv9_rdtick(void);
-
         if (OPENSSL_sparcv9cap_P&SPARCV9_TICK_PRIVILEGED)
 #if defined(__sun) && defined(__SVR4)
                 return gethrtime();
@@ -37,8 +44,11 @@ unsigned long OPENSSL_rdtsc(void)
                 return _sparcv9_rdtick();
         }
 
-#if defined(__sun) && defined(__SVR4)
-
+#if 0 && defined(__sun) && defined(__SVR4)
+/* This code path is disabled, because of incompatibility of
+ * libdevinfo.so.1 and libmalloc.so.1 (see below for details)
+ */
+#include <malloc.h>
 #include <dlfcn.h>
 #include <libdevinfo.h>
 #include <sys/systeminfo.h>
@@ -110,7 +120,21 @@ void OPENSSL_cpuid_setup(void)
                         return;
                         }
                 }
-
+#ifdef M_KEEP
+        /*
+         * Solaris libdevinfo.so.1 is effectively incomatible with
+         * libmalloc.so.1. Specifically, if application is linked with
+         * -lmalloc, it crashes upon startup with SIGSEGV in
+         * free(3LIBMALLOC) called by di_fini. Prior call to
+         * mallopt(M_KEEP,0) somehow helps... But not always...
+         */
+        if ((h = dlopen(NULL,RTLD_LAZY)))
+                {
+                union { void *p; int (*f)(int,int); } sym;
+                if ((sym.p = dlsym(h,"mallopt"))) (*sym.f)(M_KEEP,0);
+                dlclose(h);
+                }
+#endif
         if ((h = dlopen("libdevinfo.so.1",RTLD_LAZY))) do
                 {
                 di_init_t       di_init;
@@ -137,9 +161,19 @@ void OPENSSL_cpuid_setup(void)
 
 #else
 
+static sigjmp_buf common_jmp;
+static void common_handler(int sig) { siglongjmp(common_jmp,sig); }
+
 void OPENSSL_cpuid_setup(void)
         {
         char *e;
+        struct sigaction        common_act,ill_oact,bus_oact;
+        sigset_t                all_masked,oset;
+        int                     sig;
+        static int trigger=0;
+
+        if (trigger) return;
+        trigger=1;
  
         if ((e=getenv("OPENSSL_sparcv9cap")))
                 {
@@ -147,8 +181,57 @@ void OPENSSL_cpuid_setup(void)
                 return;
                 }
 
-        /* For now we assume that the rest supports UltraSPARC-I* only */
-        OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU|SPARCV9_VIS1;
+        /* Initial value, fits UltraSPARC-I&II... */
+        OPENSSL_sparcv9cap_P = SPARCV9_PREFER_FPU|SPARCV9_TICK_PRIVILEGED;
+
+        sigfillset(&all_masked);
+        sigdelset(&all_masked,SIGILL);
+        sigdelset(&all_masked,SIGTRAP);
+#ifdef SIGEMT
+        sigdelset(&all_masked,SIGEMT);
+#endif
+        sigdelset(&all_masked,SIGFPE);
+        sigdelset(&all_masked,SIGBUS);
+        sigdelset(&all_masked,SIGSEGV);
+        sigprocmask(SIG_SETMASK,&all_masked,&oset);
+
+        memset(&common_act,0,sizeof(common_act));
+        common_act.sa_handler = common_handler;
+        common_act.sa_mask    = all_masked;
+
+        sigaction(SIGILL,&common_act,&ill_oact);
+        sigaction(SIGBUS,&common_act,&bus_oact);/* T1 fails 16-bit ldda [on Linux] */
+
+        if (sigsetjmp(common_jmp,1) == 0)
+                {
+                _sparcv9_rdtick();
+                OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
+                }
+
+        if (sigsetjmp(common_jmp,1) == 0)
+                {
+                _sparcv9_vis1_probe();
+                OPENSSL_sparcv9cap_P |= SPARCV9_VIS1;
+                /* detect UltraSPARC-Tx, see sparccpud.S for details... */
+                if (_sparcv9_vis1_instrument() >= 12)
+                        OPENSSL_sparcv9cap_P &= ~(SPARCV9_VIS1|SPARCV9_PREFER_FPU);
+                else
+                        {
+                        _sparcv9_vis2_probe();
+                        OPENSSL_sparcv9cap_P |= SPARCV9_VIS2;
+                        }
+                }
+
+        if (sigsetjmp(common_jmp,1) == 0)
+                {
+                _sparcv9_fmadd_probe();
+                OPENSSL_sparcv9cap_P |= SPARCV9_FMADD;
+                }
+
+        sigaction(SIGBUS,&bus_oact,NULL);
+        sigaction(SIGILL,&ill_oact,NULL);
+
+        sigprocmask(SIG_SETMASK,&oset,NULL);
         }
 
 #endif
diff --git a/src/lib/libcrypto/stack/safestack.h b/src/lib/libcrypto/stack/safestack.h
index 891cb84a51..3e76aa58f5 100644
--- a/src/lib/libcrypto/stack/safestack.h
+++ b/src/lib/libcrypto/stack/safestack.h
@@ -179,7 +179,8 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
         sk_is_sorted(CHECKED_STACK_OF(type, st))
 
 #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-  (STACK_OF(type) *)d2i_ASN1_SET((STACK_OF(OPENSSL_BLOCK) **)CHECKED_STACK_OF(type, st), \
+  (STACK_OF(type) *)d2i_ASN1_SET( \
+                                (STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \
                                 pp, length, \
                                 CHECKED_D2I_OF(type, d2i_func), \
                                 CHECKED_SK_FREE_FUNC(type, free_func), \
@@ -2030,79 +2031,79 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_void_sort(st) SKM_sk_sort(void, (st))
 #define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
 
-#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
-#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), i))
-#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
-#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val), i)
-#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), i, CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
-#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
-#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_PTR_OF(void, ptr))
-#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \
-        ((int (*)(const void * const *,const void * const *)) \
-        sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_SK_CMP_FUNC(void, cmp)))
-#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
-#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_BLOCK), st))
-#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
-#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
+#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
+#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_STACK_OF(OPENSSL_STRING, st), i))
+#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
+#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val), i)
+#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_STRING, st), i, CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
+#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
+#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, ptr))
+#define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \
+        ((int (*)(const char * const *,const char * const *)) \
+        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_CMP_FUNC(char, cmp)))
+#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
+#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop(CHECKED_STACK_OF(OPENSSL_STRING, st))
+#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
+#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
 
 
 #define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
 #define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
-#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i))
+#define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i))
 #define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
-#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
+#define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
+#define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
 #define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
-#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
 #define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, val))
+#define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
 #define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
 #define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
-#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
+#define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
 #define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp)  \
         ((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
-        sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
+        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
 #define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
 #define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
-#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_PSTRING), st))
+#define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop(CHECKED_STACK_OF(OPENSSL_PSTRING, st))
 #define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
 #define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
 
 
-#define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
-#define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i))
-#define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
-#define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val), i)
-#define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), i, CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
-#define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
-#define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_PTR_OF(char, ptr))
-#define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \
-        ((int (*)(const char * const *,const char * const *)) \
-        sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_SK_CMP_FUNC(char, cmp)))
-#define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
-#define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_pop(st) (char *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF(OPENSSL_STRING), st))
-#define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
-#define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
+#define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
+#define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
+#define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i))
+#define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
+#define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val), i)
+#define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i, CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
+#define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
+#define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, ptr))
+#define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \
+        ((int (*)(const void * const *,const void * const *)) \
+        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_CMP_FUNC(void, cmp)))
+#define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
+#define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop(CHECKED_STACK_OF(OPENSSL_BLOCK, st))
+#define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
+#define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
 
 
 #define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
diff --git a/src/lib/libcrypto/ts/ts_verify_ctx.c b/src/lib/libcrypto/ts/ts_verify_ctx.c
index b079b50fc3..609b7735d4 100644
--- a/src/lib/libcrypto/ts/ts_verify_ctx.c
+++ b/src/lib/libcrypto/ts/ts_verify_ctx.c
@@ -56,7 +56,6 @@
  *
  */
 
-#include <assert.h>
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/ts.h>
@@ -74,7 +73,7 @@ TS_VERIFY_CTX *TS_VERIFY_CTX_new(void)
 
 void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx)
         {
-        assert(ctx != NULL);
+        OPENSSL_assert(ctx != NULL);
         memset(ctx, 0, sizeof(TS_VERIFY_CTX));
         }
 
@@ -116,7 +115,7 @@ TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx)
         ASN1_OCTET_STRING *msg;
         const ASN1_INTEGER *nonce;
 
-        assert(req != NULL);
+        OPENSSL_assert(req != NULL);
         if (ret)
                 TS_VERIFY_CTX_cleanup(ret);
         else
diff --git a/src/lib/libcrypto/util/mkerr.pl b/src/lib/libcrypto/util/mkerr.pl
index 15b774f277..2c99467d34 100644
--- a/src/lib/libcrypto/util/mkerr.pl
+++ b/src/lib/libcrypto/util/mkerr.pl
@@ -391,7 +391,7 @@ foreach $lib (keys %csrc)
         } else {
             push @out,
 "/* ====================================================================\n",
-" * Copyright (c) 2001-2010 The OpenSSL Project.  All rights reserved.\n",
+" * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.\n",
 " *\n",
 " * Redistribution and use in source and binary forms, with or without\n",
 " * modification, are permitted provided that the following conditions\n",
@@ -576,7 +576,7 @@ EOF
         print OUT <<"EOF";
 /* $cfile */
 /* ====================================================================
- * Copyright (c) 1999-2010 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/lib/libcrypto/util/mkstack.pl b/src/lib/libcrypto/util/mkstack.pl
index 6a43757c95..f708610a78 100644
--- a/src/lib/libcrypto/util/mkstack.pl
+++ b/src/lib/libcrypto/util/mkstack.pl
@@ -104,25 +104,25 @@ EOF
 
 #define sk_${t1}_new(cmp) ((STACK_OF($t1) *)sk_new(CHECKED_SK_CMP_FUNC($t2, cmp)))
 #define sk_${t1}_new_null() ((STACK_OF($t1) *)sk_new_null())
-#define sk_${t1}_push(st, val) sk_push(CHECKED_PTR_OF(STACK_OF($t1), st), CHECKED_PTR_OF($t2, val))
-#define sk_${t1}_find(st, val) sk_find(CHECKED_PTR_OF(STACK_OF($t1), st), CHECKED_PTR_OF($t2, val))
-#define sk_${t1}_value(st, i) (($t1)sk_value(CHECKED_PTR_OF(STACK_OF($t1), st), i))
+#define sk_${t1}_push(st, val) sk_push(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))
+#define sk_${t1}_find(st, val) sk_find(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))
+#define sk_${t1}_value(st, i) (($t1)sk_value(CHECKED_STACK_OF($t1, st), i))
 #define sk_${t1}_num(st) SKM_sk_num($t1, st)
-#define sk_${t1}_pop_free(st, free_func) sk_pop_free(CHECKED_PTR_OF(STACK_OF($t1), st), CHECKED_SK_FREE_FUNC2($t1, free_func))
-#define sk_${t1}_insert(st, val, i) sk_insert(CHECKED_PTR_OF(STACK_OF($t1), st), CHECKED_PTR_OF($t2, val), i)
+#define sk_${t1}_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF($t1, st), CHECKED_SK_FREE_FUNC2($t1, free_func))
+#define sk_${t1}_insert(st, val, i) sk_insert(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val), i)
 #define sk_${t1}_free(st) SKM_sk_free(${t1}, st)
-#define sk_${t1}_set(st, i, val) sk_set((_STACK *)CHECKED_PTR_OF(STACK_OF($t1), st), i, CHECKED_PTR_OF($t2, val))
+#define sk_${t1}_set(st, i, val) sk_set(CHECKED_STACK_OF($t1, st), i, CHECKED_PTR_OF($t2, val))
 #define sk_${t1}_zero(st) SKM_sk_zero($t1, (st))
-#define sk_${t1}_unshift(st, val) sk_unshift((_STACK *)CHECKED_PTR_OF(STACK_OF($t1), st), CHECKED_PTR_OF($t2, val))
+#define sk_${t1}_unshift(st, val) sk_unshift(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, val))
 #define sk_${t1}_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF($t1), st), CHECKED_CONST_PTR_OF($t2, val))
 #define sk_${t1}_delete(st, i) SKM_sk_delete($t1, (st), (i))
-#define sk_${t1}_delete_ptr(st, ptr) ($t1 *)sk_delete_ptr((_STACK *)CHECKED_PTR_OF(STACK_OF($t1), st), CHECKED_PTR_OF($t2, ptr))
+#define sk_${t1}_delete_ptr(st, ptr) ($t1 *)sk_delete_ptr(CHECKED_STACK_OF($t1, st), CHECKED_PTR_OF($t2, ptr))
 #define sk_${t1}_set_cmp_func(st, cmp)  \\
         ((int (*)(const $t2 * const *,const $t2 * const *)) \\
-        sk_set_cmp_func((_STACK *)CHECKED_PTR_OF(STACK_OF($t1), st), CHECKED_SK_CMP_FUNC($t2, cmp)))
+        sk_set_cmp_func(CHECKED_STACK_OF($t1, st), CHECKED_SK_CMP_FUNC($t2, cmp)))
 #define sk_${t1}_dup(st) SKM_sk_dup($t1, st)
 #define sk_${t1}_shift(st) SKM_sk_shift($t1, (st))
-#define sk_${t1}_pop(st) ($t2 *)sk_pop((_STACK *)CHECKED_PTR_OF(STACK_OF($t1), st))
+#define sk_${t1}_pop(st) ($t2 *)sk_pop(CHECKED_STACK_OF($t1, st))
 #define sk_${t1}_sort(st) SKM_sk_sort($t1, (st))
 #define sk_${t1}_is_sorted(st) SKM_sk_is_sorted($t1, (st))
 
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index 604f4fb27f..e6f8a40395 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -258,6 +258,7 @@ typedef struct x509_cinf_st
         ASN1_BIT_STRING *issuerUID;             /* [ 1 ] optional in v2 */
         ASN1_BIT_STRING *subjectUID;            /* [ 2 ] optional in v2 */
         STACK_OF(X509_EXTENSION) *extensions;   /* [ 3 ] optional in v3 */
+        ASN1_ENCODING enc;
         } X509_CINF;
 
 /* This stuff is certificate "auxiliary info"
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 87ebf62525..5a0b0249b4 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -703,6 +703,7 @@ static int check_cert(X509_STORE_CTX *ctx)
         x = sk_X509_value(ctx->chain, cnum);
         ctx->current_cert = x;
         ctx->current_issuer = NULL;
+        ctx->current_crl_score = 0;
         ctx->current_reasons = 0;
         while (ctx->current_reasons != CRLDP_ALL_REASONS)
                 {
@@ -2015,6 +2016,9 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
         ctx->error_depth=0;
         ctx->current_cert=NULL;
         ctx->current_issuer=NULL;
+        ctx->current_crl=NULL;
+        ctx->current_crl_score=0;
+        ctx->current_reasons=0;
         ctx->tree = NULL;
         ctx->parent = NULL;
 
@@ -2034,7 +2038,7 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
         if (store)
                 ret = X509_VERIFY_PARAM_inherit(ctx->param, store->param);
         else
-                ctx->param->flags |= X509_VP_FLAG_DEFAULT|X509_VP_FLAG_ONCE;
+                ctx->param->inh_flags |= X509_VP_FLAG_DEFAULT|X509_VP_FLAG_ONCE;
 
         if (store)
                 {
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
index ebae30b701..8ec88c215a 100644
--- a/src/lib/libcrypto/x509/x_all.c
+++ b/src/lib/libcrypto/x509/x_all.c
@@ -90,6 +90,7 @@ int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r)
 
 int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
         {
+        x->cert_info->enc.modified = 1;
         return(ASN1_item_sign(ASN1_ITEM_rptr(X509_CINF), x->cert_info->signature,
                 x->sig_alg, x->signature, x->cert_info,pkey,md));
         }
diff --git a/src/lib/libcrypto/x509v3/pcy_tree.c b/src/lib/libcrypto/x509v3/pcy_tree.c
index 92f6b24556..bb9777348f 100644
--- a/src/lib/libcrypto/x509v3/pcy_tree.c
+++ b/src/lib/libcrypto/x509v3/pcy_tree.c
@@ -341,9 +341,8 @@ static int tree_link_nodes(X509_POLICY_LEVEL *curr,
                                 const X509_POLICY_CACHE *cache)
         {
         int i;
-        X509_POLICY_LEVEL *last;
         X509_POLICY_DATA *data;
-        last = curr - 1;
+
         for (i = 0; i < sk_X509_POLICY_DATA_num(cache->data); i++)
                 {
                 data = sk_X509_POLICY_DATA_value(cache->data, i);
diff --git a/src/lib/libcrypto/x509v3/v3_ncons.c b/src/lib/libcrypto/x509v3/v3_ncons.c
index 689df46acd..a01dc64dd2 100644
--- a/src/lib/libcrypto/x509v3/v3_ncons.c
+++ b/src/lib/libcrypto/x509v3/v3_ncons.c
@@ -189,7 +189,6 @@ static int do_i2r_name_constraints(const X509V3_EXT_METHOD *method,
                         print_nc_ipadd(bp, tree->base->d.ip);
                 else
                         GENERAL_NAME_print(bp, tree->base);
-                tree = sk_GENERAL_SUBTREE_value(trees, i);
                 BIO_puts(bp, "\n");
                 }
         return 1;
diff --git a/src/lib/libssl/LICENSE b/src/lib/libssl/LICENSE
index a2c4adcbe6..e47d101f10 100644
--- a/src/lib/libssl/LICENSE
+++ b/src/lib/libssl/LICENSE
@@ -12,7 +12,7 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2008 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2011 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
index af319af302..eedac8a3fc 100644
--- a/src/lib/libssl/bio_ssl.c
+++ b/src/lib/libssl/bio_ssl.c
@@ -348,7 +348,11 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
                 break;
         case BIO_C_SET_SSL:
                 if (ssl != NULL)
+                        {
                         ssl_free(b);
+                        if (!ssl_new(b))
+                                return 0;
+                        }
                 b->shutdown=(int)num;
                 ssl=(SSL *)ptr;
                 ((BIO_SSL *)b->ptr)->ssl=ssl;
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index 4ce4064cc9..2180c6d4da 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -153,7 +153,7 @@
 #endif
 
 static unsigned char bitmask_start_values[] = {0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80};
-static unsigned char bitmask_end_values[]   = {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f};
+static unsigned char bitmask_end_values[]   = {0xff, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f};
 
 /* XDTLS:  figure out the right values */
 static unsigned int g_probable_mtu[] = {1500 - 28, 512 - 28, 256 - 28};
@@ -464,20 +464,9 @@ again:
 
         memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
 
-        s->d1->handshake_read_seq++;
-        /* we just read a handshake message from the other side:
-         * this means that we don't need to retransmit of the
-         * buffered messages.  
-         * XDTLS: may be able clear out this
-         * buffer a little sooner (i.e if an out-of-order
-         * handshake message/record is received at the record
-         * layer.  
-         * XDTLS: exception is that the server needs to
-         * know that change cipher spec and finished messages
-         * have been received by the client before clearing this
-         * buffer.  this can simply be done by waiting for the
-         * first data  segment, but is there a better way?  */
-        dtls1_clear_record_buffer(s);
+        /* Don't change sequence numbers while listening */
+        if (!s->d1->listen)
+                s->d1->handshake_read_seq++;
 
         s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
         return s->init_num;
@@ -813,9 +802,11 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
 
         /* 
          * if this is a future (or stale) message it gets buffered
-         * (or dropped)--no further processing at this time 
+         * (or dropped)--no further processing at this time
+         * While listening, we accept seq 1 (ClientHello with cookie)
+         * although we're still expecting seq 0 (ClientHello)
          */
-        if ( msg_hdr.seq != s->d1->handshake_read_seq)
+        if (msg_hdr.seq != s->d1->handshake_read_seq && !(s->d1->listen && msg_hdr.seq == 1))
                 return dtls1_process_out_of_seq_message(s, &msg_hdr, ok);
 
         len = msg_hdr.msg_len;
@@ -1322,7 +1313,8 @@ unsigned char *
 dtls1_set_message_header(SSL *s, unsigned char *p, unsigned char mt,
                         unsigned long len, unsigned long frag_off, unsigned long frag_len)
         {
-        if ( frag_off == 0)
+        /* Don't change sequence numbers while listening */
+        if (frag_off == 0 && !s->d1->listen)
                 {
                 s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
                 s->d1->next_handshake_write_seq++;
diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 5bc9eb6603..089fa4c7f8 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -407,7 +407,8 @@ int dtls1_connect(SSL *s)
 
                 case SSL3_ST_CW_CHANGE_A:
                 case SSL3_ST_CW_CHANGE_B:
-                        dtls1_start_timer(s);
+                        if (!s->hit)
+                                dtls1_start_timer(s);
                         ret=dtls1_send_change_cipher_spec(s,
                                 SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B);
                         if (ret <= 0) goto end;
@@ -442,7 +443,8 @@ int dtls1_connect(SSL *s)
 
                 case SSL3_ST_CW_FINISHED_A:
                 case SSL3_ST_CW_FINISHED_B:
-                        dtls1_start_timer(s);
+                        if (!s->hit)
+                                dtls1_start_timer(s);
                         ret=dtls1_send_finished(s,
                                 SSL3_ST_CW_FINISHED_A,SSL3_ST_CW_FINISHED_B,
                                 s->method->ssl3_enc->client_finished_label,
diff --git a/src/lib/libssl/d1_enc.c b/src/lib/libssl/d1_enc.c
index 8fa57347a9..becbab91c2 100644
--- a/src/lib/libssl/d1_enc.c
+++ b/src/lib/libssl/d1_enc.c
@@ -231,11 +231,7 @@ int dtls1_enc(SSL *s, int send)
                 if (!send)
                         {
                         if (l == 0 || l%bs != 0)
-                                {
-                                SSLerr(SSL_F_DTLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
-                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED);
-                                return 0;
-                                }
+                                return -1;
                         }
                 
                 EVP_Cipher(ds,rec->data,rec->input,l);
diff --git a/src/lib/libssl/d1_lib.c b/src/lib/libssl/d1_lib.c
index 96b220e87c..48e8b6ffbb 100644
--- a/src/lib/libssl/d1_lib.c
+++ b/src/lib/libssl/d1_lib.c
@@ -129,26 +129,33 @@ int dtls1_new(SSL *s)
         return(1);
         }
 
-void dtls1_free(SSL *s)
+static void dtls1_clear_queues(SSL *s)
         {
     pitem *item = NULL;
     hm_fragment *frag = NULL;
-
-        ssl3_free(s);
+        DTLS1_RECORD_DATA *rdata;
 
     while( (item = pqueue_pop(s->d1->unprocessed_rcds.q)) != NULL)
         {
+                rdata = (DTLS1_RECORD_DATA *) item->data;
+                if (rdata->rbuf.buf)
+                        {
+                        OPENSSL_free(rdata->rbuf.buf);
+                        }
         OPENSSL_free(item->data);
         pitem_free(item);
         }
-    pqueue_free(s->d1->unprocessed_rcds.q);
 
     while( (item = pqueue_pop(s->d1->processed_rcds.q)) != NULL)
         {
+                rdata = (DTLS1_RECORD_DATA *) item->data;
+                if (rdata->rbuf.buf)
+                        {
+                        OPENSSL_free(rdata->rbuf.buf);
+                        }
         OPENSSL_free(item->data);
         pitem_free(item);
         }
-    pqueue_free(s->d1->processed_rcds.q);
 
     while( (item = pqueue_pop(s->d1->buffered_messages)) != NULL)
         {
@@ -157,7 +164,6 @@ void dtls1_free(SSL *s)
         OPENSSL_free(frag);
         pitem_free(item);
         }
-    pqueue_free(s->d1->buffered_messages);
 
     while ( (item = pqueue_pop(s->d1->sent_messages)) != NULL)
         {
@@ -166,7 +172,6 @@ void dtls1_free(SSL *s)
         OPENSSL_free(frag);
         pitem_free(item);
         }
-        pqueue_free(s->d1->sent_messages);
 
         while ( (item = pqueue_pop(s->d1->buffered_app_data.q)) != NULL)
                 {
@@ -175,6 +180,18 @@ void dtls1_free(SSL *s)
                 OPENSSL_free(frag);
                 pitem_free(item);
                 }
+        }
+
+void dtls1_free(SSL *s)
+        {
+        ssl3_free(s);
+
+        dtls1_clear_queues(s);
+
+    pqueue_free(s->d1->unprocessed_rcds.q);
+    pqueue_free(s->d1->processed_rcds.q);
+    pqueue_free(s->d1->buffered_messages);
+        pqueue_free(s->d1->sent_messages);
         pqueue_free(s->d1->buffered_app_data.q);
 
         OPENSSL_free(s->d1);
@@ -182,6 +199,36 @@ void dtls1_free(SSL *s)
 
 void dtls1_clear(SSL *s)
         {
+    pqueue unprocessed_rcds;
+    pqueue processed_rcds;
+    pqueue buffered_messages;
+        pqueue sent_messages;
+        pqueue buffered_app_data;
+        
+        if (s->d1)
+                {
+                unprocessed_rcds = s->d1->unprocessed_rcds.q;
+                processed_rcds = s->d1->processed_rcds.q;
+                buffered_messages = s->d1->buffered_messages;
+                sent_messages = s->d1->sent_messages;
+                buffered_app_data = s->d1->buffered_app_data.q;
+
+                dtls1_clear_queues(s);
+
+                memset(s->d1, 0, sizeof(*(s->d1)));
+
+                if (s->server)
+                        {
+                        s->d1->cookie_len = sizeof(s->d1->cookie);
+                        }
+
+                s->d1->unprocessed_rcds.q = unprocessed_rcds;
+                s->d1->processed_rcds.q = processed_rcds;
+                s->d1->buffered_messages = buffered_messages;
+                s->d1->sent_messages = sent_messages;
+                s->d1->buffered_app_data.q = buffered_app_data;
+                }
+
         ssl3_clear(s);
         if (s->options & SSL_OP_CISCO_ANYCONNECT)
                 s->version=DTLS1_BAD_VER;
@@ -330,6 +377,8 @@ void dtls1_stop_timer(SSL *s)
         memset(&(s->d1->next_timeout), 0, sizeof(struct timeval));
         s->d1->timeout_duration = 1;
         BIO_ctrl(SSL_get_rbio(s), BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT, 0, &(s->d1->next_timeout));
+        /* Clear retransmission buffer */
+        dtls1_clear_record_buffer(s);
         }
 
 int dtls1_handle_timeout(SSL *s)
@@ -349,7 +398,7 @@ int dtls1_handle_timeout(SSL *s)
                 {
                 /* fail the connection, enough alerts have been sent */
                 SSLerr(SSL_F_DTLS1_HANDLE_TIMEOUT,SSL_R_READ_TIMEOUT_EXPIRED);
-                return 0;
+                return -1;
                 }
 
         state->timeout.read_timeouts++;
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index a5439d544f..39aac73e10 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -296,9 +296,6 @@ dtls1_process_buffered_records(SSL *s)
     item = pqueue_peek(s->d1->unprocessed_rcds.q);
     if (item)
         {
-        DTLS1_RECORD_DATA *rdata;
-        rdata = (DTLS1_RECORD_DATA *)item->data;
-        
         /* Check if epoch is current. */
         if (s->d1->unprocessed_rcds.epoch != s->d1->r_epoch)
             return(1);  /* Nothing to do. */
@@ -412,11 +409,12 @@ dtls1_process_record(SSL *s)
         enc_err = s->method->ssl3_enc->enc(s,0);
         if (enc_err <= 0)
                 {
-                if (enc_err == 0)
-                        /* SSLerr() and ssl3_send_alert() have been called */
-                        goto err;
-
-                /* otherwise enc_err == -1 */
+                /* decryption failed, silently discard message */
+                if (enc_err < 0)
+                        {
+                        rr->length = 0;
+                        s->packet_length = 0;
+                        }
                 goto err;
                 }
 
@@ -528,14 +526,12 @@ int dtls1_get_record(SSL *s)
         int ssl_major,ssl_minor;
         int i,n;
         SSL3_RECORD *rr;
-        SSL_SESSION *sess;
         unsigned char *p = NULL;
         unsigned short version;
         DTLS1_BITMAP *bitmap;
         unsigned int is_next_epoch;
 
         rr= &(s->s3->rrec);
-        sess=s->session;
 
         /* The epoch may have changed.  If so, process all the
          * pending records.  This is a non-blocking operation. */
@@ -662,10 +658,12 @@ again:
 
         /* If this record is from the next epoch (either HM or ALERT),
          * and a handshake is currently in progress, buffer it since it
-         * cannot be processed at this time. */
+         * cannot be processed at this time. However, do not buffer
+         * anything while listening.
+         */
         if (is_next_epoch)
                 {
-                if (SSL_in_init(s) || s->in_handshake)
+                if ((SSL_in_init(s) || s->in_handshake) && !s->d1->listen)
                         {
                         dtls1_buffer_record(s, &(s->d1->unprocessed_rcds), rr->seq_num);
                         }
diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 301ceda7a5..a6a4c87ea6 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -150,6 +150,7 @@ int dtls1_accept(SSL *s)
         unsigned long alg_k;
         int ret= -1;
         int new_state,state,skip=0;
+        int listen;
 
         RAND_add(&Time,sizeof(Time),0);
         ERR_clear_error();
@@ -159,11 +160,15 @@ int dtls1_accept(SSL *s)
                 cb=s->info_callback;
         else if (s->ctx->info_callback != NULL)
                 cb=s->ctx->info_callback;
+        
+        listen = s->d1->listen;
 
         /* init things to blank */
         s->in_handshake++;
         if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
 
+        s->d1->listen = listen;
+
         if (s->cert == NULL)
                 {
                 SSLerr(SSL_F_DTLS1_ACCEPT,SSL_R_NO_CERTIFICATE_SET);
@@ -273,11 +278,23 @@ int dtls1_accept(SSL *s)
 
                         s->init_num=0;
 
+                        /* Reflect ClientHello sequence to remain stateless while listening */
+                        if (listen)
+                                {
+                                memcpy(s->s3->write_sequence, s->s3->read_sequence, sizeof(s->s3->write_sequence));
+                                }
+
                         /* If we're just listening, stop here */
-                        if (s->d1->listen && s->state == SSL3_ST_SW_SRVR_HELLO_A)
+                        if (listen && s->state == SSL3_ST_SW_SRVR_HELLO_A)
                                 {
                                 ret = 2;
                                 s->d1->listen = 0;
+                                /* Set expected sequence numbers
+                                 * to continue the handshake.
+                                 */
+                                s->d1->handshake_read_seq = 2;
+                                s->d1->handshake_write_seq = 1;
+                                s->d1->next_handshake_write_seq = 1;
                                 goto end;
                                 }
                         
@@ -286,7 +303,6 @@ int dtls1_accept(SSL *s)
                 case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A:
                 case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B:
 
-                        dtls1_start_timer(s);
                         ret = dtls1_send_hello_verify_request(s);
                         if ( ret <= 0) goto end;
                         s->state=SSL3_ST_SW_FLUSH;
@@ -736,9 +752,6 @@ int dtls1_send_hello_verify_request(SSL *s)
                 /* number of bytes to write */
                 s->init_num=p-buf;
                 s->init_off=0;
-
-                /* buffer the message to handle re-xmits */
-                dtls1_buffer_message(s, 0);
                 }
 
         /* s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B */
@@ -1017,12 +1030,11 @@ int dtls1_send_server_key_exchange(SSL *s)
                                 SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
                                 goto err;
                                 }
-                        if (!EC_KEY_up_ref(ecdhp))
+                        if ((ecdh = EC_KEY_dup(ecdhp)) == NULL)
                                 {
                                 SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
                                 goto err;
                                 }
-                        ecdh = ecdhp;
 
                         s->s3->tmp.ecdh=ecdh;
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
diff --git a/src/lib/libssl/s23_lib.c b/src/lib/libssl/s23_lib.c
index e3fce53430..3bf728318a 100644
--- a/src/lib/libssl/s23_lib.c
+++ b/src/lib/libssl/s23_lib.c
@@ -92,15 +92,8 @@ const SSL_CIPHER *ssl23_get_cipher(unsigned int u)
  * available */
 const SSL_CIPHER *ssl23_get_cipher_by_char(const unsigned char *p)
         {
-        SSL_CIPHER c;
         const SSL_CIPHER *cp;
-        unsigned long id;
-        int n;
 
-        n=ssl3_num_ciphers();
-        id=0x03000000|((unsigned long)p[0]<<16L)|
-                ((unsigned long)p[1]<<8L)|(unsigned long)p[2];
-        c.id=id;
         cp=ssl3_get_cipher_by_char(p);
 #ifndef OPENSSL_NO_SSL2
         if (cp == NULL)
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 41769febab..50bd415b56 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -866,8 +866,11 @@ int ssl3_get_server_hello(SSL *s)
                 s->session->cipher_id = s->session->cipher->id;
         if (s->hit && (s->session->cipher_id != c->id))
                 {
+/* Workaround is now obsolete */
+#if 0
                 if (!(s->options &
                         SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG))
+#endif
                         {
                         al=SSL_AD_ILLEGAL_PARAMETER;
                         SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED);
@@ -1508,6 +1511,7 @@ int ssl3_get_key_exchange(SSL *s)
                 s->session->sess_cert->peer_ecdh_tmp=ecdh;
                 ecdh=NULL;
                 BN_CTX_free(bn_ctx);
+                bn_ctx = NULL;
                 EC_POINT_free(srvr_ecpoint);
                 srvr_ecpoint = NULL;
                 }
@@ -2239,6 +2243,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                         if (!DH_generate_key(dh_clnt))
                                 {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                DH_free(dh_clnt);
                                 goto err;
                                 }
 
@@ -2250,6 +2255,7 @@ int ssl3_send_client_key_exchange(SSL *s)
                         if (n <= 0)
                                 {
                                 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                DH_free(dh_clnt);
                                 goto err;
                                 }
 
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index d6b047c995..62c791cb72 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -2198,11 +2198,17 @@ void ssl3_clear(SSL *s)
                 }
 #ifndef OPENSSL_NO_DH
         if (s->s3->tmp.dh != NULL)
+                {
                 DH_free(s->s3->tmp.dh);
+                s->s3->tmp.dh = NULL;
+                }
 #endif
 #ifndef OPENSSL_NO_ECDH
         if (s->s3->tmp.ecdh != NULL)
+                {
                 EC_KEY_free(s->s3->tmp.ecdh);
+                s->s3->tmp.ecdh = NULL;
+                }
 #endif
 
         rp = s->s3->rbuf.buf;
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
index e3f6050a26..f9b3629cf7 100644
--- a/src/lib/libssl/s3_pkt.c
+++ b/src/lib/libssl/s3_pkt.c
@@ -246,7 +246,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
                 if (i <= 0)
                         {
                         rb->left = left;
-                        if (s->mode & SSL_MODE_RELEASE_BUFFERS)
+                        if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
+                            SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)
                                 if (len+left == 0)
                                         ssl3_release_read_buffer(s);
                         return(i);
@@ -846,7 +847,8 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
                         {
                         wb->left=0;
                         wb->offset+=i;
-                        if (s->mode & SSL_MODE_RELEASE_BUFFERS)
+                        if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
+                            SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER)
                                 ssl3_release_write_buffer(s);
                         s->rwstate=SSL_NOTHING;
                         return(s->s3->wpend_ret);
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 92f73b6681..c3b5ff33ff 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -768,9 +768,7 @@ int ssl3_check_client_hello(SSL *s)
         if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
                 {
                 /* Throw away what we have done so far in the current handshake,
-                 * which will now be aborted. (A full SSL_clear would be too much.)
-                 * I hope that tmp.dh is the only thing that may need to be cleared
-                 * when a handshake is not completed ... */
+                 * which will now be aborted. (A full SSL_clear would be too much.) */
 #ifndef OPENSSL_NO_DH
                 if (s->s3->tmp.dh != NULL)
                         {
@@ -778,6 +776,13 @@ int ssl3_check_client_hello(SSL *s)
                         s->s3->tmp.dh = NULL;
                         }
 #endif
+#ifndef OPENSSL_NO_ECDH
+                if (s->s3->tmp.ecdh != NULL)
+                        {
+                        EC_KEY_free(s->s3->tmp.ecdh);
+                        s->s3->tmp.ecdh = NULL;
+                        }
+#endif
                 return 2;
                 }
         return 1;
@@ -985,6 +990,10 @@ int ssl3_get_client_hello(SSL *s)
                                 break;
                                 }
                         }
+/* Disabled because it can be used in a ciphersuite downgrade
+ * attack: CVE-2010-4180.
+ */
+#if 0
                 if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1))
                         {
                         /* Special case as client bug workaround: the previously used cipher may
@@ -999,6 +1008,7 @@ int ssl3_get_client_hello(SSL *s)
                                 j = 1;
                                 }
                         }
+#endif
                 if (j == 0)
                         {
                         /* we need to have the cipher in the cipher
@@ -1486,7 +1496,6 @@ int ssl3_send_server_key_exchange(SSL *s)
 
                         if (s->s3->tmp.dh != NULL)
                                 {
-                                DH_free(dh);
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
                                 }
@@ -1547,7 +1556,6 @@ int ssl3_send_server_key_exchange(SSL *s)
 
                         if (s->s3->tmp.ecdh != NULL)
                                 {
-                                EC_KEY_free(s->s3->tmp.ecdh); 
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
                                 goto err;
                                 }
@@ -1558,12 +1566,11 @@ int ssl3_send_server_key_exchange(SSL *s)
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
                                 goto err;
                                 }
-                        if (!EC_KEY_up_ref(ecdhp))
+                        if ((ecdh = EC_KEY_dup(ecdhp)) == NULL)
                                 {
                                 SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_ECDH_LIB);
                                 goto err;
                                 }
-                        ecdh = ecdhp;
 
                         s->s3->tmp.ecdh=ecdh;
                         if ((EC_KEY_get0_public_key(ecdh) == NULL) ||
@@ -1726,6 +1733,7 @@ int ssl3_send_server_key_exchange(SSL *s)
                             (unsigned char *)encodedPoint, 
                             encodedlen);
                         OPENSSL_free(encodedPoint);
+                        encodedPoint = NULL;
                         p += encodedlen;
                         }
 #endif
@@ -2435,6 +2443,12 @@ int ssl3_get_client_key_exchange(SSL *s)
                         /* Get encoded point length */
                         i = *p; 
                         p += 1;
+                        if (n != 1 + i)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                                    ERR_R_EC_LIB);
+                                goto err;
+                                }
                         if (EC_POINT_oct2point(group, 
                             clnt_ecpoint, p, i, bn_ctx) == 0)
                                 {
@@ -2579,12 +2593,19 @@ int ssl3_get_client_key_exchange(SSL *s)
                         {
                         int ret = 0;
                         EVP_PKEY_CTX *pkey_ctx;
-                        EVP_PKEY *client_pub_pkey = NULL;
+                        EVP_PKEY *client_pub_pkey = NULL, *pk = NULL;
                         unsigned char premaster_secret[32], *start;
-                        size_t outlen=32, inlen;                        
+                        size_t outlen=32, inlen;
+                        unsigned long alg_a;
 
                         /* Get our certificate private key*/
-                        pkey_ctx = EVP_PKEY_CTX_new(s->cert->key->privatekey,NULL);     
+                        alg_a = s->s3->tmp.new_cipher->algorithm_auth;
+                        if (alg_a & SSL_aGOST94)
+                                pk = s->cert->pkeys[SSL_PKEY_GOST94].privatekey;
+                        else if (alg_a & SSL_aGOST01)
+                                pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey;
+
+                        pkey_ctx = EVP_PKEY_CTX_new(pk,NULL);
                         EVP_PKEY_decrypt_init(pkey_ctx);
                         /* If client certificate is present and is of the same type, maybe
                          * use it for key exchange.  Don't mind errors from
diff --git a/src/lib/libssl/ssl_asn1.c b/src/lib/libssl/ssl_asn1.c
index 28709978b5..d7f4c6087e 100644
--- a/src/lib/libssl/ssl_asn1.c
+++ b/src/lib/libssl/ssl_asn1.c
@@ -357,7 +357,7 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
 SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
                              long length)
         {
-        int version,ssl_version=0,i;
+        int ssl_version=0,i;
         long id;
         ASN1_INTEGER ai,*aip;
         ASN1_OCTET_STRING os,*osp;
@@ -371,7 +371,6 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
 
         ai.data=NULL; ai.length=0;
         M_ASN1_D2I_get_x(ASN1_INTEGER,aip,d2i_ASN1_INTEGER);
-        version=(int)ASN1_INTEGER_get(aip);
         if (ai.data != NULL) { OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; }
 
         /* we don't care about the version right now :-) */
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index bee3507ea1..a8ce186b78 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1027,7 +1027,7 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
                 const SSL_CIPHER **ca_list)
         {
         unsigned long alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl, algo_strength;
-        const char *l, *start, *buf;
+        const char *l, *buf;
         int j, multi, found, rule, retval, ok, buflen;
         unsigned long cipher_id = 0;
         char ch;
@@ -1064,7 +1064,6 @@ static int ssl_cipher_process_rulestr(const char *rule_str,
                 alg_ssl = 0;
                 algo_strength = 0;
 
-                start=l;
                 for (;;)
                         {
                         ch = *l;
@@ -1456,7 +1455,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
         int is_export,pkl,kl;
         const char *ver,*exp_str;
         const char *kx,*au,*enc,*mac;
-        unsigned long alg_mkey,alg_auth,alg_enc,alg_mac,alg_ssl,alg2,alg_s;
+        unsigned long alg_mkey,alg_auth,alg_enc,alg_mac,alg_ssl,alg2;
 #ifdef KSSL_DEBUG
         static const char *format="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s%s AL=%lx/%lx/%lx/%lx/%lx\n";
 #else
@@ -1469,7 +1468,6 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
         alg_mac = cipher->algorithm_mac;
         alg_ssl = cipher->algorithm_ssl;
 
-        alg_s=cipher->algo_strength;
         alg2=cipher->algorithm2;
 
         is_export=SSL_C_IS_EXPORT(cipher);
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 3157f20eac..46732791fd 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1833,7 +1833,7 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
 #endif
         X509 *x = NULL;
         EVP_PKEY *ecc_pkey = NULL;
-        int signature_nid = 0;
+        int signature_nid = 0, pk_nid = 0, md_nid = 0;
 
         if (c == NULL) return;
 
@@ -1963,18 +1963,15 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
                     EVP_PKEY_bits(ecc_pkey) : 0;
                 EVP_PKEY_free(ecc_pkey);
                 if ((x->sig_alg) && (x->sig_alg->algorithm))
+                        {
                         signature_nid = OBJ_obj2nid(x->sig_alg->algorithm);
+                        OBJ_find_sigid_algs(signature_nid, &md_nid, &pk_nid);
+                        }
 #ifndef OPENSSL_NO_ECDH
                 if (ecdh_ok)
                         {
-                        const char *sig = OBJ_nid2ln(signature_nid);
-                        if (sig == NULL)
-                                {
-                                ERR_clear_error();
-                                sig = "unknown";
-                                }
-                                
-                        if (strstr(sig, "WithRSA"))
+
+                        if (pk_nid == NID_rsaEncryption || pk_nid == NID_rsa)
                                 {
                                 mask_k|=SSL_kECDHr;
                                 mask_a|=SSL_aECDH;
@@ -1985,7 +1982,7 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
                                         }
                                 }
 
-                        if (signature_nid == NID_ecdsa_with_SHA1)
+                        if (pk_nid == NID_X9_62_id_ecPublicKey)
                                 {
                                 mask_k|=SSL_kECDHe;
                                 mask_a|=SSL_aECDH;
@@ -2039,7 +2036,7 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
         unsigned long alg_k, alg_a;
         EVP_PKEY *pkey = NULL;
         int keysize = 0;
-        int signature_nid = 0;
+        int signature_nid = 0, md_nid = 0, pk_nid = 0;
 
         alg_k = cs->algorithm_mkey;
         alg_a = cs->algorithm_auth;
@@ -2057,7 +2054,10 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
         /* This call populates the ex_flags field correctly */
         X509_check_purpose(x, -1, 0);
         if ((x->sig_alg) && (x->sig_alg->algorithm))
+                {
                 signature_nid = OBJ_obj2nid(x->sig_alg->algorithm);
+                OBJ_find_sigid_algs(signature_nid, &md_nid, &pk_nid);
+                }
         if (alg_k & SSL_kECDHe || alg_k & SSL_kECDHr)
                 {
                 /* key usage, if present, must allow key agreement */
@@ -2069,7 +2069,7 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
                 if (alg_k & SSL_kECDHe)
                         {
                         /* signature alg must be ECDSA */
-                        if (signature_nid != NID_ecdsa_with_SHA1)
+                        if (pk_nid != NID_X9_62_id_ecPublicKey)
                                 {
                                 SSLerr(SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG, SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE);
                                 return 0;
@@ -2079,13 +2079,7 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
                         {
                         /* signature alg must be RSA */
 
-                        const char *sig = OBJ_nid2ln(signature_nid);
-                        if (sig == NULL)
-                                {
-                                ERR_clear_error();
-                                sig = "unknown";
-                                }
-                        if (strstr(sig, "WithRSA") == NULL)
+                        if (pk_nid != NID_rsaEncryption && pk_nid != NID_rsa)
                                 {
                                 SSLerr(SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG, SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE);
                                 return 0;
@@ -2110,23 +2104,12 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
 /* THIS NEEDS CLEANING UP */
 X509 *ssl_get_server_send_cert(SSL *s)
         {
-        unsigned long alg_k,alg_a,mask_k,mask_a;
+        unsigned long alg_k,alg_a;
         CERT *c;
-        int i,is_export;
+        int i;
 
         c=s->cert;
         ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
-        is_export=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
-        if (is_export)
-                {
-                mask_k = c->export_mask_k;
-                mask_a = c->export_mask_a;
-                }
-        else
-                {
-                mask_k = c->mask_k;
-                mask_a = c->mask_a;
-                }
         
         alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
         alg_a = s->s3->tmp.new_cipher->algorithm_auth;
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c
index 9719541f2b..793ea43e90 100644
--- a/src/lib/libssl/t1_enc.c
+++ b/src/lib/libssl/t1_enc.c
@@ -157,7 +157,7 @@ static int tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
                         const void *seed5, int seed5_len,
                         unsigned char *out, int olen)
         {
-        int chunk,n;
+        int chunk;
         unsigned int j;
         HMAC_CTX ctx;
         HMAC_CTX ctx_tmp;
@@ -187,7 +187,6 @@ static int tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
         if (!HMAC_Final(&ctx,A1,&A1_len))
                 goto err;
 
-        n=0;
         for (;;)
                 {
                 if (!HMAC_Init_ex(&ctx,NULL,0,NULL,NULL)) /* re-init */
@@ -309,13 +308,13 @@ static int tls1_generate_key_block(SSL *s, unsigned char *km,
 int tls1_change_cipher_state(SSL *s, int which)
         {
         static const unsigned char empty[]="";
-        unsigned char *p,*key_block,*mac_secret;
+        unsigned char *p,*mac_secret;
         unsigned char *exp_label;
         unsigned char tmp1[EVP_MAX_KEY_LENGTH];
         unsigned char tmp2[EVP_MAX_KEY_LENGTH];
         unsigned char iv1[EVP_MAX_IV_LENGTH*2];
         unsigned char iv2[EVP_MAX_IV_LENGTH*2];
-        unsigned char *ms,*key,*iv,*er1,*er2;
+        unsigned char *ms,*key,*iv;
         int client_write;
         EVP_CIPHER_CTX *dd;
         const EVP_CIPHER *c;
@@ -337,7 +336,6 @@ int tls1_change_cipher_state(SSL *s, int which)
 #ifndef OPENSSL_NO_COMP
         comp=s->s3->tmp.new_compression;
 #endif
-        key_block=s->s3->tmp.key_block;
 
 #ifdef KSSL_DEBUG
         printf("tls1_change_cipher_state(which= %d) w/\n", which);
@@ -448,8 +446,6 @@ int tls1_change_cipher_state(SSL *s, int which)
                        cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl;
         /* Was j=(exp)?5:EVP_CIPHER_key_length(c); */
         k=EVP_CIPHER_iv_length(c);
-        er1= &(s->s3->client_random[0]);
-        er2= &(s->s3->server_random[0]);
         if (    (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
                 (which == SSL3_CHANGE_CIPHER_SERVER_READ))
                 {
@@ -880,7 +876,7 @@ int tls1_final_finish_mac(SSL *s,
 int tls1_mac(SSL *ssl, unsigned char *md, int send)
         {
         SSL3_RECORD *rec;
-        unsigned char *mac_sec,*seq;
+        unsigned char *seq;
         EVP_MD_CTX *hash;
         size_t md_size;
         int i;
@@ -892,14 +888,12 @@ int tls1_mac(SSL *ssl, unsigned char *md, int send)
         if (send)
                 {
                 rec= &(ssl->s3->wrec);
-                mac_sec= &(ssl->s3->write_mac_secret[0]);
                 seq= &(ssl->s3->write_sequence[0]);
                 hash=ssl->write_hash;
                 }
         else
                 {
                 rec= &(ssl->s3->rrec);
-                mac_sec= &(ssl->s3->read_mac_secret[0]);
                 seq= &(ssl->s3->read_sequence[0]);
                 hash=ssl->read_hash;
                 }
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index e8bc34c111..85371c87b8 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -714,14 +714,23 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                                 switch (servname_type)
                                         {
                                 case TLSEXT_NAMETYPE_host_name:
-                                        if (s->session->tlsext_hostname == NULL)
+                                        if (!s->hit)
                                                 {
-                                                if (len > TLSEXT_MAXLEN_host_name || 
-                                                        ((s->session->tlsext_hostname = OPENSSL_malloc(len+1)) == NULL))
+                                                if(s->session->tlsext_hostname)
+                                                        {
+                                                        *al = SSL_AD_DECODE_ERROR;
+                                                        return 0;
+                                                        }
+                                                if (len > TLSEXT_MAXLEN_host_name)
                                                         {
                                                         *al = TLS1_AD_UNRECOGNIZED_NAME;
                                                         return 0;
                                                         }
+                                                if ((s->session->tlsext_hostname = OPENSSL_malloc(len+1)) == NULL)
+                                                        {
+                                                        *al = TLS1_AD_INTERNAL_ERROR;
+                                                        return 0;
+                                                        }
                                                 memcpy(s->session->tlsext_hostname, sdata, len);
                                                 s->session->tlsext_hostname[len]='\0';
                                                 if (strlen(s->session->tlsext_hostname) != len) {
@@ -734,7 +743,8 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
 
                                                 }
                                         else 
-                                                s->servername_done = strlen(s->session->tlsext_hostname) == len 
+                                                s->servername_done = s->session->tlsext_hostname
+                                                        && strlen(s->session->tlsext_hostname) == len 
                                                         && strncmp(s->session->tlsext_hostname, (char *)sdata, len) == 0;
                                         
                                         break;
@@ -765,15 +775,22 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                                 *al = TLS1_AD_DECODE_ERROR;
                                 return 0;
                                 }
-                        s->session->tlsext_ecpointformatlist_length = 0;
-                        if (s->session->tlsext_ecpointformatlist != NULL) OPENSSL_free(s->session->tlsext_ecpointformatlist);
-                        if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+                        if (!s->hit)
                                 {
-                                *al = TLS1_AD_INTERNAL_ERROR;
-                                return 0;
+                                if(s->session->tlsext_ecpointformatlist)
+                                        {
+                                        OPENSSL_free(s->session->tlsext_ecpointformatlist);
+                                        s->session->tlsext_ecpointformatlist = NULL;
+                                        }
+                                s->session->tlsext_ecpointformatlist_length = 0;
+                                if ((s->session->tlsext_ecpointformatlist = OPENSSL_malloc(ecpointformatlist_length)) == NULL)
+                                        {
+                                        *al = TLS1_AD_INTERNAL_ERROR;
+                                        return 0;
+                                        }
+                                s->session->tlsext_ecpointformatlist_length = ecpointformatlist_length;
+                                memcpy(s->session->tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
                                 }
-                        s->session->tlsext_ecpointformatlist_length = ecpointformatlist_length;
-                        memcpy(s->session->tlsext_ecpointformatlist, sdata, ecpointformatlist_length);
 #if 0
                         fprintf(stderr,"ssl_parse_clienthello_tlsext s->session->tlsext_ecpointformatlist (length=%i) ", s->session->tlsext_ecpointformatlist_length);
                         sdata = s->session->tlsext_ecpointformatlist;
@@ -794,15 +811,22 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                                 *al = TLS1_AD_DECODE_ERROR;
                                 return 0;
                                 }
-                        s->session->tlsext_ellipticcurvelist_length = 0;
-                        if (s->session->tlsext_ellipticcurvelist != NULL) OPENSSL_free(s->session->tlsext_ellipticcurvelist);
-                        if ((s->session->tlsext_ellipticcurvelist = OPENSSL_malloc(ellipticcurvelist_length)) == NULL)
+                        if (!s->hit)
                                 {
-                                *al = TLS1_AD_INTERNAL_ERROR;
-                                return 0;
+                                if(s->session->tlsext_ellipticcurvelist)
+                                        {
+                                        *al = TLS1_AD_DECODE_ERROR;
+                                        return 0;
+                                        }
+                                s->session->tlsext_ellipticcurvelist_length = 0;
+                                if ((s->session->tlsext_ellipticcurvelist = OPENSSL_malloc(ellipticcurvelist_length)) == NULL)
+                                        {
+                                        *al = TLS1_AD_INTERNAL_ERROR;
+                                        return 0;
+                                        }
+                                s->session->tlsext_ellipticcurvelist_length = ellipticcurvelist_length;
+                                memcpy(s->session->tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length);
                                 }
-                        s->session->tlsext_ellipticcurvelist_length = ellipticcurvelist_length;
-                        memcpy(s->session->tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length);
 #if 0
                         fprintf(stderr,"ssl_parse_clienthello_tlsext s->session->tlsext_ellipticcurvelist (length=%i) ", s->session->tlsext_ellipticcurvelist_length);
                         sdata = s->session->tlsext_ellipticcurvelist;
@@ -893,6 +917,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                                                 }
                                         n2s(data, idsize);
                                         dsize -= 2 + idsize;
+                                        size -= 2 + idsize;
                                         if (dsize < 0)
                                                 {
                                                 *al = SSL_AD_DECODE_ERROR;
@@ -931,9 +956,14 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                                         }
 
                                 /* Read in request_extensions */
+                                if (size < 2)
+                                        {
+                                        *al = SSL_AD_DECODE_ERROR;
+                                        return 0;
+                                        }
                                 n2s(data,dsize);
                                 size -= 2;
-                                if (dsize > size) 
+                                if (dsize != size)
                                         {
                                         *al = SSL_AD_DECODE_ERROR;
                                         return 0;
@@ -983,9 +1013,9 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
 
 int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, int n, int *al)
         {
+        unsigned short length;
         unsigned short type;
         unsigned short size;
-        unsigned short len;  
         unsigned char *data = *p;
         int tlsext_servername = 0;
         int renegotiate_seen = 0;
@@ -993,7 +1023,12 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
         if (data >= (d+n-2))
                 goto ri_check;
 
-        n2s(data,len);
+        n2s(data,length);
+        if (data+length != d+n)
+                {
+                *al = SSL_AD_DECODE_ERROR;
+                return 0;
+                }
 
         while(data <= (d+n-4))
                 {
@@ -1423,23 +1458,20 @@ int ssl_check_serverhello_tlsext(SSL *s)
         int al = SSL_AD_UNRECOGNIZED_NAME;
 
 #ifndef OPENSSL_NO_EC
-        /* If we are client and using an elliptic curve cryptography cipher suite, then server
-         * must return a an EC point formats lists containing uncompressed.
+        /* If we are client and using an elliptic curve cryptography cipher
+         * suite, then if server returns an EC point formats lists extension
+         * it must contain uncompressed.
          */
         unsigned long alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
         unsigned long alg_a = s->s3->tmp.new_cipher->algorithm_auth;
         if ((s->tlsext_ecpointformatlist != NULL) && (s->tlsext_ecpointformatlist_length > 0) && 
+            (s->session->tlsext_ecpointformatlist != NULL) && (s->session->tlsext_ecpointformatlist_length > 0) && 
             ((alg_k & (SSL_kEECDH|SSL_kECDHr|SSL_kECDHe)) || (alg_a & SSL_aECDSA)))
                 {
                 /* we are using an ECC cipher */
                 size_t i;
                 unsigned char *list;
                 int found_uncompressed = 0;
-                if ((s->session->tlsext_ecpointformatlist == NULL) || (s->session->tlsext_ecpointformatlist_length == 0))
-                        {
-                        SSLerr(SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT,SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST);
-                        return -1;
-                        }
                 list = s->session->tlsext_ecpointformatlist;
                 for (i = 0; i < s->session->tlsext_ecpointformatlist_length; i++)
                         {
diff --git a/src/lib/libssl/test/cms-test.pl b/src/lib/libssl/test/cms-test.pl
index 9c50dff3e9..c938bcf00d 100644
--- a/src/lib/libssl/test/cms-test.pl
+++ b/src/lib/libssl/test/cms-test.pl
@@ -54,9 +54,13 @@
 # OpenSSL PKCS#7 and CMS implementations.
 
 my $ossl_path;
-my $redir = " 2>cms.err 1>cms.out";
+my $redir = " 2> cms.err > cms.out";
+# Make VMS work
+if ( $^O eq "VMS" && -f "OSSLX:openssl.exe" ) {
+    $ossl_path = "pipe mcr OSSLX:openssl";
+}
 # Make MSYS work
-if ( $^O eq "MSWin32" && -f "../apps/openssl.exe" ) {
+elsif ( $^O eq "MSWin32" && -f "../apps/openssl.exe" ) {
     $ossl_path = "cmd /c ..\\apps\\openssl";
 }
 elsif ( -f "../apps/openssl$ENV{EXE_EXT}" ) {
@@ -84,79 +88,79 @@ my @smime_pkcs7_tests = (
 
     [
         "signed content DER format, RSA key",
-        "-sign -in smcont.txt -outform DER -nodetach"
+        "-sign -in smcont.txt -outform \"DER\" -nodetach"
           . " -certfile $smdir/smroot.pem"
           . " -signer $smdir/smrsa1.pem -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
         "signed detached content DER format, RSA key",
-        "-sign -in smcont.txt -outform DER"
+        "-sign -in smcont.txt -outform \"DER\""
           . " -signer $smdir/smrsa1.pem -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt -content smcont.txt"
     ],
 
     [
         "signed content test streaming BER format, RSA",
-        "-sign -in smcont.txt -outform DER -nodetach"
+        "-sign -in smcont.txt -outform \"DER\" -nodetach"
           . " -stream -signer $smdir/smrsa1.pem -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
         "signed content DER format, DSA key",
-        "-sign -in smcont.txt -outform DER -nodetach"
+        "-sign -in smcont.txt -outform \"DER\" -nodetach"
           . " -signer $smdir/smdsa1.pem -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
         "signed detached content DER format, DSA key",
-        "-sign -in smcont.txt -outform DER"
+        "-sign -in smcont.txt -outform \"DER\""
           . " -signer $smdir/smdsa1.pem -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt -content smcont.txt"
     ],
 
     [
         "signed detached content DER format, add RSA signer",
-        "-resign -inform DER -in test.cms -outform DER"
+        "-resign -inform \"DER\" -in test.cms -outform \"DER\""
           . " -signer $smdir/smrsa1.pem -out test2.cms",
-        "-verify -in test2.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
+        "-verify -in test2.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt -content smcont.txt"
     ],
 
     [
         "signed content test streaming BER format, DSA key",
-        "-sign -in smcont.txt -outform DER -nodetach"
+        "-sign -in smcont.txt -outform \"DER\" -nodetach"
           . " -stream -signer $smdir/smdsa1.pem -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
         "signed content test streaming BER format, 2 DSA and 2 RSA keys",
-        "-sign -in smcont.txt -outform DER -nodetach"
+        "-sign -in smcont.txt -outform \"DER\" -nodetach"
           . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
           . " -stream -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
 "signed content test streaming BER format, 2 DSA and 2 RSA keys, no attributes",
-        "-sign -in smcont.txt -outform DER -noattr -nodetach"
+        "-sign -in smcont.txt -outform \"DER\" -noattr -nodetach"
           . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
           . " -stream -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
@@ -165,7 +169,7 @@ my @smime_pkcs7_tests = (
           . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
           . " -stream -out test.cms",
-        "-verify -in test.cms " . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms " . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
@@ -174,7 +178,7 @@ my @smime_pkcs7_tests = (
           . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
           . " -stream -out test.cms",
-        "-verify -in test.cms " . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms " . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
@@ -215,12 +219,12 @@ my @smime_cms_tests = (
 
     [
         "signed content test streaming BER format, 2 DSA and 2 RSA keys, keyid",
-        "-sign -in smcont.txt -outform DER -nodetach -keyid"
+        "-sign -in smcont.txt -outform \"DER\" -nodetach -keyid"
           . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
           . " -stream -out test.cms",
-        "-verify -in test.cms -inform DER "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+        "-verify -in test.cms -inform \"DER\" "
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
@@ -230,7 +234,7 @@ my @smime_cms_tests = (
           . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
           . " -stream -out test.cms",
         "-verify -in test.cms -inform PEM "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
@@ -239,7 +243,7 @@ my @smime_cms_tests = (
           . " -receipt_request_to test\@openssl.org -receipt_request_all"
           . " -out test.cms",
         "-verify -in test.cms "
-          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+          . " \"-CAfile\" $smdir/smroot.pem -out smtst.txt"
     ],
 
     [
@@ -248,7 +252,7 @@ my @smime_cms_tests = (
           . " -signer $smdir/smrsa2.pem"
           . " -out test2.cms",
         "-verify_receipt test2.cms -in test.cms"
-          . " -CAfile $smdir/smroot.pem"
+          . " \"-CAfile\" $smdir/smroot.pem"
     ],
 
     [
@@ -289,38 +293,38 @@ my @smime_cms_tests = (
 
     [
         "encrypted content test streaming PEM format, 128 bit RC2 key",
-        "-EncryptedData_encrypt -in smcont.txt -outform PEM"
+        "\"-EncryptedData_encrypt\" -in smcont.txt -outform PEM"
           . " -rc2 -secretkey 000102030405060708090A0B0C0D0E0F"
           . " -stream -out test.cms",
-        "-EncryptedData_decrypt -in test.cms -inform PEM "
+        "\"-EncryptedData_decrypt\" -in test.cms -inform PEM "
           . " -secretkey 000102030405060708090A0B0C0D0E0F -out smtst.txt"
     ],
 
     [
         "encrypted content test streaming PEM format, 40 bit RC2 key",
-        "-EncryptedData_encrypt -in smcont.txt -outform PEM"
+        "\"-EncryptedData_encrypt\" -in smcont.txt -outform PEM"
           . " -rc2 -secretkey 0001020304"
           . " -stream -out test.cms",
-        "-EncryptedData_decrypt -in test.cms -inform PEM "
+        "\"-EncryptedData_decrypt\" -in test.cms -inform PEM "
           . " -secretkey 0001020304 -out smtst.txt"
     ],
 
     [
         "encrypted content test streaming PEM format, triple DES key",
-        "-EncryptedData_encrypt -in smcont.txt -outform PEM"
+        "\"-EncryptedData_encrypt\" -in smcont.txt -outform PEM"
           . " -des3 -secretkey 000102030405060708090A0B0C0D0E0F1011121314151617"
           . " -stream -out test.cms",
-        "-EncryptedData_decrypt -in test.cms -inform PEM "
+        "\"-EncryptedData_decrypt\" -in test.cms -inform PEM "
           . " -secretkey 000102030405060708090A0B0C0D0E0F1011121314151617"
           . " -out smtst.txt"
     ],
 
     [
         "encrypted content test streaming PEM format, 128 bit AES key",
-        "-EncryptedData_encrypt -in smcont.txt -outform PEM"
+        "\"-EncryptedData_encrypt\" -in smcont.txt -outform PEM"
           . " -aes128 -secretkey 000102030405060708090A0B0C0D0E0F"
           . " -stream -out test.cms",
-        "-EncryptedData_decrypt -in test.cms -inform PEM "
+        "\"-EncryptedData_decrypt\" -in test.cms -inform PEM "
           . " -secretkey 000102030405060708090A0B0C0D0E0F -out smtst.txt"
     ],