339 files changed, 15664 insertions, 4357 deletions

diff --git a/src/lib/libcrypto/Attic/Makefile b/src/lib/libcrypto/Attic/Makefile
index 85d9f249c5..947dd5d44e 100644
--- a/src/lib/libcrypto/Attic/Makefile
+++ b/src/lib/libcrypto/Attic/Makefile
@@ -7,7 +7,7 @@ TOP=		..
 CC=             cc
 INCLUDE=        -I. -I$(TOP) -I../include $(ZLIB_INCLUDE)
 # INCLUDES targets sudbirs!
-INCLUDES=       -I.. -I../.. -I../asn1 -I../evp -I../../include $(ZLIB_INCLUDE)
+INCLUDES=       -I.. -I../.. -I../modes -I../asn1 -I../evp -I../../include $(ZLIB_INCLUDE)
 CFLAG=          -g
 MAKEDEPPROG=    makedepend
 MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
@@ -34,8 +34,10 @@ GENERAL=Makefile README crypto-lib.com install.com
 
 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= libcrypto$(SHLIB_EXT)
-LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c
-LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o $(CPUID_OBJ)
+LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
+        ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c
+LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \
+        uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o $(CPUID_OBJ)
 
 SRC= $(LIBSRC)
 
@@ -67,14 +69,13 @@ applink.o:	$(TOP)/ms/applink.c
 uplink.o:       $(TOP)/ms/uplink.c applink.o
         $(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/uplink.c
 
-uplink-cof.s:   $(TOP)/ms/uplink.pl
-        $(PERL) $(TOP)/ms/uplink.pl coff > $@
+uplink-x86.s:   $(TOP)/ms/uplink-x86.pl
+        $(PERL) $(TOP)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@
 
-x86_64cpuid.s: x86_64cpuid.pl
-        $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
-ia64cpuid.s: ia64cpuid.S
-        $(CC) $(CFLAGS) -E ia64cpuid.S > $@
+x86_64cpuid.s: x86_64cpuid.pl;  $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
+ia64cpuid.s: ia64cpuid.S;       $(CC) $(CFLAGS) -E ia64cpuid.S > $@
 ppccpuid.s:     ppccpuid.pl;    $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
+pariscid.s:     pariscid.pl;    $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
 alphacpuid.s:   alphacpuid.pl
         $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
 
@@ -102,6 +103,7 @@ lib:	$(LIB)
         @touch lib
 $(LIB): $(LIBOBJ)
         $(AR) $(LIB) $(LIBOBJ)
+        [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
         $(RANLIB) $(LIB) || echo Never mind.
 
 shared: buildinf.h lib subdirs
@@ -171,6 +173,7 @@ ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 ex_data.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
 ex_data.o: ex_data.c
+fips_ers.o: ../include/openssl/opensslconf.h fips_ers.c
 mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
 mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
@@ -191,6 +194,19 @@ mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
 mem_dbg.o: mem_dbg.c
 o_dir.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
 o_dir.o: LPdir_unix.c o_dir.c o_dir.h
+o_fips.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
+o_fips.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+o_fips.o: ../include/openssl/err.h ../include/openssl/lhash.h
+o_fips.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+o_fips.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+o_fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
+o_fips.o: o_fips.c
+o_init.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/crypto.h
+o_init.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+o_init.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+o_init.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+o_init.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+o_init.o: ../include/openssl/symhacks.h o_init.c
 o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
 o_str.o: o_str.c o_str.h
 o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c
diff --git a/src/lib/libcrypto/aes/Makefile b/src/lib/libcrypto/aes/Makefile
index c501a43a8f..45ede0a0b4 100644
--- a/src/lib/libcrypto/aes/Makefile
+++ b/src/lib/libcrypto/aes/Makefile
@@ -50,9 +50,21 @@ aes-ia64.s: asm/aes-ia64.S
 
 aes-586.s:      asm/aes-586.pl ../perlasm/x86asm.pl
         $(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+vpaes-x86.s:    asm/vpaes-x86.pl ../perlasm/x86asm.pl
+        $(PERL) asm/vpaes-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+aesni-x86.s:    asm/aesni-x86.pl ../perlasm/x86asm.pl
+        $(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 aes-x86_64.s: asm/aes-x86_64.pl
         $(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@
+vpaes-x86_64.s: asm/vpaes-x86_64.pl
+        $(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@
+bsaes-x86_64.s: asm/bsaes-x86_64.pl
+        $(PERL) asm/bsaes-x86_64.pl $(PERLASM_SCHEME) > $@
+aesni-x86_64.s: asm/aesni-x86_64.pl
+        $(PERL) asm/aesni-x86_64.pl $(PERLASM_SCHEME) > $@
+aesni-sha1-x86_64.s:    asm/aesni-sha1-x86_64.pl
+        $(PERL) asm/aesni-sha1-x86_64.pl $(PERLASM_SCHEME) > $@
 
 aes-sparcv9.s: asm/aes-sparcv9.pl
         $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@
@@ -60,8 +72,15 @@ aes-sparcv9.s: asm/aes-sparcv9.pl
 aes-ppc.s:      asm/aes-ppc.pl
         $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@
 
+aes-parisc.s:   asm/aes-parisc.pl
+        $(PERL) asm/aes-parisc.pl $(PERLASM_SCHEME) $@
+
+aes-mips.S:     asm/aes-mips.pl
+        $(PERL) asm/aes-mips.pl $(PERLASM_SCHEME) $@
+
 # GNU make "catch all"
-aes-%.s:        asm/aes-%.pl;   $(PERL) $< $(CFLAGS) > $@
+aes-%.S:        asm/aes-%.pl;   $(PERL) $< $(PERLASM_SCHEME) > $@
+aes-armv4.o:    aes-armv4.S
 
 files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -117,9 +136,11 @@ aes_ige.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 aes_ige.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 aes_ige.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 aes_ige.o: ../../include/openssl/symhacks.h ../cryptlib.h aes_ige.c aes_locl.h
-aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
-aes_misc.o: ../../include/openssl/opensslconf.h
-aes_misc.o: ../../include/openssl/opensslv.h aes_locl.h aes_misc.c
+aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h
+aes_misc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+aes_misc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+aes_misc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+aes_misc.o: ../../include/openssl/symhacks.h aes_locl.h aes_misc.c
 aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/modes.h
 aes_ofb.o: ../../include/openssl/opensslconf.h aes_ofb.c
 aes_wrap.o: ../../e_os.h ../../include/openssl/aes.h
diff --git a/src/lib/libcrypto/asn1/Makefile b/src/lib/libcrypto/asn1/Makefile
index 160544eede..f7787005d4 100644
--- a/src/lib/libcrypto/asn1/Makefile
+++ b/src/lib/libcrypto/asn1/Makefile
@@ -639,7 +639,7 @@ t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-t_x509.o: ../cryptlib.h t_x509.c
+t_x509.o: ../cryptlib.h asn1_locl.h t_x509.c
 t_x509a.o: ../../e_os.h ../../include/openssl/asn1.h
 t_x509a.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 t_x509a.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/src/lib/libcrypto/bf/Makefile b/src/lib/libcrypto/bf/Makefile
index dd2c2c708e..d01bfaa315 100644
--- a/src/lib/libcrypto/bf/Makefile
+++ b/src/lib/libcrypto/bf/Makefile
@@ -94,5 +94,8 @@ bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
 bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h
 bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
 bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c
-bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
-bf_skey.o: ../../include/openssl/opensslconf.h bf_locl.h bf_pi.h bf_skey.c
+bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/crypto.h
+bf_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+bf_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bf_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bf_skey.o: ../../include/openssl/symhacks.h bf_locl.h bf_pi.h bf_skey.c
diff --git a/src/lib/libcrypto/bn/Makefile b/src/lib/libcrypto/bn/Makefile
index aabc4f56b8..672773454c 100644
--- a/src/lib/libcrypto/bn/Makefile
+++ b/src/lib/libcrypto/bn/Makefile
@@ -26,13 +26,13 @@ LIBSRC=	bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
         bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
         bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \
         bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \
-        bn_depr.c bn_const.c
+        bn_depr.c bn_const.c bn_x931p.c
 
 LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \
         bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \
         bn_kron.o bn_sqrt.o bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) \
         bn_recp.o bn_mont.o bn_mpi.o bn_exp2.o bn_gf2m.o bn_nist.o \
-        bn_depr.o bn_const.o
+        bn_depr.o bn_const.o bn_x931p.o
 
 SRC= $(LIBSRC)
 
@@ -66,6 +66,8 @@ co-586.s:	asm/co-586.pl ../perlasm/x86asm.pl
         $(PERL) asm/co-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 x86-mont.s:     asm/x86-mont.pl ../perlasm/x86asm.pl
         $(PERL) asm/x86-mont.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+x86-gf2m.s:     asm/x86-gf2m.pl ../perlasm/x86asm.pl
+        $(PERL) asm/x86-gf2m.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 sparcv8.o:      asm/sparcv8.S
         $(CC) $(CFLAGS) -c asm/sparcv8.S
@@ -82,16 +84,31 @@ bn-mips3.o:	asm/mips3.s
                 as -$$ABI -O -o $@ asm/mips3.s; \
         else    $(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi
 
+bn-mips.s:      asm/mips.pl
+        $(PERL) asm/mips.pl $(PERLASM_SCHEME) $@
+mips-mont.s:    asm/mips-mont.pl
+        $(PERL) asm/mips-mont.pl $(PERLASM_SCHEME) $@
+
 bn-s390x.o:     asm/s390x.S
         $(CC) $(CFLAGS) -c -o $@ asm/s390x.S
+s390x-gf2m.s:   asm/s390x-gf2m.pl
+        $(PERL) asm/s390x-gf2m.pl $(PERLASM_SCHEME) $@
 
 x86_64-gcc.o:   asm/x86_64-gcc.c
         $(CC) $(CFLAGS) -c -o $@ asm/x86_64-gcc.c
 x86_64-mont.s:  asm/x86_64-mont.pl
         $(PERL) asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@
+x86_64-mont5.s: asm/x86_64-mont5.pl
+        $(PERL) asm/x86_64-mont5.pl $(PERLASM_SCHEME) > $@
+x86_64-gf2m.s:  asm/x86_64-gf2m.pl
+        $(PERL) asm/x86_64-gf2m.pl $(PERLASM_SCHEME) > $@
+modexp512-x86_64.s:     asm/modexp512-x86_64.pl
+        $(PERL) asm/modexp512-x86_64.pl $(PERLASM_SCHEME) > $@
 
 bn-ia64.s:      asm/ia64.S
         $(CC) $(CFLAGS) -E asm/ia64.S > $@
+ia64-mont.s:    asm/ia64-mont.pl
+        $(PERL) asm/ia64-mont.pl $@ $(CFLAGS)
 
 # GNU assembler fails to compile PA-RISC2 modules, insist on calling
 # vendor assembler...
@@ -99,16 +116,22 @@ pa-risc2W.o: asm/pa-risc2W.s
         /usr/ccs/bin/as -o pa-risc2W.o asm/pa-risc2W.s
 pa-risc2.o: asm/pa-risc2.s
         /usr/ccs/bin/as -o pa-risc2.o asm/pa-risc2.s
+parisc-mont.s:  asm/parisc-mont.pl
+        $(PERL) asm/parisc-mont.pl $(PERLASM_SCHEME) $@
 
 # ppc - AIX, Linux, MacOS X...
 bn-ppc.s:       asm/ppc.pl;     $(PERL) asm/ppc.pl $(PERLASM_SCHEME) $@
 ppc-mont.s:     asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@
+ppc64-mont.s:   asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
 
 alpha-mont.s:   asm/alpha-mont.pl
         $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
 
 # GNU make "catch all"
-%-mont.s:       asm/%-mont.pl;  $(PERL) $< $(CFLAGS) > $@
+%-mont.s:       asm/%-mont.pl;  $(PERL) $< $(PERLASM_SCHEME) $@
+%-gf2m.S:       asm/%-gf2m.pl;  $(PERL) $< $(PERLASM_SCHEME) $@
+
+armv4-gf2m.o:   armv4-gf2m.S
 
 files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -345,3 +368,8 @@ bn_word.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bn_word.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 bn_word.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_word.c
+bn_x931p.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+bn_x931p.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+bn_x931p.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bn_x931p.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_x931p.o: ../../include/openssl/symhacks.h bn_x931p.c
diff --git a/src/lib/libcrypto/bn/bntest.c b/src/lib/libcrypto/bn/bntest.c
index 0cd99c5b4b..06f5954acc 100644
--- a/src/lib/libcrypto/bn/bntest.c
+++ b/src/lib/libcrypto/bn/bntest.c
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
         message(out,"BN_mod_sqrt");
         if (!test_sqrt(out,ctx)) goto err;
         (void)BIO_flush(out);
-
+#ifndef OPENSSL_NO_EC2M
         message(out,"BN_GF2m_add");
         if (!test_gf2m_add(out)) goto err;
         (void)BIO_flush(out);
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
         message(out,"BN_GF2m_mod_solve_quad");
         if (!test_gf2m_mod_solve_quad(out,ctx)) goto err;
         (void)BIO_flush(out);
-
+#endif
         BN_CTX_free(ctx);
         BIO_free(out);
 
@@ -1061,7 +1061,7 @@ int test_exp(BIO *bp, BN_CTX *ctx)
         BN_free(one);
         return(1);
         }
-
+#ifndef OPENSSL_NO_EC2M
 int test_gf2m_add(BIO *bp)
         {
         BIGNUM a,b,c;
@@ -1636,7 +1636,7 @@ int test_gf2m_mod_solve_quad(BIO *bp,BN_CTX *ctx)
         BN_free(e);
         return ret;
         }
-
+#endif
 static int genprime_cb(int p, int n, BN_GENCB *arg)
         {
         char c='*';
diff --git a/src/lib/libcrypto/buffer/Makefile b/src/lib/libcrypto/buffer/Makefile
index 9f3a88d2d6..2efba47f07 100644
--- a/src/lib/libcrypto/buffer/Makefile
+++ b/src/lib/libcrypto/buffer/Makefile
@@ -17,8 +17,8 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC= buffer.c buf_err.c
-LIBOBJ= buffer.o buf_err.o
+LIBSRC= buffer.c buf_str.c buf_err.c
+LIBOBJ= buffer.o buf_str.o buf_err.o
 
 SRC= $(LIBSRC)
 
@@ -81,6 +81,13 @@ buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 buf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 buf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 buf_err.o: buf_err.c
+buf_str.o: ../../e_os.h ../../include/openssl/bio.h
+buf_str.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+buf_str.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+buf_str.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+buf_str.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+buf_str.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+buf_str.o: ../../include/openssl/symhacks.h ../cryptlib.h buf_str.c
 buffer.o: ../../e_os.h ../../include/openssl/bio.h
 buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/src/lib/libcrypto/cast/Makefile b/src/lib/libcrypto/cast/Makefile
index 0acc38f28d..f3f4859886 100644
--- a/src/lib/libcrypto/cast/Makefile
+++ b/src/lib/libcrypto/cast/Makefile
@@ -95,5 +95,8 @@ c_ofb64.o: ../../e_os.h ../../include/openssl/cast.h
 c_ofb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 c_ofb64.o: c_ofb64.c cast_lcl.h
 c_skey.o: ../../e_os.h ../../include/openssl/cast.h
-c_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+c_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+c_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+c_skey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+c_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 c_skey.o: c_skey.c cast_lcl.h cast_s.h
diff --git a/src/lib/libcrypto/crypto-lib.com b/src/lib/libcrypto/crypto-lib.com
index a29c0afd93..c280aa03a8 100644
--- a/src/lib/libcrypto/crypto-lib.com
+++ b/src/lib/libcrypto/crypto-lib.com
@@ -117,7 +117,7 @@ $ ENCRYPT_TYPES = "Basic,"+ -
                   "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ -
                   "EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
                   "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -
-                  "STORE,CMS,PQUEUE,TS,JPAKE"
+                  "CMS,PQUEUE,TS,JPAKE,SRP,STORE,CMAC"
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
@@ -207,7 +207,8 @@ $!
 $ APPS_DES = "DES/DES,CBC3_ENC"
 $ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE"
 $
-$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,cpt_err,ebcdic,uid,o_time,o_str,o_dir"
+$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,cpt_err,"+ -
+        "ebcdic,uid,o_time,o_str,o_dir,o_fips.c,o_init,fips_ers"
 $ LIB_MD2 = "md2_dgst,md2_one"
 $ LIB_MD4 = "md4_dgst,md4_one"
 $ LIB_MD5 = "md5_dgst,md5_one"
@@ -224,15 +225,16 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ -
         "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -
         "ede_cbcm_enc,des_old,des_old2,read2pwd"
 $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"
-$ LIB_RC4 = "rc4_skey,rc4_enc"
+$ LIB_RC4 = "rc4_skey,rc4_enc,rc4_utl"
 $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"
 $ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey"
 $ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64"
 $ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"
 $ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -
-        "cmll_cfb,cmll_ctr"
+        "cmll_cfb,cmll_ctr,cmll_utl"
 $ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"
-$ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128"
+$ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128,gcm128,"+ -
+        "ccm128,xts128"
 $ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"
 $ IF F$TRNLNM("OPENSSL_NO_ASM") .OR. ARCH .NES. "VAX" THEN -
      LIB_BN_ASM = "bn_asm"
@@ -240,14 +242,16 @@ $ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -
         "bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ -
         "bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ -
         "bn_recp,bn_mont,bn_mpi,bn_exp2,bn_gf2m,bn_nist,"+ -
-        "bn_depr,bn_const"
+        "bn_depr,bn_const,bn_x931p"
 $ LIB_EC = "ec_lib,ecp_smpl,ecp_mont,ecp_nist,ec_cvt,ec_mult,"+ -
         "ec_err,ec_curve,ec_check,ec_print,ec_asn1,ec_key,"+ -
-        "ec2_smpl,ec2_mult,ec_ameth,ec_pmeth,eck_prn"
+        "ec2_smpl,ec2_mult,ec_ameth,ec_pmeth,eck_prn,"+ -
+        "ecp_nistp224,ecp_nistp256,ecp_nistp521,ecp_nistputil,"+ -
+        "ecp_oct,ec2_oct,ec_oct"
 $ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ -
         "rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk,rsa_null,"+ -
         "rsa_pss,rsa_x931,rsa_asn1,rsa_depr,rsa_ameth,rsa_prn,"+ -
-        "rsa_pmeth"
+        "rsa_pmeth,rsa_crpt"
 $ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,"+ -
         "dsa_err,dsa_ossl,dsa_depr,dsa_ameth,dsa_pmeth,dsa_prn"
 $ LIB_ECDSA = "ecs_lib,ecs_asn1,ecs_ossl,ecs_sign,ecs_vrf,ecs_err"
@@ -260,10 +264,11 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ -
         "eng_table,eng_pkey,eng_fat,eng_all,"+ -
         "tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ -
         "tb_cipher,tb_digest,tb_pkmeth,tb_asnmth,"+ -
-        "eng_openssl,eng_dyn,eng_cnf,eng_cryptodev"
+        "eng_openssl,eng_dyn,eng_cnf,eng_cryptodev,"+ -
+        "eng_rsax,eng_rdrand"
 $ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr,"+ -
         "aes_ige,aes_wrap"
-$ LIB_BUFFER = "buffer,buf_err"
+$ LIB_BUFFER = "buffer,buf_str,buf_err"
 $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
         "bss_mem,bss_null,bss_fd,"+ -
         "bss_file,bss_sock,bss_conn,"+ -
@@ -287,7 +292,8 @@ $ LIB_EVP_2 = "m_null,m_md2,m_md4,m_md5,m_sha,m_sha1,m_wp," + -
         "bio_md,bio_b64,bio_enc,evp_err,e_null,"+ -
         "c_all,c_allc,c_alld,evp_lib,bio_ok,"+-
         "evp_pkey,evp_pbe,p5_crpt,p5_crpt2"
-$ LIB_EVP_3 = "e_old,pmeth_lib,pmeth_fn,pmeth_gn,m_sigver"
+$ LIB_EVP_3 = "e_old,pmeth_lib,pmeth_fn,pmeth_gn,m_sigver,evp_fips,"+ -
+        "e_aes_cbc_hmac_sha1,e_rc4_hmac_md5"
 $ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ -
         "a_print,a_type,a_set,a_dup,a_d2i_fp,a_i2d_fp,"+ -
         "a_enum,a_utf8,a_sign,a_digest,a_verify,a_mbstr,a_strex,"+ -
@@ -329,14 +335,17 @@ $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
 $ LIB_UI_COMPAT = ",ui_compat"
 $ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT
 $ LIB_KRB5 = "krb5_asn"
-$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"
 $ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
-        "cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess"
+        "cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess,"+ -
+        "cms_pwri"
 $ LIB_PQUEUE = "pqueue"
 $ LIB_TS = "ts_err,ts_req_utils,ts_req_print,ts_rsp_utils,ts_rsp_print,"+ -
         "ts_rsp_sign,ts_rsp_verify,ts_verify_ctx,ts_lib,ts_conf,"+ -
         "ts_asn1"
 $ LIB_JPAKE = "jpake,jpake_err"
+$ LIB_SRP = "srp_lib,srp_vfy"
+$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"
+$ LIB_CMAC = "cmac,cm_ameth.c,cm_pmeth"
 $!
 $! Setup exceptional compilations
 $!
@@ -1021,7 +1030,7 @@ $!
 $! Set basic C compiler /INCLUDE directories.
 $!
 $ CC_INCLUDES = "SYS$DISK:[.''ARCHD'],SYS$DISK:[],SYS$DISK:[-],"+ -
-   "SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1]"
+   "SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.MODES],SYS$DISK:[.ASN1],SYS$DISK:[.EVP]"
 $!
 $! Check To See If P3 Is Blank.
 $!
diff --git a/src/lib/libcrypto/des/Makefile b/src/lib/libcrypto/des/Makefile
index ae982265fd..a6e1001329 100644
--- a/src/lib/libcrypto/des/Makefile
+++ b/src/lib/libcrypto/des/Makefile
@@ -257,8 +257,9 @@ rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c
-set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
diff --git a/src/lib/libcrypto/dsa/Makefile b/src/lib/libcrypto/dsa/Makefile
index 8073c4ecfe..5fef4ca5ad 100644
--- a/src/lib/libcrypto/dsa/Makefile
+++ b/src/lib/libcrypto/dsa/Makefile
@@ -99,8 +99,9 @@ dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dsa_asn1.o: ../../include/openssl/opensslconf.h
 dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-dsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_asn1.c
+dsa_asn1.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+dsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+dsa_asn1.o: ../cryptlib.h dsa_asn1.c
 dsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -189,7 +190,7 @@ dsa_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 dsa_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 dsa_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 dsa_prn.o: ../cryptlib.h dsa_prn.c
-dsa_sign.o: ../../e_os.h ../../include/openssl/bio.h
+dsa_sign.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
diff --git a/src/lib/libcrypto/ec/Makefile b/src/lib/libcrypto/ec/Makefile
index db380ed16f..f85fc845ca 100644
--- a/src/lib/libcrypto/ec/Makefile
+++ b/src/lib/libcrypto/ec/Makefile
@@ -19,11 +19,15 @@ APPS=
 LIB=$(TOP)/libcrypto.a
 LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\
         ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\
-        ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c
+        ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c \
+        ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c \
+        ecp_oct.c ec2_oct.c ec_oct.c
 
 LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\
         ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\
-        ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o
+        ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o \
+        ecp_nistp224.o ecp_nistp256.o ecp_nistp521.o ecp_nistputil.o \
+        ecp_oct.o ec2_oct.o ec_oct.o
 
 SRC= $(LIBSRC)
 
@@ -87,6 +91,14 @@ ec2_mult.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
 ec2_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ec2_mult.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ec2_mult.o: ../../include/openssl/symhacks.h ec2_mult.c ec_lcl.h
+ec2_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ec2_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ec2_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ec2_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ec2_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
+ec2_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ec2_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ec2_oct.o: ../../include/openssl/symhacks.h ec2_oct.c ec_lcl.h
 ec2_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ec2_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 ec2_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -174,6 +186,14 @@ ec_mult.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
 ec_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ec_mult.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ec_mult.o: ../../include/openssl/symhacks.h ec_lcl.h ec_mult.c
+ec_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ec_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ec_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ec_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ec_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
+ec_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ec_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ec_oct.o: ../../include/openssl/symhacks.h ec_lcl.h ec_oct.c
 ec_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h
 ec_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 ec_pmeth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -221,6 +241,18 @@ ecp_nist.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
 ecp_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ecp_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ecp_nist.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_nist.c
+ecp_nistp224.o: ../../include/openssl/opensslconf.h ecp_nistp224.c
+ecp_nistp256.o: ../../include/openssl/opensslconf.h ecp_nistp256.c
+ecp_nistp521.o: ../../include/openssl/opensslconf.h ecp_nistp521.c
+ecp_nistputil.o: ../../include/openssl/opensslconf.h ecp_nistputil.c
+ecp_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecp_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ecp_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecp_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ecp_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
+ecp_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecp_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecp_oct.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_oct.c
 ecp_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ecp_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 ecp_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
diff --git a/src/lib/libcrypto/ec/ectest.c b/src/lib/libcrypto/ec/ectest.c
index 7509cb9c7c..f107782de0 100644
--- a/src/lib/libcrypto/ec/ectest.c
+++ b/src/lib/libcrypto/ec/ectest.c
@@ -94,6 +94,7 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
 #include <openssl/objects.h>
 #include <openssl/rand.h>
 #include <openssl/bn.h>
+#include <openssl/opensslconf.h>
 
 #if defined(_MSC_VER) && defined(_MIPS_) && (_MSC_VER/100==12)
 /* suppress "too big too optimize" warning */
@@ -107,10 +108,6 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
         EXIT(1); \
 } while (0)
 
-void prime_field_tests(void);
-void char2_field_tests(void);
-void internal_curve_test(void);
-
 #define TIMING_BASE_PT 0
 #define TIMING_RAND_PT 1
 #define TIMING_SIMUL 2
@@ -195,7 +192,50 @@ static void timings(EC_GROUP *group, int type, BN_CTX *ctx)
         }
 #endif
 
-void prime_field_tests()
+/* test multiplication with group order, long and negative scalars */
+static void group_order_tests(EC_GROUP *group)
+        {
+        BIGNUM *n1, *n2, *order;
+        EC_POINT *P = EC_POINT_new(group);
+        EC_POINT *Q = EC_POINT_new(group);
+        BN_CTX *ctx = BN_CTX_new();
+
+        n1 = BN_new(); n2 = BN_new(); order = BN_new();
+        fprintf(stdout, "verify group order ...");
+        fflush(stdout);
+        if (!EC_GROUP_get_order(group, order, ctx)) ABORT;
+        if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) ABORT;
+        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
+        fprintf(stdout, ".");
+        fflush(stdout);
+        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
+        if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) ABORT;
+        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
+        fprintf(stdout, " ok\n");
+        fprintf(stdout, "long/negative scalar tests ... ");
+        if (!BN_one(n1)) ABORT;
+        /* n1 = 1 - order */
+        if (!BN_sub(n1, n1, order)) ABORT;
+        if(!EC_POINT_mul(group, Q, NULL, P, n1, ctx)) ABORT;
+        if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+        /* n2 = 1 + order */
+        if (!BN_add(n2, order, BN_value_one())) ABORT;
+        if(!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
+        if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+        /* n2 = (1 - order) * (1 + order) */
+        if (!BN_mul(n2, n1, n2, ctx)) ABORT;
+        if(!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
+        if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+        fprintf(stdout, "ok\n");
+        EC_POINT_free(P);
+        EC_POINT_free(Q);
+        BN_free(n1);
+        BN_free(n2);
+        BN_free(order);
+        BN_CTX_free(ctx);
+        }
+
+static void prime_field_tests(void)
         {       
         BN_CTX *ctx = NULL;
         BIGNUM *p, *a, *b;
@@ -321,21 +361,21 @@ void prime_field_tests()
         if (len == 0) ABORT;
         if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
         if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
-        fprintf(stdout, "Generator as octect string, compressed form:\n     ");
+        fprintf(stdout, "Generator as octet string, compressed form:\n     ");
         for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
         
         len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_UNCOMPRESSED, buf, sizeof buf, ctx);
         if (len == 0) ABORT;
         if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
         if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
-        fprintf(stdout, "\nGenerator as octect string, uncompressed form:\n     ");
+        fprintf(stdout, "\nGenerator as octet string, uncompressed form:\n     ");
         for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
         
         len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_HYBRID, buf, sizeof buf, ctx);
         if (len == 0) ABORT;
         if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
         if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
-        fprintf(stdout, "\nGenerator as octect string, hybrid form:\n     ");
+        fprintf(stdout, "\nGenerator as octet string, hybrid form:\n     ");
         for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
         
         if (!EC_POINT_get_Jprojective_coordinates_GFp(group, R, x, y, z, ctx)) ABORT;
@@ -381,17 +421,7 @@ void prime_field_tests()
         if (EC_GROUP_get_degree(group) != 160) ABORT;
         fprintf(stdout, " ok\n");
         
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+        group_order_tests(group);
 
         if (!(P_160 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_160, group)) ABORT;
@@ -425,17 +455,7 @@ void prime_field_tests()
         if (EC_GROUP_get_degree(group) != 192) ABORT;
         fprintf(stdout, " ok\n");
         
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+        group_order_tests(group);
 
         if (!(P_192 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_192, group)) ABORT;
@@ -469,17 +489,7 @@ void prime_field_tests()
         if (EC_GROUP_get_degree(group) != 224) ABORT;
         fprintf(stdout, " ok\n");
         
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+        group_order_tests(group);
 
         if (!(P_224 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_224, group)) ABORT;
@@ -514,17 +524,7 @@ void prime_field_tests()
         if (EC_GROUP_get_degree(group) != 256) ABORT;
         fprintf(stdout, " ok\n");
         
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+        group_order_tests(group);
 
         if (!(P_256 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_256, group)) ABORT;
@@ -563,18 +563,8 @@ void prime_field_tests()
         fprintf(stdout, "verify degree ...");
         if (EC_GROUP_get_degree(group) != 384) ABORT;
         fprintf(stdout, " ok\n");
-        
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+
+        group_order_tests(group);
 
         if (!(P_384 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_384, group)) ABORT;
@@ -619,18 +609,8 @@ void prime_field_tests()
         fprintf(stdout, "verify degree ...");
         if (EC_GROUP_get_degree(group) != 521) ABORT;
         fprintf(stdout, " ok\n");
-        
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+
+        group_order_tests(group);
 
         if (!(P_521 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_521, group)) ABORT;
@@ -659,6 +639,7 @@ void prime_field_tests()
                 points[2] = Q;
                 points[3] = Q;
 
+                if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
                 if (!BN_add(y, z, BN_value_one())) ABORT;
                 if (BN_is_odd(y)) ABORT;
                 if (!BN_rshift1(y, y)) ABORT;
@@ -792,22 +773,14 @@ void prime_field_tests()
         fprintf(stdout, "verify degree ..."); \
         if (EC_GROUP_get_degree(group) != _degree) ABORT; \
         fprintf(stdout, " ok\n"); \
-        fprintf(stdout, "verify group order ..."); \
-        fflush(stdout); \
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT; \
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; \
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT; \
-        fprintf(stdout, "."); \
-        fflush(stdout); \
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; \
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; \
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT; \
-        fprintf(stdout, " ok\n"); \
+        group_order_tests(group); \
         if (!(_variable = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT; \
-        if (!EC_GROUP_copy(_variable, group)) ABORT;
+        if (!EC_GROUP_copy(_variable, group)) ABORT; \
 
-void char2_field_tests()
-        {       
+#ifndef OPENSSL_NO_EC2M
+
+static void char2_field_tests(void)
+        {
         BN_CTX *ctx = NULL;
         BIGNUM *p, *a, *b;
         EC_GROUP *group;
@@ -1239,8 +1212,9 @@ void char2_field_tests()
         if (C2_B571) EC_GROUP_free(C2_B571);
 
         }
+#endif
 
-void internal_curve_test(void)
+static void internal_curve_test(void)
         {
         EC_builtin_curve *curves = NULL;
         size_t crv_len = 0, n = 0;
@@ -1287,13 +1261,189 @@ void internal_curve_test(void)
                 EC_GROUP_free(group);
                 }
         if (ok)
-                fprintf(stdout, " ok\n");
+                fprintf(stdout, " ok\n\n");
         else
-                fprintf(stdout, " failed\n");
+                {
+                fprintf(stdout, " failed\n\n");
+                ABORT;
+                }
         OPENSSL_free(curves);
         return;
         }
 
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+/* nistp_test_params contains magic numbers for testing our optimized
+ * implementations of several NIST curves with characteristic > 3. */
+struct nistp_test_params
+        {
+        const EC_METHOD* (*meth) ();
+        int degree;
+        /* Qx, Qy and D are taken from
+         * http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
+         * Otherwise, values are standard curve parameters from FIPS 180-3 */
+        const char *p, *a, *b, *Qx, *Qy, *Gx, *Gy, *order, *d;
+        };
+
+static const struct nistp_test_params nistp_tests_params[] =
+        {
+                {
+                /* P-224 */
+                EC_GFp_nistp224_method,
+                224,
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", /* p */
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", /* a */
+                "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", /* b */
+                "E84FB0B8E7000CB657D7973CF6B42ED78B301674276DF744AF130B3E", /* Qx */
+                "4376675C6FC5612C21A0FF2D2A89D2987DF7A2BC52183B5982298555", /* Qy */
+                "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", /* Gx */
+                "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", /* Gy */
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", /* order */
+                "3F0C488E987C80BE0FEE521F8D90BE6034EC69AE11CA72AA777481E8", /* d */
+                },
+                {
+                /* P-256 */
+                EC_GFp_nistp256_method,
+                256,
+                "ffffffff00000001000000000000000000000000ffffffffffffffffffffffff", /* p */
+                "ffffffff00000001000000000000000000000000fffffffffffffffffffffffc", /* a */
+                "5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b", /* b */
+                "b7e08afdfe94bad3f1dc8c734798ba1c62b3a0ad1e9ea2a38201cd0889bc7a19", /* Qx */
+                "3603f747959dbf7a4bb226e41928729063adc7ae43529e61b563bbc606cc5e09", /* Qy */
+                "6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296", /* Gx */
+                "4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5", /* Gy */
+                "ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551", /* order */
+                "c477f9f65c22cce20657faa5b2d1d8122336f851a508a1ed04e479c34985bf96", /* d */
+                },
+                {
+                /* P-521 */
+                EC_GFp_nistp521_method,
+                521,
+                "1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", /* p */
+                "1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc", /* a */
+                "051953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef109e156193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00", /* b */
+                "0098e91eef9a68452822309c52fab453f5f117c1da8ed796b255e9ab8f6410cca16e59df403a6bdc6ca467a37056b1e54b3005d8ac030decfeb68df18b171885d5c4", /* Qx */
+                "0164350c321aecfc1cca1ba4364c9b15656150b4b78d6a48d7d28e7f31985ef17be8554376b72900712c4b83ad668327231526e313f5f092999a4632fd50d946bc2e", /* Qy */
+                "c6858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3dbaa14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66", /* Gx */
+                "11839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e662c97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650", /* Gy */
+                "1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409", /* order */
+                "0100085f47b8e1b8b11b7eb33028c0b2888e304bfc98501955b45bba1478dc184eeedf09b86a5f7c21994406072787205e69a63709fe35aa93ba333514b24f961722", /* d */
+                },
+        };
+
+void nistp_single_test(const struct nistp_test_params *test)
+        {
+        BN_CTX *ctx;
+        BIGNUM *p, *a, *b, *x, *y, *n, *m, *order;
+        EC_GROUP *NISTP;
+        EC_POINT *G, *P, *Q, *Q_CHECK;
+
+        fprintf(stdout, "\nNIST curve P-%d (optimised implementation):\n", test->degree);
+        ctx = BN_CTX_new();
+        p = BN_new();
+        a = BN_new();
+        b = BN_new();
+        x = BN_new(); y = BN_new();
+        m = BN_new(); n = BN_new(); order = BN_new();
+
+        NISTP = EC_GROUP_new(test->meth());
+        if(!NISTP) ABORT;
+        if (!BN_hex2bn(&p, test->p)) ABORT;
+        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL)) ABORT;
+        if (!BN_hex2bn(&a, test->a)) ABORT;
+        if (!BN_hex2bn(&b, test->b)) ABORT;
+        if (!EC_GROUP_set_curve_GFp(NISTP, p, a, b, ctx)) ABORT;
+        G = EC_POINT_new(NISTP);
+        P = EC_POINT_new(NISTP);
+        Q = EC_POINT_new(NISTP);
+        Q_CHECK = EC_POINT_new(NISTP);
+        if(!BN_hex2bn(&x, test->Qx)) ABORT;
+        if(!BN_hex2bn(&y, test->Qy)) ABORT;
+        if(!EC_POINT_set_affine_coordinates_GFp(NISTP, Q_CHECK, x, y, ctx)) ABORT;
+        if (!BN_hex2bn(&x, test->Gx)) ABORT;
+        if (!BN_hex2bn(&y, test->Gy)) ABORT;
+        if (!EC_POINT_set_affine_coordinates_GFp(NISTP, G, x, y, ctx)) ABORT;
+        if (!BN_hex2bn(&order, test->order)) ABORT;
+        if (!EC_GROUP_set_generator(NISTP, G, order, BN_value_one())) ABORT;
+
+        fprintf(stdout, "verify degree ... ");
+        if (EC_GROUP_get_degree(NISTP) != test->degree) ABORT;
+        fprintf(stdout, "ok\n");
+
+        fprintf(stdout, "NIST test vectors ... ");
+        if (!BN_hex2bn(&n, test->d)) ABORT;
+        /* fixed point multiplication */
+        EC_POINT_mul(NISTP, Q, n, NULL, NULL, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+        /* random point multiplication */
+        EC_POINT_mul(NISTP, Q, NULL, G, n, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+
+        /* set generator to P = 2*G, where G is the standard generator */
+        if (!EC_POINT_dbl(NISTP, P, G, ctx)) ABORT;
+        if (!EC_GROUP_set_generator(NISTP, P, order, BN_value_one())) ABORT;
+        /* set the scalar to m=n/2, where n is the NIST test scalar */
+        if (!BN_rshift(m, n, 1)) ABORT;
+
+        /* test the non-standard generator */
+        /* fixed point multiplication */
+        EC_POINT_mul(NISTP, Q, m, NULL, NULL, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+        /* random point multiplication */
+        EC_POINT_mul(NISTP, Q, NULL, P, m, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+
+        /* now repeat all tests with precomputation */
+        if (!EC_GROUP_precompute_mult(NISTP, ctx)) ABORT;
+
+        /* fixed point multiplication */
+        EC_POINT_mul(NISTP, Q, m, NULL, NULL, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+        /* random point multiplication */
+        EC_POINT_mul(NISTP, Q, NULL, P, m, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+
+        /* reset generator */
+        if (!EC_GROUP_set_generator(NISTP, G, order, BN_value_one())) ABORT;
+        /* fixed point multiplication */
+        EC_POINT_mul(NISTP, Q, n, NULL, NULL, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+        /* random point multiplication */
+        EC_POINT_mul(NISTP, Q, NULL, G, n, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+
+        fprintf(stdout, "ok\n");
+        group_order_tests(NISTP);
+#if 0
+        timings(NISTP, TIMING_BASE_PT, ctx);
+        timings(NISTP, TIMING_RAND_PT, ctx);
+#endif
+        EC_GROUP_free(NISTP);
+        EC_POINT_free(G);
+        EC_POINT_free(P);
+        EC_POINT_free(Q);
+        EC_POINT_free(Q_CHECK);
+        BN_free(n);
+        BN_free(m);
+        BN_free(p);
+        BN_free(a);
+        BN_free(b);
+        BN_free(x);
+        BN_free(y);
+        BN_free(order);
+        BN_CTX_free(ctx);
+        }
+
+void nistp_tests()
+        {
+        unsigned i;
+
+        for (i = 0; i < sizeof(nistp_tests_params) / sizeof(struct nistp_test_params); i++)
+                {
+                nistp_single_test(&nistp_tests_params[i]);
+                }
+        }
+#endif
+
 static const char rnd_seed[] = "string to make the random number generator think it has entropy";
 
 int main(int argc, char *argv[])
@@ -1317,7 +1467,12 @@ int main(int argc, char *argv[])
 
         prime_field_tests();
         puts("");
+#ifndef OPENSSL_NO_EC2M
         char2_field_tests();
+#endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+        nistp_tests();
+#endif
         /* test the internal curves */
         internal_curve_test();
 
diff --git a/src/lib/libcrypto/engine/Makefile b/src/lib/libcrypto/engine/Makefile
index 9c214824eb..d29bdd09a0 100644
--- a/src/lib/libcrypto/engine/Makefile
+++ b/src/lib/libcrypto/engine/Makefile
@@ -21,12 +21,14 @@ LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
         eng_table.c eng_pkey.c eng_fat.c eng_all.c \
         tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \
         tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \
-        eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c
+        eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \
+        eng_rsax.c eng_rdrand.c
 LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \
         eng_table.o eng_pkey.o eng_fat.o eng_all.o \
         tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \
         tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \
-        eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o
+        eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \
+        eng_rsax.o eng_rdrand.o
 
 SRC= $(LIBSRC)
 
@@ -249,6 +251,34 @@ eng_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 eng_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 eng_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_pkey.c
+eng_rdrand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+eng_rdrand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+eng_rdrand.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+eng_rdrand.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+eng_rdrand.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+eng_rdrand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+eng_rdrand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+eng_rdrand.o: ../../include/openssl/opensslconf.h
+eng_rdrand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_rdrand.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+eng_rdrand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+eng_rdrand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+eng_rdrand.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+eng_rdrand.o: eng_rdrand.c
+eng_rsax.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+eng_rsax.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+eng_rsax.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+eng_rsax.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+eng_rsax.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_rsax.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+eng_rsax.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+eng_rsax.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+eng_rsax.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_rsax.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+eng_rsax.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+eng_rsax.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+eng_rsax.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+eng_rsax.o: eng_rsax.c
 eng_table.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_table.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/src/lib/libcrypto/engine/eng_cryptodev.c b/src/lib/libcrypto/engine/eng_cryptodev.c
index 52f4ca3901..5a715aca4f 100644
--- a/src/lib/libcrypto/engine/eng_cryptodev.c
+++ b/src/lib/libcrypto/engine/eng_cryptodev.c
@@ -79,8 +79,6 @@ struct dev_crypto_state {
         unsigned char digest_res[HASH_MAX_LEN];
         char *mac_data;
         int mac_len;
-
-        int copy;
 #endif
 };
 
@@ -200,6 +198,7 @@ get_dev_crypto(void)
 
         if ((fd = open_dev_crypto()) == -1)
                 return (-1);
+#ifndef CRIOGET_NOT_NEEDED
         if (ioctl(fd, CRIOGET, &retfd) == -1)
                 return (-1);
 
@@ -208,9 +207,19 @@ get_dev_crypto(void)
                 close(retfd);
                 return (-1);
         }
+#else
+        retfd = fd;
+#endif
         return (retfd);
 }
 
+static void put_dev_crypto(int fd)
+{
+#ifndef CRIOGET_NOT_NEEDED
+        close(fd);
+#endif
+}
+
 /* Caching version for asym operations */
 static int
 get_asym_dev_crypto(void)
@@ -252,7 +261,7 @@ get_cryptodev_ciphers(const int **cnids)
                     ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
                         nids[count++] = ciphers[i].nid;
         }
-        close(fd);
+        put_dev_crypto(fd);
 
         if (count > 0)
                 *cnids = nids;
@@ -291,7 +300,7 @@ get_cryptodev_digests(const int **cnids)
                     ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
                         nids[count++] = digests[i].nid;
         }
-        close(fd);
+        put_dev_crypto(fd);
 
         if (count > 0)
                 *cnids = nids;
@@ -436,7 +445,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         sess->cipher = cipher;
 
         if (ioctl(state->d_fd, CIOCGSESSION, sess) == -1) {
-                close(state->d_fd);
+                put_dev_crypto(state->d_fd);
                 state->d_fd = -1;
                 return (0);
         }
@@ -473,7 +482,7 @@ cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
         } else {
                 ret = 1;
         }
-        close(state->d_fd);
+        put_dev_crypto(state->d_fd);
         state->d_fd = -1;
 
         return (ret);
@@ -686,7 +695,7 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
         sess->mac = digest;
 
         if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) {
-                close(state->d_fd);
+                put_dev_crypto(state->d_fd);
                 state->d_fd = -1;
                 printf("cryptodev_digest_init: Open session failed\n");
                 return (0);
@@ -758,14 +767,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
         if (! (ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) ) {
                 /* if application doesn't support one buffer */
                 memset(&cryp, 0, sizeof(cryp));
-
                 cryp.ses = sess->ses;
                 cryp.flags = 0;
                 cryp.len = state->mac_len;
                 cryp.src = state->mac_data;
                 cryp.dst = NULL;
                 cryp.mac = (caddr_t)md;
-
                 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
                         printf("cryptodev_digest_final: digest failed\n");
                         return (0);
@@ -786,6 +793,9 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
         struct dev_crypto_state *state = ctx->md_data;
         struct session_op *sess = &state->d_sess;
 
+        if (state == NULL)
+          return 0;
+
         if (state->d_fd < 0) {
                 printf("cryptodev_digest_cleanup: illegal input\n");
                 return (0);
@@ -797,16 +807,13 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
                 state->mac_len = 0;
         }
 
-        if (state->copy)
-                return 1;
-
         if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) {
                 printf("cryptodev_digest_cleanup: failed to close session\n");
                 ret = 0;
         } else {
                 ret = 1;
         }
-        close(state->d_fd);     
+        put_dev_crypto(state->d_fd);    
         state->d_fd = -1;
 
         return (ret);
@@ -816,15 +823,39 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from)
 {
         struct dev_crypto_state *fstate = from->md_data;
         struct dev_crypto_state *dstate = to->md_data;
+        struct session_op *sess;
+        int digest;
 
-        memcpy(dstate, fstate, sizeof(struct dev_crypto_state));
+        if (dstate == NULL || fstate == NULL)
+          return 1;
 
-        if (fstate->mac_len != 0) {
-                dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
-                memcpy(dstate->mac_data, fstate->mac_data, fstate->mac_len);
+        memcpy(dstate, fstate, sizeof(struct dev_crypto_state));
+
+        sess = &dstate->d_sess;
+
+        digest = digest_nid_to_cryptodev(to->digest->type);
+
+        sess->mackey = dstate->dummy_mac_key;
+        sess->mackeylen = digest_key_length(to->digest->type);
+        sess->mac = digest;
+
+        dstate->d_fd = get_dev_crypto();
+
+        if (ioctl(dstate->d_fd, CIOCGSESSION, sess) < 0) {
+                put_dev_crypto(dstate->d_fd);
+                dstate->d_fd = -1;
+                printf("cryptodev_digest_init: Open session failed\n");
+                return (0);
         }
 
-        dstate->copy = 1;
+        if (fstate->mac_len != 0) {
+                if (fstate->mac_data != NULL)
+                        {
+                        dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
+                        memcpy(dstate->mac_data, fstate->mac_data, fstate->mac_len);
+                        dstate->mac_len = fstate->mac_len;
+                        }
+        }
 
         return 1;
 }
@@ -1347,11 +1378,11 @@ ENGINE_load_cryptodev(void)
          * find out what asymmetric crypto algorithms we support
          */
         if (ioctl(fd, CIOCASYMFEAT, &cryptodev_asymfeat) == -1) {
-                close(fd);
+                put_dev_crypto(fd);
                 ENGINE_free(engine);
                 return;
         }
-        close(fd);
+        put_dev_crypto(fd);
 
         if (!ENGINE_set_id(engine, "cryptodev") ||
             !ENGINE_set_name(engine, "BSD cryptodev engine") ||
diff --git a/src/lib/libcrypto/evp/Makefile b/src/lib/libcrypto/evp/Makefile
index 82825e5299..0fe1b96bff 100644
--- a/src/lib/libcrypto/evp/Makefile
+++ b/src/lib/libcrypto/evp/Makefile
@@ -28,7 +28,8 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
         bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
         c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
         evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c \
-        e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c
+        e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c evp_fips.c \
+        e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c
 
 LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \
         e_des.o e_bf.o e_idea.o e_des3.o e_camellia.o\
@@ -40,7 +41,8 @@ LIBOBJ=	encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \
         bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \
         c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o \
         evp_pkey.o evp_pbe.o p5_crpt.o p5_crpt2.o \
-        e_old.o pmeth_lib.o pmeth_fn.o pmeth_gn.o m_sigver.o
+        e_old.o pmeth_lib.o pmeth_fn.o pmeth_gn.o m_sigver.o evp_fips.o \
+        e_aes_cbc_hmac_sha1.o e_rc4_hmac_md5.o
 
 SRC= $(LIBSRC)
 
@@ -189,11 +191,27 @@ e_aes.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 e_aes.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 e_aes.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-e_aes.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-e_aes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_aes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_aes.c
-e_aes.o: evp_locl.h
+e_aes.o: ../../include/openssl/modes.h ../../include/openssl/obj_mac.h
+e_aes.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_aes.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_aes.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+e_aes.o: ../modes/modes_lcl.h e_aes.c evp_locl.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/bio.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/crypto.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/e_os2.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/evp.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/obj_mac.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/objects.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/opensslconf.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/opensslv.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/ossl_typ.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/safestack.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/sha.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/stack.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/symhacks.h e_aes_cbc_hmac_sha1.c
+e_aes_cbc_hmac_sha1.o: evp_locl.h
 e_bf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/buffer.h
 e_bf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -279,7 +297,18 @@ e_rc4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_rc4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_rc4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h
 e_rc4.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_rc4.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc4.c
+e_rc4.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc4.c evp_locl.h
+e_rc4_hmac_md5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+e_rc4_hmac_md5.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+e_rc4_hmac_md5.o: ../../include/openssl/evp.h ../../include/openssl/md5.h
+e_rc4_hmac_md5.o: ../../include/openssl/obj_mac.h
+e_rc4_hmac_md5.o: ../../include/openssl/objects.h
+e_rc4_hmac_md5.o: ../../include/openssl/opensslconf.h
+e_rc4_hmac_md5.o: ../../include/openssl/opensslv.h
+e_rc4_hmac_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h
+e_rc4_hmac_md5.o: ../../include/openssl/safestack.h
+e_rc4_hmac_md5.o: ../../include/openssl/stack.h
+e_rc4_hmac_md5.o: ../../include/openssl/symhacks.h e_rc4_hmac_md5.c
 e_rc5.o: ../../e_os.h ../../include/openssl/bio.h
 e_rc5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 e_rc5.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -349,6 +378,13 @@ evp_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 evp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 evp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 evp_err.o: ../../include/openssl/symhacks.h evp_err.c
+evp_fips.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+evp_fips.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+evp_fips.o: ../../include/openssl/evp.h ../../include/openssl/obj_mac.h
+evp_fips.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+evp_fips.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+evp_fips.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+evp_fips.o: ../../include/openssl/symhacks.h evp_fips.c
 evp_key.o: ../../e_os.h ../../include/openssl/asn1.h
 evp_key.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 evp_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -383,7 +419,7 @@ evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
 evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pbe.c
+evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h evp_pbe.c
 evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
 evp_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 evp_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -456,7 +492,7 @@ m_md4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 m_md4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_md4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_md4.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md4.c
+m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_md4.c
 m_md5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_md5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_md5.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -469,7 +505,7 @@ m_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md5.c
+m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_md5.c
 m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
@@ -484,7 +520,7 @@ m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 m_mdc2.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
-m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_mdc2.c
+m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_mdc2.c
 m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -510,7 +546,8 @@ m_ripemd.o: ../../include/openssl/pkcs7.h ../../include/openssl/ripemd.h
 m_ripemd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_ripemd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-m_ripemd.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_ripemd.c
+m_ripemd.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h
+m_ripemd.o: m_ripemd.c
 m_sha.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_sha.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_sha.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -523,7 +560,7 @@ m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
 m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_sha.o: ../cryptlib.h m_sha.c
+m_sha.o: ../cryptlib.h evp_locl.h m_sha.c
 m_sha1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_sha1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_sha1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -563,7 +600,7 @@ m_wp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 m_wp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_wp.o: ../../include/openssl/symhacks.h ../../include/openssl/whrlpool.h
 m_wp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_wp.o: ../cryptlib.h m_wp.c
+m_wp.o: ../cryptlib.h evp_locl.h m_wp.c
 names.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 names.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 names.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -601,7 +638,8 @@ p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 p5_crpt2.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p5_crpt2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_crpt2.c
+p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h
+p5_crpt2.o: p5_crpt2.c
 p_dec.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 p_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
diff --git a/src/lib/libcrypto/evp/bio_ok.c b/src/lib/libcrypto/evp/bio_ok.c
index 98bc1ab409..e64335353f 100644
--- a/src/lib/libcrypto/evp/bio_ok.c
+++ b/src/lib/libcrypto/evp/bio_ok.c
@@ -133,10 +133,10 @@ static int ok_new(BIO *h);
 static int ok_free(BIO *data);
 static long ok_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
 
-static void sig_out(BIO* b);
-static void sig_in(BIO* b);
-static void block_out(BIO* b);
-static void block_in(BIO* b);
+static int sig_out(BIO* b);
+static int sig_in(BIO* b);
+static int block_out(BIO* b);
+static int block_in(BIO* b);
 #define OK_BLOCK_SIZE   (1024*4)
 #define OK_BLOCK_BLOCK  4
 #define IOBS            (OK_BLOCK_SIZE+ OK_BLOCK_BLOCK+ 3*EVP_MAX_MD_SIZE)
@@ -266,10 +266,24 @@ static int ok_read(BIO *b, char *out, int outl)
                 ctx->buf_len+= i;
 
                 /* no signature yet -- check if we got one */
-                if (ctx->sigio == 1) sig_in(b);
+                if (ctx->sigio == 1)
+                        {
+                        if (!sig_in(b))
+                                {
+                                BIO_clear_retry_flags(b);
+                                return 0;
+                                }
+                        }
 
                 /* signature ok -- check if we got block */
-                if (ctx->sigio == 0) block_in(b);
+                if (ctx->sigio == 0)
+                        {
+                        if (!block_in(b))
+                                {
+                                BIO_clear_retry_flags(b);
+                                return 0;
+                                }
+                        }
 
                 /* invalid block -- cancel */
                 if (ctx->cont <= 0) break;
@@ -293,7 +307,8 @@ static int ok_write(BIO *b, const char *in, int inl)
 
         if ((ctx == NULL) || (b->next_bio == NULL) || (b->init == 0)) return(0);
 
-        if(ctx->sigio) sig_out(b);
+        if(ctx->sigio && !sig_out(b))
+                return 0;
 
         do{
                 BIO_clear_retry_flags(b);
@@ -332,7 +347,11 @@ static int ok_write(BIO *b, const char *in, int inl)
 
                 if(ctx->buf_len >= OK_BLOCK_SIZE+ OK_BLOCK_BLOCK)
                         {
-                        block_out(b);
+                        if (!block_out(b))
+                                {
+                                BIO_clear_retry_flags(b);
+                                return 0;
+                                }
                         }
         }while(inl > 0);
 
@@ -379,7 +398,8 @@ static long ok_ctrl(BIO *b, int cmd, long num, void *ptr)
         case BIO_CTRL_FLUSH:
                 /* do a final write */
                 if(ctx->blockout == 0)
-                        block_out(b);
+                        if (!block_out(b))
+                                return 0;
 
                 while (ctx->blockout)
                         {
@@ -408,7 +428,8 @@ static long ok_ctrl(BIO *b, int cmd, long num, void *ptr)
                 break;
         case BIO_C_SET_MD:
                 md=ptr;
-                EVP_DigestInit_ex(&ctx->md, md, NULL);
+                if (!EVP_DigestInit_ex(&ctx->md, md, NULL))
+                        return 0;
                 b->init=1;
                 break;
         case BIO_C_GET_MD:
@@ -455,7 +476,7 @@ static void longswap(void *_ptr, size_t len)
         }
 }
 
-static void sig_out(BIO* b)
+static int sig_out(BIO* b)
         {
         BIO_OK_CTX *ctx;
         EVP_MD_CTX *md;
@@ -463,9 +484,10 @@ static void sig_out(BIO* b)
         ctx=b->ptr;
         md=&ctx->md;
 
-        if(ctx->buf_len+ 2* md->digest->md_size > OK_BLOCK_SIZE) return;
+        if(ctx->buf_len+ 2* md->digest->md_size > OK_BLOCK_SIZE) return 1;
 
-        EVP_DigestInit_ex(md, md->digest, NULL);
+        if (!EVP_DigestInit_ex(md, md->digest, NULL))
+                goto berr;
         /* FIXME: there's absolutely no guarantee this makes any sense at all,
          * particularly now EVP_MD_CTX has been restructured.
          */
@@ -474,14 +496,20 @@ static void sig_out(BIO* b)
         longswap(&(ctx->buf[ctx->buf_len]), md->digest->md_size);
         ctx->buf_len+= md->digest->md_size;
 
-        EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN));
-        EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL);
+        if (!EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN)))
+                goto berr;
+        if (!EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL))
+                goto berr;
         ctx->buf_len+= md->digest->md_size;
         ctx->blockout= 1;
         ctx->sigio= 0;
+        return 1;
+        berr:
+        BIO_clear_retry_flags(b);
+        return 0;
         }
 
-static void sig_in(BIO* b)
+static int sig_in(BIO* b)
         {
         BIO_OK_CTX *ctx;
         EVP_MD_CTX *md;
@@ -491,15 +519,18 @@ static void sig_in(BIO* b)
         ctx=b->ptr;
         md=&ctx->md;
 
-        if((int)(ctx->buf_len-ctx->buf_off) < 2*md->digest->md_size) return;
+        if((int)(ctx->buf_len-ctx->buf_off) < 2*md->digest->md_size) return 1;
 
-        EVP_DigestInit_ex(md, md->digest, NULL);
+        if (!EVP_DigestInit_ex(md, md->digest, NULL))
+                goto berr;
         memcpy(md->md_data, &(ctx->buf[ctx->buf_off]), md->digest->md_size);
         longswap(md->md_data, md->digest->md_size);
         ctx->buf_off+= md->digest->md_size;
 
-        EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN));
-        EVP_DigestFinal_ex(md, tmp, NULL);
+        if (!EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN)))
+                goto berr;
+        if (!EVP_DigestFinal_ex(md, tmp, NULL))
+                goto berr;
         ret= memcmp(&(ctx->buf[ctx->buf_off]), tmp, md->digest->md_size) == 0;
         ctx->buf_off+= md->digest->md_size;
         if(ret == 1)
@@ -516,9 +547,13 @@ static void sig_in(BIO* b)
                 {
                 ctx->cont= 0;
                 }
+        return 1;
+        berr:
+        BIO_clear_retry_flags(b);
+        return 0;
         }
 
-static void block_out(BIO* b)
+static int block_out(BIO* b)
         {
         BIO_OK_CTX *ctx;
         EVP_MD_CTX *md;
@@ -532,13 +567,20 @@ static void block_out(BIO* b)
         ctx->buf[1]=(unsigned char)(tl>>16);
         ctx->buf[2]=(unsigned char)(tl>>8);
         ctx->buf[3]=(unsigned char)(tl);
-        EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl);
-        EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL);
+        if (!EVP_DigestUpdate(md,
+                (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl))
+                goto berr;
+        if (!EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL))
+                goto berr;
         ctx->buf_len+= md->digest->md_size;
         ctx->blockout= 1;
+        return 1;
+        berr:
+        BIO_clear_retry_flags(b);
+        return 0;
         }
 
-static void block_in(BIO* b)
+static int block_in(BIO* b)
         {
         BIO_OK_CTX *ctx;
         EVP_MD_CTX *md;
@@ -554,10 +596,13 @@ static void block_in(BIO* b)
         tl|=ctx->buf[2]; tl<<=8;
         tl|=ctx->buf[3];
 
-        if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return;
+        if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return 1;
  
-        EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl);
-        EVP_DigestFinal_ex(md, tmp, NULL);
+        if (!EVP_DigestUpdate(md,
+                        (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl))
+                goto berr;
+        if (!EVP_DigestFinal_ex(md, tmp, NULL))
+                goto berr;
         if(memcmp(&(ctx->buf[tl+ OK_BLOCK_BLOCK]), tmp, md->digest->md_size) == 0)
                 {
                 /* there might be parts from next block lurking around ! */
@@ -571,5 +616,9 @@ static void block_in(BIO* b)
                 {
                 ctx->cont= 0;
                 }
+        return 1;
+        berr:
+        BIO_clear_retry_flags(b);
+        return 0;
         }
 
diff --git a/src/lib/libcrypto/evp/c_allc.c b/src/lib/libcrypto/evp/c_allc.c
index c5f9268378..2a45d435e5 100644
--- a/src/lib/libcrypto/evp/c_allc.c
+++ b/src/lib/libcrypto/evp/c_allc.c
@@ -98,6 +98,9 @@ void OpenSSL_add_all_ciphers(void)
 #ifndef OPENSSL_NO_RC4
         EVP_add_cipher(EVP_rc4());
         EVP_add_cipher(EVP_rc4_40());
+#ifndef OPENSSL_NO_MD5
+        EVP_add_cipher(EVP_rc4_hmac_md5());
+#endif
 #endif
 
 #ifndef OPENSSL_NO_IDEA
@@ -166,9 +169,9 @@ void OpenSSL_add_all_ciphers(void)
         EVP_add_cipher(EVP_aes_128_cfb1());
         EVP_add_cipher(EVP_aes_128_cfb8());
         EVP_add_cipher(EVP_aes_128_ofb());
-#if 0
         EVP_add_cipher(EVP_aes_128_ctr());
-#endif
+        EVP_add_cipher(EVP_aes_128_gcm());
+        EVP_add_cipher(EVP_aes_128_xts());
         EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
         EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
         EVP_add_cipher(EVP_aes_192_ecb());
@@ -177,9 +180,8 @@ void OpenSSL_add_all_ciphers(void)
         EVP_add_cipher(EVP_aes_192_cfb1());
         EVP_add_cipher(EVP_aes_192_cfb8());
         EVP_add_cipher(EVP_aes_192_ofb());
-#if 0
         EVP_add_cipher(EVP_aes_192_ctr());
-#endif
+        EVP_add_cipher(EVP_aes_192_gcm());
         EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
         EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
         EVP_add_cipher(EVP_aes_256_ecb());
@@ -188,11 +190,15 @@ void OpenSSL_add_all_ciphers(void)
         EVP_add_cipher(EVP_aes_256_cfb1());
         EVP_add_cipher(EVP_aes_256_cfb8());
         EVP_add_cipher(EVP_aes_256_ofb());
-#if 0
         EVP_add_cipher(EVP_aes_256_ctr());
-#endif
+        EVP_add_cipher(EVP_aes_256_gcm());
+        EVP_add_cipher(EVP_aes_256_xts());
         EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
         EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
+        EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
+        EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
+#endif
 #endif
 
 #ifndef OPENSSL_NO_CAMELLIA
diff --git a/src/lib/libcrypto/evp/evptests.txt b/src/lib/libcrypto/evp/evptests.txt
index beb12144b6..c273707c14 100644
--- a/src/lib/libcrypto/evp/evptests.txt
+++ b/src/lib/libcrypto/evp/evptests.txt
@@ -158,6 +158,19 @@ AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7B
 AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:0
 AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:0
 
+# AES Counter test vectors from RFC3686
+aes-128-ctr:AE6852F8121067CC4BF7A5765577F39E:00000030000000000000000000000001:53696E676C6520626C6F636B206D7367:E4095D4FB7A7B3792D6175A3261311B8:1
+aes-128-ctr:7E24067817FAE0D743D6CE1F32539163:006CB6DBC0543B59DA48D90B00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28:1
+aes-128-ctr:7691BE035E5020A8AC6E618529F9A0DC:00E0017B27777F3F4A1786F000000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F:1
+
+aes-192-ctr:16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515:0000004836733C147D6D93CB00000001:53696E676C6520626C6F636B206D7367:4B55384FE259C9C84E7935A003CBE928:1
+aes-192-ctr:7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A:0096B03B020C6EADC2CB500D00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:453243FC609B23327EDFAAFA7131CD9F8490701C5AD4A79CFC1FE0FF42F4FB00:1
+aes-192-ctr:02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE:0007BDFD5CBD60278DCC091200000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:96893FC55E5C722F540B7DD1DDF7E758D288BC95C69165884536C811662F2188ABEE0935:1
+
+aes-256-ctr:776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104:00000060DB5672C97AA8F0B200000001:53696E676C6520626C6F636B206D7367:145AD01DBF824EC7560863DC71E3E0C0:1
+aes-256-ctr:F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884:00FAAC24C1585EF15A43D87500000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C:1
+aes-256-ctr:FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D:001CC5B751A51D70A1C1114800000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8:1
+
 # DES ECB tests (from destest)
 
 DES-ECB:0000000000000000::0000000000000000:8CA64DE9C1B123A7
diff --git a/src/lib/libcrypto/evp/m_mdc2.c b/src/lib/libcrypto/evp/m_mdc2.c
index b08d559803..3602bed316 100644
--- a/src/lib/libcrypto/evp/m_mdc2.c
+++ b/src/lib/libcrypto/evp/m_mdc2.c
@@ -69,6 +69,8 @@
 #include <openssl/rsa.h>
 #endif
 
+#include "evp_locl.h"
+
 static int init(EVP_MD_CTX *ctx)
         { return MDC2_Init(ctx->md_data); }
 
diff --git a/src/lib/libcrypto/evp/m_sha.c b/src/lib/libcrypto/evp/m_sha.c
index acccc8f92d..8769cdd42f 100644
--- a/src/lib/libcrypto/evp/m_sha.c
+++ b/src/lib/libcrypto/evp/m_sha.c
@@ -67,6 +67,7 @@
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
+#include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
         { return SHA_Init(ctx->md_data); }
diff --git a/src/lib/libcrypto/idea/Makefile b/src/lib/libcrypto/idea/Makefile
index b2e7add666..8af0acdad9 100644
--- a/src/lib/libcrypto/idea/Makefile
+++ b/src/lib/libcrypto/idea/Makefile
@@ -82,5 +82,8 @@ i_ecb.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
 i_ecb.o: ../../include/openssl/opensslv.h i_ecb.c idea_lcl.h
 i_ofb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
 i_ofb64.o: i_ofb64.c idea_lcl.h
+i_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 i_skey.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
-i_skey.o: i_skey.c idea_lcl.h
+i_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+i_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+i_skey.o: ../../include/openssl/symhacks.h i_skey.c idea_lcl.h
diff --git a/src/lib/libcrypto/md2/md2.h b/src/lib/libcrypto/md2/md2.h
index a46120e7d4..d59c9f2593 100644
--- a/src/lib/libcrypto/md2/md2.h
+++ b/src/lib/libcrypto/md2/md2.h
@@ -81,6 +81,9 @@ typedef struct MD2state_st
         } MD2_CTX;
 
 const char *MD2_options(void);
+#ifdef OPENSSL_FIPS
+int private_MD2_Init(MD2_CTX *c);
+#endif
 int MD2_Init(MD2_CTX *c);
 int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len);
 int MD2_Final(unsigned char *md, MD2_CTX *c);
diff --git a/src/lib/libcrypto/md2/md2_dgst.c b/src/lib/libcrypto/md2/md2_dgst.c
index c57b3da288..bf89def73e 100644
--- a/src/lib/libcrypto/md2/md2_dgst.c
+++ b/src/lib/libcrypto/md2/md2_dgst.c
@@ -116,7 +116,7 @@ const char *MD2_options(void)
                 return("md2(int)");
         }
 
-int MD2_Init(MD2_CTX *c)
+fips_md_init(MD2)
         {
         c->num=0;
         memset(c->state,0,sizeof c->state);
diff --git a/src/lib/libcrypto/md4/Makefile b/src/lib/libcrypto/md4/Makefile
index c94a1398ed..e6f1e4478c 100644
--- a/src/lib/libcrypto/md4/Makefile
+++ b/src/lib/libcrypto/md4/Makefile
@@ -76,9 +76,11 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-md4_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md4.h
-md4_dgst.o: ../../include/openssl/opensslconf.h
-md4_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md4_dgst.c
+md4_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+md4_dgst.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h
+md4_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+md4_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+md4_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h md4_dgst.c
 md4_dgst.o: md4_locl.h
 md4_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 md4_one.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h
diff --git a/src/lib/libcrypto/md5/Makefile b/src/lib/libcrypto/md5/Makefile
index 9858d53d31..b9e2ce9a38 100644
--- a/src/lib/libcrypto/md5/Makefile
+++ b/src/lib/libcrypto/md5/Makefile
@@ -89,9 +89,11 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-md5_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md5.h
-md5_dgst.o: ../../include/openssl/opensslconf.h
-md5_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md5_dgst.c
+md5_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+md5_dgst.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h
+md5_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+md5_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+md5_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h md5_dgst.c
 md5_dgst.o: md5_locl.h
 md5_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 md5_one.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h
diff --git a/src/lib/libcrypto/mdc2/Makefile b/src/lib/libcrypto/mdc2/Makefile
index 1d064f17a6..141553149d 100644
--- a/src/lib/libcrypto/mdc2/Makefile
+++ b/src/lib/libcrypto/mdc2/Makefile
@@ -84,10 +84,10 @@ mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 mdc2_one.o: ../../include/openssl/ui_compat.h ../cryptlib.h mdc2_one.c
-mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-mdc2dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/mdc2.h
-mdc2dgst.o: ../../include/openssl/opensslconf.h
-mdc2dgst.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-mdc2dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-mdc2dgst.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-mdc2dgst.o: mdc2dgst.c
+mdc2dgst.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+mdc2dgst.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
+mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+mdc2dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+mdc2dgst.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+mdc2dgst.o: ../../include/openssl/ui_compat.h mdc2dgst.c
diff --git a/src/lib/libcrypto/mdc2/mdc2.h b/src/lib/libcrypto/mdc2/mdc2.h
index 72778a5212..f3e8e579d2 100644
--- a/src/lib/libcrypto/mdc2/mdc2.h
+++ b/src/lib/libcrypto/mdc2/mdc2.h
@@ -81,6 +81,9 @@ typedef struct mdc2_ctx_st
         } MDC2_CTX;
 
 
+#ifdef OPENSSL_FIPS
+int private_MDC2_Init(MDC2_CTX *c);
+#endif
 int MDC2_Init(MDC2_CTX *c);
 int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
 int MDC2_Final(unsigned char *md, MDC2_CTX *c);
diff --git a/src/lib/libcrypto/mem.c b/src/lib/libcrypto/mem.c
index 6f80dd33eb..21c0011380 100644
--- a/src/lib/libcrypto/mem.c
+++ b/src/lib/libcrypto/mem.c
@@ -125,6 +125,7 @@ static long (*get_debug_options_func)(void) = NULL;
 int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
         void (*f)(void *))
         {
+        OPENSSL_init();
         if (!allow_customize)
                 return 0;
         if ((m == 0) || (r == 0) || (f == 0))
@@ -186,6 +187,7 @@ int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
         {
         if (!allow_customize_debug)
                 return 0;
+        OPENSSL_init();
         malloc_debug_func=m;
         realloc_debug_func=r;
         free_debug_func=f;
@@ -361,6 +363,10 @@ void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
 
         if (num <= 0) return NULL;
 
+        /* We don't support shrinking the buffer. Note the memcpy that copies
+         * |old_len| bytes to the new buffer, below. */
+        if (num < old_len) return NULL;
+
         if (realloc_debug_func != NULL)
                 realloc_debug_func(str, NULL, num, file, line, 0);
         ret=malloc_ex_func(num,file,line);
diff --git a/src/lib/libcrypto/objects/obj_dat.h b/src/lib/libcrypto/objects/obj_dat.h
index 6449be6071..d404ad07c9 100644
--- a/src/lib/libcrypto/objects/obj_dat.h
+++ b/src/lib/libcrypto/objects/obj_dat.h
@@ -62,12 +62,12 @@
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 893
-#define NUM_SN 886
-#define NUM_LN 886
-#define NUM_OBJ 840
+#define NUM_NID 920
+#define NUM_SN 913
+#define NUM_LN 913
+#define NUM_OBJ 857
 
-static const unsigned char lvalues[5824]={
+static const unsigned char lvalues[5980]={
 0x00,                                        /* [  0] OBJ_undef */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -908,6 +908,23 @@ static const unsigned char lvalues[5824]={
 0x55,0x04,0x34,                              /* [5814] OBJ_supportedAlgorithms */
 0x55,0x04,0x35,                              /* [5817] OBJ_deltaRevocationList */
 0x55,0x04,0x36,                              /* [5820] OBJ_dmdName */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x09,/* [5823] OBJ_id_alg_PWRI_KEK */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x06,/* [5834] OBJ_aes_128_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x07,/* [5843] OBJ_aes_128_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x08,/* [5852] OBJ_id_aes128_wrap_pad */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1A,/* [5861] OBJ_aes_192_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1B,/* [5870] OBJ_aes_192_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1C,/* [5879] OBJ_id_aes192_wrap_pad */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2E,/* [5888] OBJ_aes_256_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2F,/* [5897] OBJ_aes_256_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x30,/* [5906] OBJ_id_aes256_wrap_pad */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x02,/* [5915] OBJ_id_camellia128_wrap */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x03,/* [5926] OBJ_id_camellia192_wrap */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x04,/* [5937] OBJ_id_camellia256_wrap */
+0x55,0x1D,0x25,0x00,                         /* [5948] OBJ_anyExtendedKeyUsage */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x08,/* [5952] OBJ_mgf1 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0A,/* [5961] OBJ_rsassaPss */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x07,/* [5970] OBJ_rsaesOaep */
 };
 
 static const ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2351,28 +2368,74 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
 {"deltaRevocationList","deltaRevocationList",NID_deltaRevocationList,
         3,&(lvalues[5817]),0},
 {"dmdName","dmdName",NID_dmdName,3,&(lvalues[5820]),0},
+{"id-alg-PWRI-KEK","id-alg-PWRI-KEK",NID_id_alg_PWRI_KEK,11,
+        &(lvalues[5823]),0},
+{"CMAC","cmac",NID_cmac,0,NULL,0},
+{"id-aes128-GCM","aes-128-gcm",NID_aes_128_gcm,9,&(lvalues[5834]),0},
+{"id-aes128-CCM","aes-128-ccm",NID_aes_128_ccm,9,&(lvalues[5843]),0},
+{"id-aes128-wrap-pad","id-aes128-wrap-pad",NID_id_aes128_wrap_pad,9,
+        &(lvalues[5852]),0},
+{"id-aes192-GCM","aes-192-gcm",NID_aes_192_gcm,9,&(lvalues[5861]),0},
+{"id-aes192-CCM","aes-192-ccm",NID_aes_192_ccm,9,&(lvalues[5870]),0},
+{"id-aes192-wrap-pad","id-aes192-wrap-pad",NID_id_aes192_wrap_pad,9,
+        &(lvalues[5879]),0},
+{"id-aes256-GCM","aes-256-gcm",NID_aes_256_gcm,9,&(lvalues[5888]),0},
+{"id-aes256-CCM","aes-256-ccm",NID_aes_256_ccm,9,&(lvalues[5897]),0},
+{"id-aes256-wrap-pad","id-aes256-wrap-pad",NID_id_aes256_wrap_pad,9,
+        &(lvalues[5906]),0},
+{"AES-128-CTR","aes-128-ctr",NID_aes_128_ctr,0,NULL,0},
+{"AES-192-CTR","aes-192-ctr",NID_aes_192_ctr,0,NULL,0},
+{"AES-256-CTR","aes-256-ctr",NID_aes_256_ctr,0,NULL,0},
+{"id-camellia128-wrap","id-camellia128-wrap",NID_id_camellia128_wrap,
+        11,&(lvalues[5915]),0},
+{"id-camellia192-wrap","id-camellia192-wrap",NID_id_camellia192_wrap,
+        11,&(lvalues[5926]),0},
+{"id-camellia256-wrap","id-camellia256-wrap",NID_id_camellia256_wrap,
+        11,&(lvalues[5937]),0},
+{"anyExtendedKeyUsage","Any Extended Key Usage",
+        NID_anyExtendedKeyUsage,4,&(lvalues[5948]),0},
+{"MGF1","mgf1",NID_mgf1,9,&(lvalues[5952]),0},
+{"RSASSA-PSS","rsassaPss",NID_rsassaPss,9,&(lvalues[5961]),0},
+{"AES-128-XTS","aes-128-xts",NID_aes_128_xts,0,NULL,0},
+{"AES-256-XTS","aes-256-xts",NID_aes_256_xts,0,NULL,0},
+{"RC4-HMAC-MD5","rc4-hmac-md5",NID_rc4_hmac_md5,0,NULL,0},
+{"AES-128-CBC-HMAC-SHA1","aes-128-cbc-hmac-sha1",
+        NID_aes_128_cbc_hmac_sha1,0,NULL,0},
+{"AES-192-CBC-HMAC-SHA1","aes-192-cbc-hmac-sha1",
+        NID_aes_192_cbc_hmac_sha1,0,NULL,0},
+{"AES-256-CBC-HMAC-SHA1","aes-256-cbc-hmac-sha1",
+        NID_aes_256_cbc_hmac_sha1,0,NULL,0},
+{"RSAES-OAEP","rsaesOaep",NID_rsaesOaep,9,&(lvalues[5970]),0},
 };
 
 static const unsigned int sn_objs[NUM_SN]={
 364,    /* "AD_DVCS" */
 419,    /* "AES-128-CBC" */
+916,    /* "AES-128-CBC-HMAC-SHA1" */
 421,    /* "AES-128-CFB" */
 650,    /* "AES-128-CFB1" */
 653,    /* "AES-128-CFB8" */
+904,    /* "AES-128-CTR" */
 418,    /* "AES-128-ECB" */
 420,    /* "AES-128-OFB" */
+913,    /* "AES-128-XTS" */
 423,    /* "AES-192-CBC" */
+917,    /* "AES-192-CBC-HMAC-SHA1" */
 425,    /* "AES-192-CFB" */
 651,    /* "AES-192-CFB1" */
 654,    /* "AES-192-CFB8" */
+905,    /* "AES-192-CTR" */
 422,    /* "AES-192-ECB" */
 424,    /* "AES-192-OFB" */
 427,    /* "AES-256-CBC" */
+918,    /* "AES-256-CBC-HMAC-SHA1" */
 429,    /* "AES-256-CFB" */
 652,    /* "AES-256-CFB1" */
 655,    /* "AES-256-CFB8" */
+906,    /* "AES-256-CTR" */
 426,    /* "AES-256-ECB" */
 428,    /* "AES-256-OFB" */
+914,    /* "AES-256-XTS" */
 91,     /* "BF-CBC" */
 93,     /* "BF-CFB" */
 92,     /* "BF-ECB" */
@@ -2400,6 +2463,7 @@ static const unsigned int sn_objs[NUM_SN]={
 110,    /* "CAST5-CFB" */
 109,    /* "CAST5-ECB" */
 111,    /* "CAST5-OFB" */
+894,    /* "CMAC" */
 13,     /* "CN" */
 141,    /* "CRLReason" */
 417,    /* "CSPName" */
@@ -2451,6 +2515,7 @@ static const unsigned int sn_objs[NUM_SN]={
  4,     /* "MD5" */
 114,    /* "MD5-SHA1" */
 95,     /* "MDC2" */
+911,    /* "MGF1" */
 388,    /* "Mail" */
 393,    /* "NULL" */
 404,    /* "NULL" */
@@ -2487,6 +2552,7 @@ static const unsigned int sn_objs[NUM_SN]={
 40,     /* "RC2-OFB" */
  5,     /* "RC4" */
 97,     /* "RC4-40" */
+915,    /* "RC4-HMAC-MD5" */
 120,    /* "RC5-CBC" */
 122,    /* "RC5-CFB" */
 121,    /* "RC5-ECB" */
@@ -2507,6 +2573,8 @@ static const unsigned int sn_objs[NUM_SN]={
 668,    /* "RSA-SHA256" */
 669,    /* "RSA-SHA384" */
 670,    /* "RSA-SHA512" */
+919,    /* "RSAES-OAEP" */
+912,    /* "RSASSA-PSS" */
 777,    /* "SEED-CBC" */
 779,    /* "SEED-CFB" */
 776,    /* "SEED-ECB" */
@@ -2540,6 +2608,7 @@ static const unsigned int sn_objs[NUM_SN]={
 363,    /* "ad_timestamping" */
 376,    /* "algorithm" */
 405,    /* "ansi-X9-62" */
+910,    /* "anyExtendedKeyUsage" */
 746,    /* "anyPolicy" */
 370,    /* "archiveCutoff" */
 484,    /* "associatedDomain" */
@@ -2716,14 +2785,27 @@ static const unsigned int sn_objs[NUM_SN]={
 357,    /* "id-aca-group" */
 358,    /* "id-aca-role" */
 176,    /* "id-ad" */
+896,    /* "id-aes128-CCM" */
+895,    /* "id-aes128-GCM" */
 788,    /* "id-aes128-wrap" */
+897,    /* "id-aes128-wrap-pad" */
+899,    /* "id-aes192-CCM" */
+898,    /* "id-aes192-GCM" */
 789,    /* "id-aes192-wrap" */
+900,    /* "id-aes192-wrap-pad" */
+902,    /* "id-aes256-CCM" */
+901,    /* "id-aes256-GCM" */
 790,    /* "id-aes256-wrap" */
+903,    /* "id-aes256-wrap-pad" */
 262,    /* "id-alg" */
+893,    /* "id-alg-PWRI-KEK" */
 323,    /* "id-alg-des40" */
 326,    /* "id-alg-dh-pop" */
 325,    /* "id-alg-dh-sig-hmac-sha1" */
 324,    /* "id-alg-noSignature" */
+907,    /* "id-camellia128-wrap" */
+908,    /* "id-camellia192-wrap" */
+909,    /* "id-camellia256-wrap" */
 268,    /* "id-cct" */
 361,    /* "id-cct-PKIData" */
 362,    /* "id-cct-PKIResponse" */
@@ -3246,6 +3328,7 @@ static const unsigned int ln_objs[NUM_LN]={
 363,    /* "AD Time Stamping" */
 405,    /* "ANSI X9.62" */
 368,    /* "Acceptable OCSP Responses" */
+910,    /* "Any Extended Key Usage" */
 664,    /* "Any language" */
 177,    /* "Authority Information Access" */
 365,    /* "Basic OCSP Response" */
@@ -3386,23 +3469,37 @@ static const unsigned int ln_objs[NUM_LN]={
 364,    /* "ad dvcs" */
 606,    /* "additional verification" */
 419,    /* "aes-128-cbc" */
+916,    /* "aes-128-cbc-hmac-sha1" */
+896,    /* "aes-128-ccm" */
 421,    /* "aes-128-cfb" */
 650,    /* "aes-128-cfb1" */
 653,    /* "aes-128-cfb8" */
+904,    /* "aes-128-ctr" */
 418,    /* "aes-128-ecb" */
+895,    /* "aes-128-gcm" */
 420,    /* "aes-128-ofb" */
+913,    /* "aes-128-xts" */
 423,    /* "aes-192-cbc" */
+917,    /* "aes-192-cbc-hmac-sha1" */
+899,    /* "aes-192-ccm" */
 425,    /* "aes-192-cfb" */
 651,    /* "aes-192-cfb1" */
 654,    /* "aes-192-cfb8" */
+905,    /* "aes-192-ctr" */
 422,    /* "aes-192-ecb" */
+898,    /* "aes-192-gcm" */
 424,    /* "aes-192-ofb" */
 427,    /* "aes-256-cbc" */
+918,    /* "aes-256-cbc-hmac-sha1" */
+902,    /* "aes-256-ccm" */
 429,    /* "aes-256-cfb" */
 652,    /* "aes-256-cfb1" */
 655,    /* "aes-256-cfb8" */
+906,    /* "aes-256-ctr" */
 426,    /* "aes-256-ecb" */
+901,    /* "aes-256-gcm" */
 428,    /* "aes-256-ofb" */
+914,    /* "aes-256-xts" */
 376,    /* "algorithm" */
 484,    /* "associatedDomain" */
 485,    /* "associatedName" */
@@ -3467,6 +3564,7 @@ static const unsigned int ln_objs[NUM_LN]={
 407,    /* "characteristic-two-field" */
 395,    /* "clearance" */
 633,    /* "cleartext track 2" */
+894,    /* "cmac" */
 13,     /* "commonName" */
 513,    /* "content types" */
 50,     /* "contentType" */
@@ -3602,13 +3700,20 @@ static const unsigned int ln_objs[NUM_LN]={
 358,    /* "id-aca-role" */
 176,    /* "id-ad" */
 788,    /* "id-aes128-wrap" */
+897,    /* "id-aes128-wrap-pad" */
 789,    /* "id-aes192-wrap" */
+900,    /* "id-aes192-wrap-pad" */
 790,    /* "id-aes256-wrap" */
+903,    /* "id-aes256-wrap-pad" */
 262,    /* "id-alg" */
+893,    /* "id-alg-PWRI-KEK" */
 323,    /* "id-alg-des40" */
 326,    /* "id-alg-dh-pop" */
 325,    /* "id-alg-dh-sig-hmac-sha1" */
 324,    /* "id-alg-noSignature" */
+907,    /* "id-camellia128-wrap" */
+908,    /* "id-camellia192-wrap" */
+909,    /* "id-camellia256-wrap" */
 268,    /* "id-cct" */
 361,    /* "id-cct-PKIData" */
 362,    /* "id-cct-PKIResponse" */
@@ -3806,6 +3911,7 @@ static const unsigned int ln_objs[NUM_LN]={
 602,    /* "merchant initiated auth" */
 514,    /* "message extensions" */
 51,     /* "messageDigest" */
+911,    /* "mgf1" */
 506,    /* "mime-mhs-bodies" */
 505,    /* "mime-mhs-headings" */
 488,    /* "mobileTelephoneNumber" */
@@ -3889,6 +3995,7 @@ static const unsigned int ln_objs[NUM_LN]={
 40,     /* "rc2-ofb" */
  5,     /* "rc4" */
 97,     /* "rc4-40" */
+915,    /* "rc4-hmac-md5" */
 120,    /* "rc5-cbc" */
 122,    /* "rc5-cfb" */
 121,    /* "rc5-ecb" */
@@ -3905,6 +4012,8 @@ static const unsigned int ln_objs[NUM_LN]={
  6,     /* "rsaEncryption" */
 644,    /* "rsaOAEPEncryptionSET" */
 377,    /* "rsaSignature" */
+919,    /* "rsaesOaep" */
+912,    /* "rsassaPss" */
 124,    /* "run length compression" */
 482,    /* "sOARecord" */
 155,    /* "safeContentsBag" */
@@ -4254,6 +4363,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
 96,     /* OBJ_mdc2WithRSA                  2 5 8 3 100 */
 95,     /* OBJ_mdc2                         2 5 8 3 101 */
 746,    /* OBJ_any_policy                   2 5 29 32 0 */
+910,    /* OBJ_anyExtendedKeyUsage          2 5 29 37 0 */
 519,    /* OBJ_setct_PANData                2 23 42 0 0 */
 520,    /* OBJ_setct_PANToken               2 23 42 0 1 */
 521,    /* OBJ_setct_PANOnly                2 23 42 0 2 */
@@ -4720,6 +4830,9 @@ static const unsigned int obj_objs[NUM_OBJ]={
  8,     /* OBJ_md5WithRSAEncryption         1 2 840 113549 1 1 4 */
 65,     /* OBJ_sha1WithRSAEncryption        1 2 840 113549 1 1 5 */
 644,    /* OBJ_rsaOAEPEncryptionSET         1 2 840 113549 1 1 6 */
+919,    /* OBJ_rsaesOaep                    1 2 840 113549 1 1 7 */
+911,    /* OBJ_mgf1                         1 2 840 113549 1 1 8 */
+912,    /* OBJ_rsassaPss                    1 2 840 113549 1 1 10 */
 668,    /* OBJ_sha256WithRSAEncryption      1 2 840 113549 1 1 11 */
 669,    /* OBJ_sha384WithRSAEncryption      1 2 840 113549 1 1 12 */
 670,    /* OBJ_sha512WithRSAEncryption      1 2 840 113549 1 1 13 */
@@ -4785,16 +4898,25 @@ static const unsigned int obj_objs[NUM_OBJ]={
 420,    /* OBJ_aes_128_ofb128               2 16 840 1 101 3 4 1 3 */
 421,    /* OBJ_aes_128_cfb128               2 16 840 1 101 3 4 1 4 */
 788,    /* OBJ_id_aes128_wrap               2 16 840 1 101 3 4 1 5 */
+895,    /* OBJ_aes_128_gcm                  2 16 840 1 101 3 4 1 6 */
+896,    /* OBJ_aes_128_ccm                  2 16 840 1 101 3 4 1 7 */
+897,    /* OBJ_id_aes128_wrap_pad           2 16 840 1 101 3 4 1 8 */
 422,    /* OBJ_aes_192_ecb                  2 16 840 1 101 3 4 1 21 */
 423,    /* OBJ_aes_192_cbc                  2 16 840 1 101 3 4 1 22 */
 424,    /* OBJ_aes_192_ofb128               2 16 840 1 101 3 4 1 23 */
 425,    /* OBJ_aes_192_cfb128               2 16 840 1 101 3 4 1 24 */
 789,    /* OBJ_id_aes192_wrap               2 16 840 1 101 3 4 1 25 */
+898,    /* OBJ_aes_192_gcm                  2 16 840 1 101 3 4 1 26 */
+899,    /* OBJ_aes_192_ccm                  2 16 840 1 101 3 4 1 27 */
+900,    /* OBJ_id_aes192_wrap_pad           2 16 840 1 101 3 4 1 28 */
 426,    /* OBJ_aes_256_ecb                  2 16 840 1 101 3 4 1 41 */
 427,    /* OBJ_aes_256_cbc                  2 16 840 1 101 3 4 1 42 */
 428,    /* OBJ_aes_256_ofb128               2 16 840 1 101 3 4 1 43 */
 429,    /* OBJ_aes_256_cfb128               2 16 840 1 101 3 4 1 44 */
 790,    /* OBJ_id_aes256_wrap               2 16 840 1 101 3 4 1 45 */
+901,    /* OBJ_aes_256_gcm                  2 16 840 1 101 3 4 1 46 */
+902,    /* OBJ_aes_256_ccm                  2 16 840 1 101 3 4 1 47 */
+903,    /* OBJ_id_aes256_wrap_pad           2 16 840 1 101 3 4 1 48 */
 672,    /* OBJ_sha256                       2 16 840 1 101 3 4 2 1 */
 673,    /* OBJ_sha384                       2 16 840 1 101 3 4 2 2 */
 674,    /* OBJ_sha512                       2 16 840 1 101 3 4 2 3 */
@@ -4901,6 +5023,9 @@ static const unsigned int obj_objs[NUM_OBJ]={
 751,    /* OBJ_camellia_128_cbc             1 2 392 200011 61 1 1 1 2 */
 752,    /* OBJ_camellia_192_cbc             1 2 392 200011 61 1 1 1 3 */
 753,    /* OBJ_camellia_256_cbc             1 2 392 200011 61 1 1 1 4 */
+907,    /* OBJ_id_camellia128_wrap          1 2 392 200011 61 1 1 3 2 */
+908,    /* OBJ_id_camellia192_wrap          1 2 392 200011 61 1 1 3 3 */
+909,    /* OBJ_id_camellia256_wrap          1 2 392 200011 61 1 1 3 4 */
 196,    /* OBJ_id_smime_mod_cms             1 2 840 113549 1 9 16 0 1 */
 197,    /* OBJ_id_smime_mod_ess             1 2 840 113549 1 9 16 0 2 */
 198,    /* OBJ_id_smime_mod_oid             1 2 840 113549 1 9 16 0 3 */
@@ -4956,6 +5081,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
 246,    /* OBJ_id_smime_alg_CMS3DESwrap     1 2 840 113549 1 9 16 3 6 */
 247,    /* OBJ_id_smime_alg_CMSRC2wrap      1 2 840 113549 1 9 16 3 7 */
 125,    /* OBJ_zlib_compression             1 2 840 113549 1 9 16 3 8 */
+893,    /* OBJ_id_alg_PWRI_KEK              1 2 840 113549 1 9 16 3 9 */
 248,    /* OBJ_id_smime_cd_ldap             1 2 840 113549 1 9 16 4 1 */
 249,    /* OBJ_id_smime_spq_ets_sqt_uri     1 2 840 113549 1 9 16 5 1 */
 250,    /* OBJ_id_smime_spq_ets_sqt_unotice 1 2 840 113549 1 9 16 5 2 */
diff --git a/src/lib/libcrypto/objects/obj_mac.h b/src/lib/libcrypto/objects/obj_mac.h
index 282f11a8a8..b5ea7cdab4 100644
--- a/src/lib/libcrypto/objects/obj_mac.h
+++ b/src/lib/libcrypto/objects/obj_mac.h
@@ -580,6 +580,21 @@
 #define NID_sha1WithRSAEncryption               65
 #define OBJ_sha1WithRSAEncryption               OBJ_pkcs1,5L
 
+#define SN_rsaesOaep            "RSAES-OAEP"
+#define LN_rsaesOaep            "rsaesOaep"
+#define NID_rsaesOaep           919
+#define OBJ_rsaesOaep           OBJ_pkcs1,7L
+
+#define SN_mgf1         "MGF1"
+#define LN_mgf1         "mgf1"
+#define NID_mgf1                911
+#define OBJ_mgf1                OBJ_pkcs1,8L
+
+#define SN_rsassaPss            "RSASSA-PSS"
+#define LN_rsassaPss            "rsassaPss"
+#define NID_rsassaPss           912
+#define OBJ_rsassaPss           OBJ_pkcs1,10L
+
 #define SN_sha256WithRSAEncryption              "RSA-SHA256"
 #define LN_sha256WithRSAEncryption              "sha256WithRSAEncryption"
 #define NID_sha256WithRSAEncryption             668
@@ -981,6 +996,10 @@
 #define NID_id_smime_alg_CMSRC2wrap             247
 #define OBJ_id_smime_alg_CMSRC2wrap             OBJ_id_smime_alg,7L
 
+#define SN_id_alg_PWRI_KEK              "id-alg-PWRI-KEK"
+#define NID_id_alg_PWRI_KEK             893
+#define OBJ_id_alg_PWRI_KEK             OBJ_id_smime_alg,9L
+
 #define SN_id_smime_cd_ldap             "id-smime-cd-ldap"
 #define NID_id_smime_cd_ldap            248
 #define OBJ_id_smime_cd_ldap            OBJ_id_smime_cd,1L
@@ -2399,6 +2418,11 @@
 #define NID_no_rev_avail                403
 #define OBJ_no_rev_avail                OBJ_id_ce,56L
 
+#define SN_anyExtendedKeyUsage          "anyExtendedKeyUsage"
+#define LN_anyExtendedKeyUsage          "Any Extended Key Usage"
+#define NID_anyExtendedKeyUsage         910
+#define OBJ_anyExtendedKeyUsage         OBJ_ext_key_usage,0L
+
 #define SN_netscape             "Netscape"
 #define LN_netscape             "Netscape Communications Corp."
 #define NID_netscape            57
@@ -2586,6 +2610,24 @@
 #define NID_aes_128_cfb128              421
 #define OBJ_aes_128_cfb128              OBJ_aes,4L
 
+#define SN_id_aes128_wrap               "id-aes128-wrap"
+#define NID_id_aes128_wrap              788
+#define OBJ_id_aes128_wrap              OBJ_aes,5L
+
+#define SN_aes_128_gcm          "id-aes128-GCM"
+#define LN_aes_128_gcm          "aes-128-gcm"
+#define NID_aes_128_gcm         895
+#define OBJ_aes_128_gcm         OBJ_aes,6L
+
+#define SN_aes_128_ccm          "id-aes128-CCM"
+#define LN_aes_128_ccm          "aes-128-ccm"
+#define NID_aes_128_ccm         896
+#define OBJ_aes_128_ccm         OBJ_aes,7L
+
+#define SN_id_aes128_wrap_pad           "id-aes128-wrap-pad"
+#define NID_id_aes128_wrap_pad          897
+#define OBJ_id_aes128_wrap_pad          OBJ_aes,8L
+
 #define SN_aes_192_ecb          "AES-192-ECB"
 #define LN_aes_192_ecb          "aes-192-ecb"
 #define NID_aes_192_ecb         422
@@ -2606,6 +2648,24 @@
 #define NID_aes_192_cfb128              425
 #define OBJ_aes_192_cfb128              OBJ_aes,24L
 
+#define SN_id_aes192_wrap               "id-aes192-wrap"
+#define NID_id_aes192_wrap              789
+#define OBJ_id_aes192_wrap              OBJ_aes,25L
+
+#define SN_aes_192_gcm          "id-aes192-GCM"
+#define LN_aes_192_gcm          "aes-192-gcm"
+#define NID_aes_192_gcm         898
+#define OBJ_aes_192_gcm         OBJ_aes,26L
+
+#define SN_aes_192_ccm          "id-aes192-CCM"
+#define LN_aes_192_ccm          "aes-192-ccm"
+#define NID_aes_192_ccm         899
+#define OBJ_aes_192_ccm         OBJ_aes,27L
+
+#define SN_id_aes192_wrap_pad           "id-aes192-wrap-pad"
+#define NID_id_aes192_wrap_pad          900
+#define OBJ_id_aes192_wrap_pad          OBJ_aes,28L
+
 #define SN_aes_256_ecb          "AES-256-ECB"
 #define LN_aes_256_ecb          "aes-256-ecb"
 #define NID_aes_256_ecb         426
@@ -2626,6 +2686,24 @@
 #define NID_aes_256_cfb128              429
 #define OBJ_aes_256_cfb128              OBJ_aes,44L
 
+#define SN_id_aes256_wrap               "id-aes256-wrap"
+#define NID_id_aes256_wrap              790
+#define OBJ_id_aes256_wrap              OBJ_aes,45L
+
+#define SN_aes_256_gcm          "id-aes256-GCM"
+#define LN_aes_256_gcm          "aes-256-gcm"
+#define NID_aes_256_gcm         901
+#define OBJ_aes_256_gcm         OBJ_aes,46L
+
+#define SN_aes_256_ccm          "id-aes256-CCM"
+#define LN_aes_256_ccm          "aes-256-ccm"
+#define NID_aes_256_ccm         902
+#define OBJ_aes_256_ccm         OBJ_aes,47L
+
+#define SN_id_aes256_wrap_pad           "id-aes256-wrap-pad"
+#define NID_id_aes256_wrap_pad          903
+#define OBJ_id_aes256_wrap_pad          OBJ_aes,48L
+
 #define SN_aes_128_cfb1         "AES-128-CFB1"
 #define LN_aes_128_cfb1         "aes-128-cfb1"
 #define NID_aes_128_cfb1                650
@@ -2650,6 +2728,26 @@
 #define LN_aes_256_cfb8         "aes-256-cfb8"
 #define NID_aes_256_cfb8                655
 
+#define SN_aes_128_ctr          "AES-128-CTR"
+#define LN_aes_128_ctr          "aes-128-ctr"
+#define NID_aes_128_ctr         904
+
+#define SN_aes_192_ctr          "AES-192-CTR"
+#define LN_aes_192_ctr          "aes-192-ctr"
+#define NID_aes_192_ctr         905
+
+#define SN_aes_256_ctr          "AES-256-CTR"
+#define LN_aes_256_ctr          "aes-256-ctr"
+#define NID_aes_256_ctr         906
+
+#define SN_aes_128_xts          "AES-128-XTS"
+#define LN_aes_128_xts          "aes-128-xts"
+#define NID_aes_128_xts         913
+
+#define SN_aes_256_xts          "AES-256-XTS"
+#define LN_aes_256_xts          "aes-256-xts"
+#define NID_aes_256_xts         914
+
 #define SN_des_cfb1             "DES-CFB1"
 #define LN_des_cfb1             "des-cfb1"
 #define NID_des_cfb1            656
@@ -2666,18 +2764,6 @@
 #define LN_des_ede3_cfb8                "des-ede3-cfb8"
 #define NID_des_ede3_cfb8               659
 
-#define SN_id_aes128_wrap               "id-aes128-wrap"
-#define NID_id_aes128_wrap              788
-#define OBJ_id_aes128_wrap              OBJ_aes,5L
-
-#define SN_id_aes192_wrap               "id-aes192-wrap"
-#define NID_id_aes192_wrap              789
-#define OBJ_id_aes192_wrap              OBJ_aes,25L
-
-#define SN_id_aes256_wrap               "id-aes256-wrap"
-#define NID_id_aes256_wrap              790
-#define OBJ_id_aes256_wrap              OBJ_aes,45L
-
 #define OBJ_nist_hashalgs               OBJ_nistAlgorithms,2L
 
 #define SN_sha256               "SHA256"
@@ -3810,6 +3896,18 @@
 #define NID_camellia_256_cbc            753
 #define OBJ_camellia_256_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,4L
 
+#define SN_id_camellia128_wrap          "id-camellia128-wrap"
+#define NID_id_camellia128_wrap         907
+#define OBJ_id_camellia128_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,2L
+
+#define SN_id_camellia192_wrap          "id-camellia192-wrap"
+#define NID_id_camellia192_wrap         908
+#define OBJ_id_camellia192_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,3L
+
+#define SN_id_camellia256_wrap          "id-camellia256-wrap"
+#define NID_id_camellia256_wrap         909
+#define OBJ_id_camellia256_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,4L
+
 #define OBJ_ntt_ds              0L,3L,4401L,5L
 
 #define OBJ_camellia            OBJ_ntt_ds,3L,1L,9L
@@ -3912,3 +4010,23 @@
 #define LN_hmac         "hmac"
 #define NID_hmac                855
 
+#define SN_cmac         "CMAC"
+#define LN_cmac         "cmac"
+#define NID_cmac                894
+
+#define SN_rc4_hmac_md5         "RC4-HMAC-MD5"
+#define LN_rc4_hmac_md5         "rc4-hmac-md5"
+#define NID_rc4_hmac_md5                915
+
+#define SN_aes_128_cbc_hmac_sha1                "AES-128-CBC-HMAC-SHA1"
+#define LN_aes_128_cbc_hmac_sha1                "aes-128-cbc-hmac-sha1"
+#define NID_aes_128_cbc_hmac_sha1               916
+
+#define SN_aes_192_cbc_hmac_sha1                "AES-192-CBC-HMAC-SHA1"
+#define LN_aes_192_cbc_hmac_sha1                "aes-192-cbc-hmac-sha1"
+#define NID_aes_192_cbc_hmac_sha1               917
+
+#define SN_aes_256_cbc_hmac_sha1                "AES-256-CBC-HMAC-SHA1"
+#define LN_aes_256_cbc_hmac_sha1                "aes-256-cbc-hmac-sha1"
+#define NID_aes_256_cbc_hmac_sha1               918
+
diff --git a/src/lib/libcrypto/opensslconf.h b/src/lib/libcrypto/opensslconf.h
index c21b3913f0..b18f4da496 100644
--- a/src/lib/libcrypto/opensslconf.h
+++ b/src/lib/libcrypto/opensslconf.h
@@ -5,6 +5,9 @@
 #ifndef OPENSSL_DOING_MAKEDEPEND
 
 
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
@@ -23,6 +26,9 @@
 #ifndef OPENSSL_NO_RFC3779
 # define OPENSSL_NO_RFC3779
 #endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
@@ -38,6 +44,9 @@
    who haven't had the time to do the appropriate changes in their
    applications.  */
 #ifdef OPENSSL_ALGORITHM_DEFINES
+# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
+#  define NO_EC_NISTP_64_GCC_128
+# endif
 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
 #  define NO_GMP
 # endif
@@ -56,6 +65,9 @@
 # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
 #  define NO_RFC3779
 # endif
+# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
+#  define NO_SCTP
+# endif
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
diff --git a/src/lib/libcrypto/perlasm/x86nasm.pl b/src/lib/libcrypto/perlasm/x86nasm.pl
index ce2bed9bb2..ca2511c9eb 100644
--- a/src/lib/libcrypto/perlasm/x86nasm.pl
+++ b/src/lib/libcrypto/perlasm/x86nasm.pl
@@ -19,6 +19,8 @@ sub ::generic
         {   $_[0] = "NEAR $_[0]";       }
         elsif ($opcode eq "lea" && $#_==1)  # wipe storage qualifier from lea
         {   $_[1] =~ s/^[^\[]*\[/\[/o;  }
+        elsif ($opcode eq "clflush" && $#_==0)
+        {   $_[0] =~ s/^[^\[]*\[/\[/o;  }
     }
     &::emit($opcode,@_);
   1;
@@ -67,6 +69,7 @@ sub get_mem
 }
 sub ::BP        { &get_mem("BYTE",@_);  }
 sub ::DWP       { &get_mem("DWORD",@_); }
+sub ::WP        { &get_mem("WORD",@_);  }
 sub ::QWP       { &get_mem("",@_);      }
 sub ::BC        { (($::mwerks)?"":"BYTE ")."@_";  }
 sub ::DWC       { (($::mwerks)?"":"DWORD ")."@_"; }
@@ -114,7 +117,7 @@ sub ::file_end
 {   if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out)
     {   my $comm=<<___;
 ${drdecor}segment       .bss
-${drdecor}common        ${nmdecor}OPENSSL_ia32cap_P 4
+${drdecor}common        ${nmdecor}OPENSSL_ia32cap_P 8
 ___
         # comment out OPENSSL_ia32cap_P declarations
         grep {s/(^extern\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out;
@@ -135,7 +138,8 @@ sub ::public_label
 
 sub ::data_byte
 {   push(@out,(($::mwerks)?".byte\t":"db\t").join(',',@_)."\n");        }
-
+sub ::data_short
+{   push(@out,(($::mwerks)?".word\t":"dw\t").join(',',@_)."\n");        }
 sub ::data_word
 {   push(@out,(($::mwerks)?".long\t":"dd\t").join(',',@_)."\n");        }
 
@@ -163,4 +167,11 @@ sub ::dataseg
     else                { push(@out,"section\t.data align=4\n"); }
 }
 
+sub ::safeseh
+{ my $nm=shift;
+    push(@out,"%if      __NASM_VERSION_ID__ >= 0x02030000\n");
+    push(@out,"safeseh  ".&::LABEL($nm,$nmdecor.$nm)."\n");
+    push(@out,"%endif\n");
+}
+
 1;
diff --git a/src/lib/libcrypto/rand/md_rand.c b/src/lib/libcrypto/rand/md_rand.c
index b2f04ff13e..fcdd3f2a84 100644
--- a/src/lib/libcrypto/rand/md_rand.c
+++ b/src/lib/libcrypto/rand/md_rand.c
@@ -109,6 +109,8 @@
  *
  */
 
+#define OPENSSL_FIPSEVP
+
 #ifdef MD_RAND_DEBUG
 # ifndef NDEBUG
 #   define NDEBUG
@@ -157,13 +159,14 @@ const char RAND_version[]="RAND" OPENSSL_VERSION_PTEXT;
 static void ssleay_rand_cleanup(void);
 static void ssleay_rand_seed(const void *buf, int num);
 static void ssleay_rand_add(const void *buf, int num, double add_entropy);
-static int ssleay_rand_bytes(unsigned char *buf, int num);
+static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo);
+static int ssleay_rand_nopseudo_bytes(unsigned char *buf, int num);
 static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num);
 static int ssleay_rand_status(void);
 
 RAND_METHOD rand_ssleay_meth={
         ssleay_rand_seed,
-        ssleay_rand_bytes,
+        ssleay_rand_nopseudo_bytes,
         ssleay_rand_cleanup,
         ssleay_rand_add,
         ssleay_rand_pseudo_bytes,
@@ -328,7 +331,7 @@ static void ssleay_rand_seed(const void *buf, int num)
         ssleay_rand_add(buf, num, (double)num);
         }
 
-static int ssleay_rand_bytes(unsigned char *buf, int num)
+static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
         {
         static volatile int stirred_pool = 0;
         int i,j,k,st_num,st_idx;
@@ -517,7 +520,9 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
         EVP_MD_CTX_cleanup(&m);
         if (ok)
                 return(1);
-        else
+        else if (pseudo)
+                return 0;
+        else 
                 {
                 RANDerr(RAND_F_SSLEAY_RAND_BYTES,RAND_R_PRNG_NOT_SEEDED);
                 ERR_add_error_data(1, "You need to read the OpenSSL FAQ, "
@@ -526,22 +531,16 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
                 }
         }
 
+static int ssleay_rand_nopseudo_bytes(unsigned char *buf, int num)
+        {
+        return ssleay_rand_bytes(buf, num, 0);
+        }
+
 /* pseudo-random bytes that are guaranteed to be unique but not
    unpredictable */
 static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num) 
         {
-        int ret;
-        unsigned long err;
-
-        ret = RAND_bytes(buf, num);
-        if (ret == 0)
-                {
-                err = ERR_peek_error();
-                if (ERR_GET_LIB(err) == ERR_LIB_RAND &&
-                    ERR_GET_REASON(err) == RAND_R_PRNG_NOT_SEEDED)
-                        ERR_clear_error();
-                }
-        return (ret);
+        return ssleay_rand_bytes(buf, num, 1);
         }
 
 static int ssleay_rand_status(void)
diff --git a/src/lib/libcrypto/rc2/Makefile b/src/lib/libcrypto/rc2/Makefile
index 73eac347e7..8a9d49ab5e 100644
--- a/src/lib/libcrypto/rc2/Makefile
+++ b/src/lib/libcrypto/rc2/Makefile
@@ -78,7 +78,11 @@ rc2_cbc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
 rc2_cbc.o: rc2_cbc.c rc2_locl.h
 rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h
-rc2_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
+rc2_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rc2_skey.o: ../../include/openssl/opensslconf.h
+rc2_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rc2_skey.o: ../../include/openssl/rc2.h ../../include/openssl/safestack.h
+rc2_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rc2_skey.o: rc2_locl.h rc2_skey.c
 rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
 rc2cfb64.o: rc2_locl.h rc2cfb64.c
diff --git a/src/lib/libcrypto/rc4/Makefile b/src/lib/libcrypto/rc4/Makefile
index 264451a213..1614d47961 100644
--- a/src/lib/libcrypto/rc4/Makefile
+++ b/src/lib/libcrypto/rc4/Makefile
@@ -21,8 +21,8 @@ TEST=rc4test.c
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=rc4_skey.c rc4_enc.c
-LIBOBJ=$(RC4_ENC)
+LIBSRC=rc4_skey.c rc4_enc.c rc4_utl.c
+LIBOBJ=$(RC4_ENC) rc4_utl.o
 
 SRC= $(LIBSRC)
 
@@ -46,12 +46,14 @@ rc4-586.s:	asm/rc4-586.pl ../perlasm/x86asm.pl
 
 rc4-x86_64.s: asm/rc4-x86_64.pl
         $(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@
+rc4-md5-x86_64.s:       asm/rc4-md5-x86_64.pl
+        $(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@
 
 rc4-ia64.S: asm/rc4-ia64.pl
         $(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@
 
-rc4-s390x.s:    asm/rc4-s390x.pl
-        $(PERL) asm/rc4-s390x.pl > $@
+rc4-parisc.s:   asm/rc4-parisc.pl
+        $(PERL) asm/rc4-parisc.pl $(PERLASM_SCHEME) $@
 
 rc4-ia64.s: rc4-ia64.S
         @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
@@ -60,6 +62,9 @@ rc4-ia64.s: rc4-ia64.S
         *)      exit 1 ;; \
         esac
 
+# GNU make "catch all"
+rc4-%.s:        asm/rc4-%.pl;   $(PERL) $< $(PERLASM_SCHEME) $@
+
 files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
@@ -113,3 +118,8 @@ rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rc4_skey.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h
 rc4_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rc4_skey.o: ../cryptlib.h rc4_locl.h rc4_skey.c
+rc4_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rc4_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rc4_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h
+rc4_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rc4_utl.o: ../../include/openssl/symhacks.h rc4_utl.c
diff --git a/src/lib/libcrypto/rc4/rc4test.c b/src/lib/libcrypto/rc4/rc4test.c
index 633a79e758..4312605ccb 100644
--- a/src/lib/libcrypto/rc4/rc4test.c
+++ b/src/lib/libcrypto/rc4/rc4test.c
@@ -120,6 +120,12 @@ int main(int argc, char *argv[])
         RC4_KEY key;
         unsigned char obuf[512];
 
+#if !defined(OPENSSL_PIC)
+        void OPENSSL_cpuid_setup(void);
+
+        OPENSSL_cpuid_setup();
+#endif
+
         for (i=0; i<6; i++)
                 {
                 RC4_set_key(&key,keys[i][0],&(keys[i][1]));
diff --git a/src/lib/libcrypto/ripemd/Makefile b/src/lib/libcrypto/ripemd/Makefile
index d5b1067dbe..25140b2a73 100644
--- a/src/lib/libcrypto/ripemd/Makefile
+++ b/src/lib/libcrypto/ripemd/Makefile
@@ -82,8 +82,11 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rmd_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ripemd.h
+rmd_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rmd_dgst.o: ../../include/openssl/opensslconf.h
+rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rmd_dgst.o: ../../include/openssl/ripemd.h ../../include/openssl/safestack.h
+rmd_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rmd_dgst.o: ../md32_common.h rmd_dgst.c rmd_locl.h rmdconst.h
 rmd_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 rmd_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
diff --git a/src/lib/libcrypto/rsa/Makefile b/src/lib/libcrypto/rsa/Makefile
index bb64223e05..f798d2f749 100644
--- a/src/lib/libcrypto/rsa/Makefile
+++ b/src/lib/libcrypto/rsa/Makefile
@@ -20,11 +20,11 @@ LIB=$(TOP)/libcrypto.a
 LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
         rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \
         rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c \
-        rsa_pmeth.c
+        rsa_pmeth.c rsa_crpt.c
 LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \
         rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o rsa_chk.o rsa_null.o \
         rsa_pss.o rsa_x931.o rsa_asn1.o rsa_depr.o rsa_ameth.o rsa_prn.o \
-        rsa_pmeth.o
+        rsa_pmeth.o rsa_crpt.o
 
 SRC= $(LIBSRC)
 
@@ -100,11 +100,16 @@ rsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 rsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 rsa_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-rsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+rsa_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+rsa_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+rsa_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 rsa_asn1.o: ../../include/openssl/opensslconf.h
 rsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-rsa_asn1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+rsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rsa_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 rsa_asn1.o: ../cryptlib.h rsa_asn1.c
 rsa_chk.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 rsa_chk.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -114,6 +119,21 @@ rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_chk.o: rsa_chk.c
+rsa_crpt.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_crpt.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+rsa_crpt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+rsa_crpt.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+rsa_crpt.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+rsa_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+rsa_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rsa_crpt.o: ../../include/openssl/opensslconf.h
+rsa_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+rsa_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rsa_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+rsa_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_crpt.c
 rsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 rsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -205,11 +225,12 @@ rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c
 rsa_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 rsa_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-rsa_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-rsa_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-rsa_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-rsa_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-rsa_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rsa_pmeth.o: ../../include/openssl/cms.h ../../include/openssl/crypto.h
+rsa_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+rsa_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+rsa_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+rsa_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+rsa_pmeth.o: ../../include/openssl/objects.h
 rsa_pmeth.o: ../../include/openssl/opensslconf.h
 rsa_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
diff --git a/src/lib/libcrypto/sha/Makefile b/src/lib/libcrypto/sha/Makefile
index e6eccb05f9..6d191d3936 100644
--- a/src/lib/libcrypto/sha/Makefile
+++ b/src/lib/libcrypto/sha/Makefile
@@ -56,8 +56,11 @@ sha256-ia64.s: asm/sha512-ia64.pl
 sha512-ia64.s: asm/sha512-ia64.pl
         (cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))
 
-sha256-armv4.s: asm/sha256-armv4.pl
-        $(PERL) $< $@
+sha256-armv4.S: asm/sha256-armv4.pl
+        $(PERL) $< $(PERLASM_SCHEME) $@
+
+sha1-alpha.s:   asm/sha1-alpha.pl
+        $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
 
 # Solaris make has to be explicitly told
 sha1-x86_64.s:  asm/sha1-x86_64.pl;     $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@
@@ -71,10 +74,22 @@ sha1-ppc.s:	asm/sha1-ppc.pl;	$(PERL) asm/sha1-ppc.pl $(PERLASM_SCHEME) $@
 sha256-ppc.s:   asm/sha512-ppc.pl;      $(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@
 sha512-ppc.s:   asm/sha512-ppc.pl;      $(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@
 
+sha1-parisc.s:  asm/sha1-parisc.pl;     $(PERL) asm/sha1-parisc.pl $(PERLASM_SCHEME) $@
+sha256-parisc.s:asm/sha512-parisc.pl;   $(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@
+sha512-parisc.s:asm/sha512-parisc.pl;   $(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@
+
+sha1-mips.S:    asm/sha1-mips.pl;       $(PERL) asm/sha1-mips.pl $(PERLASM_SCHEME) $@
+sha256-mips.S:  asm/sha512-mips.pl;     $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@
+sha512-mips.S:  asm/sha512-mips.pl;     $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@
+
 # GNU make "catch all"
-sha1-%.s:       asm/sha1-%.pl;          $(PERL) $< $@
-sha256-%.s:     asm/sha512-%.pl;        $(PERL) $< $@
-sha512-%.s:     asm/sha512-%.pl;        $(PERL) $< $@
+sha1-%.S:       asm/sha1-%.pl;          $(PERL) $< $(PERLASM_SCHEME) $@
+sha256-%.S:     asm/sha512-%.pl;        $(PERL) $< $(PERLASM_SCHEME) $@
+sha512-%.S:     asm/sha512-%.pl;        $(PERL) $< $(PERLASM_SCHEME) $@
+
+sha1-armv4-large.o:     sha1-armv4-large.S
+sha256-armv4.o:         sha256-armv4.S
+sha512-armv4.o:         sha512-armv4.S
 
 files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -119,8 +134,11 @@ sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 sha1_one.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 sha1_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha1_one.o: sha1_one.c
-sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha1dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+sha1dgst.o: ../../include/openssl/opensslconf.h
+sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+sha1dgst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+sha1dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha1dgst.o: ../md32_common.h sha1dgst.c sha_locl.h
 sha256.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 sha256.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
@@ -135,8 +153,11 @@ sha512.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 sha512.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 sha512.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha512.o: ../cryptlib.h sha512.c
-sha_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+sha_dgst.o: ../../include/openssl/opensslconf.h
+sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+sha_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+sha_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha_dgst.o: ../md32_common.h sha_dgst.c sha_locl.h
 sha_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 sha_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
diff --git a/src/lib/libcrypto/sha/sha_dgst.c b/src/lib/libcrypto/sha/sha_dgst.c
index 70eb56032c..c946ad827d 100644
--- a/src/lib/libcrypto/sha/sha_dgst.c
+++ b/src/lib/libcrypto/sha/sha_dgst.c
@@ -57,6 +57,7 @@
  */
 
 #include <openssl/opensslconf.h>
+#include <openssl/crypto.h>
 #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA)
 
 #undef  SHA_1
diff --git a/src/lib/libcrypto/symhacks.h b/src/lib/libcrypto/symhacks.h
index 3fd4a81692..403f592dcd 100644
--- a/src/lib/libcrypto/symhacks.h
+++ b/src/lib/libcrypto/symhacks.h
@@ -176,7 +176,6 @@
 #define SSL_CTX_set_default_passwd_cb_userdata  SSL_CTX_set_def_passwd_cb_ud
 #undef SSL_COMP_get_compression_methods
 #define SSL_COMP_get_compression_methods        SSL_COMP_get_compress_methods
-
 #undef ssl_add_clienthello_renegotiate_ext
 #define ssl_add_clienthello_renegotiate_ext     ssl_add_clienthello_reneg_ext
 #undef ssl_add_serverhello_renegotiate_ext
@@ -185,6 +184,26 @@
 #define ssl_parse_clienthello_renegotiate_ext   ssl_parse_clienthello_reneg_ext
 #undef ssl_parse_serverhello_renegotiate_ext
 #define ssl_parse_serverhello_renegotiate_ext   ssl_parse_serverhello_reneg_ext
+#undef SSL_srp_server_param_with_username
+#define SSL_srp_server_param_with_username      SSL_srp_server_param_with_un
+#undef SSL_CTX_set_srp_client_pwd_callback
+#define SSL_CTX_set_srp_client_pwd_callback     SSL_CTX_set_srp_client_pwd_cb
+#undef SSL_CTX_set_srp_verify_param_callback
+#define SSL_CTX_set_srp_verify_param_callback   SSL_CTX_set_srp_vfy_param_cb
+#undef SSL_CTX_set_srp_username_callback
+#define SSL_CTX_set_srp_username_callback       SSL_CTX_set_srp_un_cb
+#undef ssl_add_clienthello_use_srtp_ext
+#define ssl_add_clienthello_use_srtp_ext ssl_add_clihello_use_srtp_ext
+#undef ssl_add_serverhello_use_srtp_ext
+#define ssl_add_serverhello_use_srtp_ext ssl_add_serhello_use_srtp_ext
+#undef ssl_parse_clienthello_use_srtp_ext
+#define ssl_parse_clienthello_use_srtp_ext ssl_parse_clihello_use_srtp_ext
+#undef ssl_parse_serverhello_use_srtp_ext
+#define ssl_parse_serverhello_use_srtp_ext ssl_parse_serhello_use_srtp_ext
+#undef SSL_CTX_set_next_protos_advertised_cb
+#define SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_protos_adv_cb
+#undef SSL_CTX_set_next_proto_select_cb
+#define SSL_CTX_set_next_proto_select_cb SSL_CTX_set_next_proto_sel_cb
 
 /* Hack some long ENGINE names */
 #undef ENGINE_get_default_BN_mod_exp_crt
@@ -238,6 +257,9 @@
 #define EC_GROUP_get_point_conversion_form      EC_GROUP_get_point_conv_form
 #undef EC_GROUP_clear_free_all_extra_data
 #define EC_GROUP_clear_free_all_extra_data      EC_GROUP_clr_free_all_xtra_data
+#undef EC_KEY_set_public_key_affine_coordinates
+#define EC_KEY_set_public_key_affine_coordinates \
+                                                EC_KEY_set_pub_key_aff_coords
 #undef EC_POINT_set_Jprojective_coordinates_GFp
 #define EC_POINT_set_Jprojective_coordinates_GFp \
                                                 EC_POINT_set_Jproj_coords_GFp
@@ -399,6 +421,12 @@
 #undef dtls1_retransmit_buffered_messages
 #define dtls1_retransmit_buffered_messages      dtls1_retransmit_buffered_msgs
 
+/* Hack some long SRP names */
+#undef SRP_generate_server_master_secret
+#define SRP_generate_server_master_secret       SRP_gen_server_master_secret
+#undef SRP_generate_client_master_secret
+#define SRP_generate_client_master_secret       SRP_gen_client_master_secret
+
 /* Hack some long UI names */
 #undef UI_method_get_prompt_constructor
 #define UI_method_get_prompt_constructor        UI_method_get_prompt_constructr
diff --git a/src/lib/libcrypto/util/cygwin.sh b/src/lib/libcrypto/util/cygwin.sh
index d6228521e6..cfdb04d2a4 100644
--- a/src/lib/libcrypto/util/cygwin.sh
+++ b/src/lib/libcrypto/util/cygwin.sh
@@ -11,6 +11,7 @@ CONFIG_OPTIONS="--prefix=/usr shared zlib no-idea no-rc5"
 INSTALL_PREFIX=/tmp/install/INSTALL
 
 VERSION=
+SHLIB_VERSION_NUMBER=
 SUBVERSION=$1
 
 function cleanup()
@@ -28,6 +29,13 @@ function get_openssl_version()
     echo "       Check value of variable VERSION in Makefile."
     exit 1
   fi
+  eval `grep '^SHLIB_VERSION_NUMBER=' Makefile`
+  if [ -z "${SHLIB_VERSION_NUMBER}" ]
+  then
+    echo "Error: Couldn't retrieve OpenSSL shared lib version from Makefile."
+    echo " Check value of variable SHLIB_VERSION_NUMBER in Makefile."
+    exit 1
+  fi
 }
 
 function base_install()
@@ -124,7 +132,7 @@ strip usr/bin/*.exe usr/bin/*.dll usr/lib/engines/*.so
 chmod u-w usr/lib/engines/*.so
 
 # Runtime package
-tar cjf libopenssl${VERSION//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2 \
+tar cjf libopenssl${SHLIB_VERSION_NUMBER//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2 \
      usr/bin/cyg*dll
 # Base package
 find etc usr/bin/openssl.exe usr/bin/c_rehash usr/lib/engines usr/share/doc \
@@ -139,7 +147,7 @@ tar cjfT openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2 -
 
 ls -l openssl-${VERSION}-${SUBVERSION}.tar.bz2
 ls -l openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2
-ls -l libopenssl${VERSION//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2
+ls -l libopenssl${SHLIB_VERSION_NUMBER//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2
 
 cleanup
 
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index b23619f20a..93f80ba0c6 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -1050,7 +1050,7 @@ ASN1_TYPE_get_octetstring               1077	EXIST::FUNCTION:
 ASN1_TYPE_set_int_octetstring           1078    EXIST::FUNCTION:
 ASN1_TYPE_set_octetstring               1079    EXIST::FUNCTION:
 ASN1_UTCTIME_set_string                 1080    EXIST::FUNCTION:
-ERR_add_error_data                      1081    EXIST::FUNCTION:BIO
+ERR_add_error_data                      1081    EXIST::FUNCTION:
 ERR_set_error_data                      1082    EXIST::FUNCTION:
 EVP_CIPHER_asn1_to_param                1083    EXIST::FUNCTION:
 EVP_CIPHER_param_to_asn1                1084    EXIST::FUNCTION:
@@ -2808,7 +2808,7 @@ FIPS_corrupt_rsa                        3249	NOEXIST::FUNCTION:
 FIPS_selftest_des                       3250    NOEXIST::FUNCTION:
 EVP_aes_128_cfb1                        3251    EXIST::FUNCTION:AES
 EVP_aes_192_cfb8                        3252    EXIST::FUNCTION:AES
-FIPS_mode_set                           3253    NOEXIST::FUNCTION:
+FIPS_mode_set                           3253    EXIST::FUNCTION:
 FIPS_selftest_dsa                       3254    NOEXIST::FUNCTION:
 EVP_aes_256_cfb8                        3255    EXIST::FUNCTION:AES
 FIPS_allow_md5                          3256    NOEXIST::FUNCTION:
@@ -2838,23 +2838,23 @@ AES_cfb1_encrypt                        3279	EXIST::FUNCTION:AES
 EVP_des_ede3_cfb1                       3280    EXIST::FUNCTION:DES
 FIPS_rand_check                         3281    NOEXIST::FUNCTION:
 FIPS_md5_allowed                        3282    NOEXIST::FUNCTION:
-FIPS_mode                               3283    NOEXIST::FUNCTION:
+FIPS_mode                               3283    EXIST::FUNCTION:
 FIPS_selftest_failed                    3284    NOEXIST::FUNCTION:
 sk_is_sorted                            3285    EXIST::FUNCTION:
 X509_check_ca                           3286    EXIST::FUNCTION:
-private_idea_set_encrypt_key            3287    NOEXIST::FUNCTION:
+private_idea_set_encrypt_key            3287    EXIST:OPENSSL_FIPS:FUNCTION:IDEA
 HMAC_CTX_set_flags                      3288    EXIST::FUNCTION:HMAC
-private_SHA_Init                        3289    NOEXIST::FUNCTION:
-private_CAST_set_key                    3290    NOEXIST::FUNCTION:
-private_RIPEMD160_Init                  3291    NOEXIST::FUNCTION:
+private_SHA_Init                        3289    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA0
+private_CAST_set_key                    3290    EXIST:OPENSSL_FIPS:FUNCTION:CAST
+private_RIPEMD160_Init                  3291    EXIST:OPENSSL_FIPS:FUNCTION:RIPEMD
 private_RC5_32_set_key                  3292    NOEXIST::FUNCTION:
-private_MD5_Init                        3293    NOEXIST::FUNCTION:
-private_RC4_set_key                     3294    NOEXIST::FUNCTION:
-private_MDC2_Init                       3295    NOEXIST::FUNCTION:
-private_RC2_set_key                     3296    NOEXIST::FUNCTION:
-private_MD4_Init                        3297    NOEXIST::FUNCTION:
-private_BF_set_key                      3298    NOEXIST::FUNCTION:
-private_MD2_Init                        3299    NOEXIST::FUNCTION:
+private_MD5_Init                        3293    EXIST:OPENSSL_FIPS:FUNCTION:MD5
+private_RC4_set_key                     3294    EXIST::FUNCTION:RC4
+private_MDC2_Init                       3295    EXIST:OPENSSL_FIPS:FUNCTION:MDC2
+private_RC2_set_key                     3296    EXIST:OPENSSL_FIPS:FUNCTION:RC2
+private_MD4_Init                        3297    EXIST:OPENSSL_FIPS:FUNCTION:MD4
+private_BF_set_key                      3298    EXIST:OPENSSL_FIPS:FUNCTION:BF
+private_MD2_Init                        3299    EXIST:OPENSSL_FIPS:FUNCTION:MD2
 d2i_PROXY_CERT_INFO_EXTENSION           3300    EXIST::FUNCTION:
 PROXY_POLICY_it                         3301    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PROXY_POLICY_it                         3301    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2882,7 +2882,7 @@ RSA_verify_PKCS1_PSS                    3321	EXIST::FUNCTION:RSA
 RSA_padding_add_X931                    3322    EXIST::FUNCTION:RSA
 RSA_padding_add_PKCS1_PSS               3323    EXIST::FUNCTION:RSA
 PKCS1_MGF1                              3324    EXIST::FUNCTION:RSA
-BN_X931_generate_Xpq                    3325    NOEXIST::FUNCTION:
+BN_X931_generate_Xpq                    3325    EXIST::FUNCTION:
 RSA_X931_generate_key                   3326    NOEXIST::FUNCTION:
 BN_X931_derive_prime                    3327    NOEXIST::FUNCTION:
 BN_X931_generate_prime                  3328    NOEXIST::FUNCTION:
@@ -2906,7 +2906,7 @@ STORE_parse_attrs_start                 3343	NOEXIST::FUNCTION:
 POLICY_CONSTRAINTS_free                 3344    EXIST::FUNCTION:
 EVP_PKEY_add1_attr_by_NID               3345    EXIST::FUNCTION:
 BN_nist_mod_192                         3346    EXIST::FUNCTION:
-EC_GROUP_get_trinomial_basis            3347    EXIST::FUNCTION:EC
+EC_GROUP_get_trinomial_basis            3347    EXIST::FUNCTION:EC,EC2M
 STORE_set_method                        3348    NOEXIST::FUNCTION:
 GENERAL_SUBTREE_free                    3349    EXIST::FUNCTION:
 NAME_CONSTRAINTS_it                     3350    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2921,14 +2921,14 @@ SHA512_Update                           3356	EXIST:!VMSVAX:FUNCTION:SHA,SHA512
 i2d_ECPrivateKey                        3357    EXIST::FUNCTION:EC
 BN_get0_nist_prime_192                  3358    EXIST::FUNCTION:
 STORE_modify_certificate                3359    NOEXIST::FUNCTION:
-EC_POINT_set_affine_coordinates_GF2m    3360    EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_affine_coords_GF2m         3360    EXIST:VMS:FUNCTION:EC
-BN_GF2m_mod_exp_arr                     3361    EXIST::FUNCTION:
+EC_POINT_set_affine_coordinates_GF2m    3360    EXIST:!VMS:FUNCTION:EC,EC2M
+EC_POINT_set_affine_coords_GF2m         3360    EXIST:VMS:FUNCTION:EC,EC2M
+BN_GF2m_mod_exp_arr                     3361    EXIST::FUNCTION:EC2M
 STORE_ATTR_INFO_modify_number           3362    NOEXIST::FUNCTION:
 X509_keyid_get0                         3363    EXIST::FUNCTION:
 ENGINE_load_gmp                         3364    EXIST::FUNCTION:ENGINE,GMP,STATIC_ENGINE
 pitem_new                               3365    EXIST::FUNCTION:
-BN_GF2m_mod_mul_arr                     3366    EXIST::FUNCTION:
+BN_GF2m_mod_mul_arr                     3366    EXIST::FUNCTION:EC2M
 STORE_list_public_key_endp              3367    NOEXIST::FUNCTION:
 o2i_ECPublicKey                         3368    EXIST::FUNCTION:EC
 EC_KEY_copy                             3369    EXIST::FUNCTION:EC
@@ -2945,7 +2945,7 @@ X509_VERIFY_PARAM_inherit               3378	EXIST::FUNCTION:
 EC_POINT_point2bn                       3379    EXIST::FUNCTION:EC
 STORE_ATTR_INFO_set_dn                  3380    NOEXIST::FUNCTION:
 X509_policy_tree_get0_policies          3381    EXIST::FUNCTION:
-EC_GROUP_new_curve_GF2m                 3382    EXIST::FUNCTION:EC
+EC_GROUP_new_curve_GF2m                 3382    EXIST::FUNCTION:EC,EC2M
 STORE_destroy_method                    3383    NOEXIST::FUNCTION:
 ENGINE_unregister_STORE                 3384    EXIST::FUNCTION:ENGINE
 EVP_PKEY_get1_EC_KEY                    3385    EXIST::FUNCTION:EC
@@ -2961,7 +2961,7 @@ ENGINE_get_static_state                 3393	EXIST::FUNCTION:ENGINE
 pqueue_iterator                         3394    EXIST::FUNCTION:
 ECDSA_SIG_new                           3395    EXIST::FUNCTION:ECDSA
 OPENSSL_DIR_end                         3396    EXIST::FUNCTION:
-BN_GF2m_mod_sqr                         3397    EXIST::FUNCTION:
+BN_GF2m_mod_sqr                         3397    EXIST::FUNCTION:EC2M
 EC_POINT_bn2point                       3398    EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_set_depth             3399    EXIST::FUNCTION:
 EC_KEY_set_asn1_flag                    3400    EXIST::FUNCTION:EC
@@ -2974,7 +2974,7 @@ EC_GROUP_get_point_conv_form            3405	EXIST:VMS:FUNCTION:EC
 STORE_method_set_store_function         3406    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_in                      3407    NOEXIST::FUNCTION:
 PEM_read_bio_ECPKParameters             3408    EXIST::FUNCTION:EC
-EC_GROUP_get_pentanomial_basis          3409    EXIST::FUNCTION:EC
+EC_GROUP_get_pentanomial_basis          3409    EXIST::FUNCTION:EC,EC2M
 EVP_PKEY_add1_attr_by_txt               3410    EXIST::FUNCTION:
 BN_BLINDING_set_flags                   3411    EXIST::FUNCTION:
 X509_VERIFY_PARAM_set1_policies         3412    EXIST::FUNCTION:
@@ -2982,10 +2982,10 @@ X509_VERIFY_PARAM_set1_name             3413	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_purpose           3414    EXIST::FUNCTION:
 STORE_get_number                        3415    NOEXIST::FUNCTION:
 ECDSA_sign_setup                        3416    EXIST::FUNCTION:ECDSA
-BN_GF2m_mod_solve_quad_arr              3417    EXIST::FUNCTION:
+BN_GF2m_mod_solve_quad_arr              3417    EXIST::FUNCTION:EC2M
 EC_KEY_up_ref                           3418    EXIST::FUNCTION:EC
 POLICY_MAPPING_free                     3419    EXIST::FUNCTION:
-BN_GF2m_mod_div                         3420    EXIST::FUNCTION:
+BN_GF2m_mod_div                         3420    EXIST::FUNCTION:EC2M
 X509_VERIFY_PARAM_set_flags             3421    EXIST::FUNCTION:
 EC_KEY_free                             3422    EXIST::FUNCTION:EC
 STORE_meth_set_list_next_fn             3423    NOEXIST::FUNCTION:
@@ -2999,7 +2999,7 @@ STORE_method_set_list_end_function      3427	NOEXIST::FUNCTION:
 pqueue_print                            3428    EXIST::FUNCTION:
 EC_GROUP_have_precompute_mult           3429    EXIST::FUNCTION:EC
 EC_KEY_print_fp                         3430    EXIST::FUNCTION:EC,FP_API
-BN_GF2m_mod_arr                         3431    EXIST::FUNCTION:
+BN_GF2m_mod_arr                         3431    EXIST::FUNCTION:EC2M
 PEM_write_bio_X509_CERT_PAIR            3432    EXIST::FUNCTION:
 EVP_PKEY_cmp                            3433    EXIST::FUNCTION:
 X509_policy_level_node_count            3434    EXIST::FUNCTION:
@@ -3020,7 +3020,7 @@ X509_policy_node_get0_qualifiers        3448	EXIST:!VMS:FUNCTION:
 X509_pcy_node_get0_qualifiers           3448    EXIST:VMS:FUNCTION:
 STORE_list_crl_end                      3449    NOEXIST::FUNCTION:
 EVP_PKEY_set1_EC_KEY                    3450    EXIST::FUNCTION:EC
-BN_GF2m_mod_sqrt_arr                    3451    EXIST::FUNCTION:
+BN_GF2m_mod_sqrt_arr                    3451    EXIST::FUNCTION:EC2M
 i2d_ECPrivateKey_bio                    3452    EXIST::FUNCTION:BIO,EC
 ECPKParameters_print_fp                 3453    EXIST::FUNCTION:EC,FP_API
 pqueue_find                             3454    EXIST::FUNCTION:
@@ -3037,7 +3037,7 @@ PKCS12_add_safes                        3464	EXIST::FUNCTION:
 BN_BLINDING_convert_ex                  3465    EXIST::FUNCTION:
 X509_policy_tree_free                   3466    EXIST::FUNCTION:
 OPENSSL_ia32cap_loc                     3467    EXIST::FUNCTION:
-BN_GF2m_poly2arr                        3468    EXIST::FUNCTION:
+BN_GF2m_poly2arr                        3468    EXIST::FUNCTION:EC2M
 STORE_ctrl                              3469    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_compare                 3470    NOEXIST::FUNCTION:
 BN_get0_nist_prime_224                  3471    EXIST::FUNCTION:
@@ -3061,7 +3061,7 @@ STORE_method_set_delete_function        3486	NOEXIST::FUNCTION:
 STORE_list_certificate_next             3487    NOEXIST::FUNCTION:
 ASN1_generate_nconf                     3488    EXIST::FUNCTION:
 BUF_memdup                              3489    EXIST::FUNCTION:
-BN_GF2m_mod_mul                         3490    EXIST::FUNCTION:
+BN_GF2m_mod_mul                         3490    EXIST::FUNCTION:EC2M
 STORE_meth_get_list_next_fn             3491    NOEXIST::FUNCTION:
 STORE_method_get_list_next_function     3491    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_get0_dn                 3492    NOEXIST::FUNCTION:
@@ -3072,7 +3072,7 @@ STORE_ATTR_INFO_free                    3496	NOEXIST::FUNCTION:
 STORE_get_private_key                   3497    NOEXIST::FUNCTION:
 EVP_PKEY_get_attr_count                 3498    EXIST::FUNCTION:
 STORE_ATTR_INFO_new                     3499    NOEXIST::FUNCTION:
-EC_GROUP_get_curve_GF2m                 3500    EXIST::FUNCTION:EC
+EC_GROUP_get_curve_GF2m                 3500    EXIST::FUNCTION:EC,EC2M
 STORE_meth_set_revoke_fn                3501    NOEXIST::FUNCTION:
 STORE_method_set_revoke_function        3501    NOEXIST::FUNCTION:
 STORE_store_number                      3502    NOEXIST::FUNCTION:
@@ -3088,7 +3088,7 @@ BIO_dump_indent_fp                      3511	EXIST::FUNCTION:FP_API
 EC_KEY_set_group                        3512    EXIST::FUNCTION:EC
 BUF_strndup                             3513    EXIST::FUNCTION:
 STORE_list_certificate_start            3514    NOEXIST::FUNCTION:
-BN_GF2m_mod                             3515    EXIST::FUNCTION:
+BN_GF2m_mod                             3515    EXIST::FUNCTION:EC2M
 X509_REQ_check_private_key              3516    EXIST::FUNCTION:
 EC_GROUP_get_seed_len                   3517    EXIST::FUNCTION:EC
 ERR_load_STORE_strings                  3518    NOEXIST::FUNCTION:
@@ -3117,19 +3117,19 @@ STORE_method_set_get_function           3536	NOEXIST::FUNCTION:
 STORE_modify_number                     3537    NOEXIST::FUNCTION:
 STORE_method_get_store_function         3538    NOEXIST::FUNCTION:
 STORE_store_private_key                 3539    NOEXIST::FUNCTION:
-BN_GF2m_mod_sqr_arr                     3540    EXIST::FUNCTION:
+BN_GF2m_mod_sqr_arr                     3540    EXIST::FUNCTION:EC2M
 RSA_setup_blinding                      3541    EXIST::FUNCTION:RSA
 BIO_s_datagram                          3542    EXIST::FUNCTION:DGRAM
 STORE_Memory                            3543    NOEXIST::FUNCTION:
 sk_find_ex                              3544    EXIST::FUNCTION:
-EC_GROUP_set_curve_GF2m                 3545    EXIST::FUNCTION:EC
+EC_GROUP_set_curve_GF2m                 3545    EXIST::FUNCTION:EC,EC2M
 ENGINE_set_default_ECDSA                3546    EXIST::FUNCTION:ENGINE
 POLICY_CONSTRAINTS_new                  3547    EXIST::FUNCTION:
-BN_GF2m_mod_sqrt                        3548    EXIST::FUNCTION:
+BN_GF2m_mod_sqrt                        3548    EXIST::FUNCTION:EC2M
 ECDH_set_default_method                 3549    EXIST::FUNCTION:ECDH
 EC_KEY_generate_key                     3550    EXIST::FUNCTION:EC
 SHA384_Update                           3551    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
-BN_GF2m_arr2poly                        3552    EXIST::FUNCTION:
+BN_GF2m_arr2poly                        3552    EXIST::FUNCTION:EC2M
 STORE_method_get_get_function           3553    NOEXIST::FUNCTION:
 STORE_meth_set_cleanup_fn               3554    NOEXIST::FUNCTION:
 STORE_method_set_cleanup_function       3554    NOEXIST::FUNCTION:
@@ -3154,7 +3154,7 @@ EC_GROUP_get_degree                     3570	EXIST::FUNCTION:EC
 ASN1_generate_v3                        3571    EXIST::FUNCTION:
 STORE_ATTR_INFO_modify_cstr             3572    NOEXIST::FUNCTION:
 X509_policy_tree_level_count            3573    EXIST::FUNCTION:
-BN_GF2m_add                             3574    EXIST::FUNCTION:
+BN_GF2m_add                             3574    EXIST::FUNCTION:EC2M
 EC_KEY_get0_group                       3575    EXIST::FUNCTION:EC
 STORE_generate_crl                      3576    NOEXIST::FUNCTION:
 STORE_store_public_key                  3577    NOEXIST::FUNCTION:
@@ -3179,8 +3179,8 @@ STORE_store_certificate                 3593	NOEXIST::FUNCTION:
 OBJ_bsearch_ex                          3594    NOEXIST::FUNCTION:
 X509_STORE_CTX_set_default              3595    EXIST::FUNCTION:
 STORE_ATTR_INFO_set_sha1str             3596    NOEXIST::FUNCTION:
-BN_GF2m_mod_inv                         3597    EXIST::FUNCTION:
-BN_GF2m_mod_exp                         3598    EXIST::FUNCTION:
+BN_GF2m_mod_inv                         3597    EXIST::FUNCTION:EC2M
+BN_GF2m_mod_exp                         3598    EXIST::FUNCTION:EC2M
 STORE_modify_public_key                 3599    NOEXIST::FUNCTION:
 STORE_meth_get_list_start_fn            3600    NOEXIST::FUNCTION:
 STORE_method_get_list_start_function    3600    NOEXIST::FUNCTION:
@@ -3188,7 +3188,7 @@ EC_GROUP_get0_seed                      3601	EXIST::FUNCTION:EC
 STORE_store_arbitrary                   3602    NOEXIST::FUNCTION:
 STORE_meth_set_unlock_store_fn          3603    NOEXIST::FUNCTION:
 STORE_method_set_unlock_store_function  3603    NOEXIST::FUNCTION:
-BN_GF2m_mod_div_arr                     3604    EXIST::FUNCTION:
+BN_GF2m_mod_div_arr                     3604    EXIST::FUNCTION:EC2M
 ENGINE_set_ECDSA                        3605    EXIST::FUNCTION:ENGINE
 STORE_create_method                     3606    NOEXIST::FUNCTION:
 ECPKParameters_print                    3607    EXIST::FUNCTION:BIO,EC
@@ -3211,8 +3211,8 @@ EC_KEY_get_enc_flags                    3622	EXIST::FUNCTION:EC
 ASN1_const_check_infinite_end           3623    EXIST::FUNCTION:
 EVP_PKEY_delete_attr                    3624    EXIST::FUNCTION:
 ECDSA_set_default_method                3625    EXIST::FUNCTION:ECDSA
-EC_POINT_set_compressed_coordinates_GF2m 3626   EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_compr_coords_GF2m          3626    EXIST:VMS:FUNCTION:EC
+EC_POINT_set_compressed_coordinates_GF2m 3626   EXIST:!VMS:FUNCTION:EC,EC2M
+EC_POINT_set_compr_coords_GF2m          3626    EXIST:VMS:FUNCTION:EC,EC2M
 EC_GROUP_cmp                            3627    EXIST::FUNCTION:EC
 STORE_revoke_certificate                3628    NOEXIST::FUNCTION:
 BN_get0_nist_prime_256                  3629    EXIST::FUNCTION:
@@ -3241,7 +3241,7 @@ POLICY_CONSTRAINTS_it                   3649	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 STORE_get_ex_new_index                  3650    NOEXIST::FUNCTION:
 EVP_PKEY_get_attr_by_OBJ                3651    EXIST::FUNCTION:
 X509_VERIFY_PARAM_add0_policy           3652    EXIST::FUNCTION:
-BN_GF2m_mod_solve_quad                  3653    EXIST::FUNCTION:
+BN_GF2m_mod_solve_quad                  3653    EXIST::FUNCTION:EC2M
 SHA256                                  3654    EXIST::FUNCTION:SHA,SHA256
 i2d_ECPrivateKey_fp                     3655    EXIST::FUNCTION:EC,FP_API
 X509_policy_tree_get0_user_policies     3656    EXIST:!VMS:FUNCTION:
@@ -3249,8 +3249,8 @@ X509_pcy_tree_get0_usr_policies         3656	EXIST:VMS:FUNCTION:
 OPENSSL_DIR_read                        3657    EXIST::FUNCTION:
 ENGINE_register_all_ECDSA               3658    EXIST::FUNCTION:ENGINE
 X509_VERIFY_PARAM_lookup                3659    EXIST::FUNCTION:
-EC_POINT_get_affine_coordinates_GF2m    3660    EXIST:!VMS:FUNCTION:EC
-EC_POINT_get_affine_coords_GF2m         3660    EXIST:VMS:FUNCTION:EC
+EC_POINT_get_affine_coordinates_GF2m    3660    EXIST:!VMS:FUNCTION:EC,EC2M
+EC_POINT_get_affine_coords_GF2m         3660    EXIST:VMS:FUNCTION:EC,EC2M
 EC_GROUP_dup                            3661    EXIST::FUNCTION:EC
 ENGINE_get_default_ECDSA                3662    EXIST::FUNCTION:ENGINE
 EC_KEY_new                              3663    EXIST::FUNCTION:EC
@@ -3332,7 +3332,7 @@ STORE_list_certificate_end              3734	NOEXIST::FUNCTION:
 STORE_get_crl                           3735    NOEXIST::FUNCTION:
 X509_POLICY_NODE_print                  3736    EXIST::FUNCTION:
 SHA384_Init                             3737    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
-EC_GF2m_simple_method                   3738    EXIST::FUNCTION:EC
+EC_GF2m_simple_method                   3738    EXIST::FUNCTION:EC,EC2M
 ECDSA_set_ex_data                       3739    EXIST::FUNCTION:ECDSA
 SHA384_Final                            3740    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
 PKCS7_set_digest                        3741    EXIST::FUNCTION:
@@ -3364,7 +3364,7 @@ BIO_dump_cb                             3764	EXIST::FUNCTION:
 SHA256_Update                           3765    EXIST::FUNCTION:SHA,SHA256
 pqueue_insert                           3766    EXIST::FUNCTION:
 pitem_free                              3767    EXIST::FUNCTION:
-BN_GF2m_mod_inv_arr                     3768    EXIST::FUNCTION:
+BN_GF2m_mod_inv_arr                     3768    EXIST::FUNCTION:EC2M
 ENGINE_unregister_ECDSA                 3769    EXIST::FUNCTION:ENGINE
 BN_BLINDING_set_thread_id               3770    EXIST::FUNCTION:DEPRECATED
 get_rfc3526_prime_8192                  3771    EXIST::FUNCTION:
@@ -3670,7 +3670,7 @@ int_EVP_MD_set_engine_callbacks         4056	NOEXIST::FUNCTION:
 int_CRYPTO_set_do_dynlock_callback      4057    NOEXIST::FUNCTION:
 FIPS_rng_stick                          4058    NOEXIST::FUNCTION:
 EVP_CIPHER_CTX_set_flags                4059    EXIST::FUNCTION:
-BN_X931_generate_prime_ex               4060    NOEXIST::FUNCTION:
+BN_X931_generate_prime_ex               4060    EXIST::FUNCTION:
 FIPS_selftest_check                     4061    NOEXIST::FUNCTION:
 FIPS_rand_set_dt                        4062    NOEXIST::FUNCTION:
 CRYPTO_dbg_pop_info                     4063    NOEXIST::FUNCTION:
@@ -3695,14 +3695,14 @@ FIPS_rand_test_mode                     4081	NOEXIST::FUNCTION:
 FIPS_rand_reset                         4082    NOEXIST::FUNCTION:
 FIPS_dsa_new                            4083    NOEXIST::FUNCTION:
 int_RAND_set_callbacks                  4084    NOEXIST::FUNCTION:
-BN_X931_derive_prime_ex                 4085    NOEXIST::FUNCTION:
+BN_X931_derive_prime_ex                 4085    EXIST::FUNCTION:
 int_ERR_lib_init                        4086    NOEXIST::FUNCTION:
 int_EVP_CIPHER_init_engine_callbacks    4087    NOEXIST::FUNCTION:
 FIPS_rsa_free                           4088    NOEXIST::FUNCTION:
 FIPS_dsa_sig_encode                     4089    NOEXIST::FUNCTION:
 CRYPTO_dbg_remove_all_info              4090    NOEXIST::FUNCTION:
-OPENSSL_init                            4091    NOEXIST::FUNCTION:
-private_Camellia_set_key                4092    NOEXIST::FUNCTION:
+OPENSSL_init                            4091    EXIST::FUNCTION:
+private_Camellia_set_key                4092    EXIST:OPENSSL_FIPS:FUNCTION:CAMELLIA
 CRYPTO_strdup                           4093    EXIST::FUNCTION:
 JPAKE_STEP3A_process                    4094    EXIST::FUNCTION:JPAKE
 JPAKE_STEP1_release                     4095    EXIST::FUNCTION:JPAKE
@@ -4194,3 +4194,119 @@ OPENSSL_memcmp                          4565	EXIST::FUNCTION:
 OPENSSL_strncasecmp                     4566    EXIST::FUNCTION:
 OPENSSL_gmtime                          4567    EXIST::FUNCTION:
 OPENSSL_gmtime_adj                      4568    EXIST::FUNCTION:
+SRP_VBASE_get_by_user                   4569    EXIST::FUNCTION:SRP
+SRP_Calc_server_key                     4570    EXIST::FUNCTION:SRP
+SRP_create_verifier                     4571    EXIST::FUNCTION:SRP
+SRP_create_verifier_BN                  4572    EXIST::FUNCTION:SRP
+SRP_Calc_u                              4573    EXIST::FUNCTION:SRP
+SRP_VBASE_free                          4574    EXIST::FUNCTION:SRP
+SRP_Calc_client_key                     4575    EXIST::FUNCTION:SRP
+SRP_get_default_gN                      4576    EXIST::FUNCTION:SRP
+SRP_Calc_x                              4577    EXIST::FUNCTION:SRP
+SRP_Calc_B                              4578    EXIST::FUNCTION:SRP
+SRP_VBASE_new                           4579    EXIST::FUNCTION:SRP
+SRP_check_known_gN_param                4580    EXIST::FUNCTION:SRP
+SRP_Calc_A                              4581    EXIST::FUNCTION:SRP
+SRP_Verify_A_mod_N                      4582    EXIST::FUNCTION:SRP
+SRP_VBASE_init                          4583    EXIST::FUNCTION:SRP
+SRP_Verify_B_mod_N                      4584    EXIST::FUNCTION:SRP
+EC_KEY_set_public_key_affine_coordinates 4585   EXIST:!VMS:FUNCTION:EC
+EC_KEY_set_pub_key_aff_coords           4585    EXIST:VMS:FUNCTION:EC
+EVP_aes_192_ctr                         4586    EXIST::FUNCTION:AES
+EVP_PKEY_meth_get0_info                 4587    EXIST::FUNCTION:
+EVP_PKEY_meth_copy                      4588    EXIST::FUNCTION:
+ERR_add_error_vdata                     4589    EXIST::FUNCTION:
+EVP_aes_128_ctr                         4590    EXIST::FUNCTION:AES
+EVP_aes_256_ctr                         4591    EXIST::FUNCTION:AES
+EC_GFp_nistp224_method                  4592    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+EC_KEY_get_flags                        4593    EXIST::FUNCTION:EC
+RSA_padding_add_PKCS1_PSS_mgf1          4594    EXIST::FUNCTION:RSA
+EVP_aes_128_xts                         4595    EXIST::FUNCTION:AES
+private_SHA224_Init                     4596    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256
+private_AES_set_decrypt_key             4597    EXIST::FUNCTION:AES
+private_WHIRLPOOL_Init                  4598    EXIST:OPENSSL_FIPS:FUNCTION:WHIRLPOOL
+EVP_aes_256_xts                         4599    EXIST::FUNCTION:AES
+private_SHA512_Init                     4600    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512
+EVP_aes_128_gcm                         4601    EXIST::FUNCTION:AES
+EC_KEY_clear_flags                      4602    EXIST::FUNCTION:EC
+EC_KEY_set_flags                        4603    EXIST::FUNCTION:EC
+private_DES_set_key_unchecked           4604    EXIST:OPENSSL_FIPS:FUNCTION:DES
+EVP_aes_256_ccm                         4605    EXIST::FUNCTION:AES
+private_AES_set_encrypt_key             4606    EXIST::FUNCTION:AES
+RSA_verify_PKCS1_PSS_mgf1               4607    EXIST::FUNCTION:RSA
+private_SHA1_Init                       4608    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA1
+EVP_aes_128_ccm                         4609    EXIST::FUNCTION:AES
+private_SEED_set_key                    4610    EXIST:OPENSSL_FIPS:FUNCTION:SEED
+EVP_aes_192_gcm                         4611    EXIST::FUNCTION:AES
+X509_ALGOR_set_md                       4612    EXIST::FUNCTION:
+private_SHA256_Init                     4613    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256
+RAND_init_fips                          4614    EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_aes_256_gcm                         4615    EXIST::FUNCTION:AES
+private_SHA384_Init                     4616    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512
+EVP_aes_192_ccm                         4617    EXIST::FUNCTION:AES
+CMAC_CTX_copy                           4618    EXIST::FUNCTION:
+CMAC_CTX_free                           4619    EXIST::FUNCTION:
+CMAC_CTX_get0_cipher_ctx                4620    EXIST::FUNCTION:
+CMAC_CTX_cleanup                        4621    EXIST::FUNCTION:
+CMAC_Init                               4622    EXIST::FUNCTION:
+CMAC_Update                             4623    EXIST::FUNCTION:
+CMAC_resume                             4624    EXIST::FUNCTION:
+CMAC_CTX_new                            4625    EXIST::FUNCTION:
+CMAC_Final                              4626    EXIST::FUNCTION:
+CRYPTO_ctr128_encrypt_ctr32             4627    EXIST::FUNCTION:
+CRYPTO_gcm128_release                   4628    EXIST::FUNCTION:
+CRYPTO_ccm128_decrypt_ccm64             4629    EXIST::FUNCTION:
+CRYPTO_ccm128_encrypt                   4630    EXIST::FUNCTION:
+CRYPTO_gcm128_encrypt                   4631    EXIST::FUNCTION:
+CRYPTO_xts128_encrypt                   4632    EXIST::FUNCTION:
+EVP_rc4_hmac_md5                        4633    EXIST::FUNCTION:MD5,RC4
+CRYPTO_nistcts128_decrypt_block         4634    EXIST::FUNCTION:
+CRYPTO_gcm128_setiv                     4635    EXIST::FUNCTION:
+CRYPTO_nistcts128_encrypt               4636    EXIST::FUNCTION:
+EVP_aes_128_cbc_hmac_sha1               4637    EXIST::FUNCTION:AES,SHA,SHA1
+CRYPTO_gcm128_tag                       4638    EXIST::FUNCTION:
+CRYPTO_ccm128_encrypt_ccm64             4639    EXIST::FUNCTION:
+ENGINE_load_rdrand                      4640    EXIST::FUNCTION:ENGINE
+CRYPTO_ccm128_setiv                     4641    EXIST::FUNCTION:
+CRYPTO_nistcts128_encrypt_block         4642    EXIST::FUNCTION:
+CRYPTO_gcm128_aad                       4643    EXIST::FUNCTION:
+CRYPTO_ccm128_init                      4644    EXIST::FUNCTION:
+CRYPTO_nistcts128_decrypt               4645    EXIST::FUNCTION:
+CRYPTO_gcm128_new                       4646    EXIST::FUNCTION:
+CRYPTO_ccm128_tag                       4647    EXIST::FUNCTION:
+CRYPTO_ccm128_decrypt                   4648    EXIST::FUNCTION:
+CRYPTO_ccm128_aad                       4649    EXIST::FUNCTION:
+CRYPTO_gcm128_init                      4650    EXIST::FUNCTION:
+CRYPTO_gcm128_decrypt                   4651    EXIST::FUNCTION:
+ENGINE_load_rsax                        4652    EXIST::FUNCTION:ENGINE
+CRYPTO_gcm128_decrypt_ctr32             4653    EXIST::FUNCTION:
+CRYPTO_gcm128_encrypt_ctr32             4654    EXIST::FUNCTION:
+CRYPTO_gcm128_finish                    4655    EXIST::FUNCTION:
+EVP_aes_256_cbc_hmac_sha1               4656    EXIST::FUNCTION:AES,SHA,SHA1
+PKCS5_pbkdf2_set                        4657    EXIST::FUNCTION:
+CMS_add0_recipient_password             4658    EXIST::FUNCTION:CMS
+CMS_decrypt_set1_password               4659    EXIST::FUNCTION:CMS
+CMS_RecipientInfo_set0_password         4660    EXIST::FUNCTION:CMS
+RAND_set_fips_drbg_type                 4661    EXIST:OPENSSL_FIPS:FUNCTION:
+X509_REQ_sign_ctx                       4662    EXIST::FUNCTION:EVP
+RSA_PSS_PARAMS_new                      4663    EXIST::FUNCTION:RSA
+X509_CRL_sign_ctx                       4664    EXIST::FUNCTION:EVP
+X509_signature_dump                     4665    EXIST::FUNCTION:EVP
+d2i_RSA_PSS_PARAMS                      4666    EXIST::FUNCTION:RSA
+RSA_PSS_PARAMS_it                       4667    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
+RSA_PSS_PARAMS_it                       4667    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
+RSA_PSS_PARAMS_free                     4668    EXIST::FUNCTION:RSA
+X509_sign_ctx                           4669    EXIST::FUNCTION:EVP
+i2d_RSA_PSS_PARAMS                      4670    EXIST::FUNCTION:RSA
+ASN1_item_sign_ctx                      4671    EXIST::FUNCTION:EVP
+EC_GFp_nistp521_method                  4672    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+EC_GFp_nistp256_method                  4673    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+OPENSSL_stderr                          4674    EXIST::FUNCTION:
+OPENSSL_cpuid_setup                     4675    EXIST::FUNCTION:
+OPENSSL_showfatal                       4676    EXIST::FUNCTION:
+BIO_new_dgram_sctp                      4677    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_msg_waiting              4678    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_wait_for_dry             4679    EXIST::FUNCTION:SCTP
+BIO_s_datagram_sctp                     4680    EXIST::FUNCTION:DGRAM,SCTP
+BIO_dgram_is_sctp                       4681    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_notification_cb          4682    EXIST::FUNCTION:SCTP
diff --git a/src/lib/libcrypto/util/mk1mf.pl b/src/lib/libcrypto/util/mk1mf.pl
index afe8c7326d..72fa089f6b 100644
--- a/src/lib/libcrypto/util/mk1mf.pl
+++ b/src/lib/libcrypto/util/mk1mf.pl
@@ -18,6 +18,8 @@ local $zlib_opt = 0;	# 0 = no zlib, 1 = static, 2 = dynamic
 local $zlib_lib = "";
 local $perl_asm = 0;    # 1 to autobuild asm files from perl scripts
 
+my $ex_l_libs = "";
+
 # Options to import from top level Makefile
 
 my %mf_import = (
@@ -40,7 +42,9 @@ my %mf_import = (
         SHA1_ASM_OBJ   => \$mf_sha_asm,
         RMD160_ASM_OBJ => \$mf_rmd_asm,
         WP_ASM_OBJ     => \$mf_wp_asm,
-        CMLL_ENC       => \$mf_cm_asm
+        CMLL_ENC       => \$mf_cm_asm,
+        BASEADDR       => \$baseaddr,
+        FIPSDIR        => \$fipsdir,
 );
 
 
@@ -104,6 +108,7 @@ and [options] can be one of
         just-ssl                                - remove all non-ssl keys/digest
         no-asm                                  - No x86 asm
         no-krb5                                 - No KRB5
+        no-srp                                  - No SRP
         no-ec                                   - No EC
         no-ecdsa                                - No ECDSA
         no-ecdh                                 - No ECDH
@@ -228,6 +233,8 @@ else
         $cflags.=' -DTERMIO';
         }
 
+$fipsdir =~ s/\//${o}/g;
+
 $out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":"");
 $tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":"");
 $inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;
@@ -261,6 +268,7 @@ $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
 $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
+$cflags.=" -DOPENSSL_NO_SRP" if $no_srp;
 $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
 $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
@@ -270,7 +278,9 @@ $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
 $cflags.=" -DOPENSSL_NO_GOST" if $no_gost;
 $cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
 $cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
+$cflags.=" -DOPENSSL_FIPS"    if $fips;
 $cflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;
+$cflags.=" -DOPENSSL_NO_EC2M"    if $no_ec2m;
 $cflags.= " -DZLIB" if $zlib_opt;
 $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
 
@@ -404,6 +414,11 @@ else
         \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
 EOF
         $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
+        if ($fips)
+                {
+                $build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
+                $ex_l_libs .= " \$(O_FIPSCANISTER)";
+                }
         }
 
 $defs= <<"EOF";
@@ -465,6 +480,18 @@ MKLIB=$bin_dir$mklib
 MLFLAGS=$mlflags
 ASM=$bin_dir$asm
 
+# FIPS validated module and support file locations
+
+FIPSDIR=$fipsdir
+BASEADDR=$baseaddr
+FIPSLIB_D=\$(FIPSDIR)${o}lib
+FIPS_PREMAIN_SRC=\$(FIPSLIB_D)${o}fips_premain.c
+O_FIPSCANISTER=\$(FIPSLIB_D)${o}fipscanister.lib
+FIPS_SHA1_EXE=\$(FIPSDIR)${o}bin${o}fips_standalone_sha1${exep}
+E_PREMAIN_DSO=fips_premain_dso
+PREMAIN_DSO_EXE=\$(BIN_D)${o}fips_premain_dso$exep
+FIPSLINK=\$(PERL) \$(FIPSDIR)${o}bin${o}fipslink.pl
+
 ######################################################
 # You should not need to touch anything below this point
 ######################################################
@@ -497,7 +524,7 @@ SO_CRYPTO= $plib\$(CRYPTO)$so_shlibp
 L_SSL=     \$(LIB_D)$o$plib\$(SSL)$libp
 L_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$libp
 
-L_LIBS= \$(L_SSL) \$(L_CRYPTO)
+L_LIBS= \$(L_SSL) \$(L_CRYPTO) $ex_l_libs
 
 ######################################################
 # Don't touch anything below this point
@@ -513,7 +540,7 @@ LIBS_DEP=\$(O_CRYPTO) \$(O_SSL)
 EOF
 
 $rules=<<"EOF";
-all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe $build_targets
 
 banner:
 $banner
@@ -629,6 +656,16 @@ $rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
 $defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj);
 $rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
 
+# Special case rule for fips_premain_dso
+
+if ($fips)
+        {
+        $rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj",
+                "\$(FIPS_PREMAIN_SRC)",
+                "-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)", "");
+        $rules.=&do_link_rule("\$(PREMAIN_DSO_EXE)","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(CRYPTOOBJ) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1);
+        }
+
 foreach (values %lib_nam)
         {
         $lib_obj=$lib_obj{$_};
@@ -677,7 +714,28 @@ foreach (split(/\s+/,$engines))
 
 
 $rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)");
-$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)");
+
+if ($fips)
+        {
+        if ($shlib)
+                {
+                $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
+                                "\$(O_CRYPTO)", "$crypto",
+                                $shlib, "\$(SO_CRYPTO)", "\$(BASEADDR)");
+                }
+        else
+                {
+                $rules.= &do_lib_rule("\$(CRYPTOOBJ)",
+                        "\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)", "");
+                $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
+                        "\$(LIB_D)$o$crypto_compat",$crypto,$shlib,"\$(SO_CRYPTO)", "");
+                }
+        }
+        else
+        {
+        $rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,
+                                                        "\$(SO_CRYPTO)");
+        }
 
 foreach (split(" ",$otherlibs))
         {
@@ -687,7 +745,7 @@ foreach (split(" ",$otherlibs))
 
         }
 
-$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
+$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)", ($fips && !$shlib) ? 2 : 0);
 
 print $defs;
 
@@ -781,6 +839,8 @@ sub var_add
         @a=grep(!/(^sha1)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;
         @a=grep(!/_mdc2$/,@a) if $no_mdc2;
 
+        @a=grep(!/(srp)/,@a) if $no_srp;
+
         @a=grep(!/^engine$/,@a) if $no_engine;
         @a=grep(!/^hw$/,@a) if $no_hw;
         @a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa;
@@ -939,14 +999,15 @@ sub Sasm_compile_target
 
 sub cc_compile_target
         {
-        local($target,$source,$ex_flags)=@_;
+        local($target,$source,$ex_flags, $srcd)=@_;
         local($ret);
         
         $ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);
         $target =~ s/\//$o/g if $o ne "/";
         $source =~ s/\//$o/g if $o ne "/";
-        $ret ="$target: \$(SRC_D)$o$source\n\t";
-        $ret.="\$(CC) ${ofile}$target $ex_flags -c \$(SRC_D)$o$source\n\n";
+        $srcd = "\$(SRC_D)$o" unless defined $srcd;
+        $ret ="$target: $srcd$source\n\t";
+        $ret.="\$(CC) ${ofile}$target $ex_flags -c $srcd$source\n\n";
         return($ret);
         }
 
@@ -1056,8 +1117,11 @@ sub read_options
                 "no-ssl2" => \$no_ssl2,
                 "no-ssl3" => \$no_ssl3,
                 "no-tlsext" => \$no_tlsext,
+                "no-srp" => \$no_srp,
                 "no-cms" => \$no_cms,
+                "no-ec2m" => \$no_ec2m,
                 "no-jpake" => \$no_jpake,
+                "no-ec_nistp_64_gcc_128" => 0,
                 "no-err" => \$no_err,
                 "no-sock" => \$no_sock,
                 "no-krb5" => \$no_krb5,
@@ -1067,11 +1131,12 @@ sub read_options
                 "no-gost" => \$no_gost,
                 "no-engine" => \$no_engine,
                 "no-hw" => \$no_hw,
+                "no-rsax" => 0,
                 "just-ssl" =>
                         [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,
                           \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh,
                           \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5,
-                          \$no_aes, \$no_camellia, \$no_seed],
+                          \$no_aes, \$no_camellia, \$no_seed, \$no_srp],
                 "rsaref" => 0,
                 "gcc" => \$gcc,
                 "debug" => \$debug,
@@ -1079,6 +1144,7 @@ sub read_options
                 "shlib" => \$shlib,
                 "dll" => \$shlib,
                 "shared" => 0,
+                "no-sctp" => 0,
                 "no-gmp" => 0,
                 "no-rfc3779" => 0,
                 "no-montasm" => 0,
@@ -1086,6 +1152,7 @@ sub read_options
                 "no-store" => 0,
                 "no-zlib" => 0,
                 "no-zlib-dynamic" => 0,
+                "fips" => \$fips
                 );
 
         if (exists $valid_options{$_})
diff --git a/src/lib/libcrypto/util/mkdef.pl b/src/lib/libcrypto/util/mkdef.pl
index ab47329097..9a8c7b87d1 100644
--- a/src/lib/libcrypto/util/mkdef.pl
+++ b/src/lib/libcrypto/util/mkdef.pl
@@ -79,13 +79,15 @@ my $OS2=0;
 my $safe_stack_def = 0;
 
 my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
-                        "EXPORT_VAR_AS_FUNCTION", "ZLIB" );
+                        "EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS" );
 my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
                          "SHA256", "SHA512", "RIPEMD",
-                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA",
+                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M",
                          "HMAC", "AES", "CAMELLIA", "SEED", "GOST",
+                         # EC_NISTP_64_GCC_128
+                         "EC_NISTP_64_GCC_128",
                          # Envelope "algorithms"
                          "EVP", "X509", "ASN1_TYPEDEFS",
                          # Helper "algorithms"
@@ -98,7 +100,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          # RFC3779
                          "RFC3779",
                          # TLS
-                         "TLSEXT", "PSK",
+                         "TLSEXT", "PSK", "SRP", "HEARTBEATS",
                          # CMS
                          "CMS",
                          # CryptoAPI Engine
@@ -107,8 +109,14 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          "SSL2",
                          # JPAKE
                          "JPAKE",
+                         # NEXTPROTONEG
+                         "NEXTPROTONEG",
                          # Deprecated functions
-                         "DEPRECATED" );
+                         "DEPRECATED",
+                         # Hide SSL internals
+                         "SSL_INTERN",
+                         # SCTP
+                         "SCTP");
 
 my $options="";
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -127,7 +135,10 @@ my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
 my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
 my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
-my $no_jpake; my $no_ssl2;
+my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; 
+my $no_nextprotoneg; my $no_sctp;
+
+my $fips;
 
 my $zlib;
 
@@ -151,6 +162,7 @@ foreach (@ARGV, split(/ /, $options))
         }
         $VMS=1 if $_ eq "VMS";
         $OS2=1 if $_ eq "OS2";
+        $fips=1 if /^fips/;
         if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic"
                          || $_ eq "enable-zlib-dynamic") {
                 $zlib = 1;
@@ -215,9 +227,14 @@ foreach (@ARGV, split(/ /, $options))
         elsif (/^no-rfc3779$/)  { $no_rfc3779=1; }
         elsif (/^no-tlsext$/)   { $no_tlsext=1; }
         elsif (/^no-cms$/)      { $no_cms=1; }
+        elsif (/^no-ec2m$/)     { $no_ec2m=1; }
+        elsif (/^no-ec_nistp_64_gcc_128$/)      { $no_nistp_gcc=1; }
+        elsif (/^no-nextprotoneg$/)     { $no_nextprotoneg=1; }
         elsif (/^no-ssl2$/)     { $no_ssl2=1; }
         elsif (/^no-capieng$/)  { $no_capieng=1; }
         elsif (/^no-jpake$/)    { $no_jpake=1; }
+        elsif (/^no-srp$/)      { $no_srp=1; }
+        elsif (/^no-sctp$/)     { $no_sctp=1; }
         }
 
 
@@ -254,8 +271,10 @@ $max_crypto = $max_num;
 my $ssl="ssl/ssl.h";
 $ssl.=" ssl/kssl.h";
 $ssl.=" ssl/tls1.h";
+$ssl.=" ssl/srtp.h";
 
 my $crypto ="crypto/crypto.h";
+$crypto.=" crypto/cryptlib.h";
 $crypto.=" crypto/o_dir.h";
 $crypto.=" crypto/o_str.h";
 $crypto.=" crypto/o_time.h";
@@ -285,6 +304,7 @@ $crypto.=" crypto/ec/ec.h" ; # unless $no_ec;
 $crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa;
 $crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh;
 $crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac;
+$crypto.=" crypto/cmac/cmac.h" ; # unless $no_hmac;
 
 $crypto.=" crypto/engine/engine.h"; # unless $no_engine;
 $crypto.=" crypto/stack/stack.h" ; # unless $no_stack;
@@ -319,6 +339,7 @@ $crypto.=" crypto/pqueue/pqueue.h";
 $crypto.=" crypto/cms/cms.h";
 $crypto.=" crypto/jpake/jpake.h";
 $crypto.=" crypto/modes/modes.h";
+$crypto.=" crypto/srp/srp.h";
 
 my $symhacks="crypto/symhacks.h";
 
@@ -1126,6 +1147,9 @@ sub is_valid
                         if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) {
                                 return 1;
                         }
+                        if ($keyword eq "OPENSSL_FIPS" && $fips) {
+                                return 1;
+                        }
                         if ($keyword eq "ZLIB" && $zlib) { return 1; }
                         return 0;
                 } else {
@@ -1172,9 +1196,15 @@ sub is_valid
                         if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
                         if ($keyword eq "PSK" && $no_psk) { return 0; }
                         if ($keyword eq "CMS" && $no_cms) { return 0; }
+                        if ($keyword eq "EC2M" && $no_ec2m) { return 0; }
+                        if ($keyword eq "NEXTPROTONEG" && $no_nextprotoneg) { return 0; }
+                        if ($keyword eq "EC_NISTP_64_GCC_128" && $no_nistp_gcc)
+                                        { return 0; }
                         if ($keyword eq "SSL2" && $no_ssl2) { return 0; }
                         if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }
                         if ($keyword eq "JPAKE" && $no_jpake) { return 0; }
+                        if ($keyword eq "SRP" && $no_srp) { return 0; }
+                        if ($keyword eq "SCTP" && $no_sctp) { return 0; }
                         if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
 
                         # Nothing recognise as true
diff --git a/src/lib/libcrypto/util/mkfiles.pl b/src/lib/libcrypto/util/mkfiles.pl
index 6d15831450..7d9a9d5e5c 100644
--- a/src/lib/libcrypto/util/mkfiles.pl
+++ b/src/lib/libcrypto/util/mkfiles.pl
@@ -15,6 +15,7 @@ my @dirs = (
 "crypto/sha",
 "crypto/mdc2",
 "crypto/hmac",
+"crypto/cmac",
 "crypto/ripemd",
 "crypto/des",
 "crypto/rc2",
@@ -62,6 +63,7 @@ my @dirs = (
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
+"crypto/srp",
 "ssl",
 "apps",
 "engines",
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl
index 5f25fc41bf..c503bd52b9 100644
--- a/src/lib/libcrypto/util/pl/VC-32.pl
+++ b/src/lib/libcrypto/util/pl/VC-32.pl
@@ -6,6 +6,16 @@
 $ssl=   "ssleay32";
 $crypto="libeay32";
 
+if ($fips && !$shlib)
+        {
+        $crypto="libeayfips32";
+        $crypto_compat = "libeaycompat32.lib";
+        }
+else
+        {
+        $crypto="libeay32";
+        }
+
 $o='\\';
 $cp='$(PERL) util/copy.pl';
 $mkdir='$(PERL) util/mkdir-p.pl';
@@ -33,7 +43,7 @@ if ($FLAVOR =~ /WIN64/)
     # considered safe to ignore.
     # 
     $base_cflags= " $mf_cflag";
-    my $f = $shlib?' /MD':' /MT';
+    my $f = $shlib || $fips ?' /MD':' /MT';
     $lib_cflag='/Zl' if (!$shlib);      # remove /DEFAULTLIBs from static lib
     $opt_cflags=$f.' /Ox';
     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
@@ -114,7 +124,7 @@ elsif ($FLAVOR =~ /CE/)
 else    # Win32
     {
     $base_cflags= " $mf_cflag";
-    my $f = $shlib?' /MD':' /MT';
+    my $f = $shlib || $fips ?' /MD':' /MT';
     $lib_cflag='/Zl' if (!$shlib);      # remove /DEFAULTLIBs from static lib
     $opt_cflags=$f.' /Ox /O2 /Ob2';
     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
@@ -266,10 +276,19 @@ elsif ($shlib && $FLAVOR =~ /CE/)
 
 sub do_lib_rule
         {
-        local($objs,$target,$name,$shlib)=@_;
+        my($objs,$target,$name,$shlib,$ign,$base_addr) = @_;
         local($ret);
 
         $taget =~ s/\//$o/g if $o ne '/';
+        my $base_arg;
+        if ($base_addr ne "")
+                {
+                $base_arg= " /base:$base_addr";
+                }
+        else
+                {
+                $base_arg = "";
+                }
         if ($name ne "")
                 {
                 $name =~ tr/a-z/A-Z/;
@@ -277,17 +296,37 @@ sub do_lib_rule
                 }
 
 #       $target="\$(LIB_D)$o$target";
-        $ret.="$target: $objs\n";
+#       $ret.="$target: $objs\n";
         if (!$shlib)
                 {
 #               $ret.="\t\$(RM) \$(O_$Name)\n";
+                $ret.="$target: $objs\n";
                 $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs\n<<\n";
                 }
         else
                 {
                 local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)';
                 $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
-                $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n";
+
+                if ($fips && $target =~ /O_CRYPTO/)
+                        {
+                        $ret.="$target: $objs \$(PREMAIN_DSO_EXE)";
+                        $ret.="\n\tSET FIPS_LINK=\$(LINK)\n";
+                        $ret.="\tSET FIPS_CC=\$(CC)\n";
+                        $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
+                        $ret.="\tSET PREMAIN_DSO_EXE=\$(PREMAIN_DSO_EXE)\n";
+                        $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
+                        $ret.="\tSET FIPS_TARGET=$target\n";
+                        $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
+                        $ret.="\t\$(FIPSLINK) \$(MLFLAGS) /map $base_arg $efile$target ";
+                        $ret.="$name @<<\n  \$(SHLIB_EX_OBJ) $objs \$(EX_LIBS) ";
+                        $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n";
+                        }
+                else
+                        {
+                        $ret.="$target: $objs";
+                        $ret.="\n\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n";
+                        }
                 $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n";
                 }
         $ret.="\n";
@@ -296,15 +335,35 @@ sub do_lib_rule
 
 sub do_link_rule
         {
-        local($target,$files,$dep_libs,$libs)=@_;
+        my($target,$files,$dep_libs,$libs,$standalone)=@_;
         local($ret,$_);
-        
         $file =~ s/\//$o/g if $o ne '/';
         $n=&bname($targer);
         $ret.="$target: $files $dep_libs\n";
-        $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
-        $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
-        $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
+        if ($standalone == 1)
+                {
+                $ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";
+                $ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
+                $ret.="$files $libs\n<<\n";
+                }
+        elsif ($standalone == 2)
+                {
+                $ret.="\tSET FIPS_LINK=\$(LINK)\n";
+                $ret.="\tSET FIPS_CC=\$(CC)\n";
+                $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
+                $ret.="\tSET PREMAIN_DSO_EXE=\n";
+                $ret.="\tSET FIPS_TARGET=$target\n";
+                $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
+                $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
+                $ret.="\t\$(FIPSLINK) \$(LFLAGS) /map $efile$target @<<\n";
+                $ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";
+                }
+        else
+                {
+                $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
+                $ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n";
+                }
+        $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
         return($ret);
         }
 
diff --git a/src/lib/libcrypto/util/ssleay.num b/src/lib/libcrypto/util/ssleay.num
index 15a58e7b13..37655bc40a 100644
--- a/src/lib/libcrypto/util/ssleay.num
+++ b/src/lib/libcrypto/util/ssleay.num
@@ -259,3 +259,64 @@ SSL_set_session_secret_cb               307	EXIST::FUNCTION:
 SSL_set_session_ticket_ext_cb           308     EXIST::FUNCTION:
 SSL_set1_param                          309     EXIST::FUNCTION:
 SSL_CTX_set1_param                      310     EXIST::FUNCTION:
+SSL_tls1_key_exporter                   311     NOEXIST::FUNCTION:
+SSL_renegotiate_abbreviated             312     EXIST::FUNCTION:
+TLSv1_1_method                          313     EXIST::FUNCTION:
+TLSv1_1_client_method                   314     EXIST::FUNCTION:
+TLSv1_1_server_method                   315     EXIST::FUNCTION:
+SSL_CTX_set_srp_client_pwd_callback     316     EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_client_pwd_cb           316     EXIST:VMS:FUNCTION:SRP
+SSL_get_srp_g                           317     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_username_callback       318     EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_un_cb                   318     EXIST:VMS:FUNCTION:SRP
+SSL_get_srp_userinfo                    319     EXIST::FUNCTION:SRP
+SSL_set_srp_server_param                320     EXIST::FUNCTION:SRP
+SSL_set_srp_server_param_pw             321     EXIST::FUNCTION:SRP
+SSL_get_srp_N                           322     EXIST::FUNCTION:SRP
+SSL_get_srp_username                    323     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_password                324     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_strength                325     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_verify_param_callback   326     EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_vfy_param_cb            326     EXIST:VMS:FUNCTION:SRP
+SSL_CTX_set_srp_miss_srp_un_cb          327     NOEXIST::FUNCTION:
+SSL_CTX_set_srp_missing_srp_username_callback 327       NOEXIST::FUNCTION:
+SSL_CTX_set_srp_cb_arg                  328     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_username                329     EXIST::FUNCTION:SRP
+SSL_CTX_SRP_CTX_init                    330     EXIST::FUNCTION:SRP
+SSL_SRP_CTX_init                        331     EXIST::FUNCTION:SRP
+SRP_Calc_A_param                        332     EXIST::FUNCTION:SRP
+SRP_generate_server_master_secret       333     EXIST:!VMS:FUNCTION:SRP
+SRP_gen_server_master_secret            333     EXIST:VMS:FUNCTION:SRP
+SSL_CTX_SRP_CTX_free                    334     EXIST::FUNCTION:SRP
+SRP_generate_client_master_secret       335     EXIST:!VMS:FUNCTION:SRP
+SRP_gen_client_master_secret            335     EXIST:VMS:FUNCTION:SRP
+SSL_srp_server_param_with_username      336     EXIST:!VMS:FUNCTION:SRP
+SSL_srp_server_param_with_un            336     EXIST:VMS:FUNCTION:SRP
+SRP_have_to_put_srp_username            337     NOEXIST::FUNCTION:
+SSL_SRP_CTX_free                        338     EXIST::FUNCTION:SRP
+SSL_set_debug                           339     EXIST::FUNCTION:
+SSL_SESSION_get0_peer                   340     EXIST::FUNCTION:
+TLSv1_2_client_method                   341     EXIST::FUNCTION:
+SSL_SESSION_set1_id_context             342     EXIST::FUNCTION:
+TLSv1_2_server_method                   343     EXIST::FUNCTION:
+SSL_cache_hit                           344     EXIST::FUNCTION:
+SSL_get0_kssl_ctx                       345     EXIST::FUNCTION:KRB5
+SSL_set0_kssl_ctx                       346     EXIST::FUNCTION:KRB5
+SSL_SESSION_get0_id                     347     NOEXIST::FUNCTION:
+SSL_set_state                           348     EXIST::FUNCTION:
+SSL_CIPHER_get_id                       349     EXIST::FUNCTION:
+TLSv1_2_method                          350     EXIST::FUNCTION:
+SSL_SESSION_get_id_len                  351     NOEXIST::FUNCTION:
+kssl_ctx_get0_client_princ              352     EXIST::FUNCTION:KRB5
+SSL_export_keying_material              353     EXIST::FUNCTION:TLSEXT
+SSL_set_tlsext_use_srtp                 354     EXIST::FUNCTION:
+SSL_CTX_set_next_protos_advertised_cb   355     EXIST:!VMS:FUNCTION:NEXTPROTONEG
+SSL_CTX_set_next_protos_adv_cb          355     EXIST:VMS:FUNCTION:NEXTPROTONEG
+SSL_get0_next_proto_negotiated          356     EXIST::FUNCTION:NEXTPROTONEG
+SSL_get_selected_srtp_profile           357     EXIST::FUNCTION:
+SSL_CTX_set_tlsext_use_srtp             358     EXIST::FUNCTION:
+SSL_select_next_proto                   359     EXIST::FUNCTION:NEXTPROTONEG
+SSL_get_srtp_profiles                   360     EXIST::FUNCTION:
+SSL_CTX_set_next_proto_select_cb        361     EXIST:!VMS:FUNCTION:NEXTPROTONEG
+SSL_CTX_set_next_proto_sel_cb           361     EXIST:VMS:FUNCTION:NEXTPROTONEG
+SSL_SESSION_get_compress_id             362     EXIST::FUNCTION:
diff --git a/src/lib/libssl/src/CHANGES b/src/lib/libssl/src/CHANGES
index 03e744a049..7013e4c12c 100644
--- a/src/lib/libssl/src/CHANGES
+++ b/src/lib/libssl/src/CHANGES
@@ -2,6 +2,387 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.1b and 1.0.1c [10 May 2012]
+
+  *) Sanity check record length before skipping explicit IV in TLS
+     1.2, 1.1 and DTLS to fix DoS attack.
+
+     Thanks to Codenomicon for discovering this issue using Fuzz-o-Matic
+     fuzzing as a service testing platform.
+     (CVE-2012-2333)
+     [Steve Henson]
+
+  *) Initialise tkeylen properly when encrypting CMS messages.
+     Thanks to Solar Designer of Openwall for reporting this issue.
+     [Steve Henson]
+
+  *) In FIPS mode don't try to use composite ciphers as they are not
+     approved.
+     [Steve Henson]
+
+ Changes between 1.0.1a and 1.0.1b [26 Apr 2012]
+
+  *) OpenSSL 1.0.0 sets SSL_OP_ALL to 0x80000FFFL and OpenSSL 1.0.1 and
+     1.0.1a set SSL_OP_NO_TLSv1_1 to 0x00000400L which would unfortunately
+     mean any application compiled against OpenSSL 1.0.0 headers setting
+     SSL_OP_ALL would also set SSL_OP_NO_TLSv1_1, unintentionally disablng
+     TLS 1.1 also. Fix this by changing the value of SSL_OP_NO_TLSv1_1 to
+     0x10000000L Any application which was previously compiled against
+     OpenSSL 1.0.1 or 1.0.1a headers and which cares about SSL_OP_NO_TLSv1_1
+     will need to be recompiled as a result. Letting be results in
+     inability to disable specifically TLS 1.1 and in client context,
+     in unlike event, limit maximum offered version to TLS 1.0 [see below].
+     [Steve Henson]
+
+  *) In order to ensure interoperabilty SSL_OP_NO_protocolX does not
+     disable just protocol X, but all protocols above X *if* there are
+     protocols *below* X still enabled. In more practical terms it means
+     that if application wants to disable TLS1.0 in favor of TLS1.1 and
+     above, it's not sufficient to pass SSL_OP_NO_TLSv1, one has to pass
+     SSL_OP_NO_TLSv1|SSL_OP_NO_SSLv3|SSL_OP_NO_SSLv2. This applies to
+     client side.
+     [Andy Polyakov]
+
+ Changes between 1.0.1 and 1.0.1a [19 Apr 2012]
+
+  *) Check for potentially exploitable overflows in asn1_d2i_read_bio
+     BUF_mem_grow and BUF_mem_grow_clean. Refuse attempts to shrink buffer
+     in CRYPTO_realloc_clean.
+
+     Thanks to Tavis Ormandy, Google Security Team, for discovering this
+     issue and to Adam Langley <agl@chromium.org> for fixing it.
+     (CVE-2012-2110)
+     [Adam Langley (Google), Tavis Ormandy, Google Security Team]
+
+  *) Don't allow TLS 1.2 SHA-256 ciphersuites in TLS 1.0, 1.1 connections.
+     [Adam Langley]
+
+  *) Workarounds for some broken servers that "hang" if a client hello
+     record length exceeds 255 bytes.
+
+     1. Do not use record version number > TLS 1.0 in initial client
+        hello: some (but not all) hanging servers will now work.
+     2. If we set OPENSSL_MAX_TLS1_2_CIPHER_LENGTH this will truncate
+        the number of ciphers sent in the client hello. This should be
+        set to an even number, such as 50, for example by passing:
+        -DOPENSSL_MAX_TLS1_2_CIPHER_LENGTH=50 to config or Configure.
+        Most broken servers should now work.
+     3. If all else fails setting OPENSSL_NO_TLS1_2_CLIENT will disable
+        TLS 1.2 client support entirely.
+     [Steve Henson]
+
+  *) Fix SEGV in Vector Permutation AES module observed in OpenSSH.
+     [Andy Polyakov]
+
+ Changes between 1.0.0h and 1.0.1  [14 Mar 2012]
+
+  *) Add compatibility with old MDC2 signatures which use an ASN1 OCTET
+     STRING form instead of a DigestInfo.
+     [Steve Henson]
+
+  *) The format used for MDC2 RSA signatures is inconsistent between EVP
+     and the RSA_sign/RSA_verify functions. This was made more apparent when
+     OpenSSL used RSA_sign/RSA_verify for some RSA signatures in particular
+     those which went through EVP_PKEY_METHOD in 1.0.0 and later. Detect 
+     the correct format in RSA_verify so both forms transparently work.
+     [Steve Henson]
+
+  *) Some servers which support TLS 1.0 can choke if we initially indicate
+     support for TLS 1.2 and later renegotiate using TLS 1.0 in the RSA
+     encrypted premaster secret. As a workaround use the maximum pemitted
+     client version in client hello, this should keep such servers happy
+     and still work with previous versions of OpenSSL.
+     [Steve Henson]
+
+  *) Add support for TLS/DTLS heartbeats.
+     [Robin Seggelmann <seggelmann@fh-muenster.de>]
+
+  *) Add support for SCTP.
+     [Robin Seggelmann <seggelmann@fh-muenster.de>]
+
+  *) Improved PRNG seeding for VOS.
+     [Paul Green <Paul.Green@stratus.com>]
+
+  *) Extensive assembler packs updates, most notably:
+
+        - x86[_64]:     AES-NI, PCLMULQDQ, RDRAND support;
+        - x86[_64]:     SSSE3 support (SHA1, vector-permutation AES);
+        - x86_64:       bit-sliced AES implementation;
+        - ARM:          NEON support, contemporary platforms optimizations;
+        - s390x:        z196 support;
+        - *:            GHASH and GF(2^m) multiplication implementations;
+
+     [Andy Polyakov]
+
+  *) Make TLS-SRP code conformant with RFC 5054 API cleanup
+     (removal of unnecessary code)
+     [Peter Sylvester <peter.sylvester@edelweb.fr>]
+
+  *) Add TLS key material exporter from RFC 5705.
+     [Eric Rescorla]
+
+  *) Add DTLS-SRTP negotiation from RFC 5764.
+     [Eric Rescorla]
+
+  *) Add Next Protocol Negotiation,
+     http://tools.ietf.org/html/draft-agl-tls-nextprotoneg-00. Can be
+     disabled with a no-npn flag to config or Configure. Code donated
+     by Google.
+     [Adam Langley <agl@google.com> and Ben Laurie]
+
+  *) Add optional 64-bit optimized implementations of elliptic curves NIST-P224,
+     NIST-P256, NIST-P521, with constant-time single point multiplication on
+     typical inputs. Compiler support for the nonstandard type __uint128_t is
+     required to use this (present in gcc 4.4 and later, for 64-bit builds).
+     Code made available under Apache License version 2.0.
+
+     Specify "enable-ec_nistp_64_gcc_128" on the Configure (or config) command
+     line to include this in your build of OpenSSL, and run "make depend" (or
+     "make update"). This enables the following EC_METHODs:
+
+         EC_GFp_nistp224_method()
+         EC_GFp_nistp256_method()
+         EC_GFp_nistp521_method()
+
+     EC_GROUP_new_by_curve_name() will automatically use these (while
+     EC_GROUP_new_curve_GFp() currently prefers the more flexible
+     implementations).
+     [Emilia Käsper, Adam Langley, Bodo Moeller (Google)]
+
+  *) Use type ossl_ssize_t instad of ssize_t which isn't available on
+     all platforms. Move ssize_t definition from e_os.h to the public
+     header file e_os2.h as it now appears in public header file cms.h
+     [Steve Henson]
+
+  *) New -sigopt option to the ca, req and x509 utilities. Additional
+     signature parameters can be passed using this option and in
+     particular PSS. 
+     [Steve Henson]
+
+  *) Add RSA PSS signing function. This will generate and set the
+     appropriate AlgorithmIdentifiers for PSS based on those in the
+     corresponding EVP_MD_CTX structure. No application support yet.
+     [Steve Henson]
+
+  *) Support for companion algorithm specific ASN1 signing routines.
+     New function ASN1_item_sign_ctx() signs a pre-initialised
+     EVP_MD_CTX structure and sets AlgorithmIdentifiers based on
+     the appropriate parameters.
+     [Steve Henson]
+
+  *) Add new algorithm specific ASN1 verification initialisation function
+     to EVP_PKEY_ASN1_METHOD: this is not in EVP_PKEY_METHOD since the ASN1
+     handling will be the same no matter what EVP_PKEY_METHOD is used.
+     Add a PSS handler to support verification of PSS signatures: checked
+     against a number of sample certificates.
+     [Steve Henson]
+
+  *) Add signature printing for PSS. Add PSS OIDs.
+     [Steve Henson, Martin Kaiser <lists@kaiser.cx>]
+
+  *) Add algorithm specific signature printing. An individual ASN1 method
+     can now print out signatures instead of the standard hex dump. 
+
+     More complex signatures (e.g. PSS) can print out more meaningful
+     information. Include DSA version that prints out the signature
+     parameters r, s.
+     [Steve Henson]
+
+  *) Password based recipient info support for CMS library: implementing
+     RFC3211.
+     [Steve Henson]
+
+  *) Split password based encryption into PBES2 and PBKDF2 functions. This
+     neatly separates the code into cipher and PBE sections and is required
+     for some algorithms that split PBES2 into separate pieces (such as
+     password based CMS).
+     [Steve Henson]
+
+  *) Session-handling fixes:
+     - Fix handling of connections that are resuming with a session ID,
+       but also support Session Tickets.
+     - Fix a bug that suppressed issuing of a new ticket if the client
+       presented a ticket with an expired session.
+     - Try to set the ticket lifetime hint to something reasonable.
+     - Make tickets shorter by excluding irrelevant information.
+     - On the client side, don't ignore renewed tickets.
+     [Adam Langley, Bodo Moeller (Google)]
+
+  *) Fix PSK session representation.
+     [Bodo Moeller]
+
+  *) Add RC4-MD5 and AESNI-SHA1 "stitched" implementations.
+
+     This work was sponsored by Intel.
+     [Andy Polyakov]
+
+  *) Add GCM support to TLS library. Some custom code is needed to split
+     the IV between the fixed (from PRF) and explicit (from TLS record)
+     portions. This adds all GCM ciphersuites supported by RFC5288 and 
+     RFC5289. Generalise some AES* cipherstrings to inlclude GCM and
+     add a special AESGCM string for GCM only.
+     [Steve Henson]
+
+  *) Expand range of ctrls for AES GCM. Permit setting invocation
+     field on decrypt and retrieval of invocation field only on encrypt.
+     [Steve Henson]
+
+  *) Add HMAC ECC ciphersuites from RFC5289. Include SHA384 PRF support.
+     As required by RFC5289 these ciphersuites cannot be used if for
+     versions of TLS earlier than 1.2.
+     [Steve Henson]
+
+  *) For FIPS capable OpenSSL interpret a NULL default public key method
+     as unset and return the appopriate default but do *not* set the default.
+     This means we can return the appopriate method in applications that
+     swicth between FIPS and non-FIPS modes.
+     [Steve Henson]
+
+  *) Redirect HMAC and CMAC operations to FIPS module in FIPS mode. If an
+     ENGINE is used then we cannot handle that in the FIPS module so we
+     keep original code iff non-FIPS operations are allowed.
+     [Steve Henson]
+
+  *) Add -attime option to openssl utilities.
+     [Peter Eckersley <pde@eff.org>, Ben Laurie and Steve Henson]
+
+  *) Redirect DSA and DH operations to FIPS module in FIPS mode.
+     [Steve Henson]
+
+  *) Redirect ECDSA and ECDH operations to FIPS module in FIPS mode. Also use
+     FIPS EC methods unconditionally for now.
+     [Steve Henson]
+
+  *) New build option no-ec2m to disable characteristic 2 code.
+     [Steve Henson]
+
+  *) Backport libcrypto audit of return value checking from 1.1.0-dev; not
+     all cases can be covered as some introduce binary incompatibilities.
+     [Steve Henson]
+
+  *) Redirect RSA operations to FIPS module including keygen,
+     encrypt, decrypt, sign and verify. Block use of non FIPS RSA methods.
+     [Steve Henson]
+
+  *) Add similar low level API blocking to ciphers.
+     [Steve Henson]
+
+  *) Low level digest APIs are not approved in FIPS mode: any attempt
+     to use these will cause a fatal error. Applications that *really* want
+     to use them can use the private_* version instead.
+     [Steve Henson]
+
+  *) Redirect cipher operations to FIPS module for FIPS builds. 
+     [Steve Henson]
+
+  *) Redirect digest operations to FIPS module for FIPS builds. 
+     [Steve Henson]
+
+  *) Update build system to add "fips" flag which will link in fipscanister.o
+     for static and shared library builds embedding a signature if needed.
+     [Steve Henson]
+
+  *) Output TLS supported curves in preference order instead of numerical
+     order. This is currently hardcoded for the highest order curves first.
+     This should be configurable so applications can judge speed vs strength.
+     [Steve Henson]
+
+  *) Add TLS v1.2 server support for client authentication. 
+     [Steve Henson]
+
+  *) Add support for FIPS mode in ssl library: disable SSLv3, non-FIPS ciphers
+     and enable MD5.
+     [Steve Henson]
+
+  *) Functions FIPS_mode_set() and FIPS_mode() which call the underlying
+     FIPS modules versions.
+     [Steve Henson]
+
+  *) Add TLS v1.2 client side support for client authentication. Keep cache
+     of handshake records longer as we don't know the hash algorithm to use
+     until after the certificate request message is received.
+     [Steve Henson]
+
+  *) Initial TLS v1.2 client support. Add a default signature algorithms
+     extension including all the algorithms we support. Parse new signature
+     format in client key exchange. Relax some ECC signing restrictions for
+     TLS v1.2 as indicated in RFC5246.
+     [Steve Henson]
+
+  *) Add server support for TLS v1.2 signature algorithms extension. Switch
+     to new signature format when needed using client digest preference.
+     All server ciphersuites should now work correctly in TLS v1.2. No client
+     support yet and no support for client certificates.
+     [Steve Henson]
+
+  *) Initial TLS v1.2 support. Add new SHA256 digest to ssl code, switch
+     to SHA256 for PRF when using TLS v1.2 and later. Add new SHA256 based
+     ciphersuites. At present only RSA key exchange ciphersuites work with
+     TLS v1.2. Add new option for TLS v1.2 replacing the old and obsolete
+     SSL_OP_PKCS1_CHECK flags with SSL_OP_NO_TLSv1_2. New TLSv1.2 methods
+     and version checking.
+     [Steve Henson]
+
+  *) New option OPENSSL_NO_SSL_INTERN. If an application can be compiled
+     with this defined it will not be affected by any changes to ssl internal
+     structures. Add several utility functions to allow openssl application
+     to work with OPENSSL_NO_SSL_INTERN defined.
+     [Steve Henson]
+
+  *) Add SRP support.
+     [Tom Wu <tjw@cs.stanford.edu> and Ben Laurie]
+
+  *) Add functions to copy EVP_PKEY_METHOD and retrieve flags and id.
+     [Steve Henson]
+
+  *) Permit abbreviated handshakes when renegotiating using the function
+     SSL_renegotiate_abbreviated().
+     [Robin Seggelmann <seggelmann@fh-muenster.de>]
+
+  *) Add call to ENGINE_register_all_complete() to
+     ENGINE_load_builtin_engines(), so some implementations get used
+     automatically instead of needing explicit application support.
+     [Steve Henson]
+
+  *) Add support for TLS key exporter as described in RFC5705.
+     [Robin Seggelmann <seggelmann@fh-muenster.de>, Steve Henson]
+
+  *) Initial TLSv1.1 support. Since TLSv1.1 is very similar to TLS v1.0 only
+     a few changes are required:
+
+       Add SSL_OP_NO_TLSv1_1 flag.
+       Add TLSv1_1 methods.
+       Update version checking logic to handle version 1.1.
+       Add explicit IV handling (ported from DTLS code).
+       Add command line options to s_client/s_server.
+     [Steve Henson]
+
+ Changes between 1.0.0g and 1.0.0h [12 Mar 2012]
+
+  *) Fix MMA (Bleichenbacher's attack on PKCS #1 v1.5 RSA padding) weakness
+     in CMS and PKCS7 code. When RSA decryption fails use a random key for
+     content decryption and always return the same error. Note: this attack
+     needs on average 2^20 messages so it only affects automated senders. The
+     old behaviour can be reenabled in the CMS code by setting the
+     CMS_DEBUG_DECRYPT flag: this is useful for debugging and testing where
+     an MMA defence is not necessary.
+     Thanks to Ivan Nestlerode <inestlerode@us.ibm.com> for discovering
+     this issue. (CVE-2012-0884)
+     [Steve Henson]
+
+  *) Fix CVE-2011-4619: make sure we really are receiving a 
+     client hello before rejecting multiple SGC restarts. Thanks to
+     Ivan Nestlerode <inestlerode@us.ibm.com> for discovering this bug.
+     [Steve Henson]
+
+ Changes between 1.0.0f and 1.0.0g [18 Jan 2012]
+
+  *) Fix for DTLS DoS issue introduced by fix for CVE-2011-4109.
+     Thanks to Antonio Martin, Enterprise Secure Access Research and
+     Development, Cisco Systems, Inc. for discovering this bug and
+     preparing a fix. (CVE-2012-0050)
+     [Antonio Martin]
+
  Changes between 1.0.0e and 1.0.0f [4 Jan 2012]
 
   *) Nadhem Alfardan and Kenny Paterson have discovered an extension
@@ -22,7 +403,9 @@
      (CVE-2011-4576)
      [Adam Langley (Google)]
 
-  *) Only allow one SGC handshake restart for SSL/TLS. (CVE-2011-4619)
+  *) Only allow one SGC handshake restart for SSL/TLS. Thanks to George
+     Kadianakis <desnacked@gmail.com> for discovering this issue and
+     Adam Langley for preparing the fix. (CVE-2011-4619)
      [Adam Langley (Google)]
 
   *) Check parameters are not NULL in GOST ENGINE. (CVE-2012-0027)
@@ -963,8 +1346,47 @@
 
   *) Change 'Configure' script to enable Camellia by default.
      [NTT]
+
+ Changes between 0.9.8s and 0.9.8t [18 Jan 2012]
+
+  *) Fix for DTLS DoS issue introduced by fix for CVE-2011-4109.
+     Thanks to Antonio Martin, Enterprise Secure Access Research and
+     Development, Cisco Systems, Inc. for discovering this bug and
+     preparing a fix. (CVE-2012-0050)
+     [Antonio Martin]
   
- Changes between 0.9.8r and 0.9.8s [xx XXX xxxx]
+ Changes between 0.9.8r and 0.9.8s [4 Jan 2012]
+
+  *) Nadhem Alfardan and Kenny Paterson have discovered an extension
+     of the Vaudenay padding oracle attack on CBC mode encryption
+     which enables an efficient plaintext recovery attack against
+     the OpenSSL implementation of DTLS. Their attack exploits timing
+     differences arising during decryption processing. A research
+     paper describing this attack can be found at:
+                  http://www.isg.rhul.ac.uk/~kp/dtls.pdf
+     Thanks go to Nadhem Alfardan and Kenny Paterson of the Information
+     Security Group at Royal Holloway, University of London
+     (www.isg.rhul.ac.uk) for discovering this flaw and to Robin Seggelmann
+     <seggelmann@fh-muenster.de> and Michael Tuexen <tuexen@fh-muenster.de>
+     for preparing the fix. (CVE-2011-4108)
+     [Robin Seggelmann, Michael Tuexen]
+
+  *) Stop policy check failure freeing same buffer twice. (CVE-2011-4109)
+     [Ben Laurie, Kasper <ekasper@google.com>]
+
+  *) Clear bytes used for block padding of SSL 3.0 records.
+     (CVE-2011-4576)
+     [Adam Langley (Google)]
+
+  *) Only allow one SGC handshake restart for SSL/TLS. Thanks to George
+     Kadianakis <desnacked@gmail.com> for discovering this issue and
+     Adam Langley for preparing the fix. (CVE-2011-4619)
+     [Adam Langley (Google)]
+ 
+  *) Prevent malformed RFC3779 data triggering an assertion failure.
+     Thanks to Andrew Chi, BBN Technologies, for discovering the flaw
+     and Rob Austein <sra@hactrn.net> for fixing it. (CVE-2011-4577)
+     [Rob Austein <sra@hactrn.net>]
 
   *) Fix ssl_ciph.c set-up race.
      [Adam Langley (Google)]
diff --git a/src/lib/libssl/src/Configure b/src/lib/libssl/src/Configure
index 7941c93f64..cbbf4de8b2 100644
--- a/src/lib/libssl/src/Configure
+++ b/src/lib/libssl/src/Configure
@@ -10,7 +10,7 @@ use strict;
 
 # see INSTALL for instructions.
 
-my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
+my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
 
 # Options:
 #
@@ -56,6 +56,7 @@ my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimenta
 # [no-]zlib     [don't] compile support for zlib compression.
 # zlib-dynamic  Like "zlib", but the zlib library is expected to be a shared
 #               library and will be loaded in run-time by the OpenSSL library.
+# sctp          include SCTP support
 # 386           generate 80386 code
 # no-sse2       disables IA-32 SSE2 code, above option implies no-sse2
 # no-<cipher>   build without specified algorithm (rsa, idea, rc5, ...)
@@ -123,21 +124,24 @@ my $tlib="-lnsl -lsocket";
 my $bits1="THIRTY_TWO_BIT ";
 my $bits2="SIXTY_FOUR_BIT ";
 
-my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes-586.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o";
+my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:des-586.o crypt586.o:aes-586.o vpaes-x86.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o:cmll-x86.o:ghash-x86.o:";
 
 my $x86_elf_asm="$x86_asm:elf";
 
-my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o";
-my $ia64_asm="ia64cpuid.o:bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::void";
-my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::void";
-my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::void";
-my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::::::::void";
-my $mips3_asm=":bn-mips3.o::::::::::::void";
-my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o::aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::void";
-my $armv4_asm=":bn_asm.o armv4-mont.o::aes_cbc.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::void";
-my $ppc32_asm="ppccpuid.o:bn-ppc.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o::::::";
-my $ppc64_asm="ppccpuid.o:bn-ppc.o ppc-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o::::::";
-my $no_asm=":::::::::::::void";
+my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:";
+my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o:::::ghash-ia64.o::void";
+my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void";
+my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";
+my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void";
+my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::";
+my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::";
+my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o s390x-gf2m.o::aes-s390x.o aes-ctr.o aes-xts.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::ghash-s390x.o:";
+my $armv4_asm="armcap.o armv4cpuid.o:bn_asm.o armv4-mont.o armv4-gf2m.o::aes_cbc.o aes-armv4.o:::sha1-armv4-large.o sha256-armv4.o sha512-armv4.o:::::::ghash-armv4.o::void";
+my $parisc11_asm="pariscid.o:bn_asm.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::32";
+my $parisc20_asm="pariscid.o:pa-risc2W.o parisc-mont.o::aes_core.o aes_cbc.o aes-parisc.o:::sha1-parisc.o sha256-parisc.o sha512-parisc.o::rc4-parisc.o:::::ghash-parisc.o::64";
+my $ppc32_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o::::::::";
+my $ppc64_asm="ppccpuid.o ppccap.o:bn-ppc.o ppc-mont.o ppc64-mont.o::aes_core.o aes_cbc.o aes-ppc.o:::sha1-ppc.o sha256-ppc.o sha512-ppc.o::::::::";
+my $no_asm=":::::::::::::::void";
 
 # As for $BSDthreads. Idea is to maintain "collective" set of flags,
 # which would cover all BSD flavors. -pthread applies to them all, 
@@ -148,7 +152,7 @@ my $no_asm=":::::::::::::void";
 # seems to be sufficient?
 my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT";
 
-#config-string  $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
+#config-string  $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $modes_obj : $engines_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags : $multilib
 
 my %table=(
 # File 'TABLE' (created by 'make TABLE') contains the data from this list,
@@ -163,32 +167,34 @@ my %table=(
 # Our development configs
 "purify",       "purify gcc:-g -DPURIFY -Wall::(unknown)::-lsocket -lnsl::::",
 "debug",        "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror::(unknown)::-lefence::::",
-"debug-ben",    "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG_UNUSED -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::bn86-elf.o co86-elf.o",
+"debug-ben",    "gcc:$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe::(unknown):::::",
 "debug-ben-openbsd","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
 "debug-ben-openbsd-debug","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::",
 "debug-ben-debug",      "gcc44:$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O2 -pipe::(unknown)::::::",
+"debug-ben-macos",      "cc:$gcc_devteam_warn -arch i386 -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -O3 -DL_ENDIAN -g3 -pipe::(unknown)::-Wl,-search_paths_first::::",
+"debug-ben-macos-gcc46",        "gcc-mp-4.6:$gcc_devteam_warn -Wconversion -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -O3 -DL_ENDIAN -g3 -pipe::(unknown)::::::",
 "debug-ben-no-opt",     "gcc: -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -DTERMIOS -Wall -g3::(unknown)::::::",
 "debug-ben-strict",     "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown)::::::",
 "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
-"debug-bodo",   "gcc:-DL_ENDIAN -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBIO_PAIR_DEBUG -DPEDANTIC -g -march=i486 -pedantic -Wshadow -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion::-D_REENTRANT:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
+"debug-bodo",   "gcc:$gcc_devteam_warn -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 "debug-ulf", "gcc:-DTERMIOS -DL_ENDIAN -march=i486 -Wall -DBN_DEBUG -DBN_DEBUG_RAND -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -g -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations:::CYGWIN32:::${no_asm}:win32:cygwin-shared:::.dll",
-"debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-steve64", "gcc:$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-steve32", "gcc:$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -g -pipe::-D_REENTRANT::-rdynamic -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-steve-opt", "gcc:$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -g::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-geoff32","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-geoff64","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -DMD32_REG_T=int -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-geoff32","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:BN_LLONG:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-geoff64","gcc:-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes_x86core.o aes_cbc.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o::elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid.o:bn-586.o co-586.o x86-mont.o:des-586.o crypt586.o:aes_x86core.o aes_cbc.o aesni-x86.o:bf-586.o:md5-586.o:sha1-586.o sha256-586.o sha512-586.o:cast-586.o:rc4-586.o:rmd-586.o:rc5-586.o:wp_block.o wp-mmx.o::ghash-x86.o::elf:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-generic32","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-generic64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-linux-x86_64",   "gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"debug-linux-x86_64","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -m64 -DL_ENDIAN -DTERMIO -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 "dist",         "cc:-O::(unknown)::::::",
 
 # Basic configs that should work on any (32 and less bit) box
@@ -214,7 +220,7 @@ my %table=(
 # actually recommend to consider using gcc shared build even with vendor
 # compiler:-)
 #                                               <appro@fy.chalmers.se>
-"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN -DMD32_REG_T=int::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
+"solaris64-x86_64-gcc","gcc:-m64 -O3 -Wall -DL_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:solaris-shared:-fPIC:-m64 -shared -static-libgcc:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/64",
  
 #### Solaris x86 with Sun C setups
 "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -248,16 +254,16 @@ my %table=(
 
 #### IRIX 5.x configs
 # -mips2 flag is added by ./config when appropriate.
-"irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${no_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"irix-cc", "cc:-O2 -use_readonly_const -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR:${no_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"irix-cc", "cc:-O2 -use_readonly_const -DTERMIOS -DB_ENDIAN::(unknown):::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 #### IRIX 6.x configs
 # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke
 # './Configure irix-cc -o32' manually.
-"irix-mips3-gcc","gcc:-mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips3_asm}:dlfcn:irix-shared::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",
-"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_asm}:dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",
+"irix-mips3-gcc","gcc:-mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips64_asm}:n32:dlfcn:irix-shared::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",
+"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips64_asm}:n32:dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",
 # N64 ABI builds.
-"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_asm}:dlfcn:irix-shared::-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_asm}:dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips64_asm}:64:dlfcn:irix-shared::-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips64_asm}:64:dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
 
 #### Unified HP-UX ANSI C configs.
 # Special notes:
@@ -290,17 +296,18 @@ my %table=(
 # Since there is mention of this in shlib/hpux10-cc.sh
 "hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1::pa-risc2.o::::::::::::void:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o::::::::::::void:dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
+"hpux-parisc1_1-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${parisc11_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa1.1",
+"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1:".eval{my $asm=$parisc20_asm;$asm=~s/2W\./2\./;$asm=~s/:64/:32/;$asm}.":dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_32",
+"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o::::::::::::::void:dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
 
 # More attempts at unified 10.X and 11.X targets for HP C compiler.
 #
 # Chris Ruemmler <ruemmler@cup.hp.com>
 # Kevin Steves <ks@hp.se>
 "hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc1_0-cc","cc:+DAportable +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2.o::::::::::::void:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o::::::::::::void:dlfcn:hpux-shared:+Z:+DD64 -b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
+"hpux-parisc1_1-cc","cc:+DA1.1 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${parisc11_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa1.1",
+"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:".eval{my $asm=$parisc20_asm;$asm=~s/2W\./2\./;$asm=~s/:64/:32/;$asm}.":dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_32",
+"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${parisc20_asm}:dlfcn:hpux-shared:+Z:+DD64 -b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/pa20_64",
 
 # HP/UX IA-64 targets
 "hpux-ia64-cc","cc:-Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:+Z:+DD32 -b:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/hpux32",
@@ -351,8 +358,22 @@ my %table=(
 "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-"linux-s390x",  "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+"linux64-s390x",        "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:64:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
+#### So called "highgprs" target for z/Architecture CPUs
+# "Highgprs" is kernel feature first implemented in Linux 2.6.32, see
+# /proc/cpuinfo. The idea is to preserve most significant bits of
+# general purpose registers not only upon 32-bit process context
+# switch, but even on asynchronous signal delivery to such process.
+# This makes it possible to deploy 64-bit instructions even in legacy
+# application context and achieve better [or should we say adequate]
+# performance. The build is binary compatible with linux-generic32,
+# and the idea is to be able to install the resulting libcrypto.so
+# alongside generic one, e.g. as /lib/highgprs/libcrypto.so.x.y, for
+# ldconfig and run-time linker to autodiscover. Unfortunately it
+# doesn't work just yet, because of couple of bugs in glibc
+# sysdeps/s390/dl-procinfo.c affecting ldconfig and ld.so.1...
+"linux32-s390x",        "gcc:-m31 -Wa,-mzarch -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$s390x_asm;$asm=~s/bn\-s390x\.o/bn_asm.o/;$asm}.":31:dlfcn:linux-shared:-fPIC:-m31:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::/highgprs",
 #### SPARC Linux setups
 # Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
 # assisted with debugging of following two configs.
@@ -380,6 +401,11 @@ my %table=(
 "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
 
+# Android: linux-* but without -DTERMIO and pointers to headers and libs.
+"android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
 #### *BSD [do see comment about ${BSDthreads} above!]
 "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-x86",      "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -393,7 +419,7 @@ my %table=(
 # triggered by RIPEMD160 code.
 "BSD-sparc64",  "gcc:-DB_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2 BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "BSD-ia64",     "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"BSD-x86_64",   "gcc:-DL_ENDIAN -DTERMIOS -O3 -DMD32_REG_T=int -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"BSD-x86_64",   "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 "bsdi-elf-gcc",     "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
@@ -490,13 +516,13 @@ my %table=(
 # Visual C targets
 #
 # Win64 targets, WIN64I denotes IA-64 and WIN64A - AMD64
-"VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",
-"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
-"debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ias:win32",
-"debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:x86_64cpuid.o:bn_asm.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:auto:win32",
+"VC-WIN64I","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o ia64-mont.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o::ias:win32",
+"VC-WIN64A","cl:-W3 -Gs0 -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
+"debug-VC-WIN64I","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64I::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:ia64cpuid.o:ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o:::::::ghash-ia64.o::ias:win32",
+"debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT EXPORT_VAR_AS_FN:".eval{my $asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
 # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
 # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
-"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
+"VC-WIN32","cl:-W3 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
 # Unified CE target
 "debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
 "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${no_asm}:win32",
@@ -551,10 +577,12 @@ my %table=(
 "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
 "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 "debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+# iPhoneOS/iOS
+"iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 
 ##### A/UX
 "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
@@ -569,18 +597,21 @@ my %table=(
 "OS2-EMX", "gcc::::::::",
 
 ##### VxWorks for various targets
+"vxworks-ppc60x","ccppc:-D_REENTRANT -mrtp -mhard-float -mstrict-align -fno-implicit-fp -DPPC32_fp60x -O2 -fstrength-reduce -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip:::VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/common:::::",
+"vxworks-ppcgen","ccppc:-D_REENTRANT -mrtp -msoft-float -mstrict-align -O1 -fno-builtin -fno-strict-aliasing -Wall -DCPU=PPC32 -DTOOL_FAMILY=gnu -DTOOL=gnu -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/usr/h/wrn/coreip:::VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/ppc/PPC32/sfcommon:::::",
 "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
 "vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",
 "vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::",
 "vxworks-ppc860","ccppc:-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
-"vxworks-mipsle","ccmips:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -DL_ENDIAN -EL -Wl,-EL -mips2 -mno-branch-likely -G 0 -fno-builtin -msoft-float -DCPU=MIPS32 -DMIPSEL -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r::${no_asm}::::::ranlibmips:",
+"vxworks-simlinux","ccpentium:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK:::VXWORKS:-r::${no_asm}::::::ranlibpentium:",
+"vxworks-mips","ccmips:-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip::-D_REENTRANT:VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon::${mips32_asm}:o32::::::ranlibmips:",
 
 ##### Compaq Non-Stop Kernel (Tandem)
 "tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
 
 # uClinux
-"uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
-"uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:::::::::::::::$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+"uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
+"uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",
 
 );
 
@@ -612,6 +643,8 @@ my $idx_rmd160_obj = $idx++;
 my $idx_rc5_obj = $idx++;
 my $idx_wp_obj = $idx++;
 my $idx_cmll_obj = $idx++;
+my $idx_modes_obj = $idx++;
+my $idx_engines_obj = $idx++;
 my $idx_perlasm_scheme = $idx++;
 my $idx_dso_scheme = $idx++;
 my $idx_shared_target = $idx++;
@@ -628,6 +661,9 @@ my $openssldir="";
 my $exe_ext="";
 my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
 my $cross_compile_prefix="";
+my $fipsdir="/usr/local/ssl/fips-2.0";
+my $fipslibdir="";
+my $baseaddr="0xFB00000";
 my $no_threads=0;
 my $threads=0;
 my $no_shared=0; # but "no-shared" is default
@@ -662,26 +698,34 @@ my $cmll_enc="camellia.o cmll_misc.o cmll_cbc.o";
 my $processor="";
 my $default_ranlib;
 my $perl;
+my $fips=0;
 
+if (exists $ENV{FIPSDIR})
+        {
+        $fipsdir = $ENV{FIPSDIR};
+        $fipsdir =~ s/\/$//;
+        }
 
 # All of the following is disabled by default (RC5 was enabled before 0.9.8):
 
 my %disabled = ( # "what"         => "comment" [or special keyword "experimental"]
+                 "ec_nistp_64_gcc_128" => "default",
                  "gmp"            => "default",
-                 "jpake"          => "experimental",
-                 "md2"            => "default",
-                 "rc5"            => "default",
+                 "jpake"          => "experimental",
+                 "md2"            => "default",
+                 "rc5"            => "default",
                  "rfc3779"        => "default",
-                 "shared"         => "default",
+                 "sctp"       => "default",
+                 "shared"         => "default",
                  "store"          => "experimental",
-                 "zlib"           => "default",
-                 "zlib-dynamic"   => "default"
-               );
+                 "zlib"           => "default",
+                 "zlib-dynamic"   => "default"
+               );
 my @experimental = ();
 
 # This is what $depflags will look like with the above defaults
 # (we need this to see if we should advise the user to run "make depend"):
-my $default_depflags = " -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE";
+my $default_depflags = " -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE";
 
 # Explicit "no-..." options will be collected in %disabled along with the defaults.
 # To remove something from %disabled, use "enable-foo" (unless it's experimental).
@@ -739,6 +783,7 @@ PROCESS_ARGS:
 
                 # rewrite some options in "enable-..." form
                 s /^-?-?shared$/enable-shared/;
+                s /^sctp$/enable-sctp/;
                 s /^threads$/enable-threads/;
                 s /^zlib$/enable-zlib/;
                 s /^zlib-dynamic$/enable-zlib-dynamic/;
@@ -808,6 +853,10 @@ PROCESS_ARGS:
                         }
                 elsif (/^386$/)
                         { $processor=386; }
+                elsif (/^fips$/)
+                        {
+                        $fips=1;
+                        }
                 elsif (/^rsaref$/)
                         {
                         # No RSAref support any more since it's not needed.
@@ -822,6 +871,7 @@ PROCESS_ARGS:
                                 }
                         elsif (/^-[^-]/ or /^\+/)
                                 {
+                                $_ =~ s/%([0-9a-f]{1,2})/chr(hex($1))/gei;
                                 $flags.=$_." ";
                                 }
                         elsif (/^--prefix=(.*)$/)
@@ -852,6 +902,18 @@ PROCESS_ARGS:
                                 {
                                 $withargs{"zlib-include"}="-I$1";
                                 }
+                        elsif (/^--with-fipsdir=(.*)$/)
+                                {
+                                $fipsdir="$1";
+                                }
+                        elsif (/^--with-fipslibdir=(.*)$/)
+                                {
+                                $fipslibdir="$1";
+                                }
+                        elsif (/^--with-baseaddr=(.*)$/)
+                                {
+                                $baseaddr="$1";
+                                }
                         elsif (/^--cross-compile-prefix=(.*)$/)
                                 {
                                 $cross_compile_prefix=$1;
@@ -926,6 +988,17 @@ if (defined($disabled{"md5"}) || defined($disabled{"rsa"}))
         $disabled{"ssl2"} = "forced";
         }
 
+if ($fips && $fipslibdir eq "")
+        {
+        $fipslibdir = $fipsdir . "/lib/";
+        }
+
+# RSAX ENGINE sets default non-FIPS RSA method.
+if ($fips)
+        {
+        $disabled{"rsax"} = "forced";
+        }
+
 # SSL 3.0 and TLS requires MD5 and SHA and either RSA or DSA+DH
 if (defined($disabled{"md5"}) || defined($disabled{"sha"})
     || (defined($disabled{"rsa"})
@@ -946,6 +1019,13 @@ if (defined($disabled{"ec"}) || defined($disabled{"dsa"})
         $disabled{"gost"} = "forced";
         }
 
+# SRP and HEARTBEATS require TLSEXT
+if (defined($disabled{"tlsext"}))
+        {
+        $disabled{"srp"} = "forced";
+        $disabled{"heartbeats"} = "forced";
+        }
+
 if ($target eq "TABLE") {
         foreach $target (sort keys %table) {
                 print_table_entry($target);
@@ -995,7 +1075,7 @@ foreach (sort (keys %disabled))
         else
                 {
                 my ($ALGO, $algo);
-                ($ALGO = $algo = $_) =~ tr/[a-z]/[A-Z]/;
+                ($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
 
                 if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/)
                         {
@@ -1015,6 +1095,8 @@ foreach (sort (keys %disabled))
                         else
                                 {
                                 push @skip, $algo;
+                                # fix-up crypto/directory name(s)
+                                @skip[$#skip]="whrlpool" if $algo eq "whirlpool";
                                 print " (skip dir)";
 
                                 $depflags .= " -DOPENSSL_NO_$ALGO";
@@ -1085,6 +1167,8 @@ my $rmd160_obj = $fields[$idx_rmd160_obj];
 my $rc5_obj = $fields[$idx_rc5_obj];
 my $wp_obj = $fields[$idx_wp_obj];
 my $cmll_obj = $fields[$idx_cmll_obj];
+my $modes_obj = $fields[$idx_modes_obj];
+my $engines_obj = $fields[$idx_engines_obj];
 my $perlasm_scheme = $fields[$idx_perlasm_scheme];
 my $dso_scheme = $fields[$idx_dso_scheme];
 my $shared_target = $fields[$idx_shared_target];
@@ -1245,7 +1329,7 @@ if ($no_asm)
         {
         $cpuid_obj=$bn_obj=
         $des_obj=$aes_obj=$bf_obj=$cast_obj=$rc4_obj=$rc5_obj=$cmll_obj=
-        $sha1_obj=$md5_obj=$rmd160_obj=$wp_obj="";
+        $modes_obj=$sha1_obj=$md5_obj=$rmd160_obj=$wp_obj=$engines_obj="";
         }
 
 if (!$no_shared)
@@ -1309,7 +1393,7 @@ if (!$IsMK1MF)
                 }
         }
 
-$cpuid_obj.=" uplink.o uplink-cof.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
+$cpuid_obj.=" uplink.o uplink-x86.o" if ($cflags =~ /\-DOPENSSL_USE_APPLINK/);
 
 #
 # Platform fix-ups
@@ -1377,6 +1461,14 @@ $cflags.=" -DOPENSSL_BN_ASM_PART_WORDS" if ($bn_obj =~ /bn-586/);
 $cflags.=" -DOPENSSL_IA32_SSE2" if (!$no_sse2 && $bn_obj =~ /86/);
 
 $cflags.=" -DOPENSSL_BN_ASM_MONT" if ($bn_obj =~ /-mont/);
+$cflags.=" -DOPENSSL_BN_ASM_MONT5" if ($bn_obj =~ /-mont5/);
+$cflags.=" -DOPENSSL_BN_ASM_GF2m" if ($bn_obj =~ /-gf2m/);
+
+if ($fips)
+        {
+        $openssl_other_defines.="#define OPENSSL_FIPS\n";
+        $cflags .= " -I\$(FIPSDIR)/include";
+        }
 
 $cpuid_obj="mem_clr.o"  unless ($cpuid_obj =~ /\.o$/);
 $des_obj=$des_enc       unless ($des_obj =~ /\.o$/);
@@ -1410,12 +1502,20 @@ if ($rmd160_obj =~ /\.o$/)
 if ($aes_obj =~ /\.o$/)
         {
         $cflags.=" -DAES_ASM";
+        # aes-ctr.o is not a real file, only indication that assembler
+        # module implements AES_ctr32_encrypt...
+        $cflags.=" -DAES_CTR_ASM" if ($aes_obj =~ s/\s*aes\-ctr\.o//);
+        # aes-xts.o indicates presense of AES_xts_[en|de]crypt...
+        $cflags.=" -DAES_XTS_ASM" if ($aes_obj =~ s/\s*aes\-xts\.o//);
+        $aes_obj =~ s/\s*(vpaes|aesni)\-x86\.o//g if ($no_sse2);
+        $cflags.=" -DVPAES_ASM" if ($aes_obj =~ m/vpaes/);
+        $cflags.=" -DBSAES_ASM" if ($aes_obj =~ m/bsaes/);
         }
 else    {
         $aes_obj=$aes_enc;
         }
 $wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386");
-if ($wp_obj =~ /\.o$/)
+if ($wp_obj =~ /\.o$/ && !$disabled{"whirlpool"})
         {
         $cflags.=" -DWHIRLPOOL_ASM";
         }
@@ -1423,6 +1523,10 @@ else	{
         $wp_obj="wp_block.o";
         }
 $cmll_obj=$cmll_enc     unless ($cmll_obj =~ /.o$/);
+if ($modes_obj =~ /ghash/)
+        {
+        $cflags.=" -DGHASH_ASM";
+        }
 
 # "Stringify" the C flags string.  This permits it to be made part of a string
 # and works as well on command lines.
@@ -1537,6 +1641,8 @@ while (<IN>)
         s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/;
         s/^WP_ASM_OBJ=.*$/WP_ASM_OBJ= $wp_obj/;
         s/^CMLL_ENC=.*$/CMLL_ENC= $cmll_obj/;
+        s/^MODES_ASM_OBJ.=*$/MODES_ASM_OBJ= $modes_obj/;
+        s/^ENGINES_ASM_OBJ.=*$/ENGINES_ASM_OBJ= $engines_obj/;
         s/^PERLASM_SCHEME=.*$/PERLASM_SCHEME= $perlasm_scheme/;
         s/^PROCESSOR=.*/PROCESSOR= $processor/;
         s/^ARFLAGS=.*/ARFLAGS= $arflags/;
@@ -1545,6 +1651,12 @@ while (<IN>)
         s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
         s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
         s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
+
+        s/^FIPSDIR=.*/FIPSDIR=$fipsdir/;
+        s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/;
+        s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/ if $fips;
+        s/^BASEADDR=.*/BASEADDR=$baseaddr/;
+
         s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
         s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
         s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
@@ -1588,7 +1700,9 @@ print "RC5_ENC       =$rc5_obj\n";
 print "MD5_OBJ_ASM   =$md5_obj\n";
 print "SHA1_OBJ_ASM  =$sha1_obj\n";
 print "RMD160_OBJ_ASM=$rmd160_obj\n";
-print "CMLL_ENC=     =$cmll_obj\n";
+print "CMLL_ENC      =$cmll_obj\n";
+print "MODES_OBJ     =$modes_obj\n";
+print "ENGINES_OBJ   =$engines_obj\n";
 print "PROCESSOR     =$processor\n";
 print "RANLIB        =$ranlib\n";
 print "ARFLAGS       =$arflags\n";
@@ -1981,7 +2095,8 @@ sub print_table_entry
         (my $cc,my $cflags,my $unistd,my $thread_cflag,my $sys_id,my $lflags,
         my $bn_ops,my $cpuid_obj,my $bn_obj,my $des_obj,my $aes_obj, my $bf_obj,
         my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj,
-        my $rc5_obj,my $wp_obj,my $cmll_obj,my $perlasm_scheme,my $dso_scheme,my $shared_target,my $shared_cflag,
+        my $rc5_obj,my $wp_obj,my $cmll_obj,my $modes_obj, my $engines_obj,
+        my $perlasm_scheme,my $dso_scheme,my $shared_target,my $shared_cflag,
         my $shared_ldflag,my $shared_extension,my $ranlib,my $arflags,my $multilib)=
         split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
                         
@@ -2008,6 +2123,8 @@ sub print_table_entry
 \$rc5_obj      = $rc5_obj
 \$wp_obj       = $wp_obj
 \$cmll_obj     = $cmll_obj
+\$modes_obj    = $modes_obj
+\$engines_obj  = $engines_obj
 \$perlasm_scheme = $perlasm_scheme
 \$dso_scheme   = $dso_scheme
 \$shared_target= $shared_target
diff --git a/src/lib/libssl/src/FAQ b/src/lib/libssl/src/FAQ
index 3b07cd363d..bb6f7e2d29 100644
--- a/src/lib/libssl/src/FAQ
+++ b/src/lib/libssl/src/FAQ
@@ -10,6 +10,7 @@ OpenSSL  -  Frequently Asked Questions
 * Why aren't tools like 'autoconf' and 'libtool' used?
 * What is an 'engine' version?
 * How do I check the authenticity of the OpenSSL distribution?
+* How does the versioning scheme work?
 
 [LEGAL] Legal questions
 
@@ -82,7 +83,7 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 1.0.0f was released on Jan 4th, 2012.
+OpenSSL 1.0.1c was released on May 10th, 2012.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
@@ -108,7 +109,9 @@ In addition, you can read the most current versions at
 <URL: http://www.openssl.org/docs/>. Note that the online documents refer
 to the very latest development versions of OpenSSL and may include features
 not present in released versions. If in doubt refer to the documentation
-that came with the version of OpenSSL you are using.
+that came with the version of OpenSSL you are using. The pod format
+documentation is included in each OpenSSL distribution under the docs
+directory.
 
 For information on parts of libcrypto that are not yet documented, you
 might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's
@@ -173,6 +176,19 @@ just do:
 
    pgp TARBALL.asc
 
+* How does the versioning scheme work?
+
+After the release of OpenSSL 1.0.0 the versioning scheme changed. Letter 
+releases (e.g. 1.0.1a) can only contain bug and security fixes and no
+new features. Minor releases change the last number (e.g. 1.0.2) and 
+can contain new features that retain binary compatibility. Changes to
+the middle number are considered major releases and neither source nor
+binary compatibility is guaranteed.
+
+Therefore the answer to the common question "when will feature X be
+backported to OpenSSL 1.0.0/0.9.8?" is "never" but it could appear
+in the next minor release.
+
 [LEGAL] =======================================================================
 
 * Do I need patent licenses to use OpenSSL?
@@ -284,7 +300,7 @@ current directory in this case, but this has changed with 0.9.6a.)
 Check out the CA.pl(1) manual page. This provides a simple wrapper round
 the 'req', 'verify', 'ca' and 'pkcs12' utilities. For finer control check
 out the manual pages for the individual utilities and the certificate
-extensions documentation (currently in doc/openssl.txt).
+extensions documentation (in ca(1), req(1), x509v3_config(5) )
 
 
 * Why can't I create certificate requests?
diff --git a/src/lib/libssl/src/Makefile b/src/lib/libssl/src/Makefile
index 8fe888587e..d5db11b417 100644
--- a/src/lib/libssl/src/Makefile
+++ b/src/lib/libssl/src/Makefile
@@ -4,16 +4,16 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=1.0.0f
+VERSION=1.0.1c
 MAJOR=1
-MINOR=0.0
+MINOR=0.1
 SHLIB_VERSION_NUMBER=1.0.0
 SHLIB_VERSION_HISTORY=
 SHLIB_MAJOR=1
 SHLIB_MINOR=0.0
 SHLIB_EXT=
 PLATFORM=dist
-OPTIONS= no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-shared no-store no-zlib no-zlib-dynamic static-engine
+OPTIONS= no-ec_nistp_64_gcc_128 no-gmp no-jpake no-krb5 no-md2 no-rc5 no-rfc3779 no-sctp no-shared no-store no-zlib no-zlib-dynamic static-engine
 CONFIGURE_ARGS=dist
 SHLIB_TARGET=
 
@@ -61,7 +61,7 @@ OPENSSLDIR=/usr/local/ssl
 
 CC= cc
 CFLAG= -O
-DEPFLAG= -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE
+DEPFLAG= -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MD2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_SCTP -DOPENSSL_NO_STORE
 PEX_LIBS= 
 EX_LIBS= 
 EXE_EXT= 
@@ -101,6 +101,8 @@ SHA1_ASM_OBJ=
 RMD160_ASM_OBJ= 
 WP_ASM_OBJ= wp_block.o
 CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o
+MODES_ASM_OBJ= 
+ENGINES_ASM_OBJ= 
 PERLASM_SCHEME= 
 
 # KRB5 stuff
@@ -111,6 +113,30 @@ LIBKRB5=
 ZLIB_INCLUDE=
 LIBZLIB=
 
+# TOP level FIPS install directory.
+FIPSDIR=/usr/local/ssl/fips-2.0
+
+# This is the location of fipscanister.o and friends.
+# The FIPS module build will place it $(INSTALLTOP)/lib
+# but since $(INSTALLTOP) can only take the default value
+# when the module is built it will be in /usr/local/ssl/lib
+# $(INSTALLTOP) for this build may be different so hard
+# code the path.
+
+FIPSLIBDIR=
+
+# The location of the library which contains fipscanister.o
+# normally it will be libcrypto unless fipsdso is set in which
+# case it will be libfips. If not compiling in FIPS mode at all
+# this is empty making it a useful test for a FIPS compile.
+
+FIPSCANLIB=
+
+# Shared library base address. Currently only used on Windows.
+#
+
+BASEADDR=0xFB00000
+
 DIRS=   crypto ssl engines apps test tools
 ENGDIRS= ccgost
 SHLIBDIRS= crypto ssl
@@ -123,7 +149,7 @@ SDIRS=  \
         bn ec rsa dsa ecdsa dh ecdh dso engine \
         buffer bio stack lhash rand err \
         evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-        cms pqueue ts
+        cms pqueue ts srp cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -174,7 +200,7 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
                 $${EXHEADER+EXHEADER} $${HEADER+HEADER}         \
                 $${GENERAL+GENERAL} $${CFLAGS+CFLAGS}           \
                 $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}           \
-                $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS}             \
+                $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \
                 $${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}     \
                 $${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 
@@ -206,7 +232,12 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
                 MD5_ASM_OBJ='$(MD5_ASM_OBJ)'                    \
                 RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'              \
                 WP_ASM_OBJ='$(WP_ASM_OBJ)'                      \
+                MODES_ASM_OBJ='$(MODES_ASM_OBJ)'                \
+                ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)'            \
                 PERLASM_SCHEME='$(PERLASM_SCHEME)'              \
+                FIPSLIBDIR='${FIPSLIBDIR}'                      \
+                FIPSDIR='${FIPSDIR}'                            \
+                FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}"      \
                 THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
 # MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
 # which in turn eliminates ambiguities in variable treatment with -e.
@@ -260,9 +291,20 @@ all_testapps: build_libs build_testapps
 build_testapps:
         @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-libcrypto$(SHLIB_EXT): libcrypto.a
+fips_premain_dso$(EXE_EXT): libcrypto.a
+        [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
+                -DFINGERPRINT_PREMAIN_DSO_LOAD -o $@  \
+                $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
+                libcrypto.a $(EX_LIBS)
+
+libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
         @if [ "$(SHLIB_TARGET)" != "" ]; then \
-                $(MAKE) SHLIBDIRS=crypto build-shared; \
+                if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+                        FIPSLD_LIBCRYPTO=libcrypto.a ; \
+                        FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
+                        export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
+                fi; \
+                $(MAKE) -e SHLIBDIRS=crypto build-shared; \
         else \
                 echo "There's no support for shared libraries on this platform" >&2; \
                 exit 1; \
@@ -324,7 +366,8 @@ libcrypto.pc: Makefile
             echo 'Description: OpenSSL cryptography library'; \
             echo 'Version: '$(VERSION); \
             echo 'Requires: '; \
-            echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
+            echo 'Libs: -L$${libdir} -lcrypto'; \
+            echo 'Libs.private: $(EX_LIBS)'; \
             echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
 
 libssl.pc: Makefile
@@ -337,7 +380,8 @@ libssl.pc: Makefile
             echo 'Description: Secure Sockets Layer and cryptography libraries'; \
             echo 'Version: '$(VERSION); \
             echo 'Requires: '; \
-            echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+            echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+            echo 'Libs.private: $(EX_LIBS)'; \
             echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
 
 openssl.pc: Makefile
@@ -350,7 +394,8 @@ openssl.pc: Makefile
             echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
             echo 'Version: '$(VERSION); \
             echo 'Requires: '; \
-            echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+            echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+            echo 'Libs.private: $(EX_LIBS)'; \
             echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
 
 Makefile: Makefile.org Configure config
@@ -359,7 +404,7 @@ Makefile: Makefile.org Configure config
         @false
 
 libclean:
-        rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
+        rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib
 
 clean:  libclean
         rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
@@ -426,9 +471,9 @@ tags:
         find . -name '[^.]*.[ch]' | xargs etags -a
 
 errors:
+        $(PERL) util/ck_errf.pl -strict */*.c */*/*.c
         $(PERL) util/mkerr.pl -recurse -write
         (cd engines; $(MAKE) PERL=$(PERL) errors)
-        $(PERL) util/ck_errf.pl */*.c */*/*.c
 
 stacks:
         $(PERL) util/mkstack.pl -write
@@ -511,7 +556,7 @@ install_sw:
         chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
         done;
         @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-        @set -e; for i in $(LIBS) ;\
+        @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
         do \
                 if [ -f "$$i" ]; then \
                 (       echo installing $$i; \
diff --git a/src/lib/libssl/src/Makefile.org b/src/lib/libssl/src/Makefile.org
index fb0af7ecc2..55273ea364 100644
--- a/src/lib/libssl/src/Makefile.org
+++ b/src/lib/libssl/src/Makefile.org
@@ -99,6 +99,8 @@ SHA1_ASM_OBJ=
 RMD160_ASM_OBJ= 
 WP_ASM_OBJ=
 CMLL_ENC=
+MODES_ASM_OBJ=
+ENGINES_ASM_OBJ=
 PERLASM_SCHEME=
 
 # KRB5 stuff
@@ -109,6 +111,30 @@ LIBKRB5=
 ZLIB_INCLUDE=
 LIBZLIB=
 
+# TOP level FIPS install directory.
+FIPSDIR=
+
+# This is the location of fipscanister.o and friends.
+# The FIPS module build will place it $(INSTALLTOP)/lib
+# but since $(INSTALLTOP) can only take the default value
+# when the module is built it will be in /usr/local/ssl/lib
+# $(INSTALLTOP) for this build may be different so hard
+# code the path.
+
+FIPSLIBDIR=
+
+# The location of the library which contains fipscanister.o
+# normally it will be libcrypto unless fipsdso is set in which
+# case it will be libfips. If not compiling in FIPS mode at all
+# this is empty making it a useful test for a FIPS compile.
+
+FIPSCANLIB=
+
+# Shared library base address. Currently only used on Windows.
+#
+
+BASEADDR=
+
 DIRS=   crypto ssl engines apps test tools
 ENGDIRS= ccgost
 SHLIBDIRS= crypto ssl
@@ -121,7 +147,7 @@ SDIRS=  \
         bn ec rsa dsa ecdsa dh ecdh dso engine \
         buffer bio stack lhash rand err \
         evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-        cms pqueue ts jpake store
+        cms pqueue ts jpake srp store cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -172,7 +198,7 @@ CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
                 $${EXHEADER+EXHEADER} $${HEADER+HEADER}         \
                 $${GENERAL+GENERAL} $${CFLAGS+CFLAGS}           \
                 $${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}           \
-                $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS}             \
+                $${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS} $${SCRIPTS+SCRIPTS} \
                 $${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}     \
                 $${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
 
@@ -204,7 +230,12 @@ BUILDENV=	PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
                 MD5_ASM_OBJ='$(MD5_ASM_OBJ)'                    \
                 RMD160_ASM_OBJ='$(RMD160_ASM_OBJ)'              \
                 WP_ASM_OBJ='$(WP_ASM_OBJ)'                      \
+                MODES_ASM_OBJ='$(MODES_ASM_OBJ)'                \
+                ENGINES_ASM_OBJ='$(ENGINES_ASM_OBJ)'            \
                 PERLASM_SCHEME='$(PERLASM_SCHEME)'              \
+                FIPSLIBDIR='${FIPSLIBDIR}'                      \
+                FIPSDIR='${FIPSDIR}'                            \
+                FIPSCANLIB="$${FIPSCANLIB:-$(FIPSCANLIB)}"      \
                 THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
 # MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
 # which in turn eliminates ambiguities in variable treatment with -e.
@@ -258,9 +289,20 @@ all_testapps: build_libs build_testapps
 build_testapps:
         @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
-libcrypto$(SHLIB_EXT): libcrypto.a
+fips_premain_dso$(EXE_EXT): libcrypto.a
+        [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
+                -DFINGERPRINT_PREMAIN_DSO_LOAD -o $@  \
+                $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
+                libcrypto.a $(EX_LIBS)
+
+libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
         @if [ "$(SHLIB_TARGET)" != "" ]; then \
-                $(MAKE) SHLIBDIRS=crypto build-shared; \
+                if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+                        FIPSLD_LIBCRYPTO=libcrypto.a ; \
+                        FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
+                        export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
+                fi; \
+                $(MAKE) -e SHLIBDIRS=crypto build-shared; \
         else \
                 echo "There's no support for shared libraries on this platform" >&2; \
                 exit 1; \
@@ -322,7 +364,8 @@ libcrypto.pc: Makefile
             echo 'Description: OpenSSL cryptography library'; \
             echo 'Version: '$(VERSION); \
             echo 'Requires: '; \
-            echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
+            echo 'Libs: -L$${libdir} -lcrypto'; \
+            echo 'Libs.private: $(EX_LIBS)'; \
             echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
 
 libssl.pc: Makefile
@@ -335,7 +378,8 @@ libssl.pc: Makefile
             echo 'Description: Secure Sockets Layer and cryptography libraries'; \
             echo 'Version: '$(VERSION); \
             echo 'Requires: '; \
-            echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+            echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+            echo 'Libs.private: $(EX_LIBS)'; \
             echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
 
 openssl.pc: Makefile
@@ -348,7 +392,8 @@ openssl.pc: Makefile
             echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
             echo 'Version: '$(VERSION); \
             echo 'Requires: '; \
-            echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
+            echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
+            echo 'Libs.private: $(EX_LIBS)'; \
             echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
 
 Makefile: Makefile.org Configure config
@@ -357,7 +402,7 @@ Makefile: Makefile.org Configure config
         @false
 
 libclean:
-        rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
+        rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib
 
 clean:  libclean
         rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
@@ -424,9 +469,9 @@ tags:
         find . -name '[^.]*.[ch]' | xargs etags -a
 
 errors:
+        $(PERL) util/ck_errf.pl -strict */*.c */*/*.c
         $(PERL) util/mkerr.pl -recurse -write
         (cd engines; $(MAKE) PERL=$(PERL) errors)
-        $(PERL) util/ck_errf.pl */*.c */*/*.c
 
 stacks:
         $(PERL) util/mkstack.pl -write
@@ -509,7 +554,7 @@ install_sw:
         chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
         done;
         @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-        @set -e; for i in $(LIBS) ;\
+        @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
         do \
                 if [ -f "$$i" ]; then \
                 (       echo installing $$i; \
diff --git a/src/lib/libssl/src/NEWS b/src/lib/libssl/src/NEWS
index 1fb25c626c..4f069cbd14 100644
--- a/src/lib/libssl/src/NEWS
+++ b/src/lib/libssl/src/NEWS
@@ -5,6 +5,46 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
+  Major changes between OpenSSL 1.0.1b and OpenSSL 1.0.1c:
+
+      o Fix TLS/DTLS record length checking bug CVE-2012-2333
+      o Don't attempt to use non-FIPS composite ciphers in FIPS mode.
+
+  Major changes between OpenSSL 1.0.1a and OpenSSL 1.0.1b:
+
+      o Fix compilation error on non-x86 platforms.
+      o Make FIPS capable OpenSSL ciphers work in non-FIPS mode.
+      o Fix SSL_OP_NO_TLSv1_1 clash with SSL_OP_ALL in OpenSSL 1.0.0
+
+  Major changes between OpenSSL 1.0.1 and OpenSSL 1.0.1a:
+
+      o Fix for ASN1 overflow bug CVE-2012-2110
+      o Workarounds for some servers that hang on long client hellos.
+      o Fix SEGV in AES code.
+
+  Major changes between OpenSSL 1.0.0h and OpenSSL 1.0.1:
+
+      o TLS/DTLS heartbeat support.
+      o SCTP support.
+      o RFC 5705 TLS key material exporter.
+      o RFC 5764 DTLS-SRTP negotiation.
+      o Next Protocol Negotiation.
+      o PSS signatures in certificates, requests and CRLs.
+      o Support for password based recipient info for CMS.
+      o Support TLS v1.2 and TLS v1.1.
+      o Preliminary FIPS capability for unvalidated 2.0 FIPS module.
+      o SRP support.
+
+  Major changes between OpenSSL 1.0.0g and OpenSSL 1.0.0h:
+
+      o Fix for CMS/PKCS#7 MMA CVE-2012-0884
+      o Corrected fix for CVE-2011-4619
+      o Various DTLS fixes.
+
+  Major changes between OpenSSL 1.0.0f and OpenSSL 1.0.0g:
+
+      o Fix for DTLS DoS issue CVE-2012-0050
+
   Major changes between OpenSSL 1.0.0e and OpenSSL 1.0.0f:
 
       o Fix for DTLS plaintext recovery attack CVE-2011-4108
diff --git a/src/lib/libssl/src/README b/src/lib/libssl/src/README
index 50d54d5706..de51583a6f 100644
--- a/src/lib/libssl/src/README
+++ b/src/lib/libssl/src/README
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.0f 4 Jan 2012
+ OpenSSL 1.0.1c 10 May 2012
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/src/lib/libssl/src/apps/Makefile b/src/lib/libssl/src/apps/Makefile
index fa32d2d7e7..95f499e330 100644
--- a/src/lib/libssl/src/apps/Makefile
+++ b/src/lib/libssl/src/apps/Makefile
@@ -39,7 +39,7 @@ E_EXE=	verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
         ca crl rsa rsautl dsa dsaparam ec ecparam \
         x509 genrsa gendsa genpkey s_server s_client speed \
         s_time version pkcs7 cms crl2pkcs7 sess_id ciphers nseq pkcs12 \
-        pkcs8 pkey pkeyparam pkeyutl spkac smime rand engine ocsp prime ts
+        pkcs8 pkey pkeyparam pkeyutl spkac smime rand engine ocsp prime ts srp
 
 PROGS= $(PROGRAM).c
 
@@ -56,7 +56,7 @@ E_OBJ=	verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o er
         x509.o genrsa.o gendsa.o genpkey.o s_server.o s_client.o speed.o \
         s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \
         ciphers.o nseq.o pkcs12.o pkcs8.o pkey.o pkeyparam.o pkeyutl.o \
-        spkac.o smime.o cms.o rand.o engine.o ocsp.o prime.o ts.o
+        spkac.o smime.o cms.o rand.o engine.o ocsp.o prime.o ts.o srp.o
 
 E_SRC=  verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
         pkcs7.c crl2p7.c crl.c \
@@ -64,7 +64,7 @@ E_SRC=	verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.
         x509.c genrsa.c gendsa.c genpkey.c s_server.c s_client.c speed.c \
         s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \
         ciphers.c nseq.c pkcs12.c pkcs8.c pkey.c pkeyparam.c pkeyutl.c \
-        spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c
+        spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c srp.c
 
 SRC=$(E_SRC)
 
@@ -153,6 +153,8 @@ $(EXE): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)
         $(RM) $(EXE)
         shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
                 shlib_target="$(SHLIB_TARGET)"; \
+        elif [ -n "$(FIPSCANLIB)" ]; then \
+          FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
         fi; \
         LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
         $(MAKE) -f $(TOP)/Makefile.shared -e \
@@ -245,13 +247,13 @@ ciphers.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 ciphers.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ciphers.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ciphers.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-ciphers.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ciphers.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ciphers.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ciphers.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ciphers.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-ciphers.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-ciphers.o: ciphers.c
+ciphers.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+ciphers.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ciphers.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ciphers.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ciphers.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+ciphers.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+ciphers.o: ../include/openssl/x509v3.h apps.h ciphers.c
 cms.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 cms.o: ../include/openssl/buffer.h ../include/openssl/cms.h
 cms.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -427,13 +429,13 @@ engine.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 engine.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 engine.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 engine.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-engine.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-engine.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-engine.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-engine.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-engine.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-engine.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-engine.o: engine.c
+engine.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+engine.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+engine.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+engine.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+engine.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+engine.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+engine.o: ../include/openssl/x509v3.h apps.h engine.c
 errstr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 errstr.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 errstr.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -448,13 +450,13 @@ errstr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 errstr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 errstr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 errstr.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-errstr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-errstr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-errstr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-errstr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-errstr.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-errstr.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-errstr.o: errstr.c
+errstr.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+errstr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+errstr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+errstr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+errstr.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+errstr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+errstr.o: ../include/openssl/x509v3.h apps.h errstr.c
 gendh.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 gendh.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 gendh.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -556,12 +558,12 @@ ocsp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 ocsp.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ocsp.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 ocsp.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ocsp.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ocsp.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ocsp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ocsp.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-ocsp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ocsp.o: ../include/openssl/x509v3.h apps.h ocsp.c
+ocsp.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ocsp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ocsp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ocsp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ocsp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+ocsp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h ocsp.c
 openssl.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 openssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 openssl.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -576,13 +578,13 @@ openssl.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 openssl.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 openssl.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 openssl.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-openssl.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-openssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-openssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-openssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-openssl.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-openssl.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-openssl.o: openssl.c progs.h s_apps.h
+openssl.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+openssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+openssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+openssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+openssl.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+openssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+openssl.o: ../include/openssl/x509v3.h apps.h openssl.c progs.h s_apps.h
 passwd.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 passwd.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 passwd.o: ../include/openssl/crypto.h ../include/openssl/des.h
@@ -791,12 +793,13 @@ s_cb.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s_cb.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_cb.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 s_cb.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s_cb.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s_cb.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s_cb.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s_cb.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
-s_cb.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-s_cb.o: ../include/openssl/x509v3.h apps.h s_apps.h s_cb.c
+s_cb.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s_cb.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s_cb.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s_cb.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s_cb.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+s_cb.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
+s_cb.o: s_apps.h s_cb.c
 s_client.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_client.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s_client.o: ../include/openssl/comp.h ../include/openssl/conf.h
@@ -812,7 +815,8 @@ s_client.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 s_client.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_client.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s_client.o: ../include/openssl/rand.h ../include/openssl/safestack.h
-s_client.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+s_client.o: ../include/openssl/sha.h ../include/openssl/srp.h
+s_client.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 s_client.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 s_client.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 s_client.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
@@ -836,6 +840,7 @@ s_server.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s_server.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s_server.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 s_server.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s_server.o: ../include/openssl/srp.h ../include/openssl/srtp.h
 s_server.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 s_server.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 s_server.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -857,13 +862,13 @@ s_socket.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 s_socket.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s_socket.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_socket.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-s_socket.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s_socket.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_socket.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_socket.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s_socket.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-s_socket.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-s_socket.o: s_apps.h s_socket.c
+s_socket.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s_socket.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_socket.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_socket.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s_socket.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+s_socket.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+s_socket.o: ../include/openssl/x509v3.h apps.h s_apps.h s_socket.c
 s_time.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s_time.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s_time.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -878,13 +883,13 @@ s_time.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 s_time.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s_time.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s_time.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-s_time.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s_time.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s_time.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s_time.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s_time.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-s_time.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-s_time.o: s_apps.h s_time.c
+s_time.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s_time.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s_time.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s_time.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s_time.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+s_time.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+s_time.o: ../include/openssl/x509v3.h apps.h s_apps.h s_time.c
 sess_id.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 sess_id.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 sess_id.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -899,13 +904,13 @@ sess_id.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 sess_id.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 sess_id.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 sess_id.o: ../include/openssl/pqueue.h ../include/openssl/safestack.h
-sess_id.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-sess_id.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-sess_id.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-sess_id.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-sess_id.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
-sess_id.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-sess_id.o: sess_id.c
+sess_id.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+sess_id.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+sess_id.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+sess_id.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+sess_id.o: ../include/openssl/tls1.h ../include/openssl/txt_db.h
+sess_id.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+sess_id.o: ../include/openssl/x509v3.h apps.h sess_id.c
 smime.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 smime.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 smime.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -935,19 +940,19 @@ speed.o: ../include/openssl/err.h ../include/openssl/evp.h
 speed.o: ../include/openssl/hmac.h ../include/openssl/idea.h
 speed.o: ../include/openssl/lhash.h ../include/openssl/md4.h
 speed.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
-speed.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-speed.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
-speed.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-speed.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
-speed.o: ../include/openssl/rc2.h ../include/openssl/rc4.h
-speed.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-speed.o: ../include/openssl/safestack.h ../include/openssl/seed.h
-speed.o: ../include/openssl/sha.h ../include/openssl/stack.h
-speed.o: ../include/openssl/symhacks.h ../include/openssl/txt_db.h
-speed.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h
-speed.o: ../include/openssl/whrlpool.h ../include/openssl/x509.h
-speed.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
-speed.o: speed.c testdsa.h testrsa.h
+speed.o: ../include/openssl/modes.h ../include/openssl/obj_mac.h
+speed.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
+speed.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+speed.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
+speed.o: ../include/openssl/rand.h ../include/openssl/rc2.h
+speed.o: ../include/openssl/rc4.h ../include/openssl/ripemd.h
+speed.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+speed.o: ../include/openssl/seed.h ../include/openssl/sha.h
+speed.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+speed.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
+speed.o: ../include/openssl/ui_compat.h ../include/openssl/whrlpool.h
+speed.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+speed.o: ../include/openssl/x509v3.h apps.h speed.c testdsa.h testrsa.h
 spkac.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 spkac.o: ../include/openssl/buffer.h ../include/openssl/conf.h
 spkac.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
@@ -964,6 +969,21 @@ spkac.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
 spkac.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
 spkac.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h
 spkac.o: spkac.c
+srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+srp.o: ../include/openssl/conf.h ../include/openssl/crypto.h
+srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+srp.o: ../include/openssl/engine.h ../include/openssl/err.h
+srp.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+srp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+srp.o: ../include/openssl/ocsp.h ../include/openssl/opensslconf.h
+srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+srp.o: ../include/openssl/pkcs7.h ../include/openssl/safestack.h
+srp.o: ../include/openssl/sha.h ../include/openssl/srp.h
+srp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+srp.o: ../include/openssl/txt_db.h ../include/openssl/x509.h
+srp.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h apps.h srp.c
 ts.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ts.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ts.o: ../include/openssl/conf.h ../include/openssl/crypto.h
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c
index feb7ed46e6..4e11915b02 100644
--- a/src/lib/libssl/src/apps/apps.c
+++ b/src/lib/libssl/src/apps/apps.c
@@ -109,7 +109,7 @@
  *
  */
 
-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
 #define _POSIX_C_SOURCE 2       /* On VMS, you need to define this to get
                                    the declaration of fileno().  The value
                                    2 is to make sure no function defined
@@ -1215,7 +1215,8 @@ STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
         const char *pass, ENGINE *e, const char *desc)
         {
         STACK_OF(X509) *certs;
-        load_certs_crls(err, file, format, pass, e, desc, &certs, NULL);
+        if (!load_certs_crls(err, file, format, pass, e, desc, &certs, NULL))
+                return NULL;
         return certs;
         }       
 
@@ -1223,7 +1224,8 @@ STACK_OF(X509_CRL) *load_crls(BIO *err, const char *file, int format,
         const char *pass, ENGINE *e, const char *desc)
         {
         STACK_OF(X509_CRL) *crls;
-        load_certs_crls(err, file, format, pass, e, desc, NULL, &crls);
+        if (!load_certs_crls(err, file, format, pass, e, desc, NULL, &crls))
+                return NULL;
         return crls;
         }       
 
@@ -2256,6 +2258,7 @@ int args_verify(char ***pargs, int *pargc,
         int purpose = 0, depth = -1;
         char **oldargs = *pargs;
         char *arg = **pargs, *argn = (*pargs)[1];
+        time_t at_time = 0;
         if (!strcmp(arg, "-policy"))
                 {
                 if (!argn)
@@ -2308,6 +2311,27 @@ int args_verify(char ***pargs, int *pargc,
                         }
                 (*pargs)++;
                 }
+        else if (strcmp(arg,"-attime") == 0)
+                {
+                if (!argn)
+                        *badarg = 1;
+                else
+                        {
+                        long timestamp;
+                        /* interpret the -attime argument as seconds since
+                         * Epoch */
+                        if (sscanf(argn, "%li", &timestamp) != 1)
+                                {
+                                BIO_printf(bio_err,
+                                                "Error parsing timestamp %s\n",
+                                                argn);
+                                *badarg = 1;
+                                }
+                        /* on some platforms time_t may be a float */
+                        at_time = (time_t) timestamp;
+                        }
+                (*pargs)++;
+                }
         else if (!strcmp(arg, "-ignore_critical"))
                 flags |= X509_V_FLAG_IGNORE_CRITICAL;
         else if (!strcmp(arg, "-issuer_checks"))
@@ -2362,6 +2386,9 @@ int args_verify(char ***pargs, int *pargc,
         if (depth >= 0)
                 X509_VERIFY_PARAM_set_depth(*pm, depth);
 
+        if (at_time) 
+                X509_VERIFY_PARAM_set_time(*pm, at_time);
+
         end:
 
         (*pargs)++;
@@ -2693,6 +2720,50 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret)
 
 #endif
 
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+/* next_protos_parse parses a comma separated list of strings into a string
+ * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
+ *   outlen: (output) set to the length of the resulting buffer on success.
+ *   err: (maybe NULL) on failure, an error message line is written to this BIO.
+ *   in: a NUL termianted string like "abc,def,ghi"
+ *
+ *   returns: a malloced buffer or NULL on failure.
+ */
+unsigned char *next_protos_parse(unsigned short *outlen, const char *in)
+        {
+        size_t len;
+        unsigned char *out;
+        size_t i, start = 0;
+
+        len = strlen(in);
+        if (len >= 65535)
+                return NULL;
+
+        out = OPENSSL_malloc(strlen(in) + 1);
+        if (!out)
+                return NULL;
+
+        for (i = 0; i <= len; ++i)
+                {
+                if (i == len || in[i] == ',')
+                        {
+                        if (i - start > 255)
+                                {
+                                OPENSSL_free(out);
+                                return NULL;
+                                }
+                        out[start] = i - start;
+                        start = i + 1;
+                        }
+                else
+                        out[i+1] = in[i];
+                }
+
+        *outlen = len + 1;
+        return out;
+        }
+#endif  /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */
+
 /*
  * Platform-specific sections
  */
diff --git a/src/lib/libssl/src/apps/apps.h b/src/lib/libssl/src/apps/apps.h
index 596a39aceb..c1ca99da12 100644
--- a/src/lib/libssl/src/apps/apps.h
+++ b/src/lib/libssl/src/apps/apps.h
@@ -317,6 +317,12 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
 int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);
 int init_gen_str(BIO *err, EVP_PKEY_CTX **pctx,
                         const char *algname, ENGINE *e, int do_param);
+int do_X509_sign(BIO *err, X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
+                        STACK_OF(OPENSSL_STRING) *sigopts);
+int do_X509_REQ_sign(BIO *err, X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
+                        STACK_OF(OPENSSL_STRING) *sigopts);
+int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
+                        STACK_OF(OPENSSL_STRING) *sigopts);
 #ifndef OPENSSL_NO_PSK
 extern char *psk_key;
 #endif
@@ -325,6 +331,10 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret);
 void jpake_server_auth(BIO *out, BIO *conn, const char *secret);
 #endif
 
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+unsigned char *next_protos_parse(unsigned short *outlen, const char *in);
+#endif  /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */
+
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1
 #define FORMAT_TEXT     2
@@ -357,4 +367,7 @@ int raw_write_stdout(const void *,int);
 #define TM_START        0
 #define TM_STOP         1
 double app_tminterval (int stop,int usertime);
+
+#define OPENSSL_NO_SSL_INTERN
+
 #endif
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c
index 6b8b0ef8fd..2a83d1936e 100644
--- a/src/lib/libssl/src/apps/ca.c
+++ b/src/lib/libssl/src/apps/ca.c
@@ -197,26 +197,30 @@ extern int EF_ALIGNMENT;
 
 static void lookup_fail(const char *name, const char *tag);
 static int certify(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
-                   const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,CA_DB *db,
+                   const EVP_MD *dgst,STACK_OF(OPENSSL_STRING) *sigopts,
+                   STACK_OF(CONF_VALUE) *policy,CA_DB *db,
                    BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn, char *startdate,
                    char *enddate, long days, int batch, char *ext_sect, CONF *conf,
                    int verbose, unsigned long certopt, unsigned long nameopt,
                    int default_op, int ext_copy, int selfsign);
 static int certify_cert(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
-                        const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,
+                        const EVP_MD *dgst,STACK_OF(OPENSSL_STRING) *sigopts,
+                        STACK_OF(CONF_VALUE) *policy,
                         CA_DB *db, BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn,
                         char *startdate, char *enddate, long days, int batch,
                         char *ext_sect, CONF *conf,int verbose, unsigned long certopt,
                         unsigned long nameopt, int default_op, int ext_copy,
                         ENGINE *e);
 static int certify_spkac(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
-                         const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,
+                         const EVP_MD *dgst,STACK_OF(OPENSSL_STRING) *sigopts,
+                         STACK_OF(CONF_VALUE) *policy,
                          CA_DB *db, BIGNUM *serial,char *subj,unsigned long chtype, int multirdn, int email_dn,
                          char *startdate, char *enddate, long days, char *ext_sect,
                          CONF *conf, int verbose, unsigned long certopt, 
                          unsigned long nameopt, int default_op, int ext_copy);
 static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
 static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
+        STACK_OF(OPENSSL_STRING) *sigopts,
         STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,char *subj,unsigned long chtype, int multirdn,
         int email_dn, char *startdate, char *enddate, long days, int batch,
         int verbose, X509_REQ *req, char *ext_sect, CONF *conf,
@@ -311,6 +315,7 @@ int MAIN(int argc, char **argv)
         const EVP_MD *dgst=NULL;
         STACK_OF(CONF_VALUE) *attribs=NULL;
         STACK_OF(X509) *cert_sk=NULL;
+        STACK_OF(OPENSSL_STRING) *sigopts = NULL;
 #undef BSIZE
 #define BSIZE 256
         MS_STATIC char buf[3][BSIZE];
@@ -435,6 +440,15 @@ EF_ALIGNMENT=0;
                         if (--argc < 1) goto bad;
                         outdir= *(++argv);
                         }
+                else if (strcmp(*argv,"-sigopt") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        if (!sigopts)
+                                sigopts = sk_OPENSSL_STRING_new_null();
+                        if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
+                                goto bad;
+                        }
                 else if (strcmp(*argv,"-notext") == 0)
                         notext=1;
                 else if (strcmp(*argv,"-batch") == 0)
@@ -1170,8 +1184,9 @@ bad:
                 if (spkac_file != NULL)
                         {
                         total++;
-                        j=certify_spkac(&x,spkac_file,pkey,x509,dgst,attribs,db,
-                                serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,extensions,
+                        j=certify_spkac(&x,spkac_file,pkey,x509,dgst,sigopts,
+                                attribs,db, serial,subj,chtype,multirdn,
+                                email_dn,startdate,enddate,days,extensions,
                                 conf,verbose,certopt,nameopt,default_op,ext_copy);
                         if (j < 0) goto err;
                         if (j > 0)
@@ -1194,7 +1209,8 @@ bad:
                 if (ss_cert_file != NULL)
                         {
                         total++;
-                        j=certify_cert(&x,ss_cert_file,pkey,x509,dgst,attribs,
+                        j=certify_cert(&x,ss_cert_file,pkey,x509,dgst,sigopts,
+                                attribs,
                                 db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
                                 extensions,conf,verbose, certopt, nameopt,
                                 default_op, ext_copy, e);
@@ -1214,7 +1230,7 @@ bad:
                 if (infile != NULL)
                         {
                         total++;
-                        j=certify(&x,infile,pkey,x509p,dgst,attribs,db,
+                        j=certify(&x,infile,pkey,x509p,dgst,sigopts, attribs,db,
                                 serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
                                 extensions,conf,verbose, certopt, nameopt,
                                 default_op, ext_copy, selfsign);
@@ -1234,7 +1250,7 @@ bad:
                 for (i=0; i<argc; i++)
                         {
                         total++;
-                        j=certify(&x,argv[i],pkey,x509p,dgst,attribs,db,
+                        j=certify(&x,argv[i],pkey,x509p,dgst,sigopts,attribs,db,
                                 serial,subj,chtype,multirdn,email_dn,startdate,enddate,days,batch,
                                 extensions,conf,verbose, certopt, nameopt,
                                 default_op, ext_copy, selfsign);
@@ -1483,7 +1499,7 @@ bad:
                         crlnumber = NULL;
                         }
 
-                if (!X509_CRL_sign(crl,pkey,dgst)) goto err;
+                if (!do_X509_CRL_sign(bio_err,crl,pkey,dgst,sigopts)) goto err;
 
                 PEM_write_bio_X509_CRL(Sout,crl);
 
@@ -1537,6 +1553,8 @@ err:
         BN_free(serial);
         BN_free(crlnumber);
         free_index(db);
+        if (sigopts)
+                sk_OPENSSL_STRING_free(sigopts);
         EVP_PKEY_free(pkey);
         if (x509) X509_free(x509);
         X509_CRL_free(crl);
@@ -1553,8 +1571,10 @@ static void lookup_fail(const char *name, const char *tag)
         }
 
 static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
-             const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
-             BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn, char *startdate, char *enddate,
+             const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
+             STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+             BIGNUM *serial, char *subj,unsigned long chtype, int multirdn,
+             int email_dn, char *startdate, char *enddate,
              long days, int batch, char *ext_sect, CONF *lconf, int verbose,
              unsigned long certopt, unsigned long nameopt, int default_op,
              int ext_copy, int selfsign)
@@ -1610,7 +1630,8 @@ static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
         else
                 BIO_printf(bio_err,"Signature ok\n");
 
-        ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,chtype,multirdn, email_dn,
+        ok=do_body(xret,pkey,x509,dgst,sigopts, policy,db,serial,subj,chtype,
+                multirdn, email_dn,
                 startdate,enddate,days,batch,verbose,req,ext_sect,lconf,
                 certopt, nameopt, default_op, ext_copy, selfsign);
 
@@ -1621,7 +1642,8 @@ err:
         }
 
 static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
-             const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+             const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
+             STACK_OF(CONF_VALUE) *policy, CA_DB *db,
              BIGNUM *serial, char *subj, unsigned long chtype, int multirdn, int email_dn, char *startdate, char *enddate,
              long days, int batch, char *ext_sect, CONF *lconf, int verbose,
              unsigned long certopt, unsigned long nameopt, int default_op,
@@ -1664,7 +1686,7 @@ static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
         if ((rreq=X509_to_X509_REQ(req,NULL,EVP_md5())) == NULL)
                 goto err;
 
-        ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,
+        ok=do_body(xret,pkey,x509,dgst,sigopts,policy,db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,
                 days,batch,verbose,rreq,ext_sect,lconf, certopt, nameopt, default_op,
                 ext_copy, 0);
 
@@ -1675,7 +1697,8 @@ err:
         }
 
 static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
-             STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial, char *subj,
+             STACK_OF(OPENSSL_STRING) *sigopts, STACK_OF(CONF_VALUE) *policy,
+             CA_DB *db, BIGNUM *serial, char *subj,
              unsigned long chtype, int multirdn,
              int email_dn, char *startdate, char *enddate, long days, int batch,
              int verbose, X509_REQ *req, char *ext_sect, CONF *lconf,
@@ -2146,7 +2169,7 @@ again2:
                 EVP_PKEY_copy_parameters(pktmp,pkey);
         EVP_PKEY_free(pktmp);
 
-        if (!X509_sign(ret,pkey,dgst))
+        if (!do_X509_sign(bio_err, ret,pkey,dgst, sigopts))
                 goto err;
 
         /* We now just add it to the database */
@@ -2240,7 +2263,8 @@ static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
         }
 
 static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
-             const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
+             const EVP_MD *dgst, STACK_OF(OPENSSL_STRING) *sigopts,
+             STACK_OF(CONF_VALUE) *policy, CA_DB *db,
              BIGNUM *serial, char *subj,unsigned long chtype, int multirdn, int email_dn, char *startdate, char *enddate,
              long days, char *ext_sect, CONF *lconf, int verbose, unsigned long certopt,
              unsigned long nameopt, int default_op, int ext_copy)
@@ -2366,9 +2390,9 @@ static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
 
         X509_REQ_set_pubkey(req,pktmp);
         EVP_PKEY_free(pktmp);
-        ok=do_body(xret,pkey,x509,dgst,policy,db,serial,subj,chtype,multirdn,email_dn,startdate,enddate,
-                   days,1,verbose,req,ext_sect,lconf, certopt, nameopt, default_op,
-                        ext_copy, 0);
+        ok=do_body(xret,pkey,x509,dgst,sigopts,policy,db,serial,subj,chtype,
+                   multirdn,email_dn,startdate,enddate, days,1,verbose,req,
+                   ext_sect,lconf, certopt, nameopt, default_op, ext_copy, 0);
 err:
         if (req != NULL) X509_REQ_free(req);
         if (parms != NULL) CONF_free(parms);
@@ -2536,7 +2560,7 @@ static int get_certificate_status(const char *serial, CA_DB *db)
                         
         /* Make it Upper Case */
         for (i=0; row[DB_serial][i] != '\0'; i++)
-                row[DB_serial][i] = toupper(row[DB_serial][i]);
+                row[DB_serial][i] = toupper((unsigned char)row[DB_serial][i]);
         
 
         ok=1;
diff --git a/src/lib/libssl/src/apps/ciphers.c b/src/lib/libssl/src/apps/ciphers.c
index 3d4c60db9e..5f2b739700 100644
--- a/src/lib/libssl/src/apps/ciphers.c
+++ b/src/lib/libssl/src/apps/ciphers.c
@@ -196,7 +196,7 @@ int MAIN(int argc, char **argv)
                         
                         if (Verbose)
                                 {
-                                unsigned long id = c->id;
+                                unsigned long id = SSL_CIPHER_get_id(c);
                                 int id0 = (int)(id >> 24);
                                 int id1 = (int)((id >> 16) & 0xffL);
                                 int id2 = (int)((id >> 8) & 0xffL);
diff --git a/src/lib/libssl/src/apps/client.pem b/src/lib/libssl/src/apps/client.pem
index 307910e56e..e7a47a73f3 100644
--- a/src/lib/libssl/src/apps/client.pem
+++ b/src/lib/libssl/src/apps/client.pem
@@ -1,24 +1,52 @@
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
-subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Client test cert (512 bit)
+subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Client Cert
+issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA
 -----BEGIN CERTIFICATE-----
-MIIB6TCCAVICAQIwDQYJKoZIhvcNAQEEBQAwWzELMAkGA1UEBhMCQVUxEzARBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYD
-VQQDExJUZXN0IENBICgxMDI0IGJpdCkwHhcNOTcwNjA5MTM1NzU2WhcNOTgwNjA5
-MTM1NzU2WjBjMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDEaMBgG
-A1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxIzAhBgNVBAMTGkNsaWVudCB0ZXN0IGNl
-cnQgKDUxMiBiaXQpMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALtv55QyzG6i2Plw
-Z1pah7++Gv8L5j6Hnyr/uTZE1NLG0ABDDexmq/R4KedLjFEIYjocDui+IXs62NNt
-XrT8odkCAwEAATANBgkqhkiG9w0BAQQFAAOBgQBwtMmI7oGUG8nKmftQssATViH5
-NRRtoEw07DxJp/LfatHdrhqQB73eGdL5WILZJXk46Xz2e9WMSUjVCSYhdKxtflU3
-UR2Ajv1Oo0sTNdfz0wDqJNirLNtzyhhsaq8qMTrLwXrCP31VxBiigFSQSUFnZyTE
-9TKwhS4GlwbtCfxSKQ==
+MIID5zCCAs+gAwIBAgIJALnu1NlVpZ6yMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
+VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt
+ZWRpYXRlIENBMB4XDTExMTIwODE0MDE0OFoXDTIxMTAxNjE0MDE0OFowZDELMAkG
+A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU
+RVNUSU5HIFBVUlBPU0VTIE9OTFkxGTAXBgNVBAMMEFRlc3QgQ2xpZW50IENlcnQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC0ranbHRLcLVqN+0BzcZpY
++yOLqxzDWT1LD9eW1stC4NzXX9/DCtSIVyN7YIHdGLrIPr64IDdXXaMRzgZ2rOKs
+lmHCAiFpO/ja99gGCJRxH0xwQatqAULfJVHeUhs7OEGOZc2nWifjqKvGfNTilP7D
+nwi69ipQFq9oS19FmhwVHk2wg7KZGHI1qDyG04UrfCZMRitvS9+UVhPpIPjuiBi2
+x3/FZIpL5gXJvvFK6xHY63oq2asyzBATntBgnP4qJFWWcvRx24wF1PnZabxuVoL2
+bPnQ/KvONDrw3IdqkKhYNTul7jEcu3OlcZIMw+7DiaKJLAzKb/bBF5gm/pwW6As9
+AgMBAAGjgY8wgYwwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBeAwLAYJYIZI
+AYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW
+BBSZHKyLoTh7Mb409Zn/mK1ceSDAjDAfBgNVHSMEGDAWgBQ2w2yI55X+sL3szj49
+hqshgYfa2jANBgkqhkiG9w0BAQUFAAOCAQEAD0mL7PtPYgCEuDyOQSbLpeND5hVS
+curxQdGnrJ6Acrhodb7E9ccATokeb0PLx6HBLQUicxhTZIQ9FbO43YkQcOU6C3BB
+IlwskqmtN6+VmrQzNolHCDzvxNZs9lYL2VbGPGqVRyjZeHpoAlf9cQr8PgDb4d4b
+vUx2KAhHQvV2nkmYvKyXcgnRuHggumF87mkxidriGAEFwH4qfOqetUg64WyxP7P2
+QLipm04SyQa7ONtIApfVXgHcE42Py4/f4arzCzMjKe3VyhGkS7nsT55X/fWgTaRm
+CQPkO+H94P958WTvQDt77bQ+D3IvYaVvfil8n6HJMOJfFT0LJuSUbpSXJg==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBALtv55QyzG6i2PlwZ1pah7++Gv8L5j6Hnyr/uTZE1NLG0ABDDexm
-q/R4KedLjFEIYjocDui+IXs62NNtXrT8odkCAwEAAQJAbwXq0vJ/+uyEvsNgxLko
-/V86mGXQ/KrSkeKlL0r4ENxjcyeMAGoKu6J9yMY7+X9+Zm4nxShNfTsf/+Freoe1
-HQIhAPOSm5Q1YI+KIsII2GeVJx1U69+wnd71OasIPakS1L1XAiEAxQAW+J3/JWE0
-ftEYakbhUOKL8tD1OaFZS71/5GdG7E8CIQCefUMmySSvwd6kC0VlATSWbW+d+jp/
-nWmM1KvqnAo5uQIhALqEADu5U1Wvt8UN8UDGBRPQulHWNycuNV45d3nnskWPAiAw
-ueTyr6WsZ5+SD8g/Hy3xuvF3nPmJRH+rwvVihlcFOg==
+MIIEpQIBAAKCAQEAtK2p2x0S3C1ajftAc3GaWPsji6scw1k9Sw/XltbLQuDc11/f
+wwrUiFcje2CB3Ri6yD6+uCA3V12jEc4GdqzirJZhwgIhaTv42vfYBgiUcR9McEGr
+agFC3yVR3lIbOzhBjmXNp1on46irxnzU4pT+w58IuvYqUBavaEtfRZocFR5NsIOy
+mRhyNag8htOFK3wmTEYrb0vflFYT6SD47ogYtsd/xWSKS+YFyb7xSusR2Ot6Ktmr
+MswQE57QYJz+KiRVlnL0cduMBdT52Wm8blaC9mz50PyrzjQ68NyHapCoWDU7pe4x
+HLtzpXGSDMPuw4miiSwMym/2wReYJv6cFugLPQIDAQABAoIBAAZOyc9MhIwLSU4L
+p4RgQvM4UVVe8/Id+3XTZ8NsXExJbWxXfIhiqGjaIfL8u4vsgRjcl+v1s/jo2/iT
+KMab4o4D8gXD7UavQVDjtjb/ta79WL3SjRl2Uc9YjjMkyq6WmDNQeo2NKDdafCTB
+1uzSJtLNipB8Z53ELPuHJhxX9QMHrMnuha49riQgXZ7buP9iQrHJFhImBjSzbxJx
+L+TI6rkyLSf9Wi0Pd3L27Ob3QWNfNRYNSeTE+08eSRChkur5W0RuXAcuAICdQlCl
+LBvWO/LmmvbzCqiDcgy/TliSb6CGGwgiNG7LJZmlkYNj8laGwalNlYZs3UrVv6NO
+Br2loAECgYEA2kvCvPGj0Dg/6g7WhXDvAkEbcaL1tSeCxBbNH+6HS2UWMWvyTtCn
+/bbD519QIdkvayy1QjEf32GV/UjUVmlULMLBcDy0DGjtL3+XpIhLKWDNxN1v1/ai
+1oz23ZJCOgnk6K4qtFtlRS1XtynjA+rBetvYvLP9SKeFrnpzCgaA2r0CgYEA0+KX
+1ACXDTNH5ySX3kMjSS9xdINf+OOw4CvPHFwbtc9aqk2HePlEsBTz5I/W3rKwXva3
+NqZ/bRqVVeZB/hHKFywgdUQk2Uc5z/S7Lw70/w1HubNTXGU06Ngb6zOFAo/o/TwZ
+zTP1BMIKSOB6PAZPS3l+aLO4FRIRotfFhgRHOoECgYEAmiZbqt8cJaJDB/5YYDzC
+mp3tSk6gIb936Q6M5VqkMYp9pIKsxhk0N8aDCnTU+kIK6SzWBpr3/d9Ecmqmfyq7
+5SvWO3KyVf0WWK9KH0abhOm2BKm2HBQvI0DB5u8sUx2/hsvOnjPYDISbZ11t0MtK
+u35Zy89yMYcSsIYJjG/ROCUCgYEAgI2P9G5PNxEP5OtMwOsW84Y3Xat/hPAQFlI+
+HES+AzbFGWJkeT8zL2nm95tVkFP1sggZ7Kxjz3w7cpx7GX0NkbWSE9O+T51pNASV
+tN1sQ3p5M+/a+cnlqgfEGJVvc7iAcXQPa3LEi5h2yPR49QYXAgG6cifn3dDSpmwn
+SUI7PQECgYEApGCIIpSRPLAEHTGmP87RBL1smurhwmy2s/pghkvUkWehtxg0sGHh
+kuaqDWcskogv+QC0sVdytiLSz8G0DwcEcsHK1Fkyb8A+ayiw6jWJDo2m9+IF4Fww
+1Te6jFPYDESnbhq7+TLGgHGhtwcu5cnb4vSuYXGXKupZGzoLOBbv1Zw=
 -----END RSA PRIVATE KEY-----
diff --git a/src/lib/libssl/src/apps/dgst.c b/src/lib/libssl/src/apps/dgst.c
index 9bf38ce73b..b08e9a7c78 100644
--- a/src/lib/libssl/src/apps/dgst.c
+++ b/src/lib/libssl/src/apps/dgst.c
@@ -127,6 +127,7 @@ int MAIN(int argc, char **argv)
 #endif
         char *hmac_key=NULL;
         char *mac_name=NULL;
+        int non_fips_allow = 0;
         STACK_OF(OPENSSL_STRING) *sigopts = NULL, *macopts = NULL;
 
         apps_startup();
@@ -215,6 +216,10 @@ int MAIN(int argc, char **argv)
                         out_bin = 1;
                 else if (strcmp(*argv,"-d") == 0)
                         debug=1;
+                else if (strcmp(*argv,"-non-fips-allow") == 0)
+                        non_fips_allow=1;
+                else if (!strcmp(*argv,"-fips-fingerprint"))
+                        hmac_key = "etaonrishdlcupfm";
                 else if (!strcmp(*argv,"-hmac"))
                         {
                         if (--argc < 1)
@@ -395,6 +400,13 @@ int MAIN(int argc, char **argv)
                         goto end;
                 }
 
+        if (non_fips_allow)
+                {
+                EVP_MD_CTX *md_ctx;
+                BIO_get_md_ctx(bmd,&md_ctx);
+                EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+                }
+
         if (hmac_key)
                 {
                 sigkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, e,
diff --git a/src/lib/libssl/src/apps/enc.c b/src/lib/libssl/src/apps/enc.c
index 076225c4cb..719acc3250 100644
--- a/src/lib/libssl/src/apps/enc.c
+++ b/src/lib/libssl/src/apps/enc.c
@@ -129,6 +129,7 @@ int MAIN(int argc, char **argv)
         char *engine = NULL;
 #endif
         const EVP_MD *dgst=NULL;
+        int non_fips_allow = 0;
 
         apps_startup();
 
@@ -281,6 +282,8 @@ int MAIN(int argc, char **argv)
                         if (--argc < 1) goto bad;
                         md= *(++argv);
                         }
+                else if (strcmp(*argv,"-non-fips-allow") == 0)
+                        non_fips_allow = 1;
                 else if ((argv[0][0] == '-') &&
                         ((c=EVP_get_cipherbyname(&(argv[0][1]))) != NULL))
                         {
@@ -589,6 +592,11 @@ bad:
                  */
 
                 BIO_get_cipher_ctx(benc, &ctx);
+
+                if (non_fips_allow)
+                        EVP_CIPHER_CTX_set_flags(ctx,
+                                EVP_CIPH_FLAG_NON_FIPS_ALLOW);
+
                 if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
                         {
                         BIO_printf(bio_err, "Error setting cipher %s\n",
diff --git a/src/lib/libssl/src/apps/makeapps.com b/src/lib/libssl/src/apps/makeapps.com
index 71417a86b0..efc213c8ee 100644
--- a/src/lib/libssl/src/apps/makeapps.com
+++ b/src/lib/libssl/src/apps/makeapps.com
@@ -184,7 +184,7 @@ $ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
                 "X509,GENRSA,GENDSA,GENPKEY,S_SERVER,S_CLIENT,SPEED,"+-
                 "S_TIME,APPS,S_CB,S_SOCKET,APP_RAND,VERSION,SESS_ID,"+-
                 "CIPHERS,NSEQ,PKCS12,PKCS8,PKEY,PKEYPARAM,PKEYUTL,"+ -
-                "SPKAC,SMIME,CMS,RAND,ENGINE,OCSP,PRIME,TS"
+                "SPKAC,SMIME,CMS,RAND,ENGINE,OCSP,PRIME,TS,SRP"
 $!
 $ LIB_OPENSSL = LIB_OPENSSL+ ",VMS_DECC_INIT"
 $!
diff --git a/src/lib/libssl/src/apps/openssl.c b/src/lib/libssl/src/apps/openssl.c
index dab057bbff..1c880d90ba 100644
--- a/src/lib/libssl/src/apps/openssl.c
+++ b/src/lib/libssl/src/apps/openssl.c
@@ -129,6 +129,9 @@
 #include "progs.h"
 #include "s_apps.h"
 #include <openssl/err.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
 /* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
  * base prototypes (we cast each variable inside the function to the required
@@ -310,6 +313,19 @@ int main(int Argc, char *ARGV[])
                 CRYPTO_set_locking_callback(lock_dbg_cb);
                 }
 
+        if(getenv("OPENSSL_FIPS")) {
+#ifdef OPENSSL_FIPS
+                if (!FIPS_mode_set(1)) {
+                        ERR_load_crypto_strings();
+                        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
+                        EXIT(1);
+                }
+#else
+                fprintf(stderr, "FIPS mode not supported.\n");
+                EXIT(1);
+#endif
+                }
+
         apps_startup();
 
         /* Lets load up our environment a little */
diff --git a/src/lib/libssl/src/apps/progs.h b/src/lib/libssl/src/apps/progs.h
index 79e479a337..949e78066b 100644
--- a/src/lib/libssl/src/apps/progs.h
+++ b/src/lib/libssl/src/apps/progs.h
@@ -46,6 +46,7 @@ extern int engine_main(int argc,char *argv[]);
 extern int ocsp_main(int argc,char *argv[]);
 extern int prime_main(int argc,char *argv[]);
 extern int ts_main(int argc,char *argv[]);
+extern int srp_main(int argc,char *argv[]);
 
 #define FUNC_TYPE_GENERAL       1
 #define FUNC_TYPE_MD            2
@@ -147,6 +148,9 @@ FUNCTION functions[] = {
 #endif
         {FUNC_TYPE_GENERAL,"prime",prime_main},
         {FUNC_TYPE_GENERAL,"ts",ts_main},
+#ifndef OPENSSL_NO_SRP
+        {FUNC_TYPE_GENERAL,"srp",srp_main},
+#endif
 #ifndef OPENSSL_NO_MD2
         {FUNC_TYPE_MD,"md2",dgst_main},
 #endif
diff --git a/src/lib/libssl/src/apps/progs.pl b/src/lib/libssl/src/apps/progs.pl
index de6fdeabbd..39ca8f71fb 100644
--- a/src/lib/libssl/src/apps/progs.pl
+++ b/src/lib/libssl/src/apps/progs.pl
@@ -51,6 +51,8 @@ foreach (@ARGV)
                 { print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
         elsif ( ($_ =~ /^ocsp$/))
                 { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
+        elsif ( ($_ =~ /^srp$/))
+                { print "#ifndef OPENSSL_NO_SRP\n${str}#endif\n"; }
         else
                 { print $str; }
         }
diff --git a/src/lib/libssl/src/apps/req.c b/src/lib/libssl/src/apps/req.c
index 820cd18fc7..85526581ce 100644
--- a/src/lib/libssl/src/apps/req.c
+++ b/src/lib/libssl/src/apps/req.c
@@ -165,7 +165,7 @@ int MAIN(int argc, char **argv)
         EVP_PKEY_CTX *genctx = NULL;
         const char *keyalg = NULL;
         char *keyalgstr = NULL;
-        STACK_OF(OPENSSL_STRING) *pkeyopts = NULL;
+        STACK_OF(OPENSSL_STRING) *pkeyopts = NULL, *sigopts = NULL;
         EVP_PKEY *pkey=NULL;
         int i=0,badops=0,newreq=0,verbose=0,pkey_type=-1;
         long newkey = -1;
@@ -310,6 +310,15 @@ int MAIN(int argc, char **argv)
                         if (!pkeyopts || !sk_OPENSSL_STRING_push(pkeyopts, *(++argv)))
                                 goto bad;
                         }
+                else if (strcmp(*argv,"-sigopt") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        if (!sigopts)
+                                sigopts = sk_OPENSSL_STRING_new_null();
+                        if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
+                                goto bad;
+                        }
                 else if (strcmp(*argv,"-batch") == 0)
                         batch=1;
                 else if (strcmp(*argv,"-newhdr") == 0)
@@ -858,8 +867,9 @@ loop:
                                         extensions);
                                 goto end;
                                 }
-                        
-                        if (!(i=X509_sign(x509ss,pkey,digest)))
+
+                        i=do_X509_sign(bio_err, x509ss, pkey, digest, sigopts);
+                        if (!i)
                                 {
                                 ERR_print_errors(bio_err);
                                 goto end;
@@ -883,7 +893,8 @@ loop:
                                         req_exts);
                                 goto end;
                                 }
-                        if (!(i=X509_REQ_sign(req,pkey,digest)))
+                        i=do_X509_REQ_sign(bio_err, req, pkey, digest, sigopts);
+                        if (!i)
                                 {
                                 ERR_print_errors(bio_err);
                                 goto end;
@@ -1084,6 +1095,8 @@ end:
                 EVP_PKEY_CTX_free(genctx);
         if (pkeyopts)
                 sk_OPENSSL_STRING_free(pkeyopts);
+        if (sigopts)
+                sk_OPENSSL_STRING_free(sigopts);
 #ifndef OPENSSL_NO_ENGINE
         if (gen_eng)
                 ENGINE_free(gen_eng);
@@ -1756,3 +1769,68 @@ static int genpkey_cb(EVP_PKEY_CTX *ctx)
 #endif
         return 1;
         }
+
+static int do_sign_init(BIO *err, EVP_MD_CTX *ctx, EVP_PKEY *pkey,
+                        const EVP_MD *md, STACK_OF(OPENSSL_STRING) *sigopts)
+        {
+        EVP_PKEY_CTX *pkctx = NULL;
+        int i;
+        EVP_MD_CTX_init(ctx);
+        if (!EVP_DigestSignInit(ctx, &pkctx, md, NULL, pkey))
+                return 0;
+        for (i = 0; i < sk_OPENSSL_STRING_num(sigopts); i++)
+                {
+                char *sigopt = sk_OPENSSL_STRING_value(sigopts, i);
+                if (pkey_ctrl_string(pkctx, sigopt) <= 0)
+                        {
+                        BIO_printf(err, "parameter error \"%s\"\n", sigopt);
+                        ERR_print_errors(bio_err);
+                        return 0;
+                        }
+                }
+        return 1;
+        }
+
+int do_X509_sign(BIO *err, X509 *x, EVP_PKEY *pkey, const EVP_MD *md,
+                        STACK_OF(OPENSSL_STRING) *sigopts)
+        {
+        int rv;
+        EVP_MD_CTX mctx;
+        EVP_MD_CTX_init(&mctx);
+        rv = do_sign_init(err, &mctx, pkey, md, sigopts);
+        if (rv > 0)
+                rv = X509_sign_ctx(x, &mctx);
+        EVP_MD_CTX_cleanup(&mctx);
+        return rv > 0 ? 1 : 0;
+        }
+
+
+int do_X509_REQ_sign(BIO *err, X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md,
+                        STACK_OF(OPENSSL_STRING) *sigopts)
+        {
+        int rv;
+        EVP_MD_CTX mctx;
+        EVP_MD_CTX_init(&mctx);
+        rv = do_sign_init(err, &mctx, pkey, md, sigopts);
+        if (rv > 0)
+                rv = X509_REQ_sign_ctx(x, &mctx);
+        EVP_MD_CTX_cleanup(&mctx);
+        return rv > 0 ? 1 : 0;
+        }
+                
+        
+
+int do_X509_CRL_sign(BIO *err, X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md,
+                        STACK_OF(OPENSSL_STRING) *sigopts)
+        {
+        int rv;
+        EVP_MD_CTX mctx;
+        EVP_MD_CTX_init(&mctx);
+        rv = do_sign_init(err, &mctx, pkey, md, sigopts);
+        if (rv > 0)
+                rv = X509_CRL_sign_ctx(x, &mctx);
+        EVP_MD_CTX_cleanup(&mctx);
+        return rv > 0 ? 1 : 0;
+        }
+                
+        
diff --git a/src/lib/libssl/src/apps/s_cb.c b/src/lib/libssl/src/apps/s_cb.c
index c4f5512247..2cd73376df 100644
--- a/src/lib/libssl/src/apps/s_cb.c
+++ b/src/lib/libssl/src/apps/s_cb.c
@@ -357,6 +357,12 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
         case TLS1_VERSION:
                 str_version = "TLS 1.0 ";
                 break;
+        case TLS1_1_VERSION:
+                str_version = "TLS 1.1 ";
+                break;
+        case TLS1_2_VERSION:
+                str_version = "TLS 1.2 ";
+                break;
         case DTLS1_VERSION:
                 str_version = "DTLS 1.0 ";
                 break;
@@ -549,6 +555,9 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                                 case 114:
                                         str_details2 = " bad_certificate_hash_value";
                                         break;
+                                case 115:
+                                        str_details2 = " unknown_psk_identity";
+                                        break;
                                         }
                                 }
                         }
@@ -597,6 +606,26 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                                         }
                                 }
                         }
+
+#ifndef OPENSSL_NO_HEARTBEATS
+                if (content_type == 24) /* Heartbeat */
+                        {
+                        str_details1 = ", Heartbeat";
+                        
+                        if (len > 0)
+                                {
+                                switch (((const unsigned char*)buf)[0])
+                                        {
+                                case 1:
+                                        str_details1 = ", HeartbeatRequest";
+                                        break;
+                                case 2:
+                                        str_details1 = ", HeartbeatResponse";
+                                        break;
+                                        }
+                                }
+                        }
+#endif
                 }
 
         BIO_printf(bio, "%s %s%s [length %04lx]%s%s\n", str_write_p, str_version, str_content_type, (unsigned long)len, str_details1, str_details2);
@@ -657,6 +686,22 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
                 extname = "status request";
                 break;
 
+                case TLSEXT_TYPE_user_mapping:
+                extname = "user mapping";
+                break;
+
+                case TLSEXT_TYPE_client_authz:
+                extname = "client authz";
+                break;
+
+                case TLSEXT_TYPE_server_authz:
+                extname = "server authz";
+                break;
+
+                case TLSEXT_TYPE_cert_type:
+                extname = "cert type";
+                break;
+
                 case TLSEXT_TYPE_elliptic_curves:
                 extname = "elliptic curves";
                 break;
@@ -665,12 +710,28 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
                 extname = "EC point formats";
                 break;
 
+                case TLSEXT_TYPE_srp:
+                extname = "SRP";
+                break;
+
+                case TLSEXT_TYPE_signature_algorithms:
+                extname = "signature algorithms";
+                break;
+
+                case TLSEXT_TYPE_use_srtp:
+                extname = "use SRTP";
+                break;
+
+                case TLSEXT_TYPE_heartbeat:
+                extname = "heartbeat";
+                break;
+
                 case TLSEXT_TYPE_session_ticket:
-                extname = "server ticket";
+                extname = "session ticket";
                 break;
 
-                case TLSEXT_TYPE_renegotiate:
-                extname = "renegotiate";
+                case TLSEXT_TYPE_renegotiate: 
+                extname = "renegotiation info";
                 break;
 
 #ifdef TLSEXT_TYPE_opaque_prf_input
@@ -678,6 +739,11 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
                 extname = "opaque PRF input";
                 break;
 #endif
+#ifdef TLSEXT_TYPE_next_proto_neg
+                case TLSEXT_TYPE_next_proto_neg:
+                extname = "next protocol";
+                break;
+#endif
 
                 default:
                 extname = "unknown";
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c
index 34ad2cec78..fc806eb672 100644
--- a/src/lib/libssl/src/apps/s_client.c
+++ b/src/lib/libssl/src/apps/s_client.c
@@ -163,6 +163,9 @@ typedef unsigned int u_int;
 #include <openssl/rand.h>
 #include <openssl/ocsp.h>
 #include <openssl/bn.h>
+#ifndef OPENSSL_NO_SRP
+#include <openssl/srp.h>
+#endif
 #include "s_apps.h"
 #include "timeouts.h"
 
@@ -203,6 +206,9 @@ static int c_status_req=0;
 static int c_msg=0;
 static int c_showcerts=0;
 
+static char *keymatexportlabel=NULL;
+static int keymatexportlen=20;
+
 static void sc_usage(void);
 static void print_stuff(BIO *berr,SSL *con,int full);
 #ifndef OPENSSL_NO_TLSEXT
@@ -316,12 +322,21 @@ static void sc_usage(void)
         BIO_printf(bio_err," -jpake arg    - JPAKE secret to use\n");
 # endif
 #endif
+#ifndef OPENSSL_NO_SRP
+        BIO_printf(bio_err," -srpuser user     - SRP authentification for 'user'\n");
+        BIO_printf(bio_err," -srppass arg      - password for 'user'\n");
+        BIO_printf(bio_err," -srp_lateuser     - SRP username into second ClientHello message\n");
+        BIO_printf(bio_err," -srp_moregroups   - Tolerate other than the known g N values.\n");
+        BIO_printf(bio_err," -srp_strength int - minimal mength in bits for N (default %d).\n",SRP_MINIMAL_N);
+#endif
         BIO_printf(bio_err," -ssl2         - just use SSLv2\n");
         BIO_printf(bio_err," -ssl3         - just use SSLv3\n");
+        BIO_printf(bio_err," -tls1_2       - just use TLSv1.2\n");
+        BIO_printf(bio_err," -tls1_1       - just use TLSv1.1\n");
         BIO_printf(bio_err," -tls1         - just use TLSv1\n");
         BIO_printf(bio_err," -dtls1        - just use DTLSv1\n");    
         BIO_printf(bio_err," -mtu          - set the link layer MTU\n");
-        BIO_printf(bio_err," -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n");
+        BIO_printf(bio_err," -no_tls1_2/-no_tls1_1/-no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n");
         BIO_printf(bio_err," -bugs         - Switch on all SSL implementation bug workarounds\n");
         BIO_printf(bio_err," -serverpref   - Use server's cipher preferences (only SSLv2)\n");
         BIO_printf(bio_err," -cipher       - preferred cipher to use, use the 'openssl ciphers'\n");
@@ -342,8 +357,14 @@ static void sc_usage(void)
         BIO_printf(bio_err," -tlsextdebug      - hex dump of all TLS extensions received\n");
         BIO_printf(bio_err," -status           - request certificate status from server\n");
         BIO_printf(bio_err," -no_ticket        - disable use of RFC4507bis session tickets\n");
+# if !defined(OPENSSL_NO_NEXTPROTONEG)
+        BIO_printf(bio_err," -nextprotoneg arg - enable NPN extension, considering named protocols supported (comma-separated list)\n");
+# endif
 #endif
         BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
+        BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
+        BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
+        BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
         }
 
 #ifndef OPENSSL_NO_TLSEXT
@@ -366,6 +387,156 @@ static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
         
         return SSL_TLSEXT_ERR_OK;
         }
+
+#ifndef OPENSSL_NO_SRP
+
+/* This is a context that we pass to all callbacks */
+typedef struct srp_arg_st
+        {
+        char *srppassin;
+        char *srplogin;
+        int msg;   /* copy from c_msg */
+        int debug; /* copy from c_debug */
+        int amp;   /* allow more groups */
+        int strength /* minimal size for N */ ;
+        } SRP_ARG;
+
+#define SRP_NUMBER_ITERATIONS_FOR_PRIME 64
+
+static int srp_Verify_N_and_g(BIGNUM *N, BIGNUM *g)
+        {
+        BN_CTX *bn_ctx = BN_CTX_new();
+        BIGNUM *p = BN_new();
+        BIGNUM *r = BN_new();
+        int ret =
+                g != NULL && N != NULL && bn_ctx != NULL && BN_is_odd(N) &&
+                BN_is_prime_ex(N, SRP_NUMBER_ITERATIONS_FOR_PRIME, bn_ctx, NULL) &&
+                p != NULL && BN_rshift1(p, N) &&
+
+                /* p = (N-1)/2 */
+                BN_is_prime_ex(p, SRP_NUMBER_ITERATIONS_FOR_PRIME, bn_ctx, NULL) &&
+                r != NULL &&
+
+                /* verify g^((N-1)/2) == -1 (mod N) */
+                BN_mod_exp(r, g, p, N, bn_ctx) &&
+                BN_add_word(r, 1) &&
+                BN_cmp(r, N) == 0;
+
+        if(r)
+                BN_free(r);
+        if(p)
+                BN_free(p);
+        if(bn_ctx)
+                BN_CTX_free(bn_ctx);
+        return ret;
+        }
+
+/* This callback is used here for two purposes:
+   - extended debugging
+   - making some primality tests for unknown groups
+   The callback is only called for a non default group.
+
+   An application does not need the call back at all if
+   only the stanard groups are used.  In real life situations, 
+   client and server already share well known groups, 
+   thus there is no need to verify them. 
+   Furthermore, in case that a server actually proposes a group that
+   is not one of those defined in RFC 5054, it is more appropriate 
+   to add the group to a static list and then compare since 
+   primality tests are rather cpu consuming.
+*/
+
+static int MS_CALLBACK ssl_srp_verify_param_cb(SSL *s, void *arg)
+        {
+        SRP_ARG *srp_arg = (SRP_ARG *)arg;
+        BIGNUM *N = NULL, *g = NULL;
+        if (!(N = SSL_get_srp_N(s)) || !(g = SSL_get_srp_g(s)))
+                return 0;
+        if (srp_arg->debug || srp_arg->msg || srp_arg->amp == 1)
+                {
+                BIO_printf(bio_err, "SRP parameters:\n"); 
+                BIO_printf(bio_err,"\tN="); BN_print(bio_err,N);
+                BIO_printf(bio_err,"\n\tg="); BN_print(bio_err,g);
+                BIO_printf(bio_err,"\n");
+                }
+
+        if (SRP_check_known_gN_param(g,N))
+                return 1;
+
+        if (srp_arg->amp == 1)
+                {
+                if (srp_arg->debug)
+                        BIO_printf(bio_err, "SRP param N and g are not known params, going to check deeper.\n");
+
+/* The srp_moregroups is a real debugging feature.
+   Implementors should rather add the value to the known ones.
+   The minimal size has already been tested.
+*/
+                if (BN_num_bits(g) <= BN_BITS && srp_Verify_N_and_g(N,g))
+                        return 1;
+                }       
+        BIO_printf(bio_err, "SRP param N and g rejected.\n");
+        return 0;
+        }
+
+#define PWD_STRLEN 1024
+
+static char * MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
+        {
+        SRP_ARG *srp_arg = (SRP_ARG *)arg;
+        char *pass = (char *)OPENSSL_malloc(PWD_STRLEN+1);
+        PW_CB_DATA cb_tmp;
+        int l;
+
+        cb_tmp.password = (char *)srp_arg->srppassin;
+        cb_tmp.prompt_info = "SRP user";
+        if ((l = password_callback(pass, PWD_STRLEN, 0, &cb_tmp))<0)
+                {
+                BIO_printf (bio_err, "Can't read Password\n");
+                OPENSSL_free(pass);
+                return NULL;
+                }
+        *(pass+l)= '\0';
+
+        return pass;
+        }
+
+#endif
+        char *srtp_profiles = NULL;
+
+# ifndef OPENSSL_NO_NEXTPROTONEG
+/* This the context that we pass to next_proto_cb */
+typedef struct tlsextnextprotoctx_st {
+        unsigned char *data;
+        unsigned short len;
+        int status;
+} tlsextnextprotoctx;
+
+static tlsextnextprotoctx next_proto;
+
+static int next_proto_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
+        {
+        tlsextnextprotoctx *ctx = arg;
+
+        if (!c_quiet)
+                {
+                /* We can assume that |in| is syntactically valid. */
+                unsigned i;
+                BIO_printf(bio_c_out, "Protocols advertised by server: ");
+                for (i = 0; i < inlen; )
+                        {
+                        if (i)
+                                BIO_write(bio_c_out, ", ", 2);
+                        BIO_write(bio_c_out, &in[i + 1], in[i]);
+                        i += in[i] + 1;
+                        }
+                BIO_write(bio_c_out, "\n", 1);
+                }
+
+        ctx->status = SSL_select_next_proto(out, outlen, in, inlen, ctx->data, ctx->len);
+        return SSL_TLSEXT_ERR_OK;
+        }
+# endif
 #endif
 
 enum
@@ -384,6 +555,9 @@ int MAIN(int argc, char **argv)
         {
         unsigned int off=0, clr=0;
         SSL *con=NULL;
+#ifndef OPENSSL_NO_KRB5
+        KSSL_CTX *kctx;
+#endif
         int s,k,width,state=0;
         char *cbuf=NULL,*sbuf=NULL,*mbuf=NULL;
         int cbuf_len,cbuf_off;
@@ -429,6 +603,9 @@ int MAIN(int argc, char **argv)
         char *servername = NULL; 
         tlsextctx tlsextcbp = 
         {NULL,0};
+# ifndef OPENSSL_NO_NEXTPROTONEG
+        const char *next_proto_neg_in = NULL;
+# endif
 #endif
         char *sess_in = NULL;
         char *sess_out = NULL;
@@ -439,14 +616,13 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_JPAKE
         char *jpake_secret = NULL;
 #endif
+#ifndef OPENSSL_NO_SRP
+        char * srppass = NULL;
+        int srp_lateuser = 0;
+        SRP_ARG srp_arg = {NULL,NULL,0,0,0,1024};
+#endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
         meth=SSLv23_client_method();
-#elif !defined(OPENSSL_NO_SSL3)
-        meth=SSLv3_client_method();
-#elif !defined(OPENSSL_NO_SSL2)
-        meth=SSLv2_client_method();
-#endif
 
         apps_startup();
         c_Pause=0;
@@ -581,13 +757,44 @@ int MAIN(int argc, char **argv)
                         psk_key=*(++argv);
                         for (j = 0; j < strlen(psk_key); j++)
                                 {
-                                if (isxdigit((int)psk_key[j]))
+                                if (isxdigit((unsigned char)psk_key[j]))
                                         continue;
                                 BIO_printf(bio_err,"Not a hex number '%s'\n",*argv);
                                 goto bad;
                                 }
                         }
 #endif
+#ifndef OPENSSL_NO_SRP
+                else if (strcmp(*argv,"-srpuser") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srp_arg.srplogin= *(++argv);
+                        meth=TLSv1_client_method();
+                        }
+                else if (strcmp(*argv,"-srppass") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srppass= *(++argv);
+                        meth=TLSv1_client_method();
+                        }
+                else if (strcmp(*argv,"-srp_strength") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srp_arg.strength=atoi(*(++argv));
+                        BIO_printf(bio_err,"SRP minimal length for N is %d\n",srp_arg.strength);
+                        meth=TLSv1_client_method();
+                        }
+                else if (strcmp(*argv,"-srp_lateuser") == 0)
+                        {
+                        srp_lateuser= 1;
+                        meth=TLSv1_client_method();
+                        }
+                else if (strcmp(*argv,"-srp_moregroups") == 0)
+                        {
+                        srp_arg.amp=1;
+                        meth=TLSv1_client_method();
+                        }
+#endif
 #ifndef OPENSSL_NO_SSL2
                 else if (strcmp(*argv,"-ssl2") == 0)
                         meth=SSLv2_client_method();
@@ -597,6 +804,10 @@ int MAIN(int argc, char **argv)
                         meth=SSLv3_client_method();
 #endif
 #ifndef OPENSSL_NO_TLS1
+                else if (strcmp(*argv,"-tls1_2") == 0)
+                        meth=TLSv1_2_client_method();
+                else if (strcmp(*argv,"-tls1_1") == 0)
+                        meth=TLSv1_1_client_method();
                 else if (strcmp(*argv,"-tls1") == 0)
                         meth=TLSv1_client_method();
 #endif
@@ -645,6 +856,10 @@ int MAIN(int argc, char **argv)
                         if (--argc < 1) goto bad;
                         CAfile= *(++argv);
                         }
+                else if (strcmp(*argv,"-no_tls1_2") == 0)
+                        off|=SSL_OP_NO_TLSv1_2;
+                else if (strcmp(*argv,"-no_tls1_1") == 0)
+                        off|=SSL_OP_NO_TLSv1_1;
                 else if (strcmp(*argv,"-no_tls1") == 0)
                         off|=SSL_OP_NO_TLSv1;
                 else if (strcmp(*argv,"-no_ssl3") == 0)
@@ -656,6 +871,13 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_TLSEXT
                 else if (strcmp(*argv,"-no_ticket") == 0)
                         { off|=SSL_OP_NO_TICKET; }
+# ifndef OPENSSL_NO_NEXTPROTONEG
+                else if (strcmp(*argv,"-nextprotoneg") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        next_proto_neg_in = *(++argv);
+                        }
+# endif
 #endif
                 else if (strcmp(*argv,"-serverpref") == 0)
                         off|=SSL_OP_CIPHER_SERVER_PREFERENCE;
@@ -723,7 +945,23 @@ int MAIN(int argc, char **argv)
                         jpake_secret = *++argv;
                         }
 #endif
-                else
+                else if (strcmp(*argv,"-use_srtp") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srtp_profiles = *(++argv);
+                        }
+                else if (strcmp(*argv,"-keymatexport") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        keymatexportlabel= *(++argv);
+                        }
+                else if (strcmp(*argv,"-keymatexportlen") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        keymatexportlen=atoi(*(++argv));
+                        if (keymatexportlen == 0) goto bad;
+                        }
+                else
                         {
                         BIO_printf(bio_err,"unknown option %s\n",*argv);
                         badop=1;
@@ -749,19 +987,33 @@ bad:
                         goto end;
                         }
                 psk_identity = "JPAKE";
+                if (cipher)
+                        {
+                        BIO_printf(bio_err, "JPAKE sets cipher to PSK\n");
+                        goto end;
+                        }
+                cipher = "PSK";
                 }
-
-        if (cipher)
-                {
-                BIO_printf(bio_err, "JPAKE sets cipher to PSK\n");
-                goto end;
-                }
-        cipher = "PSK";
 #endif
 
         OpenSSL_add_ssl_algorithms();
         SSL_load_error_strings();
 
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+        next_proto.status = -1;
+        if (next_proto_neg_in)
+                {
+                next_proto.data = next_protos_parse(&next_proto.len, next_proto_neg_in);
+                if (next_proto.data == NULL)
+                        {
+                        BIO_printf(bio_err, "Error parsing -nextprotoneg argument\n");
+                        goto end;
+                        }
+                }
+        else
+                next_proto.data = NULL;
+#endif
+
 #ifndef OPENSSL_NO_ENGINE
         e = setup_engine(bio_err, engine_id, 1);
         if (ssl_client_engine_id)
@@ -835,6 +1087,14 @@ bad:
                         }
                 }
 
+#ifndef OPENSSL_NO_SRP
+        if(!app_passwd(bio_err, srppass, NULL, &srp_arg.srppassin, NULL))
+                {
+                BIO_printf(bio_err, "Error getting password\n");
+                goto end;
+                }
+#endif
+
         ctx=SSL_CTX_new(meth);
         if (ctx == NULL)
                 {
@@ -870,6 +1130,8 @@ bad:
                         BIO_printf(bio_c_out, "PSK key given or JPAKE in use, setting client callback\n");
                 SSL_CTX_set_psk_client_callback(ctx, psk_client_cb);
                 }
+        if (srtp_profiles != NULL)
+                SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles);
 #endif
         if (bugs)
                 SSL_CTX_set_options(ctx,SSL_OP_ALL|off);
@@ -883,6 +1145,11 @@ bad:
          */
         if (socket_type == SOCK_DGRAM) SSL_CTX_set_read_ahead(ctx, 1);
 
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+        if (next_proto.data)
+                SSL_CTX_set_next_proto_select_cb(ctx, next_proto_cb, &next_proto);
+#endif
+
         if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
         if (cipher != NULL)
                 if(!SSL_CTX_set_cipher_list(ctx,cipher)) {
@@ -914,6 +1181,24 @@ bad:
                 SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
                 SSL_CTX_set_tlsext_servername_arg(ctx, &tlsextcbp);
                 }
+#ifndef OPENSSL_NO_SRP
+        if (srp_arg.srplogin)
+                {
+                if (!srp_lateuser && !SSL_CTX_set_srp_username(ctx, srp_arg.srplogin))
+                        {
+                        BIO_printf(bio_err,"Unable to set SRP username\n");
+                        goto end;
+                        }
+                srp_arg.msg = c_msg;
+                srp_arg.debug = c_debug ;
+                SSL_CTX_set_srp_cb_arg(ctx,&srp_arg);
+                SSL_CTX_set_srp_client_pwd_callback(ctx, ssl_give_srp_client_pwd_cb);
+                SSL_CTX_set_srp_strength(ctx, srp_arg.strength);
+                if (c_msg || c_debug || srp_arg.amp == 0)
+                        SSL_CTX_set_srp_verify_param_callback(ctx, ssl_srp_verify_param_cb);
+                }
+
+#endif
 #endif
 
         con=SSL_new(ctx);
@@ -952,9 +1237,10 @@ bad:
                 }
 #endif
 #ifndef OPENSSL_NO_KRB5
-        if (con  &&  (con->kssl_ctx = kssl_ctx_new()) != NULL)
+        if (con  &&  (kctx = kssl_ctx_new()) != NULL)
                 {
-                kssl_ctx_setstring(con->kssl_ctx, KSSL_SERVER, host);
+                SSL_set0_kssl_ctx(con, kctx);
+                kssl_ctx_setstring(kctx, KSSL_SERVER, host);
                 }
 #endif  /* OPENSSL_NO_KRB5  */
 /*      SSL_set_cipher_list(con,"RC4-MD5"); */
@@ -986,7 +1272,7 @@ re_start:
                         }
                 }
 #endif                                              
-        if (c_Pause & 0x01) con->debug=1;
+        if (c_Pause & 0x01) SSL_set_debug(con, 1);
 
         if ( SSL_version(con) == DTLS1_VERSION)
                 {
@@ -1035,7 +1321,7 @@ re_start:
 
         if (c_debug)
                 {
-                con->debug=1;
+                SSL_set_debug(con, 1);
                 BIO_set_callback(sbio,bio_dump_callback);
                 BIO_set_callback_arg(sbio,(char *)bio_c_out);
                 }
@@ -1569,6 +1855,14 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
                                 SSL_renegotiate(con);
                                 cbuf_len=0;
                                 }
+#ifndef OPENSSL_NO_HEARTBEATS
+                        else if ((!c_ign_eof) && (cbuf[0] == 'B'))
+                                {
+                                BIO_printf(bio_err,"HEARTBEATING\n");
+                                SSL_heartbeat(con);
+                                cbuf_len=0;
+                                }
+#endif
                         else
                                 {
                                 cbuf_len=i;
@@ -1630,6 +1924,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 #ifndef OPENSSL_NO_COMP
         const COMP_METHOD *comp, *expansion;
 #endif
+        unsigned char *exportedkeymat;
 
         if (full)
                 {
@@ -1720,7 +2015,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
                         BIO_number_read(SSL_get_rbio(s)),
                         BIO_number_written(SSL_get_wbio(s)));
                 }
-        BIO_printf(bio,((s->hit)?"---\nReused, ":"---\nNew, "));
+        BIO_printf(bio,(SSL_cache_hit(s)?"---\nReused, ":"---\nNew, "));
         c=SSL_get_current_cipher(s);
         BIO_printf(bio,"%s, Cipher is %s\n",
                 SSL_CIPHER_get_version(c),
@@ -1742,7 +2037,66 @@ static void print_stuff(BIO *bio, SSL *s, int full)
         BIO_printf(bio,"Expansion: %s\n",
                 expansion ? SSL_COMP_get_name(expansion) : "NONE");
 #endif
+ 
+#ifdef SSL_DEBUG
+        {
+        /* Print out local port of connection: useful for debugging */
+        int sock;
+        struct sockaddr_in ladd;
+        socklen_t ladd_size = sizeof(ladd);
+        sock = SSL_get_fd(s);
+        getsockname(sock, (struct sockaddr *)&ladd, &ladd_size);
+        BIO_printf(bio_c_out, "LOCAL PORT is %u\n", ntohs(ladd.sin_port));
+        }
+#endif
+
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+        if (next_proto.status != -1) {
+                const unsigned char *proto;
+                unsigned int proto_len;
+                SSL_get0_next_proto_negotiated(s, &proto, &proto_len);
+                BIO_printf(bio, "Next protocol: (%d) ", next_proto.status);
+                BIO_write(bio, proto, proto_len);
+                BIO_write(bio, "\n", 1);
+        }
+#endif
+
+        {
+        SRTP_PROTECTION_PROFILE *srtp_profile=SSL_get_selected_srtp_profile(s);
+ 
+        if(srtp_profile)
+                BIO_printf(bio,"SRTP Extension negotiated, profile=%s\n",
+                           srtp_profile->name);
+        }
+ 
         SSL_SESSION_print(bio,SSL_get_session(s));
+        if (keymatexportlabel != NULL)
+                {
+                BIO_printf(bio, "Keying material exporter:\n");
+                BIO_printf(bio, "    Label: '%s'\n", keymatexportlabel);
+                BIO_printf(bio, "    Length: %i bytes\n", keymatexportlen);
+                exportedkeymat = OPENSSL_malloc(keymatexportlen);
+                if (exportedkeymat != NULL)
+                        {
+                        if (!SSL_export_keying_material(s, exportedkeymat,
+                                                        keymatexportlen,
+                                                        keymatexportlabel,
+                                                        strlen(keymatexportlabel),
+                                                        NULL, 0, 0))
+                                {
+                                BIO_printf(bio, "    Error\n");
+                                }
+                        else
+                                {
+                                BIO_printf(bio, "    Keying material: ");
+                                for (i=0; i<keymatexportlen; i++)
+                                        BIO_printf(bio, "%02X",
+                                                   exportedkeymat[i]);
+                                BIO_printf(bio, "\n");
+                                }
+                        OPENSSL_free(exportedkeymat);
+                        }
+                }
         BIO_printf(bio,"---\n");
         if (peer != NULL)
                 X509_free(peer);
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index 8a0c34cf0f..3f9b3704c6 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -186,6 +186,9 @@ typedef unsigned int u_int;
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
+#ifndef OPENSSL_NO_SRP
+#include <openssl/srp.h>
+#endif
 #include "s_apps.h"
 #include "timeouts.h"
 
@@ -290,6 +293,9 @@ static int cert_status_cb(SSL *s, void *arg);
 static int s_msg=0;
 static int s_quiet=0;
 
+static char *keymatexportlabel=NULL;
+static int keymatexportlen=20;
+
 static int hack=0;
 #ifndef OPENSSL_NO_ENGINE
 static char *engine_id=NULL;
@@ -302,6 +308,7 @@ static long socket_mtu;
 static int cert_chain = 0;
 #endif
 
+
 #ifndef OPENSSL_NO_PSK
 static char *psk_identity="Client_identity";
 char *psk_key=NULL; /* by default PSK is not used */
@@ -369,6 +376,52 @@ static unsigned int psk_server_cb(SSL *ssl, const char *identity,
         }
 #endif
 
+#ifndef OPENSSL_NO_SRP
+/* This is a context that we pass to callbacks */
+typedef struct srpsrvparm_st
+        {
+        char *login;
+        SRP_VBASE *vb;
+        SRP_user_pwd *user;
+        } srpsrvparm;
+
+/* This callback pretends to require some asynchronous logic in order to obtain
+   a verifier. When the callback is called for a new connection we return
+   with a negative value. This will provoke the accept etc to return with
+   an LOOKUP_X509. The main logic of the reinvokes the suspended call 
+   (which would normally occur after a worker has finished) and we
+   set the user parameters. 
+*/
+static int MS_CALLBACK ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
+        {
+        srpsrvparm *p = (srpsrvparm *)arg;
+        if (p->login == NULL && p->user == NULL )
+                {
+                p->login = SSL_get_srp_username(s);
+                BIO_printf(bio_err, "SRP username = \"%s\"\n", p->login);
+                return (-1) ;
+                }
+
+        if (p->user == NULL)
+                {
+                BIO_printf(bio_err, "User %s doesn't exist\n", p->login);
+                return SSL3_AL_FATAL;
+                }
+        if (SSL_set_srp_server_param(s, p->user->N, p->user->g, p->user->s, p->user->v,
+                                     p->user->info) < 0)
+                {
+                *ad = SSL_AD_INTERNAL_ERROR;
+                return SSL3_AL_FATAL;
+                }
+        BIO_printf(bio_err, "SRP parameters set: username = \"%s\" info=\"%s\" \n", p->login,p->user->info);
+        /* need to check whether there are memory leaks */
+        p->user = NULL;
+        p->login = NULL;
+        return SSL_ERROR_NONE;
+        }
+
+#endif
+
 #ifdef MONOLITH
 static void s_server_init(void)
         {
@@ -456,8 +509,14 @@ static void sv_usage(void)
         BIO_printf(bio_err," -jpake arg    - JPAKE secret to use\n");
 # endif
 #endif
+#ifndef OPENSSL_NO_SRP
+        BIO_printf(bio_err," -srpvfile file      - The verifier file for SRP\n");
+        BIO_printf(bio_err," -srpuserseed string - A seed string for a default user salt.\n");
+#endif
         BIO_printf(bio_err," -ssl2         - Just talk SSLv2\n");
         BIO_printf(bio_err," -ssl3         - Just talk SSLv3\n");
+        BIO_printf(bio_err," -tls1_2       - Just talk TLSv1.2\n");
+        BIO_printf(bio_err," -tls1_1       - Just talk TLSv1.1\n");
         BIO_printf(bio_err," -tls1         - Just talk TLSv1\n");
         BIO_printf(bio_err," -dtls1        - Just talk DTLSv1\n");
         BIO_printf(bio_err," -timeout      - Enable timeouts\n");
@@ -466,6 +525,8 @@ static void sv_usage(void)
         BIO_printf(bio_err," -no_ssl2      - Just disable SSLv2\n");
         BIO_printf(bio_err," -no_ssl3      - Just disable SSLv3\n");
         BIO_printf(bio_err," -no_tls1      - Just disable TLSv1\n");
+        BIO_printf(bio_err," -no_tls1_1    - Just disable TLSv1.1\n");
+        BIO_printf(bio_err," -no_tls1_2    - Just disable TLSv1.2\n");
 #ifndef OPENSSL_NO_DH
         BIO_printf(bio_err," -no_dhe       - Disable ephemeral DH\n");
 #endif
@@ -492,7 +553,13 @@ static void sv_usage(void)
         BIO_printf(bio_err," -tlsextdebug  - hex dump of all TLS extensions received\n");
         BIO_printf(bio_err," -no_ticket    - disable use of RFC4507bis session tickets\n");
         BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");
+# ifndef OPENSSL_NO_NEXTPROTONEG
+        BIO_printf(bio_err," -nextprotoneg arg - set the advertised protocols for the NPN extension (comma-separated list)\n");
+# endif
+        BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");
 #endif
+        BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");
+        BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
         }
 
 static int local_argc=0;
@@ -826,6 +893,26 @@ BIO_printf(err, "cert_status: received %d ids\n", sk_OCSP_RESPID_num(ids));
         ret = SSL_TLSEXT_ERR_ALERT_FATAL;
         goto done;
         }
+
+# ifndef OPENSSL_NO_NEXTPROTONEG
+/* This is the context that we pass to next_proto_cb */
+typedef struct tlsextnextprotoctx_st {
+        unsigned char *data;
+        unsigned int len;
+} tlsextnextprotoctx;
+
+static int next_proto_cb(SSL *s, const unsigned char **data, unsigned int *len, void *arg)
+        {
+        tlsextnextprotoctx *next_proto = arg;
+
+        *data = next_proto->data;
+        *len = next_proto->len;
+
+        return SSL_TLSEXT_ERR_OK;
+        }
+# endif  /* ndef OPENSSL_NO_NEXTPROTONEG */
+
+
 #endif
 
 int MAIN(int, char **);
@@ -833,6 +920,10 @@ int MAIN(int, char **);
 #ifndef OPENSSL_NO_JPAKE
 static char *jpake_secret = NULL;
 #endif
+#ifndef OPENSSL_NO_SRP
+        static srpsrvparm srp_callback_parm;
+#endif
+static char *srtp_profiles = NULL;
 
 int MAIN(int argc, char *argv[])
         {
@@ -864,21 +955,21 @@ int MAIN(int argc, char *argv[])
 #ifndef OPENSSL_NO_TLSEXT
         EVP_PKEY *s_key2 = NULL;
         X509 *s_cert2 = NULL;
-#endif
-#ifndef OPENSSL_NO_TLSEXT
         tlsextctx tlsextcbp = {NULL, NULL, SSL_TLSEXT_ERR_ALERT_WARNING};
+# ifndef OPENSSL_NO_NEXTPROTONEG
+        const char *next_proto_neg_in = NULL;
+        tlsextnextprotoctx next_proto;
+# endif
 #endif
 #ifndef OPENSSL_NO_PSK
         /* by default do not send a PSK identity hint */
         static char *psk_identity_hint=NULL;
 #endif
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
-        meth=SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
-        meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
-        meth=SSLv2_server_method();
+#ifndef OPENSSL_NO_SRP
+        char *srpuserseed = NULL;
+        char *srp_verifier_file = NULL;
 #endif
+        meth=SSLv23_server_method();
 
         local_argc=argc;
         local_argv=argv;
@@ -1103,13 +1194,27 @@ int MAIN(int argc, char *argv[])
                         psk_key=*(++argv);
                         for (i=0; i<strlen(psk_key); i++)
                                 {
-                                if (isxdigit((int)psk_key[i]))
+                                if (isxdigit((unsigned char)psk_key[i]))
                                         continue;
                                 BIO_printf(bio_err,"Not a hex number '%s'\n",*argv);
                                 goto bad;
                                 }
                         }
 #endif
+#ifndef OPENSSL_NO_SRP
+                else if (strcmp(*argv, "-srpvfile") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srp_verifier_file = *(++argv);
+                        meth=TLSv1_server_method();
+                        }
+                else if (strcmp(*argv, "-srpuserseed") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srpuserseed = *(++argv);
+                        meth=TLSv1_server_method();
+                        }
+#endif
                 else if (strcmp(*argv,"-www") == 0)
                         { www=1; }
                 else if (strcmp(*argv,"-WWW") == 0)
@@ -1122,6 +1227,10 @@ int MAIN(int argc, char *argv[])
                         { off|=SSL_OP_NO_SSLv3; }
                 else if (strcmp(*argv,"-no_tls1") == 0)
                         { off|=SSL_OP_NO_TLSv1; }
+                else if (strcmp(*argv,"-no_tls1_1") == 0)
+                        { off|=SSL_OP_NO_TLSv1_1; }
+                else if (strcmp(*argv,"-no_tls1_2") == 0)
+                        { off|=SSL_OP_NO_TLSv1_2; }
                 else if (strcmp(*argv,"-no_comp") == 0)
                         { off|=SSL_OP_NO_COMPRESSION; }
 #ifndef OPENSSL_NO_TLSEXT
@@ -1139,6 +1248,10 @@ int MAIN(int argc, char *argv[])
 #ifndef OPENSSL_NO_TLS1
                 else if (strcmp(*argv,"-tls1") == 0)
                         { meth=TLSv1_server_method(); }
+                else if (strcmp(*argv,"-tls1_1") == 0)
+                        { meth=TLSv1_1_server_method(); }
+                else if (strcmp(*argv,"-tls1_2") == 0)
+                        { meth=TLSv1_2_server_method(); }
 #endif
 #ifndef OPENSSL_NO_DTLS1
                 else if (strcmp(*argv,"-dtls1") == 0)
@@ -1191,7 +1304,13 @@ int MAIN(int argc, char *argv[])
                         if (--argc < 1) goto bad;
                         s_key_file2= *(++argv);
                         }
-                        
+# ifndef OPENSSL_NO_NEXTPROTONEG
+                else if (strcmp(*argv,"-nextprotoneg") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        next_proto_neg_in = *(++argv);
+                        }
+# endif
 #endif
 #if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
                 else if (strcmp(*argv,"-jpake") == 0)
@@ -1200,6 +1319,22 @@ int MAIN(int argc, char *argv[])
                         jpake_secret = *(++argv);
                         }
 #endif
+                else if (strcmp(*argv,"-use_srtp") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srtp_profiles = *(++argv);
+                        }
+                else if (strcmp(*argv,"-keymatexport") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        keymatexportlabel= *(++argv);
+                        }
+                else if (strcmp(*argv,"-keymatexportlen") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        keymatexportlen=atoi(*(++argv));
+                        if (keymatexportlen == 0) goto bad;
+                        }
                 else
                         {
                         BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -1296,6 +1431,22 @@ bad:
                                 goto end;
                                 }
                         }
+
+# ifndef OPENSSL_NO_NEXTPROTONEG
+                if (next_proto_neg_in)
+                        {
+                        unsigned short len;
+                        next_proto.data = next_protos_parse(&len,
+                                next_proto_neg_in);
+                        if (next_proto.data == NULL)
+                                goto end;
+                        next_proto.len = len;
+                        }
+                else
+                        {
+                        next_proto.data = NULL;
+                        }
+# endif
 #endif
                 }
 
@@ -1399,6 +1550,9 @@ bad:
         else
                 SSL_CTX_sess_set_cache_size(ctx,128);
 
+        if (srtp_profiles != NULL)
+                SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles);
+
 #if 0
         if (cipher == NULL) cipher=getenv("SSL_CIPHER");
 #endif
@@ -1476,6 +1630,11 @@ bad:
                 if (vpm)
                         SSL_CTX_set1_param(ctx2, vpm);
                 }
+
+# ifndef OPENSSL_NO_NEXTPROTONEG
+        if (next_proto.data)
+                SSL_CTX_set_next_protos_advertised_cb(ctx, next_proto_cb, &next_proto);
+# endif
 #endif 
 
 #ifndef OPENSSL_NO_DH
@@ -1684,6 +1843,25 @@ bad:
                 }
 #endif
 
+#ifndef OPENSSL_NO_SRP
+        if (srp_verifier_file != NULL)
+                {
+                srp_callback_parm.vb = SRP_VBASE_new(srpuserseed);
+                srp_callback_parm.user = NULL;
+                srp_callback_parm.login = NULL;
+                if ((ret = SRP_VBASE_init(srp_callback_parm.vb, srp_verifier_file)) != SRP_NO_ERROR)
+                        {
+                        BIO_printf(bio_err,
+                                   "Cannot initialize SRP verifier file \"%s\":ret=%d\n",
+                                   srp_verifier_file, ret);
+                                goto end;
+                        }
+                SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE,verify_callback);
+                SSL_CTX_set_srp_cb_arg(ctx, &srp_callback_parm);                        
+                SSL_CTX_set_srp_username_callback(ctx, ssl_srp_server_param_cb);
+                }
+        else
+#endif
         if (CAfile != NULL)
                 {
                 SSL_CTX_set_client_CA_list(ctx,SSL_load_client_CA_file(CAfile));
@@ -1765,6 +1943,9 @@ static int sv_body(char *hostname, int s, unsigned char *context)
         unsigned long l;
         SSL *con=NULL;
         BIO *sbio;
+#ifndef OPENSSL_NO_KRB5
+        KSSL_CTX *kctx;
+#endif
         struct timeval timeout;
 #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)
         struct timeval tv;
@@ -1805,12 +1986,11 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                 }
 #endif
 #ifndef OPENSSL_NO_KRB5
-                if ((con->kssl_ctx = kssl_ctx_new()) != NULL)
+                if ((kctx = kssl_ctx_new()) != NULL)
                         {
-                        kssl_ctx_setstring(con->kssl_ctx, KSSL_SERVICE,
-                                                                KRB5SVC);
-                        kssl_ctx_setstring(con->kssl_ctx, KSSL_KEYTAB,
-                                                                KRB5KEYTAB);
+                        SSL_set0_kssl_ctx(con, kctx);
+                        kssl_ctx_setstring(kctx, KSSL_SERVICE, KRB5SVC);
+                        kssl_ctx_setstring(kctx, KSSL_KEYTAB, KRB5KEYTAB);
                         }
 #endif  /* OPENSSL_NO_KRB5 */
                 if(context)
@@ -1873,7 +2053,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 
         if (s_debug)
                 {
-                con->debug=1;
+                SSL_set_debug(con, 1);
                 BIO_set_callback(SSL_get_rbio(con),bio_dump_callback);
                 BIO_set_callback_arg(SSL_get_rbio(con),(char *)bio_s_out);
                 }
@@ -2002,6 +2182,16 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                                         goto err;
                                         }
 
+#ifndef OPENSSL_NO_HEARTBEATS
+                                if ((buf[0] == 'B') &&
+                                        ((buf[1] == '\n') || (buf[1] == '\r')))
+                                        {
+                                        BIO_printf(bio_err,"HEARTBEATING\n");
+                                        SSL_heartbeat(con);
+                                        i=0;
+                                        continue;
+                                        }
+#endif
                                 if ((buf[0] == 'r') && 
                                         ((buf[1] == '\n') || (buf[1] == '\r')))
                                         {
@@ -2045,6 +2235,18 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 { static count=0; if (++count == 100) { count=0; SSL_renegotiate(con); } }
 #endif
                                 k=SSL_write(con,&(buf[l]),(unsigned int)i);
+#ifndef OPENSSL_NO_SRP
+                                while (SSL_get_error(con,k) == SSL_ERROR_WANT_X509_LOOKUP)
+                                        {
+                                        BIO_printf(bio_s_out,"LOOKUP renego during write\n");
+                                        srp_callback_parm.user = SRP_VBASE_get_by_user(srp_callback_parm.vb, srp_callback_parm.login); 
+                                        if (srp_callback_parm.user) 
+                                                BIO_printf(bio_s_out,"LOOKUP done %s\n",srp_callback_parm.user->info);
+                                        else 
+                                                BIO_printf(bio_s_out,"LOOKUP not successful\n");
+                                                k=SSL_write(con,&(buf[l]),(unsigned int)i);
+                                        }
+#endif
                                 switch (SSL_get_error(con,k))
                                         {
                                 case SSL_ERROR_NONE:
@@ -2092,6 +2294,18 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                                 {
 again:  
                                 i=SSL_read(con,(char *)buf,bufsize);
+#ifndef OPENSSL_NO_SRP
+                                while (SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP)
+                                        {
+                                        BIO_printf(bio_s_out,"LOOKUP renego during read\n");
+                                        srp_callback_parm.user = SRP_VBASE_get_by_user(srp_callback_parm.vb, srp_callback_parm.login); 
+                                        if (srp_callback_parm.user) 
+                                                BIO_printf(bio_s_out,"LOOKUP done %s\n",srp_callback_parm.user->info);
+                                        else 
+                                                BIO_printf(bio_s_out,"LOOKUP not successful\n");
+                                        i=SSL_read(con,(char *)buf,bufsize);
+                                        }
+#endif
                                 switch (SSL_get_error(con,i))
                                         {
                                 case SSL_ERROR_NONE:
@@ -2104,7 +2318,6 @@ again:
                                         break;
                                 case SSL_ERROR_WANT_WRITE:
                                 case SSL_ERROR_WANT_READ:
-                                case SSL_ERROR_WANT_X509_LOOKUP:
                                         BIO_printf(bio_s_out,"Read BLOCK\n");
                                         break;
                                 case SSL_ERROR_SYSCALL:
@@ -2159,8 +2372,30 @@ static int init_ssl_connection(SSL *con)
         X509 *peer;
         long verify_error;
         MS_STATIC char buf[BUFSIZ];
+#ifndef OPENSSL_NO_KRB5
+        char *client_princ;
+#endif
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+        const unsigned char *next_proto_neg;
+        unsigned next_proto_neg_len;
+#endif
+        unsigned char *exportedkeymat;
 
-        if ((i=SSL_accept(con)) <= 0)
+
+        i=SSL_accept(con);
+#ifndef OPENSSL_NO_SRP
+        while (i <= 0 &&  SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP) 
+                {
+                        BIO_printf(bio_s_out,"LOOKUP during accept %s\n",srp_callback_parm.login);
+                        srp_callback_parm.user = SRP_VBASE_get_by_user(srp_callback_parm.vb, srp_callback_parm.login); 
+                        if (srp_callback_parm.user) 
+                                BIO_printf(bio_s_out,"LOOKUP done %s\n",srp_callback_parm.user->info);
+                        else 
+                                BIO_printf(bio_s_out,"LOOKUP not successful\n");
+                        i=SSL_accept(con);
+                }
+#endif
+        if (i <= 0)
                 {
                 if (BIO_sock_should_retry(i))
                         {
@@ -2198,19 +2433,67 @@ static int init_ssl_connection(SSL *con)
                 BIO_printf(bio_s_out,"Shared ciphers:%s\n",buf);
         str=SSL_CIPHER_get_name(SSL_get_current_cipher(con));
         BIO_printf(bio_s_out,"CIPHER is %s\n",(str != NULL)?str:"(NONE)");
-        if (con->hit) BIO_printf(bio_s_out,"Reused session-id\n");
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+        SSL_get0_next_proto_negotiated(con, &next_proto_neg, &next_proto_neg_len);
+        if (next_proto_neg)
+                {
+                BIO_printf(bio_s_out,"NEXTPROTO is ");
+                BIO_write(bio_s_out, next_proto_neg, next_proto_neg_len);
+                BIO_printf(bio_s_out, "\n");
+                }
+#endif
+        {
+        SRTP_PROTECTION_PROFILE *srtp_profile
+          = SSL_get_selected_srtp_profile(con);
+
+        if(srtp_profile)
+                BIO_printf(bio_s_out,"SRTP Extension negotiated, profile=%s\n",
+                           srtp_profile->name);
+        }
+        if (SSL_cache_hit(con)) BIO_printf(bio_s_out,"Reused session-id\n");
         if (SSL_ctrl(con,SSL_CTRL_GET_FLAGS,0,NULL) &
                 TLS1_FLAGS_TLS_PADDING_BUG)
-                BIO_printf(bio_s_out,"Peer has incorrect TLSv1 block padding\n");
+                BIO_printf(bio_s_out,
+                           "Peer has incorrect TLSv1 block padding\n");
 #ifndef OPENSSL_NO_KRB5
-        if (con->kssl_ctx->client_princ != NULL)
+        client_princ = kssl_ctx_get0_client_princ(SSL_get0_kssl_ctx(con));
+        if (client_princ != NULL)
                 {
                 BIO_printf(bio_s_out,"Kerberos peer principal is %s\n",
-                        con->kssl_ctx->client_princ);
+                                                                client_princ);
                 }
 #endif /* OPENSSL_NO_KRB5 */
         BIO_printf(bio_s_out, "Secure Renegotiation IS%s supported\n",
                       SSL_get_secure_renegotiation_support(con) ? "" : " NOT");
+        if (keymatexportlabel != NULL)
+                {
+                BIO_printf(bio_s_out, "Keying material exporter:\n");
+                BIO_printf(bio_s_out, "    Label: '%s'\n", keymatexportlabel);
+                BIO_printf(bio_s_out, "    Length: %i bytes\n",
+                           keymatexportlen);
+                exportedkeymat = OPENSSL_malloc(keymatexportlen);
+                if (exportedkeymat != NULL)
+                        {
+                        if (!SSL_export_keying_material(con, exportedkeymat,
+                                                        keymatexportlen,
+                                                        keymatexportlabel,
+                                                        strlen(keymatexportlabel),
+                                                        NULL, 0, 0))
+                                {
+                                BIO_printf(bio_s_out, "    Error\n");
+                                }
+                        else
+                                {
+                                BIO_printf(bio_s_out, "    Keying material: ");
+                                for (i=0; i<keymatexportlen; i++)
+                                        BIO_printf(bio_s_out, "%02X",
+                                                   exportedkeymat[i]);
+                                BIO_printf(bio_s_out, "\n");
+                                }
+                        OPENSSL_free(exportedkeymat);
+                        }
+                }
+
         return(1);
         }
 
@@ -2228,6 +2511,9 @@ err:
         return(ret);
         }
 #endif
+#ifndef OPENSSL_NO_KRB5
+        char *client_princ;
+#endif
 
 #if 0
 static int load_CA(SSL_CTX *ctx, char *file)
@@ -2258,6 +2544,9 @@ static int www_body(char *hostname, int s, unsigned char *context)
         SSL *con;
         const SSL_CIPHER *c;
         BIO *io,*ssl_bio,*sbio;
+#ifndef OPENSSL_NO_KRB5
+        KSSL_CTX *kctx;
+#endif
 
         buf=OPENSSL_malloc(bufsize);
         if (buf == NULL) return(0);
@@ -2289,10 +2578,10 @@ static int www_body(char *hostname, int s, unsigned char *context)
                         }
 #endif
 #ifndef OPENSSL_NO_KRB5
-        if ((con->kssl_ctx = kssl_ctx_new()) != NULL)
+        if ((kctx = kssl_ctx_new()) != NULL)
                 {
-                kssl_ctx_setstring(con->kssl_ctx, KSSL_SERVICE, KRB5SVC);
-                kssl_ctx_setstring(con->kssl_ctx, KSSL_KEYTAB, KRB5KEYTAB);
+                kssl_ctx_setstring(kctx, KSSL_SERVICE, KRB5SVC);
+                kssl_ctx_setstring(kctx, KSSL_KEYTAB, KRB5KEYTAB);
                 }
 #endif  /* OPENSSL_NO_KRB5 */
         if(context) SSL_set_session_id_context(con, context,
@@ -2318,7 +2607,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
 
         if (s_debug)
                 {
-                con->debug=1;
+                SSL_set_debug(con, 1);
                 BIO_set_callback(SSL_get_rbio(con),bio_dump_callback);
                 BIO_set_callback_arg(SSL_get_rbio(con),(char *)bio_s_out);
                 }
@@ -2333,7 +2622,18 @@ static int www_body(char *hostname, int s, unsigned char *context)
                 if (hack)
                         {
                         i=SSL_accept(con);
-
+#ifndef OPENSSL_NO_SRP
+                        while (i <= 0 &&  SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP) 
+                {
+                        BIO_printf(bio_s_out,"LOOKUP during accept %s\n",srp_callback_parm.login);
+                        srp_callback_parm.user = SRP_VBASE_get_by_user(srp_callback_parm.vb, srp_callback_parm.login); 
+                        if (srp_callback_parm.user) 
+                                BIO_printf(bio_s_out,"LOOKUP done %s\n",srp_callback_parm.user->info);
+                        else 
+                                BIO_printf(bio_s_out,"LOOKUP not successful\n");
+                        i=SSL_accept(con);
+                }
+#endif
                         switch (SSL_get_error(con,i))
                                 {
                         case SSL_ERROR_NONE:
@@ -2439,7 +2739,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
                                         }
                                 BIO_puts(io,"\n");
                                 }
-                        BIO_printf(io,((con->hit)
+                        BIO_printf(io,(SSL_cache_hit(con)
                                 ?"---\nReused, "
                                 :"---\nNew, "));
                         c=SSL_get_current_cipher(con);
diff --git a/src/lib/libssl/src/apps/s_socket.c b/src/lib/libssl/src/apps/s_socket.c
index c08544a13c..380efdb1b9 100644
--- a/src/lib/libssl/src/apps/s_socket.c
+++ b/src/lib/libssl/src/apps/s_socket.c
@@ -238,11 +238,10 @@ int init_client(int *sock, char *host, int port, int type)
         {
         unsigned char ip[4];
 
+        memset(ip, '\0', sizeof ip);
         if (!host_ip(host,&(ip[0])))
-                {
-                return(0);
-                }
-        return(init_client_ip(sock,ip,port,type));
+                return 0;
+        return init_client_ip(sock,ip,port,type);
         }
 
 static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
diff --git a/src/lib/libssl/src/apps/server.pem b/src/lib/libssl/src/apps/server.pem
index 56248e57a3..d0fc265f04 100644
--- a/src/lib/libssl/src/apps/server.pem
+++ b/src/lib/libssl/src/apps/server.pem
@@ -1,369 +1,52 @@
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
-subject= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Server test cert (512 bit)
------BEGIN CERTIFICATE-----
-MIIB6TCCAVICAQYwDQYJKoZIhvcNAQEEBQAwWzELMAkGA1UEBhMCQVUxEzARBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYD
-VQQDExJUZXN0IENBICgxMDI0IGJpdCkwHhcNMDAxMDE2MjIzMTAzWhcNMDMwMTE0
-MjIzMTAzWjBjMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDEaMBgG
-A1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxIzAhBgNVBAMTGlNlcnZlciB0ZXN0IGNl
-cnQgKDUxMiBiaXQpMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ+zw4Qnlf8SMVIP
-Fe9GEcStgOY2Ww/dgNdhjeD8ckUJNP5VZkVDTGiXav6ooKXfX3j/7tdkuD8Ey2//
-Kv7+ue0CAwEAATANBgkqhkiG9w0BAQQFAAOBgQCT0grFQeZaqYb5EYfk20XixZV4
-GmyAbXMftG1Eo7qGiMhYzRwGNWxEYojf5PZkYZXvSqZ/ZXHXa4g59jK/rJNnaVGM
-k+xIX8mxQvlV0n5O9PIha5BX5teZnkHKgL8aKKLKW1BK7YTngsfSzzaeame5iKfz
-itAE+OjGF+PFKbwX8Q==
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBAJ+zw4Qnlf8SMVIPFe9GEcStgOY2Ww/dgNdhjeD8ckUJNP5VZkVD
-TGiXav6ooKXfX3j/7tdkuD8Ey2//Kv7+ue0CAwEAAQJAN6W31vDEP2DjdqhzCDDu
-OA4NACqoiFqyblo7yc2tM4h4xMbC3Yx5UKMN9ZkCtX0gzrz6DyF47bdKcWBzNWCj
-gQIhANEoojVt7hq+SQ6MCN6FTAysGgQf56Q3TYoJMoWvdiXVAiEAw3e3rc+VJpOz
-rHuDo6bgpjUAAXM+v3fcpsfZSNO6V7kCIQCtbVjanpUwvZkMI9by02oUk9taki3b
-PzPfAfNPYAbCJQIhAJXNQDWyqwn/lGmR11cqY2y9nZ1+5w3yHGatLrcDnQHxAiEA
-vnlEGo8K85u+KwIOimM48ZG8oTk7iFdkqLJR1utT3aU=
------END RSA PRIVATE KEY-----
-subject=/C=US/O=AT&T Bell Laboratories/OU=Prototype Research CA
-issuer= /C=US/O=AT&T Bell Laboratories/OU=Prototype Research CA
-notBefore=950413210656Z
-notAfter =970412210656Z
------BEGIN X509 CERTIFICATE-----
-
-MIICCDCCAXECAQAwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCVVMxHzAdBgNV
-BAoUFkFUJlQgQmVsbCBMYWJvcmF0b3JpZXMxHjAcBgNVBAsUFVByb3RvdHlwZSBS
-ZXNlYXJjaCBDQTAeFw05NTA0MTMyMTA2NTZaFw05NzA0MTIyMTA2NTZaME4xCzAJ
-BgNVBAYTAlVTMR8wHQYDVQQKFBZBVCZUIEJlbGwgTGFib3JhdG9yaWVzMR4wHAYD
-VQQLFBVQcm90b3R5cGUgUmVzZWFyY2ggQ0EwgZwwDQYJKoZIhvcNAQEBBQADgYoA
-MIGGAoGAebOmgtSCl+wCYZc86UGYeTLY8cjmW2P0FN8ToT/u2pECCoFdrlycX0OR
-3wt0ZhpFXLVNeDnHwEE9veNUih7pCL2ZBFqoIoQkB1lZmXRiVtjGonz8BLm/qrFM
-YHb0lme/Ol+s118mwKVxnn6bSAeI/OXKhLaVdYZWk+aEaxEDkVkCAQ8wDQYJKoZI
-hvcNAQEEBQADgYEAAZMG14lZmZ8bahkaHaTV9dQf4p2FZiQTFwHP9ZyGsXPC+LT5
-dG5iTaRmyjNIJdPWohZDl97kAci79aBndvuEvRKOjLHs3WRGBIwERnAcnY9Mz8u/
-zIHK23PjYVxGGaZd669OJwD0CYyqH22HH9nFUGaoJdsv39ChW0NRdLE9+y8=
------END X509 CERTIFICATE-----
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
-subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
------BEGIN CERTIFICATE-----
-MIICJjCCAY8CAQAwDQYJKoZIhvcNAQEEBQAwXDELMAkGA1UEBhMCQVUxEzARBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYD
-VQQDExNUZXN0IFBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTc0M1oXDTAxMDYw
-OTEzNTc0M1owWzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxGjAY
-BgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYDVQQDExJUZXN0IENBICgxMDI0
-IGJpdCkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKO7o8t116VP6cgybTsZ
-DCZhr95nYlZuya3aCi1IKoztqwWnjbmDFIriOqGFPrZQ+moMETC9D59iRW/dFXSv
-1F65ka/XY2hLh9exCCo7XuUcDs53Qp3bI3AmMqHjgzE8oO3ajyJAzJkTTOUecQU2
-mw/gI4tMM0LqWMQS7luTy4+xAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAM7achv3v
-hLQJcv/65eGEpBXM40ZDVoFQFFJWaY5p883HTqLB1x4FdzsXHH0QKBTcKpWwqyu4
-YDm3fb8oDugw72bCzfyZK/zVZPR/hVlqI/fvU109Qoc+7oPvIXWky71HfcK6ZBCA
-q30KIqGM/uoM60INq97qjDmCJapagcNBGQs=
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCju6PLddelT+nIMm07GQwmYa/eZ2JWbsmt2gotSCqM7asFp425
-gxSK4jqhhT62UPpqDBEwvQ+fYkVv3RV0r9ReuZGv12NoS4fXsQgqO17lHA7Od0Kd
-2yNwJjKh44MxPKDt2o8iQMyZE0zlHnEFNpsP4COLTDNC6ljEEu5bk8uPsQIDAQAB
-AoGAVZmpFZsDZfr0l2S9tLLwpjRWNOlKATQkno6q2WesT0eGLQufTciY+c8ypfU6
-hyio8r5iUl/VhhdjhAtKx1mRpiotftHo/eYf8rtsrnprOnWG0bWjLjtIoMbcxGn2
-J3bN6LJmbJMjDs0eJ3KnTu646F3nDUw2oGAwmpzKXA1KAP0CQQDRvQhxk2D3Pehs
-HvG665u2pB5ipYQngEFlZO7RHJZzJOZEWSLuuMqaF/7pTfA5jiBvWqCgJeCRRInL
-21ru4dlPAkEAx9jj7BgKn5TYnMoBSSe0afjsV9oApVpN1Nacb1YDtCwy+scp3++s
-nFxlv98wxIlSdpwMUn+AUWfjiWR7Tu/G/wJBAJ/KjwZIrFVxewP0x2ILYsTRYLzz
-MS4PDsO7FB+I0i7DbBOifXS2oNSpd3I0CNMwrxFnUHzynpbOStVfN3ZL5w0CQQCa
-pwFahxBRhkJKsxhjoFJBX9yl75JoY4Wvm5Tbo9ih6UJaRx3kqfkN14L2BKYcsZgb
-KY9vmDOYy6iNfjDeWTfJAkBkfPUb8oTJ/nSP5zN6sqGxSY4krc4xLxpRmxoJ8HL2
-XfhqXkTzbU13RX9JJ/NZ8vQN9Vm2NhxRGJocQkmcdVtJ
------END RSA PRIVATE KEY-----
------BEGIN X509 CERTIFICATE-----
-MIICYDCCAiACAgEoMAkGBSsOAwINBQAwfDELMAkGA1UEBhMCVVMxNjA0BgNVBAoT
-LU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFuZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEZ
-MBcGA1UECxMQVGVzdCBFbnZpcm9ubWVudDEaMBgGA1UECxMRRFNTLU5BU0EtUGls
-b3QtQ0EwHhcNOTYwMjI2MTYzMjQ1WhcNOTcwMjI1MTYzMjQ1WjB8MQswCQYDVQQG
-EwJVUzE2MDQGA1UEChMtTmF0aW9uYWwgQWVyb25hdXRpY3MgYW5kIFNwYWNlIEFk
-bWluaXN0cmF0aW9uMRkwFwYDVQQLExBUZXN0IEVudmlyb25tZW50MRowGAYDVQQL
-ExFEU1MtTkFTQS1QaWxvdC1DQTCB8jAJBgUrDgMCDAUAA4HkADCB4AJBAMA/ssKb
-hPNUG7ZlASfVwEJU21O5OyF/iyBzgHI1O8eOhJGUYO8cc8wDMjR508Mr9cp6Uhl/
-ZB7FV5GkLNEnRHYCQQDUEaSg45P2qrDwixTRhFhmWz5Nvc4lRFQ/42XPcchiJBLb
-bn3QK74T2IxY1yY+kCNq8XrIqf5fJJzIH0J/xUP3AhUAsg2wsQHfDGYk/BOSulX3
-fVd0geUCQQCzCFUQAh+ZkEmp5804cs6ZWBhrUAfnra8lJItYo9xPcXgdIfLfibcX
-R71UsyO77MRD7B0+Ag2tq794IleCVcEEMAkGBSsOAwINBQADLwAwLAIUUayDfreR
-Yh2WeU86/pHNdkUC1IgCFEfxe1f0oMpxJyrJ5XIxTi7vGdoK
------END X509 CERTIFICATE-----
------BEGIN X509 CERTIFICATE-----
-
-MIICGTCCAdgCAwCqTDAJBgUrDgMCDQUAMHwxCzAJBgNVBAYTAlVTMTYwNAYDVQQK
-Ey1OYXRpb25hbCBBZXJvbmF1dGljcyBhbmQgU3BhY2UgQWRtaW5pc3RyYXRpb24x
-GTAXBgNVBAsTEFRlc3QgRW52aXJvbm1lbnQxGjAYBgNVBAsTEURTUy1OQVNBLVBp
-bG90LUNBMB4XDTk2MDUxNDE3MDE0MVoXDTk3MDUxNDE3MDE0MVowMzELMAkGA1UE
-BhMCQVUxDzANBgNVBAoTBk1pbmNvbTETMBEGA1UEAxMKRXJpYyBZb3VuZzCB8jAJ
-BgUrDgMCDAUAA4HkADCB4AJBAKbfHz6vE6pXXMTpswtGUec2tvnfLJUsoxE9qs4+
-ObZX7LmLvragNPUeiTJx7UOWZ5DfBj6bXLc8eYne0lP1g3ACQQDUEaSg45P2qrDw
-ixTRhFhmWz5Nvc4lRFQ/42XPcchiJBLbbn3QK74T2IxY1yY+kCNq8XrIqf5fJJzI
-H0J/xUP3AhUAsg2wsQHfDGYk/BOSulX3fVd0geUCQQCzCFUQAh+ZkEmp5804cs6Z
-WBhrUAfnra8lJItYo9xPcXgdIfLfibcXR71UsyO77MRD7B0+Ag2tq794IleCVcEE
-MAkGBSsOAwINBQADMAAwLQIUWsuuJRE3VT4ueWkWMAJMJaZjj1ECFQCYY0zX4bzM
-LC7obsrHD8XAHG+ZRG==
------END X509 CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICTTCCAbagAwIBAgIBADANBgkqhkiG9w0BAQQFADBMMQswCQYDVQQGEwJHQjEM
-MAoGA1UEChMDVUNMMRgwFgYDVQQLEw9JQ0UtVEVMIFByb2plY3QxFTATBgNVBAMT
-DFRydXN0RmFjdG9yeTAeFw05NzA0MjIxNDM5MTRaFw05ODA0MjIxNDM5MTRaMEwx
-CzAJBgNVBAYTAkdCMQwwCgYDVQQKEwNVQ0wxGDAWBgNVBAsTD0lDRS1URUwgUHJv
-amVjdDEVMBMGA1UEAxMMVHJ1c3RGYWN0b3J5MIGcMAoGBFUIAQECAgQAA4GNADCB
-iQKBgQCEieR8NcXkUW1f0G6aC6u0i8q/98JqS6RxK5YmHIGKCkuTWAUjzLfUa4dt
-U9igGCjTuxaDqlzEim+t/02pmiBZT9HaX++35MjQPUWmsChcYU5WyzGErXi+rQaw
-zlwS73zM8qiPj/97lXYycWhgL0VaiDSPxRXEUdWoaGruom4mNQIDAQABo0IwQDAd
-BgNVHQ4EFgQUHal1LZr7oVg5z6lYzrhTgZRCmcUwDgYDVR0PAQH/BAQDAgH2MA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAfaggfl6FZoioecjv0dq8
-/DXo/u11iMZvXn08gjX/zl2b4wtPbShOSY5FhkSm8GeySasz+/Nwb/uzfnIhokWi
-lfPZHtlCWtXbIy/TN51eJyq04ceDCQDWvLC2enVg9KB+GJ34b5c5VaPRzq8MBxsA
-S7ELuYGtmYgYm9NZOIr7yU0=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIB6jCCAZQCAgEtMA0GCSqGSIb3DQEBBAUAMIGAMQswCQYDVQQGEwJVUzE2MDQG
-A1UEChMtTmF0aW9uYWwgQWVyb25hdXRpY3MgYW5kIFNwYWNlIEFkbWluaXN0cmF0
-aW9uMRkwFwYDVQQLExBUZXN0IEVudmlyb25tZW50MR4wHAYDVQQLExVNRDUtUlNB
-LU5BU0EtUGlsb3QtQ0EwHhcNOTYwNDMwMjIwNTAwWhcNOTcwNDMwMjIwNTAwWjCB
-gDELMAkGA1UEBhMCVVMxNjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFu
-ZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEZMBcGA1UECxMQVGVzdCBFbnZpcm9ubWVu
-dDEeMBwGA1UECxMVTUQ1LVJTQS1OQVNBLVBpbG90LUNBMFkwCgYEVQgBAQICAgAD
-SwAwSAJBALmmX5+GqAvcrWK13rfDrNX9UfeA7f+ijyBgeFQjYUoDpFqapw4nzQBL
-bAXug8pKkRwa2Zh8YODhXsRWu2F/UckCAwEAATANBgkqhkiG9w0BAQQFAANBAH9a
-OBA+QCsjxXgnSqHx04gcU8S49DVUb1f2XVoLnHlIb8RnX0k5O6mpHT5eti9bLkiW
-GJNMJ4L0AJ/ac+SmHZc=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICajCCAdMCBDGA0QUwDQYJKoZIhvcNAQEEBQAwfTELMAkGA1UEBhMCQ2ExDzAN
-BgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmlsaXR5IEFjY2VwdGVkMR8w
-HQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRwwGgYDVQQDExNFbnRydXN0
-IERlbW8gV2ViIENBMB4XDTk2MDQyNjEzMzUwMVoXDTA2MDQyNjEzMzUwMVowfTEL
-MAkGA1UEBhMCQ2ExDzANBgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmls
-aXR5IEFjY2VwdGVkMR8wHQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRww
-GgYDVQQDExNFbnRydXN0IERlbW8gV2ViIENBMIGdMA0GCSqGSIb3DQEBAQUAA4GL
-ADCBhwKBgQCaroS7O1DA0hm4IefNYU1cx/nqOmzEnk291d1XqznDeF4wEgakbkCc
-zTKxK791yNpXG5RmngqH7cygDRTHZJ6mfCRn0wGC+AI00F2vYTGqPGRQL1N3lZT0
-YDKFC0SQeMMjFIZ1aeQigroFQnHo0VB3zWIMpNkka8PY9lxHZAmWwQIBAzANBgkq
-hkiG9w0BAQQFAAOBgQBAx0UMVA1s54lMQyXjMX5kj99FJN5itb8bK1Rk+cegPQPF
-cWO9SEWyEjjBjIkjjzAwBkaEszFsNGxemxtXvwjIm1xEUMTVlPEWTs2qnDvAUA9W
-YqhWbhH0toGT36236QAsqCZ76rbTRVSSX2BHyJwJMG2tCRv7kRJ//NIgxj3H4w==
------END CERTIFICATE-----
-
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
-subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
------BEGIN CERTIFICATE-----
-MIICJzCCAZACAQAwDQYJKoZIhvcNAQEEBQAwXDELMAkGA1UEBhMCQVUxEzARBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYD
-VQQDExNUZXN0IFBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTczN1oXDTAxMDYw
-OTEzNTczN1owXDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxGjAY
-BgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYDVQQDExNUZXN0IFBDQSAoMTAy
-NCBiaXQpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdoWk/3+WcMlfjIrkg
-40ketmnQaEogQe1LLcuOJV6rKfUSAsPgwgsabJ/wn8TxA1yy3eKJbFl3OiUXMRsp
-22Jp85PmemiDzyUIStwk72qhp1imbANZvlmlCFKiQrjUyuDfu4TABmn+kkt3vR1Y
-BEOGt+IFye1UBVSATVdRJ2UVhwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABNA1u/S
-Cg/LJZWb7GliiKJsvuhxlE4E5JxQF2zMub/CSNbF97//tYSyj96sxeFQxZXbcjm9
-xt6mr/xNLA4szNQMJ4P+L7b5e/jC5DSqlwS+CUYJgaFs/SP+qJoCSu1bR3IM9XWO
-cRBpDmcBbYLkSyB92WURvsZ1LtjEcn+cdQVI
+subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Server Cert
+issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA
+-----BEGIN CERTIFICATE-----
+MIID5zCCAs+gAwIBAgIJALnu1NlVpZ6zMA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
+VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt
+ZWRpYXRlIENBMB4XDTExMTIwODE0MDE0OFoXDTIxMTAxNjE0MDE0OFowZDELMAkG
+A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU
+RVNUSU5HIFBVUlBPU0VTIE9OTFkxGTAXBgNVBAMMEFRlc3QgU2VydmVyIENlcnQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDzhPOSNtyyRspmeuUpxfNJ
+KCLTuf7g3uQ4zu4iHOmRO5TQci+HhVlLZrHF9XqFXcIP0y4pWDbMSGuiorUmzmfi
+R7bfSdI/+qIQt8KXRH6HNG1t8ou0VSvWId5TS5Dq/er5ODUr9OaaDva7EquHIcMv
+vPQGuI+OEAcnleVCy9HVEIySrO4P3CNIicnGkwwiAud05yUAq/gPXBC1hTtmlPD7
+TVcGVSEiJdvzqqlgv02qedGrkki6GY4S7GjZxrrf7Foc2EP+51LJzwLQx3/JfrCU
+41NEWAsu/Sl0tQabXESN+zJ1pDqoZ3uHMgpQjeGiE0olr+YcsSW/tJmiU9OiAr8R
+AgMBAAGjgY8wgYwwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBeAwLAYJYIZI
+AYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW
+BBSCvM8AABPR9zklmifnr9LvIBturDAfBgNVHSMEGDAWgBQ2w2yI55X+sL3szj49
+hqshgYfa2jANBgkqhkiG9w0BAQUFAAOCAQEAqb1NV0B0/pbpK9Z4/bNjzPQLTRLK
+WnSNm/Jh5v0GEUOE/Beg7GNjNrmeNmqxAlpqWz9qoeoFZax+QBpIZYjROU3TS3fp
+yLsrnlr0CDQ5R7kCCDGa8dkXxemmpZZLbUCpW2Uoy8sAA4JjN9OtsZY7dvUXFgJ7
+vVNTRnI01ghknbtD+2SxSQd3CWF6QhcRMAzZJ1z1cbbwGDDzfvGFPzJ+Sq+zEPds
+xoVLLSetCiBc+40ZcDS5dV98h9XD7JMTQfxzA7mNGv73JoZJA6nFgj+ADSlJsY/t
+JBv+z1iQRueoh9Qeee+ZbRifPouCB8FDx+AltvHTANdAq0t/K3o+pplMVA==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCdoWk/3+WcMlfjIrkg40ketmnQaEogQe1LLcuOJV6rKfUSAsPg
-wgsabJ/wn8TxA1yy3eKJbFl3OiUXMRsp22Jp85PmemiDzyUIStwk72qhp1imbANZ
-vlmlCFKiQrjUyuDfu4TABmn+kkt3vR1YBEOGt+IFye1UBVSATVdRJ2UVhwIDAQAB
-AoGAba4fTtuap5l7/8ZsbE7Z1O32KJY4ZcOZukLOLUUhXxXduT+FTgGWujc0/rgc
-z9qYCLlNZHOouMYTgtSfYvuMuLZ11VIt0GYH+nRioLShE59Yy+zCRyC+gPigS1kz
-xvo14AsOIPYV14Tk/SsHyq6E0eTk7VzaIE197giiINUERPECQQDSKmtPTh/lRKw7
-HSZSM0I1mFWn/1zqrAbontRQY5w98QWIOe5qmzYyFbPXYT3d9BzlsMyhgiRNoBbD
-yvohSHXJAkEAwAHx6ezAZeWWzD5yXD36nyjpkVCw7Tk7TSmOceLJMWt1QcrCfqlS
-xA5jjpQ6Z8suU5DdtWAryM2sAir1WisYzwJAd6Zcx56jvAQ3xcPXsE6scBTVFzrj
-7FqZ6E+cclPzfLQ+QQsyOBE7bpI6e/FJppY26XGZXo3YGzV8IGXrt40oOQJALETG
-h86EFXo3qGOFbmsDy4pdP5nBERCu8X1xUCSfintiD4c2DInxgS5oGclnJeMcjTvL
-QjQoJCX3UJCi/OUO1QJBAKgcDHWjMvt+l1pjJBsSEZ0HX9AAIIVx0RQmbFGS+F2Q
-hhu5l77WnnZOQ9vvhV5u7NPCUF9nhU3jh60qWWO8mkc=
+MIIEpAIBAAKCAQEA84TzkjbcskbKZnrlKcXzSSgi07n+4N7kOM7uIhzpkTuU0HIv
+h4VZS2axxfV6hV3CD9MuKVg2zEhroqK1Js5n4ke230nSP/qiELfCl0R+hzRtbfKL
+tFUr1iHeU0uQ6v3q+Tg1K/Tmmg72uxKrhyHDL7z0BriPjhAHJ5XlQsvR1RCMkqzu
+D9wjSInJxpMMIgLndOclAKv4D1wQtYU7ZpTw+01XBlUhIiXb86qpYL9NqnnRq5JI
+uhmOEuxo2ca63+xaHNhD/udSyc8C0Md/yX6wlONTRFgLLv0pdLUGm1xEjfsydaQ6
+qGd7hzIKUI3hohNKJa/mHLElv7SZolPTogK/EQIDAQABAoIBAADq9FwNtuE5IRQn
+zGtO4q7Y5uCzZ8GDNYr9RKp+P2cbuWDbvVAecYq2NV9QoIiWJOAYZKklOvekIju3
+r0UZLA0PRiIrTg6NrESx3JrjWDK8QNlUO7CPTZ39/K+FrmMkV9lem9yxjJjyC34D
+AQB+YRTx+l14HppjdxNwHjAVQpIx/uO2F5xAMuk32+3K+pq9CZUtrofe1q4Agj9R
+5s8mSy9pbRo9kW9wl5xdEotz1LivFOEiqPUJTUq5J5PeMKao3vdK726XI4Z455Nm
+W2/MA0YV0ug2FYinHcZdvKM6dimH8GLfa3X8xKRfzjGjTiMSwsdjgMa4awY3tEHH
+674jhAECgYEA/zqMrc0zsbNk83sjgaYIug5kzEpN4ic020rSZsmQxSCerJTgNhmg
+utKSCt0Re09Jt3LqG48msahX8ycqDsHNvlEGPQSbMu9IYeO3Wr3fAm75GEtFWePY
+BhM73I7gkRt4s8bUiUepMG/wY45c5tRF23xi8foReHFFe9MDzh8fJFECgYEA9EFX
+4qAik1pOJGNei9BMwmx0I0gfVEIgu0tzeVqT45vcxbxr7RkTEaDoAG6PlbWP6D9a
+WQNLp4gsgRM90ZXOJ4up5DsAWDluvaF4/omabMA+MJJ5kGZ0gCj5rbZbKqUws7x8
+bp+6iBfUPJUbcqNqFmi/08Yt7vrDnMnyMw2A/sECgYEAiiuRMxnuzVm34hQcsbhH
+6ymVqf7j0PW2qK0F4H1ocT9qhzWFd+RB3kHWrCjnqODQoI6GbGr/4JepHUpre1ex
+4UEN5oSS3G0ru0rC3U4C59dZ5KwDHFm7ffZ1pr52ljfQDUsrjjIMRtuiwNK2OoRa
+WSsqiaL+SDzSB+nBmpnAizECgYBdt/y6rerWUx4MhDwwtTnel7JwHyo2MDFS6/5g
+n8qC2Lj6/fMDRE22w+CA2esp7EJNQJGv+b27iFpbJEDh+/Lf5YzIT4MwVskQ5bYB
+JFcmRxUVmf4e09D7o705U/DjCgMH09iCsbLmqQ38ONIRSHZaJtMDtNTHD1yi+jF+
+OT43gQKBgQC/2OHZoko6iRlNOAQ/tMVFNq7fL81GivoQ9F1U0Qr+DH3ZfaH8eIkX
+xT0ToMPJUzWAn8pZv0snA0um6SIgvkCuxO84OkANCVbttzXImIsL7pFzfcwV/ERK
+UM6j0ZuSMFOCr/lGPAoOQU0fskidGEHi1/kW+suSr28TqsyYZpwBDQ==
 -----END RSA PRIVATE KEY-----
-subject=/C=US/O=RSA Data Security, Inc./OU=Commercial Certification Authority
-issuer= /C=US/O=RSA Data Security, Inc./OU=Commercial Certification Authority
-notBefore=941104185834Z
-notAfter =991103185834Z
------BEGIN X509 CERTIFICATE-----
-
-MIICIzCCAZACBQJBAAAWMA0GCSqGSIb3DQEBAgUAMFwxCzAJBgNVBAYTAlVTMSAw
-HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVy
-Y2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDQxODU4MzRaFw05
-OTExMDMxODU4MzRaMFwxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0YSBT
-ZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVyY2lhbCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCk+4Fie84QJ93o
-975sbsZwmdu41QUDaSiCnHJ/lj+O7Kwpkj+KFPhCdr69XQO5kNTQvAayUTNfxMK/
-touPmbZiImDd298ggrTKoi8tUO2UMt7gVY3UaOLgTNLNBRYulWZcYVI4HlGogqHE
-7yXpCuaLK44xZtn42f29O2nZ6wIDAQABMA0GCSqGSIb3DQEBAgUAA34AdrW2EP4j
-9/dZYkuwX5zBaLxJu7NJbyFHXSudVMQAKD+YufKKg5tgf+tQx6sFEC097TgCwaVI
-0v5loMC86qYjFmZsGySp8+x5NRhPJsjjr1BKx6cxa9B8GJ1Qv6km+iYrRpwUqbtb
-MJhCKLVLU7tDCZJAuqiqWqTGtotXTcU=
------END X509 CERTIFICATE-----
-subject=/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
-issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
-notBefore=941109235417Z
-notAfter =991231235417Z
------BEGIN X509 CERTIFICATE-----
-
-MIICKTCCAZYCBQJBAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw
-HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJl
-IFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDkyMzU0MTda
-Fw05OTEyMzEyMzU0MTdaMF8xCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0
-YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJlIFNlcnZlciBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCSznrB
-roM+WqqJg1esJQF2DK2ujiw3zus1eGRUA+WEQFHJv48I4oqCCNIWhjdV6bEhAq12
-aIGaBaJLyUslZiJWbIgHj/eBWW2EB2VwE3F2Ppt3TONQiVaYSLkdpykaEy5KEVmc
-HhXVSVQsczppgrGXOZxtcGdI5d0t1sgeewIDAQABMA0GCSqGSIb3DQEBAgUAA34A
-iNHReSHO4ovo+MF9NFM/YYPZtgs4F7boviGNjwC4i1N+RGceIr2XJ+CchcxK9oU7
-suK+ktPlDemvXA4MRpX/oRxePug2WHpzpgr4IhFrwwk4fia7c+8AvQKk8xQNMD9h
-cHsg/jKjn7P0Z1LctO6EjJY2IN6BCINxIYoPnqk=
------END X509 CERTIFICATE-----
-subject=/C=ZA/SP=Western Cape/L=Cape Town/O=Thawte Consulting cc
-        /OU=Certification Services Division/CN=Thawte Server CA
-        /Email=server-certs@thawte.com
-issuer= /C=ZA/SP=Western Cape/L=Cape Town/O=Thawte Consulting cc
-        /OU=Certification Services Division/CN=Thawte Server CA
-        /Email=server-certs@thawte.com
------BEGIN CERTIFICATE-----
-MIIC+TCCAmICAQAwDQYJKoZIhvcNAQEEBQAwgcQxCzAJBgNVBAYTAlpBMRUwEwYD
-VQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
-VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy
-dmljZXMgRGl2aXNpb24xGTAXBgNVBAMTEFRoYXd0ZSBTZXJ2ZXIgQ0ExJjAkBgkq
-hkiG9w0BCQEWF3NlcnZlci1jZXJ0c0B0aGF3dGUuY29tMB4XDTk2MDcyNzE4MDc1
-N1oXDTk4MDcyNzE4MDc1N1owgcQxCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0
-ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENv
-bnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
-aXNpb24xGTAXBgNVBAMTEFRoYXd0ZSBTZXJ2ZXIgQ0ExJjAkBgkqhkiG9w0BCQEW
-F3NlcnZlci1jZXJ0c0B0aGF3dGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQDTpFBuyP9Wa+bPXbbqDGh1R6KqwtqEJfyo9EdR2oW1IHSUhh4PdcnpCGH1
-Bm0wbhUZAulSwGLbTZme4moMRDjN/r7jZAlwxf6xaym2L0nIO9QnBCUQly/nkG3A
-KEKZ10xD3sP1IW1Un13DWOHA5NlbsLjctHvfNjrCtWYiEtaHDQIDAQABMA0GCSqG
-SIb3DQEBBAUAA4GBAIsvn7ifX3RUIrvYXtpI4DOfARkTogwm6o7OwVdl93yFhDcX
-7h5t0XZ11MUAMziKdde3rmTvzUYIUCYoY5b032IwGMTvdiclK+STN6NP2m5nvFAM
-qJT5gC5O+j/jBuZRQ4i0AMYQr5F4lT8oBJnhgafw6PL8aDY2vMHGSPl9+7uf
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIDDTCCAnYCAQAwDQYJKoZIhvcNAQEEBQAwgc4xCzAJBgNVBAYTAlpBMRUwEwYD
-VQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
-VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy
-dmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBD
-QTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTAeFw05
-NjA3MjcxODA3MTRaFw05ODA3MjcxODA3MTRaMIHOMQswCQYDVQQGEwJaQTEVMBMG
-A1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xHTAbBgNVBAoT
-FFRoYXd0ZSBDb25zdWx0aW5nIGNjMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNl
-cnZpY2VzIERpdmlzaW9uMSEwHwYDVQQDExhUaGF3dGUgUHJlbWl1bSBTZXJ2ZXIg
-Q0ExKDAmBgkqhkiG9w0BCQEWGXByZW1pdW0tc2VydmVyQHRoYXd0ZS5jb20wgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANI2NmqL18JbntqBQWKPOO5JBFXW0O8c
-G5UWR+8YSDU6UvQragaPOy/qVuOvho2eF/eetGV1Ak3vywmiIVHYm9Bn0LoNkgYU
-c9STy5cqAJxcTgy8+hVS/PJEbtoRSm4Iny8t4/mqOoZztkZTWMiJBb2DEbhzP6oH
-jfRCTedAnRw3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAutFIgTRZVYerIZfL9lvR
-w9Eifvvo5KTZ3h+Bj+VzNnyw4Qc/IyXkPOu6SIiH9LQ3sCmWBdxpe+qr4l77rLj2
-GYuMtESFfn1XVALzkYgC7JcPuTOjMfIiMByt+uFf8AV8x0IW/Qkuv+hEQcyM9vxK
-3VZdLbCVIhNoEsysrxCpxcI=
------END CERTIFICATE-----
-Tims test GCI CA
-
------BEGIN CERTIFICATE-----
-MIIB8DCCAZoCAQAwDQYJKoZIhvcNAQEEBQAwgYIxCzAJBgNVBAYTAkFVMRMwEQYD
-VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
-cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2RldmVsb3BtZW50MRkwFwYDVQQDExBD
-cnlwdFNvZnQgRGV2IENBMB4XDTk3MDMyMjEzMzQwNFoXDTk4MDMyMjEzMzQwNFow
-gYIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhC
-cmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2Rl
-dmVsb3BtZW50MRkwFwYDVQQDExBDcnlwdFNvZnQgRGV2IENBMFwwDQYJKoZIhvcN
-AQEBBQADSwAwSAJBAOAOAqogG5QwAmLhzyO4CoRnx/wVy4NZP4dxJy83O1EnL0rw
-OdsamJKvPOLHgSXo3gDu9uVyvCf/QJmZAmC5ml8CAwEAATANBgkqhkiG9w0BAQQF
-AANBADRRS/GVdd7rAqRW6SdmgLJduOU2yq3avBu99kRqbp9A/dLu6r6jU+eP4oOA
-TfdbFZtAAD2Hx9jUtY3tfdrJOb8= 
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIICVjCCAgACAQAwDQYJKoZIhvcNAQEEBQAwgbUxCzAJBgNVBAYTAkFVMRMwEQYD
-VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
-cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsTI1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9O
-IEFVVEhPUklUSUVTMTQwMgYDVQQDEytaRVJPIFZBTFVFIENBIC0gREVNT05TVFJB
-VElPTiBQVVJQT1NFUyBPTkxZMB4XDTk3MDQwMzEzMjI1NFoXDTk4MDQwMzEzMjI1
-NFowgbUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQH
-EwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsT
-I1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9OIEFVVEhPUklUSUVTMTQwMgYDVQQDEyta
-RVJPIFZBTFVFIENBIC0gREVNT05TVFJBVElPTiBQVVJQT1NFUyBPTkxZMFwwDQYJ
-KoZIhvcNAQEBBQADSwAwSAJBAOZ7T7yqP/tyspcko3yPY1y0Cm2EmwNvzW4QgVXR
-Fjs3HmJ4xtSpXdo6mwcGezL3Abt/aQXaxv9PU8xt+Jr0OFUCAwEAATANBgkqhkiG
-9w0BAQQFAANBAOQpYmGgyCqCy1OljgJhCqQOu627oVlHzK1L+t9vBaMfn40AVUR4
-WzQVWO31KTgi5vTK1U+3h46fgUWqQ0h+6rU=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIAwgKADAgECAgEAMA0GCSqGSIb3DQEBBAUAMGIxETAPBgNVBAcTCEludGVybmV0
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVyaVNpZ24gQ2xh
-c3MgMSBDQSAtIEluZGl2aWR1YWwgU3Vic2NyaWJlcjAeFw05NjA0MDgxMDIwMjda
-Fw05NzA0MDgxMDIwMjdaMGIxETAPBgNVBAcTCEludGVybmV0MRcwFQYDVQQKEw5W
-ZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVyaVNpZ24gQ2xhc3MgMSBDQSAtIElu
-ZGl2aWR1YWwgU3Vic2NyaWJlcjCAMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2
-FKbPTdAFDdjKI9BvqrQpkmOOLPhvltcunXZLEbE2jVfJw/0cxrr+Hgi6M8qV6r7j
-W80GqLd5HUQq7XPysVKDaBBwZJHXPmv5912dFEObbpdFmIFH0S3L3bty10w/cari
-QPJUObwW7s987LrbP2wqsxaxhhKdrpM01bjV0Pc+qQIDAQABAAAAADANBgkqhkiG
-9w0BAQQFAAOBgQA+1nJryNt8VBRjRr07ArDAV/3jAH7GjDc9jsrxZS68ost9v06C
-TvTNKGL+LISNmFLXl+JXhgGB0JZ9fvyYzNgHQ46HBUng1H6voalfJgS2KdEo50wW
-8EFZYMDkT1k4uynwJqkVN2QJK/2q4/A/VCov5h6SlM8Affg2W+1TLqvqkwAA
------END CERTIFICATE-----
-
- subject=/L=Internet/O=VeriSign, Inc./OU=VeriSign Class 2 CA - Individual Subscriber
- issuer= /L=Internet/O=VeriSign, Inc./OU=VeriSign Class 2 CA - Individual Subscriber
-
------BEGIN CERTIFICATE-----
-MIIEkzCCA/ygAwIBAgIRANDTUpSRL3nTFeMrMayFSPAwDQYJKoZIhvcNAQECBQAw
-YjERMA8GA1UEBxMISW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQw
-MgYDVQQLEytWZXJpU2lnbiBDbGFzcyAyIENBIC0gSW5kaXZpZHVhbCBTdWJzY3Jp
-YmVyMB4XDTk2MDYwNDAwMDAwMFoXDTk4MDYwNDIzNTk1OVowYjERMA8GA1UEBxMI
-SW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQwMgYDVQQLEytWZXJp
-U2lnbiBDbGFzcyAyIENBIC0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQC6A+2czKGRcYMfm8gdnk+0de99TDDzsqo0v5nb
-RsbUmMcdRQ7nsMbRWe0SAb/9QoLTZ/cJ0iOBqdrkz7UpqqKarVoTSdlSMVM92tWp
-3bJncZHQD1t4xd6lQVdI1/T6R+5J0T1ukOdsI9Jmf+F28S6g3R3L1SFwiHKeZKZv
-z+793wIDAQABo4ICRzCCAkMwggIpBgNVHQMBAf8EggIdMIICGTCCAhUwggIRBgtg
-hkgBhvhFAQcBATCCAgAWggGrVGhpcyBjZXJ0aWZpY2F0ZSBpbmNvcnBvcmF0ZXMg
-YnkgcmVmZXJlbmNlLCBhbmQgaXRzIHVzZSBpcyBzdHJpY3RseSBzdWJqZWN0IHRv
-LCB0aGUgVmVyaVNpZ24gQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQg
-KENQUyksIGF2YWlsYWJsZSBhdDogaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL0NQ
-Uy0xLjA7IGJ5IEUtbWFpbCBhdCBDUFMtcmVxdWVzdHNAdmVyaXNpZ24uY29tOyBv
-ciBieSBtYWlsIGF0IFZlcmlTaWduLCBJbmMuLCAyNTkzIENvYXN0IEF2ZS4sIE1v
-dW50YWluIFZpZXcsIENBIDk0MDQzIFVTQSBUZWwuICsxICg0MTUpIDk2MS04ODMw
-IENvcHlyaWdodCAoYykgMTk5NiBWZXJpU2lnbiwgSW5jLiAgQWxsIFJpZ2h0cyBS
-ZXNlcnZlZC4gQ0VSVEFJTiBXQVJSQU5USUVTIERJU0NMQUlNRUQgYW5kIExJQUJJ
-TElUWSBMSU1JVEVELqAOBgxghkgBhvhFAQcBAQGhDgYMYIZIAYb4RQEHAQECMC8w
-LRYraHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvQ1BTLTEuMDAU
-BglghkgBhvhCAQEBAf8EBAMCAgQwDQYJKoZIhvcNAQECBQADgYEApRJRkNBqLLgs
-53IR/d18ODdLOWMTZ+QOOxBrq460iBEdUwgF8vmPRX1ku7UiDeNzaLlurE6eFqHq
-2zPyK5j60zfTLVJMWKcQWwTJLjHtXrW8pxhNtFc6Fdvy5ZkHnC/9NIl7/t4U6WqB
-p4y+p7SdMIkEwIZfds0VbnQyX5MRUJY=
------END CERTIFICATE-----
-
- subject=/C=US/O=VeriSign, Inc./OU=Class 3 Public Primary Certification Authority
- issuer= /C=US/O=VeriSign, Inc./OU=Class 3 Public Primary Certification Authority
------BEGIN CERTIFICATE-----
-MIICMTCCAZoCBQKhAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBa
-Fw05OTEyMzEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
-biwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyVxZ
-nvIbigEUtBDfBEDb41evakVAj4QMC9Ez2dkRz+4CWB8l9yqoRAWq7AMfeH+ek7ma
-AKojfdashaJjRcdyJ8z0TMZ1cdI5709C8HXfCpDGjiBvmA/4rCNfcCk2pMmG57Ga
-IMtTpYXnPb59mv4kRTPcdhXtD6JxZExlLoFoRacCAwEAATANBgkqhkiG9w0BAQIF
-AAOBgQB1Zmw+0c2B27X4LzZRtvdCvM1Cr9wO+hVs+GeTVzrrtpLotgHKjLeOQ7RJ
-Zfk+7r11Ri7J/CVdqMcvi5uPaM+0nJcYwE3vH9mvgrPmZLiEXIqaB1JDYft0nls6
-NvxMsvwaPxUupVs8G5DsiCnkWRb5zget7Ond2tIxik/W2O8XjQ==
------END CERTIFICATE-----
- subject=/C=US/O=VeriSign, Inc./OU=Class 4 Public Primary Certification Authority
- issuer= /C=US/O=VeriSign, Inc./OU=Class 4 Public Primary Certification Authority
------BEGIN CERTIFICATE-----
-MIICMTCCAZoCBQKmAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBa
-Fw05OTEyMzEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
-biwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0LJ1
-9njQrlpQ9OlQqZ+M1++RlHDo0iSQdomF1t+s5gEXMoDwnZNHvJplnR+Xrr/phnVj
-IIm9gFidBAydqMEk6QvlMXi9/C0MN2qeeIDpRnX57aP7E3vIwUzSo+/1PLBij0pd
-O92VZ48TucE81qcmm+zDO3rZTbxtm+gVAePwR6kCAwEAATANBgkqhkiG9w0BAQIF
-AAOBgQBT3dPwnCR+QKri/AAa19oM/DJhuBUNlvP6Vxt/M3yv6ZiaYch6s7f/sdyZ
-g9ysEvxwyR84Qu1E9oAuW2szaayc01znX1oYx7EteQSWQZGZQbE8DbqEOcY7l/Am
-yY7uvcxClf8exwI/VAx49byqYHwCaejcrOICdmHEPgPq0ook0Q==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/apps/server2.pem b/src/lib/libssl/src/apps/server2.pem
index 8bb664194e..a3927cf788 100644
--- a/src/lib/libssl/src/apps/server2.pem
+++ b/src/lib/libssl/src/apps/server2.pem
@@ -1,376 +1,52 @@
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
-subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Server test cert (1024 bit)
------BEGIN CERTIFICATE-----
-MIICLjCCAZcCAQEwDQYJKoZIhvcNAQEEBQAwWzELMAkGA1UEBhMCQVUxEzARBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYD
-VQQDExJUZXN0IENBICgxMDI0IGJpdCkwHhcNOTcwNjA5MTM1NzU0WhcNOTgwNjA5
-MTM1NzU0WjBkMQswCQYDVQQGEwJBVTETMBEGA1UECBMKUXVlZW5zbGFuZDEaMBgG
-A1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxJDAiBgNVBAMTG1NlcnZlciB0ZXN0IGNl
-cnQgKDEwMjQgYml0KTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsxH1PBPm
-RkxrR11eV4bzNi4N9n11CI8nV29+ARlT1+qDe/mjVUvXlmsr1v/vf71G9GgqopSa
-6RXrICLVdk/FYYYzhPvl1M+OrjaXDFO8BzBAF1Lnz6c7aRZvGRJNrRSr2nZEkqDf
-JW9dY7r2VZEpD5QeuaRYUnuECkqeieB65GMCAwEAATANBgkqhkiG9w0BAQQFAAOB
-gQCWsOta6C0wiVzXz8wPmJKyTrurMlgUss2iSuW9366iwofZddsNg7FXniMzkIf6
-dp7jnmWZwKZ9cXsNUS2o4OL07qOk2HOywC0YsNZQsOBu1CBTYYkIefDiKFL1zQHh
-8lwwNd4NP+OE3NzUNkCfh4DnFfg9WHkXUlD5UpxNRJ4gJA==
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCzEfU8E+ZGTGtHXV5XhvM2Lg32fXUIjydXb34BGVPX6oN7+aNV
-S9eWayvW/+9/vUb0aCqilJrpFesgItV2T8VhhjOE++XUz46uNpcMU7wHMEAXUufP
-pztpFm8ZEk2tFKvadkSSoN8lb11juvZVkSkPlB65pFhSe4QKSp6J4HrkYwIDAQAB
-AoGBAKy8jvb0Lzby8q11yNLf7+78wCVdYi7ugMHcYA1JVFK8+zb1WfSm44FLQo/0
-dSChAjgz36TTexeLODPYxleJndjVcOMVzsLJjSM8dLpXsTS4FCeMbhw2s2u+xqKY
-bbPWfk+HOTyJjfnkcC5Nbg44eOmruq0gSmBeUXVM5UntlTnxAkEA7TGCA3h7kx5E
-Bl4zl2pc3gPAGt+dyfk5Po9mGJUUXhF5p2zueGmYWW74TmOWB1kzt4QRdYMzFePq
-zfDNXEa1CwJBAMFErdY0xp0UJ13WwBbUTk8rujqQdHtjw0klhpbuKkjxu2hN0wwM
-6p0D9qxF7JHaghqVRI0fAW/EE0OzdHMR9QkCQQDNR26dMFXKsoPu+vItljj/UEGf
-QG7gERiQ4yxaFBPHgdpGo0kT31eh9x9hQGDkxTe0GNG/YSgCRvm8+C3TMcKXAkBD
-dhGn36wkUFCddMSAM4NSJ1VN8/Z0y5HzCmI8dM3VwGtGMUQlxKxwOl30LEQzdS5M
-0SWojNYXiT2gOBfBwtbhAkEAhafl5QEOIgUz+XazS/IlZ8goNKdDVfYgK3mHHjvv
-nY5G+AuGebdNkXJr4KSWxDcN+C2i47zuj4QXA16MAOandA==
------END RSA PRIVATE KEY-----
-subject=/C=US/O=AT&T Bell Laboratories/OU=Prototype Research CA
-issuer= /C=US/O=AT&T Bell Laboratories/OU=Prototype Research CA
-notBefore=950413210656Z
-notAfter =970412210656Z
------BEGIN X509 CERTIFICATE-----
-
-MIICCDCCAXECAQAwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCVVMxHzAdBgNV
-BAoUFkFUJlQgQmVsbCBMYWJvcmF0b3JpZXMxHjAcBgNVBAsUFVByb3RvdHlwZSBS
-ZXNlYXJjaCBDQTAeFw05NTA0MTMyMTA2NTZaFw05NzA0MTIyMTA2NTZaME4xCzAJ
-BgNVBAYTAlVTMR8wHQYDVQQKFBZBVCZUIEJlbGwgTGFib3JhdG9yaWVzMR4wHAYD
-VQQLFBVQcm90b3R5cGUgUmVzZWFyY2ggQ0EwgZwwDQYJKoZIhvcNAQEBBQADgYoA
-MIGGAoGAebOmgtSCl+wCYZc86UGYeTLY8cjmW2P0FN8ToT/u2pECCoFdrlycX0OR
-3wt0ZhpFXLVNeDnHwEE9veNUih7pCL2ZBFqoIoQkB1lZmXRiVtjGonz8BLm/qrFM
-YHb0lme/Ol+s118mwKVxnn6bSAeI/OXKhLaVdYZWk+aEaxEDkVkCAQ8wDQYJKoZI
-hvcNAQEEBQADgYEAAZMG14lZmZ8bahkaHaTV9dQf4p2FZiQTFwHP9ZyGsXPC+LT5
-dG5iTaRmyjNIJdPWohZDl97kAci79aBndvuEvRKOjLHs3WRGBIwERnAcnY9Mz8u/
-zIHK23PjYVxGGaZd669OJwD0CYyqH22HH9nFUGaoJdsv39ChW0NRdLE9+y8=
------END X509 CERTIFICATE-----
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
-subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test CA (1024 bit)
------BEGIN CERTIFICATE-----
-MIICJjCCAY8CAQAwDQYJKoZIhvcNAQEEBQAwXDELMAkGA1UEBhMCQVUxEzARBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYD
-VQQDExNUZXN0IFBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTc0M1oXDTAxMDYw
-OTEzNTc0M1owWzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxGjAY
-BgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRswGQYDVQQDExJUZXN0IENBICgxMDI0
-IGJpdCkwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKO7o8t116VP6cgybTsZ
-DCZhr95nYlZuya3aCi1IKoztqwWnjbmDFIriOqGFPrZQ+moMETC9D59iRW/dFXSv
-1F65ka/XY2hLh9exCCo7XuUcDs53Qp3bI3AmMqHjgzE8oO3ajyJAzJkTTOUecQU2
-mw/gI4tMM0LqWMQS7luTy4+xAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAM7achv3v
-hLQJcv/65eGEpBXM40ZDVoFQFFJWaY5p883HTqLB1x4FdzsXHH0QKBTcKpWwqyu4
-YDm3fb8oDugw72bCzfyZK/zVZPR/hVlqI/fvU109Qoc+7oPvIXWky71HfcK6ZBCA
-q30KIqGM/uoM60INq97qjDmCJapagcNBGQs=
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCju6PLddelT+nIMm07GQwmYa/eZ2JWbsmt2gotSCqM7asFp425
-gxSK4jqhhT62UPpqDBEwvQ+fYkVv3RV0r9ReuZGv12NoS4fXsQgqO17lHA7Od0Kd
-2yNwJjKh44MxPKDt2o8iQMyZE0zlHnEFNpsP4COLTDNC6ljEEu5bk8uPsQIDAQAB
-AoGAVZmpFZsDZfr0l2S9tLLwpjRWNOlKATQkno6q2WesT0eGLQufTciY+c8ypfU6
-hyio8r5iUl/VhhdjhAtKx1mRpiotftHo/eYf8rtsrnprOnWG0bWjLjtIoMbcxGn2
-J3bN6LJmbJMjDs0eJ3KnTu646F3nDUw2oGAwmpzKXA1KAP0CQQDRvQhxk2D3Pehs
-HvG665u2pB5ipYQngEFlZO7RHJZzJOZEWSLuuMqaF/7pTfA5jiBvWqCgJeCRRInL
-21ru4dlPAkEAx9jj7BgKn5TYnMoBSSe0afjsV9oApVpN1Nacb1YDtCwy+scp3++s
-nFxlv98wxIlSdpwMUn+AUWfjiWR7Tu/G/wJBAJ/KjwZIrFVxewP0x2ILYsTRYLzz
-MS4PDsO7FB+I0i7DbBOifXS2oNSpd3I0CNMwrxFnUHzynpbOStVfN3ZL5w0CQQCa
-pwFahxBRhkJKsxhjoFJBX9yl75JoY4Wvm5Tbo9ih6UJaRx3kqfkN14L2BKYcsZgb
-KY9vmDOYy6iNfjDeWTfJAkBkfPUb8oTJ/nSP5zN6sqGxSY4krc4xLxpRmxoJ8HL2
-XfhqXkTzbU13RX9JJ/NZ8vQN9Vm2NhxRGJocQkmcdVtJ
------END RSA PRIVATE KEY-----
------BEGIN X509 CERTIFICATE-----
-MIICYDCCAiACAgEoMAkGBSsOAwINBQAwfDELMAkGA1UEBhMCVVMxNjA0BgNVBAoT
-LU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFuZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEZ
-MBcGA1UECxMQVGVzdCBFbnZpcm9ubWVudDEaMBgGA1UECxMRRFNTLU5BU0EtUGls
-b3QtQ0EwHhcNOTYwMjI2MTYzMjQ1WhcNOTcwMjI1MTYzMjQ1WjB8MQswCQYDVQQG
-EwJVUzE2MDQGA1UEChMtTmF0aW9uYWwgQWVyb25hdXRpY3MgYW5kIFNwYWNlIEFk
-bWluaXN0cmF0aW9uMRkwFwYDVQQLExBUZXN0IEVudmlyb25tZW50MRowGAYDVQQL
-ExFEU1MtTkFTQS1QaWxvdC1DQTCB8jAJBgUrDgMCDAUAA4HkADCB4AJBAMA/ssKb
-hPNUG7ZlASfVwEJU21O5OyF/iyBzgHI1O8eOhJGUYO8cc8wDMjR508Mr9cp6Uhl/
-ZB7FV5GkLNEnRHYCQQDUEaSg45P2qrDwixTRhFhmWz5Nvc4lRFQ/42XPcchiJBLb
-bn3QK74T2IxY1yY+kCNq8XrIqf5fJJzIH0J/xUP3AhUAsg2wsQHfDGYk/BOSulX3
-fVd0geUCQQCzCFUQAh+ZkEmp5804cs6ZWBhrUAfnra8lJItYo9xPcXgdIfLfibcX
-R71UsyO77MRD7B0+Ag2tq794IleCVcEEMAkGBSsOAwINBQADLwAwLAIUUayDfreR
-Yh2WeU86/pHNdkUC1IgCFEfxe1f0oMpxJyrJ5XIxTi7vGdoK
------END X509 CERTIFICATE-----
------BEGIN X509 CERTIFICATE-----
-
-MIICGTCCAdgCAwCqTDAJBgUrDgMCDQUAMHwxCzAJBgNVBAYTAlVTMTYwNAYDVQQK
-Ey1OYXRpb25hbCBBZXJvbmF1dGljcyBhbmQgU3BhY2UgQWRtaW5pc3RyYXRpb24x
-GTAXBgNVBAsTEFRlc3QgRW52aXJvbm1lbnQxGjAYBgNVBAsTEURTUy1OQVNBLVBp
-bG90LUNBMB4XDTk2MDUxNDE3MDE0MVoXDTk3MDUxNDE3MDE0MVowMzELMAkGA1UE
-BhMCQVUxDzANBgNVBAoTBk1pbmNvbTETMBEGA1UEAxMKRXJpYyBZb3VuZzCB8jAJ
-BgUrDgMCDAUAA4HkADCB4AJBAKbfHz6vE6pXXMTpswtGUec2tvnfLJUsoxE9qs4+
-ObZX7LmLvragNPUeiTJx7UOWZ5DfBj6bXLc8eYne0lP1g3ACQQDUEaSg45P2qrDw
-ixTRhFhmWz5Nvc4lRFQ/42XPcchiJBLbbn3QK74T2IxY1yY+kCNq8XrIqf5fJJzI
-H0J/xUP3AhUAsg2wsQHfDGYk/BOSulX3fVd0geUCQQCzCFUQAh+ZkEmp5804cs6Z
-WBhrUAfnra8lJItYo9xPcXgdIfLfibcXR71UsyO77MRD7B0+Ag2tq794IleCVcEE
-MAkGBSsOAwINBQADMAAwLQIUWsuuJRE3VT4ueWkWMAJMJaZjj1ECFQCYY0zX4bzM
-LC7obsrHD8XAHG+ZRG==
------END X509 CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICTTCCAbagAwIBAgIBADANBgkqhkiG9w0BAQQFADBMMQswCQYDVQQGEwJHQjEM
-MAoGA1UEChMDVUNMMRgwFgYDVQQLEw9JQ0UtVEVMIFByb2plY3QxFTATBgNVBAMT
-DFRydXN0RmFjdG9yeTAeFw05NzA0MjIxNDM5MTRaFw05ODA0MjIxNDM5MTRaMEwx
-CzAJBgNVBAYTAkdCMQwwCgYDVQQKEwNVQ0wxGDAWBgNVBAsTD0lDRS1URUwgUHJv
-amVjdDEVMBMGA1UEAxMMVHJ1c3RGYWN0b3J5MIGcMAoGBFUIAQECAgQAA4GNADCB
-iQKBgQCEieR8NcXkUW1f0G6aC6u0i8q/98JqS6RxK5YmHIGKCkuTWAUjzLfUa4dt
-U9igGCjTuxaDqlzEim+t/02pmiBZT9HaX++35MjQPUWmsChcYU5WyzGErXi+rQaw
-zlwS73zM8qiPj/97lXYycWhgL0VaiDSPxRXEUdWoaGruom4mNQIDAQABo0IwQDAd
-BgNVHQ4EFgQUHal1LZr7oVg5z6lYzrhTgZRCmcUwDgYDVR0PAQH/BAQDAgH2MA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAfaggfl6FZoioecjv0dq8
-/DXo/u11iMZvXn08gjX/zl2b4wtPbShOSY5FhkSm8GeySasz+/Nwb/uzfnIhokWi
-lfPZHtlCWtXbIy/TN51eJyq04ceDCQDWvLC2enVg9KB+GJ34b5c5VaPRzq8MBxsA
-S7ELuYGtmYgYm9NZOIr7yU0=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIB6jCCAZQCAgEtMA0GCSqGSIb3DQEBBAUAMIGAMQswCQYDVQQGEwJVUzE2MDQG
-A1UEChMtTmF0aW9uYWwgQWVyb25hdXRpY3MgYW5kIFNwYWNlIEFkbWluaXN0cmF0
-aW9uMRkwFwYDVQQLExBUZXN0IEVudmlyb25tZW50MR4wHAYDVQQLExVNRDUtUlNB
-LU5BU0EtUGlsb3QtQ0EwHhcNOTYwNDMwMjIwNTAwWhcNOTcwNDMwMjIwNTAwWjCB
-gDELMAkGA1UEBhMCVVMxNjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFu
-ZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEZMBcGA1UECxMQVGVzdCBFbnZpcm9ubWVu
-dDEeMBwGA1UECxMVTUQ1LVJTQS1OQVNBLVBpbG90LUNBMFkwCgYEVQgBAQICAgAD
-SwAwSAJBALmmX5+GqAvcrWK13rfDrNX9UfeA7f+ijyBgeFQjYUoDpFqapw4nzQBL
-bAXug8pKkRwa2Zh8YODhXsRWu2F/UckCAwEAATANBgkqhkiG9w0BAQQFAANBAH9a
-OBA+QCsjxXgnSqHx04gcU8S49DVUb1f2XVoLnHlIb8RnX0k5O6mpHT5eti9bLkiW
-GJNMJ4L0AJ/ac+SmHZc=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIICajCCAdMCBDGA0QUwDQYJKoZIhvcNAQEEBQAwfTELMAkGA1UEBhMCQ2ExDzAN
-BgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmlsaXR5IEFjY2VwdGVkMR8w
-HQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRwwGgYDVQQDExNFbnRydXN0
-IERlbW8gV2ViIENBMB4XDTk2MDQyNjEzMzUwMVoXDTA2MDQyNjEzMzUwMVowfTEL
-MAkGA1UEBhMCQ2ExDzANBgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmls
-aXR5IEFjY2VwdGVkMR8wHQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRww
-GgYDVQQDExNFbnRydXN0IERlbW8gV2ViIENBMIGdMA0GCSqGSIb3DQEBAQUAA4GL
-ADCBhwKBgQCaroS7O1DA0hm4IefNYU1cx/nqOmzEnk291d1XqznDeF4wEgakbkCc
-zTKxK791yNpXG5RmngqH7cygDRTHZJ6mfCRn0wGC+AI00F2vYTGqPGRQL1N3lZT0
-YDKFC0SQeMMjFIZ1aeQigroFQnHo0VB3zWIMpNkka8PY9lxHZAmWwQIBAzANBgkq
-hkiG9w0BAQQFAAOBgQBAx0UMVA1s54lMQyXjMX5kj99FJN5itb8bK1Rk+cegPQPF
-cWO9SEWyEjjBjIkjjzAwBkaEszFsNGxemxtXvwjIm1xEUMTVlPEWTs2qnDvAUA9W
-YqhWbhH0toGT36236QAsqCZ76rbTRVSSX2BHyJwJMG2tCRv7kRJ//NIgxj3H4w==
------END CERTIFICATE-----
-
-issuer= /C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
-subject=/C=AU/ST=Queensland/O=CryptSoft Pty Ltd/CN=Test PCA (1024 bit)
------BEGIN CERTIFICATE-----
-MIICJzCCAZACAQAwDQYJKoZIhvcNAQEEBQAwXDELMAkGA1UEBhMCQVUxEzARBgNV
-BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYD
-VQQDExNUZXN0IFBDQSAoMTAyNCBiaXQpMB4XDTk3MDYwOTEzNTczN1oXDTAxMDYw
-OTEzNTczN1owXDELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQxGjAY
-BgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMRwwGgYDVQQDExNUZXN0IFBDQSAoMTAy
-NCBiaXQpMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdoWk/3+WcMlfjIrkg
-40ketmnQaEogQe1LLcuOJV6rKfUSAsPgwgsabJ/wn8TxA1yy3eKJbFl3OiUXMRsp
-22Jp85PmemiDzyUIStwk72qhp1imbANZvlmlCFKiQrjUyuDfu4TABmn+kkt3vR1Y
-BEOGt+IFye1UBVSATVdRJ2UVhwIDAQABMA0GCSqGSIb3DQEBBAUAA4GBABNA1u/S
-Cg/LJZWb7GliiKJsvuhxlE4E5JxQF2zMub/CSNbF97//tYSyj96sxeFQxZXbcjm9
-xt6mr/xNLA4szNQMJ4P+L7b5e/jC5DSqlwS+CUYJgaFs/SP+qJoCSu1bR3IM9XWO
-cRBpDmcBbYLkSyB92WURvsZ1LtjEcn+cdQVI
+subject= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = Test Server Cert #2
+issuer= C = UK, O = OpenSSL Group, OU = FOR TESTING PURPOSES ONLY, CN = OpenSSL Test Intermediate CA
+-----BEGIN CERTIFICATE-----
+MIID6jCCAtKgAwIBAgIJALnu1NlVpZ60MA0GCSqGSIb3DQEBBQUAMHAxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMSIwIAYDVQQLDBlGT1IgVEVT
+VElORyBQVVJQT1NFUyBPTkxZMSUwIwYDVQQDDBxPcGVuU1NMIFRlc3QgSW50ZXJt
+ZWRpYXRlIENBMB4XDTExMTIwODE0MDE0OFoXDTIxMTAxNjE0MDE0OFowZzELMAkG
+A1UEBhMCVUsxFjAUBgNVBAoMDU9wZW5TU0wgR3JvdXAxIjAgBgNVBAsMGUZPUiBU
+RVNUSU5HIFBVUlBPU0VTIE9OTFkxHDAaBgNVBAMME1Rlc3QgU2VydmVyIENlcnQg
+IzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrdi7j9yctG+L4EjBy
+gjPmEqZzOJEQba26MoQGzglU7e5Xf59Rb/hgVQuKAoiZe7/R8rK4zJ4W7iXdXw0L
+qBpyG8B5aGKeI32w+A9TcBApoXXL2CrYQEQjZwUIpLlYBIi2NkJj3nVkq5dgl1gO
+ALiQ+W8jg3kzg5Ec9rimp9r93N8wsSL3awsafurmYCvOf7leHaMP1WJ/zDRGUNHG
+/WtDjXc8ZUG1+6EXU9Jc2Fs+2Omf7fcN0l00AK/wPg8OaNS0rKyGq9JdIT9FRGV1
+bXe/rx58FaE5CItdwCSYhJvF/O95LWQoxJXye5bCFLmvDTEyVq9FMSCptfsmbXjE
+ZGsXAgMBAAGjgY8wgYwwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBeAwLAYJ
+YIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1Ud
+DgQWBBR52UaWWTKzZGDH/X4mWNcuqeQVazAfBgNVHSMEGDAWgBQ2w2yI55X+sL3s
+zj49hqshgYfa2jANBgkqhkiG9w0BAQUFAAOCAQEANBW+XYLlHBqVY/31ie+3gRlS
+LPfy4SIqn0t3RJjagT29MXprblBO2cbMO8VGjkQdKGpmMXjxbht2arOOUXRHX4n/
+XTyn/QHEf0bcwIITMReO3DZUPAEw8hSjn9xEOM0IRVOCP+mH5fi74QzzQaZVCyYg
+5VtLKdww/+sc0nCbKl2KWgDluriH0nfVx95qgW3mg9dhXRr0zmf1w2zkBHYpARYL
+Dew6Z8EE4tS3HJu8/qM6meWzNtrfonQ3eiiMxjZBxzV46jchBwa2z9XYhP6AmpPb
+oeTSzcQNbWsxaGYzWo46oLDUZmJOwSBawbS31bZNMCoPIY6ukoesCzFSsUKZww==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCdoWk/3+WcMlfjIrkg40ketmnQaEogQe1LLcuOJV6rKfUSAsPg
-wgsabJ/wn8TxA1yy3eKJbFl3OiUXMRsp22Jp85PmemiDzyUIStwk72qhp1imbANZ
-vlmlCFKiQrjUyuDfu4TABmn+kkt3vR1YBEOGt+IFye1UBVSATVdRJ2UVhwIDAQAB
-AoGAba4fTtuap5l7/8ZsbE7Z1O32KJY4ZcOZukLOLUUhXxXduT+FTgGWujc0/rgc
-z9qYCLlNZHOouMYTgtSfYvuMuLZ11VIt0GYH+nRioLShE59Yy+zCRyC+gPigS1kz
-xvo14AsOIPYV14Tk/SsHyq6E0eTk7VzaIE197giiINUERPECQQDSKmtPTh/lRKw7
-HSZSM0I1mFWn/1zqrAbontRQY5w98QWIOe5qmzYyFbPXYT3d9BzlsMyhgiRNoBbD
-yvohSHXJAkEAwAHx6ezAZeWWzD5yXD36nyjpkVCw7Tk7TSmOceLJMWt1QcrCfqlS
-xA5jjpQ6Z8suU5DdtWAryM2sAir1WisYzwJAd6Zcx56jvAQ3xcPXsE6scBTVFzrj
-7FqZ6E+cclPzfLQ+QQsyOBE7bpI6e/FJppY26XGZXo3YGzV8IGXrt40oOQJALETG
-h86EFXo3qGOFbmsDy4pdP5nBERCu8X1xUCSfintiD4c2DInxgS5oGclnJeMcjTvL
-QjQoJCX3UJCi/OUO1QJBAKgcDHWjMvt+l1pjJBsSEZ0HX9AAIIVx0RQmbFGS+F2Q
-hhu5l77WnnZOQ9vvhV5u7NPCUF9nhU3jh60qWWO8mkc=
+MIIEowIBAAKCAQEA63Yu4/cnLRvi+BIwcoIz5hKmcziREG2tujKEBs4JVO3uV3+f
+UW/4YFULigKImXu/0fKyuMyeFu4l3V8NC6gachvAeWhiniN9sPgPU3AQKaF1y9gq
+2EBEI2cFCKS5WASItjZCY951ZKuXYJdYDgC4kPlvI4N5M4ORHPa4pqfa/dzfMLEi
+92sLGn7q5mArzn+5Xh2jD9Vif8w0RlDRxv1rQ413PGVBtfuhF1PSXNhbPtjpn+33
+DdJdNACv8D4PDmjUtKyshqvSXSE/RURldW13v68efBWhOQiLXcAkmISbxfzveS1k
+KMSV8nuWwhS5rw0xMlavRTEgqbX7Jm14xGRrFwIDAQABAoIBAHLsTPihIfLnYIE5
+x4GsQQ5zXeBw5ITDM37ktwHnQDC+rIzyUl1aLD1AZRBoKinXd4lOTqLZ4/NHKx4A
+DYr58mZtWyUmqLOMmQVuHXTZBlp7XtYuXMMNovQwjQlp9LicBeoBU6gQ5PVMtubD
+F4xGF89Sn0cTHW3iMkqTtQ5KcR1j57OcJO0FEb1vPvk2MXI5ZyAatUYE7YacbEzd
+rg02uIwx3FqNSkuSI79uz4hMdV5TPtuhxx9nTwj9aLUhXFeZ0mn2PVgVzEnnMoJb
++znlsZDgzDlJqdaD744YGWh8Z3OEssB35KfzFcdOeO6yH8lmv2Zfznk7pNPT7LTb
+Lae9VgkCgYEA92p1qnAB3NtJtNcaW53i0S5WJgS1hxWKvUDx3lTB9s8X9fHpqL1a
+E94fDfWzp/hax6FefUKIvBOukPLQ6bYjTMiFoOHzVirghAIuIUoMI5VtLhwD1hKs
+Lr7l/dptMgKb1nZHyXoKHRBthsy3K4+udsPi8TzMvYElgEqyQIe/Rk0CgYEA86GL
+8HC6zLszzKERDPBxrboRmoFvVUCTQDhsfj1M8aR3nQ8V5LkdIJc7Wqm/Ggfk9QRf
+rJ8M2WUMlU5CNnCn/KCrKzCNZIReze3fV+HnKdbcXGLvgbHPrhnz8yYehUFG+RGq
+bVyDWRU94T38izy2s5qMYrMJWZEYyXncSPbfcPMCgYAtaXfxcZ+V5xYPQFARMtiX
+5nZfggvDoJuXgx0h3tK/N2HBfcaSdzbaYLG4gTmZggc/jwnl2dl5E++9oSPhUdIG
+3ONSFUbxsOsGr9PBvnKd8WZZyUCXAVRjPBzAzF+whzQNWCZy/5htnz9LN7YDI9s0
+5113Q96cheDZPFydZY0hHQKBgQDVbEhNukM5xCiNcu+f2SaMnLp9EjQ4h5g3IvaP
+5B16daw/Dw8LzcohWboqIxeAsze0GD/D1ZUJAEd0qBjC3g+a9BjefervCjKOzXng
+38mEUm+6EwVjJSQcjSmycEs+Sr/kwr/8i5WYvU32+jk4tFgMoC+o6tQe/Uesf68k
+z/dPVwKBgGbF7Vv1/3SmhlOy+zYyvJ0CrWtKxH9QP6tLIEgEpd8x7YTSuCH94yok
+kToMXYA3sWNPt22GbRDZ+rcp4c7HkDx6I6vpdP9aQEwJTp0EPy0sgWr2XwYmreIQ
+NFmkk8Itn9EY2R9VBaP7GLv5kvwxDdLAnmwGmzVtbmaVdxCaBwUk
 -----END RSA PRIVATE KEY-----
-subject=/C=US/O=RSA Data Security, Inc./OU=Commercial Certification Authority
-issuer= /C=US/O=RSA Data Security, Inc./OU=Commercial Certification Authority
-notBefore=941104185834Z
-notAfter =991103185834Z
------BEGIN X509 CERTIFICATE-----
-
-MIICIzCCAZACBQJBAAAWMA0GCSqGSIb3DQEBAgUAMFwxCzAJBgNVBAYTAlVTMSAw
-HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVy
-Y2lhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDQxODU4MzRaFw05
-OTExMDMxODU4MzRaMFwxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0YSBT
-ZWN1cml0eSwgSW5jLjErMCkGA1UECxMiQ29tbWVyY2lhbCBDZXJ0aWZpY2F0aW9u
-IEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCk+4Fie84QJ93o
-975sbsZwmdu41QUDaSiCnHJ/lj+O7Kwpkj+KFPhCdr69XQO5kNTQvAayUTNfxMK/
-touPmbZiImDd298ggrTKoi8tUO2UMt7gVY3UaOLgTNLNBRYulWZcYVI4HlGogqHE
-7yXpCuaLK44xZtn42f29O2nZ6wIDAQABMA0GCSqGSIb3DQEBAgUAA34AdrW2EP4j
-9/dZYkuwX5zBaLxJu7NJbyFHXSudVMQAKD+YufKKg5tgf+tQx6sFEC097TgCwaVI
-0v5loMC86qYjFmZsGySp8+x5NRhPJsjjr1BKx6cxa9B8GJ1Qv6km+iYrRpwUqbtb
-MJhCKLVLU7tDCZJAuqiqWqTGtotXTcU=
------END X509 CERTIFICATE-----
-subject=/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
-issuer= /C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
-notBefore=941109235417Z
-notAfter =991231235417Z
------BEGIN X509 CERTIFICATE-----
-
-MIICKTCCAZYCBQJBAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw
-HgYDVQQKExdSU0EgRGF0YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJl
-IFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NDExMDkyMzU0MTda
-Fw05OTEyMzEyMzU0MTdaMF8xCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdSU0EgRGF0
-YSBTZWN1cml0eSwgSW5jLjEuMCwGA1UECxMlU2VjdXJlIFNlcnZlciBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCBmzANBgkqhkiG9w0BAQEFAAOBiQAwgYUCfgCSznrB
-roM+WqqJg1esJQF2DK2ujiw3zus1eGRUA+WEQFHJv48I4oqCCNIWhjdV6bEhAq12
-aIGaBaJLyUslZiJWbIgHj/eBWW2EB2VwE3F2Ppt3TONQiVaYSLkdpykaEy5KEVmc
-HhXVSVQsczppgrGXOZxtcGdI5d0t1sgeewIDAQABMA0GCSqGSIb3DQEBAgUAA34A
-iNHReSHO4ovo+MF9NFM/YYPZtgs4F7boviGNjwC4i1N+RGceIr2XJ+CchcxK9oU7
-suK+ktPlDemvXA4MRpX/oRxePug2WHpzpgr4IhFrwwk4fia7c+8AvQKk8xQNMD9h
-cHsg/jKjn7P0Z1LctO6EjJY2IN6BCINxIYoPnqk=
------END X509 CERTIFICATE-----
-subject=/C=ZA/SP=Western Cape/L=Cape Town/O=Thawte Consulting cc
-        /OU=Certification Services Division/CN=Thawte Server CA
-        /Email=server-certs@thawte.com
-issuer= /C=ZA/SP=Western Cape/L=Cape Town/O=Thawte Consulting cc
-        /OU=Certification Services Division/CN=Thawte Server CA
-        /Email=server-certs@thawte.com
------BEGIN CERTIFICATE-----
-MIIC+TCCAmICAQAwDQYJKoZIhvcNAQEEBQAwgcQxCzAJBgNVBAYTAlpBMRUwEwYD
-VQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
-VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy
-dmljZXMgRGl2aXNpb24xGTAXBgNVBAMTEFRoYXd0ZSBTZXJ2ZXIgQ0ExJjAkBgkq
-hkiG9w0BCQEWF3NlcnZlci1jZXJ0c0B0aGF3dGUuY29tMB4XDTk2MDcyNzE4MDc1
-N1oXDTk4MDcyNzE4MDc1N1owgcQxCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0
-ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENv
-bnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2
-aXNpb24xGTAXBgNVBAMTEFRoYXd0ZSBTZXJ2ZXIgQ0ExJjAkBgkqhkiG9w0BCQEW
-F3NlcnZlci1jZXJ0c0B0aGF3dGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
-iQKBgQDTpFBuyP9Wa+bPXbbqDGh1R6KqwtqEJfyo9EdR2oW1IHSUhh4PdcnpCGH1
-Bm0wbhUZAulSwGLbTZme4moMRDjN/r7jZAlwxf6xaym2L0nIO9QnBCUQly/nkG3A
-KEKZ10xD3sP1IW1Un13DWOHA5NlbsLjctHvfNjrCtWYiEtaHDQIDAQABMA0GCSqG
-SIb3DQEBBAUAA4GBAIsvn7ifX3RUIrvYXtpI4DOfARkTogwm6o7OwVdl93yFhDcX
-7h5t0XZ11MUAMziKdde3rmTvzUYIUCYoY5b032IwGMTvdiclK+STN6NP2m5nvFAM
-qJT5gC5O+j/jBuZRQ4i0AMYQr5F4lT8oBJnhgafw6PL8aDY2vMHGSPl9+7uf
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIDDTCCAnYCAQAwDQYJKoZIhvcNAQEEBQAwgc4xCzAJBgNVBAYTAlpBMRUwEwYD
-VQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsGA1UEChMU
-VGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRpb24gU2Vy
-dmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNlcnZlciBD
-QTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNvbTAeFw05
-NjA3MjcxODA3MTRaFw05ODA3MjcxODA3MTRaMIHOMQswCQYDVQQGEwJaQTEVMBMG
-A1UECBMMV2VzdGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xHTAbBgNVBAoT
-FFRoYXd0ZSBDb25zdWx0aW5nIGNjMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNl
-cnZpY2VzIERpdmlzaW9uMSEwHwYDVQQDExhUaGF3dGUgUHJlbWl1bSBTZXJ2ZXIg
-Q0ExKDAmBgkqhkiG9w0BCQEWGXByZW1pdW0tc2VydmVyQHRoYXd0ZS5jb20wgZ8w
-DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANI2NmqL18JbntqBQWKPOO5JBFXW0O8c
-G5UWR+8YSDU6UvQragaPOy/qVuOvho2eF/eetGV1Ak3vywmiIVHYm9Bn0LoNkgYU
-c9STy5cqAJxcTgy8+hVS/PJEbtoRSm4Iny8t4/mqOoZztkZTWMiJBb2DEbhzP6oH
-jfRCTedAnRw3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAutFIgTRZVYerIZfL9lvR
-w9Eifvvo5KTZ3h+Bj+VzNnyw4Qc/IyXkPOu6SIiH9LQ3sCmWBdxpe+qr4l77rLj2
-GYuMtESFfn1XVALzkYgC7JcPuTOjMfIiMByt+uFf8AV8x0IW/Qkuv+hEQcyM9vxK
-3VZdLbCVIhNoEsysrxCpxcI=
------END CERTIFICATE-----
-Tims test GCI CA
-
------BEGIN CERTIFICATE-----
-MIIB8DCCAZoCAQAwDQYJKoZIhvcNAQEEBQAwgYIxCzAJBgNVBAYTAkFVMRMwEQYD
-VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
-cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2RldmVsb3BtZW50MRkwFwYDVQQDExBD
-cnlwdFNvZnQgRGV2IENBMB4XDTk3MDMyMjEzMzQwNFoXDTk4MDMyMjEzMzQwNFow
-gYIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhC
-cmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2Rl
-dmVsb3BtZW50MRkwFwYDVQQDExBDcnlwdFNvZnQgRGV2IENBMFwwDQYJKoZIhvcN
-AQEBBQADSwAwSAJBAOAOAqogG5QwAmLhzyO4CoRnx/wVy4NZP4dxJy83O1EnL0rw
-OdsamJKvPOLHgSXo3gDu9uVyvCf/QJmZAmC5ml8CAwEAATANBgkqhkiG9w0BAQQF
-AANBADRRS/GVdd7rAqRW6SdmgLJduOU2yq3avBu99kRqbp9A/dLu6r6jU+eP4oOA
-TfdbFZtAAD2Hx9jUtY3tfdrJOb8= 
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIICVjCCAgACAQAwDQYJKoZIhvcNAQEEBQAwgbUxCzAJBgNVBAYTAkFVMRMwEQYD
-VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
-cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsTI1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9O
-IEFVVEhPUklUSUVTMTQwMgYDVQQDEytaRVJPIFZBTFVFIENBIC0gREVNT05TVFJB
-VElPTiBQVVJQT1NFUyBPTkxZMB4XDTk3MDQwMzEzMjI1NFoXDTk4MDQwMzEzMjI1
-NFowgbUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQH
-EwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsT
-I1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9OIEFVVEhPUklUSUVTMTQwMgYDVQQDEyta
-RVJPIFZBTFVFIENBIC0gREVNT05TVFJBVElPTiBQVVJQT1NFUyBPTkxZMFwwDQYJ
-KoZIhvcNAQEBBQADSwAwSAJBAOZ7T7yqP/tyspcko3yPY1y0Cm2EmwNvzW4QgVXR
-Fjs3HmJ4xtSpXdo6mwcGezL3Abt/aQXaxv9PU8xt+Jr0OFUCAwEAATANBgkqhkiG
-9w0BAQQFAANBAOQpYmGgyCqCy1OljgJhCqQOu627oVlHzK1L+t9vBaMfn40AVUR4
-WzQVWO31KTgi5vTK1U+3h46fgUWqQ0h+6rU=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIAwgKADAgECAgEAMA0GCSqGSIb3DQEBBAUAMGIxETAPBgNVBAcTCEludGVybmV0
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVyaVNpZ24gQ2xh
-c3MgMSBDQSAtIEluZGl2aWR1YWwgU3Vic2NyaWJlcjAeFw05NjA0MDgxMDIwMjda
-Fw05NzA0MDgxMDIwMjdaMGIxETAPBgNVBAcTCEludGVybmV0MRcwFQYDVQQKEw5W
-ZXJpU2lnbiwgSW5jLjE0MDIGA1UECxMrVmVyaVNpZ24gQ2xhc3MgMSBDQSAtIElu
-ZGl2aWR1YWwgU3Vic2NyaWJlcjCAMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2
-FKbPTdAFDdjKI9BvqrQpkmOOLPhvltcunXZLEbE2jVfJw/0cxrr+Hgi6M8qV6r7j
-W80GqLd5HUQq7XPysVKDaBBwZJHXPmv5912dFEObbpdFmIFH0S3L3bty10w/cari
-QPJUObwW7s987LrbP2wqsxaxhhKdrpM01bjV0Pc+qQIDAQABAAAAADANBgkqhkiG
-9w0BAQQFAAOBgQA+1nJryNt8VBRjRr07ArDAV/3jAH7GjDc9jsrxZS68ost9v06C
-TvTNKGL+LISNmFLXl+JXhgGB0JZ9fvyYzNgHQ46HBUng1H6voalfJgS2KdEo50wW
-8EFZYMDkT1k4uynwJqkVN2QJK/2q4/A/VCov5h6SlM8Affg2W+1TLqvqkwAA
------END CERTIFICATE-----
-
- subject=/L=Internet/O=VeriSign, Inc./OU=VeriSign Class 2 CA - Individual Subscriber
- issuer= /L=Internet/O=VeriSign, Inc./OU=VeriSign Class 2 CA - Individual Subscriber
-
------BEGIN CERTIFICATE-----
-MIIEkzCCA/ygAwIBAgIRANDTUpSRL3nTFeMrMayFSPAwDQYJKoZIhvcNAQECBQAw
-YjERMA8GA1UEBxMISW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQw
-MgYDVQQLEytWZXJpU2lnbiBDbGFzcyAyIENBIC0gSW5kaXZpZHVhbCBTdWJzY3Jp
-YmVyMB4XDTk2MDYwNDAwMDAwMFoXDTk4MDYwNDIzNTk1OVowYjERMA8GA1UEBxMI
-SW50ZXJuZXQxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTQwMgYDVQQLEytWZXJp
-U2lnbiBDbGFzcyAyIENBIC0gSW5kaXZpZHVhbCBTdWJzY3JpYmVyMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQC6A+2czKGRcYMfm8gdnk+0de99TDDzsqo0v5nb
-RsbUmMcdRQ7nsMbRWe0SAb/9QoLTZ/cJ0iOBqdrkz7UpqqKarVoTSdlSMVM92tWp
-3bJncZHQD1t4xd6lQVdI1/T6R+5J0T1ukOdsI9Jmf+F28S6g3R3L1SFwiHKeZKZv
-z+793wIDAQABo4ICRzCCAkMwggIpBgNVHQMBAf8EggIdMIICGTCCAhUwggIRBgtg
-hkgBhvhFAQcBATCCAgAWggGrVGhpcyBjZXJ0aWZpY2F0ZSBpbmNvcnBvcmF0ZXMg
-YnkgcmVmZXJlbmNlLCBhbmQgaXRzIHVzZSBpcyBzdHJpY3RseSBzdWJqZWN0IHRv
-LCB0aGUgVmVyaVNpZ24gQ2VydGlmaWNhdGlvbiBQcmFjdGljZSBTdGF0ZW1lbnQg
-KENQUyksIGF2YWlsYWJsZSBhdDogaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL0NQ
-Uy0xLjA7IGJ5IEUtbWFpbCBhdCBDUFMtcmVxdWVzdHNAdmVyaXNpZ24uY29tOyBv
-ciBieSBtYWlsIGF0IFZlcmlTaWduLCBJbmMuLCAyNTkzIENvYXN0IEF2ZS4sIE1v
-dW50YWluIFZpZXcsIENBIDk0MDQzIFVTQSBUZWwuICsxICg0MTUpIDk2MS04ODMw
-IENvcHlyaWdodCAoYykgMTk5NiBWZXJpU2lnbiwgSW5jLiAgQWxsIFJpZ2h0cyBS
-ZXNlcnZlZC4gQ0VSVEFJTiBXQVJSQU5USUVTIERJU0NMQUlNRUQgYW5kIExJQUJJ
-TElUWSBMSU1JVEVELqAOBgxghkgBhvhFAQcBAQGhDgYMYIZIAYb4RQEHAQECMC8w
-LRYraHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvQ1BTLTEuMDAU
-BglghkgBhvhCAQEBAf8EBAMCAgQwDQYJKoZIhvcNAQECBQADgYEApRJRkNBqLLgs
-53IR/d18ODdLOWMTZ+QOOxBrq460iBEdUwgF8vmPRX1ku7UiDeNzaLlurE6eFqHq
-2zPyK5j60zfTLVJMWKcQWwTJLjHtXrW8pxhNtFc6Fdvy5ZkHnC/9NIl7/t4U6WqB
-p4y+p7SdMIkEwIZfds0VbnQyX5MRUJY=
------END CERTIFICATE-----
-
- subject=/C=US/O=VeriSign, Inc./OU=Class 3 Public Primary Certification Authority
- issuer= /C=US/O=VeriSign, Inc./OU=Class 3 Public Primary Certification Authority
------BEGIN CERTIFICATE-----
-MIICMTCCAZoCBQKhAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBa
-Fw05OTEyMzEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
-biwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyVxZ
-nvIbigEUtBDfBEDb41evakVAj4QMC9Ez2dkRz+4CWB8l9yqoRAWq7AMfeH+ek7ma
-AKojfdashaJjRcdyJ8z0TMZ1cdI5709C8HXfCpDGjiBvmA/4rCNfcCk2pMmG57Ga
-IMtTpYXnPb59mv4kRTPcdhXtD6JxZExlLoFoRacCAwEAATANBgkqhkiG9w0BAQIF
-AAOBgQB1Zmw+0c2B27X4LzZRtvdCvM1Cr9wO+hVs+GeTVzrrtpLotgHKjLeOQ7RJ
-Zfk+7r11Ri7J/CVdqMcvi5uPaM+0nJcYwE3vH9mvgrPmZLiEXIqaB1JDYft0nls6
-NvxMsvwaPxUupVs8G5DsiCnkWRb5zget7Ond2tIxik/W2O8XjQ==
------END CERTIFICATE-----
- subject=/C=US/O=VeriSign, Inc./OU=Class 4 Public Primary Certification Authority
- issuer= /C=US/O=VeriSign, Inc./OU=Class 4 Public Primary Certification Authority
------BEGIN CERTIFICATE-----
-MIICMTCCAZoCBQKmAAABMA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05NjAxMjkwMDAwMDBa
-Fw05OTEyMzEyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2ln
-biwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgNCBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0LJ1
-9njQrlpQ9OlQqZ+M1++RlHDo0iSQdomF1t+s5gEXMoDwnZNHvJplnR+Xrr/phnVj
-IIm9gFidBAydqMEk6QvlMXi9/C0MN2qeeIDpRnX57aP7E3vIwUzSo+/1PLBij0pd
-O92VZ48TucE81qcmm+zDO3rZTbxtm+gVAePwR6kCAwEAATANBgkqhkiG9w0BAQIF
-AAOBgQBT3dPwnCR+QKri/AAa19oM/DJhuBUNlvP6Vxt/M3yv6ZiaYch6s7f/sdyZ
-g9ysEvxwyR84Qu1E9oAuW2szaayc01znX1oYx7EteQSWQZGZQbE8DbqEOcY7l/Am
-yY7uvcxClf8exwI/VAx49byqYHwCaejcrOICdmHEPgPq0ook0Q==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/apps/sess_id.c b/src/lib/libssl/src/apps/sess_id.c
index b99179f276..b16686c26d 100644
--- a/src/lib/libssl/src/apps/sess_id.c
+++ b/src/lib/libssl/src/apps/sess_id.c
@@ -90,6 +90,7 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
         {
         SSL_SESSION *x=NULL;
+        X509 *peer = NULL;
         int ret=1,i,num,badops=0;
         BIO *out=NULL;
         int informat,outformat;
@@ -163,16 +164,17 @@ bad:
         ERR_load_crypto_strings();
         x=load_sess_id(infile,informat);
         if (x == NULL) { goto end; }
+        peer = SSL_SESSION_get0_peer(x);
 
         if(context)
             {
-            x->sid_ctx_length=strlen(context);
-            if(x->sid_ctx_length > SSL_MAX_SID_CTX_LENGTH)
+            size_t ctx_len = strlen(context);
+            if(ctx_len > SSL_MAX_SID_CTX_LENGTH)
                 {
                 BIO_printf(bio_err,"Context too long\n");
                 goto end;
                 }
-            memcpy(x->sid_ctx,context,x->sid_ctx_length);
+            SSL_SESSION_set1_id_context(x, (unsigned char *)context, ctx_len);
             }
 
 #ifdef undef
@@ -231,10 +233,10 @@ bad:
 
                 if (cert)
                         {
-                        if (x->peer == NULL)
+                        if (peer == NULL)
                                 BIO_puts(out,"No certificate present\n");
                         else
-                                X509_print(out,x->peer);
+                                X509_print(out,peer);
                         }
                 }
 
@@ -253,12 +255,12 @@ bad:
                         goto end;
                         }
                 }
-        else if (!noout && (x->peer != NULL)) /* just print the certificate */
+        else if (!noout && (peer != NULL)) /* just print the certificate */
                 {
                 if      (outformat == FORMAT_ASN1)
-                        i=(int)i2d_X509_bio(out,x->peer);
+                        i=(int)i2d_X509_bio(out,peer);
                 else if (outformat == FORMAT_PEM)
-                        i=PEM_write_bio_X509(out,x->peer);
+                        i=PEM_write_bio_X509(out,peer);
                 else    {
                         BIO_printf(bio_err,"bad output format specified for outfile\n");
                         goto end;
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c
index 65f85fecf7..8358b12fdd 100644
--- a/src/lib/libssl/src/apps/speed.c
+++ b/src/lib/libssl/src/apps/speed.c
@@ -108,8 +108,14 @@
 #include <signal.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__CYGWIN__)
 #include <windows.h>
+# if defined(__CYGWIN__) && !defined(_WIN32)
+  /* <windows.h> should define _WIN32, which normally is mutually
+   * exclusive with __CYGWIN__, but if it didn't... */
+#  define _WIN32
+  /* this is done because Cygwin alarm() fails sometimes. */
+# endif
 #endif
 
 #include <openssl/bn.h>
@@ -183,6 +189,25 @@
 #ifndef OPENSSL_NO_ECDH
 #include <openssl/ecdh.h>
 #endif
+#include <openssl/modes.h>
+
+#ifdef OPENSSL_FIPS
+#ifdef OPENSSL_DOING_MAKEDEPEND
+#undef AES_set_encrypt_key
+#undef AES_set_decrypt_key
+#undef DES_set_key_unchecked
+#endif
+#define BF_set_key      private_BF_set_key
+#define CAST_set_key    private_CAST_set_key
+#define idea_set_encrypt_key    private_idea_set_encrypt_key
+#define SEED_set_key    private_SEED_set_key
+#define RC2_set_key     private_RC2_set_key
+#define RC4_set_key     private_RC4_set_key
+#define DES_set_key_unchecked   private_DES_set_key_unchecked
+#define AES_set_encrypt_key     private_AES_set_encrypt_key
+#define AES_set_decrypt_key     private_AES_set_decrypt_key
+#define Camellia_set_key        private_Camellia_set_key
+#endif
 
 #ifndef HAVE_FORK
 # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
@@ -214,7 +239,7 @@ static void print_result(int alg,int run_no,int count,double time_used);
 static int do_multi(int multi);
 #endif
 
-#define ALGOR_NUM       29
+#define ALGOR_NUM       30
 #define SIZE_NUM        5
 #define RSA_NUM         4
 #define DSA_NUM         3
@@ -229,7 +254,7 @@ static const char *names[ALGOR_NUM]={
   "aes-128 cbc","aes-192 cbc","aes-256 cbc",
   "camellia-128 cbc","camellia-192 cbc","camellia-256 cbc",
   "evp","sha256","sha512","whirlpool",
-  "aes-128 ige","aes-192 ige","aes-256 ige"};
+  "aes-128 ige","aes-192 ige","aes-256 ige","ghash"};
 static double results[ALGOR_NUM][SIZE_NUM];
 static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
 #ifndef OPENSSL_NO_RSA
@@ -273,9 +298,12 @@ static SIGRETTYPE sig_done(int sig)
 
 #if defined(_WIN32)
 
+#if !defined(SIGALRM)
 #define SIGALRM
+#endif
 static unsigned int lapse,schlock;
-static void alarm(unsigned int secs) { lapse = secs*1000; }
+static void alarm_win32(unsigned int secs) { lapse = secs*1000; }
+#define alarm alarm_win32
 
 static DWORD WINAPI sleepy(VOID *arg)
         {
@@ -469,6 +497,7 @@ int MAIN(int argc, char **argv)
 #define D_IGE_128_AES   26
 #define D_IGE_192_AES   27
 #define D_IGE_256_AES   28
+#define D_GHASH         29
         double d=0.0;
         long c[ALGOR_NUM][SIZE_NUM];
 #define R_DSA_512       0
@@ -894,6 +923,10 @@ int MAIN(int argc, char **argv)
                         doit[D_CBC_192_AES]=1;
                         doit[D_CBC_256_AES]=1;
                         }
+                else if (strcmp(*argv,"ghash") == 0)
+                        {
+                        doit[D_GHASH]=1;
+                        }
                 else
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
@@ -1264,6 +1297,7 @@ int MAIN(int argc, char **argv)
         c[D_IGE_128_AES][0]=count;
         c[D_IGE_192_AES][0]=count;
         c[D_IGE_256_AES][0]=count;
+        c[D_GHASH][0]=count;
 
         for (i=1; i<SIZE_NUM; i++)
                 {
@@ -1458,7 +1492,7 @@ int MAIN(int argc, char **argv)
 # error "You cannot disable DES on systems without SIGALRM."
 #endif /* OPENSSL_NO_DES */
 #else
-#define COND(c) (run)
+#define COND(c) (run && count<0x7fffffff)
 #define COUNT(d) (count)
 #ifndef _WIN32
         signal(SIGALRM,sig_done);
@@ -1754,7 +1788,22 @@ int MAIN(int argc, char **argv)
                         print_result(D_IGE_256_AES,j,count,d);
                         }
                 }
+        if (doit[D_GHASH])
+                {
+                GCM128_CONTEXT *ctx = CRYPTO_gcm128_new(&aes_ks1,(block128_f)AES_encrypt);
+                CRYPTO_gcm128_setiv (ctx,(unsigned char *)"0123456789ab",12);
 
+                for (j=0; j<SIZE_NUM; j++)
+                        {
+                        print_message(names[D_GHASH],c[D_GHASH][j],lengths[j]);
+                        Time_F(START);
+                        for (count=0,run=1; COND(c[D_GHASH][j]); count++)
+                                CRYPTO_gcm128_aad(ctx,buf,lengths[j]);
+                        d=Time_F(STOP);
+                        print_result(D_GHASH,j,count,d);
+                        }
+                CRYPTO_gcm128_release(ctx);
+                }
 
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
@@ -2548,7 +2597,7 @@ static void pkey_print_message(const char *str, const char *str2, long num,
         BIO_printf(bio_err,mr ? "+DTP:%d:%s:%s:%d\n"
                            : "Doing %d bit %s %s's for %ds: ",bits,str,str2,tm);
         (void)BIO_flush(bio_err);
-        alarm(RSA_SECONDS);
+        alarm(tm);
 #else
         BIO_printf(bio_err,mr ? "+DNP:%ld:%d:%s:%s\n"
                            : "Doing %ld %d bit %s %s's: ",num,bits,str,str2);
@@ -2608,7 +2657,11 @@ static int do_multi(int multi)
         fds=malloc(multi*sizeof *fds);
         for(n=0 ; n < multi ; ++n)
                 {
-                pipe(fd);
+                if (pipe(fd) == -1)
+                        {
+                        fprintf(stderr, "pipe failure\n");
+                        exit(1);
+                        }
                 fflush(stdout);
                 fflush(stderr);
                 if(fork())
@@ -2620,7 +2673,11 @@ static int do_multi(int multi)
                         {
                         close(fd[0]);
                         close(1);
-                        dup(fd[1]);
+                        if (dup(fd[1]) == -1)
+                                {
+                                fprintf(stderr, "dup failed\n");
+                                exit(1);
+                                }
                         close(fd[1]);
                         mr=1;
                         usertime=0;
diff --git a/src/lib/libssl/src/apps/verify.c b/src/lib/libssl/src/apps/verify.c
index 9163997e93..b9749dcd36 100644
--- a/src/lib/libssl/src/apps/verify.c
+++ b/src/lib/libssl/src/apps/verify.c
@@ -230,6 +230,7 @@ int MAIN(int argc, char **argv)
 end:
         if (ret == 1) {
                 BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
+                BIO_printf(bio_err," [-attime timestamp]");
 #ifndef OPENSSL_NO_ENGINE
                 BIO_printf(bio_err," [-engine e]");
 #endif
diff --git a/src/lib/libssl/src/apps/x509.c b/src/lib/libssl/src/apps/x509.c
index 9f5eaeb6be..e6e5e0d4e5 100644
--- a/src/lib/libssl/src/apps/x509.c
+++ b/src/lib/libssl/src/apps/x509.c
@@ -157,9 +157,10 @@ static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx);
 static int sign (X509 *x, EVP_PKEY *pkey,int days,int clrext, const EVP_MD *digest,
                                                 CONF *conf, char *section);
 static int x509_certify (X509_STORE *ctx,char *CAfile,const EVP_MD *digest,
-                         X509 *x,X509 *xca,EVP_PKEY *pkey,char *serial,
-                         int create,int days, int clrext, CONF *conf, char *section,
-                                                ASN1_INTEGER *sno);
+                         X509 *x,X509 *xca,EVP_PKEY *pkey,
+                         STACK_OF(OPENSSL_STRING) *sigopts,
+                         char *serial, int create ,int days, int clrext,
+                         CONF *conf, char *section, ASN1_INTEGER *sno);
 static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt);
 static int reqfile=0;
 
@@ -172,6 +173,7 @@ int MAIN(int argc, char **argv)
         X509_REQ *req=NULL;
         X509 *x=NULL,*xca=NULL;
         ASN1_OBJECT *objtmp;
+        STACK_OF(OPENSSL_STRING) *sigopts = NULL;
         EVP_PKEY *Upkey=NULL,*CApkey=NULL;
         ASN1_INTEGER *sno = NULL;
         int i,num,badops=0;
@@ -271,6 +273,15 @@ int MAIN(int argc, char **argv)
                         if (--argc < 1) goto bad;
                         CAkeyformat=str2fmt(*(++argv));
                         }
+                else if (strcmp(*argv,"-sigopt") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        if (!sigopts)
+                                sigopts = sk_OPENSSL_STRING_new_null();
+                        if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
+                                goto bad;
+                        }
                 else if (strcmp(*argv,"-days") == 0)
                         {
                         if (--argc < 1) goto bad;
@@ -970,7 +981,8 @@ bad:
                                 
                                 assert(need_rand);
                                 if (!x509_certify(ctx,CAfile,digest,x,xca,
-                                        CApkey, CAserial,CA_createserial,days, clrext,
+                                        CApkey, sigopts,
+                                        CAserial,CA_createserial,days, clrext,
                                         extconf, extsect, sno))
                                         goto end;
                                 }
@@ -1081,6 +1093,8 @@ end:
         X509_free(xca);
         EVP_PKEY_free(Upkey);
         EVP_PKEY_free(CApkey);
+        if (sigopts)
+                sk_OPENSSL_STRING_free(sigopts);
         X509_REQ_free(rq);
         ASN1_INTEGER_free(sno);
         sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
@@ -1131,8 +1145,11 @@ static ASN1_INTEGER *x509_load_serial(char *CAfile, char *serialfile, int create
         }
 
 static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest,
-             X509 *x, X509 *xca, EVP_PKEY *pkey, char *serialfile, int create,
-             int days, int clrext, CONF *conf, char *section, ASN1_INTEGER *sno)
+                        X509 *x, X509 *xca, EVP_PKEY *pkey,
+                        STACK_OF(OPENSSL_STRING) *sigopts,
+                        char *serialfile, int create,
+                        int days, int clrext, CONF *conf, char *section,
+                        ASN1_INTEGER *sno)
         {
         int ret=0;
         ASN1_INTEGER *bs=NULL;
@@ -1191,7 +1208,8 @@ static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest,
                 if (!X509V3_EXT_add_nconf(conf, &ctx2, section, x)) goto end;
                 }
 
-        if (!X509_sign(x,pkey,digest)) goto end;
+        if (!do_X509_sign(bio_err, x, pkey, digest, sigopts))
+                goto end;
         ret=1;
 end:
         X509_STORE_CTX_cleanup(&xsc);
diff --git a/src/lib/libssl/src/config b/src/lib/libssl/src/config
index cf64ec563e..88b9bc69da 100644
--- a/src/lib/libssl/src/config
+++ b/src/lib/libssl/src/config
@@ -370,6 +370,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
     NONSTOP_KERNEL*)
        echo "nsr-tandem-nsk"; exit 0;
        ;;
+
+    vxworks*)
+       echo "${MACHINE}-whatever-vxworks"; exit 0;
+       ;;
 esac
 
 #
@@ -407,23 +411,18 @@ exit 0
 # this is where the translation occurs into SSLeay terms
 # ---------------------------------------------------------------------------
 
-GCCVER=`(gcc -dumpversion) 2>/dev/null`
-if [ "$GCCVER" != "" ]; then
-  # then strip off whatever prefix egcs prepends the number with...
-  # Hopefully, this will work for any future prefixes as well.
-  GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
-  # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
-  # does give us what we want though, so we use that.  We just just the
-  # major and minor version numbers.
-  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
-  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
-fi
-
 # Only set CC if not supplied already
-if [ -z "$CC" ]; then
-# figure out if gcc is available and if so we use it otherwise
-# we fallback to whatever cc does on the system
+if [ -z "$CROSS_COMPILE$CC" ]; then
+  GCCVER=`sh -c "gcc -dumpversion" 2>/dev/null`
   if [ "$GCCVER" != "" ]; then
+    # then strip off whatever prefix egcs prepends the number with...
+    # Hopefully, this will work for any future prefixes as well.
+    GCCVER=`echo $GCCVER | LC_ALL=C sed 's/^[a-zA-Z]*\-//'`
+    # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
+    # does give us what we want though, so we use that.  We just just the
+    # major and minor version numbers.
+    # peak single digit before and after first dot, e.g. 2.95.1 gives 29
+    GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
     CC=gcc
   else
     CC=cc
@@ -539,7 +538,7 @@ case "$GUESSOS" in
   ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
   ppc-apple-darwin*)
         ISA64=`(sysctl -n hw.optional.64bitops) 2>/dev/null`
-        if [ "$ISA64" = "1" ]; then
+        if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
             echo "WARNING! If you wish to build 64-bit library, then you have to"
             echo "         invoke './Configure darwin64-ppc-cc' *manually*."
             if [ "$TEST" = "false" -a -t 1 ]; then
@@ -547,10 +546,14 @@ case "$GUESSOS" in
               (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
             fi
         fi
-        OUT="darwin-ppc-cc" ;;
+        if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+            OUT="darwin64-ppc-cc"
+        else
+            OUT="darwin-ppc-cc"
+        fi ;;
   i?86-apple-darwin*)
         ISA64=`(sysctl -n hw.optional.x86_64) 2>/dev/null`
-        if [ "$ISA64" = "1" ]; then
+        if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
             echo "WARNING! If you wish to build 64-bit library, then you have to"
             echo "         invoke './Configure darwin64-x86_64-cc' *manually*."
             if [ "$TEST" = "false" -a -t 1 ]; then
@@ -558,7 +561,17 @@ case "$GUESSOS" in
               (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
             fi
         fi
-        OUT="darwin-i386-cc" ;;
+        if [ "$ISA64" = "1" -a "$KERNEL_BITS" = "64" ]; then
+            OUT="darwin64-x86_64-cc"
+        else
+            OUT="darwin-i386-cc"
+        fi ;;
+  armv6+7-*-iphoneos)
+        options="$options -arch%20armv6 -arch%20armv7"
+        OUT="iphoneos-cross" ;;
+  *-*-iphoneos)
+        options="$options -arch%20${MACHINE}"
+        OUT="iphoneos-cross" ;;
   alpha-*-linux2)
         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
         case ${ISA:-generic} in
@@ -583,6 +596,11 @@ case "$GUESSOS" in
         OUT="linux-ppc"
         ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
+  ppc60x-*-vxworks*) OUT="vxworks-ppc60x" ;;
+  ppcgen-*-vxworks*) OUT="vxworks-ppcgen" ;;
+  pentium-*-vxworks*) OUT="vxworks-pentium" ;;
+  simlinux-*-vxworks*) OUT="vxworks-simlinux" ;;
+  mips-*-vxworks*) OUT="vxworks-mips";;
   ia64-*-linux?) OUT="linux-ia64" ;;
   sparc64-*-linux2)
         echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI"
@@ -624,12 +642,24 @@ case "$GUESSOS" in
         options="$options -DB_ENDIAN -mschedule=$CPUSCHEDULE -march=$CPUARCH"
         OUT="linux-generic32" ;;
   armv[1-3]*-*-linux2) OUT="linux-generic32" ;;
+  armv[7-9]*-*-linux2) OUT="linux-armv4"; options="$options -march=armv7-a" ;;
   arm*-*-linux2) OUT="linux-armv4" ;;
   sh*b-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
   sh*-*-linux2)  OUT="linux-generic32"; options="$options -DL_ENDIAN" ;;
   m68k*-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
   s390-*-linux2) OUT="linux-generic32"; options="$options -DB_ENDIAN" ;;
-  s390x-*-linux2) OUT="linux-s390x" ;;
+  s390x-*-linux2)
+        # To be uncommented when glibc bug is fixed, see Configure...
+        #if egrep -e '^features.* highgprs' /proc/cpuinfo >/dev/null ; then
+        #  echo "WARNING! If you wish to build \"highgprs\" 32-bit library, then you"
+        #  echo "         have to invoke './Configure linux32-s390x' *manually*."
+        #  if [ "$TEST" = "false" -a -t -1 ]; then
+        #    echo "         You have about 5 seconds to press Ctrl-C to abort."
+        #    (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
+        #  fi
+        #fi
+        OUT="linux64-s390x"
+        ;;
   x86_64-*-linux?) OUT="linux-x86_64" ;;
   *86-*-linux2) OUT="linux-elf"
         if [ "$GCCVER" -gt 28 ]; then
@@ -648,7 +678,7 @@ case "$GUESSOS" in
   sun4[uv]*-*-solaris2)
         OUT="solaris-sparcv9-$CC"
         ISA64=`(isalist) 2>/dev/null | grep sparcv9`
-        if [ "$ISA64" != "" ]; then
+        if [ "$ISA64" != "" -a "$KERNEL_BITS" = "" ]; then
             if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
                 echo "WARNING! If you wish to build 64-bit library, then you have to"
                 echo "         invoke './Configure solaris64-sparcv9-cc' *manually*."
@@ -678,13 +708,16 @@ case "$GUESSOS" in
                 fi
             fi
         fi
+        if [ "$ISA64" != "" -a "$KERNEL_BITS" = "64" ]; then
+            OUT="solaris64-sparcv9-$CC"
+        fi
         ;;
   sun4m-*-solaris2)     OUT="solaris-sparcv8-$CC" ;;
   sun4d-*-solaris2)     OUT="solaris-sparcv8-$CC" ;;
   sun4*-*-solaris2)     OUT="solaris-sparcv7-$CC" ;;
   *86*-*-solaris2)
         ISA64=`(isalist) 2>/dev/null | grep amd64`
-        if [ "$ISA64" != "" ]; then
+        if [ "$ISA64" != "" -a ${KERNEL_BITS:-64} -eq 64 ]; then
             OUT="solaris64-x86_64-$CC"
         else
             OUT="solaris-x86-$CC"
@@ -736,20 +769,17 @@ case "$GUESSOS" in
         if [ $CC = "gcc" -a $GCC_BITS = "64" ]; then
             OUT="hpux64-parisc2-gcc"
         fi
-        KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
+        [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
         KERNEL_BITS=${KERNEL_BITS:-32}
         CPU_VERSION=`(getconf CPU_VERSION) 2>/dev/null`
         CPU_VERSION=${CPU_VERSION:-0}
         # See <sys/unistd.h> for further info on CPU_VERSION.
         if   [ $CPU_VERSION -ge 768 ]; then     # IA-64 CPU
-             echo "WARNING! 64-bit ABI is the default configured ABI on HP-UXi."
-             echo "         If you wish to build 32-bit library, the you have to"
-             echo "         invoke './Configure hpux-ia64-cc' *manually*."
-             if [ "$TEST" = "false" -a -t 1 ]; then
-                echo "         You have about 5 seconds to press Ctrl-C to abort."
-                (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1
-             fi
-             OUT="hpux64-ia64-cc"
+             if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
+                OUT="hpux64-ia64-cc"
+             else
+                OUT="hpux-ia64-cc"
+             fi
         elif [ $CPU_VERSION -ge 532 ]; then     # PA-RISC 2.x CPU
              OUT=${OUT:-"hpux-parisc2-${CC}"}
              if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
@@ -770,7 +800,7 @@ case "$GUESSOS" in
         options="$options -D_REENTRANT" ;;
   *-hpux)       OUT="hpux-parisc-$CC" ;;
   *-aix)
-        KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
+        [ "$KERNEL_BITS" ] || KERNEL_BITS=`(getconf KERNEL_BITMODE) 2>/dev/null`
         KERNEL_BITS=${KERNEL_BITS:-32}
         OBJECT_MODE=${OBJECT_MODE:-32}
         if [ "$CC" = "gcc" ]; then
@@ -810,6 +840,8 @@ case "$GUESSOS" in
   beos-*) OUT="$GUESSOS" ;;
   x86pc-*-qnx6) OUT="QNX6-i386" ;;
   *-*-qnx6) OUT="QNX6" ;;
+  x86-*-android|i?86-*-android) OUT="android-x86" ;;
+  armv[7-9]*-*-android) OUT="android-armv7" ;;
   *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac
 
@@ -825,9 +857,11 @@ esac
 #  options="$options -DATALLA"
 #fi
 
-($CC -Wa,--help -c -o /dev/null -x assembler /dev/null 2>&1 | \
- grep \\--noexecstack) 2>&1 > /dev/null && \
+if expr "$options" : '.*no\-asm' > /dev/null; then :; else
+  sh -c "$CROSS_COMPILE${CC:-gcc} -Wa,--help -c -o /tmp/null.$$.o -x assembler /dev/null && rm /tmp/null.$$.o" 2>&1 | \
+  grep \\--noexecstack >/dev/null && \
   options="$options -Wa,--noexecstack"
+fi
 
 # gcc < 2.8 does not support -march=ultrasparc
 if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ]
diff --git a/src/lib/libssl/src/crypto/Makefile b/src/lib/libssl/src/crypto/Makefile
index 85d9f249c5..947dd5d44e 100644
--- a/src/lib/libssl/src/crypto/Makefile
+++ b/src/lib/libssl/src/crypto/Makefile
@@ -7,7 +7,7 @@ TOP=		..
 CC=             cc
 INCLUDE=        -I. -I$(TOP) -I../include $(ZLIB_INCLUDE)
 # INCLUDES targets sudbirs!
-INCLUDES=       -I.. -I../.. -I../asn1 -I../evp -I../../include $(ZLIB_INCLUDE)
+INCLUDES=       -I.. -I../.. -I../modes -I../asn1 -I../evp -I../../include $(ZLIB_INCLUDE)
 CFLAG=          -g
 MAKEDEPPROG=    makedepend
 MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
@@ -34,8 +34,10 @@ GENERAL=Makefile README crypto-lib.com install.com
 
 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= libcrypto$(SHLIB_EXT)
-LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c
-LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o $(CPUID_OBJ)
+LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
+        ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c
+LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \
+        uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o $(CPUID_OBJ)
 
 SRC= $(LIBSRC)
 
@@ -67,14 +69,13 @@ applink.o:	$(TOP)/ms/applink.c
 uplink.o:       $(TOP)/ms/uplink.c applink.o
         $(CC) $(CFLAGS) -c -o $@ $(TOP)/ms/uplink.c
 
-uplink-cof.s:   $(TOP)/ms/uplink.pl
-        $(PERL) $(TOP)/ms/uplink.pl coff > $@
+uplink-x86.s:   $(TOP)/ms/uplink-x86.pl
+        $(PERL) $(TOP)/ms/uplink-x86.pl $(PERLASM_SCHEME) > $@
 
-x86_64cpuid.s: x86_64cpuid.pl
-        $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
-ia64cpuid.s: ia64cpuid.S
-        $(CC) $(CFLAGS) -E ia64cpuid.S > $@
+x86_64cpuid.s: x86_64cpuid.pl;  $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@
+ia64cpuid.s: ia64cpuid.S;       $(CC) $(CFLAGS) -E ia64cpuid.S > $@
 ppccpuid.s:     ppccpuid.pl;    $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@
+pariscid.s:     pariscid.pl;    $(PERL) pariscid.pl $(PERLASM_SCHEME) $@
 alphacpuid.s:   alphacpuid.pl
         $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
 
@@ -102,6 +103,7 @@ lib:	$(LIB)
         @touch lib
 $(LIB): $(LIBOBJ)
         $(AR) $(LIB) $(LIBOBJ)
+        [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
         $(RANLIB) $(LIB) || echo Never mind.
 
 shared: buildinf.h lib subdirs
@@ -171,6 +173,7 @@ ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 ex_data.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
 ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
 ex_data.o: ex_data.c
+fips_ers.o: ../include/openssl/opensslconf.h fips_ers.c
 mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
 mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
@@ -191,6 +194,19 @@ mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
 mem_dbg.o: mem_dbg.c
 o_dir.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
 o_dir.o: LPdir_unix.c o_dir.c o_dir.h
+o_fips.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
+o_fips.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+o_fips.o: ../include/openssl/err.h ../include/openssl/lhash.h
+o_fips.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+o_fips.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+o_fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h
+o_fips.o: o_fips.c
+o_init.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/crypto.h
+o_init.o: ../include/openssl/e_os2.h ../include/openssl/err.h
+o_init.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h
+o_init.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+o_init.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+o_init.o: ../include/openssl/symhacks.h o_init.c
 o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h
 o_str.o: o_str.c o_str.h
 o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c
diff --git a/src/lib/libssl/src/crypto/aes/Makefile b/src/lib/libssl/src/crypto/aes/Makefile
index c501a43a8f..45ede0a0b4 100644
--- a/src/lib/libssl/src/crypto/aes/Makefile
+++ b/src/lib/libssl/src/crypto/aes/Makefile
@@ -50,9 +50,21 @@ aes-ia64.s: asm/aes-ia64.S
 
 aes-586.s:      asm/aes-586.pl ../perlasm/x86asm.pl
         $(PERL) asm/aes-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+vpaes-x86.s:    asm/vpaes-x86.pl ../perlasm/x86asm.pl
+        $(PERL) asm/vpaes-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+aesni-x86.s:    asm/aesni-x86.pl ../perlasm/x86asm.pl
+        $(PERL) asm/aesni-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 aes-x86_64.s: asm/aes-x86_64.pl
         $(PERL) asm/aes-x86_64.pl $(PERLASM_SCHEME) > $@
+vpaes-x86_64.s: asm/vpaes-x86_64.pl
+        $(PERL) asm/vpaes-x86_64.pl $(PERLASM_SCHEME) > $@
+bsaes-x86_64.s: asm/bsaes-x86_64.pl
+        $(PERL) asm/bsaes-x86_64.pl $(PERLASM_SCHEME) > $@
+aesni-x86_64.s: asm/aesni-x86_64.pl
+        $(PERL) asm/aesni-x86_64.pl $(PERLASM_SCHEME) > $@
+aesni-sha1-x86_64.s:    asm/aesni-sha1-x86_64.pl
+        $(PERL) asm/aesni-sha1-x86_64.pl $(PERLASM_SCHEME) > $@
 
 aes-sparcv9.s: asm/aes-sparcv9.pl
         $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@
@@ -60,8 +72,15 @@ aes-sparcv9.s: asm/aes-sparcv9.pl
 aes-ppc.s:      asm/aes-ppc.pl
         $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@
 
+aes-parisc.s:   asm/aes-parisc.pl
+        $(PERL) asm/aes-parisc.pl $(PERLASM_SCHEME) $@
+
+aes-mips.S:     asm/aes-mips.pl
+        $(PERL) asm/aes-mips.pl $(PERLASM_SCHEME) $@
+
 # GNU make "catch all"
-aes-%.s:        asm/aes-%.pl;   $(PERL) $< $(CFLAGS) > $@
+aes-%.S:        asm/aes-%.pl;   $(PERL) $< $(PERLASM_SCHEME) > $@
+aes-armv4.o:    aes-armv4.S
 
 files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -117,9 +136,11 @@ aes_ige.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 aes_ige.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 aes_ige.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 aes_ige.o: ../../include/openssl/symhacks.h ../cryptlib.h aes_ige.c aes_locl.h
-aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
-aes_misc.o: ../../include/openssl/opensslconf.h
-aes_misc.o: ../../include/openssl/opensslv.h aes_locl.h aes_misc.c
+aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h
+aes_misc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+aes_misc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+aes_misc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+aes_misc.o: ../../include/openssl/symhacks.h aes_locl.h aes_misc.c
 aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/modes.h
 aes_ofb.o: ../../include/openssl/opensslconf.h aes_ofb.c
 aes_wrap.o: ../../e_os.h ../../include/openssl/aes.h
diff --git a/src/lib/libssl/src/crypto/aes/aes.h b/src/lib/libssl/src/crypto/aes/aes.h
index d2c99730fe..031abf01b5 100644
--- a/src/lib/libssl/src/crypto/aes/aes.h
+++ b/src/lib/libssl/src/crypto/aes/aes.h
@@ -90,6 +90,11 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
         AES_KEY *key);
 
+int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+        AES_KEY *key);
+int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+        AES_KEY *key);
+
 void AES_encrypt(const unsigned char *in, unsigned char *out,
         const AES_KEY *key);
 void AES_decrypt(const unsigned char *in, unsigned char *out,
diff --git a/src/lib/libssl/src/crypto/aes/aes_core.c b/src/lib/libssl/src/crypto/aes/aes_core.c
index a7ec54f4da..8f5210ac70 100644
--- a/src/lib/libssl/src/crypto/aes/aes_core.c
+++ b/src/lib/libssl/src/crypto/aes/aes_core.c
@@ -625,7 +625,7 @@ static const u32 rcon[] = {
 /**
  * Expand the cipher key into the encryption key schedule.
  */
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
                         AES_KEY *key) {
 
         u32 *rk;
@@ -726,7 +726,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 /**
  * Expand the cipher key into the decryption key schedule.
  */
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
                          AES_KEY *key) {
 
         u32 *rk;
@@ -734,7 +734,7 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
         u32 temp;
 
         /* first, start with an encryption schedule */
-        status = AES_set_encrypt_key(userKey, bits, key);
+        status = private_AES_set_encrypt_key(userKey, bits, key);
         if (status < 0)
                 return status;
 
@@ -1201,7 +1201,7 @@ static const u32 rcon[] = {
 /**
  * Expand the cipher key into the encryption key schedule.
  */
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
                         AES_KEY *key) {
         u32 *rk;
         int i = 0;
@@ -1301,7 +1301,7 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 /**
  * Expand the cipher key into the decryption key schedule.
  */
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
                          AES_KEY *key) {
 
         u32 *rk;
@@ -1309,7 +1309,7 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
         u32 temp;
 
         /* first, start with an encryption schedule */
-        status = AES_set_encrypt_key(userKey, bits, key);
+        status = private_AES_set_encrypt_key(userKey, bits, key);
         if (status < 0)
                 return status;
 
diff --git a/src/lib/libssl/src/crypto/aes/aes_misc.c b/src/lib/libssl/src/crypto/aes/aes_misc.c
index 4fead1b4c7..f083488ecb 100644
--- a/src/lib/libssl/src/crypto/aes/aes_misc.c
+++ b/src/lib/libssl/src/crypto/aes/aes_misc.c
@@ -50,6 +50,7 @@
  */
 
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
@@ -62,3 +63,23 @@ const char *AES_options(void) {
         return "aes(partial)";
 #endif
 }
+
+/* FIPS wrapper functions to block low level AES calls in FIPS mode */
+
+int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+                        AES_KEY *key)
+        {
+#ifdef OPENSSL_FIPS
+        fips_cipher_abort(AES);
+#endif
+        return private_AES_set_encrypt_key(userKey, bits, key);
+        }
+
+int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+                        AES_KEY *key)
+        {
+#ifdef OPENSSL_FIPS
+        fips_cipher_abort(AES);
+#endif
+        return private_AES_set_decrypt_key(userKey, bits, key);
+        }
diff --git a/src/lib/libssl/src/crypto/asn1/Makefile b/src/lib/libssl/src/crypto/asn1/Makefile
index 160544eede..f7787005d4 100644
--- a/src/lib/libssl/src/crypto/asn1/Makefile
+++ b/src/lib/libssl/src/crypto/asn1/Makefile
@@ -639,7 +639,7 @@ t_x509.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 t_x509.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 t_x509.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 t_x509.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-t_x509.o: ../cryptlib.h t_x509.c
+t_x509.o: ../cryptlib.h asn1_locl.h t_x509.c
 t_x509a.o: ../../e_os.h ../../include/openssl/asn1.h
 t_x509a.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 t_x509a.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c b/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c
index ece40bc4c0..52b2ebdb63 100644
--- a/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c
+++ b/src/lib/libssl/src/crypto/asn1/a_d2i_fp.c
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <limits.h>
 #include "cryptlib.h"
 #include <openssl/buffer.h>
 #include <openssl/asn1_mac.h>
@@ -143,17 +144,11 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
         BUF_MEM *b;
         unsigned char *p;
         int i;
-        int ret=-1;
         ASN1_const_CTX c;
-        int want=HEADER_SIZE;
+        size_t want=HEADER_SIZE;
         int eos=0;
-#if defined(__GNUC__) && defined(__ia64)
-        /* pathetic compiler bug in all known versions as of Nov. 2002 */
-        long off=0;
-#else
-        int off=0;
-#endif
-        int len=0;
+        size_t off=0;
+        size_t len=0;
 
         b=BUF_MEM_new();
         if (b == NULL)
@@ -169,7 +164,7 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                         {
                         want-=(len-off);
 
-                        if (!BUF_MEM_grow_clean(b,len+want))
+                        if (len + want < len || !BUF_MEM_grow_clean(b,len+want))
                                 {
                                 ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
                                 goto err;
@@ -181,7 +176,14 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                                 goto err;
                                 }
                         if (i > 0)
+                                {
+                                if (len+i < len)
+                                        {
+                                        ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+                                        goto err;
+                                        }
                                 len+=i;
+                                }
                         }
                 /* else data already loaded */
 
@@ -206,6 +208,11 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                         {
                         /* no data body so go round again */
                         eos++;
+                        if (eos < 0)
+                                {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_HEADER_TOO_LONG);
+                                goto err;
+                                }
                         want=HEADER_SIZE;
                         }
                 else if (eos && (c.slen == 0) && (c.tag == V_ASN1_EOC))
@@ -220,10 +227,16 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                 else 
                         {
                         /* suck in c.slen bytes of data */
-                        want=(int)c.slen;
+                        want=c.slen;
                         if (want > (len-off))
                                 {
                                 want-=(len-off);
+                                if (want > INT_MAX /* BIO_read takes an int length */ ||
+                                        len+want < len)
+                                                {
+                                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+                                                goto err;
+                                                }
                                 if (!BUF_MEM_grow_clean(b,len+want))
                                         {
                                         ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ERR_R_MALLOC_FAILURE);
@@ -238,11 +251,18 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                                                     ASN1_R_NOT_ENOUGH_DATA);
                                                 goto err;
                                                 }
+                                        /* This can't overflow because
+                                         * |len+want| didn't overflow. */
                                         len+=i;
-                                        want -= i;
+                                        want-=i;
                                         }
                                 }
-                        off+=(int)c.slen;
+                        if (off + c.slen < off)
+                                {
+                                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+                                goto err;
+                                }
+                        off+=c.slen;
                         if (eos <= 0)
                                 {
                                 break;
@@ -252,9 +272,15 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb)
                         }
                 }
 
+        if (off > INT_MAX)
+                {
+                ASN1err(ASN1_F_ASN1_D2I_READ_BIO,ASN1_R_TOO_LONG);
+                goto err;
+                }
+
         *pb = b;
         return off;
 err:
         if (b != NULL) BUF_MEM_free(b);
-        return(ret);
+        return -1;
         }
diff --git a/src/lib/libssl/src/crypto/asn1/a_digest.c b/src/lib/libssl/src/crypto/asn1/a_digest.c
index d00d9e22b1..cbdeea6ac0 100644
--- a/src/lib/libssl/src/crypto/asn1/a_digest.c
+++ b/src/lib/libssl/src/crypto/asn1/a_digest.c
@@ -87,7 +87,8 @@ int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
         p=str;
         i2d(data,&p);
 
-        EVP_Digest(str, i, md, len, type, NULL);
+        if (!EVP_Digest(str, i, md, len, type, NULL))
+                return 0;
         OPENSSL_free(str);
         return(1);
         }
@@ -104,7 +105,8 @@ int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *asn,
         i=ASN1_item_i2d(asn,&str, it);
         if (!str) return(0);
 
-        EVP_Digest(str, i, md, len, type, NULL);
+        if (!EVP_Digest(str, i, md, len, type, NULL))
+                return 0;
         OPENSSL_free(str);
         return(1);
         }
diff --git a/src/lib/libssl/src/crypto/asn1/a_int.c b/src/lib/libssl/src/crypto/asn1/a_int.c
index 3348b8762c..ad0d2506f6 100644
--- a/src/lib/libssl/src/crypto/asn1/a_int.c
+++ b/src/lib/libssl/src/crypto/asn1/a_int.c
@@ -386,8 +386,8 @@ long ASN1_INTEGER_get(const ASN1_INTEGER *a)
         
         if (a->length > (int)sizeof(long))
                 {
-                /* hmm... a bit ugly */
-                return(0xffffffffL);
+                /* hmm... a bit ugly, return all ones */
+                return -1;
                 }
         if (a->data == NULL)
                 return 0;
diff --git a/src/lib/libssl/src/crypto/asn1/a_sign.c b/src/lib/libssl/src/crypto/asn1/a_sign.c
index ff63bfc7be..7b4a193d6b 100644
--- a/src/lib/libssl/src/crypto/asn1/a_sign.c
+++ b/src/lib/libssl/src/crypto/asn1/a_sign.c
@@ -184,9 +184,9 @@ int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
         p=buf_in;
 
         i2d(data,&p);
-        EVP_SignInit_ex(&ctx,type, NULL);
-        EVP_SignUpdate(&ctx,(unsigned char *)buf_in,inl);
-        if (!EVP_SignFinal(&ctx,(unsigned char *)buf_out,
+        if (!EVP_SignInit_ex(&ctx,type, NULL)
+                || !EVP_SignUpdate(&ctx,(unsigned char *)buf_in,inl)
+                || !EVP_SignFinal(&ctx,(unsigned char *)buf_out,
                         (unsigned int *)&outl,pkey))
                 {
                 outl=0;
@@ -218,65 +218,100 @@ int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
              const EVP_MD *type)
         {
         EVP_MD_CTX ctx;
+        EVP_MD_CTX_init(&ctx);
+        if (!EVP_DigestSignInit(&ctx, NULL, type, NULL, pkey))
+                {
+                EVP_MD_CTX_cleanup(&ctx);
+                return 0;
+                }
+        return ASN1_item_sign_ctx(it, algor1, algor2, signature, asn, &ctx);
+        }
+                
+
+int ASN1_item_sign_ctx(const ASN1_ITEM *it,
+                X509_ALGOR *algor1, X509_ALGOR *algor2,
+                ASN1_BIT_STRING *signature, void *asn, EVP_MD_CTX *ctx)
+        {
+        const EVP_MD *type;
+        EVP_PKEY *pkey;
         unsigned char *buf_in=NULL,*buf_out=NULL;
-        int inl=0,outl=0,outll=0;
+        size_t inl=0,outl=0,outll=0;
         int signid, paramtype;
+        int rv;
+
+        type = EVP_MD_CTX_md(ctx);
+        pkey = EVP_PKEY_CTX_get0_pkey(ctx->pctx);
 
-        if (type == NULL)
+        if (!type || !pkey)
                 {
-                int def_nid;
-                if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) > 0)
-                        type = EVP_get_digestbynid(def_nid);
+                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX, ASN1_R_CONTEXT_NOT_INITIALISED);
+                return 0;
                 }
 
-        if (type == NULL)
+        if (pkey->ameth->item_sign)
                 {
-                ASN1err(ASN1_F_ASN1_ITEM_SIGN, ASN1_R_NO_DEFAULT_DIGEST);
-                return 0;
+                rv = pkey->ameth->item_sign(ctx, it, asn, algor1, algor2,
+                                                signature);
+                if (rv == 1)
+                        outl = signature->length;
+                /* Return value meanings:
+                 * <=0: error.
+                 *   1: method does everything.
+                 *   2: carry on as normal.
+                 *   3: ASN1 method sets algorithm identifiers: just sign.
+                 */
+                if (rv <= 0)
+                        ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX, ERR_R_EVP_LIB);
+                if (rv <= 1)
+                        goto err;
                 }
+        else
+                rv = 2;
 
-        if (type->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
+        if (rv == 2)
                 {
-                if (!pkey->ameth ||
-                        !OBJ_find_sigid_by_algs(&signid, EVP_MD_nid(type),
-                                                pkey->ameth->pkey_id))
+                if (type->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
                         {
-                        ASN1err(ASN1_F_ASN1_ITEM_SIGN,
-                                ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED);
-                        return 0;
+                        if (!pkey->ameth ||
+                                !OBJ_find_sigid_by_algs(&signid,
+                                                        EVP_MD_nid(type),
+                                                        pkey->ameth->pkey_id))
+                                {
+                                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX,
+                                        ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED);
+                                return 0;
+                                }
                         }
-                }
-        else
-                signid = type->pkey_type;
+                else
+                        signid = type->pkey_type;
 
-        if (pkey->ameth->pkey_flags & ASN1_PKEY_SIGPARAM_NULL)
-                paramtype = V_ASN1_NULL;
-        else
-                paramtype = V_ASN1_UNDEF;
+                if (pkey->ameth->pkey_flags & ASN1_PKEY_SIGPARAM_NULL)
+                        paramtype = V_ASN1_NULL;
+                else
+                        paramtype = V_ASN1_UNDEF;
 
-        if (algor1)
-                X509_ALGOR_set0(algor1, OBJ_nid2obj(signid), paramtype, NULL);
-        if (algor2)
-                X509_ALGOR_set0(algor2, OBJ_nid2obj(signid), paramtype, NULL);
+                if (algor1)
+                        X509_ALGOR_set0(algor1, OBJ_nid2obj(signid), paramtype, NULL);
+                if (algor2)
+                        X509_ALGOR_set0(algor2, OBJ_nid2obj(signid), paramtype, NULL);
+
+                }
 
-        EVP_MD_CTX_init(&ctx);
         inl=ASN1_item_i2d(asn,&buf_in, it);
         outll=outl=EVP_PKEY_size(pkey);
-        buf_out=(unsigned char *)OPENSSL_malloc((unsigned int)outl);
+        buf_out=OPENSSL_malloc((unsigned int)outl);
         if ((buf_in == NULL) || (buf_out == NULL))
                 {
                 outl=0;
-                ASN1err(ASN1_F_ASN1_ITEM_SIGN,ERR_R_MALLOC_FAILURE);
+                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX,ERR_R_MALLOC_FAILURE);
                 goto err;
                 }
 
-        EVP_SignInit_ex(&ctx,type, NULL);
-        EVP_SignUpdate(&ctx,(unsigned char *)buf_in,inl);
-        if (!EVP_SignFinal(&ctx,(unsigned char *)buf_out,
-                        (unsigned int *)&outl,pkey))
+        if (!EVP_DigestSignUpdate(ctx, buf_in, inl)
+                || !EVP_DigestSignFinal(ctx, buf_out, &outl))
                 {
                 outl=0;
-                ASN1err(ASN1_F_ASN1_ITEM_SIGN,ERR_R_EVP_LIB);
+                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX,ERR_R_EVP_LIB);
                 goto err;
                 }
         if (signature->data != NULL) OPENSSL_free(signature->data);
@@ -289,7 +324,7 @@ int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
         signature->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
         signature->flags|=ASN1_STRING_FLAG_BITS_LEFT;
 err:
-        EVP_MD_CTX_cleanup(&ctx);
+        EVP_MD_CTX_cleanup(ctx);
         if (buf_in != NULL)
                 { OPENSSL_cleanse((char *)buf_in,(unsigned int)inl); OPENSSL_free(buf_in); }
         if (buf_out != NULL)
diff --git a/src/lib/libssl/src/crypto/asn1/a_verify.c b/src/lib/libssl/src/crypto/asn1/a_verify.c
index cecdb13c70..432722e409 100644
--- a/src/lib/libssl/src/crypto/asn1/a_verify.c
+++ b/src/lib/libssl/src/crypto/asn1/a_verify.c
@@ -101,8 +101,13 @@ int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *a, ASN1_BIT_STRING *signature,
         p=buf_in;
 
         i2d(data,&p);
-        EVP_VerifyInit_ex(&ctx,type, NULL);
-        EVP_VerifyUpdate(&ctx,(unsigned char *)buf_in,inl);
+        if (!EVP_VerifyInit_ex(&ctx,type, NULL)
+                || !EVP_VerifyUpdate(&ctx,(unsigned char *)buf_in,inl))
+                {
+                ASN1err(ASN1_F_ASN1_VERIFY,ERR_R_EVP_LIB);
+                ret=0;
+                goto err;
+                }
 
         OPENSSL_cleanse(buf_in,(unsigned int)inl);
         OPENSSL_free(buf_in);
@@ -126,11 +131,10 @@ err:
 #endif
 
 
-int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a, ASN1_BIT_STRING *signature,
-             void *asn, EVP_PKEY *pkey)
+int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a,
+                ASN1_BIT_STRING *signature, void *asn, EVP_PKEY *pkey)
         {
         EVP_MD_CTX ctx;
-        const EVP_MD *type = NULL;
         unsigned char *buf_in=NULL;
         int ret= -1,inl;
 
@@ -144,25 +148,47 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a, ASN1_BIT_STRING *signat
                 ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM);
                 goto err;
                 }
-        type=EVP_get_digestbynid(mdnid);
-        if (type == NULL)
+        if (mdnid == NID_undef)
                 {
-                ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM);
-                goto err;
+                if (!pkey->ameth || !pkey->ameth->item_verify)
+                        {
+                        ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM);
+                        goto err;
+                        }
+                ret = pkey->ameth->item_verify(&ctx, it, asn, a,
+                                                        signature, pkey);
+                /* Return value of 2 means carry on, anything else means we
+                 * exit straight away: either a fatal error of the underlying
+                 * verification routine handles all verification.
+                 */
+                if (ret != 2)
+                        goto err;
+                ret = -1;
                 }
-
-        /* Check public key OID matches public key type */
-        if (EVP_PKEY_type(pknid) != pkey->ameth->pkey_id)
+        else
                 {
-                ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ASN1_R_WRONG_PUBLIC_KEY_TYPE);
-                goto err;
-                }
+                const EVP_MD *type;
+                type=EVP_get_digestbynid(mdnid);
+                if (type == NULL)
+                        {
+                        ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM);
+                        goto err;
+                        }
+
+                /* Check public key OID matches public key type */
+                if (EVP_PKEY_type(pknid) != pkey->ameth->pkey_id)
+                        {
+                        ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ASN1_R_WRONG_PUBLIC_KEY_TYPE);
+                        goto err;
+                        }
+
+                if (!EVP_DigestVerifyInit(&ctx, NULL, type, NULL, pkey))
+                        {
+                        ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ERR_R_EVP_LIB);
+                        ret=0;
+                        goto err;
+                        }
 
-        if (!EVP_VerifyInit_ex(&ctx,type, NULL))
-                {
-                ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ERR_R_EVP_LIB);
-                ret=0;
-                goto err;
                 }
 
         inl = ASN1_item_i2d(asn, &buf_in, it);
@@ -173,13 +199,18 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a, ASN1_BIT_STRING *signat
                 goto err;
                 }
 
-        EVP_VerifyUpdate(&ctx,(unsigned char *)buf_in,inl);
+        if (!EVP_DigestVerifyUpdate(&ctx,buf_in,inl))
+                {
+                ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ERR_R_EVP_LIB);
+                ret=0;
+                goto err;
+                }
 
         OPENSSL_cleanse(buf_in,(unsigned int)inl);
         OPENSSL_free(buf_in);
 
-        if (EVP_VerifyFinal(&ctx,(unsigned char *)signature->data,
-                        (unsigned int)signature->length,pkey) <= 0)
+        if (EVP_DigestVerifyFinal(&ctx,signature->data,
+                        (size_t)signature->length) <= 0)
                 {
                 ASN1err(ASN1_F_ASN1_ITEM_VERIFY,ERR_R_EVP_LIB);
                 ret=0;
diff --git a/src/lib/libssl/src/crypto/asn1/asn1.h b/src/lib/libssl/src/crypto/asn1/asn1.h
index 59540e4e79..220a0c8c63 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1.h
+++ b/src/lib/libssl/src/crypto/asn1/asn1.h
@@ -235,7 +235,7 @@ typedef struct asn1_object_st
  */
 #define ASN1_STRING_FLAG_MSTRING 0x040 
 /* This is the base type that holds just about everything :-) */
-typedef struct asn1_string_st
+struct asn1_string_st
         {
         int length;
         int type;
@@ -245,7 +245,7 @@ typedef struct asn1_string_st
          * input data has a non-zero 'unused bits' value, it will be
          * handled correctly */
         long flags;
-        } ASN1_STRING;
+        };
 
 /* ASN1_ENCODING structure: this is used to save the received
  * encoding of an ASN1 type. This is useful to get round
@@ -293,7 +293,6 @@ DECLARE_STACK_OF(ASN1_STRING_TABLE)
  * see asn1t.h
  */
 typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;
-typedef struct ASN1_ITEM_st ASN1_ITEM;
 typedef struct ASN1_TLC_st ASN1_TLC;
 /* This is just an opaque pointer */
 typedef struct ASN1_VALUE_st ASN1_VALUE;
@@ -1194,6 +1193,7 @@ void ERR_load_ASN1_strings(void);
 #define ASN1_F_ASN1_ITEM_I2D_FP                          193
 #define ASN1_F_ASN1_ITEM_PACK                            198
 #define ASN1_F_ASN1_ITEM_SIGN                            195
+#define ASN1_F_ASN1_ITEM_SIGN_CTX                        220
 #define ASN1_F_ASN1_ITEM_UNPACK                          199
 #define ASN1_F_ASN1_ITEM_VERIFY                          197
 #define ASN1_F_ASN1_MBSTRING_NCOPY                       122
@@ -1266,6 +1266,7 @@ void ERR_load_ASN1_strings(void);
 #define ASN1_F_PKCS5_PBE2_SET_IV                         167
 #define ASN1_F_PKCS5_PBE_SET                             202
 #define ASN1_F_PKCS5_PBE_SET0_ALGOR                      215
+#define ASN1_F_PKCS5_PBKDF2_SET                          219
 #define ASN1_F_SMIME_READ_ASN1                           212
 #define ASN1_F_SMIME_TEXT                                213
 #define ASN1_F_X509_CINF_NEW                             168
@@ -1291,6 +1292,7 @@ void ERR_load_ASN1_strings(void);
 #define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   106
 #define ASN1_R_BUFFER_TOO_SMALL                          107
 #define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER           108
+#define ASN1_R_CONTEXT_NOT_INITIALISED                   217
 #define ASN1_R_DATA_IS_WRONG                             109
 #define ASN1_R_DECODE_ERROR                              110
 #define ASN1_R_DECODING_ERROR                            111
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_err.c b/src/lib/libssl/src/crypto/asn1/asn1_err.c
index 6e04d08f31..1a30bf119b 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1_err.c
+++ b/src/lib/libssl/src/crypto/asn1/asn1_err.c
@@ -1,6 +1,6 @@
 /* crypto/asn1/asn1_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2009 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
@@ -107,6 +107,7 @@ static ERR_STRING_DATA ASN1_str_functs[]=
 {ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_FP),     "ASN1_item_i2d_fp"},
 {ERR_FUNC(ASN1_F_ASN1_ITEM_PACK),       "ASN1_item_pack"},
 {ERR_FUNC(ASN1_F_ASN1_ITEM_SIGN),       "ASN1_item_sign"},
+{ERR_FUNC(ASN1_F_ASN1_ITEM_SIGN_CTX),   "ASN1_item_sign_ctx"},
 {ERR_FUNC(ASN1_F_ASN1_ITEM_UNPACK),     "ASN1_item_unpack"},
 {ERR_FUNC(ASN1_F_ASN1_ITEM_VERIFY),     "ASN1_item_verify"},
 {ERR_FUNC(ASN1_F_ASN1_MBSTRING_NCOPY),  "ASN1_mbstring_ncopy"},
@@ -179,6 +180,7 @@ static ERR_STRING_DATA ASN1_str_functs[]=
 {ERR_FUNC(ASN1_F_PKCS5_PBE2_SET_IV),    "PKCS5_pbe2_set_iv"},
 {ERR_FUNC(ASN1_F_PKCS5_PBE_SET),        "PKCS5_pbe_set"},
 {ERR_FUNC(ASN1_F_PKCS5_PBE_SET0_ALGOR), "PKCS5_pbe_set0_algor"},
+{ERR_FUNC(ASN1_F_PKCS5_PBKDF2_SET),     "PKCS5_pbkdf2_set"},
 {ERR_FUNC(ASN1_F_SMIME_READ_ASN1),      "SMIME_read_ASN1"},
 {ERR_FUNC(ASN1_F_SMIME_TEXT),   "SMIME_text"},
 {ERR_FUNC(ASN1_F_X509_CINF_NEW),        "X509_CINF_NEW"},
@@ -207,6 +209,7 @@ static ERR_STRING_DATA ASN1_str_reasons[]=
 {ERR_REASON(ASN1_R_BOOLEAN_IS_WRONG_LENGTH),"boolean is wrong length"},
 {ERR_REASON(ASN1_R_BUFFER_TOO_SMALL)     ,"buffer too small"},
 {ERR_REASON(ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER),"cipher has no object identifier"},
+{ERR_REASON(ASN1_R_CONTEXT_NOT_INITIALISED),"context not initialised"},
 {ERR_REASON(ASN1_R_DATA_IS_WRONG)        ,"data is wrong"},
 {ERR_REASON(ASN1_R_DECODE_ERROR)         ,"decode error"},
 {ERR_REASON(ASN1_R_DECODING_ERROR)       ,"decoding error"},
diff --git a/src/lib/libssl/src/crypto/asn1/n_pkey.c b/src/lib/libssl/src/crypto/asn1/n_pkey.c
index e7d0439062..e251739933 100644
--- a/src/lib/libssl/src/crypto/asn1/n_pkey.c
+++ b/src/lib/libssl/src/crypto/asn1/n_pkey.c
@@ -129,6 +129,7 @@ int i2d_RSA_NET(const RSA *a, unsigned char **pp,
         unsigned char buf[256],*zz;
         unsigned char key[EVP_MAX_KEY_LENGTH];
         EVP_CIPHER_CTX ctx;
+        EVP_CIPHER_CTX_init(&ctx);
 
         if (a == NULL) return(0);
 
@@ -206,24 +207,28 @@ int i2d_RSA_NET(const RSA *a, unsigned char **pp,
         i = strlen((char *)buf);
         /* If the key is used for SGC the algorithm is modified a little. */
         if(sgckey) {
-                EVP_Digest(buf, i, buf, NULL, EVP_md5(), NULL);
+                if (!EVP_Digest(buf, i, buf, NULL, EVP_md5(), NULL))
+                        goto err;
                 memcpy(buf + 16, "SGCKEYSALT", 10);
                 i = 26;
         }
 
-        EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,i,1,key,NULL);
+        if (!EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,i,1,key,NULL))
+                goto err;
         OPENSSL_cleanse(buf,256);
 
         /* Encrypt private key in place */
         zz = enckey->enckey->digest->data;
-        EVP_CIPHER_CTX_init(&ctx);
-        EVP_EncryptInit_ex(&ctx,EVP_rc4(),NULL,key,NULL);
-        EVP_EncryptUpdate(&ctx,zz,&i,zz,pkeylen);
-        EVP_EncryptFinal_ex(&ctx,zz + i,&j);
-        EVP_CIPHER_CTX_cleanup(&ctx);
+        if (!EVP_EncryptInit_ex(&ctx,EVP_rc4(),NULL,key,NULL))
+                goto err;
+        if (!EVP_EncryptUpdate(&ctx,zz,&i,zz,pkeylen))
+                goto err;
+        if (!EVP_EncryptFinal_ex(&ctx,zz + i,&j))
+                goto err;
 
         ret = i2d_NETSCAPE_ENCRYPTED_PKEY(enckey, pp);
 err:
+        EVP_CIPHER_CTX_cleanup(&ctx);
         NETSCAPE_ENCRYPTED_PKEY_free(enckey);
         NETSCAPE_PKEY_free(pkey);
         return(ret);
@@ -288,6 +293,7 @@ static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
         const unsigned char *zz;
         unsigned char key[EVP_MAX_KEY_LENGTH];
         EVP_CIPHER_CTX ctx;
+        EVP_CIPHER_CTX_init(&ctx);
 
         i=cb((char *)buf,256,"Enter Private Key password:",0);
         if (i != 0)
@@ -298,19 +304,22 @@ static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
 
         i = strlen((char *)buf);
         if(sgckey){
-                EVP_Digest(buf, i, buf, NULL, EVP_md5(), NULL);
+                if (!EVP_Digest(buf, i, buf, NULL, EVP_md5(), NULL))
+                        goto err;
                 memcpy(buf + 16, "SGCKEYSALT", 10);
                 i = 26;
         }
                 
-        EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,i,1,key,NULL);
+        if (!EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,i,1,key,NULL))
+                goto err;
         OPENSSL_cleanse(buf,256);
 
-        EVP_CIPHER_CTX_init(&ctx);
-        EVP_DecryptInit_ex(&ctx,EVP_rc4(),NULL, key,NULL);
-        EVP_DecryptUpdate(&ctx,os->data,&i,os->data,os->length);
-        EVP_DecryptFinal_ex(&ctx,&(os->data[i]),&j);
-        EVP_CIPHER_CTX_cleanup(&ctx);
+        if (!EVP_DecryptInit_ex(&ctx,EVP_rc4(),NULL, key,NULL))
+                goto err;
+        if (!EVP_DecryptUpdate(&ctx,os->data,&i,os->data,os->length))
+                goto err;
+        if (!EVP_DecryptFinal_ex(&ctx,&(os->data[i]),&j))
+                goto err;
         os->length=i+j;
 
         zz=os->data;
@@ -328,6 +337,7 @@ static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
                 goto err;
                 }
 err:
+        EVP_CIPHER_CTX_cleanup(&ctx);
         NETSCAPE_PKEY_free(pkey);
         return(ret);
         }
diff --git a/src/lib/libssl/src/crypto/asn1/p5_pbev2.c b/src/lib/libssl/src/crypto/asn1/p5_pbev2.c
index cb49b6651d..4ea683036b 100644
--- a/src/lib/libssl/src/crypto/asn1/p5_pbev2.c
+++ b/src/lib/libssl/src/crypto/asn1/p5_pbev2.c
@@ -91,12 +91,10 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
                                  unsigned char *aiv, int prf_nid)
 {
         X509_ALGOR *scheme = NULL, *kalg = NULL, *ret = NULL;
-        int alg_nid;
+        int alg_nid, keylen;
         EVP_CIPHER_CTX ctx;
         unsigned char iv[EVP_MAX_IV_LENGTH];
-        PBKDF2PARAM *kdf = NULL;
         PBE2PARAM *pbe2 = NULL;
-        ASN1_OCTET_STRING *osalt = NULL;
         ASN1_OBJECT *obj;
 
         alg_nid = EVP_CIPHER_type(cipher);
@@ -127,7 +125,8 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
         EVP_CIPHER_CTX_init(&ctx);
 
         /* Dummy cipherinit to just setup the IV, and PRF */
-        EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, iv, 0);
+        if (!EVP_CipherInit_ex(&ctx, cipher, NULL, NULL, iv, 0))
+                goto err;
         if(EVP_CIPHER_param_to_asn1(&ctx, scheme->parameter) < 0) {
                 ASN1err(ASN1_F_PKCS5_PBE2_SET_IV,
                                         ASN1_R_ERROR_SETTING_CIPHER_PARAMS);
@@ -145,55 +144,21 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
                 }
         EVP_CIPHER_CTX_cleanup(&ctx);
 
-        if(!(kdf = PBKDF2PARAM_new())) goto merr;
-        if(!(osalt = M_ASN1_OCTET_STRING_new())) goto merr;
-
-        if (!saltlen) saltlen = PKCS5_SALT_LEN;
-        if (!(osalt->data = OPENSSL_malloc (saltlen))) goto merr;
-        osalt->length = saltlen;
-        if (salt) memcpy (osalt->data, salt, saltlen);
-        else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) goto merr;
-
-        if(iter <= 0) iter = PKCS5_DEFAULT_ITER;
-        if(!ASN1_INTEGER_set(kdf->iter, iter)) goto merr;
-
-        /* Now include salt in kdf structure */
-        kdf->salt->value.octet_string = osalt;
-        kdf->salt->type = V_ASN1_OCTET_STRING;
-        osalt = NULL;
-
         /* If its RC2 then we'd better setup the key length */
 
-        if(alg_nid == NID_rc2_cbc) {
-                if(!(kdf->keylength = M_ASN1_INTEGER_new())) goto merr;
-                if(!ASN1_INTEGER_set (kdf->keylength,
-                                 EVP_CIPHER_key_length(cipher))) goto merr;
-        }
-
-        /* prf can stay NULL if we are using hmacWithSHA1 */
-        if (prf_nid != NID_hmacWithSHA1)
-                {
-                kdf->prf = X509_ALGOR_new();
-                if (!kdf->prf)
-                        goto merr;
-                X509_ALGOR_set0(kdf->prf, OBJ_nid2obj(prf_nid),
-                                        V_ASN1_NULL, NULL);
-                }
-
-        /* Now setup the PBE2PARAM keyfunc structure */
+        if(alg_nid == NID_rc2_cbc)
+                keylen = EVP_CIPHER_key_length(cipher);
+        else
+                keylen = -1;
 
-        pbe2->keyfunc->algorithm = OBJ_nid2obj(NID_id_pbkdf2);
+        /* Setup keyfunc */
 
-        /* Encode PBKDF2PARAM into parameter of pbe2 */
+        X509_ALGOR_free(pbe2->keyfunc);
 
-        if(!(pbe2->keyfunc->parameter = ASN1_TYPE_new())) goto merr;
+        pbe2->keyfunc = PKCS5_pbkdf2_set(iter, salt, saltlen, prf_nid, keylen);
 
-        if(!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM),
-                         &pbe2->keyfunc->parameter->value.sequence)) goto merr;
-        pbe2->keyfunc->parameter->type = V_ASN1_SEQUENCE;
-
-        PBKDF2PARAM_free(kdf);
-        kdf = NULL;
+        if (!pbe2->keyfunc)
+                goto merr;
 
         /* Now set up top level AlgorithmIdentifier */
 
@@ -219,8 +184,6 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
         err:
         PBE2PARAM_free(pbe2);
         /* Note 'scheme' is freed as part of pbe2 */
-        M_ASN1_OCTET_STRING_free(osalt);
-        PBKDF2PARAM_free(kdf);
         X509_ALGOR_free(kalg);
         X509_ALGOR_free(ret);
 
@@ -233,3 +196,85 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
         {
         return PKCS5_pbe2_set_iv(cipher, iter, salt, saltlen, NULL, -1);
         }
+
+X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
+                                int prf_nid, int keylen)
+        {
+        X509_ALGOR *keyfunc = NULL;
+        PBKDF2PARAM *kdf = NULL;
+        ASN1_OCTET_STRING *osalt = NULL;
+
+        if(!(kdf = PBKDF2PARAM_new()))
+                goto merr;
+        if(!(osalt = M_ASN1_OCTET_STRING_new()))
+                goto merr;
+
+        kdf->salt->value.octet_string = osalt;
+        kdf->salt->type = V_ASN1_OCTET_STRING;
+
+        if (!saltlen)
+                saltlen = PKCS5_SALT_LEN;
+        if (!(osalt->data = OPENSSL_malloc (saltlen)))
+                goto merr;
+
+        osalt->length = saltlen;
+
+        if (salt)
+                memcpy (osalt->data, salt, saltlen);
+        else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0)
+                goto merr;
+
+        if(iter <= 0)
+                iter = PKCS5_DEFAULT_ITER;
+
+        if(!ASN1_INTEGER_set(kdf->iter, iter))
+                goto merr;
+
+        /* If have a key len set it up */
+
+        if(keylen > 0) 
+                {
+                if(!(kdf->keylength = M_ASN1_INTEGER_new()))
+                        goto merr;
+                if(!ASN1_INTEGER_set (kdf->keylength, keylen))
+                        goto merr;
+                }
+
+        /* prf can stay NULL if we are using hmacWithSHA1 */
+        if (prf_nid > 0 && prf_nid != NID_hmacWithSHA1)
+                {
+                kdf->prf = X509_ALGOR_new();
+                if (!kdf->prf)
+                        goto merr;
+                X509_ALGOR_set0(kdf->prf, OBJ_nid2obj(prf_nid),
+                                        V_ASN1_NULL, NULL);
+                }
+
+        /* Finally setup the keyfunc structure */
+
+        keyfunc = X509_ALGOR_new();
+        if (!keyfunc)
+                goto merr;
+
+        keyfunc->algorithm = OBJ_nid2obj(NID_id_pbkdf2);
+
+        /* Encode PBKDF2PARAM into parameter of pbe2 */
+
+        if(!(keyfunc->parameter = ASN1_TYPE_new()))
+                goto merr;
+
+        if(!ASN1_item_pack(kdf, ASN1_ITEM_rptr(PBKDF2PARAM),
+                         &keyfunc->parameter->value.sequence))
+                goto merr;
+        keyfunc->parameter->type = V_ASN1_SEQUENCE;
+
+        PBKDF2PARAM_free(kdf);
+        return keyfunc;
+
+        merr:
+        ASN1err(ASN1_F_PKCS5_PBKDF2_SET,ERR_R_MALLOC_FAILURE);
+        PBKDF2PARAM_free(kdf);
+        X509_ALGOR_free(keyfunc);
+        return NULL;
+        }
+
diff --git a/src/lib/libssl/src/crypto/asn1/t_crl.c b/src/lib/libssl/src/crypto/asn1/t_crl.c
index ee5a687ce8..c61169208a 100644
--- a/src/lib/libssl/src/crypto/asn1/t_crl.c
+++ b/src/lib/libssl/src/crypto/asn1/t_crl.c
@@ -94,8 +94,7 @@ int X509_CRL_print(BIO *out, X509_CRL *x)
         l = X509_CRL_get_version(x);
         BIO_printf(out, "%8sVersion %lu (0x%lx)\n", "", l+1, l);
         i = OBJ_obj2nid(x->sig_alg->algorithm);
-        BIO_printf(out, "%8sSignature Algorithm: %s\n", "",
-                                 (i == NID_undef) ? "NONE" : OBJ_nid2ln(i));
+        X509_signature_print(out, x->sig_alg, NULL);
         p=X509_NAME_oneline(X509_CRL_get_issuer(x),NULL,0);
         BIO_printf(out,"%8sIssuer: %s\n","",p);
         OPENSSL_free(p);
diff --git a/src/lib/libssl/src/crypto/asn1/t_x509.c b/src/lib/libssl/src/crypto/asn1/t_x509.c
index e061f2ffad..edbb39a02f 100644
--- a/src/lib/libssl/src/crypto/asn1/t_x509.c
+++ b/src/lib/libssl/src/crypto/asn1/t_x509.c
@@ -72,6 +72,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "asn1_locl.h"
 
 #ifndef OPENSSL_NO_FP_API
 int X509_print_fp(FILE *fp, X509 *x)
@@ -137,10 +138,10 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
                 if (BIO_write(bp,"        Serial Number:",22) <= 0) goto err;
 
                 bs=X509_get_serialNumber(x);
-                if (bs->length <= 4)
+                if (bs->length <= (int)sizeof(long))
                         {
                         l=ASN1_INTEGER_get(bs);
-                        if (l < 0)
+                        if (bs->type == V_ASN1_NEG_INTEGER)
                                 {
                                 l= -l;
                                 neg="-";
@@ -167,12 +168,16 @@ int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags, unsigned long cflag)
 
         if(!(cflag & X509_FLAG_NO_SIGNAME))
                 {
+                if(X509_signature_print(bp, x->sig_alg, NULL) <= 0)
+                        goto err;
+#if 0
                 if (BIO_printf(bp,"%8sSignature Algorithm: ","") <= 0) 
                         goto err;
                 if (i2a_ASN1_OBJECT(bp, ci->signature->algorithm) <= 0)
                         goto err;
                 if (BIO_puts(bp, "\n") <= 0)
                         goto err;
+#endif
                 }
 
         if(!(cflag & X509_FLAG_NO_ISSUER))
@@ -255,7 +260,8 @@ int X509_ocspid_print (BIO *bp, X509 *x)
                 goto err;
         i2d_X509_NAME(x->cert_info->subject, &dertmp);
 
-        EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1(), NULL);
+        if (!EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1(), NULL))
+                goto err;
         for (i=0; i < SHA_DIGEST_LENGTH; i++)
                 {
                 if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0) goto err;
@@ -268,8 +274,10 @@ int X509_ocspid_print (BIO *bp, X509 *x)
         if (BIO_printf(bp,"\n        Public key OCSP hash: ") <= 0)
                 goto err;
 
-        EVP_Digest(x->cert_info->key->public_key->data,
-                x->cert_info->key->public_key->length, SHA1md, NULL, EVP_sha1(), NULL);
+        if (!EVP_Digest(x->cert_info->key->public_key->data,
+                        x->cert_info->key->public_key->length,
+                        SHA1md, NULL, EVP_sha1(), NULL))
+                goto err;
         for (i=0; i < SHA_DIGEST_LENGTH; i++)
                 {
                 if (BIO_printf(bp,"%02X",SHA1md[i]) <= 0)
@@ -283,23 +291,50 @@ err:
         return(0);
         }
 
-int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
+int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent)
 {
-        unsigned char *s;
+        const unsigned char *s;
         int i, n;
-        if (BIO_puts(bp,"    Signature Algorithm: ") <= 0) return 0;
-        if (i2a_ASN1_OBJECT(bp, sigalg->algorithm) <= 0) return 0;
 
         n=sig->length;
         s=sig->data;
         for (i=0; i<n; i++)
                 {
                 if ((i%18) == 0)
-                        if (BIO_write(bp,"\n        ",9) <= 0) return 0;
+                        {
+                        if (BIO_write(bp,"\n",1) <= 0) return 0;
+                        if (BIO_indent(bp, indent, indent) <= 0) return 0;
+                        }
                         if (BIO_printf(bp,"%02x%s",s[i],
                                 ((i+1) == n)?"":":") <= 0) return 0;
                 }
         if (BIO_write(bp,"\n",1) != 1) return 0;
+
+        return 1;
+}
+
+int X509_signature_print(BIO *bp, X509_ALGOR *sigalg, ASN1_STRING *sig)
+{
+        int sig_nid;
+        if (BIO_puts(bp,"    Signature Algorithm: ") <= 0) return 0;
+        if (i2a_ASN1_OBJECT(bp, sigalg->algorithm) <= 0) return 0;
+
+        sig_nid = OBJ_obj2nid(sigalg->algorithm);
+        if (sig_nid != NID_undef)
+                {
+                int pkey_nid, dig_nid;
+                const EVP_PKEY_ASN1_METHOD *ameth;
+                if (OBJ_find_sigid_algs(sig_nid, &dig_nid, &pkey_nid))
+                        {
+                        ameth = EVP_PKEY_asn1_find(NULL, pkey_nid);
+                        if (ameth && ameth->sig_print)
+                                return ameth->sig_print(bp, sigalg, sig, 9, 0);
+                        }
+                }
+        if (sig)
+                return X509_signature_dump(bp, sig, 9);
+        else if (BIO_puts(bp, "\n") <= 0)
+                return 0;
         return 1;
 }
 
diff --git a/src/lib/libssl/src/crypto/asn1/tasn_prn.c b/src/lib/libssl/src/crypto/asn1/tasn_prn.c
index 453698012d..542a091a66 100644
--- a/src/lib/libssl/src/crypto/asn1/tasn_prn.c
+++ b/src/lib/libssl/src/crypto/asn1/tasn_prn.c
@@ -446,11 +446,11 @@ static int asn1_print_fsname(BIO *out, int indent,
         return 1;
         }
 
-static int asn1_print_boolean_ctx(BIO *out, const int bool,
+static int asn1_print_boolean_ctx(BIO *out, int boolval,
                                                         const ASN1_PCTX *pctx)
         {
         const char *str;
-        switch (bool)
+        switch (boolval)
                 {
                 case -1:
                 str = "BOOL ABSENT";
@@ -574,10 +574,10 @@ static int asn1_primitive_print(BIO *out, ASN1_VALUE **fld,
                 {
                 case V_ASN1_BOOLEAN:
                         {
-                        int bool = *(int *)fld;
-                        if (bool == -1)
-                                bool = it->size;
-                        ret = asn1_print_boolean_ctx(out, bool, pctx);
+                        int boolval = *(int *)fld;
+                        if (boolval == -1)
+                                boolval = it->size;
+                        ret = asn1_print_boolean_ctx(out, boolval, pctx);
                         }
                 break;
 
diff --git a/src/lib/libssl/src/crypto/asn1/x_algor.c b/src/lib/libssl/src/crypto/asn1/x_algor.c
index 99e53429b7..274e456c73 100644
--- a/src/lib/libssl/src/crypto/asn1/x_algor.c
+++ b/src/lib/libssl/src/crypto/asn1/x_algor.c
@@ -128,3 +128,17 @@ void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
                 }
         }
 
+/* Set up an X509_ALGOR DigestAlgorithmIdentifier from an EVP_MD */
+
+void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md)
+        {
+        int param_type;
+
+        if (md->flags & EVP_MD_FLAG_DIGALGID_ABSENT)
+                param_type = V_ASN1_UNDEF;
+        else
+                param_type = V_ASN1_NULL;
+
+        X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL);
+
+        }
diff --git a/src/lib/libssl/src/crypto/asn1/x_name.c b/src/lib/libssl/src/crypto/asn1/x_name.c
index 49be08b4da..d7c2318693 100644
--- a/src/lib/libssl/src/crypto/asn1/x_name.c
+++ b/src/lib/libssl/src/crypto/asn1/x_name.c
@@ -399,8 +399,7 @@ static int asn1_string_canon(ASN1_STRING *out, ASN1_STRING *in)
         /* If type not in bitmask just copy string across */
         if (!(ASN1_tag2bit(in->type) & ASN1_MASK_CANON))
                 {
-                out->type = in->type;
-                if (!ASN1_STRING_set(out, in->data, in->length))
+                if (!ASN1_STRING_copy(out, in))
                         return 0;
                 return 1;
                 }
diff --git a/src/lib/libssl/src/crypto/asn1/x_pubkey.c b/src/lib/libssl/src/crypto/asn1/x_pubkey.c
index d42b6a2c54..627ec87f9f 100644
--- a/src/lib/libssl/src/crypto/asn1/x_pubkey.c
+++ b/src/lib/libssl/src/crypto/asn1/x_pubkey.c
@@ -171,7 +171,16 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
                 goto error;
                 }
 
-        key->pkey = ret;
+        /* Check to see if another thread set key->pkey first */
+        CRYPTO_w_lock(CRYPTO_LOCK_EVP_PKEY);
+        if (key->pkey)
+                {
+                EVP_PKEY_free(ret);
+                ret = key->pkey;
+                }
+        else
+                key->pkey = ret;
+        CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY);
         CRYPTO_add(&ret->references, 1, CRYPTO_LOCK_EVP_PKEY);
 
         return ret;
diff --git a/src/lib/libssl/src/crypto/bf/Makefile b/src/lib/libssl/src/crypto/bf/Makefile
index dd2c2c708e..d01bfaa315 100644
--- a/src/lib/libssl/src/crypto/bf/Makefile
+++ b/src/lib/libssl/src/crypto/bf/Makefile
@@ -94,5 +94,8 @@ bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
 bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h
 bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
 bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c
-bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h
-bf_skey.o: ../../include/openssl/opensslconf.h bf_locl.h bf_pi.h bf_skey.c
+bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/crypto.h
+bf_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+bf_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bf_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bf_skey.o: ../../include/openssl/symhacks.h bf_locl.h bf_pi.h bf_skey.c
diff --git a/src/lib/libssl/src/crypto/bf/bf_skey.c b/src/lib/libssl/src/crypto/bf/bf_skey.c
index 3673cdee6e..3b0bca41ae 100644
--- a/src/lib/libssl/src/crypto/bf/bf_skey.c
+++ b/src/lib/libssl/src/crypto/bf/bf_skey.c
@@ -58,11 +58,19 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <openssl/crypto.h>
 #include <openssl/blowfish.h>
 #include "bf_locl.h"
 #include "bf_pi.h"
 
 void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
+#ifdef OPENSSL_FIPS
+        {
+        fips_cipher_abort(BLOWFISH);
+        private_BF_set_key(key, len, data);
+        }
+void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data)
+#endif
         {
         int i;
         BF_LONG *p,ri,in[2];
diff --git a/src/lib/libssl/src/crypto/bf/blowfish.h b/src/lib/libssl/src/crypto/bf/blowfish.h
index b97e76f9a3..4b6c8920a4 100644
--- a/src/lib/libssl/src/crypto/bf/blowfish.h
+++ b/src/lib/libssl/src/crypto/bf/blowfish.h
@@ -104,7 +104,9 @@ typedef struct bf_key_st
         BF_LONG S[4*256];
         } BF_KEY;
 
- 
+#ifdef OPENSSL_FIPS 
+void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data);
+#endif
 void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
 
 void BF_encrypt(BF_LONG *data,const BF_KEY *key);
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c
index d47310d650..41f958be71 100644
--- a/src/lib/libssl/src/crypto/bio/b_sock.c
+++ b/src/lib/libssl/src/crypto/bio/b_sock.c
@@ -960,7 +960,6 @@ int BIO_set_tcp_ndelay(int s, int on)
 #endif
         return(ret == 0);
         }
-#endif
 
 int BIO_socket_nbio(int s, int mode)
         {
@@ -973,3 +972,4 @@ int BIO_socket_nbio(int s, int mode)
 #endif
         return(ret == 0);
         }
+#endif
diff --git a/src/lib/libssl/src/crypto/bio/bio.h b/src/lib/libssl/src/crypto/bio/bio.h
index ab47abcf14..05699ab212 100644
--- a/src/lib/libssl/src/crypto/bio/bio.h
+++ b/src/lib/libssl/src/crypto/bio/bio.h
@@ -68,6 +68,14 @@
 
 #include <openssl/crypto.h>
 
+#ifndef OPENSSL_NO_SCTP
+# ifndef OPENSSL_SYS_VMS
+# include <stdint.h>
+# else
+# include <inttypes.h>
+# endif
+#endif
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -95,6 +103,9 @@ extern "C" {
 #define BIO_TYPE_BIO            (19|0x0400)             /* (half a) BIO pair */
 #define BIO_TYPE_LINEBUFFER     (20|0x0200)             /* filter */
 #define BIO_TYPE_DGRAM          (21|0x0400|0x0100)
+#ifndef OPENSSL_NO_SCTP
+#define BIO_TYPE_DGRAM_SCTP     (24|0x0400|0x0100)
+#endif
 #define BIO_TYPE_ASN1           (22|0x0200)             /* filter */
 #define BIO_TYPE_COMP           (23|0x0200)             /* filter */
 
@@ -146,6 +157,7 @@ extern "C" {
 /* #endif */
 
 #define BIO_CTRL_DGRAM_QUERY_MTU          40 /* as kernel for current MTU */
+#define BIO_CTRL_DGRAM_GET_FALLBACK_MTU   47
 #define BIO_CTRL_DGRAM_GET_MTU            41 /* get cached value for MTU */
 #define BIO_CTRL_DGRAM_SET_MTU            42 /* set cached value for
                                               * MTU. want to use this
@@ -161,7 +173,22 @@ extern "C" {
 #define BIO_CTRL_DGRAM_SET_PEER           44 /* Destination for the data */
 
 #define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT   45 /* Next DTLS handshake timeout to
-                                                                                          * adjust socket timeouts */
+                                              * adjust socket timeouts */
+
+#ifndef OPENSSL_NO_SCTP
+/* SCTP stuff */
+#define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE    50
+#define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY                51
+#define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY               52
+#define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD               53
+#define BIO_CTRL_DGRAM_SCTP_GET_SNDINFO         60
+#define BIO_CTRL_DGRAM_SCTP_SET_SNDINFO         61
+#define BIO_CTRL_DGRAM_SCTP_GET_RCVINFO         62
+#define BIO_CTRL_DGRAM_SCTP_SET_RCVINFO         63
+#define BIO_CTRL_DGRAM_SCTP_GET_PRINFO                  64
+#define BIO_CTRL_DGRAM_SCTP_SET_PRINFO                  65
+#define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN               70
+#endif
 
 /* modifiers */
 #define BIO_FP_READ             0x02
@@ -331,6 +358,34 @@ typedef struct bio_f_buffer_ctx_struct
 /* Prefix and suffix callback in ASN1 BIO */
 typedef int asn1_ps_func(BIO *b, unsigned char **pbuf, int *plen, void *parg);
 
+#ifndef OPENSSL_NO_SCTP
+/* SCTP parameter structs */
+struct bio_dgram_sctp_sndinfo
+        {
+        uint16_t snd_sid;
+        uint16_t snd_flags;
+        uint32_t snd_ppid;
+        uint32_t snd_context;
+        };
+
+struct bio_dgram_sctp_rcvinfo
+        {
+        uint16_t rcv_sid;
+        uint16_t rcv_ssn;
+        uint16_t rcv_flags;
+        uint32_t rcv_ppid;
+        uint32_t rcv_tsn;
+        uint32_t rcv_cumtsn;
+        uint32_t rcv_context;
+        };
+
+struct bio_dgram_sctp_prinfo
+        {
+        uint16_t pr_policy;
+        uint32_t pr_value;
+        };
+#endif
+
 /* connect BIO stuff */
 #define BIO_CONN_S_BEFORE               1
 #define BIO_CONN_S_GET_IP               2
@@ -628,6 +683,9 @@ BIO_METHOD *BIO_f_linebuffer(void);
 BIO_METHOD *BIO_f_nbio_test(void);
 #ifndef OPENSSL_NO_DGRAM
 BIO_METHOD *BIO_s_datagram(void);
+#ifndef OPENSSL_NO_SCTP
+BIO_METHOD *BIO_s_datagram_sctp(void);
+#endif
 #endif
 
 /* BIO_METHOD *BIO_f_ber(void); */
@@ -670,6 +728,15 @@ int BIO_set_tcp_ndelay(int sock,int turn_on);
 
 BIO *BIO_new_socket(int sock, int close_flag);
 BIO *BIO_new_dgram(int fd, int close_flag);
+#ifndef OPENSSL_NO_SCTP
+BIO *BIO_new_dgram_sctp(int fd, int close_flag);
+int BIO_dgram_is_sctp(BIO *bio);
+int BIO_dgram_sctp_notification_cb(BIO *b,
+                                   void (*handle_notifications)(BIO *bio, void *context, void *buf),
+                                   void *context);
+int BIO_dgram_sctp_wait_for_dry(BIO *b);
+int BIO_dgram_sctp_msg_waiting(BIO *b);
+#endif
 BIO *BIO_new_fd(int fd, int close_flag);
 BIO *BIO_new_connect(char *host_port);
 BIO *BIO_new_accept(char *host_port);
@@ -734,6 +801,7 @@ void ERR_load_BIO_strings(void);
 #define BIO_F_BUFFER_CTRL                                114
 #define BIO_F_CONN_CTRL                                  127
 #define BIO_F_CONN_STATE                                 115
+#define BIO_F_DGRAM_SCTP_READ                            132
 #define BIO_F_FILE_CTRL                                  116
 #define BIO_F_FILE_READ                                  130
 #define BIO_F_LINEBUFFER_CTRL                            129
diff --git a/src/lib/libssl/src/crypto/bio/bio_err.c b/src/lib/libssl/src/crypto/bio/bio_err.c
index a224edd5a0..0dbfbd80d3 100644
--- a/src/lib/libssl/src/crypto/bio/bio_err.c
+++ b/src/lib/libssl/src/crypto/bio/bio_err.c
@@ -1,6 +1,6 @@
 /* crypto/bio/bio_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2006 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
@@ -95,6 +95,7 @@ static ERR_STRING_DATA BIO_str_functs[]=
 {ERR_FUNC(BIO_F_BUFFER_CTRL),   "BUFFER_CTRL"},
 {ERR_FUNC(BIO_F_CONN_CTRL),     "CONN_CTRL"},
 {ERR_FUNC(BIO_F_CONN_STATE),    "CONN_STATE"},
+{ERR_FUNC(BIO_F_DGRAM_SCTP_READ),       "DGRAM_SCTP_READ"},
 {ERR_FUNC(BIO_F_FILE_CTRL),     "FILE_CTRL"},
 {ERR_FUNC(BIO_F_FILE_READ),     "FILE_READ"},
 {ERR_FUNC(BIO_F_LINEBUFFER_CTRL),       "LINEBUFFER_CTRL"},
diff --git a/src/lib/libssl/src/crypto/bio/bio_lib.c b/src/lib/libssl/src/crypto/bio/bio_lib.c
index e12bc3a2ca..9c9646afa8 100644
--- a/src/lib/libssl/src/crypto/bio/bio_lib.c
+++ b/src/lib/libssl/src/crypto/bio/bio_lib.c
@@ -521,40 +521,40 @@ void BIO_free_all(BIO *bio)
 
 BIO *BIO_dup_chain(BIO *in)
         {
-        BIO *ret=NULL,*eoc=NULL,*bio,*new;
+        BIO *ret=NULL,*eoc=NULL,*bio,*new_bio;
 
         for (bio=in; bio != NULL; bio=bio->next_bio)
                 {
-                if ((new=BIO_new(bio->method)) == NULL) goto err;
-                new->callback=bio->callback;
-                new->cb_arg=bio->cb_arg;
-                new->init=bio->init;
-                new->shutdown=bio->shutdown;
-                new->flags=bio->flags;
+                if ((new_bio=BIO_new(bio->method)) == NULL) goto err;
+                new_bio->callback=bio->callback;
+                new_bio->cb_arg=bio->cb_arg;
+                new_bio->init=bio->init;
+                new_bio->shutdown=bio->shutdown;
+                new_bio->flags=bio->flags;
 
                 /* This will let SSL_s_sock() work with stdin/stdout */
-                new->num=bio->num;
+                new_bio->num=bio->num;
 
-                if (!BIO_dup_state(bio,(char *)new))
+                if (!BIO_dup_state(bio,(char *)new_bio))
                         {
-                        BIO_free(new);
+                        BIO_free(new_bio);
                         goto err;
                         }
 
                 /* copy app data */
-                if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new->ex_data,
+                if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new_bio->ex_data,
                                         &bio->ex_data))
                         goto err;
 
                 if (ret == NULL)
                         {
-                        eoc=new;
+                        eoc=new_bio;
                         ret=eoc;
                         }
                 else
                         {
-                        BIO_push(eoc,new);
-                        eoc=new;
+                        BIO_push(eoc,new_bio);
+                        eoc=new_bio;
                         }
                 }
         return(ret);
diff --git a/src/lib/libssl/src/crypto/bio/bss_bio.c b/src/lib/libssl/src/crypto/bio/bss_bio.c
index 76bd48e767..52ef0ebcb3 100644
--- a/src/lib/libssl/src/crypto/bio/bss_bio.c
+++ b/src/lib/libssl/src/crypto/bio/bss_bio.c
@@ -277,10 +277,10 @@ static int bio_read(BIO *bio, char *buf, int size_)
  */
 /* WARNING: The non-copying interface is largely untested as of yet
  * and may contain bugs. */
-static ssize_t bio_nread0(BIO *bio, char **buf)
+static ossl_ssize_t bio_nread0(BIO *bio, char **buf)
         {
         struct bio_bio_st *b, *peer_b;
-        ssize_t num;
+        ossl_ssize_t num;
         
         BIO_clear_retry_flags(bio);
 
@@ -315,15 +315,15 @@ static ssize_t bio_nread0(BIO *bio, char **buf)
         return num;
         }
 
-static ssize_t bio_nread(BIO *bio, char **buf, size_t num_)
+static ossl_ssize_t bio_nread(BIO *bio, char **buf, size_t num_)
         {
         struct bio_bio_st *b, *peer_b;
-        ssize_t num, available;
+        ossl_ssize_t num, available;
 
         if (num_ > SSIZE_MAX)
                 num = SSIZE_MAX;
         else
-                num = (ssize_t)num_;
+                num = (ossl_ssize_t)num_;
 
         available = bio_nread0(bio, buf);
         if (num > available)
@@ -428,7 +428,7 @@ static int bio_write(BIO *bio, const char *buf, int num_)
  * (example usage:  bio_nwrite0(), write to buffer, bio_nwrite()
  *  or just         bio_nwrite(), write to buffer)
  */
-static ssize_t bio_nwrite0(BIO *bio, char **buf)
+static ossl_ssize_t bio_nwrite0(BIO *bio, char **buf)
         {
         struct bio_bio_st *b;
         size_t num;
@@ -476,15 +476,15 @@ static ssize_t bio_nwrite0(BIO *bio, char **buf)
         return num;
         }
 
-static ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_)
+static ossl_ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_)
         {
         struct bio_bio_st *b;
-        ssize_t num, space;
+        ossl_ssize_t num, space;
 
         if (num_ > SSIZE_MAX)
                 num = SSIZE_MAX;
         else
-                num = (ssize_t)num_;
+                num = (ossl_ssize_t)num_;
 
         space = bio_nwrite0(bio, buf);
         if (num > space)
diff --git a/src/lib/libssl/src/crypto/bn/Makefile b/src/lib/libssl/src/crypto/bn/Makefile
index aabc4f56b8..672773454c 100644
--- a/src/lib/libssl/src/crypto/bn/Makefile
+++ b/src/lib/libssl/src/crypto/bn/Makefile
@@ -26,13 +26,13 @@ LIBSRC=	bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
         bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
         bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \
         bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_gf2m.c bn_nist.c \
-        bn_depr.c bn_const.c
+        bn_depr.c bn_const.c bn_x931p.c
 
 LIBOBJ= bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o bn_mod.o \
         bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \
         bn_kron.o bn_sqrt.o bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) \
         bn_recp.o bn_mont.o bn_mpi.o bn_exp2.o bn_gf2m.o bn_nist.o \
-        bn_depr.o bn_const.o
+        bn_depr.o bn_const.o bn_x931p.o
 
 SRC= $(LIBSRC)
 
@@ -66,6 +66,8 @@ co-586.s:	asm/co-586.pl ../perlasm/x86asm.pl
         $(PERL) asm/co-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 x86-mont.s:     asm/x86-mont.pl ../perlasm/x86asm.pl
         $(PERL) asm/x86-mont.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+x86-gf2m.s:     asm/x86-gf2m.pl ../perlasm/x86asm.pl
+        $(PERL) asm/x86-gf2m.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
 
 sparcv8.o:      asm/sparcv8.S
         $(CC) $(CFLAGS) -c asm/sparcv8.S
@@ -82,16 +84,31 @@ bn-mips3.o:	asm/mips3.s
                 as -$$ABI -O -o $@ asm/mips3.s; \
         else    $(CC) -c $(CFLAGS) -o $@ asm/mips3.s; fi
 
+bn-mips.s:      asm/mips.pl
+        $(PERL) asm/mips.pl $(PERLASM_SCHEME) $@
+mips-mont.s:    asm/mips-mont.pl
+        $(PERL) asm/mips-mont.pl $(PERLASM_SCHEME) $@
+
 bn-s390x.o:     asm/s390x.S
         $(CC) $(CFLAGS) -c -o $@ asm/s390x.S
+s390x-gf2m.s:   asm/s390x-gf2m.pl
+        $(PERL) asm/s390x-gf2m.pl $(PERLASM_SCHEME) $@
 
 x86_64-gcc.o:   asm/x86_64-gcc.c
         $(CC) $(CFLAGS) -c -o $@ asm/x86_64-gcc.c
 x86_64-mont.s:  asm/x86_64-mont.pl
         $(PERL) asm/x86_64-mont.pl $(PERLASM_SCHEME) > $@
+x86_64-mont5.s: asm/x86_64-mont5.pl
+        $(PERL) asm/x86_64-mont5.pl $(PERLASM_SCHEME) > $@
+x86_64-gf2m.s:  asm/x86_64-gf2m.pl
+        $(PERL) asm/x86_64-gf2m.pl $(PERLASM_SCHEME) > $@
+modexp512-x86_64.s:     asm/modexp512-x86_64.pl
+        $(PERL) asm/modexp512-x86_64.pl $(PERLASM_SCHEME) > $@
 
 bn-ia64.s:      asm/ia64.S
         $(CC) $(CFLAGS) -E asm/ia64.S > $@
+ia64-mont.s:    asm/ia64-mont.pl
+        $(PERL) asm/ia64-mont.pl $@ $(CFLAGS)
 
 # GNU assembler fails to compile PA-RISC2 modules, insist on calling
 # vendor assembler...
@@ -99,16 +116,22 @@ pa-risc2W.o: asm/pa-risc2W.s
         /usr/ccs/bin/as -o pa-risc2W.o asm/pa-risc2W.s
 pa-risc2.o: asm/pa-risc2.s
         /usr/ccs/bin/as -o pa-risc2.o asm/pa-risc2.s
+parisc-mont.s:  asm/parisc-mont.pl
+        $(PERL) asm/parisc-mont.pl $(PERLASM_SCHEME) $@
 
 # ppc - AIX, Linux, MacOS X...
 bn-ppc.s:       asm/ppc.pl;     $(PERL) asm/ppc.pl $(PERLASM_SCHEME) $@
 ppc-mont.s:     asm/ppc-mont.pl;$(PERL) asm/ppc-mont.pl $(PERLASM_SCHEME) $@
+ppc64-mont.s:   asm/ppc64-mont.pl;$(PERL) asm/ppc64-mont.pl $(PERLASM_SCHEME) $@
 
 alpha-mont.s:   asm/alpha-mont.pl
         $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
 
 # GNU make "catch all"
-%-mont.s:       asm/%-mont.pl;  $(PERL) $< $(CFLAGS) > $@
+%-mont.s:       asm/%-mont.pl;  $(PERL) $< $(PERLASM_SCHEME) $@
+%-gf2m.S:       asm/%-gf2m.pl;  $(PERL) $< $(PERLASM_SCHEME) $@
+
+armv4-gf2m.o:   armv4-gf2m.S
 
 files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -345,3 +368,8 @@ bn_word.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bn_word.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 bn_word.o: ../../include/openssl/symhacks.h ../cryptlib.h bn_lcl.h bn_word.c
+bn_x931p.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+bn_x931p.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+bn_x931p.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+bn_x931p.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+bn_x931p.o: ../../include/openssl/symhacks.h bn_x931p.c
diff --git a/src/lib/libssl/src/crypto/bn/asm/ppc.pl b/src/lib/libssl/src/crypto/bn/asm/ppc.pl
index f4093177e6..1249ce2299 100644
--- a/src/lib/libssl/src/crypto/bn/asm/ppc.pl
+++ b/src/lib/libssl/src/crypto/bn/asm/ppc.pl
@@ -389,7 +389,9 @@ $data=<<EOF;
         $ST             r9,`6*$BNSZ`(r3)        #r[6]=c1
         $ST             r10,`7*$BNSZ`(r3)       #r[7]=c2
         blr
-        .long   0x00000000
+        .long   0
+        .byte   0,12,0x14,0,0,0,2,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -814,8 +816,9 @@ $data=<<EOF;
 
 
         blr
-
-        .long   0x00000000
+        .long   0
+        .byte   0,12,0x14,0,0,0,2,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -966,7 +969,9 @@ $data=<<EOF;
         $ST     r10,`6*$BNSZ`(r3)       #r[6]=c1
         $ST     r11,`7*$BNSZ`(r3)       #r[7]=c2
         blr
-        .long   0x00000000
+        .long   0
+        .byte   0,12,0x14,0,0,0,3,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -1502,7 +1507,9 @@ $data=<<EOF;
         $ST     r12,`14*$BNSZ`(r3)      #r[14]=c3;
         $ST     r10,`15*$BNSZ`(r3)      #r[15]=c1;
         blr
-        .long   0x00000000
+        .long   0
+        .byte   0,12,0x14,0,0,0,3,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -1550,8 +1557,9 @@ Lppcasm_sub_adios:
         subfze  r3,r0           # if carry bit is set then r3 = 0 else -1
         andi.   r3,r3,1         # keep only last bit.
         blr
-        .long   0x00000000
-
+        .long   0
+        .byte   0,12,0x14,0,0,0,4,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -1594,7 +1602,9 @@ Lppcasm_add_mainloop:
 Lppcasm_add_adios:      
         addze   r3,r0                   #return carry bit.
         blr
-        .long   0x00000000
+        .long   0
+        .byte   0,12,0x14,0,0,0,4,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -1707,7 +1717,9 @@ Lppcasm_div8:
 Lppcasm_div9:
         or      r3,r8,r0
         blr
-        .long   0x00000000
+        .long   0
+        .byte   0,12,0x14,0,0,0,3,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -1746,8 +1758,9 @@ Lppcasm_sqr_mainloop:
         bdnz-   Lppcasm_sqr_mainloop
 Lppcasm_sqr_adios:      
         blr
-        .long   0x00000000
-
+        .long   0
+        .byte   0,12,0x14,0,0,0,3,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -1850,7 +1863,9 @@ Lppcasm_mw_REM:
 Lppcasm_mw_OVER:        
         addi    r3,r12,0
         blr
-        .long   0x00000000
+        .long   0
+        .byte   0,12,0x14,0,0,0,4,0
+        .long   0
 
 #
 #       NOTE:   The following label name should be changed to
@@ -1973,7 +1988,9 @@ Lppcasm_maw_leftover:
 Lppcasm_maw_adios:      
         addi    r3,r12,0
         blr
-        .long   0x00000000
+        .long   0
+        .byte   0,12,0x14,0,0,0,4,0
+        .long   0
         .align  4
 EOF
 $data =~ s/\`([^\`]*)\`/eval $1/gem;
diff --git a/src/lib/libssl/src/crypto/bn/bn.h b/src/lib/libssl/src/crypto/bn/bn.h
index a0bc47837d..f34248ec4f 100644
--- a/src/lib/libssl/src/crypto/bn/bn.h
+++ b/src/lib/libssl/src/crypto/bn/bn.h
@@ -558,6 +558,17 @@ int	BN_is_prime_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx, BN_GENCB *cb);
 int     BN_is_prime_fasttest_ex(const BIGNUM *p,int nchecks, BN_CTX *ctx,
                 int do_trial_division, BN_GENCB *cb);
 
+int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx);
+
+int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
+                        const BIGNUM *Xp, const BIGNUM *Xp1, const BIGNUM *Xp2,
+                        const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb);
+int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
+                        BIGNUM *Xp1, BIGNUM *Xp2,
+                        const BIGNUM *Xp,
+                        const BIGNUM *e, BN_CTX *ctx,
+                        BN_GENCB *cb);
+
 BN_MONT_CTX *BN_MONT_CTX_new(void );
 void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
 int BN_mod_mul_montgomery(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,
@@ -612,6 +623,8 @@ int	BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 int     BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
         BN_RECP_CTX *recp, BN_CTX *ctx);
 
+#ifndef OPENSSL_NO_EC2M
+
 /* Functions for arithmetic over binary polynomials represented by BIGNUMs. 
  *
  * The BIGNUM::neg property of BIGNUMs representing binary polynomials is
@@ -663,6 +676,8 @@ int	BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
 int     BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max);
 int     BN_GF2m_arr2poly(const int p[], BIGNUM *a);
 
+#endif
+
 /* faster mod functions for the 'NIST primes' 
  * 0 <= a < p^2 */
 int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
diff --git a/src/lib/libssl/src/crypto/bn/bn_div.c b/src/lib/libssl/src/crypto/bn/bn_div.c
index 802a43d642..52b3304293 100644
--- a/src/lib/libssl/src/crypto/bn/bn_div.c
+++ b/src/lib/libssl/src/crypto/bn/bn_div.c
@@ -169,15 +169,13 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
 #endif /* OPENSSL_NO_ASM */
 
 
-/* BN_div[_no_branch] computes  dv := num / divisor,  rounding towards
+/* BN_div computes  dv := num / divisor,  rounding towards
  * zero, and sets up rm  such that  dv*divisor + rm = num  holds.
  * Thus:
  *     dv->neg == num->neg ^ divisor->neg  (unless the result is zero)
  *     rm->neg == num->neg                 (unless the remainder is zero)
  * If 'dv' or 'rm' is NULL, the respective value is not returned.
  */
-static int BN_div_no_branch(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
-        const BIGNUM *divisor, BN_CTX *ctx);
 int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
            BN_CTX *ctx)
         {
@@ -186,6 +184,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
         BN_ULONG *resp,*wnump;
         BN_ULONG d0,d1;
         int num_n,div_n;
+        int no_branch=0;
 
         /* Invalid zero-padding would have particularly bad consequences
          * in the case of 'num', so don't just rely on bn_check_top() for this one
@@ -200,7 +199,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
 
         if ((BN_get_flags(num, BN_FLG_CONSTTIME) != 0) || (BN_get_flags(divisor, BN_FLG_CONSTTIME) != 0))
                 {
-                return BN_div_no_branch(dv, rm, num, divisor, ctx);
+                no_branch=1;
                 }
 
         bn_check_top(dv);
@@ -214,7 +213,7 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
                 return(0);
                 }
 
-        if (BN_ucmp(num,divisor) < 0)
+        if (!no_branch && BN_ucmp(num,divisor) < 0)
                 {
                 if (rm != NULL)
                         { if (BN_copy(rm,num) == NULL) return(0); }
@@ -239,242 +238,25 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor,
         norm_shift+=BN_BITS2;
         if (!(BN_lshift(snum,num,norm_shift))) goto err;
         snum->neg=0;
-        div_n=sdiv->top;
-        num_n=snum->top;
-        loop=num_n-div_n;
-        /* Lets setup a 'window' into snum
-         * This is the part that corresponds to the current
-         * 'area' being divided */
-        wnum.neg   = 0;
-        wnum.d     = &(snum->d[loop]);
-        wnum.top   = div_n;
-        /* only needed when BN_ucmp messes up the values between top and max */
-        wnum.dmax  = snum->dmax - loop; /* so we don't step out of bounds */
-
-        /* Get the top 2 words of sdiv */
-        /* div_n=sdiv->top; */
-        d0=sdiv->d[div_n-1];
-        d1=(div_n == 1)?0:sdiv->d[div_n-2];
-
-        /* pointer to the 'top' of snum */
-        wnump= &(snum->d[num_n-1]);
-
-        /* Setup to 'res' */
-        res->neg= (num->neg^divisor->neg);
-        if (!bn_wexpand(res,(loop+1))) goto err;
-        res->top=loop;
-        resp= &(res->d[loop-1]);
-
-        /* space for temp */
-        if (!bn_wexpand(tmp,(div_n+1))) goto err;
 
-        if (BN_ucmp(&wnum,sdiv) >= 0)
+        if (no_branch)
                 {
-                /* If BN_DEBUG_RAND is defined BN_ucmp changes (via
-                 * bn_pollute) the const bignum arguments =>
-                 * clean the values between top and max again */
-                bn_clear_top2max(&wnum);
-                bn_sub_words(wnum.d, wnum.d, sdiv->d, div_n);
-                *resp=1;
-                }
-        else
-                res->top--;
-        /* if res->top == 0 then clear the neg value otherwise decrease
-         * the resp pointer */
-        if (res->top == 0)
-                res->neg = 0;
-        else
-                resp--;
-
-        for (i=0; i<loop-1; i++, wnump--, resp--)
-                {
-                BN_ULONG q,l0;
-                /* the first part of the loop uses the top two words of
-                 * snum and sdiv to calculate a BN_ULONG q such that
-                 * | wnum - sdiv * q | < sdiv */
-#if defined(BN_DIV3W) && !defined(OPENSSL_NO_ASM)
-                BN_ULONG bn_div_3_words(BN_ULONG*,BN_ULONG,BN_ULONG);
-                q=bn_div_3_words(wnump,d1,d0);
-#else
-                BN_ULONG n0,n1,rem=0;
-
-                n0=wnump[0];
-                n1=wnump[-1];
-                if (n0 == d0)
-                        q=BN_MASK2;
-                else                    /* n0 < d0 */
-                        {
-#ifdef BN_LLONG
-                        BN_ULLONG t2;
-
-#if defined(BN_LLONG) && defined(BN_DIV2W) && !defined(bn_div_words)
-                        q=(BN_ULONG)(((((BN_ULLONG)n0)<<BN_BITS2)|n1)/d0);
-#else
-                        q=bn_div_words(n0,n1,d0);
-#ifdef BN_DEBUG_LEVITTE
-                        fprintf(stderr,"DEBUG: bn_div_words(0x%08X,0x%08X,0x%08\
-X) -> 0x%08X\n",
-                                n0, n1, d0, q);
-#endif
-#endif
-
-#ifndef REMAINDER_IS_ALREADY_CALCULATED
-                        /*
-                         * rem doesn't have to be BN_ULLONG. The least we
-                         * know it's less that d0, isn't it?
-                         */
-                        rem=(n1-q*d0)&BN_MASK2;
-#endif
-                        t2=(BN_ULLONG)d1*q;
-
-                        for (;;)
-                                {
-                                if (t2 <= ((((BN_ULLONG)rem)<<BN_BITS2)|wnump[-2]))
-                                        break;
-                                q--;
-                                rem += d0;
-                                if (rem < d0) break; /* don't let rem overflow */
-                                t2 -= d1;
-                                }
-#else /* !BN_LLONG */
-                        BN_ULONG t2l,t2h;
-
-                        q=bn_div_words(n0,n1,d0);
-#ifdef BN_DEBUG_LEVITTE
-                        fprintf(stderr,"DEBUG: bn_div_words(0x%08X,0x%08X,0x%08\
-X) -> 0x%08X\n",
-                                n0, n1, d0, q);
-#endif
-#ifndef REMAINDER_IS_ALREADY_CALCULATED
-                        rem=(n1-q*d0)&BN_MASK2;
-#endif
-
-#if defined(BN_UMULT_LOHI)
-                        BN_UMULT_LOHI(t2l,t2h,d1,q);
-#elif defined(BN_UMULT_HIGH)
-                        t2l = d1 * q;
-                        t2h = BN_UMULT_HIGH(d1,q);
-#else
+                /* Since we don't know whether snum is larger than sdiv,
+                 * we pad snum with enough zeroes without changing its
+                 * value. 
+                 */
+                if (snum->top <= sdiv->top+1) 
                         {
-                        BN_ULONG ql, qh;
-                        t2l=LBITS(d1); t2h=HBITS(d1);
-                        ql =LBITS(q);  qh =HBITS(q);
-                        mul64(t2l,t2h,ql,qh); /* t2=(BN_ULLONG)d1*q; */
+                        if (bn_wexpand(snum, sdiv->top + 2) == NULL) goto err;
+                        for (i = snum->top; i < sdiv->top + 2; i++) snum->d[i] = 0;
+                        snum->top = sdiv->top + 2;
                         }
-#endif
-
-                        for (;;)
-                                {
-                                if ((t2h < rem) ||
-                                        ((t2h == rem) && (t2l <= wnump[-2])))
-                                        break;
-                                q--;
-                                rem += d0;
-                                if (rem < d0) break; /* don't let rem overflow */
-                                if (t2l < d1) t2h--; t2l -= d1;
-                                }
-#endif /* !BN_LLONG */
-                        }
-#endif /* !BN_DIV3W */
-
-                l0=bn_mul_words(tmp->d,sdiv->d,div_n,q);
-                tmp->d[div_n]=l0;
-                wnum.d--;
-                /* ingore top values of the bignums just sub the two 
-                 * BN_ULONG arrays with bn_sub_words */
-                if (bn_sub_words(wnum.d, wnum.d, tmp->d, div_n+1))
+                else
                         {
-                        /* Note: As we have considered only the leading
-                         * two BN_ULONGs in the calculation of q, sdiv * q
-                         * might be greater than wnum (but then (q-1) * sdiv
-                         * is less or equal than wnum)
-                         */
-                        q--;
-                        if (bn_add_words(wnum.d, wnum.d, sdiv->d, div_n))
-                                /* we can't have an overflow here (assuming
-                                 * that q != 0, but if q == 0 then tmp is
-                                 * zero anyway) */
-                                (*wnump)++;
+                        if (bn_wexpand(snum, snum->top + 1) == NULL) goto err;
+                        snum->d[snum->top] = 0;
+                        snum->top ++;
                         }
-                /* store part of the result */
-                *resp = q;
-                }
-        bn_correct_top(snum);
-        if (rm != NULL)
-                {
-                /* Keep a copy of the neg flag in num because if rm==num
-                 * BN_rshift() will overwrite it.
-                 */
-                int neg = num->neg;
-                BN_rshift(rm,snum,norm_shift);
-                if (!BN_is_zero(rm))
-                        rm->neg = neg;
-                bn_check_top(rm);
-                }
-        BN_CTX_end(ctx);
-        return(1);
-err:
-        bn_check_top(rm);
-        BN_CTX_end(ctx);
-        return(0);
-        }
-
-
-/* BN_div_no_branch is a special version of BN_div. It does not contain
- * branches that may leak sensitive information.
- */
-static int BN_div_no_branch(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, 
-        const BIGNUM *divisor, BN_CTX *ctx)
-        {
-        int norm_shift,i,loop;
-        BIGNUM *tmp,wnum,*snum,*sdiv,*res;
-        BN_ULONG *resp,*wnump;
-        BN_ULONG d0,d1;
-        int num_n,div_n;
-
-        bn_check_top(dv);
-        bn_check_top(rm);
-        /* bn_check_top(num); */ /* 'num' has been checked in BN_div() */
-        bn_check_top(divisor);
-
-        if (BN_is_zero(divisor))
-                {
-                BNerr(BN_F_BN_DIV_NO_BRANCH,BN_R_DIV_BY_ZERO);
-                return(0);
-                }
-
-        BN_CTX_start(ctx);
-        tmp=BN_CTX_get(ctx);
-        snum=BN_CTX_get(ctx);
-        sdiv=BN_CTX_get(ctx);
-        if (dv == NULL)
-                res=BN_CTX_get(ctx);
-        else    res=dv;
-        if (sdiv == NULL || res == NULL) goto err;
-
-        /* First we normalise the numbers */
-        norm_shift=BN_BITS2-((BN_num_bits(divisor))%BN_BITS2);
-        if (!(BN_lshift(sdiv,divisor,norm_shift))) goto err;
-        sdiv->neg=0;
-        norm_shift+=BN_BITS2;
-        if (!(BN_lshift(snum,num,norm_shift))) goto err;
-        snum->neg=0;
-
-        /* Since we don't know whether snum is larger than sdiv,
-         * we pad snum with enough zeroes without changing its
-         * value. 
-         */
-        if (snum->top <= sdiv->top+1) 
-                {
-                if (bn_wexpand(snum, sdiv->top + 2) == NULL) goto err;
-                for (i = snum->top; i < sdiv->top + 2; i++) snum->d[i] = 0;
-                snum->top = sdiv->top + 2;
-                }
-        else
-                {
-                if (bn_wexpand(snum, snum->top + 1) == NULL) goto err;
-                snum->d[snum->top] = 0;
-                snum->top ++;
                 }
 
         div_n=sdiv->top;
@@ -500,12 +282,27 @@ static int BN_div_no_branch(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num,
         /* Setup to 'res' */
         res->neg= (num->neg^divisor->neg);
         if (!bn_wexpand(res,(loop+1))) goto err;
-        res->top=loop-1;
+        res->top=loop-no_branch;
         resp= &(res->d[loop-1]);
 
         /* space for temp */
         if (!bn_wexpand(tmp,(div_n+1))) goto err;
 
+        if (!no_branch)
+                {
+                if (BN_ucmp(&wnum,sdiv) >= 0)
+                        {
+                        /* If BN_DEBUG_RAND is defined BN_ucmp changes (via
+                         * bn_pollute) the const bignum arguments =>
+                         * clean the values between top and max again */
+                        bn_clear_top2max(&wnum);
+                        bn_sub_words(wnum.d, wnum.d, sdiv->d, div_n);
+                        *resp=1;
+                        }
+                else
+                        res->top--;
+                }
+
         /* if res->top == 0 then clear the neg value otherwise decrease
          * the resp pointer */
         if (res->top == 0)
@@ -638,7 +435,7 @@ X) -> 0x%08X\n",
                         rm->neg = neg;
                 bn_check_top(rm);
                 }
-        bn_correct_top(res);
+        if (no_branch)  bn_correct_top(res);
         BN_CTX_end(ctx);
         return(1);
 err:
@@ -646,5 +443,4 @@ err:
         BN_CTX_end(ctx);
         return(0);
         }
-
 #endif
diff --git a/src/lib/libssl/src/crypto/bn/bn_exp.c b/src/lib/libssl/src/crypto/bn/bn_exp.c
index d9b6c737fc..2abf6fd678 100644
--- a/src/lib/libssl/src/crypto/bn/bn_exp.c
+++ b/src/lib/libssl/src/crypto/bn/bn_exp.c
@@ -113,6 +113,18 @@
 #include "cryptlib.h"
 #include "bn_lcl.h"
 
+#include <stdlib.h>
+#ifdef _WIN32
+# include <malloc.h>
+# ifndef alloca
+#  define alloca _alloca
+# endif
+#elif defined(__GNUC__)
+# ifndef alloca
+#  define alloca(s) __builtin_alloca((s))
+# endif
+#endif
+
 /* maximum precomputation table size for *variable* sliding windows */
 #define TABLE_SIZE      32
 
@@ -522,23 +534,17 @@ err:
  * as cache lines are concerned.  The following functions are used to transfer a BIGNUM
  * from/to that table. */
 
-static int MOD_EXP_CTIME_COPY_TO_PREBUF(BIGNUM *b, int top, unsigned char *buf, int idx, int width)
+static int MOD_EXP_CTIME_COPY_TO_PREBUF(const BIGNUM *b, int top, unsigned char *buf, int idx, int width)
         {
         size_t i, j;
 
-        if (bn_wexpand(b, top) == NULL)
-                return 0;
-        while (b->top < top)
-                {
-                b->d[b->top++] = 0;
-                }
-        
+        if (top > b->top)
+                top = b->top; /* this works because 'buf' is explicitly zeroed */
         for (i = 0, j=idx; i < top * sizeof b->d[0]; i++, j+=width)
                 {
                 buf[j] = ((unsigned char*)b->d)[i];
                 }
 
-        bn_correct_top(b);
         return 1;
         }
 
@@ -561,7 +567,7 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top, unsigned char *buf
 
 /* Given a pointer value, compute the next address that is a cache line multiple. */
 #define MOD_EXP_CTIME_ALIGN(x_) \
-        ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((BN_ULONG)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
+        ((unsigned char*)(x_) + (MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH - (((size_t)(x_)) & (MOD_EXP_CTIME_MIN_CACHE_LINE_MASK))))
 
 /* This variant of BN_mod_exp_mont() uses fixed windows and the special
  * precomputation memory layout to limit data-dependency to a minimum
@@ -572,17 +578,15 @@ static int MOD_EXP_CTIME_COPY_FROM_PREBUF(BIGNUM *b, int top, unsigned char *buf
 int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
                     const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
         {
-        int i,bits,ret=0,idx,window,wvalue;
+        int i,bits,ret=0,window,wvalue;
         int top;
-        BIGNUM *r;
-        const BIGNUM *aa;
         BN_MONT_CTX *mont=NULL;
 
         int numPowers;
         unsigned char *powerbufFree=NULL;
         int powerbufLen = 0;
         unsigned char *powerbuf=NULL;
-        BIGNUM *computeTemp=NULL, *am=NULL;
+        BIGNUM tmp, am;
 
         bn_check_top(a);
         bn_check_top(p);
@@ -602,10 +606,7 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
                 return ret;
                 }
 
-        /* Initialize BIGNUM context and allocate intermediate result */
         BN_CTX_start(ctx);
-        r = BN_CTX_get(ctx);
-        if (r == NULL) goto err;
 
         /* Allocate a montgomery context if it was not supplied by the caller.
          * If this is not done, things will break in the montgomery part.
@@ -620,40 +621,154 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
 
         /* Get the window size to use with size of p. */
         window = BN_window_bits_for_ctime_exponent_size(bits);
+#if defined(OPENSSL_BN_ASM_MONT5)
+        if (window==6 && bits<=1024) window=5;  /* ~5% improvement of 2048-bit RSA sign */
+#endif
 
         /* Allocate a buffer large enough to hold all of the pre-computed
-         * powers of a.
+         * powers of am, am itself and tmp.
          */
         numPowers = 1 << window;
-        powerbufLen = sizeof(m->d[0])*top*numPowers;
+        powerbufLen = sizeof(m->d[0])*(top*numPowers +
+                                ((2*top)>numPowers?(2*top):numPowers));
+#ifdef alloca
+        if (powerbufLen < 3072)
+                powerbufFree = alloca(powerbufLen+MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH);
+        else
+#endif
         if ((powerbufFree=(unsigned char*)OPENSSL_malloc(powerbufLen+MOD_EXP_CTIME_MIN_CACHE_LINE_WIDTH)) == NULL)
                 goto err;
                 
         powerbuf = MOD_EXP_CTIME_ALIGN(powerbufFree);
         memset(powerbuf, 0, powerbufLen);
 
-        /* Initialize the intermediate result. Do this early to save double conversion,
-         * once each for a^0 and intermediate result.
-         */
-        if (!BN_to_montgomery(r,BN_value_one(),mont,ctx)) goto err;
-        if (!MOD_EXP_CTIME_COPY_TO_PREBUF(r, top, powerbuf, 0, numPowers)) goto err;
+#ifdef alloca
+        if (powerbufLen < 3072)
+                powerbufFree = NULL;
+#endif
 
-        /* Initialize computeTemp as a^1 with montgomery precalcs */
-        computeTemp = BN_CTX_get(ctx);
-        am = BN_CTX_get(ctx);
-        if (computeTemp==NULL || am==NULL) goto err;
+        /* lay down tmp and am right after powers table */
+        tmp.d     = (BN_ULONG *)(powerbuf + sizeof(m->d[0])*top*numPowers);
+        am.d      = tmp.d + top;
+        tmp.top   = am.top  = 0;
+        tmp.dmax  = am.dmax = top;
+        tmp.neg   = am.neg  = 0;
+        tmp.flags = am.flags = BN_FLG_STATIC_DATA;
+
+        /* prepare a^0 in Montgomery domain */
+#if 1
+        if (!BN_to_montgomery(&tmp,BN_value_one(),mont,ctx))    goto err;
+#else
+        tmp.d[0] = (0-m->d[0])&BN_MASK2;        /* 2^(top*BN_BITS2) - m */
+        for (i=1;i<top;i++)
+                tmp.d[i] = (~m->d[i])&BN_MASK2;
+        tmp.top = top;
+#endif
 
+        /* prepare a^1 in Montgomery domain */
         if (a->neg || BN_ucmp(a,m) >= 0)
                 {
-                if (!BN_mod(am,a,m,ctx))
-                        goto err;
-                aa= am;
+                if (!BN_mod(&am,a,m,ctx))                       goto err;
+                if (!BN_to_montgomery(&am,&am,mont,ctx))        goto err;
                 }
-        else
-                aa=a;
-        if (!BN_to_montgomery(am,aa,mont,ctx)) goto err;
-        if (!BN_copy(computeTemp, am)) goto err;
-        if (!MOD_EXP_CTIME_COPY_TO_PREBUF(am, top, powerbuf, 1, numPowers)) goto err;
+        else    if (!BN_to_montgomery(&am,a,mont,ctx))          goto err;
+
+#if defined(OPENSSL_BN_ASM_MONT5)
+    /* This optimization uses ideas from http://eprint.iacr.org/2011/239,
+     * specifically optimization of cache-timing attack countermeasures
+     * and pre-computation optimization. */
+
+    /* Dedicated window==4 case improves 512-bit RSA sign by ~15%, but as
+     * 512-bit RSA is hardly relevant, we omit it to spare size... */ 
+    if (window==5)
+        {
+        void bn_mul_mont_gather5(BN_ULONG *rp,const BN_ULONG *ap,
+                        const void *table,const BN_ULONG *np,
+                        const BN_ULONG *n0,int num,int power);
+        void bn_scatter5(const BN_ULONG *inp,size_t num,
+                        void *table,size_t power);
+        void bn_gather5(BN_ULONG *out,size_t num,
+                        void *table,size_t power);
+
+        BN_ULONG *np=mont->N.d, *n0=mont->n0;
+
+        /* BN_to_montgomery can contaminate words above .top
+         * [in BN_DEBUG[_DEBUG] build]... */
+        for (i=am.top; i<top; i++)      am.d[i]=0;
+        for (i=tmp.top; i<top; i++)     tmp.d[i]=0;
+
+        bn_scatter5(tmp.d,top,powerbuf,0);
+        bn_scatter5(am.d,am.top,powerbuf,1);
+        bn_mul_mont(tmp.d,am.d,am.d,np,n0,top);
+        bn_scatter5(tmp.d,top,powerbuf,2);
+
+#if 0
+        for (i=3; i<32; i++)
+                {
+                /* Calculate a^i = a^(i-1) * a */
+                bn_mul_mont_gather5(tmp.d,am.d,powerbuf,np,n0,top,i-1);
+                bn_scatter5(tmp.d,top,powerbuf,i);
+                }
+#else
+        /* same as above, but uses squaring for 1/2 of operations */
+        for (i=4; i<32; i*=2)
+                {
+                bn_mul_mont(tmp.d,tmp.d,tmp.d,np,n0,top);
+                bn_scatter5(tmp.d,top,powerbuf,i);
+                }
+        for (i=3; i<8; i+=2)
+                {
+                int j;
+                bn_mul_mont_gather5(tmp.d,am.d,powerbuf,np,n0,top,i-1);
+                bn_scatter5(tmp.d,top,powerbuf,i);
+                for (j=2*i; j<32; j*=2)
+                        {
+                        bn_mul_mont(tmp.d,tmp.d,tmp.d,np,n0,top);
+                        bn_scatter5(tmp.d,top,powerbuf,j);
+                        }
+                }
+        for (; i<16; i+=2)
+                {
+                bn_mul_mont_gather5(tmp.d,am.d,powerbuf,np,n0,top,i-1);
+                bn_scatter5(tmp.d,top,powerbuf,i);
+                bn_mul_mont(tmp.d,tmp.d,tmp.d,np,n0,top);
+                bn_scatter5(tmp.d,top,powerbuf,2*i);
+                }
+        for (; i<32; i+=2)
+                {
+                bn_mul_mont_gather5(tmp.d,am.d,powerbuf,np,n0,top,i-1);
+                bn_scatter5(tmp.d,top,powerbuf,i);
+                }
+#endif
+        bits--;
+        for (wvalue=0, i=bits%5; i>=0; i--,bits--)
+                wvalue = (wvalue<<1)+BN_is_bit_set(p,bits);
+        bn_gather5(tmp.d,top,powerbuf,wvalue);
+
+        /* Scan the exponent one window at a time starting from the most
+         * significant bits.
+         */
+        while (bits >= 0)
+                {
+                for (wvalue=0, i=0; i<5; i++,bits--)
+                        wvalue = (wvalue<<1)+BN_is_bit_set(p,bits);
+
+                bn_mul_mont(tmp.d,tmp.d,tmp.d,np,n0,top);
+                bn_mul_mont(tmp.d,tmp.d,tmp.d,np,n0,top);
+                bn_mul_mont(tmp.d,tmp.d,tmp.d,np,n0,top);
+                bn_mul_mont(tmp.d,tmp.d,tmp.d,np,n0,top);
+                bn_mul_mont(tmp.d,tmp.d,tmp.d,np,n0,top);
+                bn_mul_mont_gather5(tmp.d,tmp.d,powerbuf,np,n0,top,wvalue);
+                }
+
+        tmp.top=top;
+        bn_correct_top(&tmp);
+        }
+    else
+#endif
+        {
+        if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, 0, numPowers)) goto err;
+        if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&am,  top, powerbuf, 1, numPowers)) goto err;
 
         /* If the window size is greater than 1, then calculate
          * val[i=2..2^winsize-1]. Powers are computed as a*a^(i-1)
@@ -662,62 +777,54 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
          */
         if (window > 1)
                 {
-                for (i=2; i<numPowers; i++)
+                if (!BN_mod_mul_montgomery(&tmp,&am,&am,mont,ctx))      goto err;
+                if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, 2, numPowers)) goto err;
+                for (i=3; i<numPowers; i++)
                         {
                         /* Calculate a^i = a^(i-1) * a */
-                        if (!BN_mod_mul_montgomery(computeTemp,am,computeTemp,mont,ctx))
+                        if (!BN_mod_mul_montgomery(&tmp,&am,&tmp,mont,ctx))
                                 goto err;
-                        if (!MOD_EXP_CTIME_COPY_TO_PREBUF(computeTemp, top, powerbuf, i, numPowers)) goto err;
+                        if (!MOD_EXP_CTIME_COPY_TO_PREBUF(&tmp, top, powerbuf, i, numPowers)) goto err;
                         }
                 }
 
-        /* Adjust the number of bits up to a multiple of the window size.
-         * If the exponent length is not a multiple of the window size, then
-         * this pads the most significant bits with zeros to normalize the
-         * scanning loop to there's no special cases.
-         *
-         * * NOTE: Making the window size a power of two less than the native
-         * * word size ensures that the padded bits won't go past the last
-         * * word in the internal BIGNUM structure. Going past the end will
-         * * still produce the correct result, but causes a different branch
-         * * to be taken in the BN_is_bit_set function.
-         */
-        bits = ((bits+window-1)/window)*window;
-        idx=bits-1;     /* The top bit of the window */
-
-        /* Scan the exponent one window at a time starting from the most
-         * significant bits.
-         */
-        while (idx >= 0)
+        bits--;
+        for (wvalue=0, i=bits%window; i>=0; i--,bits--)
+                wvalue = (wvalue<<1)+BN_is_bit_set(p,bits);
+        if (!MOD_EXP_CTIME_COPY_FROM_PREBUF(&tmp,top,powerbuf,wvalue,numPowers)) goto err;
+ 
+        /* Scan the exponent one window at a time starting from the most
+         * significant bits.
+         */
+        while (bits >= 0)
                 {
                 wvalue=0; /* The 'value' of the window */
                 
                 /* Scan the window, squaring the result as we go */
-                for (i=0; i<window; i++,idx--)
+                for (i=0; i<window; i++,bits--)
                         {
-                        if (!BN_mod_mul_montgomery(r,r,r,mont,ctx))     goto err;
-                        wvalue = (wvalue<<1)+BN_is_bit_set(p,idx);
+                        if (!BN_mod_mul_montgomery(&tmp,&tmp,&tmp,mont,ctx))    goto err;
+                        wvalue = (wvalue<<1)+BN_is_bit_set(p,bits);
                         }
                 
                 /* Fetch the appropriate pre-computed value from the pre-buf */
-                if (!MOD_EXP_CTIME_COPY_FROM_PREBUF(computeTemp, top, powerbuf, wvalue, numPowers)) goto err;
+                if (!MOD_EXP_CTIME_COPY_FROM_PREBUF(&am, top, powerbuf, wvalue, numPowers)) goto err;
 
                 /* Multiply the result into the intermediate result */
-                if (!BN_mod_mul_montgomery(r,r,computeTemp,mont,ctx)) goto err;
+                if (!BN_mod_mul_montgomery(&tmp,&tmp,&am,mont,ctx)) goto err;
                 }
+        }
 
         /* Convert the final result from montgomery to standard format */
-        if (!BN_from_montgomery(rr,r,mont,ctx)) goto err;
+        if (!BN_from_montgomery(rr,&tmp,mont,ctx)) goto err;
         ret=1;
 err:
         if ((in_mont == NULL) && (mont != NULL)) BN_MONT_CTX_free(mont);
         if (powerbuf!=NULL)
                 {
                 OPENSSL_cleanse(powerbuf,powerbufLen);
-                OPENSSL_free(powerbufFree);
+                if (powerbufFree) OPENSSL_free(powerbufFree);
                 }
-        if (am!=NULL) BN_clear(am);
-        if (computeTemp!=NULL) BN_clear(computeTemp);
         BN_CTX_end(ctx);
         return(ret);
         }
@@ -988,4 +1095,3 @@ err:
         bn_check_top(r);
         return(ret);
         }
-
diff --git a/src/lib/libssl/src/crypto/bn/bn_lcl.h b/src/lib/libssl/src/crypto/bn/bn_lcl.h
index 8e5e98e3f2..eecfd8cc99 100644
--- a/src/lib/libssl/src/crypto/bn/bn_lcl.h
+++ b/src/lib/libssl/src/crypto/bn/bn_lcl.h
@@ -238,7 +238,7 @@ extern "C" {
 #  if defined(__DECC)
 #   include <c_asm.h>
 #   define BN_UMULT_HIGH(a,b)   (BN_ULONG)asm("umulh %a0,%a1,%v0",(a),(b))
-#  elif defined(__GNUC__)
+#  elif defined(__GNUC__) && __GNUC__>=2
 #   define BN_UMULT_HIGH(a,b)   ({      \
         register BN_ULONG ret;          \
         asm ("umulh     %1,%2,%0"       \
@@ -247,7 +247,7 @@ extern "C" {
         ret;                    })
 #  endif        /* compiler */
 # elif defined(_ARCH_PPC) && defined(__64BIT__) && defined(SIXTY_FOUR_BIT_LONG)
-#  if defined(__GNUC__)
+#  if defined(__GNUC__) && __GNUC__>=2
 #   define BN_UMULT_HIGH(a,b)   ({      \
         register BN_ULONG ret;          \
         asm ("mulhdu    %0,%1,%2"       \
@@ -257,7 +257,7 @@ extern "C" {
 #  endif        /* compiler */
 # elif (defined(__x86_64) || defined(__x86_64__)) && \
        (defined(SIXTY_FOUR_BIT_LONG) || defined(SIXTY_FOUR_BIT))
-#  if defined(__GNUC__)
+#  if defined(__GNUC__) && __GNUC__>=2
 #   define BN_UMULT_HIGH(a,b)   ({      \
         register BN_ULONG ret,discard;  \
         asm ("mulq      %3"             \
@@ -280,6 +280,19 @@ extern "C" {
 #   define BN_UMULT_HIGH(a,b)           __umulh((a),(b))
 #   define BN_UMULT_LOHI(low,high,a,b)  ((low)=_umul128((a),(b),&(high)))
 #  endif
+# elif defined(__mips) && (defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG))
+#  if defined(__GNUC__) && __GNUC__>=2
+#   define BN_UMULT_HIGH(a,b)   ({      \
+        register BN_ULONG ret;          \
+        asm ("dmultu    %1,%2"          \
+             : "=h"(ret)                \
+             : "r"(a), "r"(b) : "l");   \
+        ret;                    })
+#   define BN_UMULT_LOHI(low,high,a,b)  \
+        asm ("dmultu    %2,%3"          \
+             : "=l"(low),"=h"(high)     \
+             : "r"(a), "r"(b));
+#  endif
 # endif         /* cpu */
 #endif          /* OPENSSL_NO_ASM */
 
@@ -459,6 +472,10 @@ extern "C" {
         }
 #endif /* !BN_LLONG */
 
+#if defined(OPENSSL_DOING_MAKEDEPEND) && defined(OPENSSL_FIPS)
+#undef bn_div_words
+#endif
+
 void bn_mul_normal(BN_ULONG *r,BN_ULONG *a,int na,BN_ULONG *b,int nb);
 void bn_mul_comba8(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b);
 void bn_mul_comba4(BN_ULONG *r,BN_ULONG *a,BN_ULONG *b);
diff --git a/src/lib/libssl/src/crypto/bn/bn_lib.c b/src/lib/libssl/src/crypto/bn/bn_lib.c
index 5470fbe6ef..7a5676de69 100644
--- a/src/lib/libssl/src/crypto/bn/bn_lib.c
+++ b/src/lib/libssl/src/crypto/bn/bn_lib.c
@@ -139,25 +139,6 @@ const BIGNUM *BN_value_one(void)
         return(&const_one);
         }
 
-char *BN_options(void)
-        {
-        static int init=0;
-        static char data[16];
-
-        if (!init)
-                {
-                init++;
-#ifdef BN_LLONG
-                BIO_snprintf(data,sizeof data,"bn(%d,%d)",
-                             (int)sizeof(BN_ULLONG)*8,(int)sizeof(BN_ULONG)*8);
-#else
-                BIO_snprintf(data,sizeof data,"bn(%d,%d)",
-                             (int)sizeof(BN_ULONG)*8,(int)sizeof(BN_ULONG)*8);
-#endif
-                }
-        return(data);
-        }
-
 int BN_num_bits_word(BN_ULONG l)
         {
         static const unsigned char bits[256]={
diff --git a/src/lib/libssl/src/crypto/bn/bn_mont.c b/src/lib/libssl/src/crypto/bn/bn_mont.c
index 1a866880f5..427b5cf4df 100644
--- a/src/lib/libssl/src/crypto/bn/bn_mont.c
+++ b/src/lib/libssl/src/crypto/bn/bn_mont.c
@@ -177,31 +177,26 @@ err:
 static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
         {
         BIGNUM *n;
-        BN_ULONG *ap,*np,*rp,n0,v,*nrp;
-        int al,nl,max,i,x,ri;
+        BN_ULONG *ap,*np,*rp,n0,v,carry;
+        int nl,max,i;
 
         n= &(mont->N);
-        /* mont->ri is the size of mont->N in bits (rounded up
-           to the word size) */
-        al=ri=mont->ri/BN_BITS2;
-
         nl=n->top;
-        if ((al == 0) || (nl == 0)) { ret->top=0; return(1); }
+        if (nl == 0) { ret->top=0; return(1); }
 
-        max=(nl+al+1); /* allow for overflow (no?) XXX */
+        max=(2*nl); /* carry is stored separately */
         if (bn_wexpand(r,max) == NULL) return(0);
 
         r->neg^=n->neg;
         np=n->d;
         rp=r->d;
-        nrp= &(r->d[nl]);
 
         /* clear the top words of T */
 #if 1
         for (i=r->top; i<max; i++) /* memset? XXX */
-                r->d[i]=0;
+                rp[i]=0;
 #else
-        memset(&(r->d[r->top]),0,(max-r->top)*sizeof(BN_ULONG)); 
+        memset(&(rp[r->top]),0,(max-r->top)*sizeof(BN_ULONG)); 
 #endif
 
         r->top=max;
@@ -210,7 +205,7 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
 #ifdef BN_COUNT
         fprintf(stderr,"word BN_from_montgomery_word %d * %d\n",nl,nl);
 #endif
-        for (i=0; i<nl; i++)
+        for (carry=0, i=0; i<nl; i++, rp++)
                 {
 #ifdef __TANDEM
                 {
@@ -228,61 +223,33 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
 #else
                 v=bn_mul_add_words(rp,np,nl,(rp[0]*n0)&BN_MASK2);
 #endif
-                nrp++;
-                rp++;
-                if (((nrp[-1]+=v)&BN_MASK2) >= v)
-                        continue;
-                else
-                        {
-                        if (((++nrp[0])&BN_MASK2) != 0) continue;
-                        if (((++nrp[1])&BN_MASK2) != 0) continue;
-                        for (x=2; (((++nrp[x])&BN_MASK2) == 0); x++) ;
-                        }
-                }
-        bn_correct_top(r);
-
-        /* mont->ri will be a multiple of the word size and below code
-         * is kind of BN_rshift(ret,r,mont->ri) equivalent */
-        if (r->top <= ri)
-                {
-                ret->top=0;
-                return(1);
+                v = (v+carry+rp[nl])&BN_MASK2;
+                carry |= (v != rp[nl]);
+                carry &= (v <= rp[nl]);
+                rp[nl]=v;
                 }
-        al=r->top-ri;
 
-#define BRANCH_FREE 1
-#if BRANCH_FREE
-        if (bn_wexpand(ret,ri) == NULL) return(0);
-        x=0-(((al-ri)>>(sizeof(al)*8-1))&1);
-        ret->top=x=(ri&~x)|(al&x);      /* min(ri,al) */
+        if (bn_wexpand(ret,nl) == NULL) return(0);
+        ret->top=nl;
         ret->neg=r->neg;
 
         rp=ret->d;
-        ap=&(r->d[ri]);
+        ap=&(r->d[nl]);
 
+#define BRANCH_FREE 1
+#if BRANCH_FREE
         {
-        size_t m1,m2;
-
-        v=bn_sub_words(rp,ap,np,ri);
-        /* this ----------------^^ works even in al<ri case
-         * thanks to zealous zeroing of top of the vector in the
-         * beginning. */
+        BN_ULONG *nrp;
+        size_t m;
 
-        /* if (al==ri && !v) || al>ri) nrp=rp; else nrp=ap; */
-        /* in other words if subtraction result is real, then
+        v=bn_sub_words(rp,ap,np,nl)-carry;
+        /* if subtraction result is real, then
          * trick unconditional memcpy below to perform in-place
          * "refresh" instead of actual copy. */
-        m1=0-(size_t)(((al-ri)>>(sizeof(al)*8-1))&1);   /* al<ri */
-        m2=0-(size_t)(((ri-al)>>(sizeof(al)*8-1))&1);   /* al>ri */
-        m1|=m2;                 /* (al!=ri) */
-        m1|=(0-(size_t)v);      /* (al!=ri || v) */
-        m1&=~m2;                /* (al!=ri || v) && !al>ri */
-        nrp=(BN_ULONG *)(((PTR_SIZE_INT)rp&~m1)|((PTR_SIZE_INT)ap&m1));
-        }
+        m=(0-(size_t)v);
+        nrp=(BN_ULONG *)(((PTR_SIZE_INT)rp&~m)|((PTR_SIZE_INT)ap&m));
 
-        /* 'i<ri' is chosen to eliminate dependency on input data, even
-         * though it results in redundant copy in al<ri case. */
-        for (i=0,ri-=4; i<ri; i+=4)
+        for (i=0,nl-=4; i<nl; i+=4)
                 {
                 BN_ULONG t1,t2,t3,t4;
                 
@@ -295,40 +262,15 @@ static int BN_from_montgomery_word(BIGNUM *ret, BIGNUM *r, BN_MONT_CTX *mont)
                 rp[i+2]=t3;
                 rp[i+3]=t4;
                 }
-        for (ri+=4; i<ri; i++)
+        for (nl+=4; i<nl; i++)
                 rp[i]=nrp[i], ap[i]=0;
-        bn_correct_top(r);
-        bn_correct_top(ret);
+        }
 #else
-        if (bn_wexpand(ret,al) == NULL) return(0);
-        ret->top=al;
-        ret->neg=r->neg;
-
-        rp=ret->d;
-        ap=&(r->d[ri]);
-        al-=4;
-        for (i=0; i<al; i+=4)
-                {
-                BN_ULONG t1,t2,t3,t4;
-                
-                t1=ap[i+0];
-                t2=ap[i+1];
-                t3=ap[i+2];
-                t4=ap[i+3];
-                rp[i+0]=t1;
-                rp[i+1]=t2;
-                rp[i+2]=t3;
-                rp[i+3]=t4;
-                }
-        al+=4;
-        for (; i<al; i++)
-                rp[i]=ap[i];
-
-        if (BN_ucmp(ret, &(mont->N)) >= 0)
-                {
-                if (!BN_usub(ret,ret,&(mont->N))) return(0);
-                }
+        if (bn_sub_words (rp,ap,np,nl)-carry)
+                memcpy(rp,ap,nl*sizeof(BN_ULONG));
 #endif
+        bn_correct_top(r);
+        bn_correct_top(ret);
         bn_check_top(ret);
 
         return(1);
diff --git a/src/lib/libssl/src/crypto/bn/bn_print.c b/src/lib/libssl/src/crypto/bn/bn_print.c
index bebb466d08..1743b6a7e2 100644
--- a/src/lib/libssl/src/crypto/bn/bn_print.c
+++ b/src/lib/libssl/src/crypto/bn/bn_print.c
@@ -357,3 +357,22 @@ end:
         return(ret);
         }
 #endif
+
+char *BN_options(void)
+        {
+        static int init=0;
+        static char data[16];
+
+        if (!init)
+                {
+                init++;
+#ifdef BN_LLONG
+                BIO_snprintf(data,sizeof data,"bn(%d,%d)",
+                             (int)sizeof(BN_ULLONG)*8,(int)sizeof(BN_ULONG)*8);
+#else
+                BIO_snprintf(data,sizeof data,"bn(%d,%d)",
+                             (int)sizeof(BN_ULONG)*8,(int)sizeof(BN_ULONG)*8);
+#endif
+                }
+        return(data);
+        }
diff --git a/src/lib/libssl/src/crypto/bn/bn_shift.c b/src/lib/libssl/src/crypto/bn/bn_shift.c
index c4d301afc4..a6fca2c424 100644
--- a/src/lib/libssl/src/crypto/bn/bn_shift.c
+++ b/src/lib/libssl/src/crypto/bn/bn_shift.c
@@ -99,7 +99,7 @@ int BN_lshift1(BIGNUM *r, const BIGNUM *a)
 int BN_rshift1(BIGNUM *r, const BIGNUM *a)
         {
         BN_ULONG *ap,*rp,t,c;
-        int i;
+        int i,j;
 
         bn_check_top(r);
         bn_check_top(a);
@@ -109,22 +109,25 @@ int BN_rshift1(BIGNUM *r, const BIGNUM *a)
                 BN_zero(r);
                 return(1);
                 }
+        i = a->top;
+        ap= a->d;
+        j = i-(ap[i-1]==1);
         if (a != r)
                 {
-                if (bn_wexpand(r,a->top) == NULL) return(0);
-                r->top=a->top;
+                if (bn_wexpand(r,j) == NULL) return(0);
                 r->neg=a->neg;
                 }
-        ap=a->d;
         rp=r->d;
-        c=0;
-        for (i=a->top-1; i>=0; i--)
+        t=ap[--i];
+        c=(t&1)?BN_TBIT:0;
+        if (t>>=1) rp[i]=t;
+        while (i>0)
                 {
-                t=ap[i];
+                t=ap[--i];
                 rp[i]=((t>>1)&BN_MASK2)|c;
                 c=(t&1)?BN_TBIT:0;
                 }
-        bn_correct_top(r);
+        r->top=j;
         bn_check_top(r);
         return(1);
         }
@@ -182,10 +185,11 @@ int BN_rshift(BIGNUM *r, const BIGNUM *a, int n)
                 BN_zero(r);
                 return(1);
                 }
+        i = (BN_num_bits(a)-n+(BN_BITS2-1))/BN_BITS2;
         if (r != a)
                 {
                 r->neg=a->neg;
-                if (bn_wexpand(r,a->top-nw+1) == NULL) return(0);
+                if (bn_wexpand(r,i) == NULL) return(0);
                 }
         else
                 {
@@ -196,7 +200,7 @@ int BN_rshift(BIGNUM *r, const BIGNUM *a, int n)
         f= &(a->d[nw]);
         t=r->d;
         j=a->top-nw;
-        r->top=j;
+        r->top=i;
 
         if (rb == 0)
                 {
@@ -212,9 +216,8 @@ int BN_rshift(BIGNUM *r, const BIGNUM *a, int n)
                         l= *(f++);
                         *(t++) =(tmp|(l<<lb))&BN_MASK2;
                         }
-                *(t++) =(l>>rb)&BN_MASK2;
+                if ((l = (l>>rb)&BN_MASK2)) *(t) = l;
                 }
-        bn_correct_top(r);
         bn_check_top(r);
         return(1);
         }
diff --git a/src/lib/libssl/src/crypto/bn/bntest.c b/src/lib/libssl/src/crypto/bn/bntest.c
index 0cd99c5b4b..06f5954acc 100644
--- a/src/lib/libssl/src/crypto/bn/bntest.c
+++ b/src/lib/libssl/src/crypto/bn/bntest.c
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
         message(out,"BN_mod_sqrt");
         if (!test_sqrt(out,ctx)) goto err;
         (void)BIO_flush(out);
-
+#ifndef OPENSSL_NO_EC2M
         message(out,"BN_GF2m_add");
         if (!test_gf2m_add(out)) goto err;
         (void)BIO_flush(out);
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
         message(out,"BN_GF2m_mod_solve_quad");
         if (!test_gf2m_mod_solve_quad(out,ctx)) goto err;
         (void)BIO_flush(out);
-
+#endif
         BN_CTX_free(ctx);
         BIO_free(out);
 
@@ -1061,7 +1061,7 @@ int test_exp(BIO *bp, BN_CTX *ctx)
         BN_free(one);
         return(1);
         }
-
+#ifndef OPENSSL_NO_EC2M
 int test_gf2m_add(BIO *bp)
         {
         BIGNUM a,b,c;
@@ -1636,7 +1636,7 @@ int test_gf2m_mod_solve_quad(BIO *bp,BN_CTX *ctx)
         BN_free(e);
         return ret;
         }
-
+#endif
 static int genprime_cb(int p, int n, BN_GENCB *arg)
         {
         char c='*';
diff --git a/src/lib/libssl/src/crypto/buffer/Makefile b/src/lib/libssl/src/crypto/buffer/Makefile
index 9f3a88d2d6..2efba47f07 100644
--- a/src/lib/libssl/src/crypto/buffer/Makefile
+++ b/src/lib/libssl/src/crypto/buffer/Makefile
@@ -17,8 +17,8 @@ TEST=
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC= buffer.c buf_err.c
-LIBOBJ= buffer.o buf_err.o
+LIBSRC= buffer.c buf_str.c buf_err.c
+LIBOBJ= buffer.o buf_str.o buf_err.o
 
 SRC= $(LIBSRC)
 
@@ -81,6 +81,13 @@ buf_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 buf_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 buf_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 buf_err.o: buf_err.c
+buf_str.o: ../../e_os.h ../../include/openssl/bio.h
+buf_str.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+buf_str.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+buf_str.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+buf_str.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+buf_str.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+buf_str.o: ../../include/openssl/symhacks.h ../cryptlib.h buf_str.c
 buffer.o: ../../e_os.h ../../include/openssl/bio.h
 buffer.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 buffer.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
diff --git a/src/lib/libssl/src/crypto/buffer/buffer.c b/src/lib/libssl/src/crypto/buffer/buffer.c
index 620ea8d536..d7aa79ad7f 100644
--- a/src/lib/libssl/src/crypto/buffer/buffer.c
+++ b/src/lib/libssl/src/crypto/buffer/buffer.c
@@ -60,6 +60,11 @@
 #include "cryptlib.h"
 #include <openssl/buffer.h>
 
+/* LIMIT_BEFORE_EXPANSION is the maximum n such that (n+3)/3*4 < 2**31. That
+ * function is applied in several functions in this file and this limit ensures
+ * that the result fits in an int. */
+#define LIMIT_BEFORE_EXPANSION 0x5ffffffc
+
 BUF_MEM *BUF_MEM_new(void)
         {
         BUF_MEM *ret;
@@ -105,6 +110,12 @@ int BUF_MEM_grow(BUF_MEM *str, size_t len)
                 str->length=len;
                 return(len);
                 }
+        /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
+        if (len > LIMIT_BEFORE_EXPANSION)
+                {
+                BUFerr(BUF_F_BUF_MEM_GROW,ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
         n=(len+3)/3*4;
         if (str->data == NULL)
                 ret=OPENSSL_malloc(n);
@@ -142,6 +153,12 @@ int BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
                 str->length=len;
                 return(len);
                 }
+        /* This limit is sufficient to ensure (len+3)/3*4 < 2**31 */
+        if (len > LIMIT_BEFORE_EXPANSION)
+                {
+                BUFerr(BUF_F_BUF_MEM_GROW_CLEAN,ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
         n=(len+3)/3*4;
         if (str->data == NULL)
                 ret=OPENSSL_malloc(n);
@@ -162,64 +179,6 @@ int BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
         return(len);
         }
 
-char *BUF_strdup(const char *str)
-        {
-        if (str == NULL) return(NULL);
-        return BUF_strndup(str, strlen(str));
-        }
-
-char *BUF_strndup(const char *str, size_t siz)
-        {
-        char *ret;
-
-        if (str == NULL) return(NULL);
-
-        ret=OPENSSL_malloc(siz+1);
-        if (ret == NULL) 
-                {
-                BUFerr(BUF_F_BUF_STRNDUP,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        BUF_strlcpy(ret,str,siz+1);
-        return(ret);
-        }
-
-void *BUF_memdup(const void *data, size_t siz)
-        {
-        void *ret;
-
-        if (data == NULL) return(NULL);
-
-        ret=OPENSSL_malloc(siz);
-        if (ret == NULL) 
-                {
-                BUFerr(BUF_F_BUF_MEMDUP,ERR_R_MALLOC_FAILURE);
-                return(NULL);
-                }
-        return memcpy(ret, data, siz);
-        }       
-
-size_t BUF_strlcpy(char *dst, const char *src, size_t size)
-        {
-        size_t l = 0;
-        for(; size > 1 && *src; size--)
-                {
-                *dst++ = *src++;
-                l++;
-                }
-        if (size)
-                *dst = '\0';
-        return l + strlen(src);
-        }
-
-size_t BUF_strlcat(char *dst, const char *src, size_t size)
-        {
-        size_t l = 0;
-        for(; size > 0 && *dst; size--, dst++)
-                l++;
-        return l + BUF_strlcpy(dst, src, size);
-        }
-
 void BUF_reverse(unsigned char *out, unsigned char *in, size_t size)
         {
         size_t i;
diff --git a/src/lib/libssl/src/crypto/cast/Makefile b/src/lib/libssl/src/crypto/cast/Makefile
index 0acc38f28d..f3f4859886 100644
--- a/src/lib/libssl/src/crypto/cast/Makefile
+++ b/src/lib/libssl/src/crypto/cast/Makefile
@@ -95,5 +95,8 @@ c_ofb64.o: ../../e_os.h ../../include/openssl/cast.h
 c_ofb64.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
 c_ofb64.o: c_ofb64.c cast_lcl.h
 c_skey.o: ../../e_os.h ../../include/openssl/cast.h
-c_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+c_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+c_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+c_skey.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+c_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 c_skey.o: c_skey.c cast_lcl.h cast_s.h
diff --git a/src/lib/libssl/src/crypto/cast/c_skey.c b/src/lib/libssl/src/crypto/cast/c_skey.c
index 76e40005c9..cb6bf9fee3 100644
--- a/src/lib/libssl/src/crypto/cast/c_skey.c
+++ b/src/lib/libssl/src/crypto/cast/c_skey.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/cast.h>
 #include "cast_lcl.h"
 #include "cast_s.h"
@@ -71,8 +72,14 @@
 #define S5 CAST_S_table5
 #define S6 CAST_S_table6
 #define S7 CAST_S_table7
-
 void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)
+#ifdef OPENSSL_FIPS
+        {
+        fips_cipher_abort(CAST);
+        private_CAST_set_key(key, len, data);
+        }
+void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data)
+#endif
         {
         CAST_LONG x[16];
         CAST_LONG z[16];
diff --git a/src/lib/libssl/src/crypto/cast/cast.h b/src/lib/libssl/src/crypto/cast/cast.h
index 1a264f8143..203922ea2b 100644
--- a/src/lib/libssl/src/crypto/cast/cast.h
+++ b/src/lib/libssl/src/crypto/cast/cast.h
@@ -83,7 +83,9 @@ typedef struct cast_key_st
         int short_key;  /* Use reduced rounds for short key */
         } CAST_KEY;
 
- 
+#ifdef OPENSSL_FIPS 
+void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
+#endif
 void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
 void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAST_KEY *key,
                       int enc);
diff --git a/src/lib/libssl/src/crypto/comp/c_rle.c b/src/lib/libssl/src/crypto/comp/c_rle.c
index 18bceae51e..47dfb67fbd 100644
--- a/src/lib/libssl/src/crypto/comp/c_rle.c
+++ b/src/lib/libssl/src/crypto/comp/c_rle.c
@@ -30,7 +30,7 @@ static int rle_compress_block(COMP_CTX *ctx, unsigned char *out,
         {
         /* int i; */
 
-        if (olen < (ilen+1))
+        if (ilen == 0 || olen < (ilen-1))
                 {
                 /* ZZZZZZZZZZZZZZZZZZZZZZ */
                 return(-1);
@@ -46,7 +46,7 @@ static int rle_expand_block(COMP_CTX *ctx, unsigned char *out,
         {
         int i;
 
-        if (ilen == 0 || olen < (ilen-1))
+        if (olen < (ilen-1))
                 {
                 /* ZZZZZZZZZZZZZZZZZZZZZZ */
                 return(-1);
diff --git a/src/lib/libssl/src/crypto/cpt_err.c b/src/lib/libssl/src/crypto/cpt_err.c
index 139b9284e4..289005f662 100644
--- a/src/lib/libssl/src/crypto/cpt_err.c
+++ b/src/lib/libssl/src/crypto/cpt_err.c
@@ -1,6 +1,6 @@
 /* crypto/cpt_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2006 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
@@ -76,6 +76,7 @@ static ERR_STRING_DATA CRYPTO_str_functs[]=
 {ERR_FUNC(CRYPTO_F_CRYPTO_SET_EX_DATA), "CRYPTO_set_ex_data"},
 {ERR_FUNC(CRYPTO_F_DEF_ADD_INDEX),      "DEF_ADD_INDEX"},
 {ERR_FUNC(CRYPTO_F_DEF_GET_CLASS),      "DEF_GET_CLASS"},
+{ERR_FUNC(CRYPTO_F_FIPS_MODE_SET),      "FIPS_mode_set"},
 {ERR_FUNC(CRYPTO_F_INT_DUP_EX_DATA),    "INT_DUP_EX_DATA"},
 {ERR_FUNC(CRYPTO_F_INT_FREE_EX_DATA),   "INT_FREE_EX_DATA"},
 {ERR_FUNC(CRYPTO_F_INT_NEW_EX_DATA),    "INT_NEW_EX_DATA"},
@@ -84,6 +85,7 @@ static ERR_STRING_DATA CRYPTO_str_functs[]=
 
 static ERR_STRING_DATA CRYPTO_str_reasons[]=
         {
+{ERR_REASON(CRYPTO_R_FIPS_MODE_NOT_SUPPORTED),"fips mode not supported"},
 {ERR_REASON(CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK),"no dynlock create callback"},
 {0,NULL}
         };
diff --git a/src/lib/libssl/src/crypto/cryptlib.c b/src/lib/libssl/src/crypto/cryptlib.c
index 24fe123e14..766ea8cac7 100644
--- a/src/lib/libssl/src/crypto/cryptlib.c
+++ b/src/lib/libssl/src/crypto/cryptlib.c
@@ -409,6 +409,10 @@ int (*CRYPTO_get_add_lock_callback(void))(int *num,int mount,int type,
 void CRYPTO_set_locking_callback(void (*func)(int mode,int type,
                                               const char *file,int line))
         {
+        /* Calling this here ensures initialisation before any threads
+         * are started.
+         */
+        OPENSSL_init();
         locking_callback=func;
         }
 
@@ -661,28 +665,52 @@ const char *CRYPTO_get_lock_name(int type)
         defined(__INTEL__) || \
         defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 
-unsigned long  OPENSSL_ia32cap_P=0;
-unsigned long *OPENSSL_ia32cap_loc(void) { return &OPENSSL_ia32cap_P; }
+unsigned int  OPENSSL_ia32cap_P[2];
+unsigned long *OPENSSL_ia32cap_loc(void)
+{   if (sizeof(long)==4)
+        /*
+         * If 32-bit application pulls address of OPENSSL_ia32cap_P[0]
+         * clear second element to maintain the illusion that vector
+         * is 32-bit.
+         */
+        OPENSSL_ia32cap_P[1]=0;
+    return (unsigned long *)OPENSSL_ia32cap_P;
+}
 
 #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
 #define OPENSSL_CPUID_SETUP
+#if defined(_WIN32)
+typedef unsigned __int64 IA32CAP;
+#else
+typedef unsigned long long IA32CAP;
+#endif
 void OPENSSL_cpuid_setup(void)
 { static int trigger=0;
-  unsigned long OPENSSL_ia32_cpuid(void);
+  IA32CAP OPENSSL_ia32_cpuid(void);
+  IA32CAP vec;
   char *env;
 
     if (trigger)        return;
 
     trigger=1;
-    if ((env=getenv("OPENSSL_ia32cap")))
-        OPENSSL_ia32cap_P = strtoul(env,NULL,0)|(1<<10);
+    if ((env=getenv("OPENSSL_ia32cap"))) {
+        int off = (env[0]=='~')?1:0;
+#if defined(_WIN32)
+        if (!sscanf(env+off,"%I64i",&vec)) vec = strtoul(env+off,NULL,0);
+#else
+        if (!sscanf(env+off,"%lli",(long long *)&vec)) vec = strtoul(env+off,NULL,0);
+#endif
+        if (off) vec = OPENSSL_ia32_cpuid()&~vec;
+    }
     else
-        OPENSSL_ia32cap_P = OPENSSL_ia32_cpuid()|(1<<10);
+        vec = OPENSSL_ia32_cpuid();
     /*
      * |(1<<10) sets a reserved bit to signal that variable
      * was initialized already... This is to avoid interference
      * with cpuid snippets in ELF .init segment.
      */
+    OPENSSL_ia32cap_P[0] = (unsigned int)vec|(1<<10);
+    OPENSSL_ia32cap_P[1] = (unsigned int)(vec>>32);
 }
 #endif
 
diff --git a/src/lib/libssl/src/crypto/cryptlib.h b/src/lib/libssl/src/crypto/cryptlib.h
index fc249c57f3..1761f6b668 100644
--- a/src/lib/libssl/src/crypto/cryptlib.h
+++ b/src/lib/libssl/src/crypto/cryptlib.h
@@ -99,7 +99,7 @@ extern "C" {
 #define HEX_SIZE(type)          (sizeof(type)*2)
 
 void OPENSSL_cpuid_setup(void);
-extern unsigned long OPENSSL_ia32cap_P;
+extern unsigned int OPENSSL_ia32cap_P[];
 void OPENSSL_showfatal(const char *,...);
 void *OPENSSL_stderr(void);
 extern int OPENSSL_NONPIC_relocated;
diff --git a/src/lib/libssl/src/crypto/crypto-lib.com b/src/lib/libssl/src/crypto/crypto-lib.com
index a29c0afd93..c280aa03a8 100644
--- a/src/lib/libssl/src/crypto/crypto-lib.com
+++ b/src/lib/libssl/src/crypto/crypto-lib.com
@@ -117,7 +117,7 @@ $ ENCRYPT_TYPES = "Basic,"+ -
                   "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ -
                   "EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ -
                   "CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,"+ -
-                  "STORE,CMS,PQUEUE,TS,JPAKE"
+                  "CMS,PQUEUE,TS,JPAKE,SRP,STORE,CMAC"
 $!
 $! Check To Make Sure We Have Valid Command Line Parameters.
 $!
@@ -207,7 +207,8 @@ $!
 $ APPS_DES = "DES/DES,CBC3_ENC"
 $ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE"
 $
-$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,cpt_err,ebcdic,uid,o_time,o_str,o_dir"
+$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,cpt_err,"+ -
+        "ebcdic,uid,o_time,o_str,o_dir,o_fips.c,o_init,fips_ers"
 $ LIB_MD2 = "md2_dgst,md2_one"
 $ LIB_MD4 = "md4_dgst,md4_one"
 $ LIB_MD5 = "md5_dgst,md5_one"
@@ -224,15 +225,16 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ -
         "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ -
         "ede_cbcm_enc,des_old,des_old2,read2pwd"
 $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64"
-$ LIB_RC4 = "rc4_skey,rc4_enc"
+$ LIB_RC4 = "rc4_skey,rc4_enc,rc4_utl"
 $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64"
 $ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey"
 $ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64"
 $ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"
 $ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -
-        "cmll_cfb,cmll_ctr"
+        "cmll_cfb,cmll_ctr,cmll_utl"
 $ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"
-$ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128"
+$ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128,gcm128,"+ -
+        "ccm128,xts128"
 $ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"
 $ IF F$TRNLNM("OPENSSL_NO_ASM") .OR. ARCH .NES. "VAX" THEN -
      LIB_BN_ASM = "bn_asm"
@@ -240,14 +242,16 @@ $ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -
         "bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ -
         "bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ -
         "bn_recp,bn_mont,bn_mpi,bn_exp2,bn_gf2m,bn_nist,"+ -
-        "bn_depr,bn_const"
+        "bn_depr,bn_const,bn_x931p"
 $ LIB_EC = "ec_lib,ecp_smpl,ecp_mont,ecp_nist,ec_cvt,ec_mult,"+ -
         "ec_err,ec_curve,ec_check,ec_print,ec_asn1,ec_key,"+ -
-        "ec2_smpl,ec2_mult,ec_ameth,ec_pmeth,eck_prn"
+        "ec2_smpl,ec2_mult,ec_ameth,ec_pmeth,eck_prn,"+ -
+        "ecp_nistp224,ecp_nistp256,ecp_nistp521,ecp_nistputil,"+ -
+        "ecp_oct,ec2_oct,ec_oct"
 $ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ -
         "rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk,rsa_null,"+ -
         "rsa_pss,rsa_x931,rsa_asn1,rsa_depr,rsa_ameth,rsa_prn,"+ -
-        "rsa_pmeth"
+        "rsa_pmeth,rsa_crpt"
 $ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,"+ -
         "dsa_err,dsa_ossl,dsa_depr,dsa_ameth,dsa_pmeth,dsa_prn"
 $ LIB_ECDSA = "ecs_lib,ecs_asn1,ecs_ossl,ecs_sign,ecs_vrf,ecs_err"
@@ -260,10 +264,11 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ -
         "eng_table,eng_pkey,eng_fat,eng_all,"+ -
         "tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ -
         "tb_cipher,tb_digest,tb_pkmeth,tb_asnmth,"+ -
-        "eng_openssl,eng_dyn,eng_cnf,eng_cryptodev"
+        "eng_openssl,eng_dyn,eng_cnf,eng_cryptodev,"+ -
+        "eng_rsax,eng_rdrand"
 $ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr,"+ -
         "aes_ige,aes_wrap"
-$ LIB_BUFFER = "buffer,buf_err"
+$ LIB_BUFFER = "buffer,buf_str,buf_err"
 $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
         "bss_mem,bss_null,bss_fd,"+ -
         "bss_file,bss_sock,bss_conn,"+ -
@@ -287,7 +292,8 @@ $ LIB_EVP_2 = "m_null,m_md2,m_md4,m_md5,m_sha,m_sha1,m_wp," + -
         "bio_md,bio_b64,bio_enc,evp_err,e_null,"+ -
         "c_all,c_allc,c_alld,evp_lib,bio_ok,"+-
         "evp_pkey,evp_pbe,p5_crpt,p5_crpt2"
-$ LIB_EVP_3 = "e_old,pmeth_lib,pmeth_fn,pmeth_gn,m_sigver"
+$ LIB_EVP_3 = "e_old,pmeth_lib,pmeth_fn,pmeth_gn,m_sigver,evp_fips,"+ -
+        "e_aes_cbc_hmac_sha1,e_rc4_hmac_md5"
 $ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ -
         "a_print,a_type,a_set,a_dup,a_d2i_fp,a_i2d_fp,"+ -
         "a_enum,a_utf8,a_sign,a_digest,a_verify,a_mbstr,a_strex,"+ -
@@ -329,14 +335,17 @@ $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
 $ LIB_UI_COMPAT = ",ui_compat"
 $ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT
 $ LIB_KRB5 = "krb5_asn"
-$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"
 $ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
-        "cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess"
+        "cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess,"+ -
+        "cms_pwri"
 $ LIB_PQUEUE = "pqueue"
 $ LIB_TS = "ts_err,ts_req_utils,ts_req_print,ts_rsp_utils,ts_rsp_print,"+ -
         "ts_rsp_sign,ts_rsp_verify,ts_verify_ctx,ts_lib,ts_conf,"+ -
         "ts_asn1"
 $ LIB_JPAKE = "jpake,jpake_err"
+$ LIB_SRP = "srp_lib,srp_vfy"
+$ LIB_STORE = "str_err,str_lib,str_meth,str_mem"
+$ LIB_CMAC = "cmac,cm_ameth.c,cm_pmeth"
 $!
 $! Setup exceptional compilations
 $!
@@ -1021,7 +1030,7 @@ $!
 $! Set basic C compiler /INCLUDE directories.
 $!
 $ CC_INCLUDES = "SYS$DISK:[.''ARCHD'],SYS$DISK:[],SYS$DISK:[-],"+ -
-   "SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP],SYS$DISK:[.ASN1]"
+   "SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.MODES],SYS$DISK:[.ASN1],SYS$DISK:[.EVP]"
 $!
 $! Check To See If P3 Is Blank.
 $!
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h
index b0360cec51..6aeda0a9ac 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -547,6 +547,33 @@ unsigned long *OPENSSL_ia32cap_loc(void);
 #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
 int OPENSSL_isservice(void);
 
+int FIPS_mode(void);
+int FIPS_mode_set(int r);
+
+void OPENSSL_init(void);
+
+#define fips_md_init(alg) fips_md_init_ctx(alg, alg)
+
+#ifdef OPENSSL_FIPS
+#define fips_md_init_ctx(alg, cx) \
+        int alg##_Init(cx##_CTX *c) \
+        { \
+        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \
+                "Low level API call to digest " #alg " forbidden in FIPS mode!"); \
+        return private_##alg##_Init(c); \
+        } \
+        int private_##alg##_Init(cx##_CTX *c)
+
+#define fips_cipher_abort(alg) \
+        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \
+                "Low level API call to cipher " #alg " forbidden in FIPS mode!")
+
+#else
+#define fips_md_init_ctx(alg, cx) \
+        int alg##_Init(cx##_CTX *c)
+#define fips_cipher_abort(alg) while(0)
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -562,11 +589,13 @@ void ERR_load_CRYPTO_strings(void);
 #define CRYPTO_F_CRYPTO_SET_EX_DATA                      102
 #define CRYPTO_F_DEF_ADD_INDEX                           104
 #define CRYPTO_F_DEF_GET_CLASS                           105
+#define CRYPTO_F_FIPS_MODE_SET                           109
 #define CRYPTO_F_INT_DUP_EX_DATA                         106
 #define CRYPTO_F_INT_FREE_EX_DATA                        107
 #define CRYPTO_F_INT_NEW_EX_DATA                         108
 
 /* Reason codes. */
+#define CRYPTO_R_FIPS_MODE_NOT_SUPPORTED                 101
 #define CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK              100
 
 #ifdef  __cplusplus
diff --git a/src/lib/libssl/src/crypto/des/Makefile b/src/lib/libssl/src/crypto/des/Makefile
index ae982265fd..a6e1001329 100644
--- a/src/lib/libssl/src/crypto/des/Makefile
+++ b/src/lib/libssl/src/crypto/des/Makefile
@@ -257,8 +257,9 @@ rpc_enc.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 rpc_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rpc_enc.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
 rpc_enc.o: des_locl.h des_ver.h rpc_des.h rpc_enc.c
-set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+set_key.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+set_key.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+set_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 set_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 set_key.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 set_key.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
diff --git a/src/lib/libssl/src/crypto/des/des.h b/src/lib/libssl/src/crypto/des/des.h
index 92b6663599..1eaedcbd24 100644
--- a/src/lib/libssl/src/crypto/des/des.h
+++ b/src/lib/libssl/src/crypto/des/des.h
@@ -224,6 +224,9 @@ int DES_set_key(const_DES_cblock *key,DES_key_schedule *schedule);
 int DES_key_sched(const_DES_cblock *key,DES_key_schedule *schedule);
 int DES_set_key_checked(const_DES_cblock *key,DES_key_schedule *schedule);
 void DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule);
+#ifdef OPENSSL_FIPS
+void private_DES_set_key_unchecked(const_DES_cblock *key,DES_key_schedule *schedule);
+#endif
 void DES_string_to_key(const char *str,DES_cblock *key);
 void DES_string_to_2keys(const char *str,DES_cblock *key1,DES_cblock *key2);
 void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length,
diff --git a/src/lib/libssl/src/crypto/des/set_key.c b/src/lib/libssl/src/crypto/des/set_key.c
index 3004cc3ab3..d3e69ca8b5 100644
--- a/src/lib/libssl/src/crypto/des/set_key.c
+++ b/src/lib/libssl/src/crypto/des/set_key.c
@@ -65,6 +65,8 @@
  */
 #include "des_locl.h"
 
+#include <openssl/crypto.h>
+
 OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0)   /* defaults to false */
 
 static const unsigned char odd_parity[256]={
@@ -335,6 +337,13 @@ int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
         }
 
 void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
+#ifdef OPENSSL_FIPS
+        {
+        fips_cipher_abort(DES);
+        private_DES_set_key_unchecked(key, schedule);
+        }
+void private_DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
+#endif
         {
         static const int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
         register DES_LONG c,d,t,s,t2;
diff --git a/src/lib/libssl/src/crypto/dh/dh.h b/src/lib/libssl/src/crypto/dh/dh.h
index 849309a489..ea59e610ef 100644
--- a/src/lib/libssl/src/crypto/dh/dh.h
+++ b/src/lib/libssl/src/crypto/dh/dh.h
@@ -86,6 +86,21 @@
                                        * be used for all exponents.
                                        */
 
+/* If this flag is set the DH method is FIPS compliant and can be used
+ * in FIPS mode. This is set in the validated module method. If an
+ * application sets this flag in its own methods it is its reposibility
+ * to ensure the result is compliant.
+ */
+
+#define DH_FLAG_FIPS_METHOD                     0x0400
+
+/* If this flag is set the operations normally disabled in FIPS mode are
+ * permitted it is then the applications responsibility to ensure that the
+ * usage is compliant.
+ */
+
+#define DH_FLAG_NON_FIPS_ALLOW                  0x0400
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -230,6 +245,9 @@ void ERR_load_DH_strings(void);
 #define DH_F_COMPUTE_KEY                                 102
 #define DH_F_DHPARAMS_PRINT_FP                           101
 #define DH_F_DH_BUILTIN_GENPARAMS                        106
+#define DH_F_DH_COMPUTE_KEY                              114
+#define DH_F_DH_GENERATE_KEY                             115
+#define DH_F_DH_GENERATE_PARAMETERS_EX                   116
 #define DH_F_DH_NEW_METHOD                               105
 #define DH_F_DH_PARAM_DECODE                             107
 #define DH_F_DH_PRIV_DECODE                              110
@@ -249,7 +267,9 @@ void ERR_load_DH_strings(void);
 #define DH_R_DECODE_ERROR                                104
 #define DH_R_INVALID_PUBKEY                              102
 #define DH_R_KEYS_NOT_SET                                108
+#define DH_R_KEY_SIZE_TOO_SMALL                          110
 #define DH_R_MODULUS_TOO_LARGE                           103
+#define DH_R_NON_FIPS_METHOD                             111
 #define DH_R_NO_PARAMETERS_SET                           107
 #define DH_R_NO_PRIVATE_VALUE                            100
 #define DH_R_PARAMETER_ENCODING_ERROR                    105
diff --git a/src/lib/libssl/src/crypto/dh/dh_err.c b/src/lib/libssl/src/crypto/dh/dh_err.c
index d5cf0c22a3..56d3df7356 100644
--- a/src/lib/libssl/src/crypto/dh/dh_err.c
+++ b/src/lib/libssl/src/crypto/dh/dh_err.c
@@ -1,6 +1,6 @@
 /* crypto/dh/dh_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2006 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
@@ -73,6 +73,9 @@ static ERR_STRING_DATA DH_str_functs[]=
 {ERR_FUNC(DH_F_COMPUTE_KEY),    "COMPUTE_KEY"},
 {ERR_FUNC(DH_F_DHPARAMS_PRINT_FP),      "DHparams_print_fp"},
 {ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS),   "DH_BUILTIN_GENPARAMS"},
+{ERR_FUNC(DH_F_DH_COMPUTE_KEY), "DH_compute_key"},
+{ERR_FUNC(DH_F_DH_GENERATE_KEY),        "DH_generate_key"},
+{ERR_FUNC(DH_F_DH_GENERATE_PARAMETERS_EX),      "DH_generate_parameters_ex"},
 {ERR_FUNC(DH_F_DH_NEW_METHOD),  "DH_new_method"},
 {ERR_FUNC(DH_F_DH_PARAM_DECODE),        "DH_PARAM_DECODE"},
 {ERR_FUNC(DH_F_DH_PRIV_DECODE), "DH_PRIV_DECODE"},
@@ -95,7 +98,9 @@ static ERR_STRING_DATA DH_str_reasons[]=
 {ERR_REASON(DH_R_DECODE_ERROR)           ,"decode error"},
 {ERR_REASON(DH_R_INVALID_PUBKEY)         ,"invalid public key"},
 {ERR_REASON(DH_R_KEYS_NOT_SET)           ,"keys not set"},
+{ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL)     ,"key size too small"},
 {ERR_REASON(DH_R_MODULUS_TOO_LARGE)      ,"modulus too large"},
+{ERR_REASON(DH_R_NON_FIPS_METHOD)        ,"non fips method"},
 {ERR_REASON(DH_R_NO_PARAMETERS_SET)      ,"no parameters set"},
 {ERR_REASON(DH_R_NO_PRIVATE_VALUE)       ,"no private value"},
 {ERR_REASON(DH_R_PARAMETER_ENCODING_ERROR),"parameter encoding error"},
diff --git a/src/lib/libssl/src/crypto/dh/dh_gen.c b/src/lib/libssl/src/crypto/dh/dh_gen.c
index cfd5b11868..7b1fe9c9cb 100644
--- a/src/lib/libssl/src/crypto/dh/dh_gen.c
+++ b/src/lib/libssl/src/crypto/dh/dh_gen.c
@@ -66,12 +66,29 @@
 #include <openssl/bn.h>
 #include <openssl/dh.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb);
 
 int DH_generate_parameters_ex(DH *ret, int prime_len, int generator, BN_GENCB *cb)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(ret->meth->flags & DH_FLAG_FIPS_METHOD)
+                        && !(ret->flags & DH_FLAG_NON_FIPS_ALLOW))
+                {
+                DHerr(DH_F_DH_GENERATE_PARAMETERS_EX, DH_R_NON_FIPS_METHOD);
+                return 0;
+                }
+#endif
         if(ret->meth->generate_params)
                 return ret->meth->generate_params(ret, prime_len, generator, cb);
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode())
+                return FIPS_dh_generate_parameters_ex(ret, prime_len,
+                                                        generator, cb);
+#endif
         return dh_builtin_genparams(ret, prime_len, generator, cb);
         }
 
diff --git a/src/lib/libssl/src/crypto/dh/dh_key.c b/src/lib/libssl/src/crypto/dh/dh_key.c
index e7db440342..89a74db4e6 100644
--- a/src/lib/libssl/src/crypto/dh/dh_key.c
+++ b/src/lib/libssl/src/crypto/dh/dh_key.c
@@ -73,11 +73,27 @@ static int dh_finish(DH *dh);
 
 int DH_generate_key(DH *dh)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(dh->meth->flags & DH_FLAG_FIPS_METHOD)
+                        && !(dh->flags & DH_FLAG_NON_FIPS_ALLOW))
+                {
+                DHerr(DH_F_DH_GENERATE_KEY, DH_R_NON_FIPS_METHOD);
+                return 0;
+                }
+#endif
         return dh->meth->generate_key(dh);
         }
 
 int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(dh->meth->flags & DH_FLAG_FIPS_METHOD)
+                        && !(dh->flags & DH_FLAG_NON_FIPS_ALLOW))
+                {
+                DHerr(DH_F_DH_COMPUTE_KEY, DH_R_NON_FIPS_METHOD);
+                return 0;
+                }
+#endif
         return dh->meth->compute_key(key, pub_key, dh);
         }
 
@@ -138,8 +154,21 @@ static int generate_key(DH *dh)
 
         if (generate_new_key)
                 {
-                l = dh->length ? dh->length : BN_num_bits(dh->p)-1; /* secret exponent length */
-                if (!BN_rand(priv_key, l, 0, 0)) goto err;
+                if (dh->q)
+                        {
+                        do
+                                {
+                                if (!BN_rand_range(priv_key, dh->q))
+                                        goto err;
+                                }
+                        while (BN_is_zero(priv_key) || BN_is_one(priv_key));
+                        }
+                else
+                        {
+                        /* secret exponent length */
+                        l = dh->length ? dh->length : BN_num_bits(dh->p)-1;
+                        if (!BN_rand(priv_key, l, 0, 0)) goto err;
+                        }
                 }
 
         {
diff --git a/src/lib/libssl/src/crypto/dh/dh_lib.c b/src/lib/libssl/src/crypto/dh/dh_lib.c
index 7aef080e7a..00218f2b92 100644
--- a/src/lib/libssl/src/crypto/dh/dh_lib.c
+++ b/src/lib/libssl/src/crypto/dh/dh_lib.c
@@ -64,6 +64,10 @@
 #include <openssl/engine.h>
 #endif
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 const char DH_version[]="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
 
 static const DH_METHOD *default_DH_method = NULL;
@@ -76,7 +80,16 @@ void DH_set_default_method(const DH_METHOD *meth)
 const DH_METHOD *DH_get_default_method(void)
         {
         if(!default_DH_method)
+                {
+#ifdef OPENSSL_FIPS
+                if (FIPS_mode())
+                        return FIPS_dh_openssl();
+                else
+                        return DH_OpenSSL();
+#else
                 default_DH_method = DH_OpenSSL();
+#endif
+                }
         return default_DH_method;
         }
 
@@ -156,7 +169,7 @@ DH *DH_new_method(ENGINE *engine)
         ret->counter = NULL;
         ret->method_mont_p=NULL;
         ret->references = 1;
-        ret->flags=ret->meth->flags;
+        ret->flags=ret->meth->flags & ~DH_FLAG_NON_FIPS_ALLOW;
         CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data);
         if ((ret->meth->init != NULL) && !ret->meth->init(ret))
                 {
diff --git a/src/lib/libssl/src/crypto/dsa/Makefile b/src/lib/libssl/src/crypto/dsa/Makefile
index 8073c4ecfe..5fef4ca5ad 100644
--- a/src/lib/libssl/src/crypto/dsa/Makefile
+++ b/src/lib/libssl/src/crypto/dsa/Makefile
@@ -99,8 +99,9 @@ dsa_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 dsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 dsa_asn1.o: ../../include/openssl/opensslconf.h
 dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-dsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-dsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_asn1.c
+dsa_asn1.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+dsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+dsa_asn1.o: ../cryptlib.h dsa_asn1.c
 dsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
 dsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -189,7 +190,7 @@ dsa_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 dsa_prn.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 dsa_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 dsa_prn.o: ../cryptlib.h dsa_prn.c
-dsa_sign.o: ../../e_os.h ../../include/openssl/bio.h
+dsa_sign.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
 dsa_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 dsa_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
 dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
diff --git a/src/lib/libssl/src/crypto/dsa/dsa.h b/src/lib/libssl/src/crypto/dsa/dsa.h
index ac50a5c846..a6f6d0b0b2 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa.h
+++ b/src/lib/libssl/src/crypto/dsa/dsa.h
@@ -97,6 +97,21 @@
                                               * be used for all exponents.
                                               */
 
+/* If this flag is set the DSA method is FIPS compliant and can be used
+ * in FIPS mode. This is set in the validated module method. If an
+ * application sets this flag in its own methods it is its reposibility
+ * to ensure the result is compliant.
+ */
+
+#define DSA_FLAG_FIPS_METHOD                    0x0400
+
+/* If this flag is set the operations normally disabled in FIPS mode are
+ * permitted it is then the applications responsibility to ensure that the
+ * usage is compliant.
+ */
+
+#define DSA_FLAG_NON_FIPS_ALLOW                 0x0400
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -272,6 +287,8 @@ void ERR_load_DSA_strings(void);
 #define DSA_F_DSAPARAMS_PRINT_FP                         101
 #define DSA_F_DSA_DO_SIGN                                112
 #define DSA_F_DSA_DO_VERIFY                              113
+#define DSA_F_DSA_GENERATE_KEY                           124
+#define DSA_F_DSA_GENERATE_PARAMETERS_EX                 123
 #define DSA_F_DSA_NEW_METHOD                             103
 #define DSA_F_DSA_PARAM_DECODE                           119
 #define DSA_F_DSA_PRINT_FP                               105
@@ -282,6 +299,7 @@ void ERR_load_DSA_strings(void);
 #define DSA_F_DSA_SIGN                                   106
 #define DSA_F_DSA_SIGN_SETUP                             107
 #define DSA_F_DSA_SIG_NEW                                109
+#define DSA_F_DSA_SIG_PRINT                              125
 #define DSA_F_DSA_VERIFY                                 108
 #define DSA_F_I2D_DSA_SIG                                111
 #define DSA_F_OLD_DSA_PRIV_DECODE                        122
@@ -298,6 +316,8 @@ void ERR_load_DSA_strings(void);
 #define DSA_R_INVALID_DIGEST_TYPE                        106
 #define DSA_R_MISSING_PARAMETERS                         101
 #define DSA_R_MODULUS_TOO_LARGE                          103
+#define DSA_R_NEED_NEW_SETUP_VALUES                      110
+#define DSA_R_NON_FIPS_DSA_METHOD                        111
 #define DSA_R_NO_PARAMETERS_SET                          107
 #define DSA_R_PARAMETER_ENCODING_ERROR                   105
 
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_asn1.c b/src/lib/libssl/src/crypto/dsa/dsa_asn1.c
index c37460b2d6..6058534374 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_asn1.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_asn1.c
@@ -61,6 +61,7 @@
 #include <openssl/dsa.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
+#include <openssl/rand.h>
 
 /* Override the default new methods */
 static int sig_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
@@ -87,7 +88,7 @@ ASN1_SEQUENCE_cb(DSA_SIG, sig_cb) = {
         ASN1_SIMPLE(DSA_SIG, s, CBIGNUM)
 } ASN1_SEQUENCE_END_cb(DSA_SIG, DSA_SIG)
 
-IMPLEMENT_ASN1_FUNCTIONS_const(DSA_SIG)
+IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA_SIG, DSA_SIG, DSA_SIG)
 
 /* Override the default free and new methods */
 static int dsa_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
@@ -148,3 +149,40 @@ DSA *DSAparams_dup(DSA *dsa)
         {
         return ASN1_item_dup(ASN1_ITEM_rptr(DSAparams), dsa);
         }
+
+int DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig,
+             unsigned int *siglen, DSA *dsa)
+        {
+        DSA_SIG *s;
+        RAND_seed(dgst, dlen);
+        s=DSA_do_sign(dgst,dlen,dsa);
+        if (s == NULL)
+                {
+                *siglen=0;
+                return(0);
+                }
+        *siglen=i2d_DSA_SIG(s,&sig);
+        DSA_SIG_free(s);
+        return(1);
+        }
+
+/* data has already been hashed (probably with SHA or SHA-1). */
+/* returns
+ *      1: correct signature
+ *      0: incorrect signature
+ *     -1: error
+ */
+int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
+             const unsigned char *sigbuf, int siglen, DSA *dsa)
+        {
+        DSA_SIG *s;
+        int ret=-1;
+
+        s = DSA_SIG_new();
+        if (s == NULL) return(ret);
+        if (d2i_DSA_SIG(&s,&sigbuf,siglen) == NULL) goto err;
+        ret=DSA_do_verify(dgst,dgst_len,s,dsa);
+err:
+        DSA_SIG_free(s);
+        return(ret);
+        }
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_err.c b/src/lib/libssl/src/crypto/dsa/dsa_err.c
index bba984e92e..00545b7b9f 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_err.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_err.c
@@ -1,6 +1,6 @@
 /* crypto/dsa/dsa_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2006 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
@@ -76,6 +76,8 @@ static ERR_STRING_DATA DSA_str_functs[]=
 {ERR_FUNC(DSA_F_DSAPARAMS_PRINT_FP),    "DSAparams_print_fp"},
 {ERR_FUNC(DSA_F_DSA_DO_SIGN),   "DSA_do_sign"},
 {ERR_FUNC(DSA_F_DSA_DO_VERIFY), "DSA_do_verify"},
+{ERR_FUNC(DSA_F_DSA_GENERATE_KEY),      "DSA_generate_key"},
+{ERR_FUNC(DSA_F_DSA_GENERATE_PARAMETERS_EX),    "DSA_generate_parameters_ex"},
 {ERR_FUNC(DSA_F_DSA_NEW_METHOD),        "DSA_new_method"},
 {ERR_FUNC(DSA_F_DSA_PARAM_DECODE),      "DSA_PARAM_DECODE"},
 {ERR_FUNC(DSA_F_DSA_PRINT_FP),  "DSA_print_fp"},
@@ -86,6 +88,7 @@ static ERR_STRING_DATA DSA_str_functs[]=
 {ERR_FUNC(DSA_F_DSA_SIGN),      "DSA_sign"},
 {ERR_FUNC(DSA_F_DSA_SIGN_SETUP),        "DSA_sign_setup"},
 {ERR_FUNC(DSA_F_DSA_SIG_NEW),   "DSA_SIG_new"},
+{ERR_FUNC(DSA_F_DSA_SIG_PRINT), "DSA_SIG_PRINT"},
 {ERR_FUNC(DSA_F_DSA_VERIFY),    "DSA_verify"},
 {ERR_FUNC(DSA_F_I2D_DSA_SIG),   "i2d_DSA_SIG"},
 {ERR_FUNC(DSA_F_OLD_DSA_PRIV_DECODE),   "OLD_DSA_PRIV_DECODE"},
@@ -105,6 +108,8 @@ static ERR_STRING_DATA DSA_str_reasons[]=
 {ERR_REASON(DSA_R_INVALID_DIGEST_TYPE)   ,"invalid digest type"},
 {ERR_REASON(DSA_R_MISSING_PARAMETERS)    ,"missing parameters"},
 {ERR_REASON(DSA_R_MODULUS_TOO_LARGE)     ,"modulus too large"},
+{ERR_REASON(DSA_R_NEED_NEW_SETUP_VALUES) ,"need new setup values"},
+{ERR_REASON(DSA_R_NON_FIPS_DSA_METHOD)   ,"non fips dsa method"},
 {ERR_REASON(DSA_R_NO_PARAMETERS_SET)     ,"no parameters set"},
 {ERR_REASON(DSA_R_PARAMETER_ENCODING_ERROR),"parameter encoding error"},
 {0,NULL}
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_gen.c b/src/lib/libssl/src/crypto/dsa/dsa_gen.c
index cb0b4538a4..c398761d0d 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_gen.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_gen.c
@@ -81,13 +81,33 @@
 #include <openssl/sha.h>
 #include "dsa_locl.h"
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 int DSA_generate_parameters_ex(DSA *ret, int bits,
                 const unsigned char *seed_in, int seed_len,
                 int *counter_ret, unsigned long *h_ret, BN_GENCB *cb)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(ret->meth->flags & DSA_FLAG_FIPS_METHOD)
+                        && !(ret->flags & DSA_FLAG_NON_FIPS_ALLOW))
+                {
+                DSAerr(DSA_F_DSA_GENERATE_PARAMETERS_EX, DSA_R_NON_FIPS_DSA_METHOD);
+                return 0;
+                }
+#endif
         if(ret->meth->dsa_paramgen)
                 return ret->meth->dsa_paramgen(ret, bits, seed_in, seed_len,
                                 counter_ret, h_ret, cb);
+#ifdef OPENSSL_FIPS
+        else if (FIPS_mode())
+                {
+                return FIPS_dsa_generate_parameters_ex(ret, bits, 
+                                                        seed_in, seed_len,
+                                                        counter_ret, h_ret, cb);
+                }
+#endif
         else
                 {
                 const EVP_MD *evpmd;
@@ -105,12 +125,13 @@ int DSA_generate_parameters_ex(DSA *ret, int bits,
                         }
 
                 return dsa_builtin_paramgen(ret, bits, qbits, evpmd,
-                                seed_in, seed_len, counter_ret, h_ret, cb);
+                        seed_in, seed_len, NULL, counter_ret, h_ret, cb);
                 }
         }
 
 int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
         const EVP_MD *evpmd, const unsigned char *seed_in, size_t seed_len,
+        unsigned char *seed_out,
         int *counter_ret, unsigned long *h_ret, BN_GENCB *cb)
         {
         int ok=0;
@@ -201,8 +222,10 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
                                 }
 
                         /* step 2 */
-                        EVP_Digest(seed, qsize, md,   NULL, evpmd, NULL);
-                        EVP_Digest(buf,  qsize, buf2, NULL, evpmd, NULL);
+                        if (!EVP_Digest(seed, qsize, md,   NULL, evpmd, NULL))
+                                goto err;
+                        if (!EVP_Digest(buf,  qsize, buf2, NULL, evpmd, NULL))
+                                goto err;
                         for (i = 0; i < qsize; i++)
                                 md[i]^=buf2[i];
 
@@ -251,7 +274,9 @@ int dsa_builtin_paramgen(DSA *ret, size_t bits, size_t qbits,
                                                 break;
                                         }
 
-                                EVP_Digest(buf, qsize, md ,NULL, evpmd, NULL);
+                                if (!EVP_Digest(buf, qsize, md ,NULL, evpmd,
+                                                                        NULL))
+                                        goto err;
 
                                 /* step 8 */
                                 if (!BN_bin2bn(md, qsize, r0))
@@ -332,6 +357,8 @@ err:
                         }
                 if (counter_ret != NULL) *counter_ret=counter;
                 if (h_ret != NULL) *h_ret=h;
+                if (seed_out)
+                        memcpy(seed_out, seed, qsize);
                 }
         if(ctx)
                 {
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_key.c b/src/lib/libssl/src/crypto/dsa/dsa_key.c
index c4aa86bc6d..9cf669b921 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_key.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_key.c
@@ -64,12 +64,28 @@
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 static int dsa_builtin_keygen(DSA *dsa);
 
 int DSA_generate_key(DSA *dsa)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(dsa->meth->flags & DSA_FLAG_FIPS_METHOD)
+                        && !(dsa->flags & DSA_FLAG_NON_FIPS_ALLOW))
+                {
+                DSAerr(DSA_F_DSA_GENERATE_KEY, DSA_R_NON_FIPS_DSA_METHOD);
+                return 0;
+                }
+#endif
         if(dsa->meth->dsa_keygen)
                 return dsa->meth->dsa_keygen(dsa);
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode())
+                return FIPS_dsa_generate_key(dsa);
+#endif
         return dsa_builtin_keygen(dsa);
         }
 
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_lib.c b/src/lib/libssl/src/crypto/dsa/dsa_lib.c
index e9b75902db..96d8d0c4b4 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_lib.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_lib.c
@@ -70,6 +70,10 @@
 #include <openssl/dh.h>
 #endif
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 const char DSA_version[]="DSA" OPENSSL_VERSION_PTEXT;
 
 static const DSA_METHOD *default_DSA_method = NULL;
@@ -82,7 +86,16 @@ void DSA_set_default_method(const DSA_METHOD *meth)
 const DSA_METHOD *DSA_get_default_method(void)
         {
         if(!default_DSA_method)
+                {
+#ifdef OPENSSL_FIPS
+                if (FIPS_mode())
+                        return FIPS_dsa_openssl();
+                else
+                        return DSA_OpenSSL();
+#else
                 default_DSA_method = DSA_OpenSSL();
+#endif
+                }
         return default_DSA_method;
         }
 
@@ -163,7 +176,7 @@ DSA *DSA_new_method(ENGINE *engine)
         ret->method_mont_p=NULL;
 
         ret->references=1;
-        ret->flags=ret->meth->flags;
+        ret->flags=ret->meth->flags & ~DSA_FLAG_NON_FIPS_ALLOW;
         CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data);
         if ((ret->meth->init != NULL) && !ret->meth->init(ret))
                 {
@@ -276,7 +289,8 @@ void *DSA_get_ex_data(DSA *d, int idx)
 DH *DSA_dup_DH(const DSA *r)
         {
         /* DSA has p, q, g, optional pub_key, optional priv_key.
-         * DH has p, optional length, g, optional pub_key, optional priv_key.
+         * DH has p, optional length, g, optional pub_key, optional priv_key,
+         * optional q.
          */ 
 
         DH *ret = NULL;
@@ -290,7 +304,11 @@ DH *DSA_dup_DH(const DSA *r)
                 if ((ret->p = BN_dup(r->p)) == NULL)
                         goto err;
         if (r->q != NULL)
+                {
                 ret->length = BN_num_bits(r->q);
+                if ((ret->q = BN_dup(r->q)) == NULL)
+                        goto err;
+                }
         if (r->g != NULL)
                 if ((ret->g = BN_dup(r->g)) == NULL)
                         goto err;
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_ossl.c b/src/lib/libssl/src/crypto/dsa/dsa_ossl.c
index a3ddd7d281..b3d78e524c 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_ossl.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_ossl.c
@@ -136,6 +136,7 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
         BN_CTX *ctx=NULL;
         int reason=ERR_R_BN_LIB;
         DSA_SIG *ret=NULL;
+        int noredo = 0;
 
         BN_init(&m);
         BN_init(&xr);
@@ -150,7 +151,7 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
         if (s == NULL) goto err;
         ctx=BN_CTX_new();
         if (ctx == NULL) goto err;
-
+redo:
         if ((dsa->kinv == NULL) || (dsa->r == NULL))
                 {
                 if (!DSA_sign_setup(dsa,ctx,&kinv,&r)) goto err;
@@ -161,6 +162,7 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
                 dsa->kinv=NULL;
                 r=dsa->r;
                 dsa->r=NULL;
+                noredo = 1;
                 }
 
         
@@ -181,6 +183,18 @@ static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
 
         ret=DSA_SIG_new();
         if (ret == NULL) goto err;
+        /* Redo if r or s is zero as required by FIPS 186-3: this is
+         * very unlikely.
+         */
+        if (BN_is_zero(r) || BN_is_zero(s))
+                {
+                if (noredo)
+                        {
+                        reason = DSA_R_NEED_NEW_SETUP_VALUES;
+                        goto err;
+                        }
+                goto redo;
+                }
         ret->r = r;
         ret->s = s;
         
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_sign.c b/src/lib/libssl/src/crypto/dsa/dsa_sign.c
index 17555e5892..c3cc3642ce 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_sign.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_sign.c
@@ -61,30 +61,54 @@
 #include "cryptlib.h"
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
+#include <openssl/bn.h>
 
 DSA_SIG * DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(dsa->meth->flags & DSA_FLAG_FIPS_METHOD)
+                        && !(dsa->flags & DSA_FLAG_NON_FIPS_ALLOW))
+                {
+                DSAerr(DSA_F_DSA_DO_SIGN, DSA_R_NON_FIPS_DSA_METHOD);
+                return NULL;
+                }
+#endif
         return dsa->meth->dsa_do_sign(dgst, dlen, dsa);
         }
 
-int DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig,
-             unsigned int *siglen, DSA *dsa)
+int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
         {
-        DSA_SIG *s;
-        RAND_seed(dgst, dlen);
-        s=DSA_do_sign(dgst,dlen,dsa);
-        if (s == NULL)
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(dsa->meth->flags & DSA_FLAG_FIPS_METHOD)
+                        && !(dsa->flags & DSA_FLAG_NON_FIPS_ALLOW))
                 {
-                *siglen=0;
-                return(0);
+                DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_NON_FIPS_DSA_METHOD);
+                return 0;
                 }
-        *siglen=i2d_DSA_SIG(s,&sig);
-        DSA_SIG_free(s);
-        return(1);
+#endif
+        return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp);
         }
 
-int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
+DSA_SIG *DSA_SIG_new(void)
         {
-        return dsa->meth->dsa_sign_setup(dsa, ctx_in, kinvp, rp);
+        DSA_SIG *sig;
+        sig = OPENSSL_malloc(sizeof(DSA_SIG));
+        if (!sig)
+                return NULL;
+        sig->r = NULL;
+        sig->s = NULL;
+        return sig;
+        }
+
+void DSA_SIG_free(DSA_SIG *sig)
+        {
+        if (sig)
+                {
+                if (sig->r)
+                        BN_free(sig->r);
+                if (sig->s)
+                        BN_free(sig->s);
+                OPENSSL_free(sig);
+                }
         }
 
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_vrf.c b/src/lib/libssl/src/crypto/dsa/dsa_vrf.c
index 226a75ff3f..674cb5fa5f 100644
--- a/src/lib/libssl/src/crypto/dsa/dsa_vrf.c
+++ b/src/lib/libssl/src/crypto/dsa/dsa_vrf.c
@@ -64,26 +64,13 @@
 int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
                   DSA *dsa)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(dsa->meth->flags & DSA_FLAG_FIPS_METHOD)
+                        && !(dsa->flags & DSA_FLAG_NON_FIPS_ALLOW))
+                {
+                DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_NON_FIPS_DSA_METHOD);
+                return -1;
+                }
+#endif
         return dsa->meth->dsa_do_verify(dgst, dgst_len, sig, dsa);
         }
-
-/* data has already been hashed (probably with SHA or SHA-1). */
-/* returns
- *      1: correct signature
- *      0: incorrect signature
- *     -1: error
- */
-int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
-             const unsigned char *sigbuf, int siglen, DSA *dsa)
-        {
-        DSA_SIG *s;
-        int ret=-1;
-
-        s = DSA_SIG_new();
-        if (s == NULL) return(ret);
-        if (d2i_DSA_SIG(&s,&sigbuf,siglen) == NULL) goto err;
-        ret=DSA_do_verify(dgst,dgst_len,s,dsa);
-err:
-        DSA_SIG_free(s);
-        return(ret);
-        }
diff --git a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
index c2bc61760b..5f2254806c 100644
--- a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
+++ b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
@@ -86,7 +86,8 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
 # if defined(_AIX) || defined(__CYGWIN__) || \
      defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
      (defined(__osf__) && !defined(RTLD_NEXT))     || \
-     (defined(__OpenBSD__) && !defined(RTLD_SELF))
+     (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \
+        defined(__ANDROID__)
 #  undef HAVE_DLINFO
 # endif
 #endif
diff --git a/src/lib/libssl/src/crypto/ec/Makefile b/src/lib/libssl/src/crypto/ec/Makefile
index db380ed16f..f85fc845ca 100644
--- a/src/lib/libssl/src/crypto/ec/Makefile
+++ b/src/lib/libssl/src/crypto/ec/Makefile
@@ -19,11 +19,15 @@ APPS=
 LIB=$(TOP)/libcrypto.a
 LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\
         ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\
-        ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c
+        ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c \
+        ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c \
+        ecp_oct.c ec2_oct.c ec_oct.c
 
 LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\
         ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\
-        ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o
+        ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o \
+        ecp_nistp224.o ecp_nistp256.o ecp_nistp521.o ecp_nistputil.o \
+        ecp_oct.o ec2_oct.o ec_oct.o
 
 SRC= $(LIBSRC)
 
@@ -87,6 +91,14 @@ ec2_mult.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
 ec2_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ec2_mult.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ec2_mult.o: ../../include/openssl/symhacks.h ec2_mult.c ec_lcl.h
+ec2_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ec2_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ec2_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ec2_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ec2_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
+ec2_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ec2_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ec2_oct.o: ../../include/openssl/symhacks.h ec2_oct.c ec_lcl.h
 ec2_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ec2_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 ec2_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -174,6 +186,14 @@ ec_mult.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
 ec_mult.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ec_mult.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ec_mult.o: ../../include/openssl/symhacks.h ec_lcl.h ec_mult.c
+ec_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ec_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ec_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ec_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ec_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
+ec_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ec_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ec_oct.o: ../../include/openssl/symhacks.h ec_lcl.h ec_oct.c
 ec_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h
 ec_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 ec_pmeth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -221,6 +241,18 @@ ecp_nist.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
 ecp_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 ecp_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 ecp_nist.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_nist.c
+ecp_nistp224.o: ../../include/openssl/opensslconf.h ecp_nistp224.c
+ecp_nistp256.o: ../../include/openssl/opensslconf.h ecp_nistp256.c
+ecp_nistp521.o: ../../include/openssl/opensslconf.h ecp_nistp521.c
+ecp_nistputil.o: ../../include/openssl/opensslconf.h ecp_nistputil.c
+ecp_oct.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecp_oct.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ecp_oct.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecp_oct.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ecp_oct.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h
+ecp_oct.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecp_oct.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecp_oct.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_oct.c
 ecp_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 ecp_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
 ecp_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
diff --git a/src/lib/libssl/src/crypto/ec/ec.h b/src/lib/libssl/src/crypto/ec/ec.h
index ee7078130c..9d01325af3 100644
--- a/src/lib/libssl/src/crypto/ec/ec.h
+++ b/src/lib/libssl/src/crypto/ec/ec.h
@@ -151,7 +151,24 @@ const EC_METHOD *EC_GFp_mont_method(void);
  */
 const EC_METHOD *EC_GFp_nist_method(void);
 
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+/** Returns 64-bit optimized methods for nistp224
+ *  \return  EC_METHOD object
+ */
+const EC_METHOD *EC_GFp_nistp224_method(void);
+
+/** Returns 64-bit optimized methods for nistp256
+ *  \return  EC_METHOD object
+ */
+const EC_METHOD *EC_GFp_nistp256_method(void);
+
+/** Returns 64-bit optimized methods for nistp521
+ *  \return  EC_METHOD object
+ */
+const EC_METHOD *EC_GFp_nistp521_method(void);
+#endif
 
+#ifndef OPENSSL_NO_EC2M
 /********************************************************************/ 
 /*           EC_METHOD for curves over GF(2^m)                      */
 /********************************************************************/
@@ -161,6 +178,8 @@ const EC_METHOD *EC_GFp_nist_method(void);
  */
 const EC_METHOD *EC_GF2m_simple_method(void);
 
+#endif
+
 
 /********************************************************************/
 /*                   EC_GROUP functions                             */
@@ -282,6 +301,7 @@ int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, co
  */
 int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx);
 
+#ifndef OPENSSL_NO_EC2M
 /** Sets the parameter of a ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
  *  \param  group  EC_GROUP object
  *  \param  p      BIGNUM with the polynomial defining the underlying field
@@ -301,7 +321,7 @@ int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, c
  *  \return 1 on success and 0 if an error occured
  */
 int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx);
-
+#endif
 /** Returns the number of bits needed to represent a field element 
  *  \param  group  EC_GROUP object
  *  \return number of bits needed to represent a field element
@@ -342,7 +362,7 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx);
  *  \return newly created EC_GROUP object with the specified parameters
  */
 EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-
+#ifndef OPENSSL_NO_EC2M
 /** Creates a new EC_GROUP object with the specified parameters defined
  *  over GF2m (defined by the equation y^2 + x*y = x^3 + a*x^2 + b)
  *  \param  p    BIGNUM with the polynomial defining the underlying field
@@ -352,7 +372,7 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM
  *  \return newly created EC_GROUP object with the specified parameters
  */
 EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-
+#endif
 /** Creates a EC_GROUP object with a curve specified by a NID
  *  \param  nid  NID of the OID of the curve name
  *  \return newly created EC_GROUP object with specified curve or NULL
@@ -481,7 +501,7 @@ int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
  */
 int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
         const BIGNUM *x, int y_bit, BN_CTX *ctx);
-
+#ifndef OPENSSL_NO_EC2M
 /** Sets the affine coordinates of a EC_POINT over GF2m
  *  \param  group  underlying EC_GROUP object
  *  \param  p      EC_POINT object
@@ -514,7 +534,7 @@ int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
  */
 int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
         const BIGNUM *x, int y_bit, BN_CTX *ctx);
-
+#endif
 /** Encodes a EC_POINT object to a octet string
  *  \param  group  underlying EC_GROUP object
  *  \param  p      EC_POINT object
@@ -653,9 +673,11 @@ int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
 /* EC_GROUP_get_basis_type() returns the NID of the basis type
  * used to represent the field elements */
 int EC_GROUP_get_basis_type(const EC_GROUP *);
+#ifndef OPENSSL_NO_EC2M
 int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
 int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1, 
         unsigned int *k2, unsigned int *k3);
+#endif
 
 #define OPENSSL_EC_NAMED_CURVE  0x001
 
@@ -689,11 +711,21 @@ typedef struct ec_key_st EC_KEY;
 #define EC_PKEY_NO_PARAMETERS   0x001
 #define EC_PKEY_NO_PUBKEY       0x002
 
+/* some values for the flags field */
+#define EC_FLAG_NON_FIPS_ALLOW  0x1
+#define EC_FLAG_FIPS_CHECKED    0x2
+
 /** Creates a new EC_KEY object.
  *  \return EC_KEY object or NULL if an error occurred.
  */
 EC_KEY *EC_KEY_new(void);
 
+int EC_KEY_get_flags(const EC_KEY *key);
+
+void EC_KEY_set_flags(EC_KEY *key, int flags);
+
+void EC_KEY_clear_flags(EC_KEY *key, int flags);
+
 /** Creates a new EC_KEY object using a named curve as underlying
  *  EC_GROUP object.
  *  \param  nid  NID of the named curve.
@@ -799,6 +831,15 @@ int EC_KEY_generate_key(EC_KEY *key);
  */
 int EC_KEY_check_key(const EC_KEY *key);
 
+/** Sets a public key from affine coordindates performing
+ *  neccessary NIST PKV tests.
+ *  \param  key  the EC_KEY object
+ *  \param  x    public key x coordinate
+ *  \param  y    public key y coordinate
+ *  \return 1 on success and 0 otherwise.
+ */
+int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x, BIGNUM *y);
+
 
 /********************************************************************/
 /*        de- and encoding functions for SEC1 ECPrivateKey          */
@@ -926,6 +967,7 @@ void ERR_load_EC_strings(void);
 /* Error codes for the EC functions. */
 
 /* Function codes. */
+#define EC_F_BN_TO_FELEM                                 224
 #define EC_F_COMPUTE_WNAF                                143
 #define EC_F_D2I_ECPARAMETERS                            144
 #define EC_F_D2I_ECPKPARAMETERS                          145
@@ -968,6 +1010,15 @@ void ERR_load_EC_strings(void);
 #define EC_F_EC_GFP_MONT_FIELD_SQR                       132
 #define EC_F_EC_GFP_MONT_GROUP_SET_CURVE                 189
 #define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP             135
+#define EC_F_EC_GFP_NISTP224_GROUP_SET_CURVE             225
+#define EC_F_EC_GFP_NISTP224_POINTS_MUL                  228
+#define EC_F_EC_GFP_NISTP224_POINT_GET_AFFINE_COORDINATES 226
+#define EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE             230
+#define EC_F_EC_GFP_NISTP256_POINTS_MUL                  231
+#define EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES 232
+#define EC_F_EC_GFP_NISTP521_GROUP_SET_CURVE             233
+#define EC_F_EC_GFP_NISTP521_POINTS_MUL                  234
+#define EC_F_EC_GFP_NISTP521_POINT_GET_AFFINE_COORDINATES 235
 #define EC_F_EC_GFP_NIST_FIELD_MUL                       200
 #define EC_F_EC_GFP_NIST_FIELD_SQR                       201
 #define EC_F_EC_GFP_NIST_GROUP_SET_CURVE                 202
@@ -1010,6 +1061,7 @@ void ERR_load_EC_strings(void);
 #define EC_F_EC_KEY_NEW                                  182
 #define EC_F_EC_KEY_PRINT                                180
 #define EC_F_EC_KEY_PRINT_FP                             181
+#define EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES    229
 #define EC_F_EC_POINTS_MAKE_AFFINE                       136
 #define EC_F_EC_POINT_ADD                                112
 #define EC_F_EC_POINT_CMP                                113
@@ -1040,6 +1092,9 @@ void ERR_load_EC_strings(void);
 #define EC_F_I2D_ECPKPARAMETERS                          191
 #define EC_F_I2D_ECPRIVATEKEY                            192
 #define EC_F_I2O_ECPUBLICKEY                             151
+#define EC_F_NISTP224_PRE_COMP_NEW                       227
+#define EC_F_NISTP256_PRE_COMP_NEW                       236
+#define EC_F_NISTP521_PRE_COMP_NEW                       237
 #define EC_F_O2I_ECPUBLICKEY                             152
 #define EC_F_OLD_EC_PRIV_DECODE                          222
 #define EC_F_PKEY_EC_CTRL                                197
@@ -1052,12 +1107,15 @@ void ERR_load_EC_strings(void);
 /* Reason codes. */
 #define EC_R_ASN1_ERROR                                  115
 #define EC_R_ASN1_UNKNOWN_FIELD                          116
+#define EC_R_BIGNUM_OUT_OF_RANGE                         144
 #define EC_R_BUFFER_TOO_SMALL                            100
+#define EC_R_COORDINATES_OUT_OF_RANGE                    146
 #define EC_R_D2I_ECPKPARAMETERS_FAILURE                  117
 #define EC_R_DECODE_ERROR                                142
 #define EC_R_DISCRIMINANT_IS_ZERO                        118
 #define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE                119
 #define EC_R_FIELD_TOO_LARGE                             143
+#define EC_R_GF2M_NOT_SUPPORTED                          147
 #define EC_R_GROUP2PKPARAMETERS_FAILURE                  120
 #define EC_R_I2D_ECPKPARAMETERS_FAILURE                  121
 #define EC_R_INCOMPATIBLE_OBJECTS                        101
@@ -1092,6 +1150,7 @@ void ERR_load_EC_strings(void);
 #define EC_R_UNKNOWN_GROUP                               129
 #define EC_R_UNKNOWN_ORDER                               114
 #define EC_R_UNSUPPORTED_FIELD                           131
+#define EC_R_WRONG_CURVE_PARAMETERS                      145
 #define EC_R_WRONG_ORDER                                 130
 
 #ifdef  __cplusplus
diff --git a/src/lib/libssl/src/crypto/ec/ec_cvt.c b/src/lib/libssl/src/crypto/ec/ec_cvt.c
index d45640bab9..bfcbab35fe 100644
--- a/src/lib/libssl/src/crypto/ec/ec_cvt.c
+++ b/src/lib/libssl/src/crypto/ec/ec_cvt.c
@@ -78,7 +78,32 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM
         const EC_METHOD *meth;
         EC_GROUP *ret;
 
+#if defined(OPENSSL_BN_ASM_MONT)
+        /*
+         * This might appear controversial, but the fact is that generic
+         * prime method was observed to deliver better performance even
+         * for NIST primes on a range of platforms, e.g.: 60%-15%
+         * improvement on IA-64, ~25% on ARM, 30%-90% on P4, 20%-25%
+         * in 32-bit build and 35%--12% in 64-bit build on Core2...
+         * Coefficients are relative to optimized bn_nist.c for most
+         * intensive ECDSA verify and ECDH operations for 192- and 521-
+         * bit keys respectively. Choice of these boundary values is
+         * arguable, because the dependency of improvement coefficient
+         * from key length is not a "monotone" curve. For example while
+         * 571-bit result is 23% on ARM, 384-bit one is -1%. But it's
+         * generally faster, sometimes "respectfully" faster, sometimes
+         * "tolerably" slower... What effectively happens is that loop
+         * with bn_mul_add_words is put against bn_mul_mont, and the
+         * latter "wins" on short vectors. Correct solution should be
+         * implementing dedicated NxN multiplication subroutines for
+         * small N. But till it materializes, let's stick to generic
+         * prime method...
+         *                                              <appro>
+         */
+        meth = EC_GFp_mont_method();
+#else
         meth = EC_GFp_nist_method();
+#endif
         
         ret = EC_GROUP_new(meth);
         if (ret == NULL)
@@ -122,7 +147,7 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM
         return ret;
         }
 
-
+#ifndef OPENSSL_NO_EC2M
 EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
         {
         const EC_METHOD *meth;
@@ -142,3 +167,4 @@ EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM
 
         return ret;
         }
+#endif
diff --git a/src/lib/libssl/src/crypto/ec/ec_err.c b/src/lib/libssl/src/crypto/ec/ec_err.c
index 84b4833371..0d19398731 100644
--- a/src/lib/libssl/src/crypto/ec/ec_err.c
+++ b/src/lib/libssl/src/crypto/ec/ec_err.c
@@ -1,6 +1,6 @@
 /* crypto/ec/ec_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2007 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
@@ -70,6 +70,7 @@
 
 static ERR_STRING_DATA EC_str_functs[]=
         {
+{ERR_FUNC(EC_F_BN_TO_FELEM),    "BN_TO_FELEM"},
 {ERR_FUNC(EC_F_COMPUTE_WNAF),   "COMPUTE_WNAF"},
 {ERR_FUNC(EC_F_D2I_ECPARAMETERS),       "d2i_ECParameters"},
 {ERR_FUNC(EC_F_D2I_ECPKPARAMETERS),     "d2i_ECPKParameters"},
@@ -112,6 +113,15 @@ static ERR_STRING_DATA EC_str_functs[]=
 {ERR_FUNC(EC_F_EC_GFP_MONT_FIELD_SQR),  "ec_GFp_mont_field_sqr"},
 {ERR_FUNC(EC_F_EC_GFP_MONT_GROUP_SET_CURVE),    "ec_GFp_mont_group_set_curve"},
 {ERR_FUNC(EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP),        "EC_GFP_MONT_GROUP_SET_CURVE_GFP"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP224_GROUP_SET_CURVE),        "ec_GFp_nistp224_group_set_curve"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP224_POINTS_MUL),     "ec_GFp_nistp224_points_mul"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP224_POINT_GET_AFFINE_COORDINATES),   "ec_GFp_nistp224_point_get_affine_coordinates"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE),        "ec_GFp_nistp256_group_set_curve"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP256_POINTS_MUL),     "ec_GFp_nistp256_points_mul"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES),   "ec_GFp_nistp256_point_get_affine_coordinates"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP521_GROUP_SET_CURVE),        "ec_GFp_nistp521_group_set_curve"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP521_POINTS_MUL),     "ec_GFp_nistp521_points_mul"},
+{ERR_FUNC(EC_F_EC_GFP_NISTP521_POINT_GET_AFFINE_COORDINATES),   "ec_GFp_nistp521_point_get_affine_coordinates"},
 {ERR_FUNC(EC_F_EC_GFP_NIST_FIELD_MUL),  "ec_GFp_nist_field_mul"},
 {ERR_FUNC(EC_F_EC_GFP_NIST_FIELD_SQR),  "ec_GFp_nist_field_sqr"},
 {ERR_FUNC(EC_F_EC_GFP_NIST_GROUP_SET_CURVE),    "ec_GFp_nist_group_set_curve"},
@@ -154,6 +164,7 @@ static ERR_STRING_DATA EC_str_functs[]=
 {ERR_FUNC(EC_F_EC_KEY_NEW),     "EC_KEY_new"},
 {ERR_FUNC(EC_F_EC_KEY_PRINT),   "EC_KEY_print"},
 {ERR_FUNC(EC_F_EC_KEY_PRINT_FP),        "EC_KEY_print_fp"},
+{ERR_FUNC(EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES),       "EC_KEY_set_public_key_affine_coordinates"},
 {ERR_FUNC(EC_F_EC_POINTS_MAKE_AFFINE),  "EC_POINTs_make_affine"},
 {ERR_FUNC(EC_F_EC_POINT_ADD),   "EC_POINT_add"},
 {ERR_FUNC(EC_F_EC_POINT_CMP),   "EC_POINT_cmp"},
@@ -184,6 +195,9 @@ static ERR_STRING_DATA EC_str_functs[]=
 {ERR_FUNC(EC_F_I2D_ECPKPARAMETERS),     "i2d_ECPKParameters"},
 {ERR_FUNC(EC_F_I2D_ECPRIVATEKEY),       "i2d_ECPrivateKey"},
 {ERR_FUNC(EC_F_I2O_ECPUBLICKEY),        "i2o_ECPublicKey"},
+{ERR_FUNC(EC_F_NISTP224_PRE_COMP_NEW),  "NISTP224_PRE_COMP_NEW"},
+{ERR_FUNC(EC_F_NISTP256_PRE_COMP_NEW),  "NISTP256_PRE_COMP_NEW"},
+{ERR_FUNC(EC_F_NISTP521_PRE_COMP_NEW),  "NISTP521_PRE_COMP_NEW"},
 {ERR_FUNC(EC_F_O2I_ECPUBLICKEY),        "o2i_ECPublicKey"},
 {ERR_FUNC(EC_F_OLD_EC_PRIV_DECODE),     "OLD_EC_PRIV_DECODE"},
 {ERR_FUNC(EC_F_PKEY_EC_CTRL),   "PKEY_EC_CTRL"},
@@ -199,12 +213,15 @@ static ERR_STRING_DATA EC_str_reasons[]=
         {
 {ERR_REASON(EC_R_ASN1_ERROR)             ,"asn1 error"},
 {ERR_REASON(EC_R_ASN1_UNKNOWN_FIELD)     ,"asn1 unknown field"},
+{ERR_REASON(EC_R_BIGNUM_OUT_OF_RANGE)    ,"bignum out of range"},
 {ERR_REASON(EC_R_BUFFER_TOO_SMALL)       ,"buffer too small"},
+{ERR_REASON(EC_R_COORDINATES_OUT_OF_RANGE),"coordinates out of range"},
 {ERR_REASON(EC_R_D2I_ECPKPARAMETERS_FAILURE),"d2i ecpkparameters failure"},
 {ERR_REASON(EC_R_DECODE_ERROR)           ,"decode error"},
 {ERR_REASON(EC_R_DISCRIMINANT_IS_ZERO)   ,"discriminant is zero"},
 {ERR_REASON(EC_R_EC_GROUP_NEW_BY_NAME_FAILURE),"ec group new by name failure"},
 {ERR_REASON(EC_R_FIELD_TOO_LARGE)        ,"field too large"},
+{ERR_REASON(EC_R_GF2M_NOT_SUPPORTED)     ,"gf2m not supported"},
 {ERR_REASON(EC_R_GROUP2PKPARAMETERS_FAILURE),"group2pkparameters failure"},
 {ERR_REASON(EC_R_I2D_ECPKPARAMETERS_FAILURE),"i2d ecpkparameters failure"},
 {ERR_REASON(EC_R_INCOMPATIBLE_OBJECTS)   ,"incompatible objects"},
@@ -239,6 +256,7 @@ static ERR_STRING_DATA EC_str_reasons[]=
 {ERR_REASON(EC_R_UNKNOWN_GROUP)          ,"unknown group"},
 {ERR_REASON(EC_R_UNKNOWN_ORDER)          ,"unknown order"},
 {ERR_REASON(EC_R_UNSUPPORTED_FIELD)      ,"unsupported field"},
+{ERR_REASON(EC_R_WRONG_CURVE_PARAMETERS) ,"wrong curve parameters"},
 {ERR_REASON(EC_R_WRONG_ORDER)            ,"wrong order"},
 {0,NULL}
         };
diff --git a/src/lib/libssl/src/crypto/ec/ec_lcl.h b/src/lib/libssl/src/crypto/ec/ec_lcl.h
index 3e2c34b0bc..da7967df38 100644
--- a/src/lib/libssl/src/crypto/ec/ec_lcl.h
+++ b/src/lib/libssl/src/crypto/ec/ec_lcl.h
@@ -3,7 +3,7 @@
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
 /* ====================================================================
- * Copyright (c) 1998-2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2010 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
@@ -82,10 +82,15 @@
 # endif
 #endif
 
+/* Use default functions for poin2oct, oct2point and compressed coordinates */
+#define EC_FLAGS_DEFAULT_OCT    0x1
+
 /* Structure details are not part of the exported interface,
  * so all this may change in future versions. */
 
 struct ec_method_st {
+        /* Various method flags */
+        int flags;
         /* used by EC_METHOD_get_field_type: */
         int field_type; /* a NID */
 
@@ -244,6 +249,7 @@ struct ec_key_st {
         point_conversion_form_t conv_form;
 
         int     references;
+        int     flags;
 
         EC_EXTRA_DATA *method_data;
 } /* EC_KEY */;
@@ -391,3 +397,50 @@ int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
         size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
 int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
 int ec_GF2m_have_precompute_mult(const EC_GROUP *group);
+
+/* method functions in ec2_mult.c */
+int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+        size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
+int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
+int ec_GF2m_have_precompute_mult(const EC_GROUP *group);
+
+#ifndef OPENSSL_EC_NISTP_64_GCC_128
+/* method functions in ecp_nistp224.c */
+int ec_GFp_nistp224_group_init(EC_GROUP *group);
+int ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *n, BN_CTX *);
+int ec_GFp_nistp224_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point, BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
+int ec_GFp_nistp224_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
+int ec_GFp_nistp224_points_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *ctx);
+int ec_GFp_nistp224_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
+int ec_GFp_nistp224_have_precompute_mult(const EC_GROUP *group);
+
+/* method functions in ecp_nistp256.c */
+int ec_GFp_nistp256_group_init(EC_GROUP *group);
+int ec_GFp_nistp256_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *n, BN_CTX *);
+int ec_GFp_nistp256_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point, BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
+int ec_GFp_nistp256_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
+int ec_GFp_nistp256_points_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *ctx);
+int ec_GFp_nistp256_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
+int ec_GFp_nistp256_have_precompute_mult(const EC_GROUP *group);
+
+/* method functions in ecp_nistp521.c */
+int ec_GFp_nistp521_group_init(EC_GROUP *group);
+int ec_GFp_nistp521_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *n, BN_CTX *);
+int ec_GFp_nistp521_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point, BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
+int ec_GFp_nistp521_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *);
+int ec_GFp_nistp521_points_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar, size_t num, const EC_POINT *points[], const BIGNUM *scalars[], BN_CTX *ctx);
+int ec_GFp_nistp521_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
+int ec_GFp_nistp521_have_precompute_mult(const EC_GROUP *group);
+
+/* utility functions in ecp_nistputil.c */
+void ec_GFp_nistp_points_make_affine_internal(size_t num, void *point_array,
+        size_t felem_size, void *tmp_felems,
+        void (*felem_one)(void *out),
+        int (*felem_is_zero)(const void *in),
+        void (*felem_assign)(void *out, const void *in),
+        void (*felem_square)(void *out, const void *in),
+        void (*felem_mul)(void *out, const void *in1, const void *in2),
+        void (*felem_inv)(void *out, const void *in),
+        void (*felem_contract)(void *out, const void *in));
+void ec_GFp_nistp_recode_scalar_bits(unsigned char *sign, unsigned char *digit, unsigned char in);
+#endif
diff --git a/src/lib/libssl/src/crypto/ec/ec_lib.c b/src/lib/libssl/src/crypto/ec/ec_lib.c
index dd7da0fcf9..25247b5803 100644
--- a/src/lib/libssl/src/crypto/ec/ec_lib.c
+++ b/src/lib/libssl/src/crypto/ec/ec_lib.c
@@ -425,7 +425,7 @@ int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *
         return group->meth->group_get_curve(group, p, a, b, ctx);
         }
 
-
+#ifndef OPENSSL_NO_EC2M
 int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
         {
         if (group->meth->group_set_curve == 0)
@@ -446,7 +446,7 @@ int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM
                 }
         return group->meth->group_get_curve(group, p, a, b, ctx);
         }
-
+#endif
 
 int EC_GROUP_get_degree(const EC_GROUP *group)
         {
@@ -856,7 +856,7 @@ int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
         return group->meth->point_set_affine_coordinates(group, point, x, y, ctx);
         }
 
-
+#ifndef OPENSSL_NO_EC2M
 int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *point,
         const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)
         {
@@ -872,7 +872,7 @@ int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *point,
                 }
         return group->meth->point_set_affine_coordinates(group, point, x, y, ctx);
         }
-
+#endif
 
 int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *point,
         BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
@@ -890,7 +890,7 @@ int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *p
         return group->meth->point_get_affine_coordinates(group, point, x, y, ctx);
         }
 
-
+#ifndef OPENSSL_NO_EC2M
 int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, const EC_POINT *point,
         BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
         {
@@ -906,75 +906,7 @@ int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, const EC_POINT *
                 }
         return group->meth->point_get_affine_coordinates(group, point, x, y, ctx);
         }
-
-
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *point,
-        const BIGNUM *x, int y_bit, BN_CTX *ctx)
-        {
-        if (group->meth->point_set_compressed_coordinates == 0)
-                {
-                ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-                return 0;
-                }
-        if (group->meth != point->meth)
-                {
-                ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_INCOMPATIBLE_OBJECTS);
-                return 0;
-                }
-        return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
-        }
-
-
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *point,
-        const BIGNUM *x, int y_bit, BN_CTX *ctx)
-        {
-        if (group->meth->point_set_compressed_coordinates == 0)
-                {
-                ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-                return 0;
-                }
-        if (group->meth != point->meth)
-                {
-                ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M, EC_R_INCOMPATIBLE_OBJECTS);
-                return 0;
-                }
-        return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
-        }
-
-
-size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-        unsigned char *buf, size_t len, BN_CTX *ctx)
-        {
-        if (group->meth->point2oct == 0)
-                {
-                ECerr(EC_F_EC_POINT_POINT2OCT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-                return 0;
-                }
-        if (group->meth != point->meth)
-                {
-                ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_INCOMPATIBLE_OBJECTS);
-                return 0;
-                }
-        return group->meth->point2oct(group, point, form, buf, len, ctx);
-        }
-
-
-int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
-        const unsigned char *buf, size_t len, BN_CTX *ctx)
-        {
-        if (group->meth->oct2point == 0)
-                {
-                ECerr(EC_F_EC_POINT_OCT2POINT, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-                return 0;
-                }
-        if (group->meth != point->meth)
-                {
-                ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_INCOMPATIBLE_OBJECTS);
-                return 0;
-                }
-        return group->meth->oct2point(group, point, buf, len, ctx);
-        }
-
+#endif
 
 int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
         {
diff --git a/src/lib/libssl/src/crypto/ec/ecp_mont.c b/src/lib/libssl/src/crypto/ec/ecp_mont.c
index 9fc4a466a5..079e47431b 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_mont.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_mont.c
@@ -63,12 +63,20 @@
 
 #include <openssl/err.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #include "ec_lcl.h"
 
 
 const EC_METHOD *EC_GFp_mont_method(void)
         {
+#ifdef OPENSSL_FIPS
+        return fips_ec_gfp_mont_method();
+#else
         static const EC_METHOD ret = {
+                EC_FLAGS_DEFAULT_OCT,
                 NID_X9_62_prime_field,
                 ec_GFp_mont_group_init,
                 ec_GFp_mont_group_finish,
@@ -87,9 +95,7 @@ const EC_METHOD *EC_GFp_mont_method(void)
                 ec_GFp_simple_get_Jprojective_coordinates_GFp,
                 ec_GFp_simple_point_set_affine_coordinates,
                 ec_GFp_simple_point_get_affine_coordinates,
-                ec_GFp_simple_set_compressed_coordinates,
-                ec_GFp_simple_point2oct,
-                ec_GFp_simple_oct2point,
+                0,0,0,
                 ec_GFp_simple_add,
                 ec_GFp_simple_dbl,
                 ec_GFp_simple_invert,
@@ -108,7 +114,9 @@ const EC_METHOD *EC_GFp_mont_method(void)
                 ec_GFp_mont_field_decode,
                 ec_GFp_mont_field_set_to_one };
 
+
         return &ret;
+#endif
         }
 
 
diff --git a/src/lib/libssl/src/crypto/ec/ecp_nist.c b/src/lib/libssl/src/crypto/ec/ecp_nist.c
index 2a5682ea41..aad2d5f443 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_nist.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_nist.c
@@ -67,9 +67,17 @@
 #include <openssl/obj_mac.h>
 #include "ec_lcl.h"
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 const EC_METHOD *EC_GFp_nist_method(void)
         {
+#ifdef OPENSSL_FIPS
+        return fips_ec_gfp_nist_method();
+#else
         static const EC_METHOD ret = {
+                EC_FLAGS_DEFAULT_OCT,
                 NID_X9_62_prime_field,
                 ec_GFp_simple_group_init,
                 ec_GFp_simple_group_finish,
@@ -88,9 +96,7 @@ const EC_METHOD *EC_GFp_nist_method(void)
                 ec_GFp_simple_get_Jprojective_coordinates_GFp,
                 ec_GFp_simple_point_set_affine_coordinates,
                 ec_GFp_simple_point_get_affine_coordinates,
-                ec_GFp_simple_set_compressed_coordinates,
-                ec_GFp_simple_point2oct,
-                ec_GFp_simple_oct2point,
+                0,0,0,
                 ec_GFp_simple_add,
                 ec_GFp_simple_dbl,
                 ec_GFp_simple_invert,
@@ -110,6 +116,7 @@ const EC_METHOD *EC_GFp_nist_method(void)
                 0 /* field_set_to_one */ };
 
         return &ret;
+#endif
         }
 
 int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src)
diff --git a/src/lib/libssl/src/crypto/ec/ecp_smpl.c b/src/lib/libssl/src/crypto/ec/ecp_smpl.c
index 66a92e2a90..7cbb321f9a 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_smpl.c
+++ b/src/lib/libssl/src/crypto/ec/ecp_smpl.c
@@ -65,11 +65,19 @@
 #include <openssl/err.h>
 #include <openssl/symhacks.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 #include "ec_lcl.h"
 
 const EC_METHOD *EC_GFp_simple_method(void)
         {
+#ifdef OPENSSL_FIPS
+        return fips_ec_gfp_simple_method();
+#else
         static const EC_METHOD ret = {
+                EC_FLAGS_DEFAULT_OCT,
                 NID_X9_62_prime_field,
                 ec_GFp_simple_group_init,
                 ec_GFp_simple_group_finish,
@@ -88,9 +96,7 @@ const EC_METHOD *EC_GFp_simple_method(void)
                 ec_GFp_simple_get_Jprojective_coordinates_GFp,
                 ec_GFp_simple_point_set_affine_coordinates,
                 ec_GFp_simple_point_get_affine_coordinates,
-                ec_GFp_simple_set_compressed_coordinates,
-                ec_GFp_simple_point2oct,
-                ec_GFp_simple_oct2point,
+                0,0,0,
                 ec_GFp_simple_add,
                 ec_GFp_simple_dbl,
                 ec_GFp_simple_invert,
@@ -110,6 +116,7 @@ const EC_METHOD *EC_GFp_simple_method(void)
                 0 /* field_set_to_one */ };
 
         return &ret;
+#endif
         }
 
 
@@ -633,372 +640,6 @@ int ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_P
         return ret;
         }
 
-
-int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point,
-        const BIGNUM *x_, int y_bit, BN_CTX *ctx)
-        {
-        BN_CTX *new_ctx = NULL;
-        BIGNUM *tmp1, *tmp2, *x, *y;
-        int ret = 0;
-
-        /* clear error queue*/
-        ERR_clear_error();
-
-        if (ctx == NULL)
-                {
-                ctx = new_ctx = BN_CTX_new();
-                if (ctx == NULL)
-                        return 0;
-                }
-
-        y_bit = (y_bit != 0);
-
-        BN_CTX_start(ctx);
-        tmp1 = BN_CTX_get(ctx);
-        tmp2 = BN_CTX_get(ctx);
-        x = BN_CTX_get(ctx);
-        y = BN_CTX_get(ctx);
-        if (y == NULL) goto err;
-
-        /* Recover y.  We have a Weierstrass equation
-         *     y^2 = x^3 + a*x + b,
-         * so  y  is one of the square roots of  x^3 + a*x + b.
-         */
-
-        /* tmp1 := x^3 */
-        if (!BN_nnmod(x, x_, &group->field,ctx)) goto err;
-        if (group->meth->field_decode == 0)
-                {
-                /* field_{sqr,mul} work on standard representation */
-                if (!group->meth->field_sqr(group, tmp2, x_, ctx)) goto err;
-                if (!group->meth->field_mul(group, tmp1, tmp2, x_, ctx)) goto err;
-                }
-        else
-                {
-                if (!BN_mod_sqr(tmp2, x_, &group->field, ctx)) goto err;
-                if (!BN_mod_mul(tmp1, tmp2, x_, &group->field, ctx)) goto err;
-                }
-        
-        /* tmp1 := tmp1 + a*x */
-        if (group->a_is_minus3)
-                {
-                if (!BN_mod_lshift1_quick(tmp2, x, &group->field)) goto err;
-                if (!BN_mod_add_quick(tmp2, tmp2, x, &group->field)) goto err;
-                if (!BN_mod_sub_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-                }
-        else
-                {
-                if (group->meth->field_decode)
-                        {
-                        if (!group->meth->field_decode(group, tmp2, &group->a, ctx)) goto err;
-                        if (!BN_mod_mul(tmp2, tmp2, x, &group->field, ctx)) goto err;
-                        }
-                else
-                        {
-                        /* field_mul works on standard representation */
-                        if (!group->meth->field_mul(group, tmp2, &group->a, x, ctx)) goto err;
-                        }
-                
-                if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-                }
-        
-        /* tmp1 := tmp1 + b */
-        if (group->meth->field_decode)
-                {
-                if (!group->meth->field_decode(group, tmp2, &group->b, ctx)) goto err;
-                if (!BN_mod_add_quick(tmp1, tmp1, tmp2, &group->field)) goto err;
-                }
-        else
-                {
-                if (!BN_mod_add_quick(tmp1, tmp1, &group->b, &group->field)) goto err;
-                }
-        
-        if (!BN_mod_sqrt(y, tmp1, &group->field, ctx))
-                {
-                unsigned long err = ERR_peek_last_error();
-                
-                if (ERR_GET_LIB(err) == ERR_LIB_BN && ERR_GET_REASON(err) == BN_R_NOT_A_SQUARE)
-                        {
-                        ERR_clear_error();
-                        ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-                        }
-                else
-                        ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_BN_LIB);
-                goto err;
-                }
-
-        if (y_bit != BN_is_odd(y))
-                {
-                if (BN_is_zero(y))
-                        {
-                        int kron;
-
-                        kron = BN_kronecker(x, &group->field, ctx);
-                        if (kron == -2) goto err;
-
-                        if (kron == 1)
-                                ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSION_BIT);
-                        else
-                                /* BN_mod_sqrt() should have cought this error (not a square) */
-                                ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, EC_R_INVALID_COMPRESSED_POINT);
-                        goto err;
-                        }
-                if (!BN_usub(y, &group->field, y)) goto err;
-                }
-        if (y_bit != BN_is_odd(y))
-                {
-                ECerr(EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES, ERR_R_INTERNAL_ERROR);
-                goto err;
-                }
-
-        if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-
-        ret = 1;
-
- err:
-        BN_CTX_end(ctx);
-        if (new_ctx != NULL)
-                BN_CTX_free(new_ctx);
-        return ret;
-        }
-
-
-size_t ec_GFp_simple_point2oct(const EC_GROUP *group, const EC_POINT *point, point_conversion_form_t form,
-        unsigned char *buf, size_t len, BN_CTX *ctx)
-        {
-        size_t ret;
-        BN_CTX *new_ctx = NULL;
-        int used_ctx = 0;
-        BIGNUM *x, *y;
-        size_t field_len, i, skip;
-
-        if ((form != POINT_CONVERSION_COMPRESSED)
-                && (form != POINT_CONVERSION_UNCOMPRESSED)
-                && (form != POINT_CONVERSION_HYBRID))
-                {
-                ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_INVALID_FORM);
-                goto err;
-                }
-
-        if (EC_POINT_is_at_infinity(group, point))
-                {
-                /* encodes to a single 0 octet */
-                if (buf != NULL)
-                        {
-                        if (len < 1)
-                                {
-                                ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-                                return 0;
-                                }
-                        buf[0] = 0;
-                        }
-                return 1;
-                }
-
-
-        /* ret := required output buffer length */
-        field_len = BN_num_bytes(&group->field);
-        ret = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-        /* if 'buf' is NULL, just return required length */
-        if (buf != NULL)
-                {
-                if (len < ret)
-                        {
-                        ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
-                        goto err;
-                        }
-
-                if (ctx == NULL)
-                        {
-                        ctx = new_ctx = BN_CTX_new();
-                        if (ctx == NULL)
-                                return 0;
-                        }
-
-                BN_CTX_start(ctx);
-                used_ctx = 1;
-                x = BN_CTX_get(ctx);
-                y = BN_CTX_get(ctx);
-                if (y == NULL) goto err;
-
-                if (!EC_POINT_get_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-
-                if ((form == POINT_CONVERSION_COMPRESSED || form == POINT_CONVERSION_HYBRID) && BN_is_odd(y))
-                        buf[0] = form + 1;
-                else
-                        buf[0] = form;
-        
-                i = 1;
-                
-                skip = field_len - BN_num_bytes(x);
-                if (skip > field_len)
-                        {
-                        ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                while (skip > 0)
-                        {
-                        buf[i++] = 0;
-                        skip--;
-                        }
-                skip = BN_bn2bin(x, buf + i);
-                i += skip;
-                if (i != 1 + field_len)
-                        {
-                        ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-
-                if (form == POINT_CONVERSION_UNCOMPRESSED || form == POINT_CONVERSION_HYBRID)
-                        {
-                        skip = field_len - BN_num_bytes(y);
-                        if (skip > field_len)
-                                {
-                                ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                                goto err;
-                                }
-                        while (skip > 0)
-                                {
-                                buf[i++] = 0;
-                                skip--;
-                                }
-                        skip = BN_bn2bin(y, buf + i);
-                        i += skip;
-                        }
-
-                if (i != ret)
-                        {
-                        ECerr(EC_F_EC_GFP_SIMPLE_POINT2OCT, ERR_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                }
-        
-        if (used_ctx)
-                BN_CTX_end(ctx);
-        if (new_ctx != NULL)
-                BN_CTX_free(new_ctx);
-        return ret;
-
- err:
-        if (used_ctx)
-                BN_CTX_end(ctx);
-        if (new_ctx != NULL)
-                BN_CTX_free(new_ctx);
-        return 0;
-        }
-
-
-int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
-        const unsigned char *buf, size_t len, BN_CTX *ctx)
-        {
-        point_conversion_form_t form;
-        int y_bit;
-        BN_CTX *new_ctx = NULL;
-        BIGNUM *x, *y;
-        size_t field_len, enc_len;
-        int ret = 0;
-
-        if (len == 0)
-                {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_BUFFER_TOO_SMALL);
-                return 0;
-                }
-        form = buf[0];
-        y_bit = form & 1;
-        form = form & ~1U;
-        if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED)
-                && (form != POINT_CONVERSION_UNCOMPRESSED)
-                && (form != POINT_CONVERSION_HYBRID))
-                {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                return 0;
-                }
-        if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
-                {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                return 0;
-                }
-
-        if (form == 0)
-                {
-                if (len != 1)
-                        {
-                        ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                        return 0;
-                        }
-
-                return EC_POINT_set_to_infinity(group, point);
-                }
-        
-        field_len = BN_num_bytes(&group->field);
-        enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
-
-        if (len != enc_len)
-                {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                return 0;
-                }
-
-        if (ctx == NULL)
-                {
-                ctx = new_ctx = BN_CTX_new();
-                if (ctx == NULL)
-                        return 0;
-                }
-
-        BN_CTX_start(ctx);
-        x = BN_CTX_get(ctx);
-        y = BN_CTX_get(ctx);
-        if (y == NULL) goto err;
-
-        if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
-        if (BN_ucmp(x, &group->field) >= 0)
-                {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                goto err;
-                }
-
-        if (form == POINT_CONVERSION_COMPRESSED)
-                {
-                if (!EC_POINT_set_compressed_coordinates_GFp(group, point, x, y_bit, ctx)) goto err;
-                }
-        else
-                {
-                if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
-                if (BN_ucmp(y, &group->field) >= 0)
-                        {
-                        ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                        goto err;
-                        }
-                if (form == POINT_CONVERSION_HYBRID)
-                        {
-                        if (y_bit != BN_is_odd(y))
-                                {
-                                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
-                                goto err;
-                                }
-                        }
-
-                if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) goto err;
-                }
-        
-        if (!EC_POINT_is_on_curve(group, point, ctx)) /* test required by X9.62 */
-                {
-                ECerr(EC_F_EC_GFP_SIMPLE_OCT2POINT, EC_R_POINT_IS_NOT_ON_CURVE);
-                goto err;
-                }
-
-        ret = 1;
-        
- err:
-        BN_CTX_end(ctx);
-        if (new_ctx != NULL)
-                BN_CTX_free(new_ctx);
-        return ret;
-        }
-
-
 int ec_GFp_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
         {
         int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
diff --git a/src/lib/libssl/src/crypto/ec/ectest.c b/src/lib/libssl/src/crypto/ec/ectest.c
index 7509cb9c7c..f107782de0 100644
--- a/src/lib/libssl/src/crypto/ec/ectest.c
+++ b/src/lib/libssl/src/crypto/ec/ectest.c
@@ -94,6 +94,7 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
 #include <openssl/objects.h>
 #include <openssl/rand.h>
 #include <openssl/bn.h>
+#include <openssl/opensslconf.h>
 
 #if defined(_MSC_VER) && defined(_MIPS_) && (_MSC_VER/100==12)
 /* suppress "too big too optimize" warning */
@@ -107,10 +108,6 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
         EXIT(1); \
 } while (0)
 
-void prime_field_tests(void);
-void char2_field_tests(void);
-void internal_curve_test(void);
-
 #define TIMING_BASE_PT 0
 #define TIMING_RAND_PT 1
 #define TIMING_SIMUL 2
@@ -195,7 +192,50 @@ static void timings(EC_GROUP *group, int type, BN_CTX *ctx)
         }
 #endif
 
-void prime_field_tests()
+/* test multiplication with group order, long and negative scalars */
+static void group_order_tests(EC_GROUP *group)
+        {
+        BIGNUM *n1, *n2, *order;
+        EC_POINT *P = EC_POINT_new(group);
+        EC_POINT *Q = EC_POINT_new(group);
+        BN_CTX *ctx = BN_CTX_new();
+
+        n1 = BN_new(); n2 = BN_new(); order = BN_new();
+        fprintf(stdout, "verify group order ...");
+        fflush(stdout);
+        if (!EC_GROUP_get_order(group, order, ctx)) ABORT;
+        if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) ABORT;
+        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
+        fprintf(stdout, ".");
+        fflush(stdout);
+        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
+        if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) ABORT;
+        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
+        fprintf(stdout, " ok\n");
+        fprintf(stdout, "long/negative scalar tests ... ");
+        if (!BN_one(n1)) ABORT;
+        /* n1 = 1 - order */
+        if (!BN_sub(n1, n1, order)) ABORT;
+        if(!EC_POINT_mul(group, Q, NULL, P, n1, ctx)) ABORT;
+        if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+        /* n2 = 1 + order */
+        if (!BN_add(n2, order, BN_value_one())) ABORT;
+        if(!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
+        if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+        /* n2 = (1 - order) * (1 + order) */
+        if (!BN_mul(n2, n1, n2, ctx)) ABORT;
+        if(!EC_POINT_mul(group, Q, NULL, P, n2, ctx)) ABORT;
+        if (0 != EC_POINT_cmp(group, Q, P, ctx)) ABORT;
+        fprintf(stdout, "ok\n");
+        EC_POINT_free(P);
+        EC_POINT_free(Q);
+        BN_free(n1);
+        BN_free(n2);
+        BN_free(order);
+        BN_CTX_free(ctx);
+        }
+
+static void prime_field_tests(void)
         {       
         BN_CTX *ctx = NULL;
         BIGNUM *p, *a, *b;
@@ -321,21 +361,21 @@ void prime_field_tests()
         if (len == 0) ABORT;
         if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
         if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
-        fprintf(stdout, "Generator as octect string, compressed form:\n     ");
+        fprintf(stdout, "Generator as octet string, compressed form:\n     ");
         for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
         
         len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_UNCOMPRESSED, buf, sizeof buf, ctx);
         if (len == 0) ABORT;
         if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
         if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
-        fprintf(stdout, "\nGenerator as octect string, uncompressed form:\n     ");
+        fprintf(stdout, "\nGenerator as octet string, uncompressed form:\n     ");
         for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
         
         len = EC_POINT_point2oct(group, Q, POINT_CONVERSION_HYBRID, buf, sizeof buf, ctx);
         if (len == 0) ABORT;
         if (!EC_POINT_oct2point(group, P, buf, len, ctx)) ABORT;
         if (0 != EC_POINT_cmp(group, P, Q, ctx)) ABORT;
-        fprintf(stdout, "\nGenerator as octect string, hybrid form:\n     ");
+        fprintf(stdout, "\nGenerator as octet string, hybrid form:\n     ");
         for (i = 0; i < len; i++) fprintf(stdout, "%02X", buf[i]);
         
         if (!EC_POINT_get_Jprojective_coordinates_GFp(group, R, x, y, z, ctx)) ABORT;
@@ -381,17 +421,7 @@ void prime_field_tests()
         if (EC_GROUP_get_degree(group) != 160) ABORT;
         fprintf(stdout, " ok\n");
         
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+        group_order_tests(group);
 
         if (!(P_160 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_160, group)) ABORT;
@@ -425,17 +455,7 @@ void prime_field_tests()
         if (EC_GROUP_get_degree(group) != 192) ABORT;
         fprintf(stdout, " ok\n");
         
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+        group_order_tests(group);
 
         if (!(P_192 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_192, group)) ABORT;
@@ -469,17 +489,7 @@ void prime_field_tests()
         if (EC_GROUP_get_degree(group) != 224) ABORT;
         fprintf(stdout, " ok\n");
         
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+        group_order_tests(group);
 
         if (!(P_224 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_224, group)) ABORT;
@@ -514,17 +524,7 @@ void prime_field_tests()
         if (EC_GROUP_get_degree(group) != 256) ABORT;
         fprintf(stdout, " ok\n");
         
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+        group_order_tests(group);
 
         if (!(P_256 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_256, group)) ABORT;
@@ -563,18 +563,8 @@ void prime_field_tests()
         fprintf(stdout, "verify degree ...");
         if (EC_GROUP_get_degree(group) != 384) ABORT;
         fprintf(stdout, " ok\n");
-        
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+
+        group_order_tests(group);
 
         if (!(P_384 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_384, group)) ABORT;
@@ -619,18 +609,8 @@ void prime_field_tests()
         fprintf(stdout, "verify degree ...");
         if (EC_GROUP_get_degree(group) != 521) ABORT;
         fprintf(stdout, " ok\n");
-        
-        fprintf(stdout, "verify group order ...");
-        fflush(stdout);
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, ".");
-        fflush(stdout);
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT;
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT;
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT;
-        fprintf(stdout, " ok\n");
+
+        group_order_tests(group);
 
         if (!(P_521 = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT;
         if (!EC_GROUP_copy(P_521, group)) ABORT;
@@ -659,6 +639,7 @@ void prime_field_tests()
                 points[2] = Q;
                 points[3] = Q;
 
+                if (!EC_GROUP_get_order(group, z, ctx)) ABORT;
                 if (!BN_add(y, z, BN_value_one())) ABORT;
                 if (BN_is_odd(y)) ABORT;
                 if (!BN_rshift1(y, y)) ABORT;
@@ -792,22 +773,14 @@ void prime_field_tests()
         fprintf(stdout, "verify degree ..."); \
         if (EC_GROUP_get_degree(group) != _degree) ABORT; \
         fprintf(stdout, " ok\n"); \
-        fprintf(stdout, "verify group order ..."); \
-        fflush(stdout); \
-        if (!EC_GROUP_get_order(group, z, ctx)) ABORT; \
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; \
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT; \
-        fprintf(stdout, "."); \
-        fflush(stdout); \
-        if (!EC_GROUP_precompute_mult(group, ctx)) ABORT; \
-        if (!EC_POINT_mul(group, Q, z, NULL, NULL, ctx)) ABORT; \
-        if (!EC_POINT_is_at_infinity(group, Q)) ABORT; \
-        fprintf(stdout, " ok\n"); \
+        group_order_tests(group); \
         if (!(_variable = EC_GROUP_new(EC_GROUP_method_of(group)))) ABORT; \
-        if (!EC_GROUP_copy(_variable, group)) ABORT;
+        if (!EC_GROUP_copy(_variable, group)) ABORT; \
 
-void char2_field_tests()
-        {       
+#ifndef OPENSSL_NO_EC2M
+
+static void char2_field_tests(void)
+        {
         BN_CTX *ctx = NULL;
         BIGNUM *p, *a, *b;
         EC_GROUP *group;
@@ -1239,8 +1212,9 @@ void char2_field_tests()
         if (C2_B571) EC_GROUP_free(C2_B571);
 
         }
+#endif
 
-void internal_curve_test(void)
+static void internal_curve_test(void)
         {
         EC_builtin_curve *curves = NULL;
         size_t crv_len = 0, n = 0;
@@ -1287,13 +1261,189 @@ void internal_curve_test(void)
                 EC_GROUP_free(group);
                 }
         if (ok)
-                fprintf(stdout, " ok\n");
+                fprintf(stdout, " ok\n\n");
         else
-                fprintf(stdout, " failed\n");
+                {
+                fprintf(stdout, " failed\n\n");
+                ABORT;
+                }
         OPENSSL_free(curves);
         return;
         }
 
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+/* nistp_test_params contains magic numbers for testing our optimized
+ * implementations of several NIST curves with characteristic > 3. */
+struct nistp_test_params
+        {
+        const EC_METHOD* (*meth) ();
+        int degree;
+        /* Qx, Qy and D are taken from
+         * http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/ECDSA_Prime.pdf
+         * Otherwise, values are standard curve parameters from FIPS 180-3 */
+        const char *p, *a, *b, *Qx, *Qy, *Gx, *Gy, *order, *d;
+        };
+
+static const struct nistp_test_params nistp_tests_params[] =
+        {
+                {
+                /* P-224 */
+                EC_GFp_nistp224_method,
+                224,
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001", /* p */
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE", /* a */
+                "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4", /* b */
+                "E84FB0B8E7000CB657D7973CF6B42ED78B301674276DF744AF130B3E", /* Qx */
+                "4376675C6FC5612C21A0FF2D2A89D2987DF7A2BC52183B5982298555", /* Qy */
+                "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21", /* Gx */
+                "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34", /* Gy */
+                "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", /* order */
+                "3F0C488E987C80BE0FEE521F8D90BE6034EC69AE11CA72AA777481E8", /* d */
+                },
+                {
+                /* P-256 */
+                EC_GFp_nistp256_method,
+                256,
+                "ffffffff00000001000000000000000000000000ffffffffffffffffffffffff", /* p */
+                "ffffffff00000001000000000000000000000000fffffffffffffffffffffffc", /* a */
+                "5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b", /* b */
+                "b7e08afdfe94bad3f1dc8c734798ba1c62b3a0ad1e9ea2a38201cd0889bc7a19", /* Qx */
+                "3603f747959dbf7a4bb226e41928729063adc7ae43529e61b563bbc606cc5e09", /* Qy */
+                "6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296", /* Gx */
+                "4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5", /* Gy */
+                "ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551", /* order */
+                "c477f9f65c22cce20657faa5b2d1d8122336f851a508a1ed04e479c34985bf96", /* d */
+                },
+                {
+                /* P-521 */
+                EC_GFp_nistp521_method,
+                521,
+                "1ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", /* p */
+                "1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc", /* a */
+                "051953eb9618e1c9a1f929a21a0b68540eea2da725b99b315f3b8b489918ef109e156193951ec7e937b1652c0bd3bb1bf073573df883d2c34f1ef451fd46b503f00", /* b */
+                "0098e91eef9a68452822309c52fab453f5f117c1da8ed796b255e9ab8f6410cca16e59df403a6bdc6ca467a37056b1e54b3005d8ac030decfeb68df18b171885d5c4", /* Qx */
+                "0164350c321aecfc1cca1ba4364c9b15656150b4b78d6a48d7d28e7f31985ef17be8554376b72900712c4b83ad668327231526e313f5f092999a4632fd50d946bc2e", /* Qy */
+                "c6858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3dbaa14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66", /* Gx */
+                "11839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e662c97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650", /* Gy */
+                "1fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa51868783bf2f966b7fcc0148f709a5d03bb5c9b8899c47aebb6fb71e91386409", /* order */
+                "0100085f47b8e1b8b11b7eb33028c0b2888e304bfc98501955b45bba1478dc184eeedf09b86a5f7c21994406072787205e69a63709fe35aa93ba333514b24f961722", /* d */
+                },
+        };
+
+void nistp_single_test(const struct nistp_test_params *test)
+        {
+        BN_CTX *ctx;
+        BIGNUM *p, *a, *b, *x, *y, *n, *m, *order;
+        EC_GROUP *NISTP;
+        EC_POINT *G, *P, *Q, *Q_CHECK;
+
+        fprintf(stdout, "\nNIST curve P-%d (optimised implementation):\n", test->degree);
+        ctx = BN_CTX_new();
+        p = BN_new();
+        a = BN_new();
+        b = BN_new();
+        x = BN_new(); y = BN_new();
+        m = BN_new(); n = BN_new(); order = BN_new();
+
+        NISTP = EC_GROUP_new(test->meth());
+        if(!NISTP) ABORT;
+        if (!BN_hex2bn(&p, test->p)) ABORT;
+        if (1 != BN_is_prime_ex(p, BN_prime_checks, ctx, NULL)) ABORT;
+        if (!BN_hex2bn(&a, test->a)) ABORT;
+        if (!BN_hex2bn(&b, test->b)) ABORT;
+        if (!EC_GROUP_set_curve_GFp(NISTP, p, a, b, ctx)) ABORT;
+        G = EC_POINT_new(NISTP);
+        P = EC_POINT_new(NISTP);
+        Q = EC_POINT_new(NISTP);
+        Q_CHECK = EC_POINT_new(NISTP);
+        if(!BN_hex2bn(&x, test->Qx)) ABORT;
+        if(!BN_hex2bn(&y, test->Qy)) ABORT;
+        if(!EC_POINT_set_affine_coordinates_GFp(NISTP, Q_CHECK, x, y, ctx)) ABORT;
+        if (!BN_hex2bn(&x, test->Gx)) ABORT;
+        if (!BN_hex2bn(&y, test->Gy)) ABORT;
+        if (!EC_POINT_set_affine_coordinates_GFp(NISTP, G, x, y, ctx)) ABORT;
+        if (!BN_hex2bn(&order, test->order)) ABORT;
+        if (!EC_GROUP_set_generator(NISTP, G, order, BN_value_one())) ABORT;
+
+        fprintf(stdout, "verify degree ... ");
+        if (EC_GROUP_get_degree(NISTP) != test->degree) ABORT;
+        fprintf(stdout, "ok\n");
+
+        fprintf(stdout, "NIST test vectors ... ");
+        if (!BN_hex2bn(&n, test->d)) ABORT;
+        /* fixed point multiplication */
+        EC_POINT_mul(NISTP, Q, n, NULL, NULL, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+        /* random point multiplication */
+        EC_POINT_mul(NISTP, Q, NULL, G, n, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+
+        /* set generator to P = 2*G, where G is the standard generator */
+        if (!EC_POINT_dbl(NISTP, P, G, ctx)) ABORT;
+        if (!EC_GROUP_set_generator(NISTP, P, order, BN_value_one())) ABORT;
+        /* set the scalar to m=n/2, where n is the NIST test scalar */
+        if (!BN_rshift(m, n, 1)) ABORT;
+
+        /* test the non-standard generator */
+        /* fixed point multiplication */
+        EC_POINT_mul(NISTP, Q, m, NULL, NULL, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+        /* random point multiplication */
+        EC_POINT_mul(NISTP, Q, NULL, P, m, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+
+        /* now repeat all tests with precomputation */
+        if (!EC_GROUP_precompute_mult(NISTP, ctx)) ABORT;
+
+        /* fixed point multiplication */
+        EC_POINT_mul(NISTP, Q, m, NULL, NULL, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+        /* random point multiplication */
+        EC_POINT_mul(NISTP, Q, NULL, P, m, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+
+        /* reset generator */
+        if (!EC_GROUP_set_generator(NISTP, G, order, BN_value_one())) ABORT;
+        /* fixed point multiplication */
+        EC_POINT_mul(NISTP, Q, n, NULL, NULL, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+        /* random point multiplication */
+        EC_POINT_mul(NISTP, Q, NULL, G, n, ctx);
+        if (0 != EC_POINT_cmp(NISTP, Q, Q_CHECK, ctx)) ABORT;
+
+        fprintf(stdout, "ok\n");
+        group_order_tests(NISTP);
+#if 0
+        timings(NISTP, TIMING_BASE_PT, ctx);
+        timings(NISTP, TIMING_RAND_PT, ctx);
+#endif
+        EC_GROUP_free(NISTP);
+        EC_POINT_free(G);
+        EC_POINT_free(P);
+        EC_POINT_free(Q);
+        EC_POINT_free(Q_CHECK);
+        BN_free(n);
+        BN_free(m);
+        BN_free(p);
+        BN_free(a);
+        BN_free(b);
+        BN_free(x);
+        BN_free(y);
+        BN_free(order);
+        BN_CTX_free(ctx);
+        }
+
+void nistp_tests()
+        {
+        unsigned i;
+
+        for (i = 0; i < sizeof(nistp_tests_params) / sizeof(struct nistp_test_params); i++)
+                {
+                nistp_single_test(&nistp_tests_params[i]);
+                }
+        }
+#endif
+
 static const char rnd_seed[] = "string to make the random number generator think it has entropy";
 
 int main(int argc, char *argv[])
@@ -1317,7 +1467,12 @@ int main(int argc, char *argv[])
 
         prime_field_tests();
         puts("");
+#ifndef OPENSSL_NO_EC2M
         char2_field_tests();
+#endif
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+        nistp_tests();
+#endif
         /* test the internal curves */
         internal_curve_test();
 
diff --git a/src/lib/libssl/src/crypto/engine/Makefile b/src/lib/libssl/src/crypto/engine/Makefile
index 9c214824eb..d29bdd09a0 100644
--- a/src/lib/libssl/src/crypto/engine/Makefile
+++ b/src/lib/libssl/src/crypto/engine/Makefile
@@ -21,12 +21,14 @@ LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
         eng_table.c eng_pkey.c eng_fat.c eng_all.c \
         tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \
         tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \
-        eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c
+        eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \
+        eng_rsax.c eng_rdrand.c
 LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \
         eng_table.o eng_pkey.o eng_fat.o eng_all.o \
         tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \
         tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \
-        eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o
+        eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \
+        eng_rsax.o eng_rdrand.o
 
 SRC= $(LIBSRC)
 
@@ -249,6 +251,34 @@ eng_pkey.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 eng_pkey.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 eng_pkey.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
 eng_pkey.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_int.h eng_pkey.c
+eng_rdrand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+eng_rdrand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+eng_rdrand.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+eng_rdrand.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+eng_rdrand.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+eng_rdrand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+eng_rdrand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+eng_rdrand.o: ../../include/openssl/opensslconf.h
+eng_rdrand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_rdrand.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+eng_rdrand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+eng_rdrand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+eng_rdrand.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+eng_rdrand.o: eng_rdrand.c
+eng_rsax.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+eng_rsax.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+eng_rsax.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+eng_rsax.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+eng_rsax.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+eng_rsax.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+eng_rsax.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+eng_rsax.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+eng_rsax.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+eng_rsax.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+eng_rsax.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+eng_rsax.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+eng_rsax.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+eng_rsax.o: eng_rsax.c
 eng_table.o: ../../e_os.h ../../include/openssl/asn1.h
 eng_table.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
diff --git a/src/lib/libssl/src/crypto/engine/eng_all.c b/src/lib/libssl/src/crypto/engine/eng_all.c
index 22c120454f..6093376df4 100644
--- a/src/lib/libssl/src/crypto/engine/eng_all.c
+++ b/src/lib/libssl/src/crypto/engine/eng_all.c
@@ -61,6 +61,8 @@
 
 void ENGINE_load_builtin_engines(void)
         {
+        /* Some ENGINEs need this */
+        OPENSSL_cpuid_setup();
 #if 0
         /* There's no longer any need for an "openssl" ENGINE unless, one day,
          * it is the *only* way for standard builtin implementations to be be
@@ -71,6 +73,12 @@ void ENGINE_load_builtin_engines(void)
 #if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
         ENGINE_load_cryptodev();
 #endif
+#ifndef OPENSSL_NO_RSAX
+        ENGINE_load_rsax();
+#endif
+#ifndef OPENSSL_NO_RDRAND
+        ENGINE_load_rdrand();
+#endif
         ENGINE_load_dynamic();
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #ifndef OPENSSL_NO_HW
@@ -112,6 +120,7 @@ void ENGINE_load_builtin_engines(void)
         ENGINE_load_capi();
 #endif
 #endif
+        ENGINE_register_all_complete();
         }
 
 #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
diff --git a/src/lib/libssl/src/crypto/engine/eng_cryptodev.c b/src/lib/libssl/src/crypto/engine/eng_cryptodev.c
index 52f4ca3901..5a715aca4f 100644
--- a/src/lib/libssl/src/crypto/engine/eng_cryptodev.c
+++ b/src/lib/libssl/src/crypto/engine/eng_cryptodev.c
@@ -79,8 +79,6 @@ struct dev_crypto_state {
         unsigned char digest_res[HASH_MAX_LEN];
         char *mac_data;
         int mac_len;
-
-        int copy;
 #endif
 };
 
@@ -200,6 +198,7 @@ get_dev_crypto(void)
 
         if ((fd = open_dev_crypto()) == -1)
                 return (-1);
+#ifndef CRIOGET_NOT_NEEDED
         if (ioctl(fd, CRIOGET, &retfd) == -1)
                 return (-1);
 
@@ -208,9 +207,19 @@ get_dev_crypto(void)
                 close(retfd);
                 return (-1);
         }
+#else
+        retfd = fd;
+#endif
         return (retfd);
 }
 
+static void put_dev_crypto(int fd)
+{
+#ifndef CRIOGET_NOT_NEEDED
+        close(fd);
+#endif
+}
+
 /* Caching version for asym operations */
 static int
 get_asym_dev_crypto(void)
@@ -252,7 +261,7 @@ get_cryptodev_ciphers(const int **cnids)
                     ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
                         nids[count++] = ciphers[i].nid;
         }
-        close(fd);
+        put_dev_crypto(fd);
 
         if (count > 0)
                 *cnids = nids;
@@ -291,7 +300,7 @@ get_cryptodev_digests(const int **cnids)
                     ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
                         nids[count++] = digests[i].nid;
         }
-        close(fd);
+        put_dev_crypto(fd);
 
         if (count > 0)
                 *cnids = nids;
@@ -436,7 +445,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         sess->cipher = cipher;
 
         if (ioctl(state->d_fd, CIOCGSESSION, sess) == -1) {
-                close(state->d_fd);
+                put_dev_crypto(state->d_fd);
                 state->d_fd = -1;
                 return (0);
         }
@@ -473,7 +482,7 @@ cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
         } else {
                 ret = 1;
         }
-        close(state->d_fd);
+        put_dev_crypto(state->d_fd);
         state->d_fd = -1;
 
         return (ret);
@@ -686,7 +695,7 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx)
         sess->mac = digest;
 
         if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) {
-                close(state->d_fd);
+                put_dev_crypto(state->d_fd);
                 state->d_fd = -1;
                 printf("cryptodev_digest_init: Open session failed\n");
                 return (0);
@@ -758,14 +767,12 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md)
         if (! (ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) ) {
                 /* if application doesn't support one buffer */
                 memset(&cryp, 0, sizeof(cryp));
-
                 cryp.ses = sess->ses;
                 cryp.flags = 0;
                 cryp.len = state->mac_len;
                 cryp.src = state->mac_data;
                 cryp.dst = NULL;
                 cryp.mac = (caddr_t)md;
-
                 if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) {
                         printf("cryptodev_digest_final: digest failed\n");
                         return (0);
@@ -786,6 +793,9 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
         struct dev_crypto_state *state = ctx->md_data;
         struct session_op *sess = &state->d_sess;
 
+        if (state == NULL)
+          return 0;
+
         if (state->d_fd < 0) {
                 printf("cryptodev_digest_cleanup: illegal input\n");
                 return (0);
@@ -797,16 +807,13 @@ static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx)
                 state->mac_len = 0;
         }
 
-        if (state->copy)
-                return 1;
-
         if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) < 0) {
                 printf("cryptodev_digest_cleanup: failed to close session\n");
                 ret = 0;
         } else {
                 ret = 1;
         }
-        close(state->d_fd);     
+        put_dev_crypto(state->d_fd);    
         state->d_fd = -1;
 
         return (ret);
@@ -816,15 +823,39 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to,const EVP_MD_CTX *from)
 {
         struct dev_crypto_state *fstate = from->md_data;
         struct dev_crypto_state *dstate = to->md_data;
+        struct session_op *sess;
+        int digest;
 
-        memcpy(dstate, fstate, sizeof(struct dev_crypto_state));
+        if (dstate == NULL || fstate == NULL)
+          return 1;
 
-        if (fstate->mac_len != 0) {
-                dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
-                memcpy(dstate->mac_data, fstate->mac_data, fstate->mac_len);
+        memcpy(dstate, fstate, sizeof(struct dev_crypto_state));
+
+        sess = &dstate->d_sess;
+
+        digest = digest_nid_to_cryptodev(to->digest->type);
+
+        sess->mackey = dstate->dummy_mac_key;
+        sess->mackeylen = digest_key_length(to->digest->type);
+        sess->mac = digest;
+
+        dstate->d_fd = get_dev_crypto();
+
+        if (ioctl(dstate->d_fd, CIOCGSESSION, sess) < 0) {
+                put_dev_crypto(dstate->d_fd);
+                dstate->d_fd = -1;
+                printf("cryptodev_digest_init: Open session failed\n");
+                return (0);
         }
 
-        dstate->copy = 1;
+        if (fstate->mac_len != 0) {
+                if (fstate->mac_data != NULL)
+                        {
+                        dstate->mac_data = OPENSSL_malloc(fstate->mac_len);
+                        memcpy(dstate->mac_data, fstate->mac_data, fstate->mac_len);
+                        dstate->mac_len = fstate->mac_len;
+                        }
+        }
 
         return 1;
 }
@@ -1347,11 +1378,11 @@ ENGINE_load_cryptodev(void)
          * find out what asymmetric crypto algorithms we support
          */
         if (ioctl(fd, CIOCASYMFEAT, &cryptodev_asymfeat) == -1) {
-                close(fd);
+                put_dev_crypto(fd);
                 ENGINE_free(engine);
                 return;
         }
-        close(fd);
+        put_dev_crypto(fd);
 
         if (!ENGINE_set_id(engine, "cryptodev") ||
             !ENGINE_set_name(engine, "BSD cryptodev engine") ||
diff --git a/src/lib/libssl/src/crypto/engine/eng_fat.c b/src/lib/libssl/src/crypto/engine/eng_fat.c
index db66e62350..789b8d57e5 100644
--- a/src/lib/libssl/src/crypto/engine/eng_fat.c
+++ b/src/lib/libssl/src/crypto/engine/eng_fat.c
@@ -176,6 +176,7 @@ int ENGINE_register_all_complete(void)
         ENGINE *e;
 
         for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
-                ENGINE_register_complete(e);
+                if (!(e->flags & ENGINE_FLAGS_NO_REGISTER_ALL))
+                        ENGINE_register_complete(e);
         return 1;
         }
diff --git a/src/lib/libssl/src/crypto/engine/engine.h b/src/lib/libssl/src/crypto/engine/engine.h
index 943aeae215..f8be497724 100644
--- a/src/lib/libssl/src/crypto/engine/engine.h
+++ b/src/lib/libssl/src/crypto/engine/engine.h
@@ -141,6 +141,13 @@ extern "C" {
  * the existing ENGINE's structural reference count. */
 #define ENGINE_FLAGS_BY_ID_COPY         (int)0x0004
 
+/* This flag if for an ENGINE that does not want its methods registered as 
+ * part of ENGINE_register_all_complete() for example if the methods are
+ * not usable as default methods.
+ */
+
+#define ENGINE_FLAGS_NO_REGISTER_ALL    (int)0x0008
+
 /* ENGINEs can support their own command types, and these flags are used in
  * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input each
  * command expects. Currently only numeric and string input is supported. If a
@@ -344,6 +351,8 @@ void ENGINE_load_gost(void);
 #endif
 #endif
 void ENGINE_load_cryptodev(void);
+void ENGINE_load_rsax(void);
+void ENGINE_load_rdrand(void);
 void ENGINE_load_builtin_engines(void);
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
diff --git a/src/lib/libssl/src/crypto/err/err.c b/src/lib/libssl/src/crypto/err/err.c
index 69713a6e2f..fcdb244008 100644
--- a/src/lib/libssl/src/crypto/err/err.c
+++ b/src/lib/libssl/src/crypto/err/err.c
@@ -1066,6 +1066,13 @@ void ERR_set_error_data(char *data, int flags)
 void ERR_add_error_data(int num, ...)
         {
         va_list args;
+        va_start(args, num);
+        ERR_add_error_vdata(num, args);
+        va_end(args);
+        }
+
+void ERR_add_error_vdata(int num, va_list args)
+        {
         int i,n,s;
         char *str,*p,*a;
 
@@ -1074,7 +1081,6 @@ void ERR_add_error_data(int num, ...)
         if (str == NULL) return;
         str[0]='\0';
 
-        va_start(args, num);
         n=0;
         for (i=0; i<num; i++)
                 {
@@ -1090,7 +1096,7 @@ void ERR_add_error_data(int num, ...)
                                 if (p == NULL)
                                         {
                                         OPENSSL_free(str);
-                                        goto err;
+                                        return;
                                         }
                                 else
                                         str=p;
@@ -1099,9 +1105,6 @@ void ERR_add_error_data(int num, ...)
                         }
                 }
         ERR_set_error_data(str,ERR_TXT_MALLOCED|ERR_TXT_STRING);
-
-err:
-        va_end(args);
         }
 
 int ERR_set_mark(void)
diff --git a/src/lib/libssl/src/crypto/err/err.h b/src/lib/libssl/src/crypto/err/err.h
index b9f8c16d47..974cc9cc6f 100644
--- a/src/lib/libssl/src/crypto/err/err.h
+++ b/src/lib/libssl/src/crypto/err/err.h
@@ -344,8 +344,9 @@ void ERR_print_errors_fp(FILE *fp);
 #endif
 #ifndef OPENSSL_NO_BIO
 void ERR_print_errors(BIO *bp);
-void ERR_add_error_data(int num, ...);
 #endif
+void ERR_add_error_data(int num, ...);
+void ERR_add_error_vdata(int num, va_list args);
 void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
 void ERR_unload_strings(int lib,ERR_STRING_DATA str[]);
 void ERR_load_ERR_strings(void);
diff --git a/src/lib/libssl/src/crypto/err/err_all.c b/src/lib/libssl/src/crypto/err/err_all.c
index fc049e8e88..bd8946d8ba 100644
--- a/src/lib/libssl/src/crypto/err/err_all.c
+++ b/src/lib/libssl/src/crypto/err/err_all.c
@@ -104,6 +104,10 @@
 #endif
 #include <openssl/comp.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 void ERR_load_crypto_strings(void)
         {
 #ifndef OPENSSL_NO_ERR
@@ -157,4 +161,7 @@ void ERR_load_crypto_strings(void)
 #endif
         ERR_load_COMP_strings();
 #endif
+#ifdef OPENSSL_FIPS
+        ERR_load_FIPS_strings();
+#endif
         }
diff --git a/src/lib/libssl/src/crypto/evp/Makefile b/src/lib/libssl/src/crypto/evp/Makefile
index 82825e5299..0fe1b96bff 100644
--- a/src/lib/libssl/src/crypto/evp/Makefile
+++ b/src/lib/libssl/src/crypto/evp/Makefile
@@ -28,7 +28,8 @@ LIBSRC= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
         bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
         c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
         evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c \
-        e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c
+        e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c evp_fips.c \
+        e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c
 
 LIBOBJ= encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \
         e_des.o e_bf.o e_idea.o e_des3.o e_camellia.o\
@@ -40,7 +41,8 @@ LIBOBJ=	encode.o digest.o evp_enc.o evp_key.o evp_acnf.o \
         bio_md.o bio_b64.o bio_enc.o evp_err.o e_null.o \
         c_all.o c_allc.o c_alld.o evp_lib.o bio_ok.o \
         evp_pkey.o evp_pbe.o p5_crpt.o p5_crpt2.o \
-        e_old.o pmeth_lib.o pmeth_fn.o pmeth_gn.o m_sigver.o
+        e_old.o pmeth_lib.o pmeth_fn.o pmeth_gn.o m_sigver.o evp_fips.o \
+        e_aes_cbc_hmac_sha1.o e_rc4_hmac_md5.o
 
 SRC= $(LIBSRC)
 
@@ -189,11 +191,27 @@ e_aes.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
 e_aes.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 e_aes.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 e_aes.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-e_aes.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-e_aes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
-e_aes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h e_aes.c
-e_aes.o: evp_locl.h
+e_aes.o: ../../include/openssl/modes.h ../../include/openssl/obj_mac.h
+e_aes.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+e_aes.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+e_aes.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
+e_aes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+e_aes.o: ../modes/modes_lcl.h e_aes.c evp_locl.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/bio.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/crypto.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/e_os2.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/evp.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/obj_mac.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/objects.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/opensslconf.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/opensslv.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/ossl_typ.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/safestack.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/sha.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/stack.h
+e_aes_cbc_hmac_sha1.o: ../../include/openssl/symhacks.h e_aes_cbc_hmac_sha1.c
+e_aes_cbc_hmac_sha1.o: evp_locl.h
 e_bf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 e_bf.o: ../../include/openssl/blowfish.h ../../include/openssl/buffer.h
 e_bf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -279,7 +297,18 @@ e_rc4.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 e_rc4.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 e_rc4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h
 e_rc4.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-e_rc4.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc4.c
+e_rc4.o: ../../include/openssl/symhacks.h ../cryptlib.h e_rc4.c evp_locl.h
+e_rc4_hmac_md5.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+e_rc4_hmac_md5.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+e_rc4_hmac_md5.o: ../../include/openssl/evp.h ../../include/openssl/md5.h
+e_rc4_hmac_md5.o: ../../include/openssl/obj_mac.h
+e_rc4_hmac_md5.o: ../../include/openssl/objects.h
+e_rc4_hmac_md5.o: ../../include/openssl/opensslconf.h
+e_rc4_hmac_md5.o: ../../include/openssl/opensslv.h
+e_rc4_hmac_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h
+e_rc4_hmac_md5.o: ../../include/openssl/safestack.h
+e_rc4_hmac_md5.o: ../../include/openssl/stack.h
+e_rc4_hmac_md5.o: ../../include/openssl/symhacks.h e_rc4_hmac_md5.c
 e_rc5.o: ../../e_os.h ../../include/openssl/bio.h
 e_rc5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 e_rc5.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -349,6 +378,13 @@ evp_err.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
 evp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 evp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 evp_err.o: ../../include/openssl/symhacks.h evp_err.c
+evp_fips.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+evp_fips.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+evp_fips.o: ../../include/openssl/evp.h ../../include/openssl/obj_mac.h
+evp_fips.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+evp_fips.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+evp_fips.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+evp_fips.o: ../../include/openssl/symhacks.h evp_fips.c
 evp_key.o: ../../e_os.h ../../include/openssl/asn1.h
 evp_key.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 evp_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -383,7 +419,7 @@ evp_pbe.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs12.h
 evp_pbe.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 evp_pbe.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 evp_pbe.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_pbe.c
+evp_pbe.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h evp_pbe.c
 evp_pkey.o: ../../e_os.h ../../include/openssl/asn1.h
 evp_pkey.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 evp_pkey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
@@ -456,7 +492,7 @@ m_md4.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 m_md4.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_md4.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_md4.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md4.c
+m_md4.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_md4.c
 m_md5.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_md5.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_md5.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -469,7 +505,7 @@ m_md5.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
 m_md5.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_md5.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_md5.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_md5.c
+m_md5.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_md5.c
 m_mdc2.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_mdc2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_mdc2.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
@@ -484,7 +520,7 @@ m_mdc2.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_mdc2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_mdc2.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 m_mdc2.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
-m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_mdc2.c
+m_mdc2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h m_mdc2.c
 m_null.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_null.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -510,7 +546,8 @@ m_ripemd.o: ../../include/openssl/pkcs7.h ../../include/openssl/ripemd.h
 m_ripemd.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 m_ripemd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_ripemd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-m_ripemd.o: ../../include/openssl/x509_vfy.h ../cryptlib.h m_ripemd.c
+m_ripemd.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h
+m_ripemd.o: m_ripemd.c
 m_sha.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_sha.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_sha.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -523,7 +560,7 @@ m_sha.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
 m_sha.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 m_sha.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 m_sha.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_sha.o: ../cryptlib.h m_sha.c
+m_sha.o: ../cryptlib.h evp_locl.h m_sha.c
 m_sha1.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 m_sha1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 m_sha1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -563,7 +600,7 @@ m_wp.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 m_wp.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 m_wp.o: ../../include/openssl/symhacks.h ../../include/openssl/whrlpool.h
 m_wp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-m_wp.o: ../cryptlib.h m_wp.c
+m_wp.o: ../cryptlib.h evp_locl.h m_wp.c
 names.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 names.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 names.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
@@ -601,7 +638,8 @@ p5_crpt2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 p5_crpt2.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
 p5_crpt2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
 p5_crpt2.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h p5_crpt2.c
+p5_crpt2.o: ../../include/openssl/x509_vfy.h ../cryptlib.h evp_locl.h
+p5_crpt2.o: p5_crpt2.c
 p_dec.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
 p_dec.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 p_dec.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
diff --git a/src/lib/libssl/src/crypto/evp/bio_md.c b/src/lib/libssl/src/crypto/evp/bio_md.c
index 9841e32e1a..144fdfd56a 100644
--- a/src/lib/libssl/src/crypto/evp/bio_md.c
+++ b/src/lib/libssl/src/crypto/evp/bio_md.c
@@ -153,8 +153,12 @@ static int md_write(BIO *b, const char *in, int inl)
                 {
                 if (ret > 0)
                         {
-                        EVP_DigestUpdate(ctx,(const unsigned char *)in,
-                                (unsigned int)ret);
+                        if (!EVP_DigestUpdate(ctx,(const unsigned char *)in,
+                                (unsigned int)ret))
+                                {
+                                BIO_clear_retry_flags(b);
+                                return 0;
+                                }
                         }
                 }
         if(b->next_bio != NULL)
@@ -220,7 +224,8 @@ static long md_ctrl(BIO *b, int cmd, long num, void *ptr)
         case BIO_CTRL_DUP:
                 dbio=ptr;
                 dctx=dbio->ptr;
-                EVP_MD_CTX_copy_ex(dctx,ctx);
+                if (!EVP_MD_CTX_copy_ex(dctx,ctx))
+                        return 0;
                 b->init=1;
                 break;
         default:
diff --git a/src/lib/libssl/src/crypto/evp/bio_ok.c b/src/lib/libssl/src/crypto/evp/bio_ok.c
index 98bc1ab409..e64335353f 100644
--- a/src/lib/libssl/src/crypto/evp/bio_ok.c
+++ b/src/lib/libssl/src/crypto/evp/bio_ok.c
@@ -133,10 +133,10 @@ static int ok_new(BIO *h);
 static int ok_free(BIO *data);
 static long ok_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
 
-static void sig_out(BIO* b);
-static void sig_in(BIO* b);
-static void block_out(BIO* b);
-static void block_in(BIO* b);
+static int sig_out(BIO* b);
+static int sig_in(BIO* b);
+static int block_out(BIO* b);
+static int block_in(BIO* b);
 #define OK_BLOCK_SIZE   (1024*4)
 #define OK_BLOCK_BLOCK  4
 #define IOBS            (OK_BLOCK_SIZE+ OK_BLOCK_BLOCK+ 3*EVP_MAX_MD_SIZE)
@@ -266,10 +266,24 @@ static int ok_read(BIO *b, char *out, int outl)
                 ctx->buf_len+= i;
 
                 /* no signature yet -- check if we got one */
-                if (ctx->sigio == 1) sig_in(b);
+                if (ctx->sigio == 1)
+                        {
+                        if (!sig_in(b))
+                                {
+                                BIO_clear_retry_flags(b);
+                                return 0;
+                                }
+                        }
 
                 /* signature ok -- check if we got block */
-                if (ctx->sigio == 0) block_in(b);
+                if (ctx->sigio == 0)
+                        {
+                        if (!block_in(b))
+                                {
+                                BIO_clear_retry_flags(b);
+                                return 0;
+                                }
+                        }
 
                 /* invalid block -- cancel */
                 if (ctx->cont <= 0) break;
@@ -293,7 +307,8 @@ static int ok_write(BIO *b, const char *in, int inl)
 
         if ((ctx == NULL) || (b->next_bio == NULL) || (b->init == 0)) return(0);
 
-        if(ctx->sigio) sig_out(b);
+        if(ctx->sigio && !sig_out(b))
+                return 0;
 
         do{
                 BIO_clear_retry_flags(b);
@@ -332,7 +347,11 @@ static int ok_write(BIO *b, const char *in, int inl)
 
                 if(ctx->buf_len >= OK_BLOCK_SIZE+ OK_BLOCK_BLOCK)
                         {
-                        block_out(b);
+                        if (!block_out(b))
+                                {
+                                BIO_clear_retry_flags(b);
+                                return 0;
+                                }
                         }
         }while(inl > 0);
 
@@ -379,7 +398,8 @@ static long ok_ctrl(BIO *b, int cmd, long num, void *ptr)
         case BIO_CTRL_FLUSH:
                 /* do a final write */
                 if(ctx->blockout == 0)
-                        block_out(b);
+                        if (!block_out(b))
+                                return 0;
 
                 while (ctx->blockout)
                         {
@@ -408,7 +428,8 @@ static long ok_ctrl(BIO *b, int cmd, long num, void *ptr)
                 break;
         case BIO_C_SET_MD:
                 md=ptr;
-                EVP_DigestInit_ex(&ctx->md, md, NULL);
+                if (!EVP_DigestInit_ex(&ctx->md, md, NULL))
+                        return 0;
                 b->init=1;
                 break;
         case BIO_C_GET_MD:
@@ -455,7 +476,7 @@ static void longswap(void *_ptr, size_t len)
         }
 }
 
-static void sig_out(BIO* b)
+static int sig_out(BIO* b)
         {
         BIO_OK_CTX *ctx;
         EVP_MD_CTX *md;
@@ -463,9 +484,10 @@ static void sig_out(BIO* b)
         ctx=b->ptr;
         md=&ctx->md;
 
-        if(ctx->buf_len+ 2* md->digest->md_size > OK_BLOCK_SIZE) return;
+        if(ctx->buf_len+ 2* md->digest->md_size > OK_BLOCK_SIZE) return 1;
 
-        EVP_DigestInit_ex(md, md->digest, NULL);
+        if (!EVP_DigestInit_ex(md, md->digest, NULL))
+                goto berr;
         /* FIXME: there's absolutely no guarantee this makes any sense at all,
          * particularly now EVP_MD_CTX has been restructured.
          */
@@ -474,14 +496,20 @@ static void sig_out(BIO* b)
         longswap(&(ctx->buf[ctx->buf_len]), md->digest->md_size);
         ctx->buf_len+= md->digest->md_size;
 
-        EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN));
-        EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL);
+        if (!EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN)))
+                goto berr;
+        if (!EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL))
+                goto berr;
         ctx->buf_len+= md->digest->md_size;
         ctx->blockout= 1;
         ctx->sigio= 0;
+        return 1;
+        berr:
+        BIO_clear_retry_flags(b);
+        return 0;
         }
 
-static void sig_in(BIO* b)
+static int sig_in(BIO* b)
         {
         BIO_OK_CTX *ctx;
         EVP_MD_CTX *md;
@@ -491,15 +519,18 @@ static void sig_in(BIO* b)
         ctx=b->ptr;
         md=&ctx->md;
 
-        if((int)(ctx->buf_len-ctx->buf_off) < 2*md->digest->md_size) return;
+        if((int)(ctx->buf_len-ctx->buf_off) < 2*md->digest->md_size) return 1;
 
-        EVP_DigestInit_ex(md, md->digest, NULL);
+        if (!EVP_DigestInit_ex(md, md->digest, NULL))
+                goto berr;
         memcpy(md->md_data, &(ctx->buf[ctx->buf_off]), md->digest->md_size);
         longswap(md->md_data, md->digest->md_size);
         ctx->buf_off+= md->digest->md_size;
 
-        EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN));
-        EVP_DigestFinal_ex(md, tmp, NULL);
+        if (!EVP_DigestUpdate(md, WELLKNOWN, strlen(WELLKNOWN)))
+                goto berr;
+        if (!EVP_DigestFinal_ex(md, tmp, NULL))
+                goto berr;
         ret= memcmp(&(ctx->buf[ctx->buf_off]), tmp, md->digest->md_size) == 0;
         ctx->buf_off+= md->digest->md_size;
         if(ret == 1)
@@ -516,9 +547,13 @@ static void sig_in(BIO* b)
                 {
                 ctx->cont= 0;
                 }
+        return 1;
+        berr:
+        BIO_clear_retry_flags(b);
+        return 0;
         }
 
-static void block_out(BIO* b)
+static int block_out(BIO* b)
         {
         BIO_OK_CTX *ctx;
         EVP_MD_CTX *md;
@@ -532,13 +567,20 @@ static void block_out(BIO* b)
         ctx->buf[1]=(unsigned char)(tl>>16);
         ctx->buf[2]=(unsigned char)(tl>>8);
         ctx->buf[3]=(unsigned char)(tl);
-        EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl);
-        EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL);
+        if (!EVP_DigestUpdate(md,
+                (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl))
+                goto berr;
+        if (!EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL))
+                goto berr;
         ctx->buf_len+= md->digest->md_size;
         ctx->blockout= 1;
+        return 1;
+        berr:
+        BIO_clear_retry_flags(b);
+        return 0;
         }
 
-static void block_in(BIO* b)
+static int block_in(BIO* b)
         {
         BIO_OK_CTX *ctx;
         EVP_MD_CTX *md;
@@ -554,10 +596,13 @@ static void block_in(BIO* b)
         tl|=ctx->buf[2]; tl<<=8;
         tl|=ctx->buf[3];
 
-        if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return;
+        if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return 1;
  
-        EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl);
-        EVP_DigestFinal_ex(md, tmp, NULL);
+        if (!EVP_DigestUpdate(md,
+                        (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl))
+                goto berr;
+        if (!EVP_DigestFinal_ex(md, tmp, NULL))
+                goto berr;
         if(memcmp(&(ctx->buf[tl+ OK_BLOCK_BLOCK]), tmp, md->digest->md_size) == 0)
                 {
                 /* there might be parts from next block lurking around ! */
@@ -571,5 +616,9 @@ static void block_in(BIO* b)
                 {
                 ctx->cont= 0;
                 }
+        return 1;
+        berr:
+        BIO_clear_retry_flags(b);
+        return 0;
         }
 
diff --git a/src/lib/libssl/src/crypto/evp/c_allc.c b/src/lib/libssl/src/crypto/evp/c_allc.c
index c5f9268378..2a45d435e5 100644
--- a/src/lib/libssl/src/crypto/evp/c_allc.c
+++ b/src/lib/libssl/src/crypto/evp/c_allc.c
@@ -98,6 +98,9 @@ void OpenSSL_add_all_ciphers(void)
 #ifndef OPENSSL_NO_RC4
         EVP_add_cipher(EVP_rc4());
         EVP_add_cipher(EVP_rc4_40());
+#ifndef OPENSSL_NO_MD5
+        EVP_add_cipher(EVP_rc4_hmac_md5());
+#endif
 #endif
 
 #ifndef OPENSSL_NO_IDEA
@@ -166,9 +169,9 @@ void OpenSSL_add_all_ciphers(void)
         EVP_add_cipher(EVP_aes_128_cfb1());
         EVP_add_cipher(EVP_aes_128_cfb8());
         EVP_add_cipher(EVP_aes_128_ofb());
-#if 0
         EVP_add_cipher(EVP_aes_128_ctr());
-#endif
+        EVP_add_cipher(EVP_aes_128_gcm());
+        EVP_add_cipher(EVP_aes_128_xts());
         EVP_add_cipher_alias(SN_aes_128_cbc,"AES128");
         EVP_add_cipher_alias(SN_aes_128_cbc,"aes128");
         EVP_add_cipher(EVP_aes_192_ecb());
@@ -177,9 +180,8 @@ void OpenSSL_add_all_ciphers(void)
         EVP_add_cipher(EVP_aes_192_cfb1());
         EVP_add_cipher(EVP_aes_192_cfb8());
         EVP_add_cipher(EVP_aes_192_ofb());
-#if 0
         EVP_add_cipher(EVP_aes_192_ctr());
-#endif
+        EVP_add_cipher(EVP_aes_192_gcm());
         EVP_add_cipher_alias(SN_aes_192_cbc,"AES192");
         EVP_add_cipher_alias(SN_aes_192_cbc,"aes192");
         EVP_add_cipher(EVP_aes_256_ecb());
@@ -188,11 +190,15 @@ void OpenSSL_add_all_ciphers(void)
         EVP_add_cipher(EVP_aes_256_cfb1());
         EVP_add_cipher(EVP_aes_256_cfb8());
         EVP_add_cipher(EVP_aes_256_ofb());
-#if 0
         EVP_add_cipher(EVP_aes_256_ctr());
-#endif
+        EVP_add_cipher(EVP_aes_256_gcm());
+        EVP_add_cipher(EVP_aes_256_xts());
         EVP_add_cipher_alias(SN_aes_256_cbc,"AES256");
         EVP_add_cipher_alias(SN_aes_256_cbc,"aes256");
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
+        EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
+        EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
+#endif
 #endif
 
 #ifndef OPENSSL_NO_CAMELLIA
diff --git a/src/lib/libssl/src/crypto/evp/digest.c b/src/lib/libssl/src/crypto/evp/digest.c
index 982ba2b136..467e6b5ae9 100644
--- a/src/lib/libssl/src/crypto/evp/digest.c
+++ b/src/lib/libssl/src/crypto/evp/digest.c
@@ -117,6 +117,10 @@
 #include <openssl/engine.h>
 #endif
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 void EVP_MD_CTX_init(EVP_MD_CTX *ctx)
         {
         memset(ctx,'\0',sizeof *ctx);
@@ -225,12 +229,26 @@ skip_to_init:
                 }
         if (ctx->flags & EVP_MD_CTX_FLAG_NO_INIT)
                 return 1;
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode())
+                {
+                if (FIPS_digestinit(ctx, type))
+                        return 1;
+                OPENSSL_free(ctx->md_data);
+                ctx->md_data = NULL;
+                return 0;
+                }
+#endif
         return ctx->digest->init(ctx);
         }
 
 int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *data, size_t count)
         {
+#ifdef OPENSSL_FIPS
+        return FIPS_digestupdate(ctx, data, count);
+#else
         return ctx->update(ctx,data,count);
+#endif
         }
 
 /* The caller can assume that this removes any secret data from the context */
@@ -245,8 +263,10 @@ int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
 /* The caller can assume that this removes any secret data from the context */
 int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
         {
+#ifdef OPENSSL_FIPS
+        return FIPS_digestfinal(ctx, md, size);
+#else
         int ret;
-
         OPENSSL_assert(ctx->digest->md_size <= EVP_MAX_MD_SIZE);
         ret=ctx->digest->final(ctx,md);
         if (size != NULL)
@@ -258,6 +278,7 @@ int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *size)
                 }
         memset(ctx->md_data,0,ctx->digest->ctx_size);
         return ret;
+#endif
         }
 
 int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in)
@@ -351,6 +372,7 @@ void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
 /* This call frees resources associated with the context */
 int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
         {
+#ifndef OPENSSL_FIPS
         /* Don't assume ctx->md_data was cleaned in EVP_Digest_Final,
          * because sometimes only copies of the context are ever finalised.
          */
@@ -363,6 +385,7 @@ int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
                 OPENSSL_cleanse(ctx->md_data,ctx->digest->ctx_size);
                 OPENSSL_free(ctx->md_data);
                 }
+#endif
         if (ctx->pctx)
                 EVP_PKEY_CTX_free(ctx->pctx);
 #ifndef OPENSSL_NO_ENGINE
@@ -371,6 +394,9 @@ int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
                  * functional reference we held for this reason. */
                 ENGINE_finish(ctx->engine);
 #endif
+#ifdef OPENSSL_FIPS
+        FIPS_md_ctx_cleanup(ctx);
+#endif
         memset(ctx,'\0',sizeof *ctx);
 
         return 1;
diff --git a/src/lib/libssl/src/crypto/evp/e_aes.c b/src/lib/libssl/src/crypto/evp/e_aes.c
index bd6c0a3a62..1e4af0cb75 100644
--- a/src/lib/libssl/src/crypto/evp/e_aes.c
+++ b/src/lib/libssl/src/crypto/evp/e_aes.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2001-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
@@ -56,57 +56,511 @@
 #include <assert.h>
 #include <openssl/aes.h>
 #include "evp_locl.h"
-
-static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                                        const unsigned char *iv, int enc);
+#ifndef OPENSSL_FIPS
+#include "modes_lcl.h"
+#include <openssl/rand.h>
 
 typedef struct
         {
         AES_KEY ks;
+        block128_f block;
+        union {
+                cbc128_f cbc;
+                ctr128_f ctr;
+        } stream;
         } EVP_AES_KEY;
 
-#define data(ctx)       EVP_C_DATA(EVP_AES_KEY,ctx)
-
-IMPLEMENT_BLOCK_CIPHER(aes_128, ks, AES, EVP_AES_KEY,
-                       NID_aes_128, 16, 16, 16, 128,
-                       0, aes_init_key, NULL, 
-                       EVP_CIPHER_set_asn1_iv,
-                       EVP_CIPHER_get_asn1_iv,
-                       NULL)
-IMPLEMENT_BLOCK_CIPHER(aes_192, ks, AES, EVP_AES_KEY,
-                       NID_aes_192, 16, 24, 16, 128,
-                       0, aes_init_key, NULL, 
-                       EVP_CIPHER_set_asn1_iv,
-                       EVP_CIPHER_get_asn1_iv,
-                       NULL)
-IMPLEMENT_BLOCK_CIPHER(aes_256, ks, AES, EVP_AES_KEY,
-                       NID_aes_256, 16, 32, 16, 128,
-                       0, aes_init_key, NULL, 
-                       EVP_CIPHER_set_asn1_iv,
-                       EVP_CIPHER_get_asn1_iv,
-                       NULL)
-
-#define IMPLEMENT_AES_CFBR(ksize,cbits) IMPLEMENT_CFBR(aes,AES,EVP_AES_KEY,ks,ksize,cbits,16)
-
-IMPLEMENT_AES_CFBR(128,1)
-IMPLEMENT_AES_CFBR(192,1)
-IMPLEMENT_AES_CFBR(256,1)
-
-IMPLEMENT_AES_CFBR(128,8)
-IMPLEMENT_AES_CFBR(192,8)
-IMPLEMENT_AES_CFBR(256,8)
+typedef struct
+        {
+        AES_KEY ks;             /* AES key schedule to use */
+        int key_set;            /* Set if key initialised */
+        int iv_set;             /* Set if an iv is set */
+        GCM128_CONTEXT gcm;
+        unsigned char *iv;      /* Temporary IV store */
+        int ivlen;              /* IV length */
+        int taglen;
+        int iv_gen;             /* It is OK to generate IVs */
+        int tls_aad_len;        /* TLS AAD length */
+        ctr128_f ctr;
+        } EVP_AES_GCM_CTX;
+
+typedef struct
+        {
+        AES_KEY ks1, ks2;       /* AES key schedules to use */
+        XTS128_CONTEXT xts;
+        void     (*stream)(const unsigned char *in,
+                        unsigned char *out, size_t length,
+                        const AES_KEY *key1, const AES_KEY *key2,
+                        const unsigned char iv[16]);
+        } EVP_AES_XTS_CTX;
+
+typedef struct
+        {
+        AES_KEY ks;             /* AES key schedule to use */
+        int key_set;            /* Set if key initialised */
+        int iv_set;             /* Set if an iv is set */
+        int tag_set;            /* Set if tag is valid */
+        int len_set;            /* Set if message length set */
+        int L, M;               /* L and M parameters from RFC3610 */
+        CCM128_CONTEXT ccm;
+        ccm128_f str;
+        } EVP_AES_CCM_CTX;
+
+#define MAXBITCHUNK     ((size_t)1<<(sizeof(size_t)*8-4))
+
+#ifdef VPAES_ASM
+int vpaes_set_encrypt_key(const unsigned char *userKey, int bits,
+                        AES_KEY *key);
+int vpaes_set_decrypt_key(const unsigned char *userKey, int bits,
+                        AES_KEY *key);
+
+void vpaes_encrypt(const unsigned char *in, unsigned char *out,
+                        const AES_KEY *key);
+void vpaes_decrypt(const unsigned char *in, unsigned char *out,
+                        const AES_KEY *key);
+
+void vpaes_cbc_encrypt(const unsigned char *in,
+                        unsigned char *out,
+                        size_t length,
+                        const AES_KEY *key,
+                        unsigned char *ivec, int enc);
+#endif
+#ifdef BSAES_ASM
+void bsaes_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                        size_t length, const AES_KEY *key,
+                        unsigned char ivec[16], int enc);
+void bsaes_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
+                        size_t len, const AES_KEY *key,
+                        const unsigned char ivec[16]);
+void bsaes_xts_encrypt(const unsigned char *inp, unsigned char *out,
+                        size_t len, const AES_KEY *key1,
+                        const AES_KEY *key2, const unsigned char iv[16]);
+void bsaes_xts_decrypt(const unsigned char *inp, unsigned char *out,
+                        size_t len, const AES_KEY *key1,
+                        const AES_KEY *key2, const unsigned char iv[16]);
+#endif
+#ifdef AES_CTR_ASM
+void AES_ctr32_encrypt(const unsigned char *in, unsigned char *out,
+                        size_t blocks, const AES_KEY *key,
+                        const unsigned char ivec[AES_BLOCK_SIZE]);
+#endif
+#ifdef AES_XTS_ASM
+void AES_xts_encrypt(const char *inp,char *out,size_t len,
+                        const AES_KEY *key1, const AES_KEY *key2,
+                        const unsigned char iv[16]);
+void AES_xts_decrypt(const char *inp,char *out,size_t len,
+                        const AES_KEY *key1, const AES_KEY *key2,
+                        const unsigned char iv[16]);
+#endif
+
+#if     defined(AES_ASM) && !defined(I386_ONLY) &&      (  \
+        ((defined(__i386)       || defined(__i386__)    || \
+          defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \
+        defined(__x86_64)       || defined(__x86_64__)  || \
+        defined(_M_AMD64)       || defined(_M_X64)      || \
+        defined(__INTEL__)                              )
+
+extern unsigned int OPENSSL_ia32cap_P[2];
+
+#ifdef VPAES_ASM
+#define VPAES_CAPABLE   (OPENSSL_ia32cap_P[1]&(1<<(41-32)))
+#endif
+#ifdef BSAES_ASM
+#define BSAES_CAPABLE   VPAES_CAPABLE
+#endif
+/*
+ * AES-NI section
+ */
+#define AESNI_CAPABLE   (OPENSSL_ia32cap_P[1]&(1<<(57-32)))
+
+int aesni_set_encrypt_key(const unsigned char *userKey, int bits,
+                        AES_KEY *key);
+int aesni_set_decrypt_key(const unsigned char *userKey, int bits,
+                        AES_KEY *key);
+
+void aesni_encrypt(const unsigned char *in, unsigned char *out,
+                        const AES_KEY *key);
+void aesni_decrypt(const unsigned char *in, unsigned char *out,
+                        const AES_KEY *key);
+
+void aesni_ecb_encrypt(const unsigned char *in,
+                        unsigned char *out,
+                        size_t length,
+                        const AES_KEY *key,
+                        int enc);
+void aesni_cbc_encrypt(const unsigned char *in,
+                        unsigned char *out,
+                        size_t length,
+                        const AES_KEY *key,
+                        unsigned char *ivec, int enc);
+
+void aesni_ctr32_encrypt_blocks(const unsigned char *in,
+                        unsigned char *out,
+                        size_t blocks,
+                        const void *key,
+                        const unsigned char *ivec);
+
+void aesni_xts_encrypt(const unsigned char *in,
+                        unsigned char *out,
+                        size_t length,
+                        const AES_KEY *key1, const AES_KEY *key2,
+                        const unsigned char iv[16]);
+
+void aesni_xts_decrypt(const unsigned char *in,
+                        unsigned char *out,
+                        size_t length,
+                        const AES_KEY *key1, const AES_KEY *key2,
+                        const unsigned char iv[16]);
+
+void aesni_ccm64_encrypt_blocks (const unsigned char *in,
+                        unsigned char *out,
+                        size_t blocks,
+                        const void *key,
+                        const unsigned char ivec[16],
+                        unsigned char cmac[16]);
+
+void aesni_ccm64_decrypt_blocks (const unsigned char *in,
+                        unsigned char *out,
+                        size_t blocks,
+                        const void *key,
+                        const unsigned char ivec[16],
+                        unsigned char cmac[16]);
+
+static int aesni_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                   const unsigned char *iv, int enc)
+        {
+        int ret, mode;
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+        mode = ctx->cipher->flags & EVP_CIPH_MODE;
+        if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
+            && !enc)
+                { 
+                ret = aesni_set_decrypt_key(key, ctx->key_len*8, ctx->cipher_data);
+                dat->block      = (block128_f)aesni_decrypt;
+                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
+                                        (cbc128_f)aesni_cbc_encrypt :
+                                        NULL;
+                }
+        else    {
+                ret = aesni_set_encrypt_key(key, ctx->key_len*8, ctx->cipher_data);
+                dat->block      = (block128_f)aesni_encrypt;
+                if (mode==EVP_CIPH_CBC_MODE)
+                        dat->stream.cbc = (cbc128_f)aesni_cbc_encrypt;
+                else if (mode==EVP_CIPH_CTR_MODE)
+                        dat->stream.ctr = (ctr128_f)aesni_ctr32_encrypt_blocks;
+                else
+                        dat->stream.cbc = NULL;
+                }
+
+        if(ret < 0)
+                {
+                EVPerr(EVP_F_AESNI_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);
+                return 0;
+                }
+
+        return 1;
+        }
+
+static int aesni_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in, size_t len)
+{
+        aesni_cbc_encrypt(in,out,len,ctx->cipher_data,ctx->iv,ctx->encrypt);
+
+        return 1;
+}
+
+static int aesni_ecb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in, size_t len)
+{
+        size_t  bl = ctx->cipher->block_size;
+
+        if (len<bl)     return 1;
+
+        aesni_ecb_encrypt(in,out,len,ctx->cipher_data,ctx->encrypt);
+
+        return 1;
+}
+
+#define aesni_ofb_cipher aes_ofb_cipher
+static int aesni_ofb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in,size_t len);
+
+#define aesni_cfb_cipher aes_cfb_cipher
+static int aesni_cfb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in,size_t len);
+
+#define aesni_cfb8_cipher aes_cfb8_cipher
+static int aesni_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in,size_t len);
+
+#define aesni_cfb1_cipher aes_cfb1_cipher
+static int aesni_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in,size_t len);
+
+#define aesni_ctr_cipher aes_ctr_cipher
+static int aesni_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len);
+
+static int aesni_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+        {
+        EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
+        if (!iv && !key)
+                return 1;
+        if (key)
+                {
+                aesni_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
+                CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
+                                (block128_f)aesni_encrypt);
+                gctx->ctr = (ctr128_f)aesni_ctr32_encrypt_blocks;
+                /* If we have an iv can set it directly, otherwise use
+                 * saved IV.
+                 */
+                if (iv == NULL && gctx->iv_set)
+                        iv = gctx->iv;
+                if (iv)
+                        {
+                        CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen);
+                        gctx->iv_set = 1;
+                        }
+                gctx->key_set = 1;
+                }
+        else
+                {
+                /* If key set use IV, otherwise copy */
+                if (gctx->key_set)
+                        CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen);
+                else
+                        memcpy(gctx->iv, iv, gctx->ivlen);
+                gctx->iv_set = 1;
+                gctx->iv_gen = 0;
+                }
+        return 1;
+        }
+
+#define aesni_gcm_cipher aes_gcm_cipher
+static int aesni_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len);
+
+static int aesni_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+        {
+        EVP_AES_XTS_CTX *xctx = ctx->cipher_data;
+        if (!iv && !key)
+                return 1;
+
+        if (key)
+                {
+                /* key_len is two AES keys */
+                if (enc)
+                        {
+                        aesni_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                        xctx->xts.block1 = (block128_f)aesni_encrypt;
+                        xctx->stream = aesni_xts_encrypt;
+                        }
+                else
+                        {
+                        aesni_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                        xctx->xts.block1 = (block128_f)aesni_decrypt;
+                        xctx->stream = aesni_xts_decrypt;
+                        }
+
+                aesni_set_encrypt_key(key + ctx->key_len/2,
+                                                ctx->key_len * 4, &xctx->ks2);
+                xctx->xts.block2 = (block128_f)aesni_encrypt;
+
+                xctx->xts.key1 = &xctx->ks1;
+                }
+
+        if (iv)
+                {
+                xctx->xts.key2 = &xctx->ks2;
+                memcpy(ctx->iv, iv, 16);
+                }
+
+        return 1;
+        }
+
+#define aesni_xts_cipher aes_xts_cipher
+static int aesni_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len);
+
+static int aesni_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+        {
+        EVP_AES_CCM_CTX *cctx = ctx->cipher_data;
+        if (!iv && !key)
+                return 1;
+        if (key)
+                {
+                aesni_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks);
+                CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
+                                        &cctx->ks, (block128_f)aesni_encrypt);
+                cctx->str = enc?(ccm128_f)aesni_ccm64_encrypt_blocks :
+                                (ccm128_f)aesni_ccm64_decrypt_blocks;
+                cctx->key_set = 1;
+                }
+        if (iv)
+                {
+                memcpy(ctx->iv, iv, 15 - cctx->L);
+                cctx->iv_set = 1;
+                }
+        return 1;
+        }
+
+#define aesni_ccm_cipher aes_ccm_cipher
+static int aesni_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len);
+
+#define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
+static const EVP_CIPHER aesni_##keylen##_##mode = { \
+        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
+        flags|EVP_CIPH_##MODE##_MODE,   \
+        aesni_init_key,                 \
+        aesni_##mode##_cipher,          \
+        NULL,                           \
+        sizeof(EVP_AES_KEY),            \
+        NULL,NULL,NULL,NULL }; \
+static const EVP_CIPHER aes_##keylen##_##mode = { \
+        nid##_##keylen##_##nmode,blocksize,     \
+        keylen/8,ivlen, \
+        flags|EVP_CIPH_##MODE##_MODE,   \
+        aes_init_key,                   \
+        aes_##mode##_cipher,            \
+        NULL,                           \
+        sizeof(EVP_AES_KEY),            \
+        NULL,NULL,NULL,NULL }; \
+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+{ return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
+
+#define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
+static const EVP_CIPHER aesni_##keylen##_##mode = { \
+        nid##_##keylen##_##mode,blocksize, \
+        (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \
+        flags|EVP_CIPH_##MODE##_MODE,   \
+        aesni_##mode##_init_key,        \
+        aesni_##mode##_cipher,          \
+        aes_##mode##_cleanup,           \
+        sizeof(EVP_AES_##MODE##_CTX),   \
+        NULL,NULL,aes_##mode##_ctrl,NULL }; \
+static const EVP_CIPHER aes_##keylen##_##mode = { \
+        nid##_##keylen##_##mode,blocksize, \
+        (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \
+        flags|EVP_CIPH_##MODE##_MODE,   \
+        aes_##mode##_init_key,          \
+        aes_##mode##_cipher,            \
+        aes_##mode##_cleanup,           \
+        sizeof(EVP_AES_##MODE##_CTX),   \
+        NULL,NULL,aes_##mode##_ctrl,NULL }; \
+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+{ return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
+
+#else
+
+#define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
+static const EVP_CIPHER aes_##keylen##_##mode = { \
+        nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
+        flags|EVP_CIPH_##MODE##_MODE,   \
+        aes_init_key,                   \
+        aes_##mode##_cipher,            \
+        NULL,                           \
+        sizeof(EVP_AES_KEY),            \
+        NULL,NULL,NULL,NULL }; \
+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+{ return &aes_##keylen##_##mode; }
+
+#define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
+static const EVP_CIPHER aes_##keylen##_##mode = { \
+        nid##_##keylen##_##mode,blocksize, \
+        (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \
+        flags|EVP_CIPH_##MODE##_MODE,   \
+        aes_##mode##_init_key,          \
+        aes_##mode##_cipher,            \
+        aes_##mode##_cleanup,           \
+        sizeof(EVP_AES_##MODE##_CTX),   \
+        NULL,NULL,aes_##mode##_ctrl,NULL }; \
+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
+{ return &aes_##keylen##_##mode; }
+#endif
+
+#define BLOCK_CIPHER_generic_pack(nid,keylen,flags)             \
+        BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)     \
+        BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)      \
+        BLOCK_CIPHER_generic(nid,keylen,1,16,ofb128,ofb,OFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
+        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb128,cfb,CFB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)   \
+        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb1,cfb1,CFB,flags)       \
+        BLOCK_CIPHER_generic(nid,keylen,1,16,cfb8,cfb8,CFB,flags)       \
+        BLOCK_CIPHER_generic(nid,keylen,1,16,ctr,ctr,CTR,flags)
 
 static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                    const unsigned char *iv, int enc)
         {
-        int ret;
+        int ret, mode;
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
 
-        if ((ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_CFB_MODE
-            || (ctx->cipher->flags & EVP_CIPH_MODE) == EVP_CIPH_OFB_MODE
-            || enc) 
-                ret=AES_set_encrypt_key(key, ctx->key_len * 8, ctx->cipher_data);
+        mode = ctx->cipher->flags & EVP_CIPH_MODE;
+        if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE)
+            && !enc)
+#ifdef BSAES_CAPABLE
+            if (BSAES_CAPABLE && mode==EVP_CIPH_CBC_MODE)
+                {
+                ret = AES_set_decrypt_key(key,ctx->key_len*8,&dat->ks);
+                dat->block      = (block128_f)AES_decrypt;
+                dat->stream.cbc = (cbc128_f)bsaes_cbc_encrypt;
+                }
+            else
+#endif
+#ifdef VPAES_CAPABLE
+            if (VPAES_CAPABLE)
+                {
+                ret = vpaes_set_decrypt_key(key,ctx->key_len*8,&dat->ks);
+                dat->block      = (block128_f)vpaes_decrypt;
+                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
+                                        (cbc128_f)vpaes_cbc_encrypt :
+                                        NULL;
+                }
+            else
+#endif
+                {
+                ret = AES_set_decrypt_key(key,ctx->key_len*8,&dat->ks);
+                dat->block      = (block128_f)AES_decrypt;
+                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
+                                        (cbc128_f)AES_cbc_encrypt :
+                                        NULL;
+                }
         else
-                ret=AES_set_decrypt_key(key, ctx->key_len * 8, ctx->cipher_data);
+#ifdef BSAES_CAPABLE
+            if (BSAES_CAPABLE && mode==EVP_CIPH_CTR_MODE)
+                {
+                ret = AES_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
+                dat->block      = (block128_f)AES_encrypt;
+                dat->stream.ctr = (ctr128_f)bsaes_ctr32_encrypt_blocks;
+                }
+            else
+#endif
+#ifdef VPAES_CAPABLE
+            if (VPAES_CAPABLE)
+                {
+                ret = vpaes_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
+                dat->block      = (block128_f)vpaes_encrypt;
+                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
+                                        (cbc128_f)vpaes_cbc_encrypt :
+                                        NULL;
+                }
+            else
+#endif
+                {
+                ret = AES_set_encrypt_key(key,ctx->key_len*8,&dat->ks);
+                dat->block      = (block128_f)AES_encrypt;
+                dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
+                                        (cbc128_f)AES_cbc_encrypt :
+                                        NULL;
+#ifdef AES_CTR_ASM
+                if (mode==EVP_CIPH_CTR_MODE)
+                        dat->stream.ctr = (ctr128_f)AES_ctr32_encrypt;
+#endif
+                }
 
         if(ret < 0)
                 {
@@ -117,4 +571,743 @@ static int aes_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         return 1;
         }
 
+static int aes_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in, size_t len)
+{
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+        if (dat->stream.cbc)
+                (*dat->stream.cbc)(in,out,len,&dat->ks,ctx->iv,ctx->encrypt);
+        else if (ctx->encrypt)
+                CRYPTO_cbc128_encrypt(in,out,len,&dat->ks,ctx->iv,dat->block);
+        else
+                CRYPTO_cbc128_encrypt(in,out,len,&dat->ks,ctx->iv,dat->block);
+
+        return 1;
+}
+
+static int aes_ecb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in, size_t len)
+{
+        size_t  bl = ctx->cipher->block_size;
+        size_t  i;
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+        if (len<bl)     return 1;
+
+        for (i=0,len-=bl;i<=len;i+=bl)
+                (*dat->block)(in+i,out+i,&dat->ks);
+
+        return 1;
+}
+
+static int aes_ofb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in,size_t len)
+{
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+        CRYPTO_ofb128_encrypt(in,out,len,&dat->ks,
+                        ctx->iv,&ctx->num,dat->block);
+        return 1;
+}
+
+static int aes_cfb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in,size_t len)
+{
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+        CRYPTO_cfb128_encrypt(in,out,len,&dat->ks,
+                        ctx->iv,&ctx->num,ctx->encrypt,dat->block);
+        return 1;
+}
+
+static int aes_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in,size_t len)
+{
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+        CRYPTO_cfb128_8_encrypt(in,out,len,&dat->ks,
+                        ctx->iv,&ctx->num,ctx->encrypt,dat->block);
+        return 1;
+}
+
+static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
+        const unsigned char *in,size_t len)
+{
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+        if (ctx->flags&EVP_CIPH_FLAG_LENGTH_BITS) {
+                CRYPTO_cfb128_1_encrypt(in,out,len,&dat->ks,
+                        ctx->iv,&ctx->num,ctx->encrypt,dat->block);
+                return 1;
+        }
+
+        while (len>=MAXBITCHUNK) {
+                CRYPTO_cfb128_1_encrypt(in,out,MAXBITCHUNK*8,&dat->ks,
+                        ctx->iv,&ctx->num,ctx->encrypt,dat->block);
+                len-=MAXBITCHUNK;
+        }
+        if (len)
+                CRYPTO_cfb128_1_encrypt(in,out,len*8,&dat->ks,
+                        ctx->iv,&ctx->num,ctx->encrypt,dat->block);
+        
+        return 1;
+}
+
+static int aes_ctr_cipher (EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len)
+{
+        unsigned int num = ctx->num;
+        EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data;
+
+        if (dat->stream.ctr)
+                CRYPTO_ctr128_encrypt_ctr32(in,out,len,&dat->ks,
+                        ctx->iv,ctx->buf,&num,dat->stream.ctr);
+        else
+                CRYPTO_ctr128_encrypt(in,out,len,&dat->ks,
+                        ctx->iv,ctx->buf,&num,dat->block);
+        ctx->num = (size_t)num;
+        return 1;
+}
+
+BLOCK_CIPHER_generic_pack(NID_aes,128,EVP_CIPH_FLAG_FIPS)
+BLOCK_CIPHER_generic_pack(NID_aes,192,EVP_CIPH_FLAG_FIPS)
+BLOCK_CIPHER_generic_pack(NID_aes,256,EVP_CIPH_FLAG_FIPS)
+
+static int aes_gcm_cleanup(EVP_CIPHER_CTX *c)
+        {
+        EVP_AES_GCM_CTX *gctx = c->cipher_data;
+        OPENSSL_cleanse(&gctx->gcm, sizeof(gctx->gcm));
+        if (gctx->iv != c->iv)
+                OPENSSL_free(gctx->iv);
+        return 1;
+        }
+
+/* increment counter (64-bit int) by 1 */
+static void ctr64_inc(unsigned char *counter) {
+        int n=8;
+        unsigned char  c;
+
+        do {
+                --n;
+                c = counter[n];
+                ++c;
+                counter[n] = c;
+                if (c) return;
+        } while (n);
+}
+
+static int aes_gcm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
+        {
+        EVP_AES_GCM_CTX *gctx = c->cipher_data;
+        switch (type)
+                {
+        case EVP_CTRL_INIT:
+                gctx->key_set = 0;
+                gctx->iv_set = 0;
+                gctx->ivlen = c->cipher->iv_len;
+                gctx->iv = c->iv;
+                gctx->taglen = -1;
+                gctx->iv_gen = 0;
+                gctx->tls_aad_len = -1;
+                return 1;
+
+        case EVP_CTRL_GCM_SET_IVLEN:
+                if (arg <= 0)
+                        return 0;
+#ifdef OPENSSL_FIPS
+                if (FIPS_module_mode() && !(c->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW)
+                                                 && arg < 12)
+                        return 0;
+#endif
+                /* Allocate memory for IV if needed */
+                if ((arg > EVP_MAX_IV_LENGTH) && (arg > gctx->ivlen))
+                        {
+                        if (gctx->iv != c->iv)
+                                OPENSSL_free(gctx->iv);
+                        gctx->iv = OPENSSL_malloc(arg);
+                        if (!gctx->iv)
+                                return 0;
+                        }
+                gctx->ivlen = arg;
+                return 1;
+
+        case EVP_CTRL_GCM_SET_TAG:
+                if (arg <= 0 || arg > 16 || c->encrypt)
+                        return 0;
+                memcpy(c->buf, ptr, arg);
+                gctx->taglen = arg;
+                return 1;
+
+        case EVP_CTRL_GCM_GET_TAG:
+                if (arg <= 0 || arg > 16 || !c->encrypt || gctx->taglen < 0)
+                        return 0;
+                memcpy(ptr, c->buf, arg);
+                return 1;
+
+        case EVP_CTRL_GCM_SET_IV_FIXED:
+                /* Special case: -1 length restores whole IV */
+                if (arg == -1)
+                        {
+                        memcpy(gctx->iv, ptr, gctx->ivlen);
+                        gctx->iv_gen = 1;
+                        return 1;
+                        }
+                /* Fixed field must be at least 4 bytes and invocation field
+                 * at least 8.
+                 */
+                if ((arg < 4) || (gctx->ivlen - arg) < 8)
+                        return 0;
+                if (arg)
+                        memcpy(gctx->iv, ptr, arg);
+                if (c->encrypt &&
+                        RAND_bytes(gctx->iv + arg, gctx->ivlen - arg) <= 0)
+                        return 0;
+                gctx->iv_gen = 1;
+                return 1;
+
+        case EVP_CTRL_GCM_IV_GEN:
+                if (gctx->iv_gen == 0 || gctx->key_set == 0)
+                        return 0;
+                CRYPTO_gcm128_setiv(&gctx->gcm, gctx->iv, gctx->ivlen);
+                if (arg <= 0 || arg > gctx->ivlen)
+                        arg = gctx->ivlen;
+                memcpy(ptr, gctx->iv + gctx->ivlen - arg, arg);
+                /* Invocation field will be at least 8 bytes in size and
+                 * so no need to check wrap around or increment more than
+                 * last 8 bytes.
+                 */
+                ctr64_inc(gctx->iv + gctx->ivlen - 8);
+                gctx->iv_set = 1;
+                return 1;
+
+        case EVP_CTRL_GCM_SET_IV_INV:
+                if (gctx->iv_gen == 0 || gctx->key_set == 0 || c->encrypt)
+                        return 0;
+                memcpy(gctx->iv + gctx->ivlen - arg, ptr, arg);
+                CRYPTO_gcm128_setiv(&gctx->gcm, gctx->iv, gctx->ivlen);
+                gctx->iv_set = 1;
+                return 1;
+
+        case EVP_CTRL_AEAD_TLS1_AAD:
+                /* Save the AAD for later use */
+                if (arg != 13)
+                        return 0;
+                memcpy(c->buf, ptr, arg);
+                gctx->tls_aad_len = arg;
+                        {
+                        unsigned int len=c->buf[arg-2]<<8|c->buf[arg-1];
+                        /* Correct length for explicit IV */
+                        len -= EVP_GCM_TLS_EXPLICIT_IV_LEN;
+                        /* If decrypting correct for tag too */
+                        if (!c->encrypt)
+                                len -= EVP_GCM_TLS_TAG_LEN;
+                        c->buf[arg-2] = len>>8;
+                        c->buf[arg-1] = len & 0xff;
+                        }
+                /* Extra padding: tag appended to record */
+                return EVP_GCM_TLS_TAG_LEN;
+
+        default:
+                return -1;
+
+                }
+        }
+
+static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+        {
+        EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
+        if (!iv && !key)
+                return 1;
+        if (key)
+                { do {
+#ifdef BSAES_CAPABLE
+                if (BSAES_CAPABLE)
+                        {
+                        AES_set_encrypt_key(key,ctx->key_len*8,&gctx->ks);
+                        CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks,
+                                        (block128_f)AES_encrypt);
+                        gctx->ctr = (ctr128_f)bsaes_ctr32_encrypt_blocks;
+                        break;
+                        }
+                else
+#endif
+#ifdef VPAES_CAPABLE
+                if (VPAES_CAPABLE)
+                        {
+                        vpaes_set_encrypt_key(key,ctx->key_len*8,&gctx->ks);
+                        CRYPTO_gcm128_init(&gctx->gcm,&gctx->ks,
+                                        (block128_f)vpaes_encrypt);
+                        gctx->ctr = NULL;
+                        break;
+                        }
+#endif
+                AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
+                CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)AES_encrypt);
+#ifdef AES_CTR_ASM
+                gctx->ctr = (ctr128_f)AES_ctr32_encrypt;
+#else
+                gctx->ctr = NULL;
+#endif
+                } while (0);
+
+                /* If we have an iv can set it directly, otherwise use
+                 * saved IV.
+                 */
+                if (iv == NULL && gctx->iv_set)
+                        iv = gctx->iv;
+                if (iv)
+                        {
+                        CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen);
+                        gctx->iv_set = 1;
+                        }
+                gctx->key_set = 1;
+                }
+        else
+                {
+                /* If key set use IV, otherwise copy */
+                if (gctx->key_set)
+                        CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen);
+                else
+                        memcpy(gctx->iv, iv, gctx->ivlen);
+                gctx->iv_set = 1;
+                gctx->iv_gen = 0;
+                }
+        return 1;
+        }
+
+/* Handle TLS GCM packet format. This consists of the last portion of the IV
+ * followed by the payload and finally the tag. On encrypt generate IV,
+ * encrypt payload and write the tag. On verify retrieve IV, decrypt payload
+ * and verify tag.
+ */
+
+static int aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len)
+        {
+        EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
+        int rv = -1;
+        /* Encrypt/decrypt must be performed in place */
+        if (out != in || len < (EVP_GCM_TLS_EXPLICIT_IV_LEN+EVP_GCM_TLS_TAG_LEN))
+                return -1;
+        /* Set IV from start of buffer or generate IV and write to start
+         * of buffer.
+         */
+        if (EVP_CIPHER_CTX_ctrl(ctx, ctx->encrypt ?
+                                EVP_CTRL_GCM_IV_GEN : EVP_CTRL_GCM_SET_IV_INV,
+                                EVP_GCM_TLS_EXPLICIT_IV_LEN, out) <= 0)
+                goto err;
+        /* Use saved AAD */
+        if (CRYPTO_gcm128_aad(&gctx->gcm, ctx->buf, gctx->tls_aad_len))
+                goto err;
+        /* Fix buffer and length to point to payload */
+        in += EVP_GCM_TLS_EXPLICIT_IV_LEN;
+        out += EVP_GCM_TLS_EXPLICIT_IV_LEN;
+        len -= EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
+        if (ctx->encrypt)
+                {
+                /* Encrypt payload */
+                if (gctx->ctr)
+                        {
+                        if (CRYPTO_gcm128_encrypt_ctr32(&gctx->gcm,
+                                                        in, out, len,
+                                                        gctx->ctr))
+                                goto err;
+                        }
+                else    {
+                        if (CRYPTO_gcm128_encrypt(&gctx->gcm, in, out, len))
+                                goto err;
+                        }
+                out += len;
+                /* Finally write tag */
+                CRYPTO_gcm128_tag(&gctx->gcm, out, EVP_GCM_TLS_TAG_LEN);
+                rv = len + EVP_GCM_TLS_EXPLICIT_IV_LEN + EVP_GCM_TLS_TAG_LEN;
+                }
+        else
+                {
+                /* Decrypt */
+                if (gctx->ctr)
+                        {
+                        if (CRYPTO_gcm128_decrypt_ctr32(&gctx->gcm,
+                                                        in, out, len,
+                                                        gctx->ctr))
+                                goto err;
+                        }
+                else    {
+                        if (CRYPTO_gcm128_decrypt(&gctx->gcm, in, out, len))
+                                goto err;
+                        }
+                /* Retrieve tag */
+                CRYPTO_gcm128_tag(&gctx->gcm, ctx->buf,
+                                        EVP_GCM_TLS_TAG_LEN);
+                /* If tag mismatch wipe buffer */
+                if (memcmp(ctx->buf, in + len, EVP_GCM_TLS_TAG_LEN))
+                        {
+                        OPENSSL_cleanse(out, len);
+                        goto err;
+                        }
+                rv = len;
+                }
+
+        err:
+        gctx->iv_set = 0;
+        gctx->tls_aad_len = -1;
+        return rv;
+        }
+
+static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len)
+        {
+        EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
+        /* If not set up, return error */
+        if (!gctx->key_set)
+                return -1;
+
+        if (gctx->tls_aad_len >= 0)
+                return aes_gcm_tls_cipher(ctx, out, in, len);
+
+        if (!gctx->iv_set)
+                return -1;
+        if (!ctx->encrypt && gctx->taglen < 0)
+                return -1;
+        if (in)
+                {
+                if (out == NULL)
+                        {
+                        if (CRYPTO_gcm128_aad(&gctx->gcm, in, len))
+                                return -1;
+                        }
+                else if (ctx->encrypt)
+                        {
+                        if (gctx->ctr)
+                                {
+                                if (CRYPTO_gcm128_encrypt_ctr32(&gctx->gcm,
+                                                        in, out, len,
+                                                        gctx->ctr))
+                                        return -1;
+                                }
+                        else    {
+                                if (CRYPTO_gcm128_encrypt(&gctx->gcm, in, out, len))
+                                        return -1;
+                                }
+                        }
+                else
+                        {
+                        if (gctx->ctr)
+                                {
+                                if (CRYPTO_gcm128_decrypt_ctr32(&gctx->gcm,
+                                                        in, out, len,
+                                                        gctx->ctr))
+                                        return -1;
+                                }
+                        else    {
+                                if (CRYPTO_gcm128_decrypt(&gctx->gcm, in, out, len))
+                                        return -1;
+                                }
+                        }
+                return len;
+                }
+        else
+                {
+                if (!ctx->encrypt)
+                        {
+                        if (CRYPTO_gcm128_finish(&gctx->gcm,
+                                        ctx->buf, gctx->taglen) != 0)
+                                return -1;
+                        gctx->iv_set = 0;
+                        return 0;
+                        }
+                CRYPTO_gcm128_tag(&gctx->gcm, ctx->buf, 16);
+                gctx->taglen = 16;
+                /* Don't reuse the IV */
+                gctx->iv_set = 0;
+                return 0;
+                }
+
+        }
+
+#define CUSTOM_FLAGS    (EVP_CIPH_FLAG_DEFAULT_ASN1 \
+                | EVP_CIPH_CUSTOM_IV | EVP_CIPH_FLAG_CUSTOM_CIPHER \
+                | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT)
+
+BLOCK_CIPHER_custom(NID_aes,128,1,12,gcm,GCM,
+                EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,192,1,12,gcm,GCM,
+                EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,256,1,12,gcm,GCM,
+                EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS)
+
+static int aes_xts_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
+        {
+        EVP_AES_XTS_CTX *xctx = c->cipher_data;
+        if (type != EVP_CTRL_INIT)
+                return -1;
+        /* key1 and key2 are used as an indicator both key and IV are set */
+        xctx->xts.key1 = NULL;
+        xctx->xts.key2 = NULL;
+        return 1;
+        }
+
+static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+        {
+        EVP_AES_XTS_CTX *xctx = ctx->cipher_data;
+        if (!iv && !key)
+                return 1;
+
+        if (key) do
+                {
+#ifdef AES_XTS_ASM
+                xctx->stream = enc ? AES_xts_encrypt : AES_xts_decrypt;
+#else
+                xctx->stream = NULL;
+#endif
+                /* key_len is two AES keys */
+#ifdef BSAES_CAPABLE
+                if (BSAES_CAPABLE)
+                        xctx->stream = enc ? bsaes_xts_encrypt : bsaes_xts_decrypt;
+                else
+#endif
+#ifdef VPAES_CAPABLE
+                if (VPAES_CAPABLE)
+                    {
+                    if (enc)
+                        {
+                        vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                        xctx->xts.block1 = (block128_f)vpaes_encrypt;
+                        }
+                    else
+                        {
+                        vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                        xctx->xts.block1 = (block128_f)vpaes_decrypt;
+                        }
+
+                vpaes_set_encrypt_key(key + ctx->key_len/2,
+                                                ctx->key_len * 4, &xctx->ks2);
+                xctx->xts.block2 = (block128_f)vpaes_encrypt;
+
+                xctx->xts.key1 = &xctx->ks1;
+                break;
+                }
+#endif
+                if (enc)
+                        {
+                        AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                        xctx->xts.block1 = (block128_f)AES_encrypt;
+                        }
+                else
+                        {
+                        AES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
+                        xctx->xts.block1 = (block128_f)AES_decrypt;
+                        }
+
+                AES_set_encrypt_key(key + ctx->key_len/2,
+                                                ctx->key_len * 4, &xctx->ks2);
+                xctx->xts.block2 = (block128_f)AES_encrypt;
+
+                xctx->xts.key1 = &xctx->ks1;
+                } while (0);
+
+        if (iv)
+                {
+                xctx->xts.key2 = &xctx->ks2;
+                memcpy(ctx->iv, iv, 16);
+                }
+
+        return 1;
+        }
+
+static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len)
+        {
+        EVP_AES_XTS_CTX *xctx = ctx->cipher_data;
+        if (!xctx->xts.key1 || !xctx->xts.key2)
+                return 0;
+        if (!out || !in || len<AES_BLOCK_SIZE)
+                return 0;
+#ifdef OPENSSL_FIPS
+        /* Requirement of SP800-38E */
+        if (FIPS_module_mode() && !(ctx->flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW) &&
+                        (len > (1UL<<20)*16))
+                {
+                EVPerr(EVP_F_AES_XTS_CIPHER, EVP_R_TOO_LARGE);
+                return 0;
+                }
+#endif
+        if (xctx->stream)
+                (*xctx->stream)(in, out, len,
+                                xctx->xts.key1, xctx->xts.key2, ctx->iv);
+        else if (CRYPTO_xts128_encrypt(&xctx->xts, ctx->iv, in, out, len,
+                                                                ctx->encrypt))
+                return 0;
+        return 1;
+        }
+
+#define aes_xts_cleanup NULL
+
+#define XTS_FLAGS       (EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \
+                         | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT)
+
+BLOCK_CIPHER_custom(NID_aes,128,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|XTS_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,256,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|XTS_FLAGS)
+
+static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
+        {
+        EVP_AES_CCM_CTX *cctx = c->cipher_data;
+        switch (type)
+                {
+        case EVP_CTRL_INIT:
+                cctx->key_set = 0;
+                cctx->iv_set = 0;
+                cctx->L = 8;
+                cctx->M = 12;
+                cctx->tag_set = 0;
+                cctx->len_set = 0;
+                return 1;
+
+        case EVP_CTRL_CCM_SET_IVLEN:
+                arg = 15 - arg;
+        case EVP_CTRL_CCM_SET_L:
+                if (arg < 2 || arg > 8)
+                        return 0;
+                cctx->L = arg;
+                return 1;
+
+        case EVP_CTRL_CCM_SET_TAG:
+                if ((arg & 1) || arg < 4 || arg > 16)
+                        return 0;
+                if ((c->encrypt && ptr) || (!c->encrypt && !ptr))
+                        return 0;
+                if (ptr)
+                        {
+                        cctx->tag_set = 1;
+                        memcpy(c->buf, ptr, arg);
+                        }
+                cctx->M = arg;
+                return 1;
+
+        case EVP_CTRL_CCM_GET_TAG:
+                if (!c->encrypt || !cctx->tag_set)
+                        return 0;
+                if(!CRYPTO_ccm128_tag(&cctx->ccm, ptr, (size_t)arg))
+                        return 0;
+                cctx->tag_set = 0;
+                cctx->iv_set = 0;
+                cctx->len_set = 0;
+                return 1;
+
+        default:
+                return -1;
+
+                }
+        }
+
+static int aes_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                        const unsigned char *iv, int enc)
+        {
+        EVP_AES_CCM_CTX *cctx = ctx->cipher_data;
+        if (!iv && !key)
+                return 1;
+        if (key) do
+                {
+#ifdef VPAES_CAPABLE
+                if (VPAES_CAPABLE)
+                        {
+                        vpaes_set_encrypt_key(key, ctx->key_len*8, &cctx->ks);
+                        CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
+                                        &cctx->ks, (block128_f)vpaes_encrypt);
+                        cctx->key_set = 1;
+                        break;
+                        }
+#endif
+                AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks);
+                CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
+                                        &cctx->ks, (block128_f)AES_encrypt);
+                cctx->str = NULL;
+                cctx->key_set = 1;
+                } while (0);
+        if (iv)
+                {
+                memcpy(ctx->iv, iv, 15 - cctx->L);
+                cctx->iv_set = 1;
+                }
+        return 1;
+        }
+
+static int aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+                const unsigned char *in, size_t len)
+        {
+        EVP_AES_CCM_CTX *cctx = ctx->cipher_data;
+        CCM128_CONTEXT *ccm = &cctx->ccm;
+        /* If not set up, return error */
+        if (!cctx->iv_set && !cctx->key_set)
+                return -1;
+        if (!ctx->encrypt && !cctx->tag_set)
+                return -1;
+        if (!out)
+                {
+                if (!in)
+                        {
+                        if (CRYPTO_ccm128_setiv(ccm, ctx->iv, 15 - cctx->L,len))
+                                return -1;
+                        cctx->len_set = 1;
+                        return len;
+                        }
+                /* If have AAD need message length */
+                if (!cctx->len_set && len)
+                        return -1;
+                CRYPTO_ccm128_aad(ccm, in, len);
+                return len;
+                }
+        /* EVP_*Final() doesn't return any data */
+        if (!in)
+                return 0;
+        /* If not set length yet do it */
+        if (!cctx->len_set)
+                {
+                if (CRYPTO_ccm128_setiv(ccm, ctx->iv, 15 - cctx->L, len))
+                        return -1;
+                cctx->len_set = 1;
+                }
+        if (ctx->encrypt)
+                {
+                if (cctx->str ? CRYPTO_ccm128_encrypt_ccm64(ccm, in, out, len,
+                                                cctx->str) :
+                                CRYPTO_ccm128_encrypt(ccm, in, out, len))
+                        return -1;
+                cctx->tag_set = 1;
+                return len;
+                }
+        else
+                {
+                int rv = -1;
+                if (cctx->str ? !CRYPTO_ccm128_decrypt_ccm64(ccm, in, out, len,
+                                                cctx->str) :
+                                !CRYPTO_ccm128_decrypt(ccm, in, out, len))
+                        {
+                        unsigned char tag[16];
+                        if (CRYPTO_ccm128_tag(ccm, tag, cctx->M))
+                                {
+                                if (!memcmp(tag, ctx->buf, cctx->M))
+                                        rv = len;
+                                }
+                        }
+                if (rv == -1)
+                        OPENSSL_cleanse(out, len);
+                cctx->iv_set = 0;
+                cctx->tag_set = 0;
+                cctx->len_set = 0;
+                return rv;
+                }
+
+        }
+
+#define aes_ccm_cleanup NULL
+
+BLOCK_CIPHER_custom(NID_aes,128,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,192,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,256,1,12,ccm,CCM,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
+
+#endif
 #endif
diff --git a/src/lib/libssl/src/crypto/evp/e_des3.c b/src/lib/libssl/src/crypto/evp/e_des3.c
index 3232cfe024..1e69972662 100644
--- a/src/lib/libssl/src/crypto/evp/e_des3.c
+++ b/src/lib/libssl/src/crypto/evp/e_des3.c
@@ -65,6 +65,8 @@
 #include <openssl/des.h>
 #include <openssl/rand.h>
 
+#ifndef OPENSSL_FIPS
+
 static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                             const unsigned char *iv,int enc);
 
@@ -311,3 +313,4 @@ const EVP_CIPHER *EVP_des_ede3(void)
         return &des_ede3_ecb;
 }
 #endif
+#endif
diff --git a/src/lib/libssl/src/crypto/evp/e_null.c b/src/lib/libssl/src/crypto/evp/e_null.c
index 7cf50e1416..f0c1f78b5f 100644
--- a/src/lib/libssl/src/crypto/evp/e_null.c
+++ b/src/lib/libssl/src/crypto/evp/e_null.c
@@ -61,6 +61,8 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
+#ifndef OPENSSL_FIPS
+
 static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
         const unsigned char *iv,int enc);
 static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
@@ -99,4 +101,4 @@ static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 memcpy((char *)out,(const char *)in,inl);
         return 1;
         }
-
+#endif
diff --git a/src/lib/libssl/src/crypto/evp/e_rc2.c b/src/lib/libssl/src/crypto/evp/e_rc2.c
index f78d781129..d4c33b58d4 100644
--- a/src/lib/libssl/src/crypto/evp/e_rc2.c
+++ b/src/lib/libssl/src/crypto/evp/e_rc2.c
@@ -183,7 +183,8 @@ static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
                 key_bits =rc2_magic_to_meth((int)num);
                 if (!key_bits)
                         return(-1);
-                if(i > 0) EVP_CipherInit_ex(c, NULL, NULL, NULL, iv, -1);
+                if(i > 0 && !EVP_CipherInit_ex(c, NULL, NULL, NULL, iv, -1))
+                        return -1;
                 EVP_CIPHER_CTX_ctrl(c, EVP_CTRL_SET_RC2_KEY_BITS, key_bits, NULL);
                 EVP_CIPHER_CTX_set_key_length(c, key_bits / 8);
                 }
diff --git a/src/lib/libssl/src/crypto/evp/e_rc4.c b/src/lib/libssl/src/crypto/evp/e_rc4.c
index 8b5175e0fd..b4f6bda82d 100644
--- a/src/lib/libssl/src/crypto/evp/e_rc4.c
+++ b/src/lib/libssl/src/crypto/evp/e_rc4.c
@@ -62,6 +62,7 @@
 #ifndef OPENSSL_NO_RC4
 
 #include <openssl/evp.h>
+#include "evp_locl.h"
 #include <openssl/objects.h>
 #include <openssl/rc4.h>
 
diff --git a/src/lib/libssl/src/crypto/evp/evp.h b/src/lib/libssl/src/crypto/evp/evp.h
index 9f9795e2d9..0d1b20a7d3 100644
--- a/src/lib/libssl/src/crypto/evp/evp.h
+++ b/src/lib/libssl/src/crypto/evp/evp.h
@@ -83,7 +83,7 @@
 #define EVP_RC5_32_12_16_KEY_SIZE       16
 */
 #define EVP_MAX_MD_SIZE                 64      /* longest known is SHA512 */
-#define EVP_MAX_KEY_LENGTH              32
+#define EVP_MAX_KEY_LENGTH              64
 #define EVP_MAX_IV_LENGTH               16
 #define EVP_MAX_BLOCK_LENGTH            32
 
@@ -116,6 +116,7 @@
 #define EVP_PKEY_DH     NID_dhKeyAgreement
 #define EVP_PKEY_EC     NID_X9_62_id_ecPublicKey
 #define EVP_PKEY_HMAC   NID_hmac
+#define EVP_PKEY_CMAC   NID_cmac
 
 #ifdef  __cplusplus
 extern "C" {
@@ -216,6 +217,8 @@ typedef int evp_verify_method(int type,const unsigned char *m,
 
 #define EVP_MD_FLAG_DIGALGID_CUSTOM             0x0018
 
+#define EVP_MD_FLAG_FIPS        0x0400 /* Note if suitable for use in FIPS mode */
+
 /* Digest ctrls */
 
 #define EVP_MD_CTRL_DIGALGID                    0x1
@@ -325,6 +328,10 @@ struct evp_cipher_st
 #define         EVP_CIPH_CBC_MODE               0x2
 #define         EVP_CIPH_CFB_MODE               0x3
 #define         EVP_CIPH_OFB_MODE               0x4
+#define         EVP_CIPH_CTR_MODE               0x5
+#define         EVP_CIPH_GCM_MODE               0x6
+#define         EVP_CIPH_CCM_MODE               0x7
+#define         EVP_CIPH_XTS_MODE               0x10001
 #define         EVP_CIPH_MODE                   0xF0007
 /* Set if variable length cipher */
 #define         EVP_CIPH_VARIABLE_LENGTH        0x8
@@ -346,6 +353,15 @@ struct evp_cipher_st
 #define         EVP_CIPH_FLAG_DEFAULT_ASN1      0x1000
 /* Buffer length in bits not bytes: CFB1 mode only */
 #define         EVP_CIPH_FLAG_LENGTH_BITS       0x2000
+/* Note if suitable for use in FIPS mode */
+#define         EVP_CIPH_FLAG_FIPS              0x4000
+/* Allow non FIPS cipher in FIPS mode */
+#define         EVP_CIPH_FLAG_NON_FIPS_ALLOW    0x8000
+/* Cipher handles any and all padding logic as well
+ * as finalisation.
+ */
+#define         EVP_CIPH_FLAG_CUSTOM_CIPHER     0x100000
+#define         EVP_CIPH_FLAG_AEAD_CIPHER       0x200000
 
 /* ctrl() values */
 
@@ -358,6 +374,34 @@ struct evp_cipher_st
 #define         EVP_CTRL_RAND_KEY               0x6
 #define         EVP_CTRL_PBE_PRF_NID            0x7
 #define         EVP_CTRL_COPY                   0x8
+#define         EVP_CTRL_GCM_SET_IVLEN          0x9
+#define         EVP_CTRL_GCM_GET_TAG            0x10
+#define         EVP_CTRL_GCM_SET_TAG            0x11
+#define         EVP_CTRL_GCM_SET_IV_FIXED       0x12
+#define         EVP_CTRL_GCM_IV_GEN             0x13
+#define         EVP_CTRL_CCM_SET_IVLEN          EVP_CTRL_GCM_SET_IVLEN
+#define         EVP_CTRL_CCM_GET_TAG            EVP_CTRL_GCM_GET_TAG
+#define         EVP_CTRL_CCM_SET_TAG            EVP_CTRL_GCM_SET_TAG
+#define         EVP_CTRL_CCM_SET_L              0x14
+#define         EVP_CTRL_CCM_SET_MSGLEN         0x15
+/* AEAD cipher deduces payload length and returns number of bytes
+ * required to store MAC and eventual padding. Subsequent call to
+ * EVP_Cipher even appends/verifies MAC.
+ */
+#define         EVP_CTRL_AEAD_TLS1_AAD          0x16
+/* Used by composite AEAD ciphers, no-op in GCM, CCM... */
+#define         EVP_CTRL_AEAD_SET_MAC_KEY       0x17
+/* Set the GCM invocation field, decrypt only */
+#define         EVP_CTRL_GCM_SET_IV_INV         0x18
+
+/* GCM TLS constants */
+/* Length of fixed part of IV derived from PRF */
+#define EVP_GCM_TLS_FIXED_IV_LEN                        4
+/* Length of explicit part of IV part of TLS records */
+#define EVP_GCM_TLS_EXPLICIT_IV_LEN                     8
+/* Length of tag for TLS */
+#define EVP_GCM_TLS_TAG_LEN                             16
+
 
 typedef struct evp_cipher_info_st
         {
@@ -375,7 +419,7 @@ struct evp_cipher_ctx_st
         unsigned char  oiv[EVP_MAX_IV_LENGTH];  /* original iv */
         unsigned char  iv[EVP_MAX_IV_LENGTH];   /* working iv */
         unsigned char buf[EVP_MAX_BLOCK_LENGTH];/* saved partial block */
-        int num;                                /* used by cfb/ofb mode */
+        int num;                                /* used by cfb/ofb/ctr mode */
 
         void *app_data;         /* application stuff */
         int key_len;            /* May change for variable length cipher */
@@ -695,6 +739,9 @@ const EVP_MD *EVP_dev_crypto_md5(void);
 #ifndef OPENSSL_NO_RC4
 const EVP_CIPHER *EVP_rc4(void);
 const EVP_CIPHER *EVP_rc4_40(void);
+#ifndef OPENSSL_NO_MD5
+const EVP_CIPHER *EVP_rc4_hmac_md5(void);
+#endif
 #endif
 #ifndef OPENSSL_NO_IDEA
 const EVP_CIPHER *EVP_idea_ecb(void);
@@ -741,9 +788,10 @@ const EVP_CIPHER *EVP_aes_128_cfb8(void);
 const EVP_CIPHER *EVP_aes_128_cfb128(void);
 # define EVP_aes_128_cfb EVP_aes_128_cfb128
 const EVP_CIPHER *EVP_aes_128_ofb(void);
-#if 0
 const EVP_CIPHER *EVP_aes_128_ctr(void);
-#endif
+const EVP_CIPHER *EVP_aes_128_gcm(void);
+const EVP_CIPHER *EVP_aes_128_ccm(void);
+const EVP_CIPHER *EVP_aes_128_xts(void);
 const EVP_CIPHER *EVP_aes_192_ecb(void);
 const EVP_CIPHER *EVP_aes_192_cbc(void);
 const EVP_CIPHER *EVP_aes_192_cfb1(void);
@@ -751,9 +799,9 @@ const EVP_CIPHER *EVP_aes_192_cfb8(void);
 const EVP_CIPHER *EVP_aes_192_cfb128(void);
 # define EVP_aes_192_cfb EVP_aes_192_cfb128
 const EVP_CIPHER *EVP_aes_192_ofb(void);
-#if 0
 const EVP_CIPHER *EVP_aes_192_ctr(void);
-#endif
+const EVP_CIPHER *EVP_aes_192_gcm(void);
+const EVP_CIPHER *EVP_aes_192_ccm(void);
 const EVP_CIPHER *EVP_aes_256_ecb(void);
 const EVP_CIPHER *EVP_aes_256_cbc(void);
 const EVP_CIPHER *EVP_aes_256_cfb1(void);
@@ -761,8 +809,13 @@ const EVP_CIPHER *EVP_aes_256_cfb8(void);
 const EVP_CIPHER *EVP_aes_256_cfb128(void);
 # define EVP_aes_256_cfb EVP_aes_256_cfb128
 const EVP_CIPHER *EVP_aes_256_ofb(void);
-#if 0
 const EVP_CIPHER *EVP_aes_256_ctr(void);
+const EVP_CIPHER *EVP_aes_256_gcm(void);
+const EVP_CIPHER *EVP_aes_256_ccm(void);
+const EVP_CIPHER *EVP_aes_256_xts(void);
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
+const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
+const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);
 #endif
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
@@ -1047,13 +1100,22 @@ void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
 #define EVP_PKEY_CTRL_CMS_DECRYPT       10
 #define EVP_PKEY_CTRL_CMS_SIGN          11
 
+#define EVP_PKEY_CTRL_CIPHER            12
+
 #define EVP_PKEY_ALG_CTRL               0x1000
 
 
 #define EVP_PKEY_FLAG_AUTOARGLEN        2
+/* Method handles all operations: don't assume any digest related
+ * defaults.
+ */
+#define EVP_PKEY_FLAG_SIGCTX_CUSTOM     4
 
 const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
 EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags);
+void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
+                                const EVP_PKEY_METHOD *meth);
+void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src);
 void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth);
 int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);
 
@@ -1071,7 +1133,7 @@ int EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx);
 void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen);
 
 EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
-                                unsigned char *key, int keylen);
+                                const unsigned char *key, int keylen);
 
 void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data);
 void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx);
@@ -1190,8 +1252,13 @@ void ERR_load_EVP_strings(void);
 /* Error codes for the EVP functions. */
 
 /* Function codes. */
+#define EVP_F_AESNI_INIT_KEY                             165
+#define EVP_F_AESNI_XTS_CIPHER                           176
 #define EVP_F_AES_INIT_KEY                               133
+#define EVP_F_AES_XTS                                    172
+#define EVP_F_AES_XTS_CIPHER                             175
 #define EVP_F_CAMELLIA_INIT_KEY                          159
+#define EVP_F_CMAC_INIT                                  173
 #define EVP_F_D2I_PKEY                                   100
 #define EVP_F_DO_SIGVER_INIT                             161
 #define EVP_F_DSAPKEY2PKCS8                              134
@@ -1246,15 +1313,24 @@ void ERR_load_EVP_strings(void);
 #define EVP_F_EVP_RIJNDAEL                               126
 #define EVP_F_EVP_SIGNFINAL                              107
 #define EVP_F_EVP_VERIFYFINAL                            108
+#define EVP_F_FIPS_CIPHERINIT                            166
+#define EVP_F_FIPS_CIPHER_CTX_COPY                       170
+#define EVP_F_FIPS_CIPHER_CTX_CTRL                       167
+#define EVP_F_FIPS_CIPHER_CTX_SET_KEY_LENGTH             171
+#define EVP_F_FIPS_DIGESTINIT                            168
+#define EVP_F_FIPS_MD_CTX_COPY                           169
+#define EVP_F_HMAC_INIT_EX                               174
 #define EVP_F_INT_CTX_NEW                                157
 #define EVP_F_PKCS5_PBE_KEYIVGEN                         117
 #define EVP_F_PKCS5_V2_PBE_KEYIVGEN                      118
+#define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN                   164
 #define EVP_F_PKCS8_SET_BROKEN                           112
 #define EVP_F_PKEY_SET_TYPE                              158
 #define EVP_F_RC2_MAGIC_TO_METH                          109
 #define EVP_F_RC5_CTRL                                   125
 
 /* Reason codes. */
+#define EVP_R_AES_IV_SETUP_FAILED                        162
 #define EVP_R_AES_KEY_SETUP_FAILED                       143
 #define EVP_R_ASN1_LIB                                   140
 #define EVP_R_BAD_BLOCK_LENGTH                           136
@@ -1272,6 +1348,7 @@ void ERR_load_EVP_strings(void);
 #define EVP_R_DECODE_ERROR                               114
 #define EVP_R_DIFFERENT_KEY_TYPES                        101
 #define EVP_R_DIFFERENT_PARAMETERS                       153
+#define EVP_R_DISABLED_FOR_FIPS                          163
 #define EVP_R_ENCODE_ERROR                               115
 #define EVP_R_EVP_PBE_CIPHERINIT_ERROR                   119
 #define EVP_R_EXPECTING_AN_RSA_KEY                       127
@@ -1303,6 +1380,7 @@ void ERR_load_EVP_strings(void);
 #define EVP_R_PRIVATE_KEY_DECODE_ERROR                   145
 #define EVP_R_PRIVATE_KEY_ENCODE_ERROR                   146
 #define EVP_R_PUBLIC_KEY_NOT_RSA                         106
+#define EVP_R_TOO_LARGE                                  164
 #define EVP_R_UNKNOWN_CIPHER                             160
 #define EVP_R_UNKNOWN_DIGEST                             161
 #define EVP_R_UNKNOWN_PBE_ALGORITHM                      121
diff --git a/src/lib/libssl/src/crypto/evp/evp_enc.c b/src/lib/libssl/src/crypto/evp/evp_enc.c
index c268d25cb4..0c54f05e6e 100644
--- a/src/lib/libssl/src/crypto/evp/evp_enc.c
+++ b/src/lib/libssl/src/crypto/evp/evp_enc.c
@@ -64,8 +64,18 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 #include "evp_locl.h"
 
+#ifdef OPENSSL_FIPS
+#define M_do_cipher(ctx, out, in, inl) FIPS_cipher(ctx, out, in, inl)
+#else
+#define M_do_cipher(ctx, out, in, inl) ctx->cipher->do_cipher(ctx, out, in, inl)
+#endif
+
+
 const char EVP_version[]="EVP" OPENSSL_VERSION_PTEXT;
 
 void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *ctx)
@@ -115,10 +125,14 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
                 /* Ensure a context left lying around from last time is cleared
                  * (the previous check attempted to avoid this if the same
                  * ENGINE and EVP_CIPHER could be used). */
-                EVP_CIPHER_CTX_cleanup(ctx);
-
-                /* Restore encrypt field: it is zeroed by cleanup */
-                ctx->encrypt = enc;
+                if (ctx->cipher)
+                        {
+                        unsigned long flags = ctx->flags;
+                        EVP_CIPHER_CTX_cleanup(ctx);
+                        /* Restore encrypt and flags */
+                        ctx->encrypt = enc;
+                        ctx->flags = flags;
+                        }
 #ifndef OPENSSL_NO_ENGINE
                 if(impl)
                         {
@@ -155,6 +169,10 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
                         ctx->engine = NULL;
 #endif
 
+#ifdef OPENSSL_FIPS
+                if (FIPS_mode())
+                        return FIPS_cipherinit(ctx, cipher, key, iv, enc);
+#endif
                 ctx->cipher=cipher;
                 if (ctx->cipher->ctx_size)
                         {
@@ -188,6 +206,10 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
 #ifndef OPENSSL_NO_ENGINE
 skip_to_init:
 #endif
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode())
+                return FIPS_cipherinit(ctx, cipher, key, iv, enc);
+#endif
         /* we assume block size is a power of 2 in *cryptUpdate */
         OPENSSL_assert(ctx->cipher->block_size == 1
             || ctx->cipher->block_size == 8
@@ -214,6 +236,13 @@ skip_to_init:
                         memcpy(ctx->iv, ctx->oiv, EVP_CIPHER_CTX_iv_length(ctx));
                         break;
 
+                        case EVP_CIPH_CTR_MODE:
+                        ctx->num = 0;
+                        /* Don't reuse IV for CTR mode */
+                        if(iv)
+                                memcpy(ctx->iv, iv, EVP_CIPHER_CTX_iv_length(ctx));
+                        break;
+
                         default:
                         return 0;
                         break;
@@ -280,6 +309,16 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
         {
         int i,j,bl;
 
+        if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)
+                {
+                i = M_do_cipher(ctx, out, in, inl);
+                if (i < 0)
+                        return 0;
+                else
+                        *outl = i;
+                return 1;
+                }
+
         if (inl <= 0)
                 {
                 *outl = 0;
@@ -288,7 +327,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
 
         if(ctx->buf_len == 0 && (inl&(ctx->block_mask)) == 0)
                 {
-                if(ctx->cipher->do_cipher(ctx,out,in,inl))
+                if(M_do_cipher(ctx,out,in,inl))
                         {
                         *outl=inl;
                         return 1;
@@ -315,7 +354,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
                         {
                         j=bl-i;
                         memcpy(&(ctx->buf[i]),in,j);
-                        if(!ctx->cipher->do_cipher(ctx,out,ctx->buf,bl)) return 0;
+                        if(!M_do_cipher(ctx,out,ctx->buf,bl)) return 0;
                         inl-=j;
                         in+=j;
                         out+=bl;
@@ -328,7 +367,7 @@ int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
         inl-=i;
         if (inl > 0)
                 {
-                if(!ctx->cipher->do_cipher(ctx,out,in,inl)) return 0;
+                if(!M_do_cipher(ctx,out,in,inl)) return 0;
                 *outl+=inl;
                 }
 
@@ -350,6 +389,16 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
         int n,ret;
         unsigned int i, b, bl;
 
+        if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)
+                {
+                ret = M_do_cipher(ctx, out, NULL, 0);
+                if (ret < 0)
+                        return 0;
+                else 
+                        *outl = ret;
+                return 1;
+                }
+
         b=ctx->cipher->block_size;
         OPENSSL_assert(b <= sizeof ctx->buf);
         if (b == 1)
@@ -372,7 +421,7 @@ int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
         n=b-bl;
         for (i=bl; i<b; i++)
                 ctx->buf[i]=n;
-        ret=ctx->cipher->do_cipher(ctx,out,ctx->buf,b);
+        ret=M_do_cipher(ctx,out,ctx->buf,b);
 
 
         if(ret)
@@ -387,6 +436,19 @@ int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
         int fix_len;
         unsigned int b;
 
+        if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)
+                {
+                fix_len = M_do_cipher(ctx, out, in, inl);
+                if (fix_len < 0)
+                        {
+                        *outl = 0;
+                        return 0;
+                        }
+                else
+                        *outl = fix_len;
+                return 1;
+                }
+
         if (inl <= 0)
                 {
                 *outl = 0;
@@ -440,8 +502,18 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
         {
         int i,n;
         unsigned int b;
-
         *outl=0;
+
+        if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER)
+                {
+                i = M_do_cipher(ctx, out, NULL, 0);
+                if (i < 0)
+                        return 0;
+                else
+                        *outl = i;
+                return 1;
+                }
+
         b=ctx->cipher->block_size;
         if (ctx->flags & EVP_CIPH_NO_PADDING)
                 {
@@ -496,6 +568,7 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
 
 int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
         {
+#ifndef OPENSSL_FIPS
         if (c->cipher != NULL)
                 {
                 if(c->cipher->cleanup && !c->cipher->cleanup(c))
@@ -506,12 +579,16 @@ int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
                 }
         if (c->cipher_data)
                 OPENSSL_free(c->cipher_data);
+#endif
 #ifndef OPENSSL_NO_ENGINE
         if (c->engine)
                 /* The EVP_CIPHER we used belongs to an ENGINE, release the
                  * functional reference we held for this reason. */
                 ENGINE_finish(c->engine);
 #endif
+#ifdef OPENSSL_FIPS
+        FIPS_cipher_ctx_cleanup(c);
+#endif
         memset(c,0,sizeof(EVP_CIPHER_CTX));
         return 1;
         }
diff --git a/src/lib/libssl/src/crypto/evp/evp_err.c b/src/lib/libssl/src/crypto/evp/evp_err.c
index d8bfec0959..db0f76d59b 100644
--- a/src/lib/libssl/src/crypto/evp/evp_err.c
+++ b/src/lib/libssl/src/crypto/evp/evp_err.c
@@ -1,6 +1,6 @@
 /* crypto/evp/evp_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2008 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
@@ -70,8 +70,13 @@
 
 static ERR_STRING_DATA EVP_str_functs[]=
         {
+{ERR_FUNC(EVP_F_AESNI_INIT_KEY),        "AESNI_INIT_KEY"},
+{ERR_FUNC(EVP_F_AESNI_XTS_CIPHER),      "AESNI_XTS_CIPHER"},
 {ERR_FUNC(EVP_F_AES_INIT_KEY),  "AES_INIT_KEY"},
+{ERR_FUNC(EVP_F_AES_XTS),       "AES_XTS"},
+{ERR_FUNC(EVP_F_AES_XTS_CIPHER),        "AES_XTS_CIPHER"},
 {ERR_FUNC(EVP_F_CAMELLIA_INIT_KEY),     "CAMELLIA_INIT_KEY"},
+{ERR_FUNC(EVP_F_CMAC_INIT),     "CMAC_INIT"},
 {ERR_FUNC(EVP_F_D2I_PKEY),      "D2I_PKEY"},
 {ERR_FUNC(EVP_F_DO_SIGVER_INIT),        "DO_SIGVER_INIT"},
 {ERR_FUNC(EVP_F_DSAPKEY2PKCS8), "DSAPKEY2PKCS8"},
@@ -86,7 +91,7 @@ static ERR_STRING_DATA EVP_str_functs[]=
 {ERR_FUNC(EVP_F_EVP_DIGESTINIT_EX),     "EVP_DigestInit_ex"},
 {ERR_FUNC(EVP_F_EVP_ENCRYPTFINAL_EX),   "EVP_EncryptFinal_ex"},
 {ERR_FUNC(EVP_F_EVP_MD_CTX_COPY_EX),    "EVP_MD_CTX_copy_ex"},
-{ERR_FUNC(EVP_F_EVP_MD_SIZE),   "EVP_MD_SIZE"},
+{ERR_FUNC(EVP_F_EVP_MD_SIZE),   "EVP_MD_size"},
 {ERR_FUNC(EVP_F_EVP_OPENINIT),  "EVP_OpenInit"},
 {ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD),       "EVP_PBE_alg_add"},
 {ERR_FUNC(EVP_F_EVP_PBE_ALG_ADD_TYPE),  "EVP_PBE_alg_add_type"},
@@ -126,9 +131,17 @@ static ERR_STRING_DATA EVP_str_functs[]=
 {ERR_FUNC(EVP_F_EVP_RIJNDAEL),  "EVP_RIJNDAEL"},
 {ERR_FUNC(EVP_F_EVP_SIGNFINAL), "EVP_SignFinal"},
 {ERR_FUNC(EVP_F_EVP_VERIFYFINAL),       "EVP_VerifyFinal"},
+{ERR_FUNC(EVP_F_FIPS_CIPHERINIT),       "FIPS_CIPHERINIT"},
+{ERR_FUNC(EVP_F_FIPS_CIPHER_CTX_COPY),  "FIPS_CIPHER_CTX_COPY"},
+{ERR_FUNC(EVP_F_FIPS_CIPHER_CTX_CTRL),  "FIPS_CIPHER_CTX_CTRL"},
+{ERR_FUNC(EVP_F_FIPS_CIPHER_CTX_SET_KEY_LENGTH),        "FIPS_CIPHER_CTX_SET_KEY_LENGTH"},
+{ERR_FUNC(EVP_F_FIPS_DIGESTINIT),       "FIPS_DIGESTINIT"},
+{ERR_FUNC(EVP_F_FIPS_MD_CTX_COPY),      "FIPS_MD_CTX_COPY"},
+{ERR_FUNC(EVP_F_HMAC_INIT_EX),  "HMAC_Init_ex"},
 {ERR_FUNC(EVP_F_INT_CTX_NEW),   "INT_CTX_NEW"},
 {ERR_FUNC(EVP_F_PKCS5_PBE_KEYIVGEN),    "PKCS5_PBE_keyivgen"},
 {ERR_FUNC(EVP_F_PKCS5_V2_PBE_KEYIVGEN), "PKCS5_v2_PBE_keyivgen"},
+{ERR_FUNC(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN),      "PKCS5_V2_PBKDF2_KEYIVGEN"},
 {ERR_FUNC(EVP_F_PKCS8_SET_BROKEN),      "PKCS8_set_broken"},
 {ERR_FUNC(EVP_F_PKEY_SET_TYPE), "PKEY_SET_TYPE"},
 {ERR_FUNC(EVP_F_RC2_MAGIC_TO_METH),     "RC2_MAGIC_TO_METH"},
@@ -138,6 +151,7 @@ static ERR_STRING_DATA EVP_str_functs[]=
 
 static ERR_STRING_DATA EVP_str_reasons[]=
         {
+{ERR_REASON(EVP_R_AES_IV_SETUP_FAILED)   ,"aes iv setup failed"},
 {ERR_REASON(EVP_R_AES_KEY_SETUP_FAILED)  ,"aes key setup failed"},
 {ERR_REASON(EVP_R_ASN1_LIB)              ,"asn1 lib"},
 {ERR_REASON(EVP_R_BAD_BLOCK_LENGTH)      ,"bad block length"},
@@ -155,6 +169,7 @@ static ERR_STRING_DATA EVP_str_reasons[]=
 {ERR_REASON(EVP_R_DECODE_ERROR)          ,"decode error"},
 {ERR_REASON(EVP_R_DIFFERENT_KEY_TYPES)   ,"different key types"},
 {ERR_REASON(EVP_R_DIFFERENT_PARAMETERS)  ,"different parameters"},
+{ERR_REASON(EVP_R_DISABLED_FOR_FIPS)     ,"disabled for fips"},
 {ERR_REASON(EVP_R_ENCODE_ERROR)          ,"encode error"},
 {ERR_REASON(EVP_R_EVP_PBE_CIPHERINIT_ERROR),"evp pbe cipherinit error"},
 {ERR_REASON(EVP_R_EXPECTING_AN_RSA_KEY)  ,"expecting an rsa key"},
@@ -186,6 +201,7 @@ static ERR_STRING_DATA EVP_str_reasons[]=
 {ERR_REASON(EVP_R_PRIVATE_KEY_DECODE_ERROR),"private key decode error"},
 {ERR_REASON(EVP_R_PRIVATE_KEY_ENCODE_ERROR),"private key encode error"},
 {ERR_REASON(EVP_R_PUBLIC_KEY_NOT_RSA)    ,"public key not rsa"},
+{ERR_REASON(EVP_R_TOO_LARGE)             ,"too large"},
 {ERR_REASON(EVP_R_UNKNOWN_CIPHER)        ,"unknown cipher"},
 {ERR_REASON(EVP_R_UNKNOWN_DIGEST)        ,"unknown digest"},
 {ERR_REASON(EVP_R_UNKNOWN_PBE_ALGORITHM) ,"unknown pbe algorithm"},
diff --git a/src/lib/libssl/src/crypto/evp/evp_key.c b/src/lib/libssl/src/crypto/evp/evp_key.c
index 839d6a3a16..7961fbebf2 100644
--- a/src/lib/libssl/src/crypto/evp/evp_key.c
+++ b/src/lib/libssl/src/crypto/evp/evp_key.c
@@ -120,7 +120,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
         unsigned char md_buf[EVP_MAX_MD_SIZE];
         int niv,nkey,addmd=0;
         unsigned int mds=0,i;
-
+        int rv = 0;
         nkey=type->key_len;
         niv=type->iv_len;
         OPENSSL_assert(nkey <= EVP_MAX_KEY_LENGTH);
@@ -134,17 +134,24 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
                 if (!EVP_DigestInit_ex(&c,md, NULL))
                         return 0;
                 if (addmd++)
-                        EVP_DigestUpdate(&c,&(md_buf[0]),mds);
-                EVP_DigestUpdate(&c,data,datal);
+                        if (!EVP_DigestUpdate(&c,&(md_buf[0]),mds))
+                                goto err;
+                if (!EVP_DigestUpdate(&c,data,datal))
+                        goto err;
                 if (salt != NULL)
-                        EVP_DigestUpdate(&c,salt,PKCS5_SALT_LEN);
-                EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds);
+                        if (!EVP_DigestUpdate(&c,salt,PKCS5_SALT_LEN))
+                                goto err;
+                if (!EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds))
+                        goto err;
 
                 for (i=1; i<(unsigned int)count; i++)
                         {
-                        EVP_DigestInit_ex(&c,md, NULL);
-                        EVP_DigestUpdate(&c,&(md_buf[0]),mds);
-                        EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds);
+                        if (!EVP_DigestInit_ex(&c,md, NULL))
+                                goto err;
+                        if (!EVP_DigestUpdate(&c,&(md_buf[0]),mds))
+                                goto err;
+                        if (!EVP_DigestFinal_ex(&c,&(md_buf[0]),&mds))
+                                goto err;
                         }
                 i=0;
                 if (nkey)
@@ -173,8 +180,10 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
                         }
                 if ((nkey == 0) && (niv == 0)) break;
                 }
+        rv = type->key_len;
+        err:
         EVP_MD_CTX_cleanup(&c);
         OPENSSL_cleanse(&(md_buf[0]),EVP_MAX_MD_SIZE);
-        return(type->key_len);
+        return rv;
         }
 
diff --git a/src/lib/libssl/src/crypto/evp/evp_lib.c b/src/lib/libssl/src/crypto/evp/evp_lib.c
index 40951a04f0..b180e4828a 100644
--- a/src/lib/libssl/src/crypto/evp/evp_lib.c
+++ b/src/lib/libssl/src/crypto/evp/evp_lib.c
@@ -67,6 +67,8 @@ int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
 
         if (c->cipher->set_asn1_parameters != NULL)
                 ret=c->cipher->set_asn1_parameters(c,type);
+        else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1)
+                ret=EVP_CIPHER_set_asn1_iv(c, type);
         else
                 ret=-1;
         return(ret);
@@ -78,6 +80,8 @@ int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
 
         if (c->cipher->get_asn1_parameters != NULL)
                 ret=c->cipher->get_asn1_parameters(c,type);
+        else if (c->cipher->flags & EVP_CIPH_FLAG_DEFAULT_ASN1)
+                ret=EVP_CIPHER_get_asn1_iv(c, type);
         else
                 ret=-1;
         return(ret);
diff --git a/src/lib/libssl/src/crypto/evp/evp_locl.h b/src/lib/libssl/src/crypto/evp/evp_locl.h
index 292d74c188..08c0a66d39 100644
--- a/src/lib/libssl/src/crypto/evp/evp_locl.h
+++ b/src/lib/libssl/src/crypto/evp/evp_locl.h
@@ -343,3 +343,43 @@ struct evp_pkey_method_st
         } /* EVP_PKEY_METHOD */;
 
 void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx);
+
+int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
+                             ASN1_TYPE *param,
+                             const EVP_CIPHER *c, const EVP_MD *md, int en_de);
+
+#ifdef OPENSSL_FIPS
+
+#ifdef OPENSSL_DOING_MAKEDEPEND
+#undef SHA1_Init
+#undef SHA1_Update
+#undef SHA224_Init
+#undef SHA256_Init
+#undef SHA384_Init
+#undef SHA512_Init
+#undef DES_set_key_unchecked
+#endif
+
+#define RIPEMD160_Init  private_RIPEMD160_Init
+#define WHIRLPOOL_Init  private_WHIRLPOOL_Init
+#define MD5_Init        private_MD5_Init
+#define MD4_Init        private_MD4_Init
+#define MD2_Init        private_MD2_Init
+#define MDC2_Init       private_MDC2_Init
+#define SHA_Init        private_SHA_Init
+#define SHA1_Init       private_SHA1_Init
+#define SHA224_Init     private_SHA224_Init
+#define SHA256_Init     private_SHA256_Init
+#define SHA384_Init     private_SHA384_Init
+#define SHA512_Init     private_SHA512_Init
+
+#define BF_set_key      private_BF_set_key
+#define CAST_set_key    private_CAST_set_key
+#define idea_set_encrypt_key    private_idea_set_encrypt_key
+#define SEED_set_key    private_SEED_set_key
+#define RC2_set_key     private_RC2_set_key
+#define RC4_set_key     private_RC4_set_key
+#define DES_set_key_unchecked   private_DES_set_key_unchecked
+#define Camellia_set_key        private_Camellia_set_key
+
+#endif
diff --git a/src/lib/libssl/src/crypto/evp/evp_pbe.c b/src/lib/libssl/src/crypto/evp/evp_pbe.c
index c9d932d205..f8c32d825e 100644
--- a/src/lib/libssl/src/crypto/evp/evp_pbe.c
+++ b/src/lib/libssl/src/crypto/evp/evp_pbe.c
@@ -61,6 +61,7 @@
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 #include <openssl/x509.h>
+#include "evp_locl.h"
 
 /* Password based encryption (PBE) functions */
 
@@ -87,6 +88,10 @@ static const EVP_PBE_CTL builtin_pbe[] =
         {EVP_PBE_TYPE_OUTER, NID_pbeWithSHA1AndRC2_CBC,
                         NID_rc2_64_cbc, NID_sha1, PKCS5_PBE_keyivgen},
 
+#ifndef OPENSSL_NO_HMAC
+        {EVP_PBE_TYPE_OUTER, NID_id_pbkdf2, -1, -1, PKCS5_v2_PBKDF2_keyivgen},
+#endif
+
         {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And128BitRC4,
                         NID_rc4, NID_sha1, PKCS12_PBE_keyivgen},
         {EVP_PBE_TYPE_OUTER, NID_pbe_WithSHA1And40BitRC4,
diff --git a/src/lib/libssl/src/crypto/evp/evptests.txt b/src/lib/libssl/src/crypto/evp/evptests.txt
index beb12144b6..c273707c14 100644
--- a/src/lib/libssl/src/crypto/evp/evptests.txt
+++ b/src/lib/libssl/src/crypto/evp/evptests.txt
@@ -158,6 +158,19 @@ AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7B
 AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:0
 AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:0
 
+# AES Counter test vectors from RFC3686
+aes-128-ctr:AE6852F8121067CC4BF7A5765577F39E:00000030000000000000000000000001:53696E676C6520626C6F636B206D7367:E4095D4FB7A7B3792D6175A3261311B8:1
+aes-128-ctr:7E24067817FAE0D743D6CE1F32539163:006CB6DBC0543B59DA48D90B00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28:1
+aes-128-ctr:7691BE035E5020A8AC6E618529F9A0DC:00E0017B27777F3F4A1786F000000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F:1
+
+aes-192-ctr:16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515:0000004836733C147D6D93CB00000001:53696E676C6520626C6F636B206D7367:4B55384FE259C9C84E7935A003CBE928:1
+aes-192-ctr:7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A:0096B03B020C6EADC2CB500D00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:453243FC609B23327EDFAAFA7131CD9F8490701C5AD4A79CFC1FE0FF42F4FB00:1
+aes-192-ctr:02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE:0007BDFD5CBD60278DCC091200000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:96893FC55E5C722F540B7DD1DDF7E758D288BC95C69165884536C811662F2188ABEE0935:1
+
+aes-256-ctr:776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104:00000060DB5672C97AA8F0B200000001:53696E676C6520626C6F636B206D7367:145AD01DBF824EC7560863DC71E3E0C0:1
+aes-256-ctr:F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884:00FAAC24C1585EF15A43D87500000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C:1
+aes-256-ctr:FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D:001CC5B751A51D70A1C1114800000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8:1
+
 # DES ECB tests (from destest)
 
 DES-ECB:0000000000000000::0000000000000000:8CA64DE9C1B123A7
diff --git a/src/lib/libssl/src/crypto/evp/m_dss.c b/src/lib/libssl/src/crypto/evp/m_dss.c
index 48c2689504..4ad63ada6f 100644
--- a/src/lib/libssl/src/crypto/evp/m_dss.c
+++ b/src/lib/libssl/src/crypto/evp/m_dss.c
@@ -66,6 +66,7 @@
 #endif
 
 #ifndef OPENSSL_NO_SHA
+#ifndef OPENSSL_FIPS
 
 static int init(EVP_MD_CTX *ctx)
         { return SHA1_Init(ctx->md_data); }
@@ -97,3 +98,4 @@ const EVP_MD *EVP_dss(void)
         return(&dsa_md);
         }
 #endif
+#endif
diff --git a/src/lib/libssl/src/crypto/evp/m_dss1.c b/src/lib/libssl/src/crypto/evp/m_dss1.c
index 4f03fb70e0..f80170efeb 100644
--- a/src/lib/libssl/src/crypto/evp/m_dss1.c
+++ b/src/lib/libssl/src/crypto/evp/m_dss1.c
@@ -68,6 +68,8 @@
 #include <openssl/dsa.h>
 #endif
 
+#ifndef OPENSSL_FIPS 
+
 static int init(EVP_MD_CTX *ctx)
         { return SHA1_Init(ctx->md_data); }
 
@@ -98,3 +100,4 @@ const EVP_MD *EVP_dss1(void)
         return(&dss1_md);
         }
 #endif
+#endif
diff --git a/src/lib/libssl/src/crypto/evp/m_md4.c b/src/lib/libssl/src/crypto/evp/m_md4.c
index 1e0b7c5b42..6d47f61b27 100644
--- a/src/lib/libssl/src/crypto/evp/m_md4.c
+++ b/src/lib/libssl/src/crypto/evp/m_md4.c
@@ -69,6 +69,8 @@
 #include <openssl/rsa.h>
 #endif
 
+#include "evp_locl.h"
+
 static int init(EVP_MD_CTX *ctx)
         { return MD4_Init(ctx->md_data); }
 
diff --git a/src/lib/libssl/src/crypto/evp/m_md5.c b/src/lib/libssl/src/crypto/evp/m_md5.c
index 63c142119e..9a8bae0258 100644
--- a/src/lib/libssl/src/crypto/evp/m_md5.c
+++ b/src/lib/libssl/src/crypto/evp/m_md5.c
@@ -68,6 +68,7 @@
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
+#include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
         { return MD5_Init(ctx->md_data); }
diff --git a/src/lib/libssl/src/crypto/evp/m_mdc2.c b/src/lib/libssl/src/crypto/evp/m_mdc2.c
index b08d559803..3602bed316 100644
--- a/src/lib/libssl/src/crypto/evp/m_mdc2.c
+++ b/src/lib/libssl/src/crypto/evp/m_mdc2.c
@@ -69,6 +69,8 @@
 #include <openssl/rsa.h>
 #endif
 
+#include "evp_locl.h"
+
 static int init(EVP_MD_CTX *ctx)
         { return MDC2_Init(ctx->md_data); }
 
diff --git a/src/lib/libssl/src/crypto/evp/m_ripemd.c b/src/lib/libssl/src/crypto/evp/m_ripemd.c
index a1d60ee78d..7bf4804cf8 100644
--- a/src/lib/libssl/src/crypto/evp/m_ripemd.c
+++ b/src/lib/libssl/src/crypto/evp/m_ripemd.c
@@ -68,6 +68,7 @@
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
+#include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
         { return RIPEMD160_Init(ctx->md_data); }
diff --git a/src/lib/libssl/src/crypto/evp/m_sha.c b/src/lib/libssl/src/crypto/evp/m_sha.c
index acccc8f92d..8769cdd42f 100644
--- a/src/lib/libssl/src/crypto/evp/m_sha.c
+++ b/src/lib/libssl/src/crypto/evp/m_sha.c
@@ -67,6 +67,7 @@
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
+#include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
         { return SHA_Init(ctx->md_data); }
diff --git a/src/lib/libssl/src/crypto/evp/m_sha1.c b/src/lib/libssl/src/crypto/evp/m_sha1.c
index 9a2790fdea..3cb11f1ebb 100644
--- a/src/lib/libssl/src/crypto/evp/m_sha1.c
+++ b/src/lib/libssl/src/crypto/evp/m_sha1.c
@@ -59,6 +59,8 @@
 #include <stdio.h>
 #include "cryptlib.h"
 
+#ifndef OPENSSL_FIPS
+
 #ifndef OPENSSL_NO_SHA
 
 #include <openssl/evp.h>
@@ -68,6 +70,7 @@
 #include <openssl/rsa.h>
 #endif
 
+
 static int init(EVP_MD_CTX *ctx)
         { return SHA1_Init(ctx->md_data); }
 
@@ -202,3 +205,5 @@ static const EVP_MD sha512_md=
 const EVP_MD *EVP_sha512(void)
         { return(&sha512_md); }
 #endif  /* ifndef OPENSSL_NO_SHA512 */
+
+#endif
diff --git a/src/lib/libssl/src/crypto/evp/names.c b/src/lib/libssl/src/crypto/evp/names.c
index f2869f5c78..6311ad7cfb 100644
--- a/src/lib/libssl/src/crypto/evp/names.c
+++ b/src/lib/libssl/src/crypto/evp/names.c
@@ -66,6 +66,10 @@ int EVP_add_cipher(const EVP_CIPHER *c)
         {
         int r;
 
+        if (c == NULL) return 0;
+
+        OPENSSL_init();
+
         r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
         if (r == 0) return(0);
         check_defer(c->nid);
@@ -78,6 +82,7 @@ int EVP_add_digest(const EVP_MD *md)
         {
         int r;
         const char *name;
+        OPENSSL_init();
 
         name=OBJ_nid2sn(md->type);
         r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md);
diff --git a/src/lib/libssl/src/crypto/evp/p5_crpt.c b/src/lib/libssl/src/crypto/evp/p5_crpt.c
index 7ecfa8dad9..294cc90d87 100644
--- a/src/lib/libssl/src/crypto/evp/p5_crpt.c
+++ b/src/lib/libssl/src/crypto/evp/p5_crpt.c
@@ -82,6 +82,8 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
         unsigned char *salt;
         const unsigned char *pbuf;
         int mdsize;
+        int rv = 0;
+        EVP_MD_CTX_init(&ctx);
 
         /* Extract useful info from parameter */
         if (param == NULL || param->type != V_ASN1_SEQUENCE ||
@@ -104,29 +106,38 @@ int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
         if(!pass) passlen = 0;
         else if(passlen == -1) passlen = strlen(pass);
 
-        EVP_MD_CTX_init(&ctx);
-        EVP_DigestInit_ex(&ctx, md, NULL);
-        EVP_DigestUpdate(&ctx, pass, passlen);
-        EVP_DigestUpdate(&ctx, salt, saltlen);
+        if (!EVP_DigestInit_ex(&ctx, md, NULL))
+                goto err;
+        if (!EVP_DigestUpdate(&ctx, pass, passlen))
+                goto err;
+        if (!EVP_DigestUpdate(&ctx, salt, saltlen))
+                goto err;
         PBEPARAM_free(pbe);
-        EVP_DigestFinal_ex(&ctx, md_tmp, NULL);
+        if (!EVP_DigestFinal_ex(&ctx, md_tmp, NULL))
+                goto err;
         mdsize = EVP_MD_size(md);
         if (mdsize < 0)
             return 0;
         for (i = 1; i < iter; i++) {
-                EVP_DigestInit_ex(&ctx, md, NULL);
-                EVP_DigestUpdate(&ctx, md_tmp, mdsize);
-                EVP_DigestFinal_ex (&ctx, md_tmp, NULL);
+                if (!EVP_DigestInit_ex(&ctx, md, NULL))
+                        goto err;
+                if (!EVP_DigestUpdate(&ctx, md_tmp, mdsize))
+                        goto err;
+                if (!EVP_DigestFinal_ex (&ctx, md_tmp, NULL))
+                        goto err;
         }
-        EVP_MD_CTX_cleanup(&ctx);
         OPENSSL_assert(EVP_CIPHER_key_length(cipher) <= (int)sizeof(md_tmp));
         memcpy(key, md_tmp, EVP_CIPHER_key_length(cipher));
         OPENSSL_assert(EVP_CIPHER_iv_length(cipher) <= 16);
         memcpy(iv, md_tmp + (16 - EVP_CIPHER_iv_length(cipher)),
                                                  EVP_CIPHER_iv_length(cipher));
-        EVP_CipherInit_ex(cctx, cipher, NULL, key, iv, en_de);
+        if (!EVP_CipherInit_ex(cctx, cipher, NULL, key, iv, en_de))
+                goto err;
         OPENSSL_cleanse(md_tmp, EVP_MAX_MD_SIZE);
         OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
         OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
-        return 1;
+        rv = 1;
+        err:
+        EVP_MD_CTX_cleanup(&ctx);
+        return rv;
 }
diff --git a/src/lib/libssl/src/crypto/evp/p5_crpt2.c b/src/lib/libssl/src/crypto/evp/p5_crpt2.c
index 334379f310..975d004df4 100644
--- a/src/lib/libssl/src/crypto/evp/p5_crpt2.c
+++ b/src/lib/libssl/src/crypto/evp/p5_crpt2.c
@@ -62,6 +62,7 @@
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
+#include "evp_locl.h"
 
 /* set this to print out info about the keygen algorithm */
 /* #define DEBUG_PKCS5V2 */
@@ -110,10 +111,14 @@ int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
                 itmp[1] = (unsigned char)((i >> 16) & 0xff);
                 itmp[2] = (unsigned char)((i >> 8) & 0xff);
                 itmp[3] = (unsigned char)(i & 0xff);
-                HMAC_Init_ex(&hctx, pass, passlen, digest, NULL);
-                HMAC_Update(&hctx, salt, saltlen);
-                HMAC_Update(&hctx, itmp, 4);
-                HMAC_Final(&hctx, digtmp, NULL);
+                if (!HMAC_Init_ex(&hctx, pass, passlen, digest, NULL)
+                        || !HMAC_Update(&hctx, salt, saltlen)
+                        || !HMAC_Update(&hctx, itmp, 4)
+                        || !HMAC_Final(&hctx, digtmp, NULL))
+                        {
+                        HMAC_CTX_cleanup(&hctx);
+                        return 0;
+                        }
                 memcpy(p, digtmp, cplen);
                 for(j = 1; j < iter; j++)
                         {
@@ -168,27 +173,24 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
                          ASN1_TYPE *param, const EVP_CIPHER *c, const EVP_MD *md,
                          int en_de)
 {
-        unsigned char *salt, key[EVP_MAX_KEY_LENGTH];
         const unsigned char *pbuf;
-        int saltlen, iter, plen;
-        unsigned int keylen;
+        int plen;
         PBE2PARAM *pbe2 = NULL;
         const EVP_CIPHER *cipher;
-        PBKDF2PARAM *kdf = NULL;
-        const EVP_MD *prfmd;
-        int prf_nid, hmac_md_nid;
+
+        int rv = 0;
 
         if (param == NULL || param->type != V_ASN1_SEQUENCE ||
             param->value.sequence == NULL) {
                 EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
-                return 0;
+                goto err;
         }
 
         pbuf = param->value.sequence->data;
         plen = param->value.sequence->length;
         if(!(pbe2 = d2i_PBE2PARAM(NULL, &pbuf, plen))) {
                 EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
-                return 0;
+                goto err;
         }
 
         /* See if we recognise the key derivation function */
@@ -211,38 +213,63 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
         }
 
         /* Fixup cipher based on AlgorithmIdentifier */
-        EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, en_de);
+        if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, en_de))
+                goto err;
         if(EVP_CIPHER_asn1_to_param(ctx, pbe2->encryption->parameter) < 0) {
                 EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
                                         EVP_R_CIPHER_PARAMETER_ERROR);
                 goto err;
         }
+        rv = PKCS5_v2_PBKDF2_keyivgen(ctx, pass, passlen,
+                                        pbe2->keyfunc->parameter, c, md, en_de);
+        err:
+        PBE2PARAM_free(pbe2);
+        return rv;
+}
+
+int PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
+                         ASN1_TYPE *param,
+                         const EVP_CIPHER *c, const EVP_MD *md, int en_de)
+{
+        unsigned char *salt, key[EVP_MAX_KEY_LENGTH];
+        const unsigned char *pbuf;
+        int saltlen, iter, plen;
+        int rv = 0;
+        unsigned int keylen = 0;
+        int prf_nid, hmac_md_nid;
+        PBKDF2PARAM *kdf = NULL;
+        const EVP_MD *prfmd;
+
+        if (EVP_CIPHER_CTX_cipher(ctx) == NULL)
+                {
+                EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN,EVP_R_NO_CIPHER_SET);
+                goto err;
+                }
         keylen = EVP_CIPHER_CTX_key_length(ctx);
         OPENSSL_assert(keylen <= sizeof key);
 
-        /* Now decode key derivation function */
+        /* Decode parameter */
 
-        if(!pbe2->keyfunc->parameter ||
-                 (pbe2->keyfunc->parameter->type != V_ASN1_SEQUENCE))
+        if(!param || (param->type != V_ASN1_SEQUENCE))
                 {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
+                EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN,EVP_R_DECODE_ERROR);
                 goto err;
                 }
 
-        pbuf = pbe2->keyfunc->parameter->value.sequence->data;
-        plen = pbe2->keyfunc->parameter->value.sequence->length;
+        pbuf = param->value.sequence->data;
+        plen = param->value.sequence->length;
+
         if(!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
+                EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN,EVP_R_DECODE_ERROR);
                 goto err;
         }
 
-        PBE2PARAM_free(pbe2);
-        pbe2 = NULL;
+        keylen = EVP_CIPHER_CTX_key_length(ctx);
 
         /* Now check the parameters of the kdf */
 
         if(kdf->keylength && (ASN1_INTEGER_get(kdf->keylength) != (int)keylen)){
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
+                EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN,
                                                 EVP_R_UNSUPPORTED_KEYLENGTH);
                 goto err;
         }
@@ -254,19 +281,19 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
 
         if (!EVP_PBE_find(EVP_PBE_TYPE_PRF, prf_nid, NULL, &hmac_md_nid, 0))
                 {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN, EVP_R_UNSUPPORTED_PRF);
+                EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN, EVP_R_UNSUPPORTED_PRF);
                 goto err;
                 }
 
         prfmd = EVP_get_digestbynid(hmac_md_nid);
         if (prfmd == NULL)
                 {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN, EVP_R_UNSUPPORTED_PRF);
+                EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN, EVP_R_UNSUPPORTED_PRF);
                 goto err;
                 }
 
         if(kdf->salt->type != V_ASN1_OCTET_STRING) {
-                EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,
+                EVPerr(EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN,
                                                 EVP_R_UNSUPPORTED_SALT_TYPE);
                 goto err;
         }
@@ -278,15 +305,11 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
         if(!PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, iter, prfmd,
                                                    keylen, key))
                 goto err;
-        EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, en_de);
-        OPENSSL_cleanse(key, keylen);
-        PBKDF2PARAM_free(kdf);
-        return 1;
-
+        rv = EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, en_de);
         err:
-        PBE2PARAM_free(pbe2);
+        OPENSSL_cleanse(key, keylen);
         PBKDF2PARAM_free(kdf);
-        return 0;
+        return rv;
 }
 
 #ifdef DEBUG_PKCS5V2
diff --git a/src/lib/libssl/src/crypto/evp/p_open.c b/src/lib/libssl/src/crypto/evp/p_open.c
index 53a59a295c..c748fbea87 100644
--- a/src/lib/libssl/src/crypto/evp/p_open.c
+++ b/src/lib/libssl/src/crypto/evp/p_open.c
@@ -115,7 +115,8 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
         int i;
 
         i=EVP_DecryptFinal_ex(ctx,out,outl);
-        EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL);
+        if (i)
+                i = EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL);
         return(i);
         }
 #else /* !OPENSSL_NO_RSA */
diff --git a/src/lib/libssl/src/crypto/evp/p_seal.c b/src/lib/libssl/src/crypto/evp/p_seal.c
index d8324526e7..e5919b0fbf 100644
--- a/src/lib/libssl/src/crypto/evp/p_seal.c
+++ b/src/lib/libssl/src/crypto/evp/p_seal.c
@@ -110,6 +110,7 @@ int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
         {
         int i;
         i = EVP_EncryptFinal_ex(ctx,out,outl);
-        EVP_EncryptInit_ex(ctx,NULL,NULL,NULL,NULL);
+        if (i) 
+                i = EVP_EncryptInit_ex(ctx,NULL,NULL,NULL,NULL);
         return i;
         }
diff --git a/src/lib/libssl/src/crypto/evp/p_sign.c b/src/lib/libssl/src/crypto/evp/p_sign.c
index bb893f5bde..dfa48c157c 100644
--- a/src/lib/libssl/src/crypto/evp/p_sign.c
+++ b/src/lib/libssl/src/crypto/evp/p_sign.c
@@ -80,18 +80,20 @@ 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;
+        int i=0,ok=0,v;
         EVP_MD_CTX tmp_ctx;
+        EVP_PKEY_CTX *pkctx = NULL;
 
         *siglen=0;
         EVP_MD_CTX_init(&tmp_ctx);
-        EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);   
-        EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len);
+        if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
+                goto err;  
+        if (!EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len))
+                goto err;
         EVP_MD_CTX_cleanup(&tmp_ctx);
 
         if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
                 {
-                EVP_PKEY_CTX *pkctx = NULL;
                 size_t sltmp = (size_t)EVP_PKEY_size(pkey);
                 i = 0;
                 pkctx = EVP_PKEY_CTX_new(pkey, NULL);
diff --git a/src/lib/libssl/src/crypto/evp/p_verify.c b/src/lib/libssl/src/crypto/evp/p_verify.c
index 41d4b67130..5f5c409f45 100644
--- a/src/lib/libssl/src/crypto/evp/p_verify.c
+++ b/src/lib/libssl/src/crypto/evp/p_verify.c
@@ -67,17 +67,19 @@ 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;
+        int i=-1,ok=0,v;
         EVP_MD_CTX tmp_ctx;
+        EVP_PKEY_CTX *pkctx = NULL;
 
         EVP_MD_CTX_init(&tmp_ctx);
-        EVP_MD_CTX_copy_ex(&tmp_ctx,ctx);     
-        EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len);
+        if (!EVP_MD_CTX_copy_ex(&tmp_ctx,ctx))
+                goto err;    
+        if (!EVP_DigestFinal_ex(&tmp_ctx,&(m[0]),&m_len))
+                goto err;
         EVP_MD_CTX_cleanup(&tmp_ctx);
 
         if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE)
                 {
-                EVP_PKEY_CTX *pkctx = NULL;
                 i = -1;
                 pkctx = EVP_PKEY_CTX_new(pkey, NULL);
                 if (!pkctx)
diff --git a/src/lib/libssl/src/crypto/hmac/hmac.c b/src/lib/libssl/src/crypto/hmac/hmac.c
index 6c98fc43a3..ba27cbf56f 100644
--- a/src/lib/libssl/src/crypto/hmac/hmac.c
+++ b/src/lib/libssl/src/crypto/hmac/hmac.c
@@ -61,12 +61,34 @@
 #include "cryptlib.h"
 #include <openssl/hmac.h>
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
                   const EVP_MD *md, ENGINE *impl)
         {
         int i,j,reset=0;
         unsigned char pad[HMAC_MAX_MD_CBLOCK];
 
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode())
+                {
+                /* If we have an ENGINE need to allow non FIPS */
+                if ((impl || ctx->i_ctx.engine)
+                        &&  !(ctx->i_ctx.flags & EVP_CIPH_FLAG_NON_FIPS_ALLOW))
+                        {
+                        EVPerr(EVP_F_HMAC_INIT_EX, EVP_R_DISABLED_FOR_FIPS);
+                        return 0;
+                        }
+                /* Other algorithm blocking will be done in FIPS_cmac_init,
+                 * via FIPS_hmac_init_ex().
+                 */
+                if (!impl && !ctx->i_ctx.engine)
+                        return FIPS_hmac_init_ex(ctx, key, len, md, NULL);
+                }
+#endif
+
         if (md != NULL)
                 {
                 reset=1;
@@ -133,6 +155,10 @@ int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md)
 
 int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !ctx->i_ctx.engine)
+                return FIPS_hmac_update(ctx, data, len);
+#endif
         return EVP_DigestUpdate(&ctx->md_ctx,data,len);
         }
 
@@ -140,6 +166,10 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
         {
         unsigned int i;
         unsigned char buf[EVP_MAX_MD_SIZE];
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !ctx->i_ctx.engine)
+                return FIPS_hmac_final(ctx, md, len);
+#endif
 
         if (!EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i))
                 goto err;
@@ -179,6 +209,13 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
 
 void HMAC_CTX_cleanup(HMAC_CTX *ctx)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !ctx->i_ctx.engine)
+                {
+                FIPS_hmac_ctx_cleanup(ctx);
+                return;
+                }
+#endif
         EVP_MD_CTX_cleanup(&ctx->i_ctx);
         EVP_MD_CTX_cleanup(&ctx->o_ctx);
         EVP_MD_CTX_cleanup(&ctx->md_ctx);
diff --git a/src/lib/libssl/src/crypto/idea/Makefile b/src/lib/libssl/src/crypto/idea/Makefile
index b2e7add666..8af0acdad9 100644
--- a/src/lib/libssl/src/crypto/idea/Makefile
+++ b/src/lib/libssl/src/crypto/idea/Makefile
@@ -82,5 +82,8 @@ i_ecb.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
 i_ecb.o: ../../include/openssl/opensslv.h i_ecb.c idea_lcl.h
 i_ofb64.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
 i_ofb64.o: i_ofb64.c idea_lcl.h
+i_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 i_skey.o: ../../include/openssl/idea.h ../../include/openssl/opensslconf.h
-i_skey.o: i_skey.c idea_lcl.h
+i_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+i_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+i_skey.o: ../../include/openssl/symhacks.h i_skey.c idea_lcl.h
diff --git a/src/lib/libssl/src/crypto/idea/idea.h b/src/lib/libssl/src/crypto/idea/idea.h
index 5782e54b0f..e9a1e7f1a5 100644
--- a/src/lib/libssl/src/crypto/idea/idea.h
+++ b/src/lib/libssl/src/crypto/idea/idea.h
@@ -83,6 +83,9 @@ typedef struct idea_key_st
 const char *idea_options(void);
 void idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
         IDEA_KEY_SCHEDULE *ks);
+#ifdef OPENSSL_FIPS
+void private_idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
+#endif
 void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
 void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
 void idea_cbc_encrypt(const unsigned char *in, unsigned char *out,
diff --git a/src/lib/libssl/src/crypto/md2/md2.h b/src/lib/libssl/src/crypto/md2/md2.h
index a46120e7d4..d59c9f2593 100644
--- a/src/lib/libssl/src/crypto/md2/md2.h
+++ b/src/lib/libssl/src/crypto/md2/md2.h
@@ -81,6 +81,9 @@ typedef struct MD2state_st
         } MD2_CTX;
 
 const char *MD2_options(void);
+#ifdef OPENSSL_FIPS
+int private_MD2_Init(MD2_CTX *c);
+#endif
 int MD2_Init(MD2_CTX *c);
 int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len);
 int MD2_Final(unsigned char *md, MD2_CTX *c);
diff --git a/src/lib/libssl/src/crypto/md2/md2_dgst.c b/src/lib/libssl/src/crypto/md2/md2_dgst.c
index c57b3da288..bf89def73e 100644
--- a/src/lib/libssl/src/crypto/md2/md2_dgst.c
+++ b/src/lib/libssl/src/crypto/md2/md2_dgst.c
@@ -116,7 +116,7 @@ const char *MD2_options(void)
                 return("md2(int)");
         }
 
-int MD2_Init(MD2_CTX *c)
+fips_md_init(MD2)
         {
         c->num=0;
         memset(c->state,0,sizeof c->state);
diff --git a/src/lib/libssl/src/crypto/md4/Makefile b/src/lib/libssl/src/crypto/md4/Makefile
index c94a1398ed..e6f1e4478c 100644
--- a/src/lib/libssl/src/crypto/md4/Makefile
+++ b/src/lib/libssl/src/crypto/md4/Makefile
@@ -76,9 +76,11 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-md4_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md4.h
-md4_dgst.o: ../../include/openssl/opensslconf.h
-md4_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md4_dgst.c
+md4_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+md4_dgst.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h
+md4_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+md4_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+md4_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h md4_dgst.c
 md4_dgst.o: md4_locl.h
 md4_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 md4_one.o: ../../include/openssl/md4.h ../../include/openssl/opensslconf.h
diff --git a/src/lib/libssl/src/crypto/md4/md4.h b/src/lib/libssl/src/crypto/md4/md4.h
index c3ed9b3f75..a55368a790 100644
--- a/src/lib/libssl/src/crypto/md4/md4.h
+++ b/src/lib/libssl/src/crypto/md4/md4.h
@@ -105,6 +105,9 @@ typedef struct MD4state_st
         unsigned int num;
         } MD4_CTX;
 
+#ifdef OPENSSL_FIPS
+int private_MD4_Init(MD4_CTX *c);
+#endif
 int MD4_Init(MD4_CTX *c);
 int MD4_Update(MD4_CTX *c, const void *data, size_t len);
 int MD4_Final(unsigned char *md, MD4_CTX *c);
diff --git a/src/lib/libssl/src/crypto/md4/md4_dgst.c b/src/lib/libssl/src/crypto/md4/md4_dgst.c
index e0c42e8596..82c2cb2d98 100644
--- a/src/lib/libssl/src/crypto/md4/md4_dgst.c
+++ b/src/lib/libssl/src/crypto/md4/md4_dgst.c
@@ -57,8 +57,9 @@
  */
 
 #include <stdio.h>
-#include "md4_locl.h"
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
+#include "md4_locl.h"
 
 const char MD4_version[]="MD4" OPENSSL_VERSION_PTEXT;
 
@@ -70,7 +71,7 @@ const char MD4_version[]="MD4" OPENSSL_VERSION_PTEXT;
 #define INIT_DATA_C (unsigned long)0x98badcfeL
 #define INIT_DATA_D (unsigned long)0x10325476L
 
-int MD4_Init(MD4_CTX *c)
+fips_md_init(MD4)
         {
         memset (c,0,sizeof(*c));
         c->A=INIT_DATA_A;
diff --git a/src/lib/libssl/src/crypto/md5/Makefile b/src/lib/libssl/src/crypto/md5/Makefile
index 9858d53d31..b9e2ce9a38 100644
--- a/src/lib/libssl/src/crypto/md5/Makefile
+++ b/src/lib/libssl/src/crypto/md5/Makefile
@@ -89,9 +89,11 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-md5_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/md5.h
-md5_dgst.o: ../../include/openssl/opensslconf.h
-md5_dgst.o: ../../include/openssl/opensslv.h ../md32_common.h md5_dgst.c
+md5_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+md5_dgst.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h
+md5_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+md5_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+md5_dgst.o: ../../include/openssl/symhacks.h ../md32_common.h md5_dgst.c
 md5_dgst.o: md5_locl.h
 md5_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 md5_one.o: ../../include/openssl/md5.h ../../include/openssl/opensslconf.h
diff --git a/src/lib/libssl/src/crypto/md5/md5.h b/src/lib/libssl/src/crypto/md5/md5.h
index 4cbf84386b..541cc925fe 100644
--- a/src/lib/libssl/src/crypto/md5/md5.h
+++ b/src/lib/libssl/src/crypto/md5/md5.h
@@ -105,6 +105,9 @@ typedef struct MD5state_st
         unsigned int num;
         } MD5_CTX;
 
+#ifdef OPENSSL_FIPS
+int private_MD5_Init(MD5_CTX *c);
+#endif
 int MD5_Init(MD5_CTX *c);
 int MD5_Update(MD5_CTX *c, const void *data, size_t len);
 int MD5_Final(unsigned char *md, MD5_CTX *c);
diff --git a/src/lib/libssl/src/crypto/md5/md5_dgst.c b/src/lib/libssl/src/crypto/md5/md5_dgst.c
index beace632e3..265890de52 100644
--- a/src/lib/libssl/src/crypto/md5/md5_dgst.c
+++ b/src/lib/libssl/src/crypto/md5/md5_dgst.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "md5_locl.h"
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 
 const char MD5_version[]="MD5" OPENSSL_VERSION_PTEXT;
 
@@ -70,7 +71,7 @@ const char MD5_version[]="MD5" OPENSSL_VERSION_PTEXT;
 #define INIT_DATA_C (unsigned long)0x98badcfeL
 #define INIT_DATA_D (unsigned long)0x10325476L
 
-int MD5_Init(MD5_CTX *c)
+fips_md_init(MD5)
         {
         memset (c,0,sizeof(*c));
         c->A=INIT_DATA_A;
diff --git a/src/lib/libssl/src/crypto/mdc2/Makefile b/src/lib/libssl/src/crypto/mdc2/Makefile
index 1d064f17a6..141553149d 100644
--- a/src/lib/libssl/src/crypto/mdc2/Makefile
+++ b/src/lib/libssl/src/crypto/mdc2/Makefile
@@ -84,10 +84,10 @@ mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
 mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
 mdc2_one.o: ../../include/openssl/ui_compat.h ../cryptlib.h mdc2_one.c
-mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-mdc2dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/mdc2.h
-mdc2dgst.o: ../../include/openssl/opensslconf.h
-mdc2dgst.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-mdc2dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-mdc2dgst.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-mdc2dgst.o: mdc2dgst.c
+mdc2dgst.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
+mdc2dgst.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
+mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h
+mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+mdc2dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+mdc2dgst.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
+mdc2dgst.o: ../../include/openssl/ui_compat.h mdc2dgst.c
diff --git a/src/lib/libssl/src/crypto/mdc2/mdc2.h b/src/lib/libssl/src/crypto/mdc2/mdc2.h
index 72778a5212..f3e8e579d2 100644
--- a/src/lib/libssl/src/crypto/mdc2/mdc2.h
+++ b/src/lib/libssl/src/crypto/mdc2/mdc2.h
@@ -81,6 +81,9 @@ typedef struct mdc2_ctx_st
         } MDC2_CTX;
 
 
+#ifdef OPENSSL_FIPS
+int private_MDC2_Init(MDC2_CTX *c);
+#endif
 int MDC2_Init(MDC2_CTX *c);
 int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
 int MDC2_Final(unsigned char *md, MDC2_CTX *c);
diff --git a/src/lib/libssl/src/crypto/mem.c b/src/lib/libssl/src/crypto/mem.c
index 6f80dd33eb..21c0011380 100644
--- a/src/lib/libssl/src/crypto/mem.c
+++ b/src/lib/libssl/src/crypto/mem.c
@@ -125,6 +125,7 @@ static long (*get_debug_options_func)(void) = NULL;
 int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t),
         void (*f)(void *))
         {
+        OPENSSL_init();
         if (!allow_customize)
                 return 0;
         if ((m == 0) || (r == 0) || (f == 0))
@@ -186,6 +187,7 @@ int CRYPTO_set_mem_debug_functions(void (*m)(void *,int,const char *,int,int),
         {
         if (!allow_customize_debug)
                 return 0;
+        OPENSSL_init();
         malloc_debug_func=m;
         realloc_debug_func=r;
         free_debug_func=f;
@@ -361,6 +363,10 @@ void *CRYPTO_realloc_clean(void *str, int old_len, int num, const char *file,
 
         if (num <= 0) return NULL;
 
+        /* We don't support shrinking the buffer. Note the memcpy that copies
+         * |old_len| bytes to the new buffer, below. */
+        if (num < old_len) return NULL;
+
         if (realloc_debug_func != NULL)
                 realloc_debug_func(str, NULL, num, file, line, 0);
         ret=malloc_ex_func(num,file,line);
diff --git a/src/lib/libssl/src/crypto/objects/obj_dat.h b/src/lib/libssl/src/crypto/objects/obj_dat.h
index 6449be6071..d404ad07c9 100644
--- a/src/lib/libssl/src/crypto/objects/obj_dat.h
+++ b/src/lib/libssl/src/crypto/objects/obj_dat.h
@@ -62,12 +62,12 @@
  * [including the GNU Public Licence.]
  */
 
-#define NUM_NID 893
-#define NUM_SN 886
-#define NUM_LN 886
-#define NUM_OBJ 840
+#define NUM_NID 920
+#define NUM_SN 913
+#define NUM_LN 913
+#define NUM_OBJ 857
 
-static const unsigned char lvalues[5824]={
+static const unsigned char lvalues[5980]={
 0x00,                                        /* [  0] OBJ_undef */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,               /* [  1] OBJ_rsadsi */
 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,          /* [  7] OBJ_pkcs */
@@ -908,6 +908,23 @@ static const unsigned char lvalues[5824]={
 0x55,0x04,0x34,                              /* [5814] OBJ_supportedAlgorithms */
 0x55,0x04,0x35,                              /* [5817] OBJ_deltaRevocationList */
 0x55,0x04,0x36,                              /* [5820] OBJ_dmdName */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x09,0x10,0x03,0x09,/* [5823] OBJ_id_alg_PWRI_KEK */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x06,/* [5834] OBJ_aes_128_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x07,/* [5843] OBJ_aes_128_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x08,/* [5852] OBJ_id_aes128_wrap_pad */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1A,/* [5861] OBJ_aes_192_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1B,/* [5870] OBJ_aes_192_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x1C,/* [5879] OBJ_id_aes192_wrap_pad */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2E,/* [5888] OBJ_aes_256_gcm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x2F,/* [5897] OBJ_aes_256_ccm */
+0x60,0x86,0x48,0x01,0x65,0x03,0x04,0x01,0x30,/* [5906] OBJ_id_aes256_wrap_pad */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x02,/* [5915] OBJ_id_camellia128_wrap */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x03,/* [5926] OBJ_id_camellia192_wrap */
+0x2A,0x83,0x08,0x8C,0x9A,0x4B,0x3D,0x01,0x01,0x03,0x04,/* [5937] OBJ_id_camellia256_wrap */
+0x55,0x1D,0x25,0x00,                         /* [5948] OBJ_anyExtendedKeyUsage */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x08,/* [5952] OBJ_mgf1 */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0A,/* [5961] OBJ_rsassaPss */
+0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x07,/* [5970] OBJ_rsaesOaep */
 };
 
 static const ASN1_OBJECT nid_objs[NUM_NID]={
@@ -2351,28 +2368,74 @@ static const ASN1_OBJECT nid_objs[NUM_NID]={
 {"deltaRevocationList","deltaRevocationList",NID_deltaRevocationList,
         3,&(lvalues[5817]),0},
 {"dmdName","dmdName",NID_dmdName,3,&(lvalues[5820]),0},
+{"id-alg-PWRI-KEK","id-alg-PWRI-KEK",NID_id_alg_PWRI_KEK,11,
+        &(lvalues[5823]),0},
+{"CMAC","cmac",NID_cmac,0,NULL,0},
+{"id-aes128-GCM","aes-128-gcm",NID_aes_128_gcm,9,&(lvalues[5834]),0},
+{"id-aes128-CCM","aes-128-ccm",NID_aes_128_ccm,9,&(lvalues[5843]),0},
+{"id-aes128-wrap-pad","id-aes128-wrap-pad",NID_id_aes128_wrap_pad,9,
+        &(lvalues[5852]),0},
+{"id-aes192-GCM","aes-192-gcm",NID_aes_192_gcm,9,&(lvalues[5861]),0},
+{"id-aes192-CCM","aes-192-ccm",NID_aes_192_ccm,9,&(lvalues[5870]),0},
+{"id-aes192-wrap-pad","id-aes192-wrap-pad",NID_id_aes192_wrap_pad,9,
+        &(lvalues[5879]),0},
+{"id-aes256-GCM","aes-256-gcm",NID_aes_256_gcm,9,&(lvalues[5888]),0},
+{"id-aes256-CCM","aes-256-ccm",NID_aes_256_ccm,9,&(lvalues[5897]),0},
+{"id-aes256-wrap-pad","id-aes256-wrap-pad",NID_id_aes256_wrap_pad,9,
+        &(lvalues[5906]),0},
+{"AES-128-CTR","aes-128-ctr",NID_aes_128_ctr,0,NULL,0},
+{"AES-192-CTR","aes-192-ctr",NID_aes_192_ctr,0,NULL,0},
+{"AES-256-CTR","aes-256-ctr",NID_aes_256_ctr,0,NULL,0},
+{"id-camellia128-wrap","id-camellia128-wrap",NID_id_camellia128_wrap,
+        11,&(lvalues[5915]),0},
+{"id-camellia192-wrap","id-camellia192-wrap",NID_id_camellia192_wrap,
+        11,&(lvalues[5926]),0},
+{"id-camellia256-wrap","id-camellia256-wrap",NID_id_camellia256_wrap,
+        11,&(lvalues[5937]),0},
+{"anyExtendedKeyUsage","Any Extended Key Usage",
+        NID_anyExtendedKeyUsage,4,&(lvalues[5948]),0},
+{"MGF1","mgf1",NID_mgf1,9,&(lvalues[5952]),0},
+{"RSASSA-PSS","rsassaPss",NID_rsassaPss,9,&(lvalues[5961]),0},
+{"AES-128-XTS","aes-128-xts",NID_aes_128_xts,0,NULL,0},
+{"AES-256-XTS","aes-256-xts",NID_aes_256_xts,0,NULL,0},
+{"RC4-HMAC-MD5","rc4-hmac-md5",NID_rc4_hmac_md5,0,NULL,0},
+{"AES-128-CBC-HMAC-SHA1","aes-128-cbc-hmac-sha1",
+        NID_aes_128_cbc_hmac_sha1,0,NULL,0},
+{"AES-192-CBC-HMAC-SHA1","aes-192-cbc-hmac-sha1",
+        NID_aes_192_cbc_hmac_sha1,0,NULL,0},
+{"AES-256-CBC-HMAC-SHA1","aes-256-cbc-hmac-sha1",
+        NID_aes_256_cbc_hmac_sha1,0,NULL,0},
+{"RSAES-OAEP","rsaesOaep",NID_rsaesOaep,9,&(lvalues[5970]),0},
 };
 
 static const unsigned int sn_objs[NUM_SN]={
 364,    /* "AD_DVCS" */
 419,    /* "AES-128-CBC" */
+916,    /* "AES-128-CBC-HMAC-SHA1" */
 421,    /* "AES-128-CFB" */
 650,    /* "AES-128-CFB1" */
 653,    /* "AES-128-CFB8" */
+904,    /* "AES-128-CTR" */
 418,    /* "AES-128-ECB" */
 420,    /* "AES-128-OFB" */
+913,    /* "AES-128-XTS" */
 423,    /* "AES-192-CBC" */
+917,    /* "AES-192-CBC-HMAC-SHA1" */
 425,    /* "AES-192-CFB" */
 651,    /* "AES-192-CFB1" */
 654,    /* "AES-192-CFB8" */
+905,    /* "AES-192-CTR" */
 422,    /* "AES-192-ECB" */
 424,    /* "AES-192-OFB" */
 427,    /* "AES-256-CBC" */
+918,    /* "AES-256-CBC-HMAC-SHA1" */
 429,    /* "AES-256-CFB" */
 652,    /* "AES-256-CFB1" */
 655,    /* "AES-256-CFB8" */
+906,    /* "AES-256-CTR" */
 426,    /* "AES-256-ECB" */
 428,    /* "AES-256-OFB" */
+914,    /* "AES-256-XTS" */
 91,     /* "BF-CBC" */
 93,     /* "BF-CFB" */
 92,     /* "BF-ECB" */
@@ -2400,6 +2463,7 @@ static const unsigned int sn_objs[NUM_SN]={
 110,    /* "CAST5-CFB" */
 109,    /* "CAST5-ECB" */
 111,    /* "CAST5-OFB" */
+894,    /* "CMAC" */
 13,     /* "CN" */
 141,    /* "CRLReason" */
 417,    /* "CSPName" */
@@ -2451,6 +2515,7 @@ static const unsigned int sn_objs[NUM_SN]={
  4,     /* "MD5" */
 114,    /* "MD5-SHA1" */
 95,     /* "MDC2" */
+911,    /* "MGF1" */
 388,    /* "Mail" */
 393,    /* "NULL" */
 404,    /* "NULL" */
@@ -2487,6 +2552,7 @@ static const unsigned int sn_objs[NUM_SN]={
 40,     /* "RC2-OFB" */
  5,     /* "RC4" */
 97,     /* "RC4-40" */
+915,    /* "RC4-HMAC-MD5" */
 120,    /* "RC5-CBC" */
 122,    /* "RC5-CFB" */
 121,    /* "RC5-ECB" */
@@ -2507,6 +2573,8 @@ static const unsigned int sn_objs[NUM_SN]={
 668,    /* "RSA-SHA256" */
 669,    /* "RSA-SHA384" */
 670,    /* "RSA-SHA512" */
+919,    /* "RSAES-OAEP" */
+912,    /* "RSASSA-PSS" */
 777,    /* "SEED-CBC" */
 779,    /* "SEED-CFB" */
 776,    /* "SEED-ECB" */
@@ -2540,6 +2608,7 @@ static const unsigned int sn_objs[NUM_SN]={
 363,    /* "ad_timestamping" */
 376,    /* "algorithm" */
 405,    /* "ansi-X9-62" */
+910,    /* "anyExtendedKeyUsage" */
 746,    /* "anyPolicy" */
 370,    /* "archiveCutoff" */
 484,    /* "associatedDomain" */
@@ -2716,14 +2785,27 @@ static const unsigned int sn_objs[NUM_SN]={
 357,    /* "id-aca-group" */
 358,    /* "id-aca-role" */
 176,    /* "id-ad" */
+896,    /* "id-aes128-CCM" */
+895,    /* "id-aes128-GCM" */
 788,    /* "id-aes128-wrap" */
+897,    /* "id-aes128-wrap-pad" */
+899,    /* "id-aes192-CCM" */
+898,    /* "id-aes192-GCM" */
 789,    /* "id-aes192-wrap" */
+900,    /* "id-aes192-wrap-pad" */
+902,    /* "id-aes256-CCM" */
+901,    /* "id-aes256-GCM" */
 790,    /* "id-aes256-wrap" */
+903,    /* "id-aes256-wrap-pad" */
 262,    /* "id-alg" */
+893,    /* "id-alg-PWRI-KEK" */
 323,    /* "id-alg-des40" */
 326,    /* "id-alg-dh-pop" */
 325,    /* "id-alg-dh-sig-hmac-sha1" */
 324,    /* "id-alg-noSignature" */
+907,    /* "id-camellia128-wrap" */
+908,    /* "id-camellia192-wrap" */
+909,    /* "id-camellia256-wrap" */
 268,    /* "id-cct" */
 361,    /* "id-cct-PKIData" */
 362,    /* "id-cct-PKIResponse" */
@@ -3246,6 +3328,7 @@ static const unsigned int ln_objs[NUM_LN]={
 363,    /* "AD Time Stamping" */
 405,    /* "ANSI X9.62" */
 368,    /* "Acceptable OCSP Responses" */
+910,    /* "Any Extended Key Usage" */
 664,    /* "Any language" */
 177,    /* "Authority Information Access" */
 365,    /* "Basic OCSP Response" */
@@ -3386,23 +3469,37 @@ static const unsigned int ln_objs[NUM_LN]={
 364,    /* "ad dvcs" */
 606,    /* "additional verification" */
 419,    /* "aes-128-cbc" */
+916,    /* "aes-128-cbc-hmac-sha1" */
+896,    /* "aes-128-ccm" */
 421,    /* "aes-128-cfb" */
 650,    /* "aes-128-cfb1" */
 653,    /* "aes-128-cfb8" */
+904,    /* "aes-128-ctr" */
 418,    /* "aes-128-ecb" */
+895,    /* "aes-128-gcm" */
 420,    /* "aes-128-ofb" */
+913,    /* "aes-128-xts" */
 423,    /* "aes-192-cbc" */
+917,    /* "aes-192-cbc-hmac-sha1" */
+899,    /* "aes-192-ccm" */
 425,    /* "aes-192-cfb" */
 651,    /* "aes-192-cfb1" */
 654,    /* "aes-192-cfb8" */
+905,    /* "aes-192-ctr" */
 422,    /* "aes-192-ecb" */
+898,    /* "aes-192-gcm" */
 424,    /* "aes-192-ofb" */
 427,    /* "aes-256-cbc" */
+918,    /* "aes-256-cbc-hmac-sha1" */
+902,    /* "aes-256-ccm" */
 429,    /* "aes-256-cfb" */
 652,    /* "aes-256-cfb1" */
 655,    /* "aes-256-cfb8" */
+906,    /* "aes-256-ctr" */
 426,    /* "aes-256-ecb" */
+901,    /* "aes-256-gcm" */
 428,    /* "aes-256-ofb" */
+914,    /* "aes-256-xts" */
 376,    /* "algorithm" */
 484,    /* "associatedDomain" */
 485,    /* "associatedName" */
@@ -3467,6 +3564,7 @@ static const unsigned int ln_objs[NUM_LN]={
 407,    /* "characteristic-two-field" */
 395,    /* "clearance" */
 633,    /* "cleartext track 2" */
+894,    /* "cmac" */
 13,     /* "commonName" */
 513,    /* "content types" */
 50,     /* "contentType" */
@@ -3602,13 +3700,20 @@ static const unsigned int ln_objs[NUM_LN]={
 358,    /* "id-aca-role" */
 176,    /* "id-ad" */
 788,    /* "id-aes128-wrap" */
+897,    /* "id-aes128-wrap-pad" */
 789,    /* "id-aes192-wrap" */
+900,    /* "id-aes192-wrap-pad" */
 790,    /* "id-aes256-wrap" */
+903,    /* "id-aes256-wrap-pad" */
 262,    /* "id-alg" */
+893,    /* "id-alg-PWRI-KEK" */
 323,    /* "id-alg-des40" */
 326,    /* "id-alg-dh-pop" */
 325,    /* "id-alg-dh-sig-hmac-sha1" */
 324,    /* "id-alg-noSignature" */
+907,    /* "id-camellia128-wrap" */
+908,    /* "id-camellia192-wrap" */
+909,    /* "id-camellia256-wrap" */
 268,    /* "id-cct" */
 361,    /* "id-cct-PKIData" */
 362,    /* "id-cct-PKIResponse" */
@@ -3806,6 +3911,7 @@ static const unsigned int ln_objs[NUM_LN]={
 602,    /* "merchant initiated auth" */
 514,    /* "message extensions" */
 51,     /* "messageDigest" */
+911,    /* "mgf1" */
 506,    /* "mime-mhs-bodies" */
 505,    /* "mime-mhs-headings" */
 488,    /* "mobileTelephoneNumber" */
@@ -3889,6 +3995,7 @@ static const unsigned int ln_objs[NUM_LN]={
 40,     /* "rc2-ofb" */
  5,     /* "rc4" */
 97,     /* "rc4-40" */
+915,    /* "rc4-hmac-md5" */
 120,    /* "rc5-cbc" */
 122,    /* "rc5-cfb" */
 121,    /* "rc5-ecb" */
@@ -3905,6 +4012,8 @@ static const unsigned int ln_objs[NUM_LN]={
  6,     /* "rsaEncryption" */
 644,    /* "rsaOAEPEncryptionSET" */
 377,    /* "rsaSignature" */
+919,    /* "rsaesOaep" */
+912,    /* "rsassaPss" */
 124,    /* "run length compression" */
 482,    /* "sOARecord" */
 155,    /* "safeContentsBag" */
@@ -4254,6 +4363,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
 96,     /* OBJ_mdc2WithRSA                  2 5 8 3 100 */
 95,     /* OBJ_mdc2                         2 5 8 3 101 */
 746,    /* OBJ_any_policy                   2 5 29 32 0 */
+910,    /* OBJ_anyExtendedKeyUsage          2 5 29 37 0 */
 519,    /* OBJ_setct_PANData                2 23 42 0 0 */
 520,    /* OBJ_setct_PANToken               2 23 42 0 1 */
 521,    /* OBJ_setct_PANOnly                2 23 42 0 2 */
@@ -4720,6 +4830,9 @@ static const unsigned int obj_objs[NUM_OBJ]={
  8,     /* OBJ_md5WithRSAEncryption         1 2 840 113549 1 1 4 */
 65,     /* OBJ_sha1WithRSAEncryption        1 2 840 113549 1 1 5 */
 644,    /* OBJ_rsaOAEPEncryptionSET         1 2 840 113549 1 1 6 */
+919,    /* OBJ_rsaesOaep                    1 2 840 113549 1 1 7 */
+911,    /* OBJ_mgf1                         1 2 840 113549 1 1 8 */
+912,    /* OBJ_rsassaPss                    1 2 840 113549 1 1 10 */
 668,    /* OBJ_sha256WithRSAEncryption      1 2 840 113549 1 1 11 */
 669,    /* OBJ_sha384WithRSAEncryption      1 2 840 113549 1 1 12 */
 670,    /* OBJ_sha512WithRSAEncryption      1 2 840 113549 1 1 13 */
@@ -4785,16 +4898,25 @@ static const unsigned int obj_objs[NUM_OBJ]={
 420,    /* OBJ_aes_128_ofb128               2 16 840 1 101 3 4 1 3 */
 421,    /* OBJ_aes_128_cfb128               2 16 840 1 101 3 4 1 4 */
 788,    /* OBJ_id_aes128_wrap               2 16 840 1 101 3 4 1 5 */
+895,    /* OBJ_aes_128_gcm                  2 16 840 1 101 3 4 1 6 */
+896,    /* OBJ_aes_128_ccm                  2 16 840 1 101 3 4 1 7 */
+897,    /* OBJ_id_aes128_wrap_pad           2 16 840 1 101 3 4 1 8 */
 422,    /* OBJ_aes_192_ecb                  2 16 840 1 101 3 4 1 21 */
 423,    /* OBJ_aes_192_cbc                  2 16 840 1 101 3 4 1 22 */
 424,    /* OBJ_aes_192_ofb128               2 16 840 1 101 3 4 1 23 */
 425,    /* OBJ_aes_192_cfb128               2 16 840 1 101 3 4 1 24 */
 789,    /* OBJ_id_aes192_wrap               2 16 840 1 101 3 4 1 25 */
+898,    /* OBJ_aes_192_gcm                  2 16 840 1 101 3 4 1 26 */
+899,    /* OBJ_aes_192_ccm                  2 16 840 1 101 3 4 1 27 */
+900,    /* OBJ_id_aes192_wrap_pad           2 16 840 1 101 3 4 1 28 */
 426,    /* OBJ_aes_256_ecb                  2 16 840 1 101 3 4 1 41 */
 427,    /* OBJ_aes_256_cbc                  2 16 840 1 101 3 4 1 42 */
 428,    /* OBJ_aes_256_ofb128               2 16 840 1 101 3 4 1 43 */
 429,    /* OBJ_aes_256_cfb128               2 16 840 1 101 3 4 1 44 */
 790,    /* OBJ_id_aes256_wrap               2 16 840 1 101 3 4 1 45 */
+901,    /* OBJ_aes_256_gcm                  2 16 840 1 101 3 4 1 46 */
+902,    /* OBJ_aes_256_ccm                  2 16 840 1 101 3 4 1 47 */
+903,    /* OBJ_id_aes256_wrap_pad           2 16 840 1 101 3 4 1 48 */
 672,    /* OBJ_sha256                       2 16 840 1 101 3 4 2 1 */
 673,    /* OBJ_sha384                       2 16 840 1 101 3 4 2 2 */
 674,    /* OBJ_sha512                       2 16 840 1 101 3 4 2 3 */
@@ -4901,6 +5023,9 @@ static const unsigned int obj_objs[NUM_OBJ]={
 751,    /* OBJ_camellia_128_cbc             1 2 392 200011 61 1 1 1 2 */
 752,    /* OBJ_camellia_192_cbc             1 2 392 200011 61 1 1 1 3 */
 753,    /* OBJ_camellia_256_cbc             1 2 392 200011 61 1 1 1 4 */
+907,    /* OBJ_id_camellia128_wrap          1 2 392 200011 61 1 1 3 2 */
+908,    /* OBJ_id_camellia192_wrap          1 2 392 200011 61 1 1 3 3 */
+909,    /* OBJ_id_camellia256_wrap          1 2 392 200011 61 1 1 3 4 */
 196,    /* OBJ_id_smime_mod_cms             1 2 840 113549 1 9 16 0 1 */
 197,    /* OBJ_id_smime_mod_ess             1 2 840 113549 1 9 16 0 2 */
 198,    /* OBJ_id_smime_mod_oid             1 2 840 113549 1 9 16 0 3 */
@@ -4956,6 +5081,7 @@ static const unsigned int obj_objs[NUM_OBJ]={
 246,    /* OBJ_id_smime_alg_CMS3DESwrap     1 2 840 113549 1 9 16 3 6 */
 247,    /* OBJ_id_smime_alg_CMSRC2wrap      1 2 840 113549 1 9 16 3 7 */
 125,    /* OBJ_zlib_compression             1 2 840 113549 1 9 16 3 8 */
+893,    /* OBJ_id_alg_PWRI_KEK              1 2 840 113549 1 9 16 3 9 */
 248,    /* OBJ_id_smime_cd_ldap             1 2 840 113549 1 9 16 4 1 */
 249,    /* OBJ_id_smime_spq_ets_sqt_uri     1 2 840 113549 1 9 16 5 1 */
 250,    /* OBJ_id_smime_spq_ets_sqt_unotice 1 2 840 113549 1 9 16 5 2 */
diff --git a/src/lib/libssl/src/crypto/objects/obj_mac.h b/src/lib/libssl/src/crypto/objects/obj_mac.h
index 282f11a8a8..b5ea7cdab4 100644
--- a/src/lib/libssl/src/crypto/objects/obj_mac.h
+++ b/src/lib/libssl/src/crypto/objects/obj_mac.h
@@ -580,6 +580,21 @@
 #define NID_sha1WithRSAEncryption               65
 #define OBJ_sha1WithRSAEncryption               OBJ_pkcs1,5L
 
+#define SN_rsaesOaep            "RSAES-OAEP"
+#define LN_rsaesOaep            "rsaesOaep"
+#define NID_rsaesOaep           919
+#define OBJ_rsaesOaep           OBJ_pkcs1,7L
+
+#define SN_mgf1         "MGF1"
+#define LN_mgf1         "mgf1"
+#define NID_mgf1                911
+#define OBJ_mgf1                OBJ_pkcs1,8L
+
+#define SN_rsassaPss            "RSASSA-PSS"
+#define LN_rsassaPss            "rsassaPss"
+#define NID_rsassaPss           912
+#define OBJ_rsassaPss           OBJ_pkcs1,10L
+
 #define SN_sha256WithRSAEncryption              "RSA-SHA256"
 #define LN_sha256WithRSAEncryption              "sha256WithRSAEncryption"
 #define NID_sha256WithRSAEncryption             668
@@ -981,6 +996,10 @@
 #define NID_id_smime_alg_CMSRC2wrap             247
 #define OBJ_id_smime_alg_CMSRC2wrap             OBJ_id_smime_alg,7L
 
+#define SN_id_alg_PWRI_KEK              "id-alg-PWRI-KEK"
+#define NID_id_alg_PWRI_KEK             893
+#define OBJ_id_alg_PWRI_KEK             OBJ_id_smime_alg,9L
+
 #define SN_id_smime_cd_ldap             "id-smime-cd-ldap"
 #define NID_id_smime_cd_ldap            248
 #define OBJ_id_smime_cd_ldap            OBJ_id_smime_cd,1L
@@ -2399,6 +2418,11 @@
 #define NID_no_rev_avail                403
 #define OBJ_no_rev_avail                OBJ_id_ce,56L
 
+#define SN_anyExtendedKeyUsage          "anyExtendedKeyUsage"
+#define LN_anyExtendedKeyUsage          "Any Extended Key Usage"
+#define NID_anyExtendedKeyUsage         910
+#define OBJ_anyExtendedKeyUsage         OBJ_ext_key_usage,0L
+
 #define SN_netscape             "Netscape"
 #define LN_netscape             "Netscape Communications Corp."
 #define NID_netscape            57
@@ -2586,6 +2610,24 @@
 #define NID_aes_128_cfb128              421
 #define OBJ_aes_128_cfb128              OBJ_aes,4L
 
+#define SN_id_aes128_wrap               "id-aes128-wrap"
+#define NID_id_aes128_wrap              788
+#define OBJ_id_aes128_wrap              OBJ_aes,5L
+
+#define SN_aes_128_gcm          "id-aes128-GCM"
+#define LN_aes_128_gcm          "aes-128-gcm"
+#define NID_aes_128_gcm         895
+#define OBJ_aes_128_gcm         OBJ_aes,6L
+
+#define SN_aes_128_ccm          "id-aes128-CCM"
+#define LN_aes_128_ccm          "aes-128-ccm"
+#define NID_aes_128_ccm         896
+#define OBJ_aes_128_ccm         OBJ_aes,7L
+
+#define SN_id_aes128_wrap_pad           "id-aes128-wrap-pad"
+#define NID_id_aes128_wrap_pad          897
+#define OBJ_id_aes128_wrap_pad          OBJ_aes,8L
+
 #define SN_aes_192_ecb          "AES-192-ECB"
 #define LN_aes_192_ecb          "aes-192-ecb"
 #define NID_aes_192_ecb         422
@@ -2606,6 +2648,24 @@
 #define NID_aes_192_cfb128              425
 #define OBJ_aes_192_cfb128              OBJ_aes,24L
 
+#define SN_id_aes192_wrap               "id-aes192-wrap"
+#define NID_id_aes192_wrap              789
+#define OBJ_id_aes192_wrap              OBJ_aes,25L
+
+#define SN_aes_192_gcm          "id-aes192-GCM"
+#define LN_aes_192_gcm          "aes-192-gcm"
+#define NID_aes_192_gcm         898
+#define OBJ_aes_192_gcm         OBJ_aes,26L
+
+#define SN_aes_192_ccm          "id-aes192-CCM"
+#define LN_aes_192_ccm          "aes-192-ccm"
+#define NID_aes_192_ccm         899
+#define OBJ_aes_192_ccm         OBJ_aes,27L
+
+#define SN_id_aes192_wrap_pad           "id-aes192-wrap-pad"
+#define NID_id_aes192_wrap_pad          900
+#define OBJ_id_aes192_wrap_pad          OBJ_aes,28L
+
 #define SN_aes_256_ecb          "AES-256-ECB"
 #define LN_aes_256_ecb          "aes-256-ecb"
 #define NID_aes_256_ecb         426
@@ -2626,6 +2686,24 @@
 #define NID_aes_256_cfb128              429
 #define OBJ_aes_256_cfb128              OBJ_aes,44L
 
+#define SN_id_aes256_wrap               "id-aes256-wrap"
+#define NID_id_aes256_wrap              790
+#define OBJ_id_aes256_wrap              OBJ_aes,45L
+
+#define SN_aes_256_gcm          "id-aes256-GCM"
+#define LN_aes_256_gcm          "aes-256-gcm"
+#define NID_aes_256_gcm         901
+#define OBJ_aes_256_gcm         OBJ_aes,46L
+
+#define SN_aes_256_ccm          "id-aes256-CCM"
+#define LN_aes_256_ccm          "aes-256-ccm"
+#define NID_aes_256_ccm         902
+#define OBJ_aes_256_ccm         OBJ_aes,47L
+
+#define SN_id_aes256_wrap_pad           "id-aes256-wrap-pad"
+#define NID_id_aes256_wrap_pad          903
+#define OBJ_id_aes256_wrap_pad          OBJ_aes,48L
+
 #define SN_aes_128_cfb1         "AES-128-CFB1"
 #define LN_aes_128_cfb1         "aes-128-cfb1"
 #define NID_aes_128_cfb1                650
@@ -2650,6 +2728,26 @@
 #define LN_aes_256_cfb8         "aes-256-cfb8"
 #define NID_aes_256_cfb8                655
 
+#define SN_aes_128_ctr          "AES-128-CTR"
+#define LN_aes_128_ctr          "aes-128-ctr"
+#define NID_aes_128_ctr         904
+
+#define SN_aes_192_ctr          "AES-192-CTR"
+#define LN_aes_192_ctr          "aes-192-ctr"
+#define NID_aes_192_ctr         905
+
+#define SN_aes_256_ctr          "AES-256-CTR"
+#define LN_aes_256_ctr          "aes-256-ctr"
+#define NID_aes_256_ctr         906
+
+#define SN_aes_128_xts          "AES-128-XTS"
+#define LN_aes_128_xts          "aes-128-xts"
+#define NID_aes_128_xts         913
+
+#define SN_aes_256_xts          "AES-256-XTS"
+#define LN_aes_256_xts          "aes-256-xts"
+#define NID_aes_256_xts         914
+
 #define SN_des_cfb1             "DES-CFB1"
 #define LN_des_cfb1             "des-cfb1"
 #define NID_des_cfb1            656
@@ -2666,18 +2764,6 @@
 #define LN_des_ede3_cfb8                "des-ede3-cfb8"
 #define NID_des_ede3_cfb8               659
 
-#define SN_id_aes128_wrap               "id-aes128-wrap"
-#define NID_id_aes128_wrap              788
-#define OBJ_id_aes128_wrap              OBJ_aes,5L
-
-#define SN_id_aes192_wrap               "id-aes192-wrap"
-#define NID_id_aes192_wrap              789
-#define OBJ_id_aes192_wrap              OBJ_aes,25L
-
-#define SN_id_aes256_wrap               "id-aes256-wrap"
-#define NID_id_aes256_wrap              790
-#define OBJ_id_aes256_wrap              OBJ_aes,45L
-
 #define OBJ_nist_hashalgs               OBJ_nistAlgorithms,2L
 
 #define SN_sha256               "SHA256"
@@ -3810,6 +3896,18 @@
 #define NID_camellia_256_cbc            753
 #define OBJ_camellia_256_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,4L
 
+#define SN_id_camellia128_wrap          "id-camellia128-wrap"
+#define NID_id_camellia128_wrap         907
+#define OBJ_id_camellia128_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,2L
+
+#define SN_id_camellia192_wrap          "id-camellia192-wrap"
+#define NID_id_camellia192_wrap         908
+#define OBJ_id_camellia192_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,3L
+
+#define SN_id_camellia256_wrap          "id-camellia256-wrap"
+#define NID_id_camellia256_wrap         909
+#define OBJ_id_camellia256_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,4L
+
 #define OBJ_ntt_ds              0L,3L,4401L,5L
 
 #define OBJ_camellia            OBJ_ntt_ds,3L,1L,9L
@@ -3912,3 +4010,23 @@
 #define LN_hmac         "hmac"
 #define NID_hmac                855
 
+#define SN_cmac         "CMAC"
+#define LN_cmac         "cmac"
+#define NID_cmac                894
+
+#define SN_rc4_hmac_md5         "RC4-HMAC-MD5"
+#define LN_rc4_hmac_md5         "rc4-hmac-md5"
+#define NID_rc4_hmac_md5                915
+
+#define SN_aes_128_cbc_hmac_sha1                "AES-128-CBC-HMAC-SHA1"
+#define LN_aes_128_cbc_hmac_sha1                "aes-128-cbc-hmac-sha1"
+#define NID_aes_128_cbc_hmac_sha1               916
+
+#define SN_aes_192_cbc_hmac_sha1                "AES-192-CBC-HMAC-SHA1"
+#define LN_aes_192_cbc_hmac_sha1                "aes-192-cbc-hmac-sha1"
+#define NID_aes_192_cbc_hmac_sha1               917
+
+#define SN_aes_256_cbc_hmac_sha1                "AES-256-CBC-HMAC-SHA1"
+#define LN_aes_256_cbc_hmac_sha1                "aes-256-cbc-hmac-sha1"
+#define NID_aes_256_cbc_hmac_sha1               918
+
diff --git a/src/lib/libssl/src/crypto/objects/obj_mac.num b/src/lib/libssl/src/crypto/objects/obj_mac.num
index 8c50aac27f..1d0a7c802d 100644
--- a/src/lib/libssl/src/crypto/objects/obj_mac.num
+++ b/src/lib/libssl/src/crypto/objects/obj_mac.num
@@ -890,3 +890,30 @@ houseIdentifier		889
 supportedAlgorithms             890
 deltaRevocationList             891
 dmdName         892
+id_alg_PWRI_KEK         893
+cmac            894
+aes_128_gcm             895
+aes_128_ccm             896
+id_aes128_wrap_pad              897
+aes_192_gcm             898
+aes_192_ccm             899
+id_aes192_wrap_pad              900
+aes_256_gcm             901
+aes_256_ccm             902
+id_aes256_wrap_pad              903
+aes_128_ctr             904
+aes_192_ctr             905
+aes_256_ctr             906
+id_camellia128_wrap             907
+id_camellia192_wrap             908
+id_camellia256_wrap             909
+anyExtendedKeyUsage             910
+mgf1            911
+rsassaPss               912
+aes_128_xts             913
+aes_256_xts             914
+rc4_hmac_md5            915
+aes_128_cbc_hmac_sha1           916
+aes_192_cbc_hmac_sha1           917
+aes_256_cbc_hmac_sha1           918
+rsaesOaep               919
diff --git a/src/lib/libssl/src/crypto/objects/objects.txt b/src/lib/libssl/src/crypto/objects/objects.txt
index e61fe60cbf..d3bfad72a2 100644
--- a/src/lib/libssl/src/crypto/objects/objects.txt
+++ b/src/lib/libssl/src/crypto/objects/objects.txt
@@ -166,6 +166,10 @@ pkcs1 3			: RSA-MD4		: md4WithRSAEncryption
 pkcs1 4                 : RSA-MD5               : md5WithRSAEncryption
 pkcs1 5                 : RSA-SHA1              : sha1WithRSAEncryption
 # According to PKCS #1 version 2.1
+pkcs1 7                 : RSAES-OAEP            : rsaesOaep
+pkcs1 8                 : MGF1                  : mgf1
+pkcs1 10                : RSASSA-PSS            : rsassaPss
+
 pkcs1 11                : RSA-SHA256            : sha256WithRSAEncryption
 pkcs1 12                : RSA-SHA384            : sha384WithRSAEncryption
 pkcs1 13                : RSA-SHA512            : sha512WithRSAEncryption
@@ -299,6 +303,7 @@ id-smime-alg 4		: id-smime-alg-RC2wrap
 id-smime-alg 5          : id-smime-alg-ESDH
 id-smime-alg 6          : id-smime-alg-CMS3DESwrap
 id-smime-alg 7          : id-smime-alg-CMSRC2wrap
+id-smime-alg 9          : id-alg-PWRI-KEK
 
 # S/MIME Certificate Distribution
 id-smime-cd 1           : id-smime-cd-ldap
@@ -770,6 +775,10 @@ id-ce 55		: targetInformation	: X509v3 AC Targeting
 !Cname no-rev-avail
 id-ce 56                : noRevAvail            : X509v3 No Revocation Available
 
+# From RFC5280
+ext-key-usage 0         : anyExtendedKeyUsage   : Any Extended Key Usage
+
+
 !Cname netscape
 2 16 840 1 113730       : Netscape              : Netscape Communications Corp.
 !Cname netscape-cert-extension
@@ -846,6 +855,10 @@ aes 2			: AES-128-CBC		: aes-128-cbc
 aes 3                   : AES-128-OFB           : aes-128-ofb
 !Cname aes-128-cfb128
 aes 4                   : AES-128-CFB           : aes-128-cfb
+aes 5                   : id-aes128-wrap
+aes 6                   : id-aes128-GCM         : aes-128-gcm
+aes 7                   : id-aes128-CCM         : aes-128-ccm
+aes 8                   : id-aes128-wrap-pad
 
 aes 21                  : AES-192-ECB           : aes-192-ecb
 aes 22                  : AES-192-CBC           : aes-192-cbc
@@ -853,6 +866,10 @@ aes 22			: AES-192-CBC		: aes-192-cbc
 aes 23                  : AES-192-OFB           : aes-192-ofb
 !Cname aes-192-cfb128
 aes 24                  : AES-192-CFB           : aes-192-cfb
+aes 25                  : id-aes192-wrap
+aes 26                  : id-aes192-GCM         : aes-192-gcm
+aes 27                  : id-aes192-CCM         : aes-192-ccm
+aes 28                  : id-aes192-wrap-pad
 
 aes 41                  : AES-256-ECB           : aes-256-ecb
 aes 42                  : AES-256-CBC           : aes-256-cbc
@@ -860,6 +877,10 @@ aes 42			: AES-256-CBC		: aes-256-cbc
 aes 43                  : AES-256-OFB           : aes-256-ofb
 !Cname aes-256-cfb128
 aes 44                  : AES-256-CFB           : aes-256-cfb
+aes 45                  : id-aes256-wrap
+aes 46                  : id-aes256-GCM         : aes-256-gcm
+aes 47                  : id-aes256-CCM         : aes-256-ccm
+aes 48                  : id-aes256-wrap-pad
 
 # There are no OIDs for these modes...
 
@@ -869,15 +890,16 @@ aes 44			: AES-256-CFB		: aes-256-cfb
                         : AES-128-CFB8          : aes-128-cfb8
                         : AES-192-CFB8          : aes-192-cfb8
                         : AES-256-CFB8          : aes-256-cfb8
+                        : AES-128-CTR           : aes-128-ctr
+                        : AES-192-CTR           : aes-192-ctr
+                        : AES-256-CTR           : aes-256-ctr
+                        : AES-128-XTS           : aes-128-xts
+                        : AES-256-XTS           : aes-256-xts
                         : DES-CFB1              : des-cfb1
                         : DES-CFB8              : des-cfb8
                         : DES-EDE3-CFB1         : des-ede3-cfb1
                         : DES-EDE3-CFB8         : des-ede3-cfb8
 
-aes 5                   : id-aes128-wrap 
-aes 25                  : id-aes192-wrap 
-aes 45                  : id-aes256-wrap 
-
 # OIDs for SHA224, SHA256, SHA385 and SHA512, according to x9.84.
 !Alias nist_hashalgs nistAlgorithms 2
 nist_hashalgs 1         : SHA256                : sha256
@@ -1211,6 +1233,9 @@ cryptocom 1 8 1		: id-GostR3410-2001-ParamSet-cc : GOST R 3410-2001 Parameter Se
 1 2 392 200011 61 1 1 1 2 : CAMELLIA-128-CBC            : camellia-128-cbc
 1 2 392 200011 61 1 1 1 3 : CAMELLIA-192-CBC            : camellia-192-cbc
 1 2 392 200011 61 1 1 1 4 : CAMELLIA-256-CBC            : camellia-256-cbc
+1 2 392 200011 61 1 1 3 2 : id-camellia128-wrap
+1 2 392 200011 61 1 1 3 3 : id-camellia192-wrap
+1 2 392 200011 61 1 1 3 4 : id-camellia256-wrap
 
 # Definitions for Camellia cipher - ECB, CFB, OFB MODE
 
@@ -1257,3 +1282,11 @@ kisa 1 6                : SEED-OFB      : seed-ofb
 # There is no OID that just denotes "HMAC" oddly enough...
 
                         : HMAC                          : hmac
+# Nor CMAC either
+                        : CMAC                          : cmac
+
+# Synthetic composite ciphersuites
+                        : RC4-HMAC-MD5                  : rc4-hmac-md5
+                        : AES-128-CBC-HMAC-SHA1         : aes-128-cbc-hmac-sha1
+                        : AES-192-CBC-HMAC-SHA1         : aes-192-cbc-hmac-sha1
+                        : AES-256-CBC-HMAC-SHA1         : aes-256-cbc-hmac-sha1
diff --git a/src/lib/libssl/src/crypto/ocsp/ocsp_lib.c b/src/lib/libssl/src/crypto/ocsp/ocsp_lib.c
index e92b86c060..a94dc838ee 100644
--- a/src/lib/libssl/src/crypto/ocsp/ocsp_lib.c
+++ b/src/lib/libssl/src/crypto/ocsp/ocsp_lib.c
@@ -124,7 +124,8 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
         if (!(ASN1_OCTET_STRING_set(cid->issuerNameHash, md, i))) goto err;
 
         /* Calculate the issuerKey hash, excluding tag and length */
-        EVP_Digest(issuerKey->data, issuerKey->length, md, &i, dgst, NULL);
+        if (!EVP_Digest(issuerKey->data, issuerKey->length, md, &i, dgst, NULL))
+                goto err;
 
         if (!(ASN1_OCTET_STRING_set(cid->issuerKeyHash, md, i))) goto err;
 
diff --git a/src/lib/libssl/src/crypto/opensslconf.h b/src/lib/libssl/src/crypto/opensslconf.h
index c21b3913f0..b18f4da496 100644
--- a/src/lib/libssl/src/crypto/opensslconf.h
+++ b/src/lib/libssl/src/crypto/opensslconf.h
@@ -5,6 +5,9 @@
 #ifndef OPENSSL_DOING_MAKEDEPEND
 
 
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
@@ -23,6 +26,9 @@
 #ifndef OPENSSL_NO_RFC3779
 # define OPENSSL_NO_RFC3779
 #endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
 #ifndef OPENSSL_NO_STORE
 # define OPENSSL_NO_STORE
 #endif
@@ -38,6 +44,9 @@
    who haven't had the time to do the appropriate changes in their
    applications.  */
 #ifdef OPENSSL_ALGORITHM_DEFINES
+# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
+#  define NO_EC_NISTP_64_GCC_128
+# endif
 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
 #  define NO_GMP
 # endif
@@ -56,6 +65,9 @@
 # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
 #  define NO_RFC3779
 # endif
+# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
+#  define NO_SCTP
+# endif
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
diff --git a/src/lib/libssl/src/crypto/opensslv.h b/src/lib/libssl/src/crypto/opensslv.h
index d6d61a0c7d..71be3590af 100644
--- a/src/lib/libssl/src/crypto/opensslv.h
+++ b/src/lib/libssl/src/crypto/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  0x1000006fL
+#define OPENSSL_VERSION_NUMBER  0x1000103fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0f-fips 4 Jan 2012"
+#define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1c-fips 10 May 2012"
 #else
-#define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.0f 4 Jan 2012"
+#define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1c 10 May 2012"
 #endif
 #define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/src/lib/libssl/src/crypto/ossl_typ.h b/src/lib/libssl/src/crypto/ossl_typ.h
index 12bd7014de..ea9227f6f9 100644
--- a/src/lib/libssl/src/crypto/ossl_typ.h
+++ b/src/lib/libssl/src/crypto/ossl_typ.h
@@ -91,10 +91,12 @@ typedef struct asn1_string_st ASN1_TIME;
 typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
 typedef struct asn1_string_st ASN1_VISIBLESTRING;
 typedef struct asn1_string_st ASN1_UTF8STRING;
+typedef struct asn1_string_st ASN1_STRING;
 typedef int ASN1_BOOLEAN;
 typedef int ASN1_NULL;
 #endif
 
+typedef struct ASN1_ITEM_st ASN1_ITEM;
 typedef struct asn1_pctx_st ASN1_PCTX;
 
 #ifdef OPENSSL_SYS_WIN32
diff --git a/src/lib/libssl/src/crypto/perlasm/x86asm.pl b/src/lib/libssl/src/crypto/perlasm/x86asm.pl
index 28080caaa6..eb543db2f6 100644
--- a/src/lib/libssl/src/crypto/perlasm/x86asm.pl
+++ b/src/lib/libssl/src/crypto/perlasm/x86asm.pl
@@ -80,6 +80,57 @@ sub ::movq
     {   &::generic("movq",@_);                  }
 }
 
+# SSE>2 instructions
+my %regrm = (   "eax"=>0, "ecx"=>1, "edx"=>2, "ebx"=>3,
+                "esp"=>4, "ebp"=>5, "esi"=>6, "edi"=>7  );
+sub ::pextrd
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /(e[a-dsd][ixp]):xmm([0-7])/)
+    {   &::data_byte(0x66,0x0f,0x3a,0x16,0xc0|($2<<3)|$regrm{$1},$imm); }
+    else
+    {   &::generic("pextrd",@_);                }
+}
+
+sub ::pinsrd
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):(e[a-dsd][ixp])/)
+    {   &::data_byte(0x66,0x0f,0x3a,0x22,0xc0|($1<<3)|$regrm{$2},$imm); }
+    else
+    {   &::generic("pinsrd",@_);                }
+}
+
+sub ::pshufb
+{ my($dst,$src)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
+    {   &data_byte(0x66,0x0f,0x38,0x00,0xc0|($1<<3)|$2);        }
+    else
+    {   &::generic("pshufb",@_);                }
+}
+
+sub ::palignr
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
+    {   &::data_byte(0x66,0x0f,0x3a,0x0f,0xc0|($1<<3)|$2,$imm); }
+    else
+    {   &::generic("palignr",@_);               }
+}
+
+sub ::pclmulqdq
+{ my($dst,$src,$imm)=@_;
+    if ("$dst:$src" =~ /xmm([0-7]):xmm([0-7])/)
+    {   &::data_byte(0x66,0x0f,0x3a,0x44,0xc0|($1<<3)|$2,$imm); }
+    else
+    {   &::generic("pclmulqdq",@_);             }
+}
+
+sub ::rdrand
+{ my ($dst)=@_;
+    if ($dst =~ /(e[a-dsd][ixp])/)
+    {   &::data_byte(0x0f,0xc7,0xf0|$regrm{$dst});      }
+    else
+    {   &::generic("rdrand",@_);        }
+}
+
 # label management
 $lbdecor="L";           # local label decoration, set by package
 $label="000";
@@ -167,7 +218,7 @@ sub ::asm_init
     $filename=$fn;
     $i386=$cpu;
 
-    $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=0;
+    $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$android=0;
     if    (($type eq "elf"))
     {   $elf=1;                 require "x86gas.pl";    }
     elsif (($type eq "a\.out"))
@@ -184,6 +235,8 @@ sub ::asm_init
     {   $win32=1;               require "x86masm.pl";   }
     elsif (($type eq "macosx"))
     {   $aout=1; $macosx=1;     require "x86gas.pl";    }
+    elsif (($type eq "android"))
+    {   $elf=1; $android=1;     require "x86gas.pl";    }
     else
     {   print STDERR <<"EOF";
 Pick one target type from
diff --git a/src/lib/libssl/src/crypto/perlasm/x86nasm.pl b/src/lib/libssl/src/crypto/perlasm/x86nasm.pl
index ce2bed9bb2..ca2511c9eb 100644
--- a/src/lib/libssl/src/crypto/perlasm/x86nasm.pl
+++ b/src/lib/libssl/src/crypto/perlasm/x86nasm.pl
@@ -19,6 +19,8 @@ sub ::generic
         {   $_[0] = "NEAR $_[0]";       }
         elsif ($opcode eq "lea" && $#_==1)  # wipe storage qualifier from lea
         {   $_[1] =~ s/^[^\[]*\[/\[/o;  }
+        elsif ($opcode eq "clflush" && $#_==0)
+        {   $_[0] =~ s/^[^\[]*\[/\[/o;  }
     }
     &::emit($opcode,@_);
   1;
@@ -67,6 +69,7 @@ sub get_mem
 }
 sub ::BP        { &get_mem("BYTE",@_);  }
 sub ::DWP       { &get_mem("DWORD",@_); }
+sub ::WP        { &get_mem("WORD",@_);  }
 sub ::QWP       { &get_mem("",@_);      }
 sub ::BC        { (($::mwerks)?"":"BYTE ")."@_";  }
 sub ::DWC       { (($::mwerks)?"":"DWORD ")."@_"; }
@@ -114,7 +117,7 @@ sub ::file_end
 {   if (grep {/\b${nmdecor}OPENSSL_ia32cap_P\b/i} @out)
     {   my $comm=<<___;
 ${drdecor}segment       .bss
-${drdecor}common        ${nmdecor}OPENSSL_ia32cap_P 4
+${drdecor}common        ${nmdecor}OPENSSL_ia32cap_P 8
 ___
         # comment out OPENSSL_ia32cap_P declarations
         grep {s/(^extern\s+${nmdecor}OPENSSL_ia32cap_P)/\;$1/} @out;
@@ -135,7 +138,8 @@ sub ::public_label
 
 sub ::data_byte
 {   push(@out,(($::mwerks)?".byte\t":"db\t").join(',',@_)."\n");        }
-
+sub ::data_short
+{   push(@out,(($::mwerks)?".word\t":"dw\t").join(',',@_)."\n");        }
 sub ::data_word
 {   push(@out,(($::mwerks)?".long\t":"dd\t").join(',',@_)."\n");        }
 
@@ -163,4 +167,11 @@ sub ::dataseg
     else                { push(@out,"section\t.data align=4\n"); }
 }
 
+sub ::safeseh
+{ my $nm=shift;
+    push(@out,"%if      __NASM_VERSION_ID__ >= 0x02030000\n");
+    push(@out,"safeseh  ".&::LABEL($nm,$nmdecor.$nm)."\n");
+    push(@out,"%endif\n");
+}
+
 1;
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_decr.c b/src/lib/libssl/src/crypto/pkcs12/p12_decr.c
index ba77dbbe32..9d3557e8d7 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_decr.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_decr.c
@@ -89,7 +89,14 @@ unsigned char * PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
                 goto err;
         }
 
-        EVP_CipherUpdate(&ctx, out, &i, in, inlen);
+        if (!EVP_CipherUpdate(&ctx, out, &i, in, inlen))
+                {
+                OPENSSL_free(out);
+                out = NULL;
+                PKCS12err(PKCS12_F_PKCS12_PBE_CRYPT,ERR_R_EVP_LIB);
+                goto err;
+                }
+
         outlen = i;
         if(!EVP_CipherFinal_ex(&ctx, out + i, &i)) {
                 OPENSSL_free(out);
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_key.c b/src/lib/libssl/src/crypto/pkcs12/p12_key.c
index 424203f648..c55c7b60b3 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_key.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_key.c
@@ -152,14 +152,16 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
         for (i = 0; i < Slen; i++) *p++ = salt[i % saltlen];
         for (i = 0; i < Plen; i++) *p++ = pass[i % passlen];
         for (;;) {
-                EVP_DigestInit_ex(&ctx, md_type, NULL);
-                EVP_DigestUpdate(&ctx, D, v);
-                EVP_DigestUpdate(&ctx, I, Ilen);
-                EVP_DigestFinal_ex(&ctx, Ai, NULL);
+                if (!EVP_DigestInit_ex(&ctx, md_type, NULL)
+                        || !EVP_DigestUpdate(&ctx, D, v)
+                        || !EVP_DigestUpdate(&ctx, I, Ilen)
+                        || !EVP_DigestFinal_ex(&ctx, Ai, NULL))
+                        goto err;
                 for (j = 1; j < iter; j++) {
-                        EVP_DigestInit_ex(&ctx, md_type, NULL);
-                        EVP_DigestUpdate(&ctx, Ai, u);
-                        EVP_DigestFinal_ex(&ctx, Ai, NULL);
+                        if (!EVP_DigestInit_ex(&ctx, md_type, NULL)
+                                || !EVP_DigestUpdate(&ctx, Ai, u)
+                                || !EVP_DigestFinal_ex(&ctx, Ai, NULL))
+                        goto err;
                 }
                 memcpy (out, Ai, min (n, u));
                 if (u >= n) {
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c b/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c
index 292cc3ed4a..206b1b0b18 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_kiss.c
@@ -167,7 +167,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
         if (cert && *cert)
                 X509_free(*cert);
         if (x)
-                X509_free(*cert);
+                X509_free(x);
         if (ocerts)
                 sk_X509_pop_free(ocerts, X509_free);
         return 0;
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c b/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c
index 9ab740d51f..96de1bd11e 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c
@@ -97,10 +97,14 @@ int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
                 return 0;
         }
         HMAC_CTX_init(&hmac);
-        HMAC_Init_ex(&hmac, key, md_size, md_type, NULL);
-        HMAC_Update(&hmac, p12->authsafes->d.data->data,
-                                         p12->authsafes->d.data->length);
-        HMAC_Final(&hmac, mac, maclen);
+        if (!HMAC_Init_ex(&hmac, key, md_size, md_type, NULL)
+                || !HMAC_Update(&hmac, p12->authsafes->d.data->data,
+                                         p12->authsafes->d.data->length)
+                || !HMAC_Final(&hmac, mac, maclen))
+                {
+                HMAC_CTX_cleanup(&hmac);
+                return 0;
+                }
         HMAC_CTX_cleanup(&hmac);
         return 1;
 }
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
index 3bf1a367bb..77fda3b82a 100644
--- a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
+++ b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
@@ -204,11 +204,11 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
         unsigned char *ek = NULL;
         size_t eklen;
 
-        int ret = 0;
+        int ret = -1;
 
         pctx = EVP_PKEY_CTX_new(pkey, NULL);
         if (!pctx)
-                return 0;
+                return -1;
 
         if (EVP_PKEY_decrypt_init(pctx) <= 0)
                 goto err;
@@ -235,12 +235,19 @@ static int pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen,
         if (EVP_PKEY_decrypt(pctx, ek, &eklen,
                                 ri->enc_key->data, ri->enc_key->length) <= 0)
                 {
+                ret = 0;
                 PKCS7err(PKCS7_F_PKCS7_DECRYPT_RINFO, ERR_R_EVP_LIB);
                 goto err;
                 }
 
         ret = 1;
 
+        if (*pek)
+                {
+                OPENSSL_cleanse(*pek, *peklen);
+                OPENSSL_free(*pek);
+                }
+
         *pek = ek;
         *peklen = eklen;
 
@@ -423,6 +430,8 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
         STACK_OF(X509_ALGOR) *md_sk=NULL;
         STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
         PKCS7_RECIP_INFO *ri=NULL;
+       unsigned char *ek = NULL, *tkey = NULL;
+       int eklen = 0, tkeylen = 0;
 
         i=OBJ_obj2nid(p7->type);
         p7->state=PKCS7_S_HEADER;
@@ -500,8 +509,6 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                 int max;
                 X509_OBJECT ret;
 #endif
-                unsigned char *ek = NULL;
-                int eklen;
 
                 if ((etmp=BIO_new(BIO_f_cipher())) == NULL)
                         {
@@ -534,29 +541,28 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                         }
 
                 /* If we haven't got a certificate try each ri in turn */
-
                 if (pcert == NULL)
                         {
+                        /* Always attempt to decrypt all rinfo even
+                         * after sucess as a defence against MMA timing
+                         * attacks.
+                         */
                         for (i=0; i<sk_PKCS7_RECIP_INFO_num(rsk); i++)
                                 {
                                 ri=sk_PKCS7_RECIP_INFO_value(rsk,i);
+                                
                                 if (pkcs7_decrypt_rinfo(&ek, &eklen,
-                                                        ri, pkey) > 0)
-                                        break;
+                                                        ri, pkey) < 0)
+                                        goto err;
                                 ERR_clear_error();
-                                ri = NULL;
-                                }
-                        if (ri == NULL)
-                                {
-                                PKCS7err(PKCS7_F_PKCS7_DATADECODE,
-                                      PKCS7_R_NO_RECIPIENT_MATCHES_KEY);
-                                goto err;
                                 }
                         }
                 else
                         {
-                        if (pkcs7_decrypt_rinfo(&ek, &eklen, ri, pkey) <= 0)
+                        /* Only exit on fatal errors, not decrypt failure */
+                        if (pkcs7_decrypt_rinfo(&ek, &eklen, ri, pkey) < 0)
                                 goto err;
+                        ERR_clear_error();
                         }
 
                 evp_ctx=NULL;
@@ -565,6 +571,19 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                         goto err;
                 if (EVP_CIPHER_asn1_to_param(evp_ctx,enc_alg->parameter) < 0)
                         goto err;
+                /* Generate random key as MMA defence */
+                tkeylen = EVP_CIPHER_CTX_key_length(evp_ctx);
+                tkey = OPENSSL_malloc(tkeylen);
+                if (!tkey)
+                        goto err;
+                if (EVP_CIPHER_CTX_rand_key(evp_ctx, tkey) <= 0)
+                        goto err;
+                if (ek == NULL)
+                        {
+                        ek = tkey;
+                        eklen = tkeylen;
+                        tkey = NULL;
+                        }
 
                 if (eklen != EVP_CIPHER_CTX_key_length(evp_ctx)) {
                         /* Some S/MIME clients don't use the same key
@@ -573,11 +592,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                          */
                         if(!EVP_CIPHER_CTX_set_key_length(evp_ctx, eklen))
                                 {
-                                PKCS7err(PKCS7_F_PKCS7_DATADECODE,
-                                        PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH);
-                                goto err;
+                                /* Use random key as MMA defence */
+                                OPENSSL_cleanse(ek, eklen);
+                                OPENSSL_free(ek);
+                                ek = tkey;
+                                eklen = tkeylen;
+                                tkey = NULL;
                                 }
                 } 
+                /* Clear errors so we don't leak information useful in MMA */
+                ERR_clear_error();
                 if (EVP_CipherInit_ex(evp_ctx,NULL,NULL,ek,NULL,0) <= 0)
                         goto err;
 
@@ -585,6 +609,13 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
                         {
                         OPENSSL_cleanse(ek,eklen);
                         OPENSSL_free(ek);
+                       ek = NULL;
+                        }
+                if (tkey)
+                        {
+                        OPENSSL_cleanse(tkey,tkeylen);
+                        OPENSSL_free(tkey);
+                       tkey = NULL;
                         }
 
                 if (out == NULL)
@@ -627,6 +658,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
         if (0)
                 {
 err:
+               if (ek)
+                       {
+                       OPENSSL_cleanse(ek,eklen);
+                       OPENSSL_free(ek);
+                       }
+               if (tkey)
+                       {
+                       OPENSSL_cleanse(tkey,tkeylen);
+                       OPENSSL_free(tkey);
+                       }
                 if (out != NULL) BIO_free_all(out);
                 if (btmp != NULL) BIO_free_all(btmp);
                 if (etmp != NULL) BIO_free_all(etmp);
@@ -676,7 +717,11 @@ static int do_pkcs7_signed_attrib(PKCS7_SIGNER_INFO *si, EVP_MD_CTX *mctx)
                 }
 
         /* Add digest */
-        EVP_DigestFinal_ex(mctx, md_data,&md_len);
+        if (!EVP_DigestFinal_ex(mctx, md_data,&md_len))
+                {
+                PKCS7err(PKCS7_F_DO_PKCS7_SIGNED_ATTRIB, ERR_R_EVP_LIB);
+                return 0;
+                }
         if (!PKCS7_add1_attrib_digest(si, md_data, md_len))
                 {
                 PKCS7err(PKCS7_F_DO_PKCS7_SIGNED_ATTRIB, ERR_R_MALLOC_FAILURE);
@@ -784,7 +829,8 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
 
                         /* We now have the EVP_MD_CTX, lets do the
                          * signing. */
-                        EVP_MD_CTX_copy_ex(&ctx_tmp,mdc);
+                        if (!EVP_MD_CTX_copy_ex(&ctx_tmp,mdc))
+                                goto err;
 
                         sk=si->auth_attr;
 
@@ -822,7 +868,8 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
                 if (!PKCS7_find_digest(&mdc, bio,
                                 OBJ_obj2nid(p7->d.digest->md->algorithm)))
                         goto err;
-                EVP_DigestFinal_ex(mdc,md_data,&md_len);
+                if (!EVP_DigestFinal_ex(mdc,md_data,&md_len))
+                        goto err;
                 M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
                 }
 
@@ -1015,7 +1062,8 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
 
         /* mdc is the digest ctx that we want, unless there are attributes,
          * in which case the digest is the signed attributes */
-        EVP_MD_CTX_copy_ex(&mdc_tmp,mdc);
+        if (!EVP_MD_CTX_copy_ex(&mdc_tmp,mdc))
+                goto err;
 
         sk=si->auth_attr;
         if ((sk != NULL) && (sk_X509_ATTRIBUTE_num(sk) != 0))
@@ -1025,7 +1073,8 @@ int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
                 int alen;
                 ASN1_OCTET_STRING *message_digest;
 
-                EVP_DigestFinal_ex(&mdc_tmp,md_dat,&md_len);
+                if (!EVP_DigestFinal_ex(&mdc_tmp,md_dat,&md_len))
+                        goto err;
                 message_digest=PKCS7_digest_from_attributes(sk);
                 if (!message_digest)
                         {
@@ -1050,7 +1099,8 @@ for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n");
                         goto err;
                         }
 
-                EVP_VerifyInit_ex(&mdc_tmp,EVP_get_digestbynid(md_type), NULL);
+                if (!EVP_VerifyInit_ex(&mdc_tmp,EVP_get_digestbynid(md_type), NULL))
+                        goto err;
 
                 alen = ASN1_item_i2d((ASN1_VALUE *)sk, &abuf,
                                                 ASN1_ITEM_rptr(PKCS7_ATTR_VERIFY));
@@ -1060,7 +1110,8 @@ for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n");
                         ret = -1;
                         goto err;
                         }
-                EVP_VerifyUpdate(&mdc_tmp, abuf, alen);
+                if (!EVP_VerifyUpdate(&mdc_tmp, abuf, alen))
+                        goto err;
 
                 OPENSSL_free(abuf);
                 }
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_smime.c b/src/lib/libssl/src/crypto/pkcs7/pk7_smime.c
index 86742d0dcd..a5104f8d05 100644
--- a/src/lib/libssl/src/crypto/pkcs7/pk7_smime.c
+++ b/src/lib/libssl/src/crypto/pkcs7/pk7_smime.c
@@ -573,15 +573,34 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
                         return 0;
                 }
                 ret = SMIME_text(bread, data);
+                if (ret > 0 && BIO_method_type(tmpmem) == BIO_TYPE_CIPHER)
+                        {
+                        if (!BIO_get_cipher_status(tmpmem))
+                                ret = 0;
+                        }
                 BIO_free_all(bread);
                 return ret;
         } else {
                 for(;;) {
                         i = BIO_read(tmpmem, buf, sizeof(buf));
-                        if(i <= 0) break;
-                        BIO_write(data, buf, i);
+                        if(i <= 0)
+                                {
+                                ret = 1;
+                                if (BIO_method_type(tmpmem) == BIO_TYPE_CIPHER)
+                                        {
+                                        if (!BIO_get_cipher_status(tmpmem))
+                                                ret = 0;
+                                        }
+                                        
+                                break;
+                                }
+                        if (BIO_write(data, buf, i) != i)
+                                {
+                                ret = 0;
+                                break;
+                                }
                 }
                 BIO_free_all(tmpmem);
-                return 1;
+                return ret;
         }
 }
diff --git a/src/lib/libssl/src/crypto/rand/md_rand.c b/src/lib/libssl/src/crypto/rand/md_rand.c
index b2f04ff13e..fcdd3f2a84 100644
--- a/src/lib/libssl/src/crypto/rand/md_rand.c
+++ b/src/lib/libssl/src/crypto/rand/md_rand.c
@@ -109,6 +109,8 @@
  *
  */
 
+#define OPENSSL_FIPSEVP
+
 #ifdef MD_RAND_DEBUG
 # ifndef NDEBUG
 #   define NDEBUG
@@ -157,13 +159,14 @@ const char RAND_version[]="RAND" OPENSSL_VERSION_PTEXT;
 static void ssleay_rand_cleanup(void);
 static void ssleay_rand_seed(const void *buf, int num);
 static void ssleay_rand_add(const void *buf, int num, double add_entropy);
-static int ssleay_rand_bytes(unsigned char *buf, int num);
+static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo);
+static int ssleay_rand_nopseudo_bytes(unsigned char *buf, int num);
 static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num);
 static int ssleay_rand_status(void);
 
 RAND_METHOD rand_ssleay_meth={
         ssleay_rand_seed,
-        ssleay_rand_bytes,
+        ssleay_rand_nopseudo_bytes,
         ssleay_rand_cleanup,
         ssleay_rand_add,
         ssleay_rand_pseudo_bytes,
@@ -328,7 +331,7 @@ static void ssleay_rand_seed(const void *buf, int num)
         ssleay_rand_add(buf, num, (double)num);
         }
 
-static int ssleay_rand_bytes(unsigned char *buf, int num)
+static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo)
         {
         static volatile int stirred_pool = 0;
         int i,j,k,st_num,st_idx;
@@ -517,7 +520,9 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
         EVP_MD_CTX_cleanup(&m);
         if (ok)
                 return(1);
-        else
+        else if (pseudo)
+                return 0;
+        else 
                 {
                 RANDerr(RAND_F_SSLEAY_RAND_BYTES,RAND_R_PRNG_NOT_SEEDED);
                 ERR_add_error_data(1, "You need to read the OpenSSL FAQ, "
@@ -526,22 +531,16 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
                 }
         }
 
+static int ssleay_rand_nopseudo_bytes(unsigned char *buf, int num)
+        {
+        return ssleay_rand_bytes(buf, num, 0);
+        }
+
 /* pseudo-random bytes that are guaranteed to be unique but not
    unpredictable */
 static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num) 
         {
-        int ret;
-        unsigned long err;
-
-        ret = RAND_bytes(buf, num);
-        if (ret == 0)
-                {
-                err = ERR_peek_error();
-                if (ERR_GET_LIB(err) == ERR_LIB_RAND &&
-                    ERR_GET_REASON(err) == RAND_R_PRNG_NOT_SEEDED)
-                        ERR_clear_error();
-                }
-        return (ret);
+        return ssleay_rand_bytes(buf, num, 1);
         }
 
 static int ssleay_rand_status(void)
diff --git a/src/lib/libssl/src/crypto/rand/rand.h b/src/lib/libssl/src/crypto/rand/rand.h
index ac6c021763..dc8fcf94c5 100644
--- a/src/lib/libssl/src/crypto/rand/rand.h
+++ b/src/lib/libssl/src/crypto/rand/rand.h
@@ -119,6 +119,11 @@ int RAND_event(UINT, WPARAM, LPARAM);
 
 #endif
 
+#ifdef OPENSSL_FIPS
+void RAND_set_fips_drbg_type(int type, int flags);
+int RAND_init_fips(void);
+#endif
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -129,9 +134,13 @@ void ERR_load_RAND_strings(void);
 
 /* Function codes. */
 #define RAND_F_RAND_GET_RAND_METHOD                      101
+#define RAND_F_RAND_INIT_FIPS                            102
 #define RAND_F_SSLEAY_RAND_BYTES                         100
 
 /* Reason codes. */
+#define RAND_R_ERROR_INITIALISING_DRBG                   102
+#define RAND_R_ERROR_INSTANTIATING_DRBG                  103
+#define RAND_R_NO_FIPS_RANDOM_METHOD_SET                 101
 #define RAND_R_PRNG_NOT_SEEDED                           100
 
 #ifdef  __cplusplus
diff --git a/src/lib/libssl/src/crypto/rand/rand_err.c b/src/lib/libssl/src/crypto/rand/rand_err.c
index 03cda4dd92..b8586c8f4a 100644
--- a/src/lib/libssl/src/crypto/rand/rand_err.c
+++ b/src/lib/libssl/src/crypto/rand/rand_err.c
@@ -1,6 +1,6 @@
 /* crypto/rand/rand_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2006 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
@@ -71,12 +71,16 @@
 static ERR_STRING_DATA RAND_str_functs[]=
         {
 {ERR_FUNC(RAND_F_RAND_GET_RAND_METHOD), "RAND_get_rand_method"},
+{ERR_FUNC(RAND_F_RAND_INIT_FIPS),       "RAND_init_fips"},
 {ERR_FUNC(RAND_F_SSLEAY_RAND_BYTES),    "SSLEAY_RAND_BYTES"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA RAND_str_reasons[]=
         {
+{ERR_REASON(RAND_R_ERROR_INITIALISING_DRBG),"error initialising drbg"},
+{ERR_REASON(RAND_R_ERROR_INSTANTIATING_DRBG),"error instantiating drbg"},
+{ERR_REASON(RAND_R_NO_FIPS_RANDOM_METHOD_SET),"no fips random method set"},
 {ERR_REASON(RAND_R_PRNG_NOT_SEEDED)      ,"PRNG not seeded"},
 {0,NULL}
         };
diff --git a/src/lib/libssl/src/crypto/rand/rand_lib.c b/src/lib/libssl/src/crypto/rand/rand_lib.c
index 513e338985..daf1dab973 100644
--- a/src/lib/libssl/src/crypto/rand/rand_lib.c
+++ b/src/lib/libssl/src/crypto/rand/rand_lib.c
@@ -60,10 +60,16 @@
 #include <time.h>
 #include "cryptlib.h"
 #include <openssl/rand.h>
+
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#include <openssl/fips_rand.h>
+#endif
+
 #ifndef OPENSSL_NO_ENGINE
 /* non-NULL if default_RAND_meth is ENGINE-provided */
 static ENGINE *funct_ref =NULL;
@@ -174,3 +180,116 @@ int RAND_status(void)
                 return meth->status();
         return 0;
         }
+
+#ifdef OPENSSL_FIPS
+
+/* FIPS DRBG initialisation code. This sets up the DRBG for use by the
+ * rest of OpenSSL. 
+ */
+
+/* Entropy gatherer: use standard OpenSSL PRNG to seed (this will gather
+ * entropy internally through RAND_poll().
+ */
+
+static size_t drbg_get_entropy(DRBG_CTX *ctx, unsigned char **pout,
+                                int entropy, size_t min_len, size_t max_len)
+        {
+        /* Round up request to multiple of block size */
+        min_len = ((min_len + 19) / 20) * 20;
+        *pout = OPENSSL_malloc(min_len);
+        if (!*pout)
+                return 0;
+        if (RAND_SSLeay()->bytes(*pout, min_len) <= 0)
+                {
+                OPENSSL_free(*pout);
+                *pout = NULL;
+                return 0;
+                }
+        return min_len;
+        }
+
+static void drbg_free_entropy(DRBG_CTX *ctx, unsigned char *out, size_t olen)
+        {
+        OPENSSL_cleanse(out, olen);
+        OPENSSL_free(out);
+        }
+
+/* Set "additional input" when generating random data. This uses the
+ * current PID, a time value and a counter.
+ */
+
+static size_t drbg_get_adin(DRBG_CTX *ctx, unsigned char **pout)
+        {
+        /* Use of static variables is OK as this happens under a lock */
+        static unsigned char buf[16];
+        static unsigned long counter;
+        FIPS_get_timevec(buf, &counter);
+        *pout = buf;
+        return sizeof(buf);
+        }
+
+/* RAND_add() and RAND_seed() pass through to OpenSSL PRNG so it is 
+ * correctly seeded by RAND_poll().
+ */
+
+static int drbg_rand_add(DRBG_CTX *ctx, const void *in, int inlen,
+                                double entropy)
+        {
+        RAND_SSLeay()->add(in, inlen, entropy);
+        return 1;
+        }
+
+static int drbg_rand_seed(DRBG_CTX *ctx, const void *in, int inlen)
+        {
+        RAND_SSLeay()->seed(in, inlen);
+        return 1;
+        }
+
+#ifndef OPENSSL_DRBG_DEFAULT_TYPE
+#define OPENSSL_DRBG_DEFAULT_TYPE       NID_aes_256_ctr
+#endif
+#ifndef OPENSSL_DRBG_DEFAULT_FLAGS
+#define OPENSSL_DRBG_DEFAULT_FLAGS      DRBG_FLAG_CTR_USE_DF
+#endif 
+
+static int fips_drbg_type = OPENSSL_DRBG_DEFAULT_TYPE;
+static int fips_drbg_flags = OPENSSL_DRBG_DEFAULT_FLAGS;
+
+void RAND_set_fips_drbg_type(int type, int flags)
+        {
+        fips_drbg_type = type;
+        fips_drbg_flags = flags;
+        }
+
+int RAND_init_fips(void)
+        {
+        DRBG_CTX *dctx;
+        size_t plen;
+        unsigned char pers[32], *p;
+        dctx = FIPS_get_default_drbg();
+        if (FIPS_drbg_init(dctx, fips_drbg_type, fips_drbg_flags) <= 0)
+                {
+                RANDerr(RAND_F_RAND_INIT_FIPS, RAND_R_ERROR_INITIALISING_DRBG);
+                return 0;
+                }
+                
+        FIPS_drbg_set_callbacks(dctx,
+                                drbg_get_entropy, drbg_free_entropy, 20,
+                                drbg_get_entropy, drbg_free_entropy);
+        FIPS_drbg_set_rand_callbacks(dctx, drbg_get_adin, 0,
+                                        drbg_rand_seed, drbg_rand_add);
+        /* Personalisation string: a string followed by date time vector */
+        strcpy((char *)pers, "OpenSSL DRBG2.0");
+        plen = drbg_get_adin(dctx, &p);
+        memcpy(pers + 16, p, plen);
+
+        if (FIPS_drbg_instantiate(dctx, pers, sizeof(pers)) <= 0)
+                {
+                RANDerr(RAND_F_RAND_INIT_FIPS, RAND_R_ERROR_INSTANTIATING_DRBG);
+                return 0;
+                }
+        FIPS_rand_set_method(FIPS_drbg_method());
+        return 1;
+        }
+
+#endif
diff --git a/src/lib/libssl/src/crypto/rand/randfile.c b/src/lib/libssl/src/crypto/rand/randfile.c
index bc7d9c5804..030e07f418 100644
--- a/src/lib/libssl/src/crypto/rand/randfile.c
+++ b/src/lib/libssl/src/crypto/rand/randfile.c
@@ -137,7 +137,7 @@ int RAND_load_file(const char *file, long bytes)
         in=fopen(file,"rb");
 #endif
         if (in == NULL) goto err;
-#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPNESSL_NO_POSIX_IO)
+#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPENSSL_NO_POSIX_IO)
         if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
           /* this file is a device. we don't want read an infinite number
            * of bytes from a random device, nor do we want to use buffered
diff --git a/src/lib/libssl/src/crypto/rc2/Makefile b/src/lib/libssl/src/crypto/rc2/Makefile
index 73eac347e7..8a9d49ab5e 100644
--- a/src/lib/libssl/src/crypto/rc2/Makefile
+++ b/src/lib/libssl/src/crypto/rc2/Makefile
@@ -78,7 +78,11 @@ rc2_cbc.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
 rc2_cbc.o: rc2_cbc.c rc2_locl.h
 rc2_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 rc2_ecb.o: ../../include/openssl/rc2.h rc2_ecb.c rc2_locl.h
-rc2_skey.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
+rc2_skey.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rc2_skey.o: ../../include/openssl/opensslconf.h
+rc2_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rc2_skey.o: ../../include/openssl/rc2.h ../../include/openssl/safestack.h
+rc2_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rc2_skey.o: rc2_locl.h rc2_skey.c
 rc2cfb64.o: ../../include/openssl/opensslconf.h ../../include/openssl/rc2.h
 rc2cfb64.o: rc2_locl.h rc2cfb64.c
diff --git a/src/lib/libssl/src/crypto/rc2/rc2.h b/src/lib/libssl/src/crypto/rc2/rc2.h
index 34c8362317..e542ec94ff 100644
--- a/src/lib/libssl/src/crypto/rc2/rc2.h
+++ b/src/lib/libssl/src/crypto/rc2/rc2.h
@@ -79,7 +79,9 @@ typedef struct rc2_key_st
         RC2_INT data[64];
         } RC2_KEY;
 
- 
+#ifdef OPENSSL_FIPS 
+void private_RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits);
+#endif
 void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,int bits);
 void RC2_ecb_encrypt(const unsigned char *in,unsigned char *out,RC2_KEY *key,
                      int enc);
diff --git a/src/lib/libssl/src/crypto/rc2/rc2_skey.c b/src/lib/libssl/src/crypto/rc2/rc2_skey.c
index 0150b0e035..6668ac011f 100644
--- a/src/lib/libssl/src/crypto/rc2/rc2_skey.c
+++ b/src/lib/libssl/src/crypto/rc2/rc2_skey.c
@@ -56,6 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
+#include <openssl/crypto.h>
 #include <openssl/rc2.h>
 #include "rc2_locl.h"
 
@@ -95,6 +96,13 @@ static const unsigned char key_table[256]={
  * the same as specifying 1024 for the 'bits' parameter.  Bsafe uses
  * a version where the bits parameter is the same as len*8 */
 void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits)
+#ifdef OPENSSL_FIPS
+        {
+        fips_cipher_abort(RC2);
+        private_RC2_set_key(key, len, data, bits);
+        }
+void private_RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits)
+#endif
         {
         int i,j;
         unsigned char *k;
diff --git a/src/lib/libssl/src/crypto/rc4/Makefile b/src/lib/libssl/src/crypto/rc4/Makefile
index 264451a213..1614d47961 100644
--- a/src/lib/libssl/src/crypto/rc4/Makefile
+++ b/src/lib/libssl/src/crypto/rc4/Makefile
@@ -21,8 +21,8 @@ TEST=rc4test.c
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=rc4_skey.c rc4_enc.c
-LIBOBJ=$(RC4_ENC)
+LIBSRC=rc4_skey.c rc4_enc.c rc4_utl.c
+LIBOBJ=$(RC4_ENC) rc4_utl.o
 
 SRC= $(LIBSRC)
 
@@ -46,12 +46,14 @@ rc4-586.s:	asm/rc4-586.pl ../perlasm/x86asm.pl
 
 rc4-x86_64.s: asm/rc4-x86_64.pl
         $(PERL) asm/rc4-x86_64.pl $(PERLASM_SCHEME) > $@
+rc4-md5-x86_64.s:       asm/rc4-md5-x86_64.pl
+        $(PERL) asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME) > $@
 
 rc4-ia64.S: asm/rc4-ia64.pl
         $(PERL) asm/rc4-ia64.pl $(CFLAGS) > $@
 
-rc4-s390x.s:    asm/rc4-s390x.pl
-        $(PERL) asm/rc4-s390x.pl > $@
+rc4-parisc.s:   asm/rc4-parisc.pl
+        $(PERL) asm/rc4-parisc.pl $(PERLASM_SCHEME) $@
 
 rc4-ia64.s: rc4-ia64.S
         @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
@@ -60,6 +62,9 @@ rc4-ia64.s: rc4-ia64.S
         *)      exit 1 ;; \
         esac
 
+# GNU make "catch all"
+rc4-%.s:        asm/rc4-%.pl;   $(PERL) $< $(PERLASM_SCHEME) $@
+
 files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
 
@@ -113,3 +118,8 @@ rc4_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rc4_skey.o: ../../include/openssl/rc4.h ../../include/openssl/safestack.h
 rc4_skey.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rc4_skey.o: ../cryptlib.h rc4_locl.h rc4_skey.c
+rc4_utl.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rc4_utl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+rc4_utl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc4.h
+rc4_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+rc4_utl.o: ../../include/openssl/symhacks.h rc4_utl.c
diff --git a/src/lib/libssl/src/crypto/rc4/asm/rc4-586.pl b/src/lib/libssl/src/crypto/rc4/asm/rc4-586.pl
index 38a44a70ef..5c9ac6ad28 100644
--- a/src/lib/libssl/src/crypto/rc4/asm/rc4-586.pl
+++ b/src/lib/libssl/src/crypto/rc4/asm/rc4-586.pl
@@ -28,6 +28,34 @@
 #
 #                                       <appro@fy.chalmers.se>
 
+# May 2011
+#
+# Optimize for Core2 and Westmere [and incidentally Opteron]. Current
+# performance in cycles per processed byte (less is better) and
+# improvement relative to previous version of this module is:
+#
+# Pentium       10.2                    # original numbers
+# Pentium III   7.8(*)
+# Intel P4      7.5
+#
+# Opteron       6.1/+20%                # new MMX numbers
+# Core2         5.3/+67%(**)
+# Westmere      5.1/+94%(**)
+# Sandy Bridge  5.0/+8%
+# Atom          12.6/+6%
+#
+# (*)   PIII can actually deliver 6.6 cycles per byte with MMX code,
+#       but this specific code performs poorly on Core2. And vice
+#       versa, below MMX/SSE code delivering 5.8/7.1 on Core2 performs
+#       poorly on PIII, at 8.0/14.5:-( As PIII is not a "hot" CPU
+#       [anymore], I chose to discard PIII-specific code path and opt
+#       for original IALU-only code, which is why MMX/SSE code path
+#       is guarded by SSE2 bit (see below), not MMX/SSE.
+# (**)  Performance vs. block size on Core2 and Westmere had a maximum
+#       at ... 64 bytes block size. And it was quite a maximum, 40-60%
+#       in comparison to largest 8KB block size. Above improvement
+#       coefficients are for the largest block size.
+
 $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
 push(@INC,"${dir}","${dir}../../perlasm");
 require "x86asm.pl";
@@ -62,6 +90,68 @@ sub RC4_loop {
         &$func  ($out,&DWP(0,$dat,$ty,4));
 }
 
+if ($alt=0) {
+  # >20% faster on Atom and Sandy Bridge[!], 8% faster on Opteron,
+  # but ~40% slower on Core2 and Westmere... Attempt to add movz
+  # brings down Opteron by 25%, Atom and Sandy Bridge by 15%, yet
+  # on Core2 with movz it's almost 20% slower than below alternative
+  # code... Yes, it's a total mess...
+  my @XX=($xx,$out);
+  $RC4_loop_mmx = sub {         # SSE actually...
+    my $i=shift;
+    my $j=$i<=0?0:$i>>1;
+    my $mm=$i<=0?"mm0":"mm".($i&1);
+
+        &add    (&LB($yy),&LB($tx));
+        &lea    (@XX[1],&DWP(1,@XX[0]));
+        &pxor   ("mm2","mm0")                           if ($i==0);
+        &psllq  ("mm1",8)                               if ($i==0);
+        &and    (@XX[1],0xff);
+        &pxor   ("mm0","mm0")                           if ($i<=0);
+        &mov    ($ty,&DWP(0,$dat,$yy,4));
+        &mov    (&DWP(0,$dat,$yy,4),$tx);
+        &pxor   ("mm1","mm2")                           if ($i==0);
+        &mov    (&DWP(0,$dat,$XX[0],4),$ty);
+        &add    (&LB($ty),&LB($tx));
+        &movd   (@XX[0],"mm7")                          if ($i==0);
+        &mov    ($tx,&DWP(0,$dat,@XX[1],4));
+        &pxor   ("mm1","mm1")                           if ($i==1);
+        &movq   ("mm2",&QWP(0,$inp))                    if ($i==1);
+        &movq   (&QWP(-8,(@XX[0],$inp)),"mm1")          if ($i==0);
+        &pinsrw ($mm,&DWP(0,$dat,$ty,4),$j);
+
+        push    (@XX,shift(@XX))                        if ($i>=0);
+  }
+} else {
+  # Using pinsrw here improves performane on Intel CPUs by 2-3%, but
+  # brings down AMD by 7%...
+  $RC4_loop_mmx = sub {
+    my $i=shift;
+
+        &add    (&LB($yy),&LB($tx));
+        &psllq  ("mm1",8*(($i-1)&7))                    if (abs($i)!=1);
+        &mov    ($ty,&DWP(0,$dat,$yy,4));
+        &mov    (&DWP(0,$dat,$yy,4),$tx);
+        &mov    (&DWP(0,$dat,$xx,4),$ty);
+        &inc    ($xx);
+        &add    ($ty,$tx);
+        &movz   ($xx,&LB($xx));                         # (*)
+        &movz   ($ty,&LB($ty));                         # (*)
+        &pxor   ("mm2",$i==1?"mm0":"mm1")               if ($i>=0);
+        &movq   ("mm0",&QWP(0,$inp))                    if ($i<=0);
+        &movq   (&QWP(-8,($out,$inp)),"mm2")            if ($i==0);
+        &mov    ($tx,&DWP(0,$dat,$xx,4));
+        &movd   ($i>0?"mm1":"mm2",&DWP(0,$dat,$ty,4));
+
+        # (*)   This is the key to Core2 and Westmere performance.
+        #       Whithout movz out-of-order execution logic confuses
+        #       itself and fails to reorder loads and stores. Problem
+        #       appears to be fixed in Sandy Bridge...
+  }
+}
+
+&external_label("OPENSSL_ia32cap_P");
+
 # void RC4(RC4_KEY *key,size_t len,const unsigned char *inp,unsigned char *out);
 &function_begin("RC4");
         &mov    ($dat,&wparam(0));      # load key schedule pointer
@@ -94,11 +184,56 @@ sub RC4_loop {
         &and    ($ty,-4);               # how many 4-byte chunks?
         &jz     (&label("loop1"));
 
+        &test   ($ty,-8);
+        &mov    (&wparam(3),$out);      # $out as accumulator in these loops
+        &jz     (&label("go4loop4"));
+
+        &picmeup($out,"OPENSSL_ia32cap_P");
+        &bt     (&DWP(0,$out),26);      # check SSE2 bit [could have been MMX]
+        &jnc    (&label("go4loop4"));
+
+        &mov    ($out,&wparam(3))       if (!$alt);
+        &movd   ("mm7",&wparam(3))      if ($alt);
+        &and    ($ty,-8);
+        &lea    ($ty,&DWP(-8,$inp,$ty));
+        &mov    (&DWP(-4,$dat),$ty);    # save input+(len/8)*8-8
+
+        &$RC4_loop_mmx(-1);
+        &jmp(&label("loop_mmx_enter"));
+
+        &set_label("loop_mmx",16);
+                &$RC4_loop_mmx(0);
+        &set_label("loop_mmx_enter");
+                for     ($i=1;$i<8;$i++) { &$RC4_loop_mmx($i); }
+                &mov    ($ty,$yy);
+                &xor    ($yy,$yy);              # this is second key to Core2
+                &mov    (&LB($yy),&LB($ty));    # and Westmere performance...
+                &cmp    ($inp,&DWP(-4,$dat));
+                &lea    ($inp,&DWP(8,$inp));
+        &jb     (&label("loop_mmx"));
+
+    if ($alt) {
+        &movd   ($out,"mm7");
+        &pxor   ("mm2","mm0");
+        &psllq  ("mm1",8);
+        &pxor   ("mm1","mm2");
+        &movq   (&QWP(-8,$out,$inp),"mm1");
+    } else {
+        &psllq  ("mm1",56);
+        &pxor   ("mm2","mm1");
+        &movq   (&QWP(-8,$out,$inp),"mm2");
+    }
+        &emms   ();
+
+        &cmp    ($inp,&wparam(1));      # compare to input+len
+        &je     (&label("done"));
+        &jmp    (&label("loop1"));
+
+&set_label("go4loop4",16);
         &lea    ($ty,&DWP(-4,$inp,$ty));
         &mov    (&wparam(2),$ty);       # save input+(len/4)*4-4
-        &mov    (&wparam(3),$out);      # $out as accumulator in this loop
 
-        &set_label("loop4",16);
+        &set_label("loop4");
                 for ($i=0;$i<4;$i++) { RC4_loop($i); }
                 &ror    ($out,8);
                 &xor    ($out,&DWP(0,$inp));
@@ -151,7 +286,7 @@ sub RC4_loop {
 
 &set_label("done");
         &dec    (&LB($xx));
-        &mov    (&BP(-4,$dat),&LB($yy));        # save key->y
+        &mov    (&DWP(-4,$dat),$yy);            # save key->y
         &mov    (&BP(-8,$dat),&LB($xx));        # save key->x
 &set_label("abort");
 &function_end("RC4");
@@ -164,10 +299,8 @@ $idi="ebp";
 $ido="ecx";
 $idx="edx";
 
-&external_label("OPENSSL_ia32cap_P");
-
 # void RC4_set_key(RC4_KEY *key,int len,const unsigned char *data);
-&function_begin("RC4_set_key");
+&function_begin("private_RC4_set_key");
         &mov    ($out,&wparam(0));              # load key
         &mov    ($idi,&wparam(1));              # load len
         &mov    ($inp,&wparam(2));              # load data
@@ -245,7 +378,7 @@ $idx="edx";
         &xor    ("eax","eax");
         &mov    (&DWP(-8,$out),"eax");          # key->x=0;
         &mov    (&DWP(-4,$out),"eax");          # key->y=0;
-&function_end("RC4_set_key");
+&function_end("private_RC4_set_key");
 
 # const char *RC4_options(void);
 &function_begin_B("RC4_options");
@@ -254,14 +387,21 @@ $idx="edx";
         &blindpop("eax");
         &lea    ("eax",&DWP(&label("opts")."-".&label("pic_point"),"eax"));
         &picmeup("edx","OPENSSL_ia32cap_P");
-        &bt     (&DWP(0,"edx"),20);
-        &jnc    (&label("skip"));
-          &add  ("eax",12);
-        &set_label("skip");
+        &mov    ("edx",&DWP(0,"edx"));
+        &bt     ("edx",20);
+        &jc     (&label("1xchar"));
+        &bt     ("edx",26);
+        &jnc    (&label("ret"));
+        &add    ("eax",25);
+        &ret    ();
+&set_label("1xchar");
+        &add    ("eax",12);
+&set_label("ret");
         &ret    ();
 &set_label("opts",64);
 &asciz  ("rc4(4x,int)");
 &asciz  ("rc4(1x,char)");
+&asciz  ("rc4(8x,mmx)");
 &asciz  ("RC4 for x86, CRYPTOGAMS by <appro\@openssl.org>");
 &align  (64);
 &function_end_B("RC4_options");
diff --git a/src/lib/libssl/src/crypto/rc4/rc4.h b/src/lib/libssl/src/crypto/rc4/rc4.h
index 29d1acccf5..88ceb46bc5 100644
--- a/src/lib/libssl/src/crypto/rc4/rc4.h
+++ b/src/lib/libssl/src/crypto/rc4/rc4.h
@@ -79,6 +79,7 @@ typedef struct rc4_key_st
  
 const char *RC4_options(void);
 void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
+void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
 void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
                 unsigned char *outdata);
 
diff --git a/src/lib/libssl/src/crypto/rc4/rc4_skey.c b/src/lib/libssl/src/crypto/rc4/rc4_skey.c
index b22c40b0bd..fda27636e7 100644
--- a/src/lib/libssl/src/crypto/rc4/rc4_skey.c
+++ b/src/lib/libssl/src/crypto/rc4/rc4_skey.c
@@ -85,7 +85,7 @@ const char *RC4_options(void)
  * Date: Wed, 14 Sep 1994 06:35:31 GMT
  */
 
-void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
+void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
         {
         register RC4_INT tmp;
         register int id1,id2;
@@ -104,40 +104,6 @@ void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
                 d[(n)]=d[id2]; \
                 d[id2]=tmp; }
 
-#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM)
-# if    defined(__i386)   || defined(__i386__)   || defined(_M_IX86) || \
-        defined(__INTEL__) || \
-        defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64)
-        if (sizeof(RC4_INT) > 1) {
-                /*
-                 * Unlike all other x86 [and x86_64] implementations,
-                 * Intel P4 core [including EM64T] was found to perform
-                 * poorly with wider RC4_INT. Performance improvement
-                 * for IA-32 hand-coded assembler turned out to be 2.8x
-                 * if re-coded for RC4_CHAR! It's however inappropriate
-                 * to just switch to RC4_CHAR for x86[_64], as non-P4
-                 * implementations suffer from significant performance
-                 * losses then, e.g. PIII exhibits >2x deterioration,
-                 * and so does Opteron. In order to assure optimal
-                 * all-round performance, let us [try to] detect P4 at
-                 * run-time by checking upon HTT bit in CPU capability
-                 * vector and set up compressed key schedule, which is
-                 * recognized by correspondingly updated assembler
-                 * module...
-                 *                              <appro@fy.chalmers.se>
-                 */
-                if (OPENSSL_ia32cap_P & (1<<28)) {
-                        unsigned char *cp=(unsigned char *)d;
-
-                        for (i=0;i<256;i++) cp[i]=i;
-                        for (i=0;i<256;i++) SK_LOOP(cp,i);
-                        /* mark schedule as compressed! */
-                        d[256/sizeof(RC4_INT)]=-1;
-                        return;
-                }
-        }
-# endif
-#endif
         for (i=0; i < 256; i++) d[i]=i;
         for (i=0; i < 256; i+=4)
                 {
diff --git a/src/lib/libssl/src/crypto/rc4/rc4test.c b/src/lib/libssl/src/crypto/rc4/rc4test.c
index 633a79e758..4312605ccb 100644
--- a/src/lib/libssl/src/crypto/rc4/rc4test.c
+++ b/src/lib/libssl/src/crypto/rc4/rc4test.c
@@ -120,6 +120,12 @@ int main(int argc, char *argv[])
         RC4_KEY key;
         unsigned char obuf[512];
 
+#if !defined(OPENSSL_PIC)
+        void OPENSSL_cpuid_setup(void);
+
+        OPENSSL_cpuid_setup();
+#endif
+
         for (i=0; i<6; i++)
                 {
                 RC4_set_key(&key,keys[i][0],&(keys[i][1]));
diff --git a/src/lib/libssl/src/crypto/ripemd/Makefile b/src/lib/libssl/src/crypto/ripemd/Makefile
index d5b1067dbe..25140b2a73 100644
--- a/src/lib/libssl/src/crypto/ripemd/Makefile
+++ b/src/lib/libssl/src/crypto/ripemd/Makefile
@@ -82,8 +82,11 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-rmd_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ripemd.h
+rmd_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+rmd_dgst.o: ../../include/openssl/opensslconf.h
+rmd_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rmd_dgst.o: ../../include/openssl/ripemd.h ../../include/openssl/safestack.h
+rmd_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rmd_dgst.o: ../md32_common.h rmd_dgst.c rmd_locl.h rmdconst.h
 rmd_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 rmd_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
diff --git a/src/lib/libssl/src/crypto/ripemd/ripemd.h b/src/lib/libssl/src/crypto/ripemd/ripemd.h
index 5942eb6180..189bd8c90e 100644
--- a/src/lib/libssl/src/crypto/ripemd/ripemd.h
+++ b/src/lib/libssl/src/crypto/ripemd/ripemd.h
@@ -91,6 +91,9 @@ typedef struct RIPEMD160state_st
         unsigned int   num;
         } RIPEMD160_CTX;
 
+#ifdef OPENSSL_FIPS
+int private_RIPEMD160_Init(RIPEMD160_CTX *c);
+#endif
 int RIPEMD160_Init(RIPEMD160_CTX *c);
 int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len);
 int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
diff --git a/src/lib/libssl/src/crypto/ripemd/rmd_dgst.c b/src/lib/libssl/src/crypto/ripemd/rmd_dgst.c
index 59b017f8c0..63f0d983f7 100644
--- a/src/lib/libssl/src/crypto/ripemd/rmd_dgst.c
+++ b/src/lib/libssl/src/crypto/ripemd/rmd_dgst.c
@@ -59,6 +59,7 @@
 #include <stdio.h>
 #include "rmd_locl.h"
 #include <openssl/opensslv.h>
+#include <openssl/crypto.h>
 
 const char RMD160_version[]="RIPE-MD160" OPENSSL_VERSION_PTEXT;
 
@@ -69,7 +70,7 @@ const char RMD160_version[]="RIPE-MD160" OPENSSL_VERSION_PTEXT;
      void ripemd160_block(RIPEMD160_CTX *c, unsigned long *p,size_t num);
 #  endif
 
-int RIPEMD160_Init(RIPEMD160_CTX *c)
+fips_md_init(RIPEMD160)
         {
         memset (c,0,sizeof(*c));
         c->A=RIPEMD160_A;
diff --git a/src/lib/libssl/src/crypto/rsa/Makefile b/src/lib/libssl/src/crypto/rsa/Makefile
index bb64223e05..f798d2f749 100644
--- a/src/lib/libssl/src/crypto/rsa/Makefile
+++ b/src/lib/libssl/src/crypto/rsa/Makefile
@@ -20,11 +20,11 @@ LIB=$(TOP)/libcrypto.a
 LIBSRC= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
         rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \
         rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c \
-        rsa_pmeth.c
+        rsa_pmeth.c rsa_crpt.c
 LIBOBJ= rsa_eay.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \
         rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o rsa_chk.o rsa_null.o \
         rsa_pss.o rsa_x931.o rsa_asn1.o rsa_depr.o rsa_ameth.o rsa_prn.o \
-        rsa_pmeth.o
+        rsa_pmeth.o rsa_crpt.o
 
 SRC= $(LIBSRC)
 
@@ -100,11 +100,16 @@ rsa_asn1.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 rsa_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
 rsa_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-rsa_asn1.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+rsa_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+rsa_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+rsa_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+rsa_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
 rsa_asn1.o: ../../include/openssl/opensslconf.h
 rsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-rsa_asn1.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+rsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 rsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+rsa_asn1.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 rsa_asn1.o: ../cryptlib.h rsa_asn1.c
 rsa_chk.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
 rsa_chk.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
@@ -114,6 +119,21 @@ rsa_chk.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rsa_chk.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
 rsa_chk.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 rsa_chk.o: rsa_chk.c
+rsa_crpt.o: ../../e_os.h ../../include/openssl/asn1.h
+rsa_crpt.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+rsa_crpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+rsa_crpt.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+rsa_crpt.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+rsa_crpt.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+rsa_crpt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+rsa_crpt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rsa_crpt.o: ../../include/openssl/opensslconf.h
+rsa_crpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+rsa_crpt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h
+rsa_crpt.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
+rsa_crpt.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rsa_crpt.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+rsa_crpt.o: ../../include/openssl/x509_vfy.h ../cryptlib.h rsa_crpt.c
 rsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
 rsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -205,11 +225,12 @@ rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c
 rsa_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h
 rsa_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
 rsa_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-rsa_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-rsa_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
-rsa_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
-rsa_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
-rsa_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+rsa_pmeth.o: ../../include/openssl/cms.h ../../include/openssl/crypto.h
+rsa_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+rsa_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+rsa_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+rsa_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+rsa_pmeth.o: ../../include/openssl/objects.h
 rsa_pmeth.o: ../../include/openssl/opensslconf.h
 rsa_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 rsa_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
diff --git a/src/lib/libssl/src/crypto/rsa/rsa.h b/src/lib/libssl/src/crypto/rsa/rsa.h
index cf74343657..4814a2fc15 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa.h
+++ b/src/lib/libssl/src/crypto/rsa/rsa.h
@@ -222,12 +222,22 @@ struct rsa_st
         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING, \
                                 pad, NULL)
 
+#define EVP_PKEY_CTX_get_rsa_padding(ctx, ppad) \
+        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, \
+                                EVP_PKEY_CTRL_GET_RSA_PADDING, 0, ppad)
+
 #define EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, len) \
         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
                                 (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
                                 EVP_PKEY_CTRL_RSA_PSS_SALTLEN, \
                                 len, NULL)
 
+#define EVP_PKEY_CTX_get_rsa_pss_saltlen(ctx, plen) \
+        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
+                                (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
+                                EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, \
+                                0, plen)
+
 #define EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits) \
         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
                                 EVP_PKEY_CTRL_RSA_KEYGEN_BITS, bits, NULL)
@@ -236,11 +246,24 @@ struct rsa_st
         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
                                 EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp)
 
+#define  EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md)  \
+                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_SIG,  \
+                                EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)md)
+
+#define  EVP_PKEY_CTX_get_rsa_mgf1_md(ctx, pmd) \
+                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_SIG,  \
+                                EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)pmd)
+
 #define EVP_PKEY_CTRL_RSA_PADDING       (EVP_PKEY_ALG_CTRL + 1)
 #define EVP_PKEY_CTRL_RSA_PSS_SALTLEN   (EVP_PKEY_ALG_CTRL + 2)
 
 #define EVP_PKEY_CTRL_RSA_KEYGEN_BITS   (EVP_PKEY_ALG_CTRL + 3)
 #define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP (EVP_PKEY_ALG_CTRL + 4)
+#define EVP_PKEY_CTRL_RSA_MGF1_MD       (EVP_PKEY_ALG_CTRL + 5)
+
+#define EVP_PKEY_CTRL_GET_RSA_PADDING           (EVP_PKEY_ALG_CTRL + 6)
+#define EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN       (EVP_PKEY_ALG_CTRL + 7)
+#define EVP_PKEY_CTRL_GET_RSA_MGF1_MD           (EVP_PKEY_ALG_CTRL + 8)
 
 #define RSA_PKCS1_PADDING       1
 #define RSA_SSLV23_PADDING      2
@@ -300,6 +323,16 @@ const RSA_METHOD *RSA_null_method(void);
 DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey)
 DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey)
 
+typedef struct rsa_pss_params_st
+        {
+        X509_ALGOR *hashAlgorithm;
+        X509_ALGOR *maskGenAlgorithm;
+        ASN1_INTEGER *saltLength;
+        ASN1_INTEGER *trailerField;
+        } RSA_PSS_PARAMS;
+
+DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
+
 #ifndef OPENSSL_NO_FP_API
 int     RSA_print_fp(FILE *fp, const RSA *r,int offset);
 #endif
@@ -380,6 +413,14 @@ int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
                         const unsigned char *mHash,
                         const EVP_MD *Hash, int sLen);
 
+int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
+                        const EVP_MD *Hash, const EVP_MD *mgf1Hash, 
+                        const unsigned char *EM, int sLen);
+
+int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
+                        const unsigned char *mHash,
+                        const EVP_MD *Hash, const EVP_MD *mgf1Hash, int sLen);
+
 int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int RSA_set_ex_data(RSA *r,int idx,void *arg);
@@ -388,6 +429,25 @@ void *RSA_get_ex_data(const RSA *r, int idx);
 RSA *RSAPublicKey_dup(RSA *rsa);
 RSA *RSAPrivateKey_dup(RSA *rsa);
 
+/* If this flag is set the RSA method is FIPS compliant and can be used
+ * in FIPS mode. This is set in the validated module method. If an
+ * application sets this flag in its own methods it is its responsibility
+ * to ensure the result is compliant.
+ */
+
+#define RSA_FLAG_FIPS_METHOD                    0x0400
+
+/* If this flag is set the operations normally disabled in FIPS mode are
+ * permitted it is then the applications responsibility to ensure that the
+ * usage is compliant.
+ */
+
+#define RSA_FLAG_NON_FIPS_ALLOW                 0x0400
+/* Application has decided PRNG is good enough to generate a key: don't
+ * check.
+ */
+#define RSA_FLAG_CHECKED                        0x0800
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -405,6 +465,7 @@ void ERR_load_RSA_strings(void);
 #define RSA_F_PKEY_RSA_CTRL                              143
 #define RSA_F_PKEY_RSA_CTRL_STR                          144
 #define RSA_F_PKEY_RSA_SIGN                              142
+#define RSA_F_PKEY_RSA_VERIFY                            154
 #define RSA_F_PKEY_RSA_VERIFYRECOVER                     141
 #define RSA_F_RSA_BUILTIN_KEYGEN                         129
 #define RSA_F_RSA_CHECK_KEY                              123
@@ -413,6 +474,8 @@ void ERR_load_RSA_strings(void);
 #define RSA_F_RSA_EAY_PUBLIC_DECRYPT                     103
 #define RSA_F_RSA_EAY_PUBLIC_ENCRYPT                     104
 #define RSA_F_RSA_GENERATE_KEY                           105
+#define RSA_F_RSA_GENERATE_KEY_EX                        155
+#define RSA_F_RSA_ITEM_VERIFY                            156
 #define RSA_F_RSA_MEMORY_LOCK                            130
 #define RSA_F_RSA_NEW_METHOD                             106
 #define RSA_F_RSA_NULL                                   124
@@ -424,6 +487,7 @@ void ERR_load_RSA_strings(void);
 #define RSA_F_RSA_PADDING_ADD_NONE                       107
 #define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP                 121
 #define RSA_F_RSA_PADDING_ADD_PKCS1_PSS                  125
+#define RSA_F_RSA_PADDING_ADD_PKCS1_PSS_MGF1             148
 #define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               108
 #define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               109
 #define RSA_F_RSA_PADDING_ADD_SSLV23                     110
@@ -436,8 +500,12 @@ void ERR_load_RSA_strings(void);
 #define RSA_F_RSA_PADDING_CHECK_X931                     128
 #define RSA_F_RSA_PRINT                                  115
 #define RSA_F_RSA_PRINT_FP                               116
+#define RSA_F_RSA_PRIVATE_DECRYPT                        150
+#define RSA_F_RSA_PRIVATE_ENCRYPT                        151
 #define RSA_F_RSA_PRIV_DECODE                            137
 #define RSA_F_RSA_PRIV_ENCODE                            138
+#define RSA_F_RSA_PUBLIC_DECRYPT                         152
+#define RSA_F_RSA_PUBLIC_ENCRYPT                         153
 #define RSA_F_RSA_PUB_DECODE                             139
 #define RSA_F_RSA_SETUP_BLINDING                         136
 #define RSA_F_RSA_SIGN                                   117
@@ -445,6 +513,7 @@ void ERR_load_RSA_strings(void);
 #define RSA_F_RSA_VERIFY                                 119
 #define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               120
 #define RSA_F_RSA_VERIFY_PKCS1_PSS                       126
+#define RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1                  149
 
 /* Reason codes. */
 #define RSA_R_ALGORITHM_MISMATCH                         100
@@ -470,19 +539,24 @@ void ERR_load_RSA_strings(void);
 #define RSA_R_INVALID_HEADER                             137
 #define RSA_R_INVALID_KEYBITS                            145
 #define RSA_R_INVALID_MESSAGE_LENGTH                     131
+#define RSA_R_INVALID_MGF1_MD                            156
 #define RSA_R_INVALID_PADDING                            138
 #define RSA_R_INVALID_PADDING_MODE                       141
+#define RSA_R_INVALID_PSS_PARAMETERS                     149
 #define RSA_R_INVALID_PSS_SALTLEN                        146
+#define RSA_R_INVALID_SALT_LENGTH                        150
 #define RSA_R_INVALID_TRAILER                            139
 #define RSA_R_INVALID_X931_DIGEST                        142
 #define RSA_R_IQMP_NOT_INVERSE_OF_Q                      126
 #define RSA_R_KEY_SIZE_TOO_SMALL                         120
 #define RSA_R_LAST_OCTET_INVALID                         134
 #define RSA_R_MODULUS_TOO_LARGE                          105
+#define RSA_R_NON_FIPS_RSA_METHOD                        157
 #define RSA_R_NO_PUBLIC_EXPONENT                         140
 #define RSA_R_NULL_BEFORE_BLOCK_MISSING                  113
 #define RSA_R_N_DOES_NOT_EQUAL_P_Q                       127
 #define RSA_R_OAEP_DECODING_ERROR                        121
+#define RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE         158
 #define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   148
 #define RSA_R_PADDING_CHECK_FAILED                       114
 #define RSA_R_P_NOT_PRIME                                128
@@ -493,7 +567,12 @@ void ERR_load_RSA_strings(void);
 #define RSA_R_SSLV3_ROLLBACK_ATTACK                      115
 #define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
 #define RSA_R_UNKNOWN_ALGORITHM_TYPE                     117
+#define RSA_R_UNKNOWN_MASK_DIGEST                        151
 #define RSA_R_UNKNOWN_PADDING_TYPE                       118
+#define RSA_R_UNKNOWN_PSS_DIGEST                         152
+#define RSA_R_UNSUPPORTED_MASK_ALGORITHM                 153
+#define RSA_R_UNSUPPORTED_MASK_PARAMETER                 154
+#define RSA_R_UNSUPPORTED_SIGNATURE_TYPE                 155
 #define RSA_R_VALUE_MISSING                              147
 #define RSA_R_WRONG_SIGNATURE_LENGTH                     119
 
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_asn1.c b/src/lib/libssl/src/crypto/rsa/rsa_asn1.c
index 4efca8cdc8..6ed5de3db4 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_asn1.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_asn1.c
@@ -60,6 +60,7 @@
 #include "cryptlib.h"
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
+#include <openssl/x509.h>
 #include <openssl/asn1t.h>
 
 /* Override the default free and new methods */
@@ -96,6 +97,15 @@ ASN1_SEQUENCE_cb(RSAPublicKey, rsa_cb) = {
         ASN1_SIMPLE(RSA, e, BIGNUM),
 } ASN1_SEQUENCE_END_cb(RSA, RSAPublicKey)
 
+ASN1_SEQUENCE(RSA_PSS_PARAMS) = {
+        ASN1_EXP_OPT(RSA_PSS_PARAMS, hashAlgorithm, X509_ALGOR,0),
+        ASN1_EXP_OPT(RSA_PSS_PARAMS, maskGenAlgorithm, X509_ALGOR,1),
+        ASN1_EXP_OPT(RSA_PSS_PARAMS, saltLength, ASN1_INTEGER,2),
+        ASN1_EXP_OPT(RSA_PSS_PARAMS, trailerField, ASN1_INTEGER,3)
+} ASN1_SEQUENCE_END(RSA_PSS_PARAMS)
+
+IMPLEMENT_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
+
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPrivateKey, RSAPrivateKey)
 
 IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(RSA, RSAPublicKey, RSAPublicKey)
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_err.c b/src/lib/libssl/src/crypto/rsa/rsa_err.c
index cf9f1106b0..46e0bf9980 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_err.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_err.c
@@ -1,6 +1,6 @@
 /* crypto/rsa/rsa_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2008 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
@@ -78,6 +78,7 @@ static ERR_STRING_DATA RSA_str_functs[]=
 {ERR_FUNC(RSA_F_PKEY_RSA_CTRL), "PKEY_RSA_CTRL"},
 {ERR_FUNC(RSA_F_PKEY_RSA_CTRL_STR),     "PKEY_RSA_CTRL_STR"},
 {ERR_FUNC(RSA_F_PKEY_RSA_SIGN), "PKEY_RSA_SIGN"},
+{ERR_FUNC(RSA_F_PKEY_RSA_VERIFY),       "PKEY_RSA_VERIFY"},
 {ERR_FUNC(RSA_F_PKEY_RSA_VERIFYRECOVER),        "PKEY_RSA_VERIFYRECOVER"},
 {ERR_FUNC(RSA_F_RSA_BUILTIN_KEYGEN),    "RSA_BUILTIN_KEYGEN"},
 {ERR_FUNC(RSA_F_RSA_CHECK_KEY), "RSA_check_key"},
@@ -86,6 +87,8 @@ static ERR_STRING_DATA RSA_str_functs[]=
 {ERR_FUNC(RSA_F_RSA_EAY_PUBLIC_DECRYPT),        "RSA_EAY_PUBLIC_DECRYPT"},
 {ERR_FUNC(RSA_F_RSA_EAY_PUBLIC_ENCRYPT),        "RSA_EAY_PUBLIC_ENCRYPT"},
 {ERR_FUNC(RSA_F_RSA_GENERATE_KEY),      "RSA_generate_key"},
+{ERR_FUNC(RSA_F_RSA_GENERATE_KEY_EX),   "RSA_generate_key_ex"},
+{ERR_FUNC(RSA_F_RSA_ITEM_VERIFY),       "RSA_ITEM_VERIFY"},
 {ERR_FUNC(RSA_F_RSA_MEMORY_LOCK),       "RSA_memory_lock"},
 {ERR_FUNC(RSA_F_RSA_NEW_METHOD),        "RSA_new_method"},
 {ERR_FUNC(RSA_F_RSA_NULL),      "RSA_NULL"},
@@ -97,6 +100,7 @@ static ERR_STRING_DATA RSA_str_functs[]=
 {ERR_FUNC(RSA_F_RSA_PADDING_ADD_NONE),  "RSA_padding_add_none"},
 {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP),    "RSA_padding_add_PKCS1_OAEP"},
 {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_PSS),     "RSA_padding_add_PKCS1_PSS"},
+{ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_PSS_MGF1),        "RSA_padding_add_PKCS1_PSS_mgf1"},
 {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1),  "RSA_padding_add_PKCS1_type_1"},
 {ERR_FUNC(RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2),  "RSA_padding_add_PKCS1_type_2"},
 {ERR_FUNC(RSA_F_RSA_PADDING_ADD_SSLV23),        "RSA_padding_add_SSLv23"},
@@ -109,8 +113,12 @@ static ERR_STRING_DATA RSA_str_functs[]=
 {ERR_FUNC(RSA_F_RSA_PADDING_CHECK_X931),        "RSA_padding_check_X931"},
 {ERR_FUNC(RSA_F_RSA_PRINT),     "RSA_print"},
 {ERR_FUNC(RSA_F_RSA_PRINT_FP),  "RSA_print_fp"},
+{ERR_FUNC(RSA_F_RSA_PRIVATE_DECRYPT),   "RSA_private_decrypt"},
+{ERR_FUNC(RSA_F_RSA_PRIVATE_ENCRYPT),   "RSA_private_encrypt"},
 {ERR_FUNC(RSA_F_RSA_PRIV_DECODE),       "RSA_PRIV_DECODE"},
 {ERR_FUNC(RSA_F_RSA_PRIV_ENCODE),       "RSA_PRIV_ENCODE"},
+{ERR_FUNC(RSA_F_RSA_PUBLIC_DECRYPT),    "RSA_public_decrypt"},
+{ERR_FUNC(RSA_F_RSA_PUBLIC_ENCRYPT),    "RSA_public_encrypt"},
 {ERR_FUNC(RSA_F_RSA_PUB_DECODE),        "RSA_PUB_DECODE"},
 {ERR_FUNC(RSA_F_RSA_SETUP_BLINDING),    "RSA_setup_blinding"},
 {ERR_FUNC(RSA_F_RSA_SIGN),      "RSA_sign"},
@@ -118,6 +126,7 @@ static ERR_STRING_DATA RSA_str_functs[]=
 {ERR_FUNC(RSA_F_RSA_VERIFY),    "RSA_verify"},
 {ERR_FUNC(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING),  "RSA_verify_ASN1_OCTET_STRING"},
 {ERR_FUNC(RSA_F_RSA_VERIFY_PKCS1_PSS),  "RSA_verify_PKCS1_PSS"},
+{ERR_FUNC(RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1),     "RSA_verify_PKCS1_PSS_mgf1"},
 {0,NULL}
         };
 
@@ -146,19 +155,24 @@ static ERR_STRING_DATA RSA_str_reasons[]=
 {ERR_REASON(RSA_R_INVALID_HEADER)        ,"invalid header"},
 {ERR_REASON(RSA_R_INVALID_KEYBITS)       ,"invalid keybits"},
 {ERR_REASON(RSA_R_INVALID_MESSAGE_LENGTH),"invalid message length"},
+{ERR_REASON(RSA_R_INVALID_MGF1_MD)       ,"invalid mgf1 md"},
 {ERR_REASON(RSA_R_INVALID_PADDING)       ,"invalid padding"},
 {ERR_REASON(RSA_R_INVALID_PADDING_MODE)  ,"invalid padding mode"},
+{ERR_REASON(RSA_R_INVALID_PSS_PARAMETERS),"invalid pss parameters"},
 {ERR_REASON(RSA_R_INVALID_PSS_SALTLEN)   ,"invalid pss saltlen"},
+{ERR_REASON(RSA_R_INVALID_SALT_LENGTH)   ,"invalid salt length"},
 {ERR_REASON(RSA_R_INVALID_TRAILER)       ,"invalid trailer"},
 {ERR_REASON(RSA_R_INVALID_X931_DIGEST)   ,"invalid x931 digest"},
 {ERR_REASON(RSA_R_IQMP_NOT_INVERSE_OF_Q) ,"iqmp not inverse of q"},
 {ERR_REASON(RSA_R_KEY_SIZE_TOO_SMALL)    ,"key size too small"},
 {ERR_REASON(RSA_R_LAST_OCTET_INVALID)    ,"last octet invalid"},
 {ERR_REASON(RSA_R_MODULUS_TOO_LARGE)     ,"modulus too large"},
+{ERR_REASON(RSA_R_NON_FIPS_RSA_METHOD)   ,"non fips rsa method"},
 {ERR_REASON(RSA_R_NO_PUBLIC_EXPONENT)    ,"no public exponent"},
 {ERR_REASON(RSA_R_NULL_BEFORE_BLOCK_MISSING),"null before block missing"},
 {ERR_REASON(RSA_R_N_DOES_NOT_EQUAL_P_Q)  ,"n does not equal p q"},
 {ERR_REASON(RSA_R_OAEP_DECODING_ERROR)   ,"oaep decoding error"},
+{ERR_REASON(RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE),"operation not allowed in fips mode"},
 {ERR_REASON(RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),"operation not supported for this keytype"},
 {ERR_REASON(RSA_R_PADDING_CHECK_FAILED)  ,"padding check failed"},
 {ERR_REASON(RSA_R_P_NOT_PRIME)           ,"p not prime"},
@@ -169,7 +183,12 @@ static ERR_STRING_DATA RSA_str_reasons[]=
 {ERR_REASON(RSA_R_SSLV3_ROLLBACK_ATTACK) ,"sslv3 rollback attack"},
 {ERR_REASON(RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),"the asn1 object identifier is not known for this md"},
 {ERR_REASON(RSA_R_UNKNOWN_ALGORITHM_TYPE),"unknown algorithm type"},
+{ERR_REASON(RSA_R_UNKNOWN_MASK_DIGEST)   ,"unknown mask digest"},
 {ERR_REASON(RSA_R_UNKNOWN_PADDING_TYPE)  ,"unknown padding type"},
+{ERR_REASON(RSA_R_UNKNOWN_PSS_DIGEST)    ,"unknown pss digest"},
+{ERR_REASON(RSA_R_UNSUPPORTED_MASK_ALGORITHM),"unsupported mask algorithm"},
+{ERR_REASON(RSA_R_UNSUPPORTED_MASK_PARAMETER),"unsupported mask parameter"},
+{ERR_REASON(RSA_R_UNSUPPORTED_SIGNATURE_TYPE),"unsupported signature type"},
 {ERR_REASON(RSA_R_VALUE_MISSING)         ,"value missing"},
 {ERR_REASON(RSA_R_WRONG_SIGNATURE_LENGTH),"wrong signature length"},
 {0,NULL}
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_gen.c b/src/lib/libssl/src/crypto/rsa/rsa_gen.c
index 767f7ab682..42290cce66 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_gen.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_gen.c
@@ -67,6 +67,9 @@
 #include "cryptlib.h"
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
 static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb);
 
@@ -77,8 +80,20 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb)
  * now just because key-generation is part of RSA_METHOD. */
 int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e_value, BN_GENCB *cb)
         {
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(rsa->meth->flags & RSA_FLAG_FIPS_METHOD)
+                        && !(rsa->flags & RSA_FLAG_NON_FIPS_ALLOW))
+                {
+                RSAerr(RSA_F_RSA_GENERATE_KEY_EX, RSA_R_NON_FIPS_RSA_METHOD);
+                return 0;
+                }
+#endif
         if(rsa->meth->rsa_keygen)
                 return rsa->meth->rsa_keygen(rsa, bits, e_value, cb);
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode())
+                return FIPS_rsa_generate_key_ex(rsa, bits, e_value, cb);
+#endif
         return rsa_builtin_keygen(rsa, bits, e_value, cb);
         }
 
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_lib.c b/src/lib/libssl/src/crypto/rsa/rsa_lib.c
index de45088d76..c95ceafc82 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_lib.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_lib.c
@@ -67,6 +67,10 @@
 #include <openssl/engine.h>
 #endif
 
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
+
 const char RSA_version[]="RSA" OPENSSL_VERSION_PTEXT;
 
 static const RSA_METHOD *default_RSA_meth=NULL;
@@ -87,12 +91,15 @@ const RSA_METHOD *RSA_get_default_method(void)
         {
         if (default_RSA_meth == NULL)
                 {
+#ifdef OPENSSL_FIPS
+                if (FIPS_mode())
+                        return FIPS_rsa_pkcs1_ssleay();
+                else
+                        return RSA_PKCS1_SSLeay();
+#else
 #ifdef RSA_NULL
                 default_RSA_meth=RSA_null_method();
 #else
-#if 0 /* was: #ifdef RSAref */
-                default_RSA_meth=RSA_PKCS1_RSAref();
-#else
                 default_RSA_meth=RSA_PKCS1_SSLeay();
 #endif
 #endif
@@ -181,7 +188,7 @@ RSA *RSA_new_method(ENGINE *engine)
         ret->blinding=NULL;
         ret->mt_blinding=NULL;
         ret->bignum_data=NULL;
-        ret->flags=ret->meth->flags;
+        ret->flags=ret->meth->flags & ~RSA_FLAG_NON_FIPS_ALLOW;
         if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data))
                 {
 #ifndef OPENSSL_NO_ENGINE
@@ -280,163 +287,6 @@ void *RSA_get_ex_data(const RSA *r, int idx)
         return(CRYPTO_get_ex_data(&r->ex_data,idx));
         }
 
-int RSA_size(const RSA *r)
-        {
-        return(BN_num_bytes(r->n));
-        }
-
-int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
-             RSA *rsa, int padding)
-        {
-        return(rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding));
-        }
-
-int RSA_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
-             RSA *rsa, int padding)
-        {
-        return(rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding));
-        }
-
-int RSA_private_decrypt(int flen, const unsigned char *from, unsigned char *to,
-             RSA *rsa, int padding)
-        {
-        return(rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding));
-        }
-
-int RSA_public_decrypt(int flen, const unsigned char *from, unsigned char *to,
-             RSA *rsa, int padding)
-        {
-        return(rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding));
-        }
-
-int RSA_flags(const RSA *r)
-        {
-        return((r == NULL)?0:r->meth->flags);
-        }
-
-void RSA_blinding_off(RSA *rsa)
-        {
-        if (rsa->blinding != NULL)
-                {
-                BN_BLINDING_free(rsa->blinding);
-                rsa->blinding=NULL;
-                }
-        rsa->flags &= ~RSA_FLAG_BLINDING;
-        rsa->flags |= RSA_FLAG_NO_BLINDING;
-        }
-
-int RSA_blinding_on(RSA *rsa, BN_CTX *ctx)
-        {
-        int ret=0;
-
-        if (rsa->blinding != NULL)
-                RSA_blinding_off(rsa);
-
-        rsa->blinding = RSA_setup_blinding(rsa, ctx);
-        if (rsa->blinding == NULL)
-                goto err;
-
-        rsa->flags |= RSA_FLAG_BLINDING;
-        rsa->flags &= ~RSA_FLAG_NO_BLINDING;
-        ret=1;
-err:
-        return(ret);
-        }
-
-static BIGNUM *rsa_get_public_exp(const BIGNUM *d, const BIGNUM *p,
-        const BIGNUM *q, BN_CTX *ctx)
-{
-        BIGNUM *ret = NULL, *r0, *r1, *r2;
-
-        if (d == NULL || p == NULL || q == NULL)
-                return NULL;
-
-        BN_CTX_start(ctx);
-        r0 = BN_CTX_get(ctx);
-        r1 = BN_CTX_get(ctx);
-        r2 = BN_CTX_get(ctx);
-        if (r2 == NULL)
-                goto err;
-
-        if (!BN_sub(r1, p, BN_value_one())) goto err;
-        if (!BN_sub(r2, q, BN_value_one())) goto err;
-        if (!BN_mul(r0, r1, r2, ctx)) goto err;
-
-        ret = BN_mod_inverse(NULL, d, r0, ctx);
-err:
-        BN_CTX_end(ctx);
-        return ret;
-}
-
-BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *in_ctx)
-{
-        BIGNUM local_n;
-        BIGNUM *e,*n;
-        BN_CTX *ctx;
-        BN_BLINDING *ret = NULL;
-
-        if (in_ctx == NULL)
-                {
-                if ((ctx = BN_CTX_new()) == NULL) return 0;
-                }
-        else
-                ctx = in_ctx;
-
-        BN_CTX_start(ctx);
-        e  = BN_CTX_get(ctx);
-        if (e == NULL)
-                {
-                RSAerr(RSA_F_RSA_SETUP_BLINDING, ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        if (rsa->e == NULL)
-                {
-                e = rsa_get_public_exp(rsa->d, rsa->p, rsa->q, ctx);
-                if (e == NULL)
-                        {
-                        RSAerr(RSA_F_RSA_SETUP_BLINDING, RSA_R_NO_PUBLIC_EXPONENT);
-                        goto err;
-                        }
-                }
-        else
-                e = rsa->e;
-
-        
-        if ((RAND_status() == 0) && rsa->d != NULL && rsa->d->d != NULL)
-                {
-                /* if PRNG is not properly seeded, resort to secret
-                 * exponent as unpredictable seed */
-                RAND_add(rsa->d->d, rsa->d->dmax * sizeof rsa->d->d[0], 0.0);
-                }
-
-        if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
-                {
-                /* Set BN_FLG_CONSTTIME flag */
-                n = &local_n;
-                BN_with_flags(n, rsa->n, BN_FLG_CONSTTIME);
-                }
-        else
-                n = rsa->n;
-
-        ret = BN_BLINDING_create_param(NULL, e, n, ctx,
-                        rsa->meth->bn_mod_exp, rsa->_method_mod_n);
-        if (ret == NULL)
-                {
-                RSAerr(RSA_F_RSA_SETUP_BLINDING, ERR_R_BN_LIB);
-                goto err;
-                }
-        CRYPTO_THREADID_current(BN_BLINDING_thread_id(ret));
-err:
-        BN_CTX_end(ctx);
-        if (in_ctx == NULL)
-                BN_CTX_free(ctx);
-        if(rsa->e == NULL)
-                BN_free(e);
-
-        return ret;
-}
-
 int RSA_memory_lock(RSA *r)
         {
         int i,j,k,off;
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_oaep.c b/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
index 18d307ea9e..553d212ebe 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
@@ -56,7 +56,8 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
         seed = to + 1;
         db = to + SHA_DIGEST_LENGTH + 1;
 
-        EVP_Digest((void *)param, plen, db, NULL, EVP_sha1(), NULL);
+        if (!EVP_Digest((void *)param, plen, db, NULL, EVP_sha1(), NULL))
+                return 0;
         memset(db + SHA_DIGEST_LENGTH, 0,
                 emlen - flen - 2 * SHA_DIGEST_LENGTH - 1);
         db[emlen - flen - SHA_DIGEST_LENGTH - 1] = 0x01;
@@ -145,7 +146,8 @@ int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
         for (i = 0; i < dblen; i++)
                 db[i] ^= maskeddb[i];
 
-        EVP_Digest((void *)param, plen, phash, NULL, EVP_sha1(), NULL);
+        if (!EVP_Digest((void *)param, plen, phash, NULL, EVP_sha1(), NULL))
+                return -1;
 
         if (memcmp(db, phash, SHA_DIGEST_LENGTH) != 0 || bad)
                 goto decoding_err;
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_sign.c b/src/lib/libssl/src/crypto/rsa/rsa_sign.c
index 0be4ec7fb0..b6f6037ae0 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_sign.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_sign.c
@@ -77,6 +77,14 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
         const unsigned char *s = NULL;
         X509_ALGOR algor;
         ASN1_OCTET_STRING digest;
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(rsa->meth->flags & RSA_FLAG_FIPS_METHOD)
+                        && !(rsa->flags & RSA_FLAG_NON_FIPS_ALLOW))
+                {
+                RSAerr(RSA_F_RSA_SIGN, RSA_R_NON_FIPS_RSA_METHOD);
+                return 0;
+                }
+#endif
         if((rsa->flags & RSA_FLAG_SIGN_VER) && rsa->meth->rsa_sign)
                 {
                 return rsa->meth->rsa_sign(type, m, m_len,
@@ -153,6 +161,15 @@ int int_rsa_verify(int dtype, const unsigned char *m,
         unsigned char *s;
         X509_SIG *sig=NULL;
 
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && !(rsa->meth->flags & RSA_FLAG_FIPS_METHOD)
+                        && !(rsa->flags & RSA_FLAG_NON_FIPS_ALLOW))
+                {
+                RSAerr(RSA_F_INT_RSA_VERIFY, RSA_R_NON_FIPS_RSA_METHOD);
+                return 0;
+                }
+#endif
+
         if (siglen != (unsigned int)RSA_size(rsa))
                 {
                 RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_WRONG_SIGNATURE_LENGTH);
@@ -182,6 +199,22 @@ int int_rsa_verify(int dtype, const unsigned char *m,
         i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PADDING);
 
         if (i <= 0) goto err;
+        /* Oddball MDC2 case: signature can be OCTET STRING.
+         * check for correct tag and length octets.
+         */
+        if (dtype == NID_mdc2 && i == 18 && s[0] == 0x04 && s[1] == 0x10)
+                {
+                if (rm)
+                        {
+                        memcpy(rm, s + 2, 16);
+                        *prm_len = 16;
+                        ret = 1;
+                        }
+                else if(memcmp(m, s + 2, 16))
+                        RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
+                else
+                        ret = 1;
+                }
 
         /* Special case: SSL signature */
         if(dtype == NID_md5_sha1) {
diff --git a/src/lib/libssl/src/crypto/sha/Makefile b/src/lib/libssl/src/crypto/sha/Makefile
index e6eccb05f9..6d191d3936 100644
--- a/src/lib/libssl/src/crypto/sha/Makefile
+++ b/src/lib/libssl/src/crypto/sha/Makefile
@@ -56,8 +56,11 @@ sha256-ia64.s: asm/sha512-ia64.pl
 sha512-ia64.s: asm/sha512-ia64.pl
         (cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS))
 
-sha256-armv4.s: asm/sha256-armv4.pl
-        $(PERL) $< $@
+sha256-armv4.S: asm/sha256-armv4.pl
+        $(PERL) $< $(PERLASM_SCHEME) $@
+
+sha1-alpha.s:   asm/sha1-alpha.pl
+        $(PERL) $< | $(CC) -E - | tee $@ > /dev/null
 
 # Solaris make has to be explicitly told
 sha1-x86_64.s:  asm/sha1-x86_64.pl;     $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@
@@ -71,10 +74,22 @@ sha1-ppc.s:	asm/sha1-ppc.pl;	$(PERL) asm/sha1-ppc.pl $(PERLASM_SCHEME) $@
 sha256-ppc.s:   asm/sha512-ppc.pl;      $(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@
 sha512-ppc.s:   asm/sha512-ppc.pl;      $(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@
 
+sha1-parisc.s:  asm/sha1-parisc.pl;     $(PERL) asm/sha1-parisc.pl $(PERLASM_SCHEME) $@
+sha256-parisc.s:asm/sha512-parisc.pl;   $(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@
+sha512-parisc.s:asm/sha512-parisc.pl;   $(PERL) asm/sha512-parisc.pl $(PERLASM_SCHEME) $@
+
+sha1-mips.S:    asm/sha1-mips.pl;       $(PERL) asm/sha1-mips.pl $(PERLASM_SCHEME) $@
+sha256-mips.S:  asm/sha512-mips.pl;     $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@
+sha512-mips.S:  asm/sha512-mips.pl;     $(PERL) asm/sha512-mips.pl $(PERLASM_SCHEME) $@
+
 # GNU make "catch all"
-sha1-%.s:       asm/sha1-%.pl;          $(PERL) $< $@
-sha256-%.s:     asm/sha512-%.pl;        $(PERL) $< $@
-sha512-%.s:     asm/sha512-%.pl;        $(PERL) $< $@
+sha1-%.S:       asm/sha1-%.pl;          $(PERL) $< $(PERLASM_SCHEME) $@
+sha256-%.S:     asm/sha512-%.pl;        $(PERL) $< $(PERLASM_SCHEME) $@
+sha512-%.S:     asm/sha512-%.pl;        $(PERL) $< $(PERLASM_SCHEME) $@
+
+sha1-armv4-large.o:     sha1-armv4-large.S
+sha256-armv4.o:         sha256-armv4.S
+sha512-armv4.o:         sha512-armv4.S
 
 files:
         $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -119,8 +134,11 @@ sha1_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 sha1_one.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 sha1_one.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha1_one.o: sha1_one.c
-sha1dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha1dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+sha1dgst.o: ../../include/openssl/opensslconf.h
+sha1dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+sha1dgst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+sha1dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha1dgst.o: ../md32_common.h sha1dgst.c sha_locl.h
 sha256.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 sha256.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
@@ -135,8 +153,11 @@ sha512.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 sha512.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 sha512.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha512.o: ../cryptlib.h sha512.c
-sha_dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/sha.h
+sha_dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+sha_dgst.o: ../../include/openssl/opensslconf.h
+sha_dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+sha_dgst.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+sha_dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 sha_dgst.o: ../md32_common.h sha_dgst.c sha_locl.h
 sha_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 sha_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl b/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl
index a1f876281a..1084d227fe 100644
--- a/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl
+++ b/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl
@@ -12,6 +12,8 @@
 # commentary below], and in 2006 the rest was rewritten in order to
 # gain freedom to liberate licensing terms.
 
+# January, September 2004.
+#
 # It was noted that Intel IA-32 C compiler generates code which
 # performs ~30% *faster* on P4 CPU than original *hand-coded*
 # SHA1 assembler implementation. To address this problem (and
@@ -31,12 +33,92 @@
 # ----------------------------------------------------------------
 #                                       <appro@fy.chalmers.se>
 
+# August 2009.
+#
+# George Spelvin has tipped that F_40_59(b,c,d) can be rewritten as
+# '(c&d) + (b&(c^d))', which allows to accumulate partial results
+# and lighten "pressure" on scratch registers. This resulted in
+# >12% performance improvement on contemporary AMD cores (with no
+# degradation on other CPUs:-). Also, the code was revised to maximize
+# "distance" between instructions producing input to 'lea' instruction
+# and the 'lea' instruction itself, which is essential for Intel Atom
+# core and resulted in ~15% improvement.
+
+# October 2010.
+#
+# Add SSSE3, Supplemental[!] SSE3, implementation. The idea behind it
+# is to offload message schedule denoted by Wt in NIST specification,
+# or Xupdate in OpenSSL source, to SIMD unit. The idea is not novel,
+# and in SSE2 context was first explored by Dean Gaudet in 2004, see
+# http://arctic.org/~dean/crypto/sha1.html. Since then several things
+# have changed that made it interesting again:
+#
+# a) XMM units became faster and wider;
+# b) instruction set became more versatile;
+# c) an important observation was made by Max Locktykhin, which made
+#    it possible to reduce amount of instructions required to perform
+#    the operation in question, for further details see
+#    http://software.intel.com/en-us/articles/improving-the-performance-of-the-secure-hash-algorithm-1/.
+
+# April 2011.
+#
+# Add AVX code path, probably most controversial... The thing is that
+# switch to AVX alone improves performance by as little as 4% in
+# comparison to SSSE3 code path. But below result doesn't look like
+# 4% improvement... Trouble is that Sandy Bridge decodes 'ro[rl]' as
+# pair of µ-ops, and it's the additional µ-ops, two per round, that
+# make it run slower than Core2 and Westmere. But 'sh[rl]d' is decoded
+# as single µ-op by Sandy Bridge and it's replacing 'ro[rl]' with
+# equivalent 'sh[rl]d' that is responsible for the impressive 5.1
+# cycles per processed byte. But 'sh[rl]d' is not something that used
+# to be fast, nor does it appear to be fast in upcoming Bulldozer
+# [according to its optimization manual]. Which is why AVX code path
+# is guarded by *both* AVX and synthetic bit denoting Intel CPUs.
+# One can argue that it's unfair to AMD, but without 'sh[rl]d' it
+# makes no sense to keep the AVX code path. If somebody feels that
+# strongly, it's probably more appropriate to discuss possibility of
+# using vector rotate XOP on AMD...
+
+######################################################################
+# Current performance is summarized in following table. Numbers are
+# CPU clock cycles spent to process single byte (less is better).
+#
+#               x86             SSSE3           AVX
+# Pentium       15.7            -
+# PIII          11.5            -
+# P4            10.6            -
+# AMD K8        7.1             -
+# Core2         7.3             6.1/+20%        -
+# Atom          12.5            9.5(*)/+32%     -
+# Westmere      7.3             5.6/+30%        -
+# Sandy Bridge  8.8             6.2/+40%        5.1(**)/+70%
+#
+# (*)   Loop is 1056 instructions long and expected result is ~8.25.
+#       It remains mystery [to me] why ILP is limited to 1.7.
+#
+# (**)  As per above comment, the result is for AVX *plus* sh[rl]d.
+
 $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
 push(@INC,"${dir}","${dir}../../perlasm");
 require "x86asm.pl";
 
 &asm_init($ARGV[0],"sha1-586.pl",$ARGV[$#ARGV] eq "386");
 
+$xmm=$ymm=0;
+for (@ARGV) { $xmm=1 if (/-DOPENSSL_IA32_SSE2/); }
+
+$ymm=1 if ($xmm &&
+                `$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`
+                        =~ /GNU assembler version ([2-9]\.[0-9]+)/ &&
+                $1>=2.19);      # first version supporting AVX
+
+$ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32n" && 
+                `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ &&
+                $1>=2.03);      # first version supporting AVX
+
+&external_label("OPENSSL_ia32cap_P") if ($xmm);
+
+
 $A="eax";
 $B="ebx";
 $C="ecx";
@@ -47,6 +129,10 @@ $tmp1="ebp";
 
 @V=($A,$B,$C,$D,$E,$T);
 
+$alt=0; # 1 denotes alternative IALU implementation, which performs
+        # 8% *worse* on P4, same on Westmere and Atom, 2% better on
+        # Sandy Bridge...
+
 sub BODY_00_15
         {
         local($n,$a,$b,$c,$d,$e,$f)=@_;
@@ -59,16 +145,18 @@ sub BODY_00_15
         &rotl($tmp1,5);                 # tmp1=ROTATE(a,5)
          &xor($f,$d);
         &add($tmp1,$e);                 # tmp1+=e;
-         &and($f,$b);
-        &mov($e,&swtmp($n%16));         # e becomes volatile and is loaded
+         &mov($e,&swtmp($n%16));        # e becomes volatile and is loaded
                                         # with xi, also note that e becomes
                                         # f in next round...
-         &xor($f,$d);                   # f holds F_00_19(b,c,d)
+        &and($f,$b);
         &rotr($b,2);                    # b=ROTATE(b,30)
-         &lea($tmp1,&DWP(0x5a827999,$tmp1,$e)); # tmp1+=K_00_19+xi
+         &xor($f,$d);                   # f holds F_00_19(b,c,d)
+        &lea($tmp1,&DWP(0x5a827999,$tmp1,$e));  # tmp1+=K_00_19+xi
 
-        if ($n==15) { &add($f,$tmp1); } # f+=tmp1
+        if ($n==15) { &mov($e,&swtmp(($n+1)%16));# pre-fetch f for next round
+                      &add($f,$tmp1); } # f+=tmp1
         else        { &add($tmp1,$f); } # f becomes a in next round
+        &mov($tmp1,$a)                  if ($alt && $n==15);
         }
 
 sub BODY_16_19
@@ -77,22 +165,41 @@ sub BODY_16_19
 
         &comment("16_19 $n");
 
-        &mov($f,&swtmp($n%16));         # f to hold Xupdate(xi,xa,xb,xc,xd)
-         &mov($tmp1,$c);                # tmp1 to hold F_00_19(b,c,d)
-        &xor($f,&swtmp(($n+2)%16));
-         &xor($tmp1,$d);
-        &xor($f,&swtmp(($n+8)%16));
-         &and($tmp1,$b);                # tmp1 holds F_00_19(b,c,d)
-        &rotr($b,2);                    # b=ROTATE(b,30)
+if ($alt) {
+        &xor($c,$d);
+         &xor($f,&swtmp(($n+2)%16));    # f to hold Xupdate(xi,xa,xb,xc,xd)
+        &and($tmp1,$c);                 # tmp1 to hold F_00_19(b,c,d), b&=c^d
+         &xor($f,&swtmp(($n+8)%16));
+        &xor($tmp1,$d);                 # tmp1=F_00_19(b,c,d)
+         &xor($f,&swtmp(($n+13)%16));   # f holds xa^xb^xc^xd
+        &rotl($f,1);                    # f=ROTATE(f,1)
+         &add($e,$tmp1);                # e+=F_00_19(b,c,d)
+        &xor($c,$d);                    # restore $c
+         &mov($tmp1,$a);                # b in next round
+        &rotr($b,$n==16?2:7);           # b=ROTATE(b,30)
+         &mov(&swtmp($n%16),$f);        # xi=f
+        &rotl($a,5);                    # ROTATE(a,5)
+         &lea($f,&DWP(0x5a827999,$f,$e));# f+=F_00_19(b,c,d)+e
+        &mov($e,&swtmp(($n+1)%16));     # pre-fetch f for next round
+         &add($f,$a);                   # f+=ROTATE(a,5)
+} else {
+        &mov($tmp1,$c);                 # tmp1 to hold F_00_19(b,c,d)
+         &xor($f,&swtmp(($n+2)%16));    # f to hold Xupdate(xi,xa,xb,xc,xd)
+        &xor($tmp1,$d);
+         &xor($f,&swtmp(($n+8)%16));
+        &and($tmp1,$b);
          &xor($f,&swtmp(($n+13)%16));   # f holds xa^xb^xc^xd
         &rotl($f,1);                    # f=ROTATE(f,1)
          &xor($tmp1,$d);                # tmp1=F_00_19(b,c,d)
-        &mov(&swtmp($n%16),$f);         # xi=f
-        &lea($f,&DWP(0x5a827999,$f,$e));# f+=K_00_19+e
-         &mov($e,$a);                   # e becomes volatile
-        &rotl($e,5);                    # e=ROTATE(a,5)
-         &add($f,$tmp1);                # f+=F_00_19(b,c,d)
-        &add($f,$e);                    # f+=ROTATE(a,5)
+        &add($e,$tmp1);                 # e+=F_00_19(b,c,d)
+         &mov($tmp1,$a);
+        &rotr($b,2);                    # b=ROTATE(b,30)
+         &mov(&swtmp($n%16),$f);        # xi=f
+        &rotl($tmp1,5);                 # ROTATE(a,5)
+         &lea($f,&DWP(0x5a827999,$f,$e));# f+=F_00_19(b,c,d)+e
+        &mov($e,&swtmp(($n+1)%16));     # pre-fetch f for next round
+         &add($f,$tmp1);                # f+=ROTATE(a,5)
+}
         }
 
 sub BODY_20_39
@@ -102,21 +209,41 @@ sub BODY_20_39
 
         &comment("20_39 $n");
 
+if ($alt) {
+        &xor($tmp1,$c);                 # tmp1 to hold F_20_39(b,c,d), b^=c
+         &xor($f,&swtmp(($n+2)%16));    # f to hold Xupdate(xi,xa,xb,xc,xd)
+        &xor($tmp1,$d);                 # tmp1 holds F_20_39(b,c,d)
+         &xor($f,&swtmp(($n+8)%16));
+        &add($e,$tmp1);                 # e+=F_20_39(b,c,d)
+         &xor($f,&swtmp(($n+13)%16));   # f holds xa^xb^xc^xd
+        &rotl($f,1);                    # f=ROTATE(f,1)
+         &mov($tmp1,$a);                # b in next round
+        &rotr($b,7);                    # b=ROTATE(b,30)
+         &mov(&swtmp($n%16),$f)         if($n<77);# xi=f
+        &rotl($a,5);                    # ROTATE(a,5)
+         &xor($b,$c)                    if($n==39);# warm up for BODY_40_59
+        &and($tmp1,$b)                  if($n==39);
+         &lea($f,&DWP($K,$f,$e));       # f+=e+K_XX_YY
+        &mov($e,&swtmp(($n+1)%16))      if($n<79);# pre-fetch f for next round
+         &add($f,$a);                   # f+=ROTATE(a,5)
+        &rotr($a,5)                     if ($n==79);
+} else {
         &mov($tmp1,$b);                 # tmp1 to hold F_20_39(b,c,d)
-         &mov($f,&swtmp($n%16));        # f to hold Xupdate(xi,xa,xb,xc,xd)
-        &rotr($b,2);                    # b=ROTATE(b,30)
-         &xor($f,&swtmp(($n+2)%16));
+         &xor($f,&swtmp(($n+2)%16));    # f to hold Xupdate(xi,xa,xb,xc,xd)
         &xor($tmp1,$c);
          &xor($f,&swtmp(($n+8)%16));
         &xor($tmp1,$d);                 # tmp1 holds F_20_39(b,c,d)
          &xor($f,&swtmp(($n+13)%16));   # f holds xa^xb^xc^xd
         &rotl($f,1);                    # f=ROTATE(f,1)
-         &add($tmp1,$e);
-        &mov(&swtmp($n%16),$f);         # xi=f
-         &mov($e,$a);                   # e becomes volatile
-        &rotl($e,5);                    # e=ROTATE(a,5)
-         &lea($f,&DWP($K,$f,$tmp1));    # f+=K_20_39+e
-        &add($f,$e);                    # f+=ROTATE(a,5)
+         &add($e,$tmp1);                # e+=F_20_39(b,c,d)
+        &rotr($b,2);                    # b=ROTATE(b,30)
+         &mov($tmp1,$a);
+        &rotl($tmp1,5);                 # ROTATE(a,5)
+         &mov(&swtmp($n%16),$f) if($n<77);# xi=f
+        &lea($f,&DWP($K,$f,$e));        # f+=e+K_XX_YY
+         &mov($e,&swtmp(($n+1)%16)) if($n<79);# pre-fetch f for next round
+        &add($f,$tmp1);                 # f+=ROTATE(a,5)
+}
         }
 
 sub BODY_40_59
@@ -125,41 +252,86 @@ sub BODY_40_59
 
         &comment("40_59 $n");
 
-        &mov($f,&swtmp($n%16));         # f to hold Xupdate(xi,xa,xb,xc,xd)
-         &mov($tmp1,&swtmp(($n+2)%16));
-        &xor($f,$tmp1);
-         &mov($tmp1,&swtmp(($n+8)%16));
-        &xor($f,$tmp1);
-         &mov($tmp1,&swtmp(($n+13)%16));
-        &xor($f,$tmp1);                 # f holds xa^xb^xc^xd
-         &mov($tmp1,$b);                # tmp1 to hold F_40_59(b,c,d)
+if ($alt) {
+        &add($e,$tmp1);                 # e+=b&(c^d)
+         &xor($f,&swtmp(($n+2)%16));    # f to hold Xupdate(xi,xa,xb,xc,xd)
+        &mov($tmp1,$d);
+         &xor($f,&swtmp(($n+8)%16));
+        &xor($c,$d);                    # restore $c
+         &xor($f,&swtmp(($n+13)%16));   # f holds xa^xb^xc^xd
         &rotl($f,1);                    # f=ROTATE(f,1)
-         &or($tmp1,$c);
-        &mov(&swtmp($n%16),$f);         # xi=f
-         &and($tmp1,$d);
-        &lea($f,&DWP(0x8f1bbcdc,$f,$e));# f+=K_40_59+e
-         &mov($e,$b);                   # e becomes volatile and is used
-                                        # to calculate F_40_59(b,c,d)
+         &and($tmp1,$c);
+        &rotr($b,7);                    # b=ROTATE(b,30)
+         &add($e,$tmp1);                # e+=c&d
+        &mov($tmp1,$a);                 # b in next round
+         &mov(&swtmp($n%16),$f);        # xi=f
+        &rotl($a,5);                    # ROTATE(a,5)
+         &xor($b,$c)                    if ($n<59);
+        &and($tmp1,$b)                  if ($n<59);# tmp1 to hold F_40_59(b,c,d)
+         &lea($f,&DWP(0x8f1bbcdc,$f,$e));# f+=K_40_59+e+(b&(c^d))
+        &mov($e,&swtmp(($n+1)%16));     # pre-fetch f for next round
+         &add($f,$a);                   # f+=ROTATE(a,5)
+} else {
+        &mov($tmp1,$c);                 # tmp1 to hold F_40_59(b,c,d)
+         &xor($f,&swtmp(($n+2)%16));    # f to hold Xupdate(xi,xa,xb,xc,xd)
+        &xor($tmp1,$d);
+         &xor($f,&swtmp(($n+8)%16));
+        &and($tmp1,$b);
+         &xor($f,&swtmp(($n+13)%16));   # f holds xa^xb^xc^xd
+        &rotl($f,1);                    # f=ROTATE(f,1)
+         &add($tmp1,$e);                # b&(c^d)+=e
         &rotr($b,2);                    # b=ROTATE(b,30)
-         &and($e,$c);
-        &or($tmp1,$e);                  # tmp1 holds F_40_59(b,c,d)             
-         &mov($e,$a);
-        &rotl($e,5);                    # e=ROTATE(a,5)
-         &add($f,$tmp1);                # f+=tmp1;
+         &mov($e,$a);                   # e becomes volatile
+        &rotl($e,5);                    # ROTATE(a,5)
+         &mov(&swtmp($n%16),$f);        # xi=f
+        &lea($f,&DWP(0x8f1bbcdc,$f,$tmp1));# f+=K_40_59+e+(b&(c^d))
+         &mov($tmp1,$c);
         &add($f,$e);                    # f+=ROTATE(a,5)
+         &and($tmp1,$d);
+        &mov($e,&swtmp(($n+1)%16));     # pre-fetch f for next round
+         &add($f,$tmp1);                # f+=c&d
+}
         }
 
 &function_begin("sha1_block_data_order");
+if ($xmm) {
+  &static_label("ssse3_shortcut");
+  &static_label("avx_shortcut")         if ($ymm);
+  &static_label("K_XX_XX");
+
+        &call   (&label("pic_point"));  # make it PIC!
+  &set_label("pic_point");
+        &blindpop($tmp1);
+        &picmeup($T,"OPENSSL_ia32cap_P",$tmp1,&label("pic_point"));
+        &lea    ($tmp1,&DWP(&label("K_XX_XX")."-".&label("pic_point"),$tmp1));
+
+        &mov    ($A,&DWP(0,$T));
+        &mov    ($D,&DWP(4,$T));
+        &test   ($D,1<<9);              # check SSSE3 bit
+        &jz     (&label("x86"));
+        &test   ($A,1<<24);             # check FXSR bit
+        &jz     (&label("x86"));
+        if ($ymm) {
+                &and    ($D,1<<28);             # mask AVX bit
+                &and    ($A,1<<30);             # mask "Intel CPU" bit
+                &or     ($A,$D);
+                &cmp    ($A,1<<28|1<<30);
+                &je     (&label("avx_shortcut"));
+        }
+        &jmp    (&label("ssse3_shortcut"));
+  &set_label("x86",16);
+}
         &mov($tmp1,&wparam(0)); # SHA_CTX *c
         &mov($T,&wparam(1));    # const void *input
         &mov($A,&wparam(2));    # size_t num
-        &stack_push(16);        # allocate X[16]
+        &stack_push(16+3);      # allocate X[16]
         &shl($A,6);
         &add($A,$T);
         &mov(&wparam(2),$A);    # pointer beyond the end of input
         &mov($E,&DWP(16,$tmp1));# pre-load E
+        &jmp(&label("loop"));
 
-        &set_label("loop",16);
+&set_label("loop",16);
 
         # copy input chunk to X, but reversing byte order!
         for ($i=0; $i<16; $i+=4)
@@ -213,8 +385,845 @@ sub BODY_40_59
         &mov(&DWP(16,$tmp1),$C);
         &jb(&label("loop"));
 
-        &stack_pop(16);
+        &stack_pop(16+3);
 &function_end("sha1_block_data_order");
+
+if ($xmm) {
+######################################################################
+# The SSSE3 implementation.
+#
+# %xmm[0-7] are used as ring @X[] buffer containing quadruples of last
+# 32 elements of the message schedule or Xupdate outputs. First 4
+# quadruples are simply byte-swapped input, next 4 are calculated
+# according to method originally suggested by Dean Gaudet (modulo
+# being implemented in SSSE3). Once 8 quadruples or 32 elements are
+# collected, it switches to routine proposed by Max Locktyukhin.
+#
+# Calculations inevitably require temporary reqisters, and there are
+# no %xmm registers left to spare. For this reason part of the ring
+# buffer, X[2..4] to be specific, is offloaded to 3 quadriples ring
+# buffer on the stack. Keep in mind that X[2] is alias X[-6], X[3] -
+# X[-5], and X[4] - X[-4]...
+#
+# Another notable optimization is aggressive stack frame compression
+# aiming to minimize amount of 9-byte instructions...
+#
+# Yet another notable optimization is "jumping" $B variable. It means
+# that there is no register permanently allocated for $B value. This
+# allowed to eliminate one instruction from body_20_39...
+#
+my $Xi=4;                       # 4xSIMD Xupdate round, start pre-seeded
+my @X=map("xmm$_",(4..7,0..3)); # pre-seeded for $Xi=4
+my @V=($A,$B,$C,$D,$E);
+my $j=0;                        # hash round
+my @T=($T,$tmp1);
+my $inp;
+
+my $_rol=sub { &rol(@_) };
+my $_ror=sub { &ror(@_) };
+
+&function_begin("_sha1_block_data_order_ssse3");
+        &call   (&label("pic_point"));  # make it PIC!
+        &set_label("pic_point");
+        &blindpop($tmp1);
+        &lea    ($tmp1,&DWP(&label("K_XX_XX")."-".&label("pic_point"),$tmp1));
+&set_label("ssse3_shortcut");
+
+        &movdqa (@X[3],&QWP(0,$tmp1));          # K_00_19
+        &movdqa (@X[4],&QWP(16,$tmp1));         # K_20_39
+        &movdqa (@X[5],&QWP(32,$tmp1));         # K_40_59
+        &movdqa (@X[6],&QWP(48,$tmp1));         # K_60_79
+        &movdqa (@X[2],&QWP(64,$tmp1));         # pbswap mask
+
+        &mov    ($E,&wparam(0));                # load argument block
+        &mov    ($inp=@T[1],&wparam(1));
+        &mov    ($D,&wparam(2));
+        &mov    (@T[0],"esp");
+
+        # stack frame layout
+        #
+        # +0    X[0]+K  X[1]+K  X[2]+K  X[3]+K  # XMM->IALU xfer area
+        #       X[4]+K  X[5]+K  X[6]+K  X[7]+K
+        #       X[8]+K  X[9]+K  X[10]+K X[11]+K
+        #       X[12]+K X[13]+K X[14]+K X[15]+K
+        #
+        # +64   X[0]    X[1]    X[2]    X[3]    # XMM->XMM backtrace area
+        #       X[4]    X[5]    X[6]    X[7]
+        #       X[8]    X[9]    X[10]   X[11]   # even borrowed for K_00_19
+        #
+        # +112  K_20_39 K_20_39 K_20_39 K_20_39 # constants
+        #       K_40_59 K_40_59 K_40_59 K_40_59
+        #       K_60_79 K_60_79 K_60_79 K_60_79
+        #       K_00_19 K_00_19 K_00_19 K_00_19
+        #       pbswap mask
+        #
+        # +192  ctx                             # argument block
+        # +196  inp
+        # +200  end
+        # +204  esp
+        &sub    ("esp",208);
+        &and    ("esp",-64);
+
+        &movdqa (&QWP(112+0,"esp"),@X[4]);      # copy constants
+        &movdqa (&QWP(112+16,"esp"),@X[5]);
+        &movdqa (&QWP(112+32,"esp"),@X[6]);
+        &shl    ($D,6);                         # len*64
+        &movdqa (&QWP(112+48,"esp"),@X[3]);
+        &add    ($D,$inp);                      # end of input
+        &movdqa (&QWP(112+64,"esp"),@X[2]);
+        &add    ($inp,64);
+        &mov    (&DWP(192+0,"esp"),$E);         # save argument block
+        &mov    (&DWP(192+4,"esp"),$inp);
+        &mov    (&DWP(192+8,"esp"),$D);
+        &mov    (&DWP(192+12,"esp"),@T[0]);     # save original %esp
+
+        &mov    ($A,&DWP(0,$E));                # load context
+        &mov    ($B,&DWP(4,$E));
+        &mov    ($C,&DWP(8,$E));
+        &mov    ($D,&DWP(12,$E));
+        &mov    ($E,&DWP(16,$E));
+        &mov    (@T[0],$B);                     # magic seed
+
+        &movdqu (@X[-4&7],&QWP(-64,$inp));      # load input to %xmm[0-3]
+        &movdqu (@X[-3&7],&QWP(-48,$inp));
+        &movdqu (@X[-2&7],&QWP(-32,$inp));
+        &movdqu (@X[-1&7],&QWP(-16,$inp));
+        &pshufb (@X[-4&7],@X[2]);               # byte swap
+        &pshufb (@X[-3&7],@X[2]);
+        &pshufb (@X[-2&7],@X[2]);
+        &movdqa (&QWP(112-16,"esp"),@X[3]);     # borrow last backtrace slot
+        &pshufb (@X[-1&7],@X[2]);
+        &paddd  (@X[-4&7],@X[3]);               # add K_00_19
+        &paddd  (@X[-3&7],@X[3]);
+        &paddd  (@X[-2&7],@X[3]);
+        &movdqa (&QWP(0,"esp"),@X[-4&7]);       # X[]+K xfer to IALU
+        &psubd  (@X[-4&7],@X[3]);               # restore X[]
+        &movdqa (&QWP(0+16,"esp"),@X[-3&7]);
+        &psubd  (@X[-3&7],@X[3]);
+        &movdqa (&QWP(0+32,"esp"),@X[-2&7]);
+        &psubd  (@X[-2&7],@X[3]);
+        &movdqa (@X[0],@X[-3&7]);
+        &jmp    (&label("loop"));
+
+######################################################################
+# SSE instruction sequence is first broken to groups of indepentent
+# instructions, independent in respect to their inputs and shifter
+# (not all architectures have more than one). Then IALU instructions
+# are "knitted in" between the SSE groups. Distance is maintained for
+# SSE latency of 2 in hope that it fits better upcoming AMD Bulldozer
+# [which allegedly also implements SSSE3]...
+#
+# Temporary registers usage. X[2] is volatile at the entry and at the
+# end is restored from backtrace ring buffer. X[3] is expected to
+# contain current K_XX_XX constant and is used to caclulate X[-1]+K
+# from previous round, it becomes volatile the moment the value is
+# saved to stack for transfer to IALU. X[4] becomes volatile whenever
+# X[-4] is accumulated and offloaded to backtrace ring buffer, at the
+# end it is loaded with next K_XX_XX [which becomes X[3] in next
+# round]...
+#
+sub Xupdate_ssse3_16_31()               # recall that $Xi starts wtih 4
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 40 instructions
+  my ($a,$b,$c,$d,$e);
+
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &palignr(@X[0],@X[-4&7],8);     # compose "X[-14]" in "X[0]"
+        &movdqa (@X[2],@X[-1&7]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+          &paddd        (@X[3],@X[-1&7]);
+          &movdqa       (&QWP(64+16*(($Xi-4)%3),"esp"),@X[-4&7]);# save X[] to backtrace buffer
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &psrldq (@X[2],4);              # "X[-3]", 3 dwords
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &pxor   (@X[0],@X[-4&7]);       # "X[0]"^="X[-16]"
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &pxor   (@X[2],@X[-2&7]);       # "X[-3]"^"X[-8]"
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &pxor   (@X[0],@X[2]);          # "X[0]"^="X[-3]"^"X[-8]"
+         eval(shift(@insns));
+         eval(shift(@insns));
+          &movdqa       (&QWP(0+16*(($Xi-1)&3),"esp"),@X[3]);   # X[]+K xfer to IALU
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &movdqa (@X[4],@X[0]);
+        &movdqa (@X[2],@X[0]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &pslldq (@X[4],12);             # "X[0]"<<96, extract one dword
+        &paddd  (@X[0],@X[0]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &psrld  (@X[2],31);
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &movdqa (@X[3],@X[4]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &psrld  (@X[4],30);
+        &por    (@X[0],@X[2]);          # "X[0]"<<<=1
+         eval(shift(@insns));
+         eval(shift(@insns));
+          &movdqa       (@X[2],&QWP(64+16*(($Xi-6)%3),"esp")) if ($Xi>5);       # restore X[] from backtrace buffer
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &pslld  (@X[3],2);
+        &pxor   (@X[0],@X[4]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+          &movdqa       (@X[4],&QWP(112-16+16*(($Xi)/5),"esp"));        # K_XX_XX
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &pxor   (@X[0],@X[3]);          # "X[0]"^=("X[0]"<<96)<<<2
+          &movdqa       (@X[1],@X[-2&7])        if ($Xi<7);
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+         foreach (@insns) { eval; }     # remaining instructions [if any]
+
+  $Xi++;        push(@X,shift(@X));     # "rotate" X[]
+}
+
+sub Xupdate_ssse3_32_79()
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 32 to 48 instructions
+  my ($a,$b,$c,$d,$e);
+
+        &movdqa (@X[2],@X[-1&7])        if ($Xi==8);
+         eval(shift(@insns));           # body_20_39
+        &pxor   (@X[0],@X[-4&7]);       # "X[0]"="X[-32]"^"X[-16]"
+        &palignr(@X[2],@X[-2&7],8);     # compose "X[-6]"
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # rol
+
+        &pxor   (@X[0],@X[-7&7]);       # "X[0]"^="X[-28]"
+          &movdqa       (&QWP(64+16*(($Xi-4)%3),"esp"),@X[-4&7]);       # save X[] to backtrace buffer
+         eval(shift(@insns));
+         eval(shift(@insns));
+         if ($Xi%5) {
+          &movdqa       (@X[4],@X[3]);  # "perpetuate" K_XX_XX...
+         } else {                       # ... or load next one
+          &movdqa       (@X[4],&QWP(112-16+16*($Xi/5),"esp"));
+         }
+          &paddd        (@X[3],@X[-1&7]);
+         eval(shift(@insns));           # ror
+         eval(shift(@insns));
+
+        &pxor   (@X[0],@X[2]);          # "X[0]"^="X[-6]"
+         eval(shift(@insns));           # body_20_39
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # rol
+
+        &movdqa (@X[2],@X[0]);
+          &movdqa       (&QWP(0+16*(($Xi-1)&3),"esp"),@X[3]);   # X[]+K xfer to IALU
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # ror
+         eval(shift(@insns));
+
+        &pslld  (@X[0],2);
+         eval(shift(@insns));           # body_20_39
+         eval(shift(@insns));
+        &psrld  (@X[2],30);
+         eval(shift(@insns));
+         eval(shift(@insns));           # rol
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # ror
+         eval(shift(@insns));
+
+        &por    (@X[0],@X[2]);          # "X[0]"<<<=2
+         eval(shift(@insns));           # body_20_39
+         eval(shift(@insns));
+          &movdqa       (@X[2],&QWP(64+16*(($Xi-6)%3),"esp")) if($Xi<19);       # restore X[] from backtrace buffer
+         eval(shift(@insns));
+         eval(shift(@insns));           # rol
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # ror
+          &movdqa       (@X[3],@X[0])   if ($Xi<19);
+         eval(shift(@insns));
+
+         foreach (@insns) { eval; }     # remaining instructions
+
+  $Xi++;        push(@X,shift(@X));     # "rotate" X[]
+}
+
+sub Xuplast_ssse3_80()
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 32 instructions
+  my ($a,$b,$c,$d,$e);
+
+         eval(shift(@insns));
+          &paddd        (@X[3],@X[-1&7]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+          &movdqa       (&QWP(0+16*(($Xi-1)&3),"esp"),@X[3]);   # X[]+K xfer IALU
+
+         foreach (@insns) { eval; }             # remaining instructions
+
+        &mov    ($inp=@T[1],&DWP(192+4,"esp"));
+        &cmp    ($inp,&DWP(192+8,"esp"));
+        &je     (&label("done"));
+
+        &movdqa (@X[3],&QWP(112+48,"esp"));     # K_00_19
+        &movdqa (@X[2],&QWP(112+64,"esp"));     # pbswap mask
+        &movdqu (@X[-4&7],&QWP(0,$inp));        # load input
+        &movdqu (@X[-3&7],&QWP(16,$inp));
+        &movdqu (@X[-2&7],&QWP(32,$inp));
+        &movdqu (@X[-1&7],&QWP(48,$inp));
+        &add    ($inp,64);
+        &pshufb (@X[-4&7],@X[2]);               # byte swap
+        &mov    (&DWP(192+4,"esp"),$inp);
+        &movdqa (&QWP(112-16,"esp"),@X[3]);     # borrow last backtrace slot
+
+  $Xi=0;
+}
+
+sub Xloop_ssse3()
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 32 instructions
+  my ($a,$b,$c,$d,$e);
+
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &pshufb (@X[($Xi-3)&7],@X[2]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &paddd  (@X[($Xi-4)&7],@X[3]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &movdqa (&QWP(0+16*$Xi,"esp"),@X[($Xi-4)&7]);   # X[]+K xfer to IALU
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &psubd  (@X[($Xi-4)&7],@X[3]);
+
+        foreach (@insns) { eval; }
+  $Xi++;
+}
+
+sub Xtail_ssse3()
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 32 instructions
+  my ($a,$b,$c,$d,$e);
+
+        foreach (@insns) { eval; }
+}
+
+sub body_00_19 () {
+        (
+        '($a,$b,$c,$d,$e)=@V;'.
+        '&add   ($e,&DWP(4*($j&15),"esp"));',   # X[]+K xfer
+        '&xor   ($c,$d);',
+        '&mov   (@T[1],$a);',   # $b in next round
+        '&$_rol ($a,5);',
+        '&and   (@T[0],$c);',   # ($b&($c^$d))
+        '&xor   ($c,$d);',      # restore $c
+        '&xor   (@T[0],$d);',
+        '&add   ($e,$a);',
+        '&$_ror ($b,$j?7:2);',  # $b>>>2
+        '&add   ($e,@T[0]);'    .'$j++; unshift(@V,pop(@V)); unshift(@T,pop(@T));'
+        );
+}
+
+sub body_20_39 () {
+        (
+        '($a,$b,$c,$d,$e)=@V;'.
+        '&add   ($e,&DWP(4*($j++&15),"esp"));', # X[]+K xfer
+        '&xor   (@T[0],$d);',   # ($b^$d)
+        '&mov   (@T[1],$a);',   # $b in next round
+        '&$_rol ($a,5);',
+        '&xor   (@T[0],$c);',   # ($b^$d^$c)
+        '&add   ($e,$a);',
+        '&$_ror ($b,7);',       # $b>>>2
+        '&add   ($e,@T[0]);'    .'unshift(@V,pop(@V)); unshift(@T,pop(@T));'
+        );
+}
+
+sub body_40_59 () {
+        (
+        '($a,$b,$c,$d,$e)=@V;'.
+        '&mov   (@T[1],$c);',
+        '&xor   ($c,$d);',
+        '&add   ($e,&DWP(4*($j++&15),"esp"));', # X[]+K xfer
+        '&and   (@T[1],$d);',
+        '&and   (@T[0],$c);',   # ($b&($c^$d))
+        '&$_ror ($b,7);',       # $b>>>2
+        '&add   ($e,@T[1]);',
+        '&mov   (@T[1],$a);',   # $b in next round
+        '&$_rol ($a,5);',
+        '&add   ($e,@T[0]);',
+        '&xor   ($c,$d);',      # restore $c
+        '&add   ($e,$a);'       .'unshift(@V,pop(@V)); unshift(@T,pop(@T));'
+        );
+}
+
+&set_label("loop",16);
+        &Xupdate_ssse3_16_31(\&body_00_19);
+        &Xupdate_ssse3_16_31(\&body_00_19);
+        &Xupdate_ssse3_16_31(\&body_00_19);
+        &Xupdate_ssse3_16_31(\&body_00_19);
+        &Xupdate_ssse3_32_79(\&body_00_19);
+        &Xupdate_ssse3_32_79(\&body_20_39);
+        &Xupdate_ssse3_32_79(\&body_20_39);
+        &Xupdate_ssse3_32_79(\&body_20_39);
+        &Xupdate_ssse3_32_79(\&body_20_39);
+        &Xupdate_ssse3_32_79(\&body_20_39);
+        &Xupdate_ssse3_32_79(\&body_40_59);
+        &Xupdate_ssse3_32_79(\&body_40_59);
+        &Xupdate_ssse3_32_79(\&body_40_59);
+        &Xupdate_ssse3_32_79(\&body_40_59);
+        &Xupdate_ssse3_32_79(\&body_40_59);
+        &Xupdate_ssse3_32_79(\&body_20_39);
+        &Xuplast_ssse3_80(\&body_20_39);        # can jump to "done"
+
+                                $saved_j=$j; @saved_V=@V;
+
+        &Xloop_ssse3(\&body_20_39);
+        &Xloop_ssse3(\&body_20_39);
+        &Xloop_ssse3(\&body_20_39);
+
+        &mov    (@T[1],&DWP(192,"esp"));        # update context
+        &add    ($A,&DWP(0,@T[1]));
+        &add    (@T[0],&DWP(4,@T[1]));          # $b
+        &add    ($C,&DWP(8,@T[1]));
+        &mov    (&DWP(0,@T[1]),$A);
+        &add    ($D,&DWP(12,@T[1]));
+        &mov    (&DWP(4,@T[1]),@T[0]);
+        &add    ($E,&DWP(16,@T[1]));
+        &mov    (&DWP(8,@T[1]),$C);
+        &mov    ($B,@T[0]);
+        &mov    (&DWP(12,@T[1]),$D);
+        &mov    (&DWP(16,@T[1]),$E);
+        &movdqa (@X[0],@X[-3&7]);
+
+        &jmp    (&label("loop"));
+
+&set_label("done",16);          $j=$saved_j; @V=@saved_V;
+
+        &Xtail_ssse3(\&body_20_39);
+        &Xtail_ssse3(\&body_20_39);
+        &Xtail_ssse3(\&body_20_39);
+
+        &mov    (@T[1],&DWP(192,"esp"));        # update context
+        &add    ($A,&DWP(0,@T[1]));
+        &mov    ("esp",&DWP(192+12,"esp"));     # restore %esp
+        &add    (@T[0],&DWP(4,@T[1]));          # $b
+        &add    ($C,&DWP(8,@T[1]));
+        &mov    (&DWP(0,@T[1]),$A);
+        &add    ($D,&DWP(12,@T[1]));
+        &mov    (&DWP(4,@T[1]),@T[0]);
+        &add    ($E,&DWP(16,@T[1]));
+        &mov    (&DWP(8,@T[1]),$C);
+        &mov    (&DWP(12,@T[1]),$D);
+        &mov    (&DWP(16,@T[1]),$E);
+
+&function_end("_sha1_block_data_order_ssse3");
+
+if ($ymm) {
+my $Xi=4;                       # 4xSIMD Xupdate round, start pre-seeded
+my @X=map("xmm$_",(4..7,0..3)); # pre-seeded for $Xi=4
+my @V=($A,$B,$C,$D,$E);
+my $j=0;                        # hash round
+my @T=($T,$tmp1);
+my $inp;
+
+my $_rol=sub { &shld(@_[0],@_) };
+my $_ror=sub { &shrd(@_[0],@_) };
+
+&function_begin("_sha1_block_data_order_avx");
+        &call   (&label("pic_point"));  # make it PIC!
+        &set_label("pic_point");
+        &blindpop($tmp1);
+        &lea    ($tmp1,&DWP(&label("K_XX_XX")."-".&label("pic_point"),$tmp1));
+&set_label("avx_shortcut");
+        &vzeroall();
+
+        &vmovdqa(@X[3],&QWP(0,$tmp1));          # K_00_19
+        &vmovdqa(@X[4],&QWP(16,$tmp1));         # K_20_39
+        &vmovdqa(@X[5],&QWP(32,$tmp1));         # K_40_59
+        &vmovdqa(@X[6],&QWP(48,$tmp1));         # K_60_79
+        &vmovdqa(@X[2],&QWP(64,$tmp1));         # pbswap mask
+
+        &mov    ($E,&wparam(0));                # load argument block
+        &mov    ($inp=@T[1],&wparam(1));
+        &mov    ($D,&wparam(2));
+        &mov    (@T[0],"esp");
+
+        # stack frame layout
+        #
+        # +0    X[0]+K  X[1]+K  X[2]+K  X[3]+K  # XMM->IALU xfer area
+        #       X[4]+K  X[5]+K  X[6]+K  X[7]+K
+        #       X[8]+K  X[9]+K  X[10]+K X[11]+K
+        #       X[12]+K X[13]+K X[14]+K X[15]+K
+        #
+        # +64   X[0]    X[1]    X[2]    X[3]    # XMM->XMM backtrace area
+        #       X[4]    X[5]    X[6]    X[7]
+        #       X[8]    X[9]    X[10]   X[11]   # even borrowed for K_00_19
+        #
+        # +112  K_20_39 K_20_39 K_20_39 K_20_39 # constants
+        #       K_40_59 K_40_59 K_40_59 K_40_59
+        #       K_60_79 K_60_79 K_60_79 K_60_79
+        #       K_00_19 K_00_19 K_00_19 K_00_19
+        #       pbswap mask
+        #
+        # +192  ctx                             # argument block
+        # +196  inp
+        # +200  end
+        # +204  esp
+        &sub    ("esp",208);
+        &and    ("esp",-64);
+
+        &vmovdqa(&QWP(112+0,"esp"),@X[4]);      # copy constants
+        &vmovdqa(&QWP(112+16,"esp"),@X[5]);
+        &vmovdqa(&QWP(112+32,"esp"),@X[6]);
+        &shl    ($D,6);                         # len*64
+        &vmovdqa(&QWP(112+48,"esp"),@X[3]);
+        &add    ($D,$inp);                      # end of input
+        &vmovdqa(&QWP(112+64,"esp"),@X[2]);
+        &add    ($inp,64);
+        &mov    (&DWP(192+0,"esp"),$E);         # save argument block
+        &mov    (&DWP(192+4,"esp"),$inp);
+        &mov    (&DWP(192+8,"esp"),$D);
+        &mov    (&DWP(192+12,"esp"),@T[0]);     # save original %esp
+
+        &mov    ($A,&DWP(0,$E));                # load context
+        &mov    ($B,&DWP(4,$E));
+        &mov    ($C,&DWP(8,$E));
+        &mov    ($D,&DWP(12,$E));
+        &mov    ($E,&DWP(16,$E));
+        &mov    (@T[0],$B);                     # magic seed
+
+        &vmovdqu(@X[-4&7],&QWP(-64,$inp));      # load input to %xmm[0-3]
+        &vmovdqu(@X[-3&7],&QWP(-48,$inp));
+        &vmovdqu(@X[-2&7],&QWP(-32,$inp));
+        &vmovdqu(@X[-1&7],&QWP(-16,$inp));
+        &vpshufb(@X[-4&7],@X[-4&7],@X[2]);      # byte swap
+        &vpshufb(@X[-3&7],@X[-3&7],@X[2]);
+        &vpshufb(@X[-2&7],@X[-2&7],@X[2]);
+        &vmovdqa(&QWP(112-16,"esp"),@X[3]);     # borrow last backtrace slot
+        &vpshufb(@X[-1&7],@X[-1&7],@X[2]);
+        &vpaddd (@X[0],@X[-4&7],@X[3]);         # add K_00_19
+        &vpaddd (@X[1],@X[-3&7],@X[3]);
+        &vpaddd (@X[2],@X[-2&7],@X[3]);
+        &vmovdqa(&QWP(0,"esp"),@X[0]);          # X[]+K xfer to IALU
+        &vmovdqa(&QWP(0+16,"esp"),@X[1]);
+        &vmovdqa(&QWP(0+32,"esp"),@X[2]);
+        &jmp    (&label("loop"));
+
+sub Xupdate_avx_16_31()         # recall that $Xi starts wtih 4
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 40 instructions
+  my ($a,$b,$c,$d,$e);
+
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &vpalignr(@X[0],@X[-3&7],@X[-4&7],8);   # compose "X[-14]" in "X[0]"
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+          &vpaddd       (@X[3],@X[3],@X[-1&7]);
+          &vmovdqa      (&QWP(64+16*(($Xi-4)%3),"esp"),@X[-4&7]);# save X[] to backtrace buffer
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &vpsrldq(@X[2],@X[-1&7],4);             # "X[-3]", 3 dwords
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &vpxor  (@X[0],@X[0],@X[-4&7]);         # "X[0]"^="X[-16]"
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &vpxor  (@X[2],@X[2],@X[-2&7]);         # "X[-3]"^"X[-8]"
+         eval(shift(@insns));
+         eval(shift(@insns));
+          &vmovdqa      (&QWP(0+16*(($Xi-1)&3),"esp"),@X[3]);   # X[]+K xfer to IALU
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &vpxor  (@X[0],@X[0],@X[2]);            # "X[0]"^="X[-3]"^"X[-8]"
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &vpsrld (@X[2],@X[0],31);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &vpslldq(@X[4],@X[0],12);               # "X[0]"<<96, extract one dword
+        &vpaddd (@X[0],@X[0],@X[0]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &vpsrld (@X[3],@X[4],30);
+        &vpor   (@X[0],@X[0],@X[2]);            # "X[0]"<<<=1
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &vpslld (@X[4],@X[4],2);
+          &vmovdqa      (@X[2],&QWP(64+16*(($Xi-6)%3),"esp")) if ($Xi>5);       # restore X[] from backtrace buffer
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &vpxor  (@X[0],@X[0],@X[3]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        &vpxor  (@X[0],@X[0],@X[4]);            # "X[0]"^=("X[0]"<<96)<<<2
+         eval(shift(@insns));
+         eval(shift(@insns));
+          &vmovdqa      (@X[4],&QWP(112-16+16*(($Xi)/5),"esp"));        # K_XX_XX
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+         foreach (@insns) { eval; }     # remaining instructions [if any]
+
+  $Xi++;        push(@X,shift(@X));     # "rotate" X[]
+}
+
+sub Xupdate_avx_32_79()
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 32 to 48 instructions
+  my ($a,$b,$c,$d,$e);
+
+        &vpalignr(@X[2],@X[-1&7],@X[-2&7],8);   # compose "X[-6]"
+        &vpxor  (@X[0],@X[0],@X[-4&7]); # "X[0]"="X[-32]"^"X[-16]"
+         eval(shift(@insns));           # body_20_39
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # rol
+
+        &vpxor  (@X[0],@X[0],@X[-7&7]); # "X[0]"^="X[-28]"
+          &vmovdqa      (&QWP(64+16*(($Xi-4)%3),"esp"),@X[-4&7]);       # save X[] to backtrace buffer
+         eval(shift(@insns));
+         eval(shift(@insns));
+         if ($Xi%5) {
+          &vmovdqa      (@X[4],@X[3]);  # "perpetuate" K_XX_XX...
+         } else {                       # ... or load next one
+          &vmovdqa      (@X[4],&QWP(112-16+16*($Xi/5),"esp"));
+         }
+          &vpaddd       (@X[3],@X[3],@X[-1&7]);
+         eval(shift(@insns));           # ror
+         eval(shift(@insns));
+
+        &vpxor  (@X[0],@X[0],@X[2]);            # "X[0]"^="X[-6]"
+         eval(shift(@insns));           # body_20_39
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # rol
+
+        &vpsrld (@X[2],@X[0],30);
+          &vmovdqa      (&QWP(0+16*(($Xi-1)&3),"esp"),@X[3]);   # X[]+K xfer to IALU
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # ror
+         eval(shift(@insns));
+
+        &vpslld (@X[0],@X[0],2);
+         eval(shift(@insns));           # body_20_39
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # rol
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # ror
+         eval(shift(@insns));
+
+        &vpor   (@X[0],@X[0],@X[2]);    # "X[0]"<<<=2
+         eval(shift(@insns));           # body_20_39
+         eval(shift(@insns));
+          &vmovdqa      (@X[2],&QWP(64+16*(($Xi-6)%3),"esp")) if($Xi<19);       # restore X[] from backtrace buffer
+         eval(shift(@insns));
+         eval(shift(@insns));           # rol
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));           # ror
+         eval(shift(@insns));
+
+         foreach (@insns) { eval; }     # remaining instructions
+
+  $Xi++;        push(@X,shift(@X));     # "rotate" X[]
+}
+
+sub Xuplast_avx_80()
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 32 instructions
+  my ($a,$b,$c,$d,$e);
+
+         eval(shift(@insns));
+          &vpaddd       (@X[3],@X[3],@X[-1&7]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+          &vmovdqa      (&QWP(0+16*(($Xi-1)&3),"esp"),@X[3]);   # X[]+K xfer IALU
+
+         foreach (@insns) { eval; }             # remaining instructions
+
+        &mov    ($inp=@T[1],&DWP(192+4,"esp"));
+        &cmp    ($inp,&DWP(192+8,"esp"));
+        &je     (&label("done"));
+
+        &vmovdqa(@X[3],&QWP(112+48,"esp"));     # K_00_19
+        &vmovdqa(@X[2],&QWP(112+64,"esp"));     # pbswap mask
+        &vmovdqu(@X[-4&7],&QWP(0,$inp));        # load input
+        &vmovdqu(@X[-3&7],&QWP(16,$inp));
+        &vmovdqu(@X[-2&7],&QWP(32,$inp));
+        &vmovdqu(@X[-1&7],&QWP(48,$inp));
+        &add    ($inp,64);
+        &vpshufb(@X[-4&7],@X[-4&7],@X[2]);              # byte swap
+        &mov    (&DWP(192+4,"esp"),$inp);
+        &vmovdqa(&QWP(112-16,"esp"),@X[3]);     # borrow last backtrace slot
+
+  $Xi=0;
+}
+
+sub Xloop_avx()
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 32 instructions
+  my ($a,$b,$c,$d,$e);
+
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &vpshufb        (@X[($Xi-3)&7],@X[($Xi-3)&7],@X[2]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &vpaddd (@X[$Xi&7],@X[($Xi-4)&7],@X[3]);
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+         eval(shift(@insns));
+        &vmovdqa        (&QWP(0+16*$Xi,"esp"),@X[$Xi&7]);       # X[]+K xfer to IALU
+         eval(shift(@insns));
+         eval(shift(@insns));
+
+        foreach (@insns) { eval; }
+  $Xi++;
+}
+
+sub Xtail_avx()
+{ use integer;
+  my $body = shift;
+  my @insns = (&$body,&$body,&$body,&$body);    # 32 instructions
+  my ($a,$b,$c,$d,$e);
+
+        foreach (@insns) { eval; }
+}
+
+&set_label("loop",16);
+        &Xupdate_avx_16_31(\&body_00_19);
+        &Xupdate_avx_16_31(\&body_00_19);
+        &Xupdate_avx_16_31(\&body_00_19);
+        &Xupdate_avx_16_31(\&body_00_19);
+        &Xupdate_avx_32_79(\&body_00_19);
+        &Xupdate_avx_32_79(\&body_20_39);
+        &Xupdate_avx_32_79(\&body_20_39);
+        &Xupdate_avx_32_79(\&body_20_39);
+        &Xupdate_avx_32_79(\&body_20_39);
+        &Xupdate_avx_32_79(\&body_20_39);
+        &Xupdate_avx_32_79(\&body_40_59);
+        &Xupdate_avx_32_79(\&body_40_59);
+        &Xupdate_avx_32_79(\&body_40_59);
+        &Xupdate_avx_32_79(\&body_40_59);
+        &Xupdate_avx_32_79(\&body_40_59);
+        &Xupdate_avx_32_79(\&body_20_39);
+        &Xuplast_avx_80(\&body_20_39);  # can jump to "done"
+
+                                $saved_j=$j; @saved_V=@V;
+
+        &Xloop_avx(\&body_20_39);
+        &Xloop_avx(\&body_20_39);
+        &Xloop_avx(\&body_20_39);
+
+        &mov    (@T[1],&DWP(192,"esp"));        # update context
+        &add    ($A,&DWP(0,@T[1]));
+        &add    (@T[0],&DWP(4,@T[1]));          # $b
+        &add    ($C,&DWP(8,@T[1]));
+        &mov    (&DWP(0,@T[1]),$A);
+        &add    ($D,&DWP(12,@T[1]));
+        &mov    (&DWP(4,@T[1]),@T[0]);
+        &add    ($E,&DWP(16,@T[1]));
+        &mov    (&DWP(8,@T[1]),$C);
+        &mov    ($B,@T[0]);
+        &mov    (&DWP(12,@T[1]),$D);
+        &mov    (&DWP(16,@T[1]),$E);
+
+        &jmp    (&label("loop"));
+
+&set_label("done",16);          $j=$saved_j; @V=@saved_V;
+
+        &Xtail_avx(\&body_20_39);
+        &Xtail_avx(\&body_20_39);
+        &Xtail_avx(\&body_20_39);
+
+        &vzeroall();
+
+        &mov    (@T[1],&DWP(192,"esp"));        # update context
+        &add    ($A,&DWP(0,@T[1]));
+        &mov    ("esp",&DWP(192+12,"esp"));     # restore %esp
+        &add    (@T[0],&DWP(4,@T[1]));          # $b
+        &add    ($C,&DWP(8,@T[1]));
+        &mov    (&DWP(0,@T[1]),$A);
+        &add    ($D,&DWP(12,@T[1]));
+        &mov    (&DWP(4,@T[1]),@T[0]);
+        &add    ($E,&DWP(16,@T[1]));
+        &mov    (&DWP(8,@T[1]),$C);
+        &mov    (&DWP(12,@T[1]),$D);
+        &mov    (&DWP(16,@T[1]),$E);
+&function_end("_sha1_block_data_order_avx");
+}
+&set_label("K_XX_XX",64);
+&data_word(0x5a827999,0x5a827999,0x5a827999,0x5a827999);        # K_00_19
+&data_word(0x6ed9eba1,0x6ed9eba1,0x6ed9eba1,0x6ed9eba1);        # K_20_39
+&data_word(0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc);        # K_40_59
+&data_word(0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6);        # K_60_79
+&data_word(0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f);        # pbswap mask
+}
 &asciz("SHA1 block transform for x86, CRYPTOGAMS by <appro\@openssl.org>");
 
 &asm_finish();
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha1-ia64.pl b/src/lib/libssl/src/crypto/sha/asm/sha1-ia64.pl
index 51c4f47ecb..db28f0805a 100644
--- a/src/lib/libssl/src/crypto/sha/asm/sha1-ia64.pl
+++ b/src/lib/libssl/src/crypto/sha/asm/sha1-ia64.pl
@@ -15,7 +15,7 @@
 # is >50% better than HP C and >2x better than gcc.
 
 $code=<<___;
-.ident  \"sha1-ia64.s, version 1.2\"
+.ident  \"sha1-ia64.s, version 1.3\"
 .ident  \"IA-64 ISA artwork by Andy Polyakov <appro\@fy.chalmers.se>\"
 .explicit
 
@@ -26,14 +26,10 @@ if ($^O eq "hpux") {
     $ADDP="addp4";
     for (@ARGV) { $ADDP="add" if (/[\+DD|\-mlp]64/); }
 } else { $ADDP="add"; }
-for (@ARGV) {   $big_endian=1 if (/\-DB_ENDIAN/);
-                $big_endian=0 if (/\-DL_ENDIAN/);   }
-if (!defined($big_endian))
-            {   $big_endian=(unpack('L',pack('N',1))==1);   }
 
 #$human=1;
 if ($human) {   # useful for visual code auditing...
-        ($A,$B,$C,$D,$E,$T)   = ("A","B","C","D","E","T");
+        ($A,$B,$C,$D,$E)   = ("A","B","C","D","E");
         ($h0,$h1,$h2,$h3,$h4) = ("h0","h1","h2","h3","h4");
         ($K_00_19, $K_20_39, $K_40_59, $K_60_79) =
             (   "K_00_19","K_20_39","K_40_59","K_60_79" );
@@ -41,47 +37,50 @@ if ($human) {	# useful for visual code auditing...
                 "X8", "X9","X10","X11","X12","X13","X14","X15"  );
 }
 else {
-        ($A,$B,$C,$D,$E,$T)   = ("loc0","loc1","loc2","loc3","loc4","loc5");
-        ($h0,$h1,$h2,$h3,$h4) = ("loc6","loc7","loc8","loc9","loc10");
+        ($A,$B,$C,$D,$E)   =    ("loc0","loc1","loc2","loc3","loc4");
+        ($h0,$h1,$h2,$h3,$h4) = ("loc5","loc6","loc7","loc8","loc9");
         ($K_00_19, $K_20_39, $K_40_59, $K_60_79) =
-            (   "r14", "r15", "loc11", "loc12"  );
+            (   "r14", "r15", "loc10", "loc11"  );
         @X= (   "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
                 "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31"  );
 }
 
 sub BODY_00_15 {
 local   *code=shift;
-local   ($i,$a,$b,$c,$d,$e,$f)=@_;
+my      ($i,$a,$b,$c,$d,$e)=@_;
+my      $j=$i+1;
+my      $Xn=@X[$j%16];
 
 $code.=<<___ if ($i==0);
-{ .mmi; ld1     $X[$i&0xf]=[inp],2          // MSB
+{ .mmi; ld1     $X[$i]=[inp],2              // MSB
         ld1     tmp2=[tmp3],2           };;
 { .mmi; ld1     tmp0=[inp],2
         ld1     tmp4=[tmp3],2               // LSB
-        dep     $X[$i&0xf]=$X[$i&0xf],tmp2,8,8  };;
+        dep     $X[$i]=$X[$i],tmp2,8,8  };;
 ___
 if ($i<15) {
         $code.=<<___;
-{ .mmi; ld1     $X[($i+1)&0xf]=[inp],2      // +1
+{ .mmi; ld1     $Xn=[inp],2                 // forward Xload
+        nop.m   0x0
         dep     tmp1=tmp0,tmp4,8,8      };;
-{ .mmi; ld1     tmp2=[tmp3],2               // +1
+{ .mmi; ld1     tmp2=[tmp3],2               // forward Xload
         and     tmp4=$c,$b
-        dep     $X[$i&0xf]=$X[$i&0xf],tmp1,16,16        } //;;
-{ .mmi; andcm   tmp1=$d,$b
-        add     tmp0=$e,$K_00_19
+        dep     $X[$i]=$X[$i],tmp1,16,16} //;;
+{ .mmi; add     $e=$e,$K_00_19              // e+=K_00_19
+        andcm   tmp1=$d,$b
         dep.z   tmp5=$a,5,27            };; // a<<5
-{ .mmi; or      tmp4=tmp4,tmp1              // F_00_19(b,c,d)=(b&c)|(~b&d)
-        add     $f=tmp0,$X[$i&0xf]          // f=xi+e+K_00_19
+{ .mmi; add     $e=$e,$X[$i]                // e+=Xload
+        or      tmp4=tmp4,tmp1              // F_00_19(b,c,d)=(b&c)|(~b&d)
         extr.u  tmp1=$a,27,5            };; // a>>27
-{ .mmi; ld1     tmp0=[inp],2                // +1
-        add     $f=$f,tmp4                  // f+=F_00_19(b,c,d)
+{ .mmi; ld1     tmp0=[inp],2                // forward Xload
+        add     $e=$e,tmp4                  // e+=F_00_19(b,c,d)
         shrp    $b=tmp6,tmp6,2          }   // b=ROTATE(b,30)
-{ .mmi; ld1     tmp4=[tmp3],2               // +1
+{ .mmi; ld1     tmp4=[tmp3],2               // forward Xload
         or      tmp5=tmp1,tmp5              // ROTATE(a,5)
         mux2    tmp6=$a,0x44            };; // see b in next iteration
-{ .mii; add     $f=$f,tmp5                  // f+=ROTATE(a,5)
-        dep     $X[($i+1)&0xf]=$X[($i+1)&0xf],tmp2,8,8  // +1
-        mux2    $X[$i&0xf]=$X[$i&0xf],0x44      } //;;
+{ .mii; add     $e=$e,tmp5                  // e+=ROTATE(a,5)
+        dep     $Xn=$Xn,tmp2,8,8            // forward Xload
+        mux2    $X[$i]=$X[$i],0x44      } //;;
 
 ___
         }
@@ -89,24 +88,24 @@ else	{
         $code.=<<___;
 { .mii; and     tmp3=$c,$b
         dep     tmp1=tmp0,tmp4,8,8;;
-        dep     $X[$i&0xf]=$X[$i&0xf],tmp1,16,16        } //;;
-{ .mmi; andcm   tmp1=$d,$b
-        add     tmp0=$e,$K_00_19
+        dep     $X[$i]=$X[$i],tmp1,16,16} //;;
+{ .mmi; add     $e=$e,$K_00_19              // e+=K_00_19
+        andcm   tmp1=$d,$b
         dep.z   tmp5=$a,5,27            };; // a<<5
-{ .mmi; or      tmp4=tmp3,tmp1              // F_00_19(b,c,d)=(b&c)|(~b&d)
-        add     $f=tmp0,$X[$i&0xf]          // f=xi+e+K_00_19
+{ .mmi; add     $e=$e,$X[$i]                // e+=Xupdate
+        or      tmp4=tmp3,tmp1              // F_00_19(b,c,d)=(b&c)|(~b&d)
         extr.u  tmp1=$a,27,5            }   // a>>27
-{ .mmi; xor     tmp2=$X[($i+0+1)&0xf],$X[($i+2+1)&0xf]  // +1
-        xor     tmp3=$X[($i+8+1)&0xf],$X[($i+13+1)&0xf] // +1
+{ .mmi; xor     $Xn=$Xn,$X[($j+2)%16]       // forward Xupdate
+        xor     tmp3=$X[($j+8)%16],$X[($j+13)%16] // forward Xupdate
         nop.i   0                       };;
-{ .mmi; add     $f=$f,tmp4                  // f+=F_00_19(b,c,d)
-        xor     tmp2=tmp2,tmp3              // +1
+{ .mmi; add     $e=$e,tmp4                  // e+=F_00_19(b,c,d)
+        xor     $Xn=$Xn,tmp3                // forward Xupdate
         shrp    $b=tmp6,tmp6,2          }   // b=ROTATE(b,30)
 { .mmi; or      tmp1=tmp1,tmp5              // ROTATE(a,5)
         mux2    tmp6=$a,0x44            };; // see b in next iteration
-{ .mii; add     $f=$f,tmp1                  // f+=ROTATE(a,5)
-        shrp    $e=tmp2,tmp2,31             // f+1=ROTATE(x[0]^x[2]^x[8]^x[13],1)
-        mux2    $X[$i&0xf]=$X[$i&0xf],0x44  };;
+{ .mii; add     $e=$e,tmp1                  // e+=ROTATE(a,5)
+        shrp    $Xn=$Xn,$Xn,31              // ROTATE(x[0]^x[2]^x[8]^x[13],1)
+        mux2    $X[$i]=$X[$i],0x44      };;
 
 ___
         }
@@ -114,27 +113,28 @@ ___
 
 sub BODY_16_19 {
 local   *code=shift;
-local   ($i,$a,$b,$c,$d,$e,$f)=@_;
+my      ($i,$a,$b,$c,$d,$e)=@_;
+my      $j=$i+1;
+my      $Xn=@X[$j%16];
 
 $code.=<<___;
-{ .mmi; mov     $X[$i&0xf]=$f               // Xupdate
-        and     tmp0=$c,$b
+{ .mib; add     $e=$e,$K_00_19              // e+=K_00_19
         dep.z   tmp5=$a,5,27            }   // a<<5
-{ .mmi; andcm   tmp1=$d,$b
-        add     tmp4=$e,$K_00_19        };;
-{ .mmi; or      tmp0=tmp0,tmp1              // F_00_19(b,c,d)=(b&c)|(~b&d)
-        add     $f=$f,tmp4                  // f+=e+K_00_19
+{ .mib; andcm   tmp1=$d,$b
+        and     tmp0=$c,$b              };;
+{ .mmi; add     $e=$e,$X[$i%16]             // e+=Xupdate
+        or      tmp0=tmp0,tmp1              // F_00_19(b,c,d)=(b&c)|(~b&d)
         extr.u  tmp1=$a,27,5            }   // a>>27
-{ .mmi; xor     tmp2=$X[($i+0+1)&0xf],$X[($i+2+1)&0xf]  // +1
-        xor     tmp3=$X[($i+8+1)&0xf],$X[($i+13+1)&0xf] // +1
+{ .mmi; xor     $Xn=$Xn,$X[($j+2)%16]       // forward Xupdate
+        xor     tmp3=$X[($j+8)%16],$X[($j+13)%16]       // forward Xupdate
         nop.i   0                       };;
-{ .mmi; add     $f=$f,tmp0                  // f+=F_00_19(b,c,d)
-        xor     tmp2=tmp2,tmp3              // +1
+{ .mmi; add     $e=$e,tmp0                  // f+=F_00_19(b,c,d)
+        xor     $Xn=$Xn,tmp3                // forward Xupdate
         shrp    $b=tmp6,tmp6,2          }   // b=ROTATE(b,30)
 { .mmi; or      tmp1=tmp1,tmp5              // ROTATE(a,5)
         mux2    tmp6=$a,0x44            };; // see b in next iteration
-{ .mii; add     $f=$f,tmp1                  // f+=ROTATE(a,5)
-        shrp    $e=tmp2,tmp2,31             // f+1=ROTATE(x[0]^x[2]^x[8]^x[13],1)
+{ .mii; add     $e=$e,tmp1                  // e+=ROTATE(a,5)
+        shrp    $Xn=$Xn,$Xn,31              // ROTATE(x[0]^x[2]^x[8]^x[13],1)
         nop.i   0                       };;
 
 ___
@@ -142,49 +142,47 @@ ___
 
 sub BODY_20_39 {
 local   *code=shift;
-local   ($i,$a,$b,$c,$d,$e,$f,$Konst)=@_;
+my      ($i,$a,$b,$c,$d,$e,$Konst)=@_;
         $Konst = $K_20_39 if (!defined($Konst));
+my      $j=$i+1;
+my      $Xn=@X[$j%16];
 
 if ($i<79) {
 $code.=<<___;
-{ .mib; mov     $X[$i&0xf]=$f               // Xupdate
+{ .mib; add     $e=$e,$Konst                // e+=K_XX_XX
         dep.z   tmp5=$a,5,27            }   // a<<5
 { .mib; xor     tmp0=$c,$b
-        add     tmp4=$e,$Konst          };;
-{ .mmi; xor     tmp0=tmp0,$d                // F_20_39(b,c,d)=b^c^d
-        add     $f=$f,tmp4                  // f+=e+K_20_39
+        xor     $Xn=$Xn,$X[($j+2)%16]   };; // forward Xupdate
+{ .mib; add     $e=$e,$X[$i%16]             // e+=Xupdate
         extr.u  tmp1=$a,27,5            }   // a>>27
-{ .mmi; xor     tmp2=$X[($i+0+1)&0xf],$X[($i+2+1)&0xf]  // +1
-        xor     tmp3=$X[($i+8+1)&0xf],$X[($i+13+1)&0xf] // +1
-        nop.i   0                       };;
-{ .mmi; add     $f=$f,tmp0                  // f+=F_20_39(b,c,d)
-        xor     tmp2=tmp2,tmp3              // +1
+{ .mib; xor     tmp0=tmp0,$d                // F_20_39(b,c,d)=b^c^d
+        xor     $Xn=$Xn,$X[($j+8)%16]   };; // forward Xupdate
+{ .mmi; add     $e=$e,tmp0                  // e+=F_20_39(b,c,d)
+        xor     $Xn=$Xn,$X[($j+13)%16]      // forward Xupdate
         shrp    $b=tmp6,tmp6,2          }   // b=ROTATE(b,30)
 { .mmi; or      tmp1=tmp1,tmp5              // ROTATE(a,5)
         mux2    tmp6=$a,0x44            };; // see b in next iteration
-{ .mii; add     $f=$f,tmp1                  // f+=ROTATE(a,5)
-        shrp    $e=tmp2,tmp2,31             // f+1=ROTATE(x[0]^x[2]^x[8]^x[13],1)
+{ .mii; add     $e=$e,tmp1                  // e+=ROTATE(a,5)
+        shrp    $Xn=$Xn,$Xn,31              // ROTATE(x[0]^x[2]^x[8]^x[13],1)
         nop.i   0                       };;
 
 ___
 }
 else {
 $code.=<<___;
-{ .mib; mov     $X[$i&0xf]=$f               // Xupdate
+{ .mib; add     $e=$e,$Konst                // e+=K_60_79
         dep.z   tmp5=$a,5,27            }   // a<<5
 { .mib; xor     tmp0=$c,$b
-        add     tmp4=$e,$Konst          };;
-{ .mib; xor     tmp0=tmp0,$d                // F_20_39(b,c,d)=b^c^d
-        extr.u  tmp1=$a,27,5            }   // a>>27
-{ .mib; add     $f=$f,tmp4                  // f+=e+K_20_39
         add     $h1=$h1,$a              };; // wrap up
-{ .mmi; add     $f=$f,tmp0                  // f+=F_20_39(b,c,d)
-        shrp    $b=tmp6,tmp6,2          }   // b=ROTATE(b,30) ;;?
-{ .mmi; or      tmp1=tmp1,tmp5              // ROTATE(a,5)
+{ .mib; add     $e=$e,$X[$i%16]             // e+=Xupdate
+        extr.u  tmp1=$a,27,5            }   // a>>27
+{ .mib; xor     tmp0=tmp0,$d                // F_20_39(b,c,d)=b^c^d
         add     $h3=$h3,$c              };; // wrap up
-{ .mib; add     tmp3=1,inp                  // used in unaligned codepath
-        add     $f=$f,tmp1              }   // f+=ROTATE(a,5)
-{ .mib; add     $h2=$h2,$b                  // wrap up
+{ .mmi; add     $e=$e,tmp0                  // e+=F_20_39(b,c,d)
+        or      tmp1=tmp1,tmp5              // ROTATE(a,5)
+        shrp    $b=tmp6,tmp6,2          };; // b=ROTATE(b,30) ;;?
+{ .mmi; add     $e=$e,tmp1                  // e+=ROTATE(a,5)
+        add     tmp3=1,inp                  // used in unaligned codepath
         add     $h4=$h4,$d              };; // wrap up
 
 ___
@@ -193,29 +191,29 @@ ___
 
 sub BODY_40_59 {
 local   *code=shift;
-local   ($i,$a,$b,$c,$d,$e,$f)=@_;
+my      ($i,$a,$b,$c,$d,$e)=@_;
+my      $j=$i+1;
+my      $Xn=@X[$j%16];
 
 $code.=<<___;
-{ .mmi; mov     $X[$i&0xf]=$f               // Xupdate
-        and     tmp0=$c,$b
+{ .mib; add     $e=$e,$K_40_59              // e+=K_40_59
         dep.z   tmp5=$a,5,27            }   // a<<5
-{ .mmi; and     tmp1=$d,$b
-        add     tmp4=$e,$K_40_59        };;
-{ .mmi; or      tmp0=tmp0,tmp1              // (b&c)|(b&d)
-        add     $f=$f,tmp4                  // f+=e+K_40_59
+{ .mib; and     tmp1=$c,$d
+        xor     tmp0=$c,$d              };;
+{ .mmi; add     $e=$e,$X[$i%16]             // e+=Xupdate
+        add     tmp5=tmp5,tmp1              // a<<5+(c&d)
         extr.u  tmp1=$a,27,5            }   // a>>27
-{ .mmi; and     tmp4=$c,$d
-        xor     tmp2=$X[($i+0+1)&0xf],$X[($i+2+1)&0xf]  // +1
-        xor     tmp3=$X[($i+8+1)&0xf],$X[($i+13+1)&0xf] // +1
-        };;
-{ .mmi; or      tmp1=tmp1,tmp5              // ROTATE(a,5)
-        xor     tmp2=tmp2,tmp3              // +1
+{ .mmi; and     tmp0=tmp0,$b
+        xor     $Xn=$Xn,$X[($j+2)%16]       // forward Xupdate
+        xor     tmp3=$X[($j+8)%16],$X[($j+13)%16] };;   // forward Xupdate
+{ .mmi; add     $e=$e,tmp0                  // e+=b&(c^d)
+        add     tmp5=tmp5,tmp1              // ROTATE(a,5)+(c&d)
         shrp    $b=tmp6,tmp6,2          }   // b=ROTATE(b,30)
-{ .mmi; or      tmp0=tmp0,tmp4              // F_40_59(b,c,d)=(b&c)|(b&d)|(c&d)
+{ .mmi; xor     $Xn=$Xn,tmp3
         mux2    tmp6=$a,0x44            };; // see b in next iteration
-{ .mii; add     $f=$f,tmp0                  // f+=F_40_59(b,c,d)
-        shrp    $e=tmp2,tmp2,31;;           // f+1=ROTATE(x[0]^x[2]^x[8]^x[13],1)
-        add     $f=$f,tmp1              };; // f+=ROTATE(a,5)
+{ .mii; add     $e=$e,tmp5                  // e+=ROTATE(a,5)+(c&d)
+        shrp    $Xn=$Xn,$Xn,31              // ROTATE(x[0]^x[2]^x[8]^x[13],1)
+        nop.i   0x0                     };;
 
 ___
 }
@@ -237,7 +235,7 @@ inp=r33;	// in1
 .align  32
 sha1_block_data_order:
         .prologue
-{ .mmi; alloc   tmp1=ar.pfs,3,15,0,0
+{ .mmi; alloc   tmp1=ar.pfs,3,14,0,0
         $ADDP   tmp0=4,ctx
         .save   ar.lc,r3
         mov     r3=ar.lc                }
@@ -245,8 +243,8 @@ sha1_block_data_order:
         $ADDP   inp=0,inp
         mov     r2=pr                   };;
 tmp4=in2;
-tmp5=loc13;
-tmp6=loc14;
+tmp5=loc12;
+tmp6=loc13;
         .body
 { .mlx; ld4     $h0=[ctx],8
         movl    $K_00_19=0x5a827999     }
@@ -273,7 +271,7 @@ tmp6=loc14;
 
 ___
 
-{ my $i,@V=($A,$B,$C,$D,$E,$T);
+{ my $i,@V=($A,$B,$C,$D,$E);
 
         for($i=0;$i<16;$i++)    { &BODY_00_15(\$code,$i,@V); unshift(@V,pop(@V)); }
         for(;$i<20;$i++)        { &BODY_16_19(\$code,$i,@V); unshift(@V,pop(@V)); }
@@ -281,12 +279,12 @@ ___
         for(;$i<60;$i++)        { &BODY_40_59(\$code,$i,@V); unshift(@V,pop(@V)); }
         for(;$i<80;$i++)        { &BODY_60_79(\$code,$i,@V); unshift(@V,pop(@V)); }
 
-        (($V[5] eq $D) and ($V[0] eq $E)) or die;       # double-check
+        (($V[0] eq $A) and ($V[4] eq $E)) or die;       # double-check
 }
 
 $code.=<<___;
-{ .mmb; add     $h0=$h0,$E
-        nop.m   0
+{ .mmb; add     $h0=$h0,$A
+        add     $h2=$h2,$C
         br.ctop.dptk.many       .Ldtop  };;
 .Ldend:
 { .mmi; add     tmp0=4,ctx
diff --git a/src/lib/libssl/src/crypto/sha/sha.h b/src/lib/libssl/src/crypto/sha/sha.h
index 16cacf9fc0..8a6bf4bbbb 100644
--- a/src/lib/libssl/src/crypto/sha/sha.h
+++ b/src/lib/libssl/src/crypto/sha/sha.h
@@ -106,6 +106,9 @@ typedef struct SHAstate_st
         } SHA_CTX;
 
 #ifndef OPENSSL_NO_SHA0
+#ifdef OPENSSL_FIPS
+int private_SHA_Init(SHA_CTX *c);
+#endif
 int SHA_Init(SHA_CTX *c);
 int SHA_Update(SHA_CTX *c, const void *data, size_t len);
 int SHA_Final(unsigned char *md, SHA_CTX *c);
@@ -113,6 +116,9 @@ unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md);
 void SHA_Transform(SHA_CTX *c, const unsigned char *data);
 #endif
 #ifndef OPENSSL_NO_SHA1
+#ifdef OPENSSL_FIPS
+int private_SHA1_Init(SHA_CTX *c);
+#endif
 int SHA1_Init(SHA_CTX *c);
 int SHA1_Update(SHA_CTX *c, const void *data, size_t len);
 int SHA1_Final(unsigned char *md, SHA_CTX *c);
@@ -135,6 +141,10 @@ typedef struct SHA256state_st
         } SHA256_CTX;
 
 #ifndef OPENSSL_NO_SHA256
+#ifdef OPENSSL_FIPS
+int private_SHA224_Init(SHA256_CTX *c);
+int private_SHA256_Init(SHA256_CTX *c);
+#endif
 int SHA224_Init(SHA256_CTX *c);
 int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
 int SHA224_Final(unsigned char *md, SHA256_CTX *c);
@@ -182,6 +192,10 @@ typedef struct SHA512state_st
 #endif
 
 #ifndef OPENSSL_NO_SHA512
+#ifdef OPENSSL_FIPS
+int private_SHA384_Init(SHA512_CTX *c);
+int private_SHA512_Init(SHA512_CTX *c);
+#endif
 int SHA384_Init(SHA512_CTX *c);
 int SHA384_Update(SHA512_CTX *c, const void *data, size_t len);
 int SHA384_Final(unsigned char *md, SHA512_CTX *c);
diff --git a/src/lib/libssl/src/crypto/sha/sha1dgst.c b/src/lib/libssl/src/crypto/sha/sha1dgst.c
index 50d1925cde..81219af088 100644
--- a/src/lib/libssl/src/crypto/sha/sha1dgst.c
+++ b/src/lib/libssl/src/crypto/sha/sha1dgst.c
@@ -57,6 +57,7 @@
  */
 
 #include <openssl/opensslconf.h>
+#include <openssl/crypto.h>
 #if !defined(OPENSSL_NO_SHA1) && !defined(OPENSSL_NO_SHA)
 
 #undef  SHA_0
diff --git a/src/lib/libssl/src/crypto/sha/sha_dgst.c b/src/lib/libssl/src/crypto/sha/sha_dgst.c
index 70eb56032c..c946ad827d 100644
--- a/src/lib/libssl/src/crypto/sha/sha_dgst.c
+++ b/src/lib/libssl/src/crypto/sha/sha_dgst.c
@@ -57,6 +57,7 @@
  */
 
 #include <openssl/opensslconf.h>
+#include <openssl/crypto.h>
 #if !defined(OPENSSL_NO_SHA0) && !defined(OPENSSL_NO_SHA)
 
 #undef  SHA_1
diff --git a/src/lib/libssl/src/crypto/sha/sha_locl.h b/src/lib/libssl/src/crypto/sha/sha_locl.h
index 672c26eee1..7a0c3ca8d8 100644
--- a/src/lib/libssl/src/crypto/sha/sha_locl.h
+++ b/src/lib/libssl/src/crypto/sha/sha_locl.h
@@ -122,7 +122,11 @@ void sha1_block_data_order (SHA_CTX *c, const void *p,size_t num);
 #define INIT_DATA_h3 0x10325476UL
 #define INIT_DATA_h4 0xc3d2e1f0UL
 
-int HASH_INIT (SHA_CTX *c)
+#ifdef SHA_0
+fips_md_init(SHA)
+#else
+fips_md_init_ctx(SHA1, SHA)
+#endif
         {
         memset (c,0,sizeof(*c));
         c->h0=INIT_DATA_h0;
diff --git a/src/lib/libssl/src/crypto/stack/safestack.h b/src/lib/libssl/src/crypto/stack/safestack.h
index 3e76aa58f5..ea3aa0d800 100644
--- a/src/lib/libssl/src/crypto/stack/safestack.h
+++ b/src/lib/libssl/src/crypto/stack/safestack.h
@@ -1459,6 +1459,94 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
 #define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))
 
+#define sk_SRP_gN_new(cmp) SKM_sk_new(SRP_gN, (cmp))
+#define sk_SRP_gN_new_null() SKM_sk_new_null(SRP_gN)
+#define sk_SRP_gN_free(st) SKM_sk_free(SRP_gN, (st))
+#define sk_SRP_gN_num(st) SKM_sk_num(SRP_gN, (st))
+#define sk_SRP_gN_value(st, i) SKM_sk_value(SRP_gN, (st), (i))
+#define sk_SRP_gN_set(st, i, val) SKM_sk_set(SRP_gN, (st), (i), (val))
+#define sk_SRP_gN_zero(st) SKM_sk_zero(SRP_gN, (st))
+#define sk_SRP_gN_push(st, val) SKM_sk_push(SRP_gN, (st), (val))
+#define sk_SRP_gN_unshift(st, val) SKM_sk_unshift(SRP_gN, (st), (val))
+#define sk_SRP_gN_find(st, val) SKM_sk_find(SRP_gN, (st), (val))
+#define sk_SRP_gN_find_ex(st, val) SKM_sk_find_ex(SRP_gN, (st), (val))
+#define sk_SRP_gN_delete(st, i) SKM_sk_delete(SRP_gN, (st), (i))
+#define sk_SRP_gN_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN, (st), (ptr))
+#define sk_SRP_gN_insert(st, val, i) SKM_sk_insert(SRP_gN, (st), (val), (i))
+#define sk_SRP_gN_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_gN, (st), (cmp))
+#define sk_SRP_gN_dup(st) SKM_sk_dup(SRP_gN, st)
+#define sk_SRP_gN_pop_free(st, free_func) SKM_sk_pop_free(SRP_gN, (st), (free_func))
+#define sk_SRP_gN_shift(st) SKM_sk_shift(SRP_gN, (st))
+#define sk_SRP_gN_pop(st) SKM_sk_pop(SRP_gN, (st))
+#define sk_SRP_gN_sort(st) SKM_sk_sort(SRP_gN, (st))
+#define sk_SRP_gN_is_sorted(st) SKM_sk_is_sorted(SRP_gN, (st))
+
+#define sk_SRP_gN_cache_new(cmp) SKM_sk_new(SRP_gN_cache, (cmp))
+#define sk_SRP_gN_cache_new_null() SKM_sk_new_null(SRP_gN_cache)
+#define sk_SRP_gN_cache_free(st) SKM_sk_free(SRP_gN_cache, (st))
+#define sk_SRP_gN_cache_num(st) SKM_sk_num(SRP_gN_cache, (st))
+#define sk_SRP_gN_cache_value(st, i) SKM_sk_value(SRP_gN_cache, (st), (i))
+#define sk_SRP_gN_cache_set(st, i, val) SKM_sk_set(SRP_gN_cache, (st), (i), (val))
+#define sk_SRP_gN_cache_zero(st) SKM_sk_zero(SRP_gN_cache, (st))
+#define sk_SRP_gN_cache_push(st, val) SKM_sk_push(SRP_gN_cache, (st), (val))
+#define sk_SRP_gN_cache_unshift(st, val) SKM_sk_unshift(SRP_gN_cache, (st), (val))
+#define sk_SRP_gN_cache_find(st, val) SKM_sk_find(SRP_gN_cache, (st), (val))
+#define sk_SRP_gN_cache_find_ex(st, val) SKM_sk_find_ex(SRP_gN_cache, (st), (val))
+#define sk_SRP_gN_cache_delete(st, i) SKM_sk_delete(SRP_gN_cache, (st), (i))
+#define sk_SRP_gN_cache_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN_cache, (st), (ptr))
+#define sk_SRP_gN_cache_insert(st, val, i) SKM_sk_insert(SRP_gN_cache, (st), (val), (i))
+#define sk_SRP_gN_cache_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_gN_cache, (st), (cmp))
+#define sk_SRP_gN_cache_dup(st) SKM_sk_dup(SRP_gN_cache, st)
+#define sk_SRP_gN_cache_pop_free(st, free_func) SKM_sk_pop_free(SRP_gN_cache, (st), (free_func))
+#define sk_SRP_gN_cache_shift(st) SKM_sk_shift(SRP_gN_cache, (st))
+#define sk_SRP_gN_cache_pop(st) SKM_sk_pop(SRP_gN_cache, (st))
+#define sk_SRP_gN_cache_sort(st) SKM_sk_sort(SRP_gN_cache, (st))
+#define sk_SRP_gN_cache_is_sorted(st) SKM_sk_is_sorted(SRP_gN_cache, (st))
+
+#define sk_SRP_user_pwd_new(cmp) SKM_sk_new(SRP_user_pwd, (cmp))
+#define sk_SRP_user_pwd_new_null() SKM_sk_new_null(SRP_user_pwd)
+#define sk_SRP_user_pwd_free(st) SKM_sk_free(SRP_user_pwd, (st))
+#define sk_SRP_user_pwd_num(st) SKM_sk_num(SRP_user_pwd, (st))
+#define sk_SRP_user_pwd_value(st, i) SKM_sk_value(SRP_user_pwd, (st), (i))
+#define sk_SRP_user_pwd_set(st, i, val) SKM_sk_set(SRP_user_pwd, (st), (i), (val))
+#define sk_SRP_user_pwd_zero(st) SKM_sk_zero(SRP_user_pwd, (st))
+#define sk_SRP_user_pwd_push(st, val) SKM_sk_push(SRP_user_pwd, (st), (val))
+#define sk_SRP_user_pwd_unshift(st, val) SKM_sk_unshift(SRP_user_pwd, (st), (val))
+#define sk_SRP_user_pwd_find(st, val) SKM_sk_find(SRP_user_pwd, (st), (val))
+#define sk_SRP_user_pwd_find_ex(st, val) SKM_sk_find_ex(SRP_user_pwd, (st), (val))
+#define sk_SRP_user_pwd_delete(st, i) SKM_sk_delete(SRP_user_pwd, (st), (i))
+#define sk_SRP_user_pwd_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_user_pwd, (st), (ptr))
+#define sk_SRP_user_pwd_insert(st, val, i) SKM_sk_insert(SRP_user_pwd, (st), (val), (i))
+#define sk_SRP_user_pwd_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_user_pwd, (st), (cmp))
+#define sk_SRP_user_pwd_dup(st) SKM_sk_dup(SRP_user_pwd, st)
+#define sk_SRP_user_pwd_pop_free(st, free_func) SKM_sk_pop_free(SRP_user_pwd, (st), (free_func))
+#define sk_SRP_user_pwd_shift(st) SKM_sk_shift(SRP_user_pwd, (st))
+#define sk_SRP_user_pwd_pop(st) SKM_sk_pop(SRP_user_pwd, (st))
+#define sk_SRP_user_pwd_sort(st) SKM_sk_sort(SRP_user_pwd, (st))
+#define sk_SRP_user_pwd_is_sorted(st) SKM_sk_is_sorted(SRP_user_pwd, (st))
+
+#define sk_SRTP_PROTECTION_PROFILE_new(cmp) SKM_sk_new(SRTP_PROTECTION_PROFILE, (cmp))
+#define sk_SRTP_PROTECTION_PROFILE_new_null() SKM_sk_new_null(SRTP_PROTECTION_PROFILE)
+#define sk_SRTP_PROTECTION_PROFILE_free(st) SKM_sk_free(SRTP_PROTECTION_PROFILE, (st))
+#define sk_SRTP_PROTECTION_PROFILE_num(st) SKM_sk_num(SRTP_PROTECTION_PROFILE, (st))
+#define sk_SRTP_PROTECTION_PROFILE_value(st, i) SKM_sk_value(SRTP_PROTECTION_PROFILE, (st), (i))
+#define sk_SRTP_PROTECTION_PROFILE_set(st, i, val) SKM_sk_set(SRTP_PROTECTION_PROFILE, (st), (i), (val))
+#define sk_SRTP_PROTECTION_PROFILE_zero(st) SKM_sk_zero(SRTP_PROTECTION_PROFILE, (st))
+#define sk_SRTP_PROTECTION_PROFILE_push(st, val) SKM_sk_push(SRTP_PROTECTION_PROFILE, (st), (val))
+#define sk_SRTP_PROTECTION_PROFILE_unshift(st, val) SKM_sk_unshift(SRTP_PROTECTION_PROFILE, (st), (val))
+#define sk_SRTP_PROTECTION_PROFILE_find(st, val) SKM_sk_find(SRTP_PROTECTION_PROFILE, (st), (val))
+#define sk_SRTP_PROTECTION_PROFILE_find_ex(st, val) SKM_sk_find_ex(SRTP_PROTECTION_PROFILE, (st), (val))
+#define sk_SRTP_PROTECTION_PROFILE_delete(st, i) SKM_sk_delete(SRTP_PROTECTION_PROFILE, (st), (i))
+#define sk_SRTP_PROTECTION_PROFILE_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRTP_PROTECTION_PROFILE, (st), (ptr))
+#define sk_SRTP_PROTECTION_PROFILE_insert(st, val, i) SKM_sk_insert(SRTP_PROTECTION_PROFILE, (st), (val), (i))
+#define sk_SRTP_PROTECTION_PROFILE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRTP_PROTECTION_PROFILE, (st), (cmp))
+#define sk_SRTP_PROTECTION_PROFILE_dup(st) SKM_sk_dup(SRTP_PROTECTION_PROFILE, st)
+#define sk_SRTP_PROTECTION_PROFILE_pop_free(st, free_func) SKM_sk_pop_free(SRTP_PROTECTION_PROFILE, (st), (free_func))
+#define sk_SRTP_PROTECTION_PROFILE_shift(st) SKM_sk_shift(SRTP_PROTECTION_PROFILE, (st))
+#define sk_SRTP_PROTECTION_PROFILE_pop(st) SKM_sk_pop(SRTP_PROTECTION_PROFILE, (st))
+#define sk_SRTP_PROTECTION_PROFILE_sort(st) SKM_sk_sort(SRTP_PROTECTION_PROFILE, (st))
+#define sk_SRTP_PROTECTION_PROFILE_is_sorted(st) SKM_sk_is_sorted(SRTP_PROTECTION_PROFILE, (st))
+
 #define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))
 #define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
 #define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))
@@ -2056,31 +2144,6 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #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_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_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(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(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(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(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(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_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))
@@ -2106,6 +2169,31 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
 #define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (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_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_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(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(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(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(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(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 d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
         SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class)) 
 #define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
diff --git a/src/lib/libssl/src/crypto/symhacks.h b/src/lib/libssl/src/crypto/symhacks.h
index 3fd4a81692..403f592dcd 100644
--- a/src/lib/libssl/src/crypto/symhacks.h
+++ b/src/lib/libssl/src/crypto/symhacks.h
@@ -176,7 +176,6 @@
 #define SSL_CTX_set_default_passwd_cb_userdata  SSL_CTX_set_def_passwd_cb_ud
 #undef SSL_COMP_get_compression_methods
 #define SSL_COMP_get_compression_methods        SSL_COMP_get_compress_methods
-
 #undef ssl_add_clienthello_renegotiate_ext
 #define ssl_add_clienthello_renegotiate_ext     ssl_add_clienthello_reneg_ext
 #undef ssl_add_serverhello_renegotiate_ext
@@ -185,6 +184,26 @@
 #define ssl_parse_clienthello_renegotiate_ext   ssl_parse_clienthello_reneg_ext
 #undef ssl_parse_serverhello_renegotiate_ext
 #define ssl_parse_serverhello_renegotiate_ext   ssl_parse_serverhello_reneg_ext
+#undef SSL_srp_server_param_with_username
+#define SSL_srp_server_param_with_username      SSL_srp_server_param_with_un
+#undef SSL_CTX_set_srp_client_pwd_callback
+#define SSL_CTX_set_srp_client_pwd_callback     SSL_CTX_set_srp_client_pwd_cb
+#undef SSL_CTX_set_srp_verify_param_callback
+#define SSL_CTX_set_srp_verify_param_callback   SSL_CTX_set_srp_vfy_param_cb
+#undef SSL_CTX_set_srp_username_callback
+#define SSL_CTX_set_srp_username_callback       SSL_CTX_set_srp_un_cb
+#undef ssl_add_clienthello_use_srtp_ext
+#define ssl_add_clienthello_use_srtp_ext ssl_add_clihello_use_srtp_ext
+#undef ssl_add_serverhello_use_srtp_ext
+#define ssl_add_serverhello_use_srtp_ext ssl_add_serhello_use_srtp_ext
+#undef ssl_parse_clienthello_use_srtp_ext
+#define ssl_parse_clienthello_use_srtp_ext ssl_parse_clihello_use_srtp_ext
+#undef ssl_parse_serverhello_use_srtp_ext
+#define ssl_parse_serverhello_use_srtp_ext ssl_parse_serhello_use_srtp_ext
+#undef SSL_CTX_set_next_protos_advertised_cb
+#define SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_protos_adv_cb
+#undef SSL_CTX_set_next_proto_select_cb
+#define SSL_CTX_set_next_proto_select_cb SSL_CTX_set_next_proto_sel_cb
 
 /* Hack some long ENGINE names */
 #undef ENGINE_get_default_BN_mod_exp_crt
@@ -238,6 +257,9 @@
 #define EC_GROUP_get_point_conversion_form      EC_GROUP_get_point_conv_form
 #undef EC_GROUP_clear_free_all_extra_data
 #define EC_GROUP_clear_free_all_extra_data      EC_GROUP_clr_free_all_xtra_data
+#undef EC_KEY_set_public_key_affine_coordinates
+#define EC_KEY_set_public_key_affine_coordinates \
+                                                EC_KEY_set_pub_key_aff_coords
 #undef EC_POINT_set_Jprojective_coordinates_GFp
 #define EC_POINT_set_Jprojective_coordinates_GFp \
                                                 EC_POINT_set_Jproj_coords_GFp
@@ -399,6 +421,12 @@
 #undef dtls1_retransmit_buffered_messages
 #define dtls1_retransmit_buffered_messages      dtls1_retransmit_buffered_msgs
 
+/* Hack some long SRP names */
+#undef SRP_generate_server_master_secret
+#define SRP_generate_server_master_secret       SRP_gen_server_master_secret
+#undef SRP_generate_client_master_secret
+#define SRP_generate_client_master_secret       SRP_gen_client_master_secret
+
 /* Hack some long UI names */
 #undef UI_method_get_prompt_constructor
 #define UI_method_get_prompt_constructor        UI_method_get_prompt_constructr
diff --git a/src/lib/libssl/src/crypto/ui/ui.h b/src/lib/libssl/src/crypto/ui/ui.h
index 2b1cfa2289..bd78aa413f 100644
--- a/src/lib/libssl/src/crypto/ui/ui.h
+++ b/src/lib/libssl/src/crypto/ui/ui.h
@@ -316,7 +316,7 @@ int (*UI_method_get_writer(UI_METHOD *method))(UI*,UI_STRING*);
 int (*UI_method_get_flusher(UI_METHOD *method))(UI*);
 int (*UI_method_get_reader(UI_METHOD *method))(UI*,UI_STRING*);
 int (*UI_method_get_closer(UI_METHOD *method))(UI*);
-char* (*UI_method_get_prompt_constructor(UI_METHOD *method))(UI*, const char*, const char*);
+char * (*UI_method_get_prompt_constructor(UI_METHOD *method))(UI*, const char*, const char*);
 
 /* The following functions are helpers for method writers to access relevant
    data from a UI_STRING. */
diff --git a/src/lib/libssl/src/crypto/ui/ui_openssl.c b/src/lib/libssl/src/crypto/ui/ui_openssl.c
index 1bc25f48d5..5832a73cf5 100644
--- a/src/lib/libssl/src/crypto/ui/ui_openssl.c
+++ b/src/lib/libssl/src/crypto/ui/ui_openssl.c
@@ -122,7 +122,7 @@
  * sigaction and fileno included. -pedantic would be more appropriate for
  * the intended purposes, but we can't prevent users from adding -ansi.
  */
-#ifndef _POSIX_C_SOURCE
+#if !defined(_POSIX_C_SOURCE) && defined(OPENSSL_SYS_VMS)
 #define _POSIX_C_SOURCE 2
 #endif
 #include <signal.h>
diff --git a/src/lib/libssl/src/crypto/x509/x509.h b/src/lib/libssl/src/crypto/x509/x509.h
index e6f8a40395..092dd7450d 100644
--- a/src/lib/libssl/src/crypto/x509/x509.h
+++ b/src/lib/libssl/src/crypto/x509/x509.h
@@ -657,11 +657,15 @@ int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey);
 
 int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki);
 
+int X509_signature_dump(BIO *bp,const ASN1_STRING *sig, int indent);
 int X509_signature_print(BIO *bp,X509_ALGOR *alg, ASN1_STRING *sig);
 
 int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
+int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx);
 int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md);
+int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx);
 int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md);
+int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx);
 int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md);
 
 int X509_pubkey_digest(const X509 *data,const EVP_MD *type,
@@ -763,6 +767,7 @@ X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn);
 int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval);
 void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
                                                 X509_ALGOR *algor);
+void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md);
 
 X509_NAME *X509_NAME_dup(X509_NAME *xn);
 X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
@@ -896,6 +901,9 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *algor1,
 int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
         ASN1_BIT_STRING *signature,
         void *data, EVP_PKEY *pkey, const EVP_MD *type);
+int ASN1_item_sign_ctx(const ASN1_ITEM *it,
+                X509_ALGOR *algor1, X509_ALGOR *algor2,
+                ASN1_BIT_STRING *signature, void *asn, EVP_MD_CTX *ctx);
 #endif
 
 int             X509_set_version(X509 *x,long version);
@@ -1161,6 +1169,9 @@ X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
                                  unsigned char *salt, int saltlen,
                                  unsigned char *aiv, int prf_nid);
 
+X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
+                                int prf_nid, int keylen);
+
 /* PKCS#8 utilities */
 
 DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
diff --git a/src/lib/libssl/src/crypto/x509/x509_cmp.c b/src/lib/libssl/src/crypto/x509/x509_cmp.c
index 4bc9da07e0..7c2aaee2e9 100644
--- a/src/lib/libssl/src/crypto/x509/x509_cmp.c
+++ b/src/lib/libssl/src/crypto/x509/x509_cmp.c
@@ -87,15 +87,20 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
         EVP_MD_CTX_init(&ctx);
         f=X509_NAME_oneline(a->cert_info->issuer,NULL,0);
         ret=strlen(f);
-        EVP_DigestInit_ex(&ctx, EVP_md5(), NULL);
-        EVP_DigestUpdate(&ctx,(unsigned char *)f,ret);
+        if (!EVP_DigestInit_ex(&ctx, EVP_md5(), NULL))
+                goto err;
+        if (!EVP_DigestUpdate(&ctx,(unsigned char *)f,ret))
+                goto err;
         OPENSSL_free(f);
-        EVP_DigestUpdate(&ctx,(unsigned char *)a->cert_info->serialNumber->data,
-                (unsigned long)a->cert_info->serialNumber->length);
-        EVP_DigestFinal_ex(&ctx,&(md[0]),NULL);
+        if(!EVP_DigestUpdate(&ctx,(unsigned char *)a->cert_info->serialNumber->data,
+                (unsigned long)a->cert_info->serialNumber->length))
+                goto err;
+        if (!EVP_DigestFinal_ex(&ctx,&(md[0]),NULL))
+                goto err;
         ret=(   ((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
                 ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)
                 )&0xffffffffL;
+        err:
         EVP_MD_CTX_cleanup(&ctx);
         return(ret);
         }
@@ -219,7 +224,9 @@ unsigned long X509_NAME_hash(X509_NAME *x)
 
         /* Make sure X509_NAME structure contains valid cached encoding */
         i2d_X509_NAME(x,NULL);
-        EVP_Digest(x->canon_enc, x->canon_enclen, md, NULL, EVP_sha1(), NULL);
+        if (!EVP_Digest(x->canon_enc, x->canon_enclen, md, NULL, EVP_sha1(),
+                NULL))
+                return 0;
 
         ret=(   ((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
                 ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)
@@ -234,12 +241,18 @@ unsigned long X509_NAME_hash(X509_NAME *x)
 
 unsigned long X509_NAME_hash_old(X509_NAME *x)
         {
+        EVP_MD_CTX md_ctx;
         unsigned long ret=0;
         unsigned char md[16];
 
         /* Make sure X509_NAME structure contains valid cached encoding */
         i2d_X509_NAME(x,NULL);
-        EVP_Digest(x->bytes->data, x->bytes->length, md, NULL, EVP_md5(), NULL);
+        EVP_MD_CTX_init(&md_ctx);
+        EVP_MD_CTX_set_flags(&md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+        EVP_DigestInit_ex(&md_ctx, EVP_md5(), NULL);
+        EVP_DigestUpdate(&md_ctx, x->bytes->data, x->bytes->length);
+        EVP_DigestFinal_ex(&md_ctx,md,NULL);
+        EVP_MD_CTX_cleanup(&md_ctx);
 
         ret=(   ((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
                 ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)
diff --git a/src/lib/libssl/src/crypto/x509/x509_lu.c b/src/lib/libssl/src/crypto/x509/x509_lu.c
index 3a6e04a1de..38525a8cdd 100644
--- a/src/lib/libssl/src/crypto/x509/x509_lu.c
+++ b/src/lib/libssl/src/crypto/x509/x509_lu.c
@@ -87,7 +87,7 @@ void X509_LOOKUP_free(X509_LOOKUP *ctx)
         if (ctx == NULL) return;
         if (    (ctx->method != NULL) &&
                 (ctx->method->free != NULL))
-                ctx->method->free(ctx);
+                (*ctx->method->free)(ctx);
         OPENSSL_free(ctx);
         }
 
diff --git a/src/lib/libssl/src/crypto/x509/x509_vfy.c b/src/lib/libssl/src/crypto/x509/x509_vfy.c
index 701ec565e9..b0779db023 100644
--- a/src/lib/libssl/src/crypto/x509/x509_vfy.c
+++ b/src/lib/libssl/src/crypto/x509/x509_vfy.c
@@ -153,7 +153,6 @@ static int x509_subject_cmp(X509 **a, X509 **b)
 int X509_verify_cert(X509_STORE_CTX *ctx)
         {
         X509 *x,*xtmp,*chain_ss=NULL;
-        X509_NAME *xn;
         int bad_chain = 0;
         X509_VERIFY_PARAM *param = ctx->param;
         int depth,i,ok=0;
@@ -205,7 +204,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                                          */
 
                 /* If we are self signed, we break */
-                xn=X509_get_issuer_name(x);
                 if (ctx->check_issued(ctx, x,x)) break;
 
                 /* If we were passed a cert chain, use it first */
@@ -242,7 +240,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
 
         i=sk_X509_num(ctx->chain);
         x=sk_X509_value(ctx->chain,i-1);
-        xn = X509_get_subject_name(x);
         if (ctx->check_issued(ctx, x, x))
                 {
                 /* we have a self signed certificate */
@@ -291,7 +288,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                 if (depth < num) break;
 
                 /* If we are self signed, we break */
-                xn=X509_get_issuer_name(x);
                 if (ctx->check_issued(ctx,x,x)) break;
 
                 ok = ctx->get_issuer(&xtmp, ctx, x);
@@ -310,7 +306,6 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                 }
 
         /* we now have our chain, lets check it... */
-        xn=X509_get_issuer_name(x);
 
         /* Is last certificate looked up self signed? */
         if (!ctx->check_issued(ctx,x,x))
diff --git a/src/lib/libssl/src/crypto/x509/x509type.c b/src/lib/libssl/src/crypto/x509/x509type.c
index 3385ad3f67..9702ec5310 100644
--- a/src/lib/libssl/src/crypto/x509/x509type.c
+++ b/src/lib/libssl/src/crypto/x509/x509type.c
@@ -100,20 +100,26 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
                 break;
                 }
 
-        i=X509_get_signature_type(x);
-        switch (i)
+        i=OBJ_obj2nid(x->sig_alg->algorithm);
+        if (i && OBJ_find_sigid_algs(i, NULL, &i))
                 {
-        case EVP_PKEY_RSA:
-                ret|=EVP_PKS_RSA;
-                break;
-        case EVP_PKEY_DSA:
-                ret|=EVP_PKS_DSA;
-                break;
-        case EVP_PKEY_EC:
-                ret|=EVP_PKS_EC;
-                break;
-        default:
-                break;
+
+                switch (i)
+                        {
+                case NID_rsaEncryption:
+                case NID_rsa:
+                        ret|=EVP_PKS_RSA;
+                        break;
+                case NID_dsa:
+                case NID_dsa_2:
+                        ret|=EVP_PKS_DSA;
+                        break;
+                case NID_X9_62_id_ecPublicKey:
+                        ret|=EVP_PKS_EC;
+                        break;
+                default:
+                        break;
+                        }
                 }
 
         if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look
diff --git a/src/lib/libssl/src/crypto/x509/x_all.c b/src/lib/libssl/src/crypto/x509/x_all.c
index 8ec88c215a..b94aeeb873 100644
--- a/src/lib/libssl/src/crypto/x509/x_all.c
+++ b/src/lib/libssl/src/crypto/x509/x_all.c
@@ -95,12 +95,25 @@ int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
                 x->sig_alg, x->signature, x->cert_info,pkey,md));
         }
 
+int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx)
+        {
+        return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CINF),
+                x->cert_info->signature,
+                x->sig_alg, x->signature, x->cert_info, ctx);
+        }
+
 int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md)
         {
         return(ASN1_item_sign(ASN1_ITEM_rptr(X509_REQ_INFO),x->sig_alg, NULL,
                 x->signature, x->req_info,pkey,md));
         }
 
+int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx)
+        {
+        return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_REQ_INFO),
+                x->sig_alg, NULL, x->signature, x->req_info, ctx);
+        }
+
 int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
         {
         x->crl->enc.modified = 1;
@@ -108,6 +121,12 @@ int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md)
                 x->sig_alg, x->signature, x->crl,pkey,md));
         }
 
+int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx)
+        {
+        return ASN1_item_sign_ctx(ASN1_ITEM_rptr(X509_CRL_INFO),
+                x->crl->sig_alg, x->sig_alg, x->signature, x->crl, ctx);
+        }
+
 int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
         {
         return(ASN1_item_sign(ASN1_ITEM_rptr(NETSCAPE_SPKAC), x->sig_algor,NULL,
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_skey.c b/src/lib/libssl/src/crypto/x509v3/v3_skey.c
index 202c9e4896..0a984fbaa8 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_skey.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_skey.c
@@ -129,7 +129,8 @@ static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method,
                 goto err;
         }
 
-        EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL);
+        if (!EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL))
+                goto err;
 
         if(!M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
                 X509V3err(X509V3_F_S2I_SKEY_ID,ERR_R_MALLOC_FAILURE);
diff --git a/src/lib/libssl/src/doc/HOWTO/proxy_certificates.txt b/src/lib/libssl/src/doc/HOWTO/proxy_certificates.txt
index 3d36b02f6b..f98ec36076 100644
--- a/src/lib/libssl/src/doc/HOWTO/proxy_certificates.txt
+++ b/src/lib/libssl/src/doc/HOWTO/proxy_certificates.txt
@@ -57,7 +57,7 @@ following methods:
 
  - in all other cases, proxy certificate validation can be enabled
    before starting the application by setting the envirnoment variable
-   OPENSSL_ALLOW_PROXY with some non-empty value.
+   OPENSSL_ALLOW_PROXY_CERTS with some non-empty value.
 
 There are thoughts to allow proxy certificates with a line in the
 default openssl.cnf, but that's still in the future.
diff --git a/src/lib/libssl/src/doc/apps/openssl.pod b/src/lib/libssl/src/doc/apps/openssl.pod
index 738142e9ff..64a160c20a 100644
--- a/src/lib/libssl/src/doc/apps/openssl.pod
+++ b/src/lib/libssl/src/doc/apps/openssl.pod
@@ -287,8 +287,6 @@ SHA Digest
 
 SHA-1 Digest
 
-=back
-
 =item B<sha224>
 
 SHA-224 Digest
@@ -305,6 +303,8 @@ SHA-384 Digest
 
 SHA-512 Digest
 
+=back
+
 =head2 ENCODING AND CIPHER COMMANDS
 
 =over 10
diff --git a/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod b/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
index 5b477ac6ec..367691cc7a 100644
--- a/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
+++ b/src/lib/libssl/src/doc/crypto/EVP_DigestInit.pod
@@ -6,7 +6,8 @@ EVP_MD_CTX_init, EVP_MD_CTX_create, EVP_DigestInit_ex, EVP_DigestUpdate,
 EVP_DigestFinal_ex, EVP_MD_CTX_cleanup, EVP_MD_CTX_destroy, EVP_MAX_MD_SIZE,
 EVP_MD_CTX_copy_ex, EVP_MD_CTX_copy, EVP_MD_type, EVP_MD_pkey_type, EVP_MD_size,
 EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size, EVP_MD_CTX_block_size, EVP_MD_CTX_type,
-EVP_md_null, EVP_md2, EVP_md5, EVP_sha, EVP_sha1, EVP_dss, EVP_dss1, EVP_mdc2,
+EVP_md_null, EVP_md2, EVP_md5, EVP_sha, EVP_sha1, EVP_sha224, EVP_sha256,
+EVP_sha384, EVP_sha512, EVP_dss, EVP_dss1, EVP_mdc2,
 EVP_ripemd160, EVP_get_digestbyname, EVP_get_digestbynid, EVP_get_digestbyobj -
 EVP digest routines
 
@@ -33,16 +34,15 @@ EVP digest routines
 
  int EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in);  
 
- #define EVP_MAX_MD_SIZE (16+20) /* The SSLv3 md5+sha1 type */
+ #define EVP_MAX_MD_SIZE 64     /* SHA512 */
 
+ int EVP_MD_type(const EVP_MD *md);
+ int EVP_MD_pkey_type(const EVP_MD *md);        
+ int EVP_MD_size(const EVP_MD *md);
+ int EVP_MD_block_size(const EVP_MD *md);
 
- #define EVP_MD_type(e)                 ((e)->type)
- #define EVP_MD_pkey_type(e)            ((e)->pkey_type)
- #define EVP_MD_size(e)                 ((e)->md_size)
- #define EVP_MD_block_size(e)           ((e)->block_size)
-
- #define EVP_MD_CTX_md(e)               (e)->digest)
- #define EVP_MD_CTX_size(e)             EVP_MD_size((e)->digest)
+ const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
+ #define EVP_MD_CTX_size(e)             EVP_MD_size(EVP_MD_CTX_md(e))
  #define EVP_MD_CTX_block_size(e)       EVP_MD_block_size((e)->digest)
  #define EVP_MD_CTX_type(e)             EVP_MD_type((e)->digest)
 
@@ -56,6 +56,11 @@ EVP digest routines
  const EVP_MD *EVP_mdc2(void);
  const EVP_MD *EVP_ripemd160(void);
 
+ const EVP_MD *EVP_sha224(void);
+ const EVP_MD *EVP_sha256(void);
+ const EVP_MD *EVP_sha384(void);
+ const EVP_MD *EVP_sha512(void);
+
  const EVP_MD *EVP_get_digestbyname(const char *name);
  #define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
  #define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
@@ -124,12 +129,14 @@ B<EVP_MD_CTX>.
 
 EVP_MD_pkey_type() returns the NID of the public key signing algorithm associated
 with this digest. For example EVP_sha1() is associated with RSA so this will
-return B<NID_sha1WithRSAEncryption>. This "link" between digests and signature
-algorithms may not be retained in future versions of OpenSSL.
+return B<NID_sha1WithRSAEncryption>. Since digests and signature algorithms
+are no longer linked this function is only retained for compatibility
+reasons.
 
-EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_mdc2() and EVP_ripemd160()
-return B<EVP_MD> structures for the MD2, MD5, SHA, SHA1, MDC2 and RIPEMD160 digest
-algorithms respectively. The associated signature algorithm is RSA in each case.
+EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_sha224(), EVP_sha256(),
+EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160() return B<EVP_MD>
+structures for the MD2, MD5, SHA, SHA1, SHA224, SHA256, SHA384, SHA512, MDC2
+and RIPEMD160 digest algorithms respectively. 
 
 EVP_dss() and EVP_dss1() return B<EVP_MD> structures for SHA and SHA1 digest
 algorithms but using DSS (DSA) for the signature algorithm. Note: there is 
@@ -171,8 +178,8 @@ The B<EVP> interface to message digests should almost always be used in
 preference to the low level interfaces. This is because the code then becomes
 transparent to the digest used and much more flexible.
 
-SHA1 is the digest of choice for new applications. The other digest algorithms
-are still in common use.
+New applications should use the SHA2 digest algorithms such as SHA256. 
+The other digest algorithms are still in common use.
 
 For most applications the B<impl> parameter to EVP_DigestInit_ex() will be
 set to NULL to use the default digest implementation.
@@ -187,6 +194,19 @@ implementations of digests to be specified.
 In OpenSSL 0.9.7 and later if digest contexts are not cleaned up after use
 memory leaks will occur. 
 
+Stack allocation of EVP_MD_CTX structures is common, for example:
+
+ EVP_MD_CTX mctx;
+ EVP_MD_CTX_init(&mctx);
+
+This will cause binary compatibility issues if the size of EVP_MD_CTX
+structure changes (this will only happen with a major release of OpenSSL).
+Applications wishing to avoid this should use EVP_MD_CTX_create() instead:
+
+ EVP_MD_CTX *mctx;
+ mctx = EVP_MD_CTX_create();
+
+
 =head1 EXAMPLE
 
 This example digests the data "Test Message\n" and "Hello World\n", using the
@@ -197,7 +217,7 @@ digest name passed on the command line.
 
  main(int argc, char *argv[])
  {
- EVP_MD_CTX mdctx;
+ EVP_MD_CTX *mdctx;
  const EVP_MD *md;
  char mess1[] = "Test Message\n";
  char mess2[] = "Hello World\n";
@@ -218,12 +238,12 @@ digest name passed on the command line.
         exit(1);
  }
 
- EVP_MD_CTX_init(&mdctx);
- EVP_DigestInit_ex(&mdctx, md, NULL);
- EVP_DigestUpdate(&mdctx, mess1, strlen(mess1));
- EVP_DigestUpdate(&mdctx, mess2, strlen(mess2));
- EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
- EVP_MD_CTX_cleanup(&mdctx);
+ mdctx = EVP_MD_CTX_create();
+ EVP_DigestInit_ex(mdctx, md, NULL);
+ EVP_DigestUpdate(mdctx, mess1, strlen(mess1));
+ EVP_DigestUpdate(mdctx, mess2, strlen(mess2));
+ EVP_DigestFinal_ex(mdctx, md_value, &md_len);
+ EVP_MD_CTX_destroy(mdctx);
 
  printf("Digest is: ");
  for(i = 0; i < md_len; i++) printf("%02x", md_value[i]);
diff --git a/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod b/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod
index 94e28cc307..0329c34869 100644
--- a/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod
+++ b/src/lib/libssl/src/doc/ssl/SSL_alert_type_string.pod
@@ -214,6 +214,11 @@ satisfy a request; the process might receive security parameters
 difficult to communicate changes to these parameters after that
 point. This message is always a warning.
 
+=item "UP"/"unknown PSK identity"
+
+Sent by the server to indicate that it does not recognize a PSK
+identity or an SRP identity. 
+
 =item "UK"/"unknown"
 
 This indicates that no description is available for this alert type.
diff --git a/src/lib/libssl/src/e_os.h b/src/lib/libssl/src/e_os.h
index 5ceeeeb950..79c1392573 100644
--- a/src/lib/libssl/src/e_os.h
+++ b/src/lib/libssl/src/e_os.h
@@ -99,7 +99,6 @@ extern "C" {
 #  ifndef MAC_OS_GUSI_SOURCE
 #    define MAC_OS_pre_X
 #    define NO_SYS_TYPES_H
-     typedef long ssize_t;
 #  endif
 #  define NO_SYS_PARAM_H
 #  define NO_CHMOD
@@ -340,8 +339,6 @@ static unsigned int _strlen31(const char *str)
 #    define OPENSSL_NO_POSIX_IO
 #  endif
 
-#  define ssize_t long
-
 #  if defined (__BORLANDC__)
 #    define _setmode setmode
 #    define _O_TEXT O_TEXT
@@ -456,9 +453,6 @@ static unsigned int _strlen31(const char *str)
                          * (unless when compiling with -D_POSIX_SOURCE,
                          * which doesn't work for us) */
 #    endif
-#    if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) || defined(OPENSSL_SYS_SUNOS)
-#      define ssize_t int /* ditto */
-#    endif
 #    ifdef OPENSSL_SYS_NEWS4 /* setvbuf is missing on mips-sony-bsd */
 #      define setvbuf(a, b, c, d) setbuffer((a), (b), (d))
        typedef unsigned long clock_t;
@@ -637,12 +631,6 @@ static unsigned int _strlen31(const char *str)
 
 #endif
 
-#if defined(__ultrix)
-#  ifndef ssize_t
-#    define ssize_t int 
-#  endif
-#endif
-
 #if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
   /* include headers first, so our defines don't break it */
 #include <stdlib.h>
diff --git a/src/lib/libssl/src/e_os2.h b/src/lib/libssl/src/e_os2.h
index d30724d304..d22c0368f8 100644
--- a/src/lib/libssl/src/e_os2.h
+++ b/src/lib/libssl/src/e_os2.h
@@ -289,6 +289,26 @@ extern "C" {
 # define OPENSSL_GLOBAL_REF(name) _shadow_##name
 #endif
 
+#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) && macintosh==1 && !defined(MAC_OS_GUSI_SOURCE)
+#  define ossl_ssize_t long
+#endif
+
+#ifdef OPENSSL_SYS_MSDOS
+#  define ossl_ssize_t long
+#endif
+
+#if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) || defined(OPENSSL_SYS_SUNOS)
+#  define ssize_t int
+#endif
+
+#if defined(__ultrix) && !defined(ssize_t)
+#  define ossl_ssize_t int 
+#endif
+
+#ifndef ossl_ssize_t
+#  define ossl_ssize_t ssize_t
+#endif
+
 #ifdef  __cplusplus
 }
 #endif
diff --git a/src/lib/libssl/src/makevms.com b/src/lib/libssl/src/makevms.com
index eb22f20db2..de1dbd9058 100644
--- a/src/lib/libssl/src/makevms.com
+++ b/src/lib/libssl/src/makevms.com
@@ -263,8 +263,10 @@ $ CONFIG_LOGICALS := AES,-
                      DH,-
                      DSA,-
                      EC,-
+                     EC2M,-
                      ECDH,-
                      ECDSA,-
+                     EC_NISTP_64_GCC_128,-
                      ENGINE,-
                      ERR,-
                      EVP,-
@@ -296,7 +298,9 @@ $ CONFIG_LOGICALS := AES,-
                      SHA256,-
                      SHA512,-
                      SOCK,-
+                     SRP,-
                      SSL2,-
+                     SSL_INTERN,-
                      STACK,-
                      STATIC_ENGINE,-
                      STDIO,-
@@ -335,7 +339,8 @@ $ CONFIG_DISABLE_RULES := RIJNDAEL/AES;-
                           DSA/GOST;-
                           DH/GOST;-
                           /STATIC_ENGINE;-
-                          /KRB5
+                          /KRB5;-
+                          /EC_NISTP_64_GCC_128
 $ CONFIG_ENABLE_RULES := ZLIB_DYNAMIC/ZLIB;-
                          /THREADS
 $
@@ -498,6 +503,9 @@ $ WRITE H_FILE " *       value _IONBF is not supported."
 $ WRITE H_FILE " * So, skip it on VMS."
 $ WRITE H_FILE " */"
 $ WRITE H_FILE "#define OPENSSL_NO_SETVBUF_IONBF"
+$ WRITE H_FILE "/* STCP support comes with TCPIP 5.7 ECO 2 "
+$ WRITE H_FILE " * enable on newer systems / 2012-02-24 arpadffy */"
+$ WRITE H_FILE "#define OPENSSL_NO_SCTP"
 $ WRITE H_FILE ""
 $!
 $! Add in the common "crypto/opensslconf.h.in".
@@ -704,7 +712,7 @@ $ SDIRS := , -
    BUFFER, BIO, STACK, LHASH, RAND, ERR, -
    EVP, ASN1, PEM, X509, X509V3, CONF, TXT_DB, PKCS7, PKCS12, -
    COMP, OCSP, UI, KRB5, -
-   STORE, CMS, PQUEUE, TS, JPAKE
+   CMS, PQUEUE, TS, JPAKE, SRP, STORE, CMAC
 $!
 $ EXHEADER_ := crypto.h, opensslv.h, ebcdic.h, symhacks.h, ossl_typ.h
 $ EXHEADER_'ARCHD' := opensslconf.h
@@ -756,12 +764,14 @@ $ EXHEADER_COMP := comp.h
 $ EXHEADER_OCSP := ocsp.h
 $ EXHEADER_UI := ui.h, ui_compat.h
 $ EXHEADER_KRB5 := krb5_asn.h
-$!!! EXHEADER_STORE := store.h, str_compat.h
-$ EXHEADER_STORE := store.h
 $ EXHEADER_CMS := cms.h
 $ EXHEADER_PQUEUE := pqueue.h
 $ EXHEADER_TS := ts.h
 $ EXHEADER_JPAKE := jpake.h
+$ EXHEADER_SRP := srp.h
+$!!! EXHEADER_STORE := store.h, str_compat.h
+$ EXHEADER_STORE := store.h
+$ EXHEADER_CMAC := cmac.h
 $!
 $ i = 0
 $ loop_sdirs:
@@ -777,7 +787,7 @@ $!
 $! Copy All The ".H" Files From The [.SSL] Directory.
 $!
 $! (keep these in the same order as ssl/Makefile)
-$ EXHEADER := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h
+$ EXHEADER := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h, srtp.h
 $ copy sys$disk:[.ssl]'exheader' sys$disk:[.include.openssl]
 $!
 $! Purge the [.include.openssl] header files.
diff --git a/src/lib/libssl/src/ms/do_win64a.bat b/src/lib/libssl/src/ms/do_win64a.bat
index 495f1ea7d8..ff8b19ccfd 100755
--- a/src/lib/libssl/src/ms/do_win64a.bat
+++ b/src/lib/libssl/src/ms/do_win64a.bat
@@ -1,9 +1,19 @@
-
 perl util\mkfiles.pl >MINFO
-perl ms\uplink.pl win64a > ms\uptable.asm
+
+cmd /c "nasm -f win64 -v" >NUL: 2>&1
+if %errorlevel% neq 0 goto ml64
+
+perl ms\uplink-x86_64.pl nasm > ms\uptable.asm
+nasm -f win64 -o ms\uptable.obj ms\uptable.asm
+goto proceed
+
+:ml64
+perl ms\uplink-x86_64.pl masm > ms\uptable.asm
 ml64 -c -Foms\uptable.obj ms\uptable.asm
-perl util\mk1mf.pl no-asm VC-WIN64A >ms\nt.mak
-perl util\mk1mf.pl dll no-asm VC-WIN64A >ms\ntdll.mak
+
+:proceed
+perl util\mk1mf.pl VC-WIN64A >ms\nt.mak
+perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak
 
 perl util\mkdef.pl 32 libeay > ms\libeay32.def
 perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
diff --git a/src/lib/libssl/src/ms/do_win64i.bat b/src/lib/libssl/src/ms/do_win64i.bat
index 15ebcaaeb6..088f5e1d0a 100755
--- a/src/lib/libssl/src/ms/do_win64i.bat
+++ b/src/lib/libssl/src/ms/do_win64i.bat
@@ -1,9 +1,9 @@
 
 perl util\mkfiles.pl >MINFO
-perl ms\uplink.pl win64i > ms\uptable.asm
+perl ms\uplink-ia64.pl > ms\uptable.asm
 ias -o ms\uptable.obj ms\uptable.asm
-perl util\mk1mf.pl no-asm VC-WIN64I >ms\nt.mak
-perl util\mk1mf.pl dll no-asm VC-WIN64I >ms\ntdll.mak
+perl util\mk1mf.pl VC-WIN64I >ms\nt.mak
+perl util\mk1mf.pl dll VC-WIN64I >ms\ntdll.mak
 
 perl util\mkdef.pl 32 libeay > ms\libeay32.def
 perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
diff --git a/src/lib/libssl/src/ms/uplink.h b/src/lib/libssl/src/ms/uplink.h
index a4a67d3c14..4881ba7d42 100644
--- a/src/lib/libssl/src/ms/uplink.h
+++ b/src/lib/libssl/src/ms/uplink.h
@@ -23,7 +23,7 @@ extern void *OPENSSL_UplinkTable[];
 #define UP_fileno (*(int (*)(void *))OPENSSL_UplinkTable[APPLINK_FILENO])
 
 #define UP_open   (*(int (*)(const char *,int,...))OPENSSL_UplinkTable[APPLINK_OPEN])
-#define UP_read   (*(ssize_t (*)(int,void *,size_t))OPENSSL_UplinkTable[APPLINK_READ])
-#define UP_write  (*(ssize_t (*)(int,const void *,size_t))OPENSSL_UplinkTable[APPLINK_WRITE])
+#define UP_read   (*(ossl_ssize_t (*)(int,void *,size_t))OPENSSL_UplinkTable[APPLINK_READ])
+#define UP_write  (*(ossl_ssize_t (*)(int,const void *,size_t))OPENSSL_UplinkTable[APPLINK_WRITE])
 #define UP_lseek  (*(long (*)(int,long,int))OPENSSL_UplinkTable[APPLINK_LSEEK])
 #define UP_close  (*(int (*)(int))OPENSSL_UplinkTable[APPLINK_CLOSE])
diff --git a/src/lib/libssl/src/openssl.spec b/src/lib/libssl/src/openssl.spec
index 703cea2a5f..0d86222e43 100644
--- a/src/lib/libssl/src/openssl.spec
+++ b/src/lib/libssl/src/openssl.spec
@@ -1,8 +1,8 @@
 %define _unpackaged_files_terminate_build 0
 %define libmaj 1
 %define libmin 0
-%define librel 0
-%define librev f
+%define librel 1
+%define librev c
 Release: 1
 
 %define openssldir /var/ssl
diff --git a/src/lib/libssl/src/ssl/Makefile b/src/lib/libssl/src/ssl/Makefile
index 2b275faf6a..feaf3e358a 100644
--- a/src/lib/libssl/src/ssl/Makefile
+++ b/src/lib/libssl/src/ssl/Makefile
@@ -26,26 +26,26 @@ LIBSRC=	\
         s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c          s23_pkt.c \
         t1_meth.c   t1_srvr.c t1_clnt.c  t1_lib.c  t1_enc.c \
         d1_meth.c   d1_srvr.c d1_clnt.c  d1_lib.c  d1_pkt.c \
-        d1_both.c d1_enc.c \
+        d1_both.c d1_enc.c d1_srtp.c \
         ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c \
         ssl_ciph.c ssl_stat.c ssl_rsa.c \
         ssl_asn1.c ssl_txt.c ssl_algs.c \
-        bio_ssl.c ssl_err.c kssl.c t1_reneg.c
+        bio_ssl.c ssl_err.c kssl.c tls_srp.c t1_reneg.c
 LIBOBJ= \
         s2_meth.o  s2_srvr.o  s2_clnt.o  s2_lib.o  s2_enc.o s2_pkt.o \
         s3_meth.o  s3_srvr.o  s3_clnt.o  s3_lib.o  s3_enc.o s3_pkt.o s3_both.o \
         s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o          s23_pkt.o \
         t1_meth.o   t1_srvr.o t1_clnt.o  t1_lib.o  t1_enc.o \
         d1_meth.o   d1_srvr.o d1_clnt.o  d1_lib.o  d1_pkt.o \
-        d1_both.o d1_enc.o \
+        d1_both.o d1_enc.o d1_srtp.o\
         ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o \
         ssl_ciph.o ssl_stat.o ssl_rsa.o \
         ssl_asn1.o ssl_txt.o ssl_algs.o \
-        bio_ssl.o ssl_err.o kssl.o t1_reneg.o
+        bio_ssl.o ssl_err.o kssl.o tls_srp.o t1_reneg.o
 
 SRC= $(LIBSRC)
 
-EXHEADER= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h
+EXHEADER= ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h kssl.h srtp.h
 HEADER= $(EXHEADER) ssl_locl.h kssl_lcl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
@@ -118,11 +118,11 @@ bio_ssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 bio_ssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 bio_ssl.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 bio_ssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-bio_ssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-bio_ssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-bio_ssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-bio_ssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-bio_ssl.o: ../include/openssl/x509_vfy.h bio_ssl.c
+bio_ssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+bio_ssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+bio_ssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+bio_ssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+bio_ssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bio_ssl.c
 d1_both.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 d1_both.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 d1_both.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -137,12 +137,12 @@ d1_both.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 d1_both.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 d1_both.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 d1_both.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-d1_both.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-d1_both.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-d1_both.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-d1_both.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-d1_both.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_both.c
-d1_both.o: ssl_locl.h
+d1_both.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+d1_both.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+d1_both.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+d1_both.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+d1_both.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+d1_both.o: ../include/openssl/x509_vfy.h d1_both.c ssl_locl.h
 d1_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 d1_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 d1_clnt.o: ../include/openssl/comp.h ../include/openssl/crypto.h
@@ -159,11 +159,12 @@ d1_clnt.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 d1_clnt.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 d1_clnt.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 d1_clnt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-d1_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-d1_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-d1_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-d1_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-d1_clnt.o: ../include/openssl/x509_vfy.h d1_clnt.c kssl_lcl.h ssl_locl.h
+d1_clnt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+d1_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+d1_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+d1_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+d1_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_clnt.c
+d1_clnt.o: kssl_lcl.h ssl_locl.h
 d1_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 d1_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 d1_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -179,11 +180,12 @@ d1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 d1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 d1_enc.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 d1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-d1_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-d1_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-d1_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-d1_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-d1_enc.o: ../include/openssl/x509_vfy.h d1_enc.c ssl_locl.h
+d1_enc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+d1_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+d1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+d1_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+d1_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_enc.c
+d1_enc.o: ssl_locl.h
 d1_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 d1_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 d1_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -198,11 +200,12 @@ d1_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 d1_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 d1_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 d1_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-d1_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-d1_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-d1_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-d1_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-d1_lib.o: ../include/openssl/x509_vfy.h d1_lib.c ssl_locl.h
+d1_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+d1_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+d1_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+d1_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+d1_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_lib.c
+d1_lib.o: ssl_locl.h
 d1_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 d1_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 d1_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -217,11 +220,12 @@ d1_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 d1_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 d1_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 d1_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-d1_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-d1_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-d1_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-d1_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-d1_meth.o: ../include/openssl/x509_vfy.h d1_meth.c ssl_locl.h
+d1_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+d1_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+d1_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+d1_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+d1_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_meth.c
+d1_meth.o: ssl_locl.h
 d1_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 d1_pkt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 d1_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -236,12 +240,32 @@ d1_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 d1_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 d1_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 d1_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-d1_pkt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-d1_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-d1_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-d1_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-d1_pkt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_pkt.c
-d1_pkt.o: ssl_locl.h
+d1_pkt.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+d1_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+d1_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+d1_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+d1_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+d1_pkt.o: ../include/openssl/x509_vfy.h d1_pkt.c ssl_locl.h
+d1_srtp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+d1_srtp.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+d1_srtp.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
+d1_srtp.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
+d1_srtp.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+d1_srtp.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
+d1_srtp.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+d1_srtp.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
+d1_srtp.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+d1_srtp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+d1_srtp.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+d1_srtp.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+d1_srtp.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
+d1_srtp.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+d1_srtp.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+d1_srtp.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+d1_srtp.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+d1_srtp.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+d1_srtp.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_srtp.c
+d1_srtp.o: srtp.h ssl_locl.h
 d1_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 d1_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 d1_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h
@@ -258,11 +282,12 @@ d1_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 d1_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 d1_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 d1_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-d1_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-d1_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-d1_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-d1_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-d1_srvr.o: ../include/openssl/x509_vfy.h d1_srvr.c ssl_locl.h
+d1_srvr.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+d1_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+d1_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+d1_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+d1_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_srvr.c
+d1_srvr.o: ssl_locl.h
 kssl.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 kssl.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 kssl.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
@@ -276,11 +301,12 @@ kssl.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 kssl.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 kssl.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 kssl.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-kssl.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-kssl.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-kssl.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-kssl.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-kssl.o: ../include/openssl/x509_vfy.h kssl.c kssl_lcl.h
+kssl.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+kssl.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+kssl.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+kssl.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+kssl.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl.c
+kssl.o: kssl_lcl.h
 s23_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s23_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s23_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -295,12 +321,12 @@ s23_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s23_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 s23_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s23_clnt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s23_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s23_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s23_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s23_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_clnt.c
-s23_clnt.o: ssl_locl.h
+s23_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s23_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s23_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s23_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s23_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s23_clnt.o: ../include/openssl/x509_vfy.h s23_clnt.c ssl_locl.h
 s23_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s23_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s23_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -315,11 +341,12 @@ s23_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s23_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 s23_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s23_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s23_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s23_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s23_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s23_lib.o: ../include/openssl/x509_vfy.h s23_lib.c ssl_locl.h
+s23_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s23_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s23_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s23_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s23_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_lib.c
+s23_lib.o: ssl_locl.h
 s23_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s23_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s23_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -334,11 +361,12 @@ s23_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s23_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 s23_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s23_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s23_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s23_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s23_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s23_meth.o: ../include/openssl/x509_vfy.h s23_meth.c ssl_locl.h
+s23_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s23_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s23_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s23_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s23_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_meth.c
+s23_meth.o: ssl_locl.h
 s23_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s23_pkt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s23_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -353,11 +381,12 @@ s23_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s23_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 s23_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s23_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s23_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s23_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s23_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s23_pkt.o: ../include/openssl/x509_vfy.h s23_pkt.c ssl_locl.h
+s23_pkt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s23_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s23_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s23_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s23_pkt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_pkt.c
+s23_pkt.o: ssl_locl.h
 s23_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s23_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s23_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -372,12 +401,12 @@ s23_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s23_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s23_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 s23_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s23_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s23_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s23_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s23_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s23_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s23_srvr.c
-s23_srvr.o: ssl_locl.h
+s23_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s23_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s23_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s23_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s23_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s23_srvr.o: ../include/openssl/x509_vfy.h s23_srvr.c ssl_locl.h
 s2_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s2_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s2_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -392,12 +421,12 @@ s2_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s2_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 s2_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s2_clnt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s2_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s2_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s2_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s2_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_clnt.c
-s2_clnt.o: ssl_locl.h
+s2_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s2_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s2_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s2_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s2_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s2_clnt.o: ../include/openssl/x509_vfy.h s2_clnt.c ssl_locl.h
 s2_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s2_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s2_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -412,11 +441,12 @@ s2_enc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s2_enc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_enc.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 s2_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s2_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s2_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s2_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s2_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s2_enc.o: ../include/openssl/x509_vfy.h s2_enc.c ssl_locl.h
+s2_enc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s2_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s2_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s2_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s2_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_enc.c
+s2_enc.o: ssl_locl.h
 s2_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s2_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s2_lib.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -431,12 +461,12 @@ s2_lib.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 s2_lib.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s2_lib.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s2_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s2_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s2_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s2_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s2_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s2_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_lib.c
-s2_lib.o: ssl_locl.h
+s2_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s2_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s2_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s2_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s2_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s2_lib.o: ../include/openssl/x509_vfy.h s2_lib.c ssl_locl.h
 s2_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s2_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s2_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -451,11 +481,12 @@ s2_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s2_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 s2_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s2_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s2_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s2_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s2_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s2_meth.o: ../include/openssl/x509_vfy.h s2_meth.c ssl_locl.h
+s2_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s2_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s2_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s2_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s2_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_meth.c
+s2_meth.o: ssl_locl.h
 s2_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s2_pkt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s2_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -470,11 +501,12 @@ s2_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s2_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 s2_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s2_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s2_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s2_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s2_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s2_pkt.o: ../include/openssl/x509_vfy.h s2_pkt.c ssl_locl.h
+s2_pkt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s2_pkt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s2_pkt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s2_pkt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s2_pkt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_pkt.c
+s2_pkt.o: ssl_locl.h
 s2_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s2_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s2_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -489,12 +521,12 @@ s2_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s2_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s2_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 s2_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s2_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s2_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s2_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s2_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s2_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s2_srvr.c
-s2_srvr.o: ssl_locl.h
+s2_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s2_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s2_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s2_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s2_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s2_srvr.o: ../include/openssl/x509_vfy.h s2_srvr.c ssl_locl.h
 s3_both.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s3_both.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s3_both.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -509,12 +541,12 @@ s3_both.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s3_both.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_both.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 s3_both.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s3_both.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s3_both.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s3_both.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s3_both.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s3_both.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_both.c
-s3_both.o: ssl_locl.h
+s3_both.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s3_both.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s3_both.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s3_both.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s3_both.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s3_both.o: ../include/openssl/x509_vfy.h s3_both.c ssl_locl.h
 s3_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s3_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 s3_clnt.o: ../include/openssl/comp.h ../include/openssl/crypto.h
@@ -531,12 +563,12 @@ s3_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s3_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 s3_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s3_clnt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s3_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s3_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s3_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s3_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h
-s3_clnt.o: s3_clnt.c ssl_locl.h
+s3_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s3_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s3_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s3_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s3_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s3_clnt.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_clnt.c ssl_locl.h
 s3_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s3_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s3_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -551,12 +583,12 @@ s3_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 s3_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 s3_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 s3_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s3_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s3_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s3_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s3_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s3_enc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_enc.c
-s3_enc.o: ssl_locl.h
+s3_enc.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s3_enc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s3_enc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s3_enc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s3_enc.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s3_enc.o: ../include/openssl/x509_vfy.h s3_enc.c ssl_locl.h
 s3_lib.o: ../crypto/ec/ec_lcl.h ../e_os.h ../include/openssl/asn1.h
 s3_lib.o: ../include/openssl/bio.h ../include/openssl/bn.h
 s3_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h
@@ -573,11 +605,12 @@ s3_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s3_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 s3_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s3_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s3_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s3_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s3_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s3_lib.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_lib.c ssl_locl.h
+s3_lib.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s3_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s3_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s3_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s3_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h
+s3_lib.o: s3_lib.c ssl_locl.h
 s3_meth.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s3_meth.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s3_meth.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -592,11 +625,12 @@ s3_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s3_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 s3_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-s3_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-s3_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-s3_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-s3_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-s3_meth.o: ../include/openssl/x509_vfy.h s3_meth.c ssl_locl.h
+s3_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+s3_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+s3_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+s3_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+s3_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_meth.c
+s3_meth.o: ssl_locl.h
 s3_pkt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 s3_pkt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 s3_pkt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -609,8 +643,9 @@ s3_pkt.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
 s3_pkt.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 s3_pkt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s3_pkt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-s3_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
-s3_pkt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+s3_pkt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
+s3_pkt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+s3_pkt.o: ../include/openssl/sha.h ../include/openssl/srtp.h
 s3_pkt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 s3_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 s3_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -632,12 +667,12 @@ s3_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 s3_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 s3_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 s3_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-s3_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-s3_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-s3_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-s3_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-s3_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h
-s3_srvr.o: s3_srvr.c ssl_locl.h
+s3_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+s3_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+s3_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+s3_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+s3_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+s3_srvr.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_srvr.c ssl_locl.h
 ssl_algs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_algs.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_algs.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -652,11 +687,12 @@ ssl_algs.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssl_algs.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_algs.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 ssl_algs.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_algs.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_algs.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_algs.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_algs.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_algs.o: ../include/openssl/x509_vfy.h ssl_algs.c ssl_locl.h
+ssl_algs.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_algs.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_algs.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_algs.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_algs.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_algs.c
+ssl_algs.o: ssl_locl.h
 ssl_asn1.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/asn1_mac.h
 ssl_asn1.o: ../include/openssl/bio.h ../include/openssl/buffer.h
 ssl_asn1.o: ../include/openssl/comp.h ../include/openssl/crypto.h
@@ -671,12 +707,12 @@ ssl_asn1.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 ssl_asn1.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_asn1.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 ssl_asn1.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_asn1.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_asn1.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_asn1.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_asn1.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_asn1.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_asn1.c
-ssl_asn1.o: ssl_locl.h
+ssl_asn1.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+ssl_asn1.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_asn1.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_asn1.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_asn1.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+ssl_asn1.o: ../include/openssl/x509_vfy.h ssl_asn1.c ssl_locl.h
 ssl_cert.o: ../crypto/o_dir.h ../e_os.h ../include/openssl/asn1.h
 ssl_cert.o: ../include/openssl/bio.h ../include/openssl/bn.h
 ssl_cert.o: ../include/openssl/buffer.h ../include/openssl/comp.h
@@ -693,12 +729,12 @@ ssl_cert.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssl_cert.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_cert.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 ssl_cert.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_cert.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_cert.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_cert.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_cert.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_cert.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h
-ssl_cert.o: ssl_cert.c ssl_locl.h
+ssl_cert.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_cert.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_cert.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_cert.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_cert.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+ssl_cert.o: ../include/openssl/x509v3.h ssl_cert.c ssl_locl.h
 ssl_ciph.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_ciph.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_ciph.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -713,12 +749,12 @@ ssl_ciph.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 ssl_ciph.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_ciph.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 ssl_ciph.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_ciph.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_ciph.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_ciph.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_ciph.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_ciph.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_ciph.c
-ssl_ciph.o: ssl_locl.h
+ssl_ciph.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+ssl_ciph.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_ciph.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_ciph.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_ciph.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+ssl_ciph.o: ../include/openssl/x509_vfy.h ssl_ciph.c ssl_locl.h
 ssl_err.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_err.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_err.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
@@ -732,11 +768,11 @@ ssl_err.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 ssl_err.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_err.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 ssl_err.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_err.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_err.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_err.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_err.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_err.o: ../include/openssl/x509_vfy.h ssl_err.c
+ssl_err.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_err.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_err.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_err.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_err.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_err.c
 ssl_err2.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_err2.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_err2.o: ../include/openssl/crypto.h ../include/openssl/dtls1.h
@@ -750,11 +786,11 @@ ssl_err2.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 ssl_err2.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_err2.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 ssl_err2.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_err2.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_err2.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_err2.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_err2.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_err2.o: ../include/openssl/x509_vfy.h ssl_err2.c
+ssl_err2.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_err2.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_err2.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_err2.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_err2.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_err2.c
 ssl_lib.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_lib.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_lib.o: ../include/openssl/conf.h ../include/openssl/crypto.h
@@ -771,12 +807,13 @@ ssl_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssl_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_lib.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 ssl_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssl_lib.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-ssl_lib.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-ssl_lib.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-ssl_lib.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-ssl_lib.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
-ssl_lib.o: ../include/openssl/x509v3.h kssl_lcl.h ssl_lib.c ssl_locl.h
+ssl_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+ssl_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+ssl_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+ssl_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+ssl_lib.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+ssl_lib.o: ../include/openssl/x509_vfy.h ../include/openssl/x509v3.h kssl_lcl.h
+ssl_lib.o: ssl_lib.c ssl_locl.h
 ssl_rsa.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_rsa.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_rsa.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -791,11 +828,12 @@ ssl_rsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssl_rsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_rsa.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 ssl_rsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_rsa.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_rsa.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_rsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_rsa.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_rsa.o: ../include/openssl/x509_vfy.h ssl_locl.h ssl_rsa.c
+ssl_rsa.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_rsa.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_rsa.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_rsa.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_rsa.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
+ssl_rsa.o: ssl_rsa.c
 ssl_sess.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_sess.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_sess.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -811,11 +849,12 @@ ssl_sess.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 ssl_sess.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
 ssl_sess.o: ../include/openssl/rand.h ../include/openssl/rsa.h
 ssl_sess.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_sess.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_sess.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_sess.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_sess.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_sess.o: ../include/openssl/x509_vfy.h ssl_locl.h ssl_sess.c
+ssl_sess.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_sess.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_sess.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_sess.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_sess.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
+ssl_sess.o: ssl_sess.c
 ssl_stat.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_stat.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_stat.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -830,11 +869,12 @@ ssl_stat.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssl_stat.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_stat.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 ssl_stat.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_stat.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_stat.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_stat.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_stat.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_stat.o: ../include/openssl/x509_vfy.h ssl_locl.h ssl_stat.c
+ssl_stat.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_stat.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_stat.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_stat.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_stat.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
+ssl_stat.o: ssl_stat.c
 ssl_txt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssl_txt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 ssl_txt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -849,11 +889,12 @@ ssl_txt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssl_txt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssl_txt.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 ssl_txt.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-ssl_txt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-ssl_txt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-ssl_txt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-ssl_txt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-ssl_txt.o: ../include/openssl/x509_vfy.h ssl_locl.h ssl_txt.c
+ssl_txt.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+ssl_txt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+ssl_txt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+ssl_txt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+ssl_txt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
+ssl_txt.o: ssl_txt.c
 t1_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 t1_clnt.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 t1_clnt.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -868,12 +909,12 @@ t1_clnt.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 t1_clnt.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_clnt.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 t1_clnt.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-t1_clnt.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-t1_clnt.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-t1_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-t1_clnt.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-t1_clnt.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
-t1_clnt.o: t1_clnt.c
+t1_clnt.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+t1_clnt.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+t1_clnt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+t1_clnt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+t1_clnt.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+t1_clnt.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_clnt.c
 t1_enc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 t1_enc.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 t1_enc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -887,8 +928,9 @@ t1_enc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 t1_enc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 t1_enc.o: ../include/openssl/pem.h ../include/openssl/pem2.h
 t1_enc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
-t1_enc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-t1_enc.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+t1_enc.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+t1_enc.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+t1_enc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 t1_enc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 t1_enc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 t1_enc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
@@ -907,8 +949,9 @@ t1_lib.o: ../include/openssl/objects.h ../include/openssl/ocsp.h
 t1_lib.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 t1_lib.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 t1_lib.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
-t1_lib.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
-t1_lib.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+t1_lib.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
+t1_lib.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+t1_lib.o: ../include/openssl/sha.h ../include/openssl/srtp.h
 t1_lib.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
 t1_lib.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
 t1_lib.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
@@ -929,11 +972,12 @@ t1_meth.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 t1_meth.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_meth.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 t1_meth.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-t1_meth.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-t1_meth.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-t1_meth.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-t1_meth.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-t1_meth.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_meth.c
+t1_meth.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+t1_meth.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+t1_meth.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+t1_meth.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+t1_meth.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
+t1_meth.o: t1_meth.c
 t1_reneg.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 t1_reneg.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 t1_reneg.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -948,11 +992,12 @@ t1_reneg.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 t1_reneg.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_reneg.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h
 t1_reneg.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-t1_reneg.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
-t1_reneg.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
-t1_reneg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-t1_reneg.o: ../include/openssl/tls1.h ../include/openssl/x509.h
-t1_reneg.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_reneg.c
+t1_reneg.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
+t1_reneg.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
+t1_reneg.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
+t1_reneg.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
+t1_reneg.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
+t1_reneg.o: t1_reneg.c
 t1_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 t1_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h
 t1_srvr.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
@@ -967,9 +1012,30 @@ t1_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 t1_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 t1_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 t1_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-t1_srvr.o: ../include/openssl/sha.h ../include/openssl/ssl.h
-t1_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
-t1_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
-t1_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
-t1_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h ssl_locl.h
-t1_srvr.o: t1_srvr.c
+t1_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+t1_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+t1_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+t1_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+t1_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+t1_srvr.o: ../include/openssl/x509_vfy.h ssl_locl.h t1_srvr.c
+tls_srp.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+tls_srp.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+tls_srp.o: ../include/openssl/comp.h ../include/openssl/crypto.h
+tls_srp.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h
+tls_srp.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+tls_srp.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+tls_srp.o: ../include/openssl/err.h ../include/openssl/evp.h
+tls_srp.o: ../include/openssl/hmac.h ../include/openssl/kssl.h
+tls_srp.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+tls_srp.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+tls_srp.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+tls_srp.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+tls_srp.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+tls_srp.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+tls_srp.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+tls_srp.o: ../include/openssl/srp.h ../include/openssl/srtp.h
+tls_srp.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+tls_srp.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+tls_srp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+tls_srp.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+tls_srp.o: ../include/openssl/x509_vfy.h ssl_locl.h tls_srp.c
diff --git a/src/lib/libssl/src/ssl/bio_ssl.c b/src/lib/libssl/src/ssl/bio_ssl.c
index eedac8a3fc..e9552caee2 100644
--- a/src/lib/libssl/src/ssl/bio_ssl.c
+++ b/src/lib/libssl/src/ssl/bio_ssl.c
@@ -538,6 +538,7 @@ err:
 
 BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
         {
+#ifndef OPENSSL_NO_SOCK
         BIO *ret=NULL,*con=NULL,*ssl=NULL;
 
         if ((con=BIO_new(BIO_s_connect())) == NULL)
@@ -549,6 +550,7 @@ BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
         return(ret);
 err:
         if (con != NULL) BIO_free(con);
+#endif
         return(NULL);
         }
 
diff --git a/src/lib/libssl/src/ssl/install-ssl.com b/src/lib/libssl/src/ssl/install-ssl.com
index 1bd6ccaa7a..afe6967f85 100755
--- a/src/lib/libssl/src/ssl/install-ssl.com
+++ b/src/lib/libssl/src/ssl/install-ssl.com
@@ -73,7 +73,7 @@ $ if f$parse("wrk_sslxexe:") .eqs. "" then -
 $ if f$parse("wrk_sslxlib:") .eqs. "" then -
    create /directory /log wrk_sslxlib:
 $!
-$ exheader := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h
+$ exheader := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h, srtp.h
 $ e_exe := ssl_task
 $ libs := ssl_libssl
 $!
diff --git a/src/lib/libssl/src/ssl/kssl.c b/src/lib/libssl/src/ssl/kssl.c
index b820e37464..fd7c67bb1f 100644
--- a/src/lib/libssl/src/ssl/kssl.c
+++ b/src/lib/libssl/src/ssl/kssl.c
@@ -2194,6 +2194,22 @@ krb5_error_code  kssl_build_principal_2(
         return ENOMEM;
         }
 
+void SSL_set0_kssl_ctx(SSL *s, KSSL_CTX *kctx)
+        {
+        s->kssl_ctx = kctx;
+        } 
+
+KSSL_CTX * SSL_get0_kssl_ctx(SSL *s)
+        {
+        return s->kssl_ctx;
+        }
+
+char *kssl_ctx_get0_client_princ(KSSL_CTX *kctx)
+        {
+        if (kctx)
+                return kctx->client_princ;
+        return NULL;
+        }
 
 #else /* !OPENSSL_NO_KRB5 */
 
diff --git a/src/lib/libssl/src/ssl/kssl.h b/src/lib/libssl/src/ssl/kssl.h
index a3d20e1ccb..8242fd5eeb 100644
--- a/src/lib/libssl/src/ssl/kssl.h
+++ b/src/lib/libssl/src/ssl/kssl.h
@@ -172,6 +172,10 @@ krb5_error_code  kssl_check_authent(KSSL_CTX *kssl_ctx, krb5_data *authentp,
                                     krb5_timestamp *atimep, KSSL_ERR *kssl_err);
 unsigned char   *kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
 
+void SSL_set0_kssl_ctx(SSL *s, KSSL_CTX *kctx);
+KSSL_CTX * SSL_get0_kssl_ctx(SSL *s);
+char *kssl_ctx_get0_client_princ(KSSL_CTX *kctx);
+
 #ifdef  __cplusplus
 }
 #endif
diff --git a/src/lib/libssl/src/ssl/s23_clnt.c b/src/lib/libssl/src/ssl/s23_clnt.c
index c4d8bf2eb3..47673e740a 100644
--- a/src/lib/libssl/src/ssl/s23_clnt.c
+++ b/src/lib/libssl/src/ssl/s23_clnt.c
@@ -129,6 +129,10 @@ static const SSL_METHOD *ssl23_get_client_method(int ver)
                 return(SSLv3_client_method());
         else if (ver == TLS1_VERSION)
                 return(TLSv1_client_method());
+        else if (ver == TLS1_1_VERSION)
+                return(TLSv1_1_client_method());
+        else if (ver == TLS1_2_VERSION)
+                return(TLSv1_2_client_method());
         else
                 return(NULL);
         }
@@ -278,24 +282,51 @@ static int ssl23_client_hello(SSL *s)
         SSL_COMP *comp;
 #endif
         int ret;
+        unsigned long mask, options = s->options;
 
-        ssl2_compat = (s->options & SSL_OP_NO_SSLv2) ? 0 : 1;
+        ssl2_compat = (options & SSL_OP_NO_SSLv2) ? 0 : 1;
 
         if (ssl2_compat && ssl23_no_ssl2_ciphers(s))
                 ssl2_compat = 0;
 
-        if (!(s->options & SSL_OP_NO_TLSv1))
-                {
+        /*
+         * SSL_OP_NO_X disables all protocols above X *if* there are
+         * some protocols below X enabled. This is required in order
+         * to maintain "version capability" vector contiguous. So
+         * that if application wants to disable TLS1.0 in favour of
+         * TLS1>=1, it would be insufficient to pass SSL_NO_TLSv1, the
+         * answer is SSL_OP_NO_TLSv1|SSL_OP_NO_SSLv3|SSL_OP_NO_SSLv2.
+         */
+        mask =  SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1
+#if !defined(OPENSSL_NO_SSL3)
+                |SSL_OP_NO_SSLv3
+#endif
+#if !defined(OPENSSL_NO_SSL2)
+                |(ssl2_compat?SSL_OP_NO_SSLv2:0)
+#endif
+                ;
+#if !defined(OPENSSL_NO_TLS1_2_CLIENT)
+        version = TLS1_2_VERSION;
+
+        if ((options & SSL_OP_NO_TLSv1_2) && (options & mask) != mask)
+                version = TLS1_1_VERSION;
+#else
+        version = TLS1_1_VERSION;
+#endif
+        mask &= ~SSL_OP_NO_TLSv1_1;
+        if ((options & SSL_OP_NO_TLSv1_1) && (options & mask) != mask)
                 version = TLS1_VERSION;
-                }
-        else if (!(s->options & SSL_OP_NO_SSLv3))
-                {
+        mask &= ~SSL_OP_NO_TLSv1;
+#if !defined(OPENSSL_NO_SSL3)
+        if ((options & SSL_OP_NO_TLSv1) && (options & mask) != mask)
                 version = SSL3_VERSION;
-                }
-        else if (!(s->options & SSL_OP_NO_SSLv2))
-                {
+        mask &= ~SSL_OP_NO_SSLv3;
+#endif
+#if !defined(OPENSSL_NO_SSL2)
+        if ((options & SSL_OP_NO_SSLv3) && (options & mask) != mask)
                 version = SSL2_VERSION;
-                }
+#endif
+
 #ifndef OPENSSL_NO_TLSEXT
         if (version != SSL2_VERSION)
                 {
@@ -329,11 +360,29 @@ static int ssl23_client_hello(SSL *s)
                 if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4) <= 0)
                         return -1;
 
-                if (version == TLS1_VERSION)
+                if (version == TLS1_2_VERSION)
+                        {
+                        version_major = TLS1_2_VERSION_MAJOR;
+                        version_minor = TLS1_2_VERSION_MINOR;
+                        }
+                else if (version == TLS1_1_VERSION)
+                        {
+                        version_major = TLS1_1_VERSION_MAJOR;
+                        version_minor = TLS1_1_VERSION_MINOR;
+                        }
+                else if (version == TLS1_VERSION)
                         {
                         version_major = TLS1_VERSION_MAJOR;
                         version_minor = TLS1_VERSION_MINOR;
                         }
+#ifdef OPENSSL_FIPS
+                else if(FIPS_mode())
+                        {
+                        SSLerr(SSL_F_SSL23_CLIENT_HELLO,
+                                        SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
+                        return -1;
+                        }
+#endif
                 else if (version == SSL3_VERSION)
                         {
                         version_major = SSL3_VERSION_MAJOR;
@@ -437,6 +486,15 @@ static int ssl23_client_hello(SSL *s)
                                 SSLerr(SSL_F_SSL23_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
                                 return -1;
                                 }
+#ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
+                        /* Some servers hang if client hello > 256 bytes
+                         * as hack workaround chop number of supported ciphers
+                         * to keep it well below this if we use TLS v1.2
+                         */
+                        if (TLS1_get_version(s) >= TLS1_2_VERSION
+                                && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
+                                i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
+#endif
                         s2n(i,p);
                         p+=i;
 
@@ -491,8 +549,13 @@ static int ssl23_client_hello(SSL *s)
                         d=buf;
                         *(d++) = SSL3_RT_HANDSHAKE;
                         *(d++) = version_major;
-                        *(d++) = version_minor; /* arguably we should send the *lowest* suported version here
-                                                 * (indicating, e.g., TLS 1.0 in "SSL 3.0 format") */
+                        /* Some servers hang if we use long client hellos
+                         * and a record number > TLS 1.0.
+                         */
+                        if (TLS1_get_client_version(s) > TLS1_VERSION)
+                                *(d++) = 1;
+                        else
+                                *(d++) = version_minor;
                         s2n((int)l,d);
 
                         /* number of bytes to write */
@@ -608,7 +671,7 @@ static int ssl23_get_server_hello(SSL *s)
 #endif
                 }
         else if (p[1] == SSL3_VERSION_MAJOR &&
-                 (p[2] == SSL3_VERSION_MINOR || p[2] == TLS1_VERSION_MINOR) &&
+                 p[2] <= TLS1_2_VERSION_MINOR &&
                  ((p[0] == SSL3_RT_HANDSHAKE && p[5] == SSL3_MT_SERVER_HELLO) ||
                   (p[0] == SSL3_RT_ALERT && p[3] == 0 && p[4] == 2)))
                 {
@@ -617,6 +680,14 @@ static int ssl23_get_server_hello(SSL *s)
                 if ((p[2] == SSL3_VERSION_MINOR) &&
                         !(s->options & SSL_OP_NO_SSLv3))
                         {
+#ifdef OPENSSL_FIPS
+                        if(FIPS_mode())
+                                {
+                                SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,
+                                        SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
+                                goto err;
+                                }
+#endif
                         s->version=SSL3_VERSION;
                         s->method=SSLv3_client_method();
                         }
@@ -626,6 +697,18 @@ static int ssl23_get_server_hello(SSL *s)
                         s->version=TLS1_VERSION;
                         s->method=TLSv1_client_method();
                         }
+                else if ((p[2] == TLS1_1_VERSION_MINOR) &&
+                        !(s->options & SSL_OP_NO_TLSv1_1))
+                        {
+                        s->version=TLS1_1_VERSION;
+                        s->method=TLSv1_1_client_method();
+                        }
+                else if ((p[2] == TLS1_2_VERSION_MINOR) &&
+                        !(s->options & SSL_OP_NO_TLSv1_2))
+                        {
+                        s->version=TLS1_2_VERSION;
+                        s->method=TLSv1_2_client_method();
+                        }
                 else
                         {
                         SSLerr(SSL_F_SSL23_GET_SERVER_HELLO,SSL_R_UNSUPPORTED_PROTOCOL);
diff --git a/src/lib/libssl/src/ssl/s23_meth.c b/src/lib/libssl/src/ssl/s23_meth.c
index c6099efcf7..40eae0f0be 100644
--- a/src/lib/libssl/src/ssl/s23_meth.c
+++ b/src/lib/libssl/src/ssl/s23_meth.c
@@ -76,6 +76,10 @@ static const SSL_METHOD *ssl23_get_method(int ver)
 #ifndef OPENSSL_NO_TLS1
         if (ver == TLS1_VERSION)
                 return(TLSv1_method());
+        else if (ver == TLS1_1_VERSION)
+                return(TLSv1_1_method());
+        else if (ver == TLS1_2_VERSION)
+                return(TLSv1_2_method());
         else
 #endif
                 return(NULL);
diff --git a/src/lib/libssl/src/ssl/s23_srvr.c b/src/lib/libssl/src/ssl/s23_srvr.c
index 836dd1f1cf..4877849013 100644
--- a/src/lib/libssl/src/ssl/s23_srvr.c
+++ b/src/lib/libssl/src/ssl/s23_srvr.c
@@ -115,6 +115,9 @@
 #include <openssl/rand.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 
 static const SSL_METHOD *ssl23_get_server_method(int ver);
 int ssl23_get_client_hello(SSL *s);
@@ -128,6 +131,10 @@ static const SSL_METHOD *ssl23_get_server_method(int ver)
                 return(SSLv3_server_method());
         else if (ver == TLS1_VERSION)
                 return(TLSv1_server_method());
+        else if (ver == TLS1_1_VERSION)
+                return(TLSv1_1_server_method());
+        else if (ver == TLS1_2_VERSION)
+                return(TLSv1_2_server_method());
         else
                 return(NULL);
         }
@@ -283,7 +290,20 @@ int ssl23_get_client_hello(SSL *s)
                                 /* SSLv3/TLSv1 */
                                 if (p[4] >= TLS1_VERSION_MINOR)
                                         {
-                                        if (!(s->options & SSL_OP_NO_TLSv1))
+                                        if (p[4] >= TLS1_2_VERSION_MINOR &&
+                                           !(s->options & SSL_OP_NO_TLSv1_2))
+                                                {
+                                                s->version=TLS1_2_VERSION;
+                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
+                                                }
+                                        else if (p[4] >= TLS1_1_VERSION_MINOR &&
+                                           !(s->options & SSL_OP_NO_TLSv1_1))
+                                                {
+                                                s->version=TLS1_1_VERSION;
+                                                /* type=2; */ /* done later to survive restarts */
+                                                s->state=SSL23_ST_SR_CLNT_HELLO_B;
+                                                }
+                                        else if (!(s->options & SSL_OP_NO_TLSv1))
                                                 {
                                                 s->version=TLS1_VERSION;
                                                 /* type=2; */ /* done later to survive restarts */
@@ -350,7 +370,19 @@ int ssl23_get_client_hello(SSL *s)
                                 v[1]=p[10]; /* minor version according to client_version */
                         if (v[1] >= TLS1_VERSION_MINOR)
                                 {
-                                if (!(s->options & SSL_OP_NO_TLSv1))
+                                if (v[1] >= TLS1_2_VERSION_MINOR &&
+                                        !(s->options & SSL_OP_NO_TLSv1_2))
+                                        {
+                                        s->version=TLS1_2_VERSION;
+                                        type=3;
+                                        }
+                                else if (v[1] >= TLS1_1_VERSION_MINOR &&
+                                        !(s->options & SSL_OP_NO_TLSv1_1))
+                                        {
+                                        s->version=TLS1_1_VERSION;
+                                        type=3;
+                                        }
+                                else if (!(s->options & SSL_OP_NO_TLSv1))
                                         {
                                         s->version=TLS1_VERSION;
                                         type=3;
@@ -393,6 +425,15 @@ int ssl23_get_client_hello(SSL *s)
                         }
                 }
 
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && (s->version < TLS1_VERSION))
+                {
+                SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,
+                                        SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
+                goto err;
+                }
+#endif
+
         if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
                 {
                 /* we have SSLv3/TLSv1 in an SSLv2 header
@@ -567,8 +608,11 @@ int ssl23_get_client_hello(SSL *s)
                         s->s3->rbuf.left=0;
                         s->s3->rbuf.offset=0;
                         }
-
-                if (s->version == TLS1_VERSION)
+                if (s->version == TLS1_2_VERSION)
+                        s->method = TLSv1_2_server_method();
+                else if (s->version == TLS1_1_VERSION)
+                        s->method = TLSv1_1_server_method();
+                else if (s->version == TLS1_VERSION)
                         s->method = TLSv1_server_method();
                 else
                         s->method = SSLv3_server_method();
diff --git a/src/lib/libssl/src/ssl/s3_both.c b/src/lib/libssl/src/ssl/s3_both.c
index a6d869df59..b63460a56d 100644
--- a/src/lib/libssl/src/ssl/s3_both.c
+++ b/src/lib/libssl/src/ssl/s3_both.c
@@ -202,15 +202,38 @@ int ssl3_send_finished(SSL *s, int a, int b, const char *sender, int slen)
         return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
         }
 
+#ifndef OPENSSL_NO_NEXTPROTONEG
+/* ssl3_take_mac calculates the Finished MAC for the handshakes messages seen to far. */
+static void ssl3_take_mac(SSL *s) {
+        const char *sender;
+        int slen;
+
+        if (s->state & SSL_ST_CONNECT)
+                {
+                sender=s->method->ssl3_enc->server_finished_label;
+                slen=s->method->ssl3_enc->server_finished_label_len;
+                }
+        else
+                {
+                sender=s->method->ssl3_enc->client_finished_label;
+                slen=s->method->ssl3_enc->client_finished_label_len;
+                }
+
+        s->s3->tmp.peer_finish_md_len = s->method->ssl3_enc->final_finish_mac(s,
+                sender,slen,s->s3->tmp.peer_finish_md);
+}
+#endif
+
 int ssl3_get_finished(SSL *s, int a, int b)
         {
         int al,i,ok;
         long n;
         unsigned char *p;
 
-        /* the mac has already been generated when we received the
-         * change cipher spec message and is in s->s3->tmp.peer_finish_md
-         */ 
+#ifdef OPENSSL_NO_NEXTPROTONEG
+        /* the mac has already been generated when we received the change
+         * cipher spec message and is in s->s3->tmp.peer_finish_md. */
+#endif
 
         n=s->method->ssl_get_message(s,
                 a,
@@ -514,6 +537,13 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
                 s->init_num += i;
                 n -= i;
                 }
+#ifndef OPENSSL_NO_NEXTPROTONEG
+        /* If receiving Finished, record MAC of prior handshake messages for
+         * Finished verification. */
+        if (*s->init_buf->data == SSL3_MT_FINISHED)
+                ssl3_take_mac(s);
+#endif
+        /* Feed this message into MAC computation. */
         ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num + 4);
         if (s->msg_callback)
                 s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data, (size_t)s->init_num + 4, s, s->msg_callback_arg);
diff --git a/src/lib/libssl/src/ssl/s3_clnt.c b/src/lib/libssl/src/ssl/s3_clnt.c
index 53223bd38d..b80d052e1f 100644
--- a/src/lib/libssl/src/ssl/s3_clnt.c
+++ b/src/lib/libssl/src/ssl/s3_clnt.c
@@ -156,6 +156,9 @@
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/md5.h>
+#ifdef OPENSSL_FIPS
+#include <openssl/fips.h>
+#endif
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
@@ -200,6 +203,18 @@ int ssl3_connect(SSL *s)
         s->in_handshake++;
         if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
 
+#ifndef OPENSSL_NO_HEARTBEATS
+        /* If we're awaiting a HeartbeatResponse, pretend we
+         * already got and don't await it anymore, because
+         * Heartbeats don't make sense during handshakes anyway.
+         */
+        if (s->tlsext_hb_pending)
+                {
+                s->tlsext_hb_pending = 0;
+                s->tlsext_hb_seq++;
+                }
+#endif
+
         for (;;)
                 {
                 state=s->state;
@@ -207,7 +222,7 @@ int ssl3_connect(SSL *s)
                 switch(s->state)
                         {
                 case SSL_ST_RENEGOTIATE:
-                        s->new_session=1;
+                        s->renegotiate=1;
                         s->state=SSL_ST_CONNECT;
                         s->ctx->stats.sess_connect_renegotiate++;
                         /* break */
@@ -280,7 +295,16 @@ int ssl3_connect(SSL *s)
                         if (ret <= 0) goto end;
 
                         if (s->hit)
+                                {
                                 s->state=SSL3_ST_CR_FINISHED_A;
+#ifndef OPENSSL_NO_TLSEXT
+                                if (s->tlsext_ticket_expected)
+                                        {
+                                        /* receive renewed session ticket */
+                                        s->state=SSL3_ST_CR_SESSION_TICKET_A;
+                                        }
+#endif
+                                }
                         else
                                 s->state=SSL3_ST_CR_CERT_A;
                         s->init_num=0;
@@ -358,6 +382,17 @@ int ssl3_connect(SSL *s)
                 case SSL3_ST_CR_SRVR_DONE_B:
                         ret=ssl3_get_server_done(s);
                         if (ret <= 0) goto end;
+#ifndef OPENSSL_NO_SRP
+                        if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP)
+                                {
+                                if ((ret = SRP_Calc_A_param(s))<=0)
+                                        {
+                                        SSLerr(SSL_F_SSL3_CONNECT,SSL_R_SRP_A_CALC);
+                                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_INTERNAL_ERROR);
+                                        goto end;
+                                        }
+                                }
+#endif
                         if (s->s3->tmp.cert_req)
                                 s->state=SSL3_ST_CW_CERT_A;
                         else
@@ -423,7 +458,16 @@ int ssl3_connect(SSL *s)
                         ret=ssl3_send_change_cipher_spec(s,
                                 SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B);
                         if (ret <= 0) goto end;
+
+
+#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
                         s->state=SSL3_ST_CW_FINISHED_A;
+#else
+                        if (s->s3->next_proto_neg_seen)
+                                s->state=SSL3_ST_CW_NEXT_PROTO_A;
+                        else
+                                s->state=SSL3_ST_CW_FINISHED_A;
+#endif
                         s->init_num=0;
 
                         s->session->cipher=s->s3->tmp.new_cipher;
@@ -451,6 +495,15 @@ int ssl3_connect(SSL *s)
 
                         break;
 
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+                case SSL3_ST_CW_NEXT_PROTO_A:
+                case SSL3_ST_CW_NEXT_PROTO_B:
+                        ret=ssl3_send_next_proto(s);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_CW_FINISHED_A;
+                        break;
+#endif
+
                 case SSL3_ST_CW_FINISHED_A:
                 case SSL3_ST_CW_FINISHED_B:
                         ret=ssl3_send_finished(s,
@@ -546,6 +599,7 @@ int ssl3_connect(SSL *s)
                         /* else do it later in ssl3_write */
 
                         s->init_num=0;
+                        s->renegotiate=0;
                         s->new_session=0;
 
                         ssl_update_cache(s,SSL_SESS_CACHE_CLIENT);
@@ -635,9 +689,43 @@ int ssl3_client_hello(SSL *s)
                 /* Do the message type and length last */
                 d=p= &(buf[4]);
 
+                /* version indicates the negotiated version: for example from
+                 * an SSLv2/v3 compatible client hello). The client_version
+                 * field is the maximum version we permit and it is also
+                 * used in RSA encrypted premaster secrets. Some servers can
+                 * choke if we initially report a higher version then
+                 * renegotiate to a lower one in the premaster secret. This
+                 * didn't happen with TLS 1.0 as most servers supported it
+                 * but it can with TLS 1.1 or later if the server only supports
+                 * 1.0.
+                 *
+                 * Possible scenario with previous logic:
+                 *      1. Client hello indicates TLS 1.2
+                 *      2. Server hello says TLS 1.0
+                 *      3. RSA encrypted premaster secret uses 1.2.
+                 *      4. Handhaked proceeds using TLS 1.0.
+                 *      5. Server sends hello request to renegotiate.
+                 *      6. Client hello indicates TLS v1.0 as we now
+                 *         know that is maximum server supports.
+                 *      7. Server chokes on RSA encrypted premaster secret
+                 *         containing version 1.0.
+                 *
+                 * For interoperability it should be OK to always use the
+                 * maximum version we support in client hello and then rely
+                 * on the checking of version to ensure the servers isn't
+                 * being inconsistent: for example initially negotiating with
+                 * TLS 1.0 and renegotiating with TLS 1.2. We do this by using
+                 * client_version in client hello and not resetting it to
+                 * the negotiated version.
+                 */
+#if 0
                 *(p++)=s->version>>8;
                 *(p++)=s->version&0xff;
                 s->client_version=s->version;
+#else
+                *(p++)=s->client_version>>8;
+                *(p++)=s->client_version&0xff;
+#endif
 
                 /* Random stuff */
                 memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
@@ -667,6 +755,15 @@ int ssl3_client_hello(SSL *s)
                         SSLerr(SSL_F_SSL3_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
                         goto err;
                         }
+#ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH
+                        /* Some servers hang if client hello > 256 bytes
+                         * as hack workaround chop number of supported ciphers
+                         * to keep it well below this if we use TLS v1.2
+                         */
+                        if (TLS1_get_version(s) >= TLS1_2_VERSION
+                                && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH)
+                                i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1;
+#endif
                 s2n(i,p);
                 p+=i;
 
@@ -847,6 +944,14 @@ int ssl3_get_server_hello(SSL *s)
                 SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNKNOWN_CIPHER_RETURNED);
                 goto f_err;
                 }
+        /* TLS v1.2 only ciphersuites require v1.2 or later */
+        if ((c->algorithm_ssl & SSL_TLSV1_2) && 
+                (TLS1_get_version(s) < TLS1_2_VERSION))
+                {
+                al=SSL_AD_ILLEGAL_PARAMETER;
+                SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_WRONG_CIPHER_RETURNED);
+                goto f_err;
+                }
         p+=ssl_put_cipher_by_char(s,NULL,NULL);
 
         sk=ssl_get_ciphers_by_id(s);
@@ -878,9 +983,11 @@ int ssl3_get_server_hello(SSL *s)
                         }
                 }
         s->s3->tmp.new_cipher=c;
-        if (!ssl3_digest_cached_records(s))
+        /* Don't digest cached records if TLS v1.2: we may need them for
+         * client authentication.
+         */
+        if (TLS1_get_version(s) < TLS1_2_VERSION && !ssl3_digest_cached_records(s))
                 goto f_err;
-
         /* lets get the compression algorithm */
         /* COMPRESSION */
 #ifdef OPENSSL_NO_COMP
@@ -1159,6 +1266,7 @@ int ssl3_get_key_exchange(SSL *s)
         int al,i,j,param_len,ok;
         long n,alg_k,alg_a;
         EVP_PKEY *pkey=NULL;
+        const EVP_MD *md = NULL;
 #ifndef OPENSSL_NO_RSA
         RSA *rsa=NULL;
 #endif
@@ -1282,6 +1390,86 @@ int ssl3_get_key_exchange(SSL *s)
                 }
         else
 #endif /* !OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+        if (alg_k & SSL_kSRP)
+                {
+                n2s(p,i);
+                param_len=i+2;
+                if (param_len > n)
+                        {
+                        al=SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_N_LENGTH);
+                        goto f_err;
+                        }
+                if (!(s->srp_ctx.N=BN_bin2bn(p,i,NULL)))
+                        {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                        goto err;
+                        }
+                p+=i;
+
+                n2s(p,i);
+                param_len+=i+2;
+                if (param_len > n)
+                        {
+                        al=SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_G_LENGTH);
+                        goto f_err;
+                        }
+                if (!(s->srp_ctx.g=BN_bin2bn(p,i,NULL)))
+                        {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                        goto err;
+                        }
+                p+=i;
+
+                i = (unsigned int)(p[0]);
+                p++;
+                param_len+=i+1;
+                if (param_len > n)
+                        {
+                        al=SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_S_LENGTH);
+                        goto f_err;
+                        }
+                if (!(s->srp_ctx.s=BN_bin2bn(p,i,NULL)))
+                        {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                        goto err;
+                        }
+                p+=i;
+
+                n2s(p,i);
+                param_len+=i+2;
+                if (param_len > n)
+                        {
+                        al=SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_B_LENGTH);
+                        goto f_err;
+                        }
+                if (!(s->srp_ctx.B=BN_bin2bn(p,i,NULL)))
+                        {
+                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB);
+                        goto err;
+                        }
+                p+=i;
+                n-=param_len;
+
+/* We must check if there is a certificate */
+#ifndef OPENSSL_NO_RSA
+                if (alg_a & SSL_aRSA)
+                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+#else
+                if (0)
+                        ;
+#endif
+#ifndef OPENSSL_NO_DSA
+                else if (alg_a & SSL_aDSS)
+                        pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
+#endif
+                }
+        else
+#endif /* !OPENSSL_NO_SRP */
 #ifndef OPENSSL_NO_RSA
         if (alg_k & SSL_kRSA)
                 {
@@ -1529,6 +1717,38 @@ int ssl3_get_key_exchange(SSL *s)
         /* if it was signed, check the signature */
         if (pkey != NULL)
                 {
+                if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                        {
+                        int sigalg = tls12_get_sigid(pkey);
+                        /* Should never happen */
+                        if (sigalg == -1)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+                        /* Check key type is consistent with signature */
+                        if (sigalg != (int)p[1])
+                                {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_TYPE);
+                                al=SSL_AD_DECODE_ERROR;
+                                goto f_err;
+                                }
+                        md = tls12_get_hash(p[0]);
+                        if (md == NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNKNOWN_DIGEST);
+                                al=SSL_AD_DECODE_ERROR;
+                                goto f_err;
+                                }
+#ifdef SSL_DEBUG
+fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
+#endif
+                        p += 2;
+                        n -= 2;
+                        }
+                else
+                        md = EVP_sha1();
+                        
                 n2s(p,i);
                 n-=2;
                 j=EVP_PKEY_size(pkey);
@@ -1542,7 +1762,7 @@ int ssl3_get_key_exchange(SSL *s)
                         }
 
 #ifndef OPENSSL_NO_RSA
-                if (pkey->type == EVP_PKEY_RSA)
+                if (pkey->type == EVP_PKEY_RSA && TLS1_get_version(s) < TLS1_2_VERSION)
                         {
                         int num;
 
@@ -1550,6 +1770,8 @@ int ssl3_get_key_exchange(SSL *s)
                         q=md_buf;
                         for (num=2; num > 0; num--)
                                 {
+                                EVP_MD_CTX_set_flags(&md_ctx,
+                                        EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
                                 EVP_DigestInit_ex(&md_ctx,(num == 2)
                                         ?s->ctx->md5:s->ctx->sha1, NULL);
                                 EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
@@ -1577,29 +1799,8 @@ int ssl3_get_key_exchange(SSL *s)
                         }
                 else
 #endif
-#ifndef OPENSSL_NO_DSA
-                        if (pkey->type == EVP_PKEY_DSA)
-                        {
-                        /* lets do DSS */
-                        EVP_VerifyInit_ex(&md_ctx,EVP_dss1(), NULL);
-                        EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                        EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                        EVP_VerifyUpdate(&md_ctx,param,param_len);
-                        if (EVP_VerifyFinal(&md_ctx,p,(int)n,pkey) <= 0)
-                                {
-                                /* bad signature */
-                                al=SSL_AD_DECRYPT_ERROR;
-                                SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SIGNATURE);
-                                goto f_err;
-                                }
-                        }
-                else
-#endif
-#ifndef OPENSSL_NO_ECDSA
-                        if (pkey->type == EVP_PKEY_EC)
                         {
-                        /* let's do ECDSA */
-                        EVP_VerifyInit_ex(&md_ctx,EVP_ecdsa(), NULL);
+                        EVP_VerifyInit_ex(&md_ctx, md, NULL);
                         EVP_VerifyUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
                         EVP_VerifyUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
                         EVP_VerifyUpdate(&md_ctx,param,param_len);
@@ -1611,12 +1812,6 @@ int ssl3_get_key_exchange(SSL *s)
                                 goto f_err;
                                 }
                         }
-                else
-#endif
-                        {
-                        SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
-                        goto err;
-                        }
                 }
         else
                 {
@@ -1663,7 +1858,7 @@ int ssl3_get_certificate_request(SSL *s)
         {
         int ok,ret=0;
         unsigned long n,nc,l;
-        unsigned int llen,ctype_num,i;
+        unsigned int llen, ctype_num,i;
         X509_NAME *xn=NULL;
         const unsigned char *p,*q;
         unsigned char *d;
@@ -1683,6 +1878,14 @@ int ssl3_get_certificate_request(SSL *s)
         if (s->s3->tmp.message_type == SSL3_MT_SERVER_DONE)
                 {
                 s->s3->tmp.reuse_message=1;
+                /* If we get here we don't need any cached handshake records
+                 * as we wont be doing client auth.
+                 */
+                if (s->s3->handshake_buffer)
+                        {
+                        if (!ssl3_digest_cached_records(s))
+                                goto err;
+                        }
                 return(1);
                 }
 
@@ -1719,6 +1922,26 @@ int ssl3_get_certificate_request(SSL *s)
         for (i=0; i<ctype_num; i++)
                 s->s3->tmp.ctype[i]= p[i];
         p+=ctype_num;
+        if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                {
+                n2s(p, llen);
+                /* Check we have enough room for signature algorithms and
+                 * following length value.
+                 */
+                if ((unsigned long)(p - d + llen + 2) > n)
+                        {
+                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_DATA_LENGTH_TOO_LONG);
+                        goto err;
+                        }
+                if ((llen & 1) || !tls1_process_sigalgs(s, p, llen))
+                        {
+                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
+                        SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_SIGNATURE_ALGORITHMS_ERROR);
+                        goto err;
+                        }
+                p += llen;
+                }
 
         /* get the CA RDNs */
         n2s(p,llen);
@@ -1731,7 +1954,7 @@ fclose(out);
 }
 #endif
 
-        if ((llen+ctype_num+2+1) != n)
+        if ((unsigned long)(p - d + llen) != n)
                 {
                 ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECODE_ERROR);
                 SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST,SSL_R_LENGTH_MISMATCH);
@@ -2553,6 +2776,39 @@ int ssl3_send_client_key_exchange(SSL *s)
                         EVP_PKEY_free(pub_key);
 
                         }
+#ifndef OPENSSL_NO_SRP
+                else if (alg_k & SSL_kSRP)
+                        {
+                        if (s->srp_ctx.A != NULL)
+                                {
+                                /* send off the data */
+                                n=BN_num_bytes(s->srp_ctx.A);
+                                s2n(n,p);
+                                BN_bn2bin(s->srp_ctx.A,p);
+                                n+=2;
+                                }
+                        else
+                                {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+                        if (s->session->srp_username != NULL)
+                                OPENSSL_free(s->session->srp_username);
+                        s->session->srp_username = BUF_strdup(s->srp_ctx.login);
+                        if (s->session->srp_username == NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,
+                                        ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+
+                        if ((s->session->master_key_length = SRP_generate_client_master_secret(s,s->session->master_key))<0)
+                                {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+                        }
+#endif
 #ifndef OPENSSL_NO_PSK
                 else if (alg_k & SSL_kPSK)
                         {
@@ -2672,12 +2928,13 @@ int ssl3_send_client_verify(SSL *s)
         unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
         EVP_PKEY *pkey;
         EVP_PKEY_CTX *pctx=NULL;
-#ifndef OPENSSL_NO_RSA
+        EVP_MD_CTX mctx;
         unsigned u=0;
-#endif
         unsigned long n;
         int j;
 
+        EVP_MD_CTX_init(&mctx);
+
         if (s->state == SSL3_ST_CW_CERT_VRFY_A)
                 {
                 d=(unsigned char *)s->init_buf->data;
@@ -2688,7 +2945,8 @@ int ssl3_send_client_verify(SSL *s)
                 EVP_PKEY_sign_init(pctx);
                 if (EVP_PKEY_CTX_set_signature_md(pctx, EVP_sha1())>0)
                         {
-                        s->method->ssl3_enc->cert_verify_mac(s,
+                        if (TLS1_get_version(s) < TLS1_2_VERSION)
+                                s->method->ssl3_enc->cert_verify_mac(s,
                                                 NID_sha1,
                                                 &(data[MD5_DIGEST_LENGTH]));
                         }
@@ -2696,6 +2954,41 @@ int ssl3_send_client_verify(SSL *s)
                         {
                         ERR_clear_error();
                         }
+                /* For TLS v1.2 send signature algorithm and signature
+                 * using agreed digest and cached handshake records.
+                 */
+                if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                        {
+                        long hdatalen = 0;
+                        void *hdata;
+                        const EVP_MD *md = s->cert->key->digest;
+                        hdatalen = BIO_get_mem_data(s->s3->handshake_buffer,
+                                                                &hdata);
+                        if (hdatalen <= 0 || !tls12_get_sigandhash(p, pkey, md))
+                                {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
+                                                ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+                        p += 2;
+#ifdef SSL_DEBUG
+                        fprintf(stderr, "Using TLS 1.2 with client alg %s\n",
+                                                        EVP_MD_name(md));
+#endif
+                        if (!EVP_SignInit_ex(&mctx, md, NULL)
+                                || !EVP_SignUpdate(&mctx, hdata, hdatalen)
+                                || !EVP_SignFinal(&mctx, p + 2, &u, pkey))
+                                {
+                                SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,
+                                                ERR_R_EVP_LIB);
+                                goto err;
+                                }
+                        s2n(u,p);
+                        n = u + 4;
+                        if (!ssl3_digest_cached_records(s))
+                                goto err;
+                        }
+                else
 #ifndef OPENSSL_NO_RSA
                 if (pkey->type == EVP_PKEY_RSA)
                         {
@@ -2778,9 +3071,11 @@ int ssl3_send_client_verify(SSL *s)
                 s->init_num=(int)n+4;
                 s->init_off=0;
                 }
+        EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_CTX_free(pctx);
         return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
 err:
+        EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_CTX_free(pctx);
         return(-1);
         }
@@ -2904,7 +3199,7 @@ int ssl3_check_cert_and_algorithm(SSL *s)
         if (idx == SSL_PKEY_ECC)
                 {
                 if (ssl_check_srvr_ecc_cert_and_alg(sc->peer_pkeys[idx].x509,
-                    s->s3->tmp.new_cipher) == 0) 
+                                                                s) == 0) 
                         { /* check failed */
                         SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_BAD_ECC_CERT);
                         goto f_err;
@@ -3000,6 +3295,32 @@ err:
         return(0);
         }
 
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+int ssl3_send_next_proto(SSL *s)
+        {
+        unsigned int len, padding_len;
+        unsigned char *d;
+
+        if (s->state == SSL3_ST_CW_NEXT_PROTO_A)
+                {
+                len = s->next_proto_negotiated_len;
+                padding_len = 32 - ((len + 2) % 32);
+                d = (unsigned char *)s->init_buf->data;
+                d[4] = len;
+                memcpy(d + 5, s->next_proto_negotiated, len);
+                d[5 + len] = padding_len;
+                memset(d + 6 + len, 0, padding_len);
+                *(d++)=SSL3_MT_NEXT_PROTO;
+                l2n3(2 + len + padding_len, d);
+                s->state = SSL3_ST_CW_NEXT_PROTO_B;
+                s->init_num = 4 + 2 + len + padding_len;
+                s->init_off = 0;
+                }
+
+        return ssl3_do_write(s, SSL3_RT_HANDSHAKE);
+}
+#endif  /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */
+
 /* Check to see if handshake is full or resumed. Usually this is just a
  * case of checking to see if a cache hit has occurred. In the case of
  * session tickets we have to check the next message to be sure.
diff --git a/src/lib/libssl/src/ssl/s3_enc.c b/src/lib/libssl/src/ssl/s3_enc.c
index b14597076d..c5df2cb90a 100644
--- a/src/lib/libssl/src/ssl/s3_enc.c
+++ b/src/lib/libssl/src/ssl/s3_enc.c
@@ -170,6 +170,7 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
 #endif
         k=0;
         EVP_MD_CTX_init(&m5);
+        EVP_MD_CTX_set_flags(&m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
         EVP_MD_CTX_init(&s1);
         for (i=0; (int)i<num; i+=MD5_DIGEST_LENGTH)
                 {
@@ -571,12 +572,12 @@ void ssl3_free_digest_list(SSL *s)
         OPENSSL_free(s->s3->handshake_dgst);
         s->s3->handshake_dgst=NULL;
         }       
-                
+
 
 
 void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len)
         {
-        if (s->s3->handshake_buffer) 
+        if (s->s3->handshake_buffer && !(s->s3->flags & TLS1_FLAGS_KEEP_HANDSHAKE)) 
                 {
                 BIO_write (s->s3->handshake_buffer,(void *)buf,len);
                 } 
@@ -613,9 +614,16 @@ int ssl3_digest_cached_records(SSL *s)
         /* Loop through bitso of algorithm2 field and create MD_CTX-es */
         for (i=0;ssl_get_handshake_digest(i,&mask,&md); i++) 
                 {
-                if ((mask & s->s3->tmp.new_cipher->algorithm2) && md) 
+                if ((mask & ssl_get_algorithm2(s)) && md) 
                         {
                         s->s3->handshake_dgst[i]=EVP_MD_CTX_create();
+#ifdef OPENSSL_FIPS
+                        if (EVP_MD_nid(md) == NID_md5)
+                                {
+                                EVP_MD_CTX_set_flags(s->s3->handshake_dgst[i],
+                                                EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+                                }
+#endif
                         EVP_DigestInit_ex(s->s3->handshake_dgst[i],md,NULL);
                         EVP_DigestUpdate(s->s3->handshake_dgst[i],hdata,hdatalen);
                         } 
@@ -624,9 +632,12 @@ int ssl3_digest_cached_records(SSL *s)
                         s->s3->handshake_dgst[i]=NULL;
                         }
                 }
-        /* Free handshake_buffer BIO */
-        BIO_free(s->s3->handshake_buffer);
-        s->s3->handshake_buffer = NULL;
+        if (!(s->s3->flags & TLS1_FLAGS_KEEP_HANDSHAKE))
+                {
+                /* Free handshake_buffer BIO */
+                BIO_free(s->s3->handshake_buffer);
+                s->s3->handshake_buffer = NULL;
+                }
 
         return 1;
         }
@@ -672,6 +683,7 @@ static int ssl3_handshake_mac(SSL *s, int md_nid,
                 return 0;
         }       
         EVP_MD_CTX_init(&ctx);
+        EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
         EVP_MD_CTX_copy_ex(&ctx,d);
         n=EVP_MD_CTX_size(&ctx);
         if (n < 0)
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index 1130244aeb..fb60cde8ee 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -1071,6 +1071,103 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         256,
         },
 
+        /* TLS v1.2 ciphersuites */
+        /* Cipher 3B */
+        {
+        1,
+        TLS1_TXT_RSA_WITH_NULL_SHA256,
+        TLS1_CK_RSA_WITH_NULL_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_eNULL,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        0,
+        0,
+        },
+
+        /* Cipher 3C */
+        {
+        1,
+        TLS1_TXT_RSA_WITH_AES_128_SHA256,
+        TLS1_CK_RSA_WITH_AES_128_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
+        /* Cipher 3D */
+        {
+        1,
+        TLS1_TXT_RSA_WITH_AES_256_SHA256,
+        TLS1_CK_RSA_WITH_AES_256_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+
+        /* Cipher 3E */
+        {
+        0, /* not implemented (non-ephemeral DH) */
+        TLS1_TXT_DH_DSS_WITH_AES_128_SHA256,
+        TLS1_CK_DH_DSS_WITH_AES_128_SHA256,
+        SSL_kDHr,
+        SSL_aDH,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
+        /* Cipher 3F */
+        {
+        0, /* not implemented (non-ephemeral DH) */
+        TLS1_TXT_DH_RSA_WITH_AES_128_SHA256,
+        TLS1_CK_DH_RSA_WITH_AES_128_SHA256,
+        SSL_kDHr,
+        SSL_aDH,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
+        /* Cipher 40 */
+        {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256,
+        TLS1_CK_DHE_DSS_WITH_AES_128_SHA256,
+        SSL_kEDH,
+        SSL_aDSS,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
 #ifndef OPENSSL_NO_CAMELLIA
         /* Camellia ciphersuites from RFC4132 (128-bit portion) */
 
@@ -1287,6 +1384,122 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         128,
         },
 #endif
+
+        /* TLS v1.2 ciphersuites */
+        /* Cipher 67 */
+        {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256,
+        TLS1_CK_DHE_RSA_WITH_AES_128_SHA256,
+        SSL_kEDH,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
+        /* Cipher 68 */
+        {
+        0, /* not implemented (non-ephemeral DH) */
+        TLS1_TXT_DH_DSS_WITH_AES_256_SHA256,
+        TLS1_CK_DH_DSS_WITH_AES_256_SHA256,
+        SSL_kDHr,
+        SSL_aDH,
+        SSL_AES256,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+
+        /* Cipher 69 */
+        {
+        0, /* not implemented (non-ephemeral DH) */
+        TLS1_TXT_DH_RSA_WITH_AES_256_SHA256,
+        TLS1_CK_DH_RSA_WITH_AES_256_SHA256,
+        SSL_kDHr,
+        SSL_aDH,
+        SSL_AES256,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+
+        /* Cipher 6A */
+        {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256,
+        TLS1_CK_DHE_DSS_WITH_AES_256_SHA256,
+        SSL_kEDH,
+        SSL_aDSS,
+        SSL_AES256,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+
+        /* Cipher 6B */
+        {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256,
+        TLS1_CK_DHE_RSA_WITH_AES_256_SHA256,
+        SSL_kEDH,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+
+        /* Cipher 6C */
+        {
+        1,
+        TLS1_TXT_ADH_WITH_AES_128_SHA256,
+        TLS1_CK_ADH_WITH_AES_128_SHA256,
+        SSL_kEDH,
+        SSL_aNULL,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
+        /* Cipher 6D */
+        {
+        1,
+        TLS1_TXT_ADH_WITH_AES_256_SHA256,
+        TLS1_CK_ADH_WITH_AES_256_SHA256,
+        SSL_kEDH,
+        SSL_aNULL,
+        SSL_AES256,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+
+        /* GOST Ciphersuites */
+
         {
         1,
         "GOST94-GOST89-GOST89",
@@ -1610,6 +1823,200 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
 
 #endif /* OPENSSL_NO_SEED */
 
+        /* GCM ciphersuites from RFC5288 */
+
+        /* Cipher 9C */
+        {
+        1,
+        TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_RSA_WITH_AES_128_GCM_SHA256,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher 9D */
+        {
+        1,
+        TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_RSA_WITH_AES_256_GCM_SHA384,
+        SSL_kRSA,
+        SSL_aRSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher 9E */
+        {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256,
+        SSL_kEDH,
+        SSL_aRSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher 9F */
+        {
+        1,
+        TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384,
+        SSL_kEDH,
+        SSL_aRSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher A0 */
+        {
+        0,
+        TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256,
+        SSL_kDHr,
+        SSL_aDH,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher A1 */
+        {
+        0,
+        TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384,
+        SSL_kDHr,
+        SSL_aDH,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher A2 */
+        {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256,
+        SSL_kEDH,
+        SSL_aDSS,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher A3 */
+        {
+        1,
+        TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384,
+        SSL_kEDH,
+        SSL_aDSS,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher A4 */
+        {
+        0,
+        TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256,
+        SSL_kDHr,
+        SSL_aDH,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher A5 */
+        {
+        0,
+        TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384,
+        SSL_kDHr,
+        SSL_aDH,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher A6 */
+        {
+        1,
+        TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_ADH_WITH_AES_128_GCM_SHA256,
+        SSL_kEDH,
+        SSL_aNULL,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher A7 */
+        {
+        1,
+        TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_ADH_WITH_AES_256_GCM_SHA384,
+        SSL_kEDH,
+        SSL_aNULL,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
 #ifndef OPENSSL_NO_ECDH
         /* Cipher C001 */
         {
@@ -1621,7 +2028,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_eNULL,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_STRONG_NONE,
+        SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         0,
         0,
@@ -1653,7 +2060,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_3DES,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         168,
         168,
@@ -1669,7 +2076,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES128,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         128,
         128,
@@ -1685,7 +2092,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES256,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         256,
         256,
@@ -1701,7 +2108,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_eNULL,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_STRONG_NONE,
+        SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         0,
         0,
@@ -1733,7 +2140,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_3DES,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         168,
         168,
@@ -1749,7 +2156,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES128,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         128,
         128,
@@ -1765,7 +2172,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES256,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         256,
         256,
@@ -1781,7 +2188,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_eNULL,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_STRONG_NONE,
+        SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         0,
         0,
@@ -1813,7 +2220,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_3DES,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         168,
         168,
@@ -1829,7 +2236,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES128,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         128,
         128,
@@ -1845,7 +2252,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES256,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         256,
         256,
@@ -1861,7 +2268,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_eNULL,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_STRONG_NONE,
+        SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         0,
         0,
@@ -1893,7 +2300,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_3DES,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         168,
         168,
@@ -1909,7 +2316,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES128,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         128,
         128,
@@ -1925,7 +2332,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES256,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         256,
         256,
@@ -1941,7 +2348,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_eNULL,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_STRONG_NONE,
+        SSL_NOT_EXP|SSL_STRONG_NONE|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         0,
         0,
@@ -1973,7 +2380,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_3DES,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         168,
         168,
@@ -1989,7 +2396,7 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES128,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         128,
         128,
@@ -2005,13 +2412,423 @@ OPENSSL_GLOBAL SSL_CIPHER ssl3_ciphers[]={
         SSL_AES256,
         SSL_SHA1,
         SSL_TLSV1,
-        SSL_NOT_EXP|SSL_HIGH,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
         SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
         256,
         256,
         },
 #endif  /* OPENSSL_NO_ECDH */
 
+#ifndef OPENSSL_NO_SRP
+        /* Cipher C01A */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA,
+        SSL_kSRP,
+        SSL_aNULL,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        168,
+        168,
+        },
+
+        /* Cipher C01B */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA,
+        SSL_kSRP,
+        SSL_aRSA,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        168,
+        168,
+        },
+
+        /* Cipher C01C */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
+        TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA,
+        SSL_kSRP,
+        SSL_aDSS,
+        SSL_3DES,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        168,
+        168,
+        },
+
+        /* Cipher C01D */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA,
+        TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA,
+        SSL_kSRP,
+        SSL_aNULL,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
+        /* Cipher C01E */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
+        TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
+        SSL_kSRP,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
+        /* Cipher C01F */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
+        TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
+        SSL_kSRP,
+        SSL_aDSS,
+        SSL_AES128,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        128,
+        128,
+        },
+
+        /* Cipher C020 */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA,
+        TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA,
+        SSL_kSRP,
+        SSL_aNULL,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+
+        /* Cipher C021 */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
+        TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
+        SSL_kSRP,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+
+        /* Cipher C022 */
+        {
+        1,
+        TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
+        TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
+        SSL_kSRP,
+        SSL_aDSS,
+        SSL_AES256,
+        SSL_SHA1,
+        SSL_TLSV1,
+        SSL_NOT_EXP|SSL_HIGH,
+        SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF,
+        256,
+        256,
+        },
+#endif  /* OPENSSL_NO_SRP */
+#ifndef OPENSSL_NO_ECDH
+
+        /* HMAC based TLS v1.2 ciphersuites from RFC5289 */
+
+        /* Cipher C023 */
+        {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256,
+        SSL_kEECDH,
+        SSL_aECDSA,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher C024 */
+        {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384,
+        SSL_kEECDH,
+        SSL_aECDSA,
+        SSL_AES256,
+        SSL_SHA384,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher C025 */
+        {
+        1,
+        TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256,
+        TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256,
+        SSL_kECDHe,
+        SSL_aECDH,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher C026 */
+        {
+        1,
+        TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384,
+        TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384,
+        SSL_kECDHe,
+        SSL_aECDH,
+        SSL_AES256,
+        SSL_SHA384,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher C027 */
+        {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256,
+        TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256,
+        SSL_kEECDH,
+        SSL_aRSA,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher C028 */
+        {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384,
+        TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384,
+        SSL_kEECDH,
+        SSL_aRSA,
+        SSL_AES256,
+        SSL_SHA384,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher C029 */
+        {
+        1,
+        TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256,
+        TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256,
+        SSL_kECDHe,
+        SSL_aECDH,
+        SSL_AES128,
+        SSL_SHA256,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher C02A */
+        {
+        1,
+        TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384,
+        TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384,
+        SSL_kECDHe,
+        SSL_aECDH,
+        SSL_AES256,
+        SSL_SHA384,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* GCM based TLS v1.2 ciphersuites from RFC5289 */
+
+        /* Cipher C02B */
+        {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+        SSL_kEECDH,
+        SSL_aECDSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher C02C */
+        {
+        1,
+        TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
+        SSL_kEECDH,
+        SSL_aECDSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher C02D */
+        {
+        1,
+        TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256,
+        SSL_kECDHe,
+        SSL_aECDH,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher C02E */
+        {
+        1,
+        TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384,
+        SSL_kECDHe,
+        SSL_aECDH,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher C02F */
+        {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+        SSL_kEECDH,
+        SSL_aRSA,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher C030 */
+        {
+        1,
+        TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+        SSL_kEECDH,
+        SSL_aRSA,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+        /* Cipher C031 */
+        {
+        1,
+        TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256,
+        TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256,
+        SSL_kECDHe,
+        SSL_aECDH,
+        SSL_AES128GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA256|TLS1_PRF_SHA256,
+        128,
+        128,
+        },
+
+        /* Cipher C032 */
+        {
+        1,
+        TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384,
+        TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384,
+        SSL_kECDHe,
+        SSL_aECDH,
+        SSL_AES256GCM,
+        SSL_AEAD,
+        SSL_TLSV1_2,
+        SSL_NOT_EXP|SSL_HIGH|SSL_FIPS,
+        SSL_HANDSHAKE_MAC_SHA384|TLS1_PRF_SHA384,
+        256,
+        256,
+        },
+
+#endif /* OPENSSL_NO_ECDH */
+
+
 #ifdef TEMP_GOST_TLS
 /* Cipher FF00 */
         {
@@ -2087,6 +2904,9 @@ SSL3_ENC_METHOD SSLv3_enc_data={
         SSL3_MD_CLIENT_FINISHED_CONST,4,
         SSL3_MD_SERVER_FINISHED_CONST,4,
         ssl3_alert_code,
+        (int (*)(SSL *, unsigned char *, size_t, const char *,
+                 size_t, const unsigned char *, size_t,
+                 int use_context))ssl_undefined_function,
         };
 
 long ssl3_default_timeout(void)
@@ -2128,6 +2948,9 @@ int ssl3_new(SSL *s)
 
         s->s3=s3;
 
+#ifndef OPENSSL_NO_SRP
+        SSL_SRP_CTX_init(s);
+#endif
         s->method->ssl_clear(s);
         return(1);
 err:
@@ -2168,6 +2991,9 @@ void ssl3_free(SSL *s)
                 BIO_free(s->s3->handshake_buffer);
         }
         if (s->s3->handshake_dgst) ssl3_free_digest_list(s);
+#ifndef OPENSSL_NO_SRP
+        SSL_SRP_CTX_free(s);
+#endif
         OPENSSL_cleanse(s->s3,sizeof *s->s3);
         OPENSSL_free(s->s3);
         s->s3=NULL;
@@ -2239,8 +3065,24 @@ void ssl3_clear(SSL *s)
         s->s3->num_renegotiations=0;
         s->s3->in_read_app_data=0;
         s->version=SSL3_VERSION;
+
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+        if (s->next_proto_negotiated)
+                {
+                OPENSSL_free(s->next_proto_negotiated);
+                s->next_proto_negotiated = NULL;
+                s->next_proto_negotiated_len = 0;
+                }
+#endif
         }
 
+#ifndef OPENSSL_NO_SRP
+static char * MS_CALLBACK srp_password_from_info_cb(SSL *s, void *arg)
+        {
+        return BUF_strdup(s->srp_ctx.info) ;
+        }
+#endif
+
 long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
         {
         int ret=0;
@@ -2486,6 +3328,27 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
                 ret = 1;
                 break;
 
+#ifndef OPENSSL_NO_HEARTBEATS
+        case SSL_CTRL_TLS_EXT_SEND_HEARTBEAT:
+                if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
+                        ret = dtls1_heartbeat(s);
+                else
+                        ret = tls1_heartbeat(s);
+                break;
+
+        case SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING:
+                ret = s->tlsext_hb_pending;
+                break;
+
+        case SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS:
+                if (larg)
+                        s->tlsext_heartbeat |= SSL_TLSEXT_HB_DONT_RECV_REQUESTS;
+                else
+                        s->tlsext_heartbeat &= ~SSL_TLSEXT_HB_DONT_RECV_REQUESTS;
+                ret = 1;
+                break;
+#endif
+
 #endif /* !OPENSSL_NO_TLSEXT */
         default:
                 break;
@@ -2718,6 +3581,38 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                 return 1;
                 break;
 
+#ifndef OPENSSL_NO_SRP
+        case SSL_CTRL_SET_TLS_EXT_SRP_USERNAME:
+                ctx->srp_ctx.srp_Mask|=SSL_kSRP;
+                if (ctx->srp_ctx.login != NULL)
+                        OPENSSL_free(ctx->srp_ctx.login);
+                ctx->srp_ctx.login = NULL;
+                if (parg == NULL)
+                        break;
+                if (strlen((const char *)parg) > 255 || strlen((const char *)parg) < 1)
+                        {
+                        SSLerr(SSL_F_SSL3_CTX_CTRL, SSL_R_INVALID_SRP_USERNAME);
+                        return 0;
+                        } 
+                if ((ctx->srp_ctx.login = BUF_strdup((char *)parg)) == NULL)
+                        {
+                        SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_INTERNAL_ERROR);
+                        return 0;
+                        }
+                break;
+        case SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD:
+                ctx->srp_ctx.SRP_give_srp_client_pwd_callback=srp_password_from_info_cb;
+                ctx->srp_ctx.info=parg;
+                break;
+        case SSL_CTRL_SET_SRP_ARG:
+                ctx->srp_ctx.srp_Mask|=SSL_kSRP;
+                ctx->srp_ctx.SRP_cb_arg=parg;
+                break;
+
+        case SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH:
+                ctx->srp_ctx.strength=larg;
+                break;
+#endif
 #endif /* !OPENSSL_NO_TLSEXT */
 
         /* A Thawte special :-) */
@@ -2730,6 +3625,18 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                 sk_X509_push(ctx->extra_certs,(X509 *)parg);
                 break;
 
+        case SSL_CTRL_GET_EXTRA_CHAIN_CERTS:
+                *(STACK_OF(X509) **)parg =  ctx->extra_certs;
+                break;
+
+        case SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS:
+                if (ctx->extra_certs)
+                        {
+                        sk_X509_pop_free(ctx->extra_certs, X509_free);
+                        ctx->extra_certs = NULL;
+                        }
+                break;
+
         default:
                 return(0);
                 }
@@ -2787,6 +3694,20 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
                                                 HMAC_CTX *, int))fp;
                 break;
 
+#ifndef OPENSSL_NO_SRP
+        case SSL_CTRL_SET_SRP_VERIFY_PARAM_CB:
+                ctx->srp_ctx.srp_Mask|=SSL_kSRP;
+                ctx->srp_ctx.SRP_verify_param_callback=(int (*)(SSL *,void *))fp;
+                break;
+        case SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB:
+                ctx->srp_ctx.srp_Mask|=SSL_kSRP;
+                ctx->srp_ctx.TLS_ext_srp_username_callback=(int (*)(SSL *,int *,void *))fp;
+                break;
+        case SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB:
+                ctx->srp_ctx.srp_Mask|=SSL_kSRP;
+                ctx->srp_ctx.SRP_give_srp_client_pwd_callback=(char *(*)(SSL *,void *))fp;
+                break;
+#endif
 #endif
         default:
                 return(0);
@@ -2805,6 +3726,9 @@ const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p)
         id=0x03000000L|((unsigned long)p[0]<<8L)|(unsigned long)p[1];
         c.id=id;
         cp = OBJ_bsearch_ssl_cipher_id(&c, ssl3_ciphers, SSL3_NUM_CIPHERS);
+#ifdef DEBUG_PRINT_UNKNOWN_CIPHERSUITES
+if (cp == NULL) fprintf(stderr, "Unknown cipher ID %x\n", (p[0] << 8) | p[1]);
+#endif
         if (cp == NULL || cp->valid == 0)
                 return NULL;
         else
@@ -2882,11 +3806,20 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                 {
                 c=sk_SSL_CIPHER_value(prio,i);
 
+                /* Skip TLS v1.2 only ciphersuites if lower than v1.2 */
+                if ((c->algorithm_ssl & SSL_TLSV1_2) && 
+                        (TLS1_get_version(s) < TLS1_2_VERSION))
+                        continue;
+
                 ssl_set_cert_masks(cert,c);
                 mask_k = cert->mask_k;
                 mask_a = cert->mask_a;
                 emask_k = cert->export_mask_k;
                 emask_a = cert->export_mask_a;
+#ifndef OPENSSL_NO_SRP
+                mask_k=cert->mask_k | s->srp_ctx.srp_Mask;
+                emask_k=cert->export_mask_k | s->srp_ctx.srp_Mask;
+#endif
                         
 #ifdef KSSL_DEBUG
 /*              printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);*/
@@ -3335,4 +4268,15 @@ need to go to SSL_ST_ACCEPT.
                 }
         return(ret);
         }
-
+/* If we are using TLS v1.2 or later and default SHA1+MD5 algorithms switch
+ * to new SHA256 PRF and handshake macs
+ */
+long ssl_get_algorithm2(SSL *s)
+        {
+        long alg2 = s->s3->tmp.new_cipher->algorithm2;
+        if (TLS1_get_version(s) >= TLS1_2_VERSION &&
+            alg2 == (SSL_HANDSHAKE_MAC_DEFAULT|TLS1_PRF))
+                return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256;
+        return alg2;
+        }
+                
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c
index f9b3629cf7..adf8c387cc 100644
--- a/src/lib/libssl/src/ssl/s3_pkt.c
+++ b/src/lib/libssl/src/ssl/s3_pkt.c
@@ -115,6 +115,7 @@
 #include "ssl_locl.h"
 #include <openssl/evp.h>
 #include <openssl/buffer.h>
+#include <openssl/rand.h>
 
 static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
                          unsigned int len, int create_empty_fragment);
@@ -630,6 +631,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
         unsigned char *p,*plen;
         int i,mac_size,clear=0;
         int prefix_len=0;
+        int eivlen;
         long align=0;
         SSL3_RECORD *wr;
         SSL3_BUFFER *wb=&(s->s3->wbuf);
@@ -662,10 +664,14 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
         if (    (sess == NULL) ||
                 (s->enc_write_ctx == NULL) ||
                 (EVP_MD_CTX_md(s->write_hash) == NULL))
+                {
+#if 1
+                clear=s->enc_write_ctx?0:1;     /* must be AEAD cipher */
+#else
                 clear=1;
-
-        if (clear)
+#endif
                 mac_size=0;
+                }
         else
                 {
                 mac_size=EVP_MD_CTX_size(s->write_hash);
@@ -734,14 +740,39 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
         wr->type=type;
 
         *(p++)=(s->version>>8);
-        *(p++)=s->version&0xff;
+        /* Some servers hang if iniatial client hello is larger than 256
+         * bytes and record version number > TLS 1.0
+         */
+        if (s->state == SSL3_ST_CW_CLNT_HELLO_B
+                                && TLS1_get_version(s) > TLS1_VERSION)
+                *(p++) = 0x1;
+        else
+                *(p++)=s->version&0xff;
 
         /* field where we are to write out packet length */
         plen=p; 
         p+=2;
+        /* Explicit IV length, block ciphers and TLS version 1.1 or later */
+        if (s->enc_write_ctx && s->version >= TLS1_1_VERSION)
+                {
+                int mode = EVP_CIPHER_CTX_mode(s->enc_write_ctx);
+                if (mode == EVP_CIPH_CBC_MODE)
+                        {
+                        eivlen = EVP_CIPHER_CTX_iv_length(s->enc_write_ctx);
+                        if (eivlen <= 1)
+                                eivlen = 0;
+                        }
+                /* Need explicit part of IV for GCM mode */
+                else if (mode == EVP_CIPH_GCM_MODE)
+                        eivlen = EVP_GCM_TLS_EXPLICIT_IV_LEN;
+                else
+                        eivlen = 0;
+                }
+        else 
+                eivlen = 0;
 
         /* lets setup the record stuff. */
-        wr->data=p;
+        wr->data=p + eivlen;
         wr->length=(int)len;
         wr->input=(unsigned char *)buf;
 
@@ -769,11 +800,19 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
 
         if (mac_size != 0)
                 {
-                if (s->method->ssl3_enc->mac(s,&(p[wr->length]),1) < 0)
+                if (s->method->ssl3_enc->mac(s,&(p[wr->length + eivlen]),1) < 0)
                         goto err;
                 wr->length+=mac_size;
-                wr->input=p;
-                wr->data=p;
+                }
+
+        wr->input=p;
+        wr->data=p;
+
+        if (eivlen)
+                {
+        /*      if (RAND_pseudo_bytes(p, eivlen) <= 0)
+                        goto err; */
+                wr->length += eivlen;
                 }
 
         /* ssl3_enc can only have an error on read */
@@ -1042,6 +1081,19 @@ start:
                         dest = s->s3->alert_fragment;
                         dest_len = &s->s3->alert_fragment_len;
                         }
+#ifndef OPENSSL_NO_HEARTBEATS
+                else if (rr->type == TLS1_RT_HEARTBEAT)
+                        {
+                        tls1_process_heartbeat(s);
+
+                        /* Exit and notify application to read again */
+                        rr->length = 0;
+                        s->rwstate=SSL_READING;
+                        BIO_clear_retry_flags(SSL_get_rbio(s));
+                        BIO_set_retry_read(SSL_get_rbio(s));
+                        return(-1);
+                        }
+#endif
 
                 if (dest_maxlen > 0)
                         {
@@ -1185,6 +1237,10 @@ start:
                                 SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_NO_RENEGOTIATION);
                                 goto f_err;
                                 }
+#ifdef SSL_AD_MISSING_SRP_USERNAME
+                        if (alert_descr == SSL_AD_MISSING_SRP_USERNAME)
+                                return(0);
+#endif
                         }
                 else if (alert_level == 2) /* fatal */
                         {
@@ -1263,6 +1319,7 @@ start:
 #else
                         s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT;
 #endif
+                        s->renegotiate=1;
                         s->new_session=1;
                         }
                 i=s->handshake_func(s);
@@ -1296,8 +1353,10 @@ start:
                 {
         default:
 #ifndef OPENSSL_NO_TLS
-                /* TLS just ignores unknown message types */
-                if (s->version == TLS1_VERSION)
+                /* TLS up to v1.1 just ignores unknown message types:
+                 * TLS v1.2 give an unexpected message alert.
+                 */
+                if (s->version >= TLS1_VERSION && s->version <= TLS1_1_VERSION)
                         {
                         rr->length = 0;
                         goto start;
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index d734c359fb..118939fabb 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -179,6 +179,31 @@ static const SSL_METHOD *ssl3_get_server_method(int ver)
                 return(NULL);
         }
 
+#ifndef OPENSSL_NO_SRP
+static int ssl_check_srp_ext_ClientHello(SSL *s, int *al)
+        {
+        int ret = SSL_ERROR_NONE;
+
+        *al = SSL_AD_UNRECOGNIZED_NAME;
+
+        if ((s->s3->tmp.new_cipher->algorithm_mkey & SSL_kSRP) &&
+            (s->srp_ctx.TLS_ext_srp_username_callback != NULL))
+                {
+                if(s->srp_ctx.login == NULL)
+                        {
+                        /* There isn't any srp login extension !!! */
+                        ret = SSL3_AL_FATAL;
+                        *al = SSL_AD_UNKNOWN_PSK_IDENTITY;
+                        }
+                else
+                        {
+                        ret = SSL_srp_server_param_with_username(s,al);
+                        }
+                }
+        return ret;
+        }
+#endif
+
 IMPLEMENT_ssl3_meth_func(SSLv3_server_method,
                         ssl3_accept,
                         ssl_undefined_function,
@@ -211,6 +236,18 @@ int ssl3_accept(SSL *s)
                 return(-1);
                 }
 
+#ifndef OPENSSL_NO_HEARTBEATS
+        /* If we're awaiting a HeartbeatResponse, pretend we
+         * already got and don't await it anymore, because
+         * Heartbeats don't make sense during handshakes anyway.
+         */
+        if (s->tlsext_hb_pending)
+                {
+                s->tlsext_hb_pending = 0;
+                s->tlsext_hb_seq++;
+                }
+#endif
+
         for (;;)
                 {
                 state=s->state;
@@ -218,7 +255,7 @@ int ssl3_accept(SSL *s)
                 switch (s->state)
                         {
                 case SSL_ST_RENEGOTIATE:
-                        s->new_session=1;
+                        s->renegotiate=1;
                         /* s->state=SSL_ST_ACCEPT; */
 
                 case SSL_ST_BEFORE:
@@ -314,10 +351,34 @@ int ssl3_accept(SSL *s)
                 case SSL3_ST_SR_CLNT_HELLO_C:
 
                         s->shutdown=0;
-                        ret=ssl3_get_client_hello(s);
-                        if (ret <= 0) goto end;
-                        
-                        s->new_session = 2;
+                        if (s->rwstate != SSL_X509_LOOKUP)
+                        {
+                                ret=ssl3_get_client_hello(s);
+                                if (ret <= 0) goto end;
+                        }
+#ifndef OPENSSL_NO_SRP
+                        {
+                        int al;
+                        if ((ret = ssl_check_srp_ext_ClientHello(s,&al))  < 0)
+                                        {
+                                        /* callback indicates firther work to be done */
+                                        s->rwstate=SSL_X509_LOOKUP;
+                                        goto end;
+                                        }
+                        if (ret != SSL_ERROR_NONE)
+                                {
+                                ssl3_send_alert(s,SSL3_AL_FATAL,al);    
+                                /* This is not really an error but the only means to
+                                   for a client to detect whether srp is supported. */
+                                   if (al != TLS1_AD_UNKNOWN_PSK_IDENTITY)      
+                                        SSLerr(SSL_F_SSL3_ACCEPT,SSL_R_CLIENTHELLO_TLSEXT);                     
+                                ret = SSL_TLSEXT_ERR_ALERT_FATAL;                       
+                                ret= -1;
+                                goto end;       
+                                }
+                        }
+#endif          
+                        s->renegotiate = 2;
                         s->state=SSL3_ST_SW_SRVR_HELLO_A;
                         s->init_num=0;
                         break;
@@ -346,7 +407,7 @@ int ssl3_accept(SSL *s)
                 case SSL3_ST_SW_CERT_A:
                 case SSL3_ST_SW_CERT_B:
                         /* Check if it is anon DH or anon ECDH, */
-                        /* normal PSK or KRB5 */
+                        /* normal PSK or KRB5 or SRP */
                         if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
                                 && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)
                                 && !(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5))
@@ -411,6 +472,10 @@ int ssl3_accept(SSL *s)
 #ifndef OPENSSL_NO_PSK
                             || ((alg_k & SSL_kPSK) && s->ctx->psk_identity_hint)
 #endif
+#ifndef OPENSSL_NO_SRP
+                            /* SRP: send ServerKeyExchange */
+                            || (alg_k & SSL_kSRP)
+#endif
                             || (alg_k & (SSL_kDHr|SSL_kDHd|SSL_kEDH))
                             || (alg_k & SSL_kEECDH)
                             || ((alg_k & SSL_kRSA)
@@ -457,6 +522,9 @@ int ssl3_accept(SSL *s)
                                 skip=1;
                                 s->s3->tmp.cert_request=0;
                                 s->state=SSL3_ST_SW_SRVR_DONE_A;
+                                if (s->s3->handshake_buffer)
+                                        if (!ssl3_digest_cached_records(s))
+                                                return -1;
                                 }
                         else
                                 {
@@ -539,9 +607,34 @@ int ssl3_accept(SSL *s)
                                  * the client uses its key from the certificate
                                  * for key exchange.
                                  */
+#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
                                 s->state=SSL3_ST_SR_FINISHED_A;
+#else
+                                if (s->s3->next_proto_neg_seen)
+                                        s->state=SSL3_ST_SR_NEXT_PROTO_A;
+                                else
+                                        s->state=SSL3_ST_SR_FINISHED_A;
+#endif
                                 s->init_num = 0;
                                 }
+                        else if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                                {
+                                s->state=SSL3_ST_SR_CERT_VRFY_A;
+                                s->init_num=0;
+                                if (!s->session->peer)
+                                        break;
+                                /* For TLS v1.2 freeze the handshake buffer
+                                 * at this point and digest cached records.
+                                 */
+                                if (!s->s3->handshake_buffer)
+                                        {
+                                        SSLerr(SSL_F_SSL3_ACCEPT,ERR_R_INTERNAL_ERROR);
+                                        return -1;
+                                        }
+                                s->s3->flags |= TLS1_FLAGS_KEEP_HANDSHAKE;
+                                if (!ssl3_digest_cached_records(s))
+                                        return -1;
+                                }
                         else
                                 {
                                 int offset=0;
@@ -582,23 +675,37 @@ int ssl3_accept(SSL *s)
                         ret=ssl3_get_cert_verify(s);
                         if (ret <= 0) goto end;
 
+#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
                         s->state=SSL3_ST_SR_FINISHED_A;
+#else
+                        if (s->s3->next_proto_neg_seen)
+                                s->state=SSL3_ST_SR_NEXT_PROTO_A;
+                        else
+                                s->state=SSL3_ST_SR_FINISHED_A;
+#endif
                         s->init_num=0;
                         break;
 
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+                case SSL3_ST_SR_NEXT_PROTO_A:
+                case SSL3_ST_SR_NEXT_PROTO_B:
+                        ret=ssl3_get_next_proto(s);
+                        if (ret <= 0) goto end;
+                        s->init_num = 0;
+                        s->state=SSL3_ST_SR_FINISHED_A;
+                        break;
+#endif
+
                 case SSL3_ST_SR_FINISHED_A:
                 case SSL3_ST_SR_FINISHED_B:
                         ret=ssl3_get_finished(s,SSL3_ST_SR_FINISHED_A,
                                 SSL3_ST_SR_FINISHED_B);
                         if (ret <= 0) goto end;
-#ifndef OPENSSL_NO_TLSEXT
-                        if (s->tlsext_ticket_expected)
-                                s->state=SSL3_ST_SW_SESSION_TICKET_A;
-                        else if (s->hit)
-                                s->state=SSL_ST_OK;
-#else
                         if (s->hit)
                                 s->state=SSL_ST_OK;
+#ifndef OPENSSL_NO_TLSEXT
+                        else if (s->tlsext_ticket_expected)
+                                s->state=SSL3_ST_SW_SESSION_TICKET_A;
 #endif
                         else
                                 s->state=SSL3_ST_SW_CHANGE_A;
@@ -656,7 +763,16 @@ int ssl3_accept(SSL *s)
                         if (ret <= 0) goto end;
                         s->state=SSL3_ST_SW_FLUSH;
                         if (s->hit)
+                                {
+#if defined(OPENSSL_NO_TLSEXT) || defined(OPENSSL_NO_NEXTPROTONEG)
                                 s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A;
+#else
+                                if (s->s3->next_proto_neg_seen)
+                                        s->s3->tmp.next_state=SSL3_ST_SR_NEXT_PROTO_A;
+                                else
+                                        s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A;
+#endif
+                                }
                         else
                                 s->s3->tmp.next_state=SSL_ST_OK;
                         s->init_num=0;
@@ -674,11 +790,9 @@ int ssl3_accept(SSL *s)
 
                         s->init_num=0;
 
-                        if (s->new_session == 2) /* skipped if we just sent a HelloRequest */
+                        if (s->renegotiate == 2) /* skipped if we just sent a HelloRequest */
                                 {
-                                /* actually not necessarily a 'new' session unless
-                                 * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */
-                                
+                                s->renegotiate=0;
                                 s->new_session=0;
                                 
                                 ssl_update_cache(s,SSL_SESS_CACHE_SERVER);
@@ -756,14 +870,6 @@ int ssl3_check_client_hello(SSL *s)
         int ok;
         long n;
 
-        /* We only allow the client to restart the handshake once per
-         * negotiation. */
-        if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE)
-                {
-                SSLerr(SSL_F_SSL3_CHECK_CLIENT_HELLO, SSL_R_MULTIPLE_SGC_RESTARTS);
-                return -1;
-                }
-
         /* this function is called when we really expect a Certificate message,
          * so permit appropriate message length */
         n=s->method->ssl_get_message(s,
@@ -776,6 +882,13 @@ int ssl3_check_client_hello(SSL *s)
         s->s3->tmp.reuse_message = 1;
         if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)
                 {
+                /* We only allow the client to restart the handshake once per
+                 * negotiation. */
+                if (s->s3->flags & SSL3_FLAGS_SGC_RESTART_DONE)
+                        {
+                        SSLerr(SSL_F_SSL3_CHECK_CLIENT_HELLO, SSL_R_MULTIPLE_SGC_RESTARTS);
+                        return -1;
+                        }
                 /* 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.) */
 #ifndef OPENSSL_NO_DH
@@ -817,7 +930,8 @@ int ssl3_get_client_hello(SSL *s)
          * If we are SSLv3, we will respond with SSLv3, even if prompted with
          * TLSv1.
          */
-        if (s->state == SSL3_ST_SR_CLNT_HELLO_A)
+        if (s->state == SSL3_ST_SR_CLNT_HELLO_A
+                )
                 {
                 s->state=SSL3_ST_SR_CLNT_HELLO_B;
                 }
@@ -874,13 +988,16 @@ int ssl3_get_client_hello(SSL *s)
         j= *(p++);
 
         s->hit=0;
-        /* Versions before 0.9.7 always allow session reuse during renegotiation
-         * (i.e. when s->new_session is true), option
-         * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is new with 0.9.7.
-         * Maybe this optional behaviour should always have been the default,
-         * but we cannot safely change the default behaviour (or new applications
-         * might be written that become totally unsecure when compiled with
-         * an earlier library version)
+        /* Versions before 0.9.7 always allow clients to resume sessions in renegotiation.
+         * 0.9.7 and later allow this by default, but optionally ignore resumption requests
+         * with flag SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION (it's a new flag rather
+         * than a change to default behavior so that applications relying on this for security
+         * won't even compile against older library versions).
+         *
+         * 1.0.1 and later also have a function SSL_renegotiate_abbreviated() to request
+         * renegotiation but not a new session (s->new_session remains unset): for servers,
+         * this essentially just means that the SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
+         * setting will be ignored.
          */
         if ((s->new_session && (s->options & SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)))
                 {
@@ -1269,8 +1386,11 @@ int ssl3_get_client_hello(SSL *s)
                 s->s3->tmp.new_cipher=s->session->cipher;
                 }
 
-        if (!ssl3_digest_cached_records(s))
-                goto f_err;
+        if (TLS1_get_version(s) < TLS1_2_VERSION || !(s->verify_mode & SSL_VERIFY_PEER))
+                {
+                if (!ssl3_digest_cached_records(s))
+                        goto f_err;
+                }
         
         /* we now have the following setup. 
          * client_random
@@ -1325,20 +1445,20 @@ int ssl3_send_server_hello(SSL *s)
                 memcpy(p,s->s3->server_random,SSL3_RANDOM_SIZE);
                 p+=SSL3_RANDOM_SIZE;
 
-                /* now in theory we have 3 options to sending back the
-                 * session id.  If it is a re-use, we send back the
-                 * old session-id, if it is a new session, we send
-                 * back the new session-id or we send back a 0 length
-                 * session-id if we want it to be single use.
-                 * Currently I will not implement the '0' length session-id
-                 * 12-Jan-98 - I'll now support the '0' length stuff.
-                 *
-                 * We also have an additional case where stateless session
-                 * resumption is successful: we always send back the old
-                 * session id. In this case s->hit is non zero: this can
-                 * only happen if stateless session resumption is succesful
-                 * if session caching is disabled so existing functionality
-                 * is unaffected.
+                /* There are several cases for the session ID to send
+                 * back in the server hello:
+                 * - For session reuse from the session cache,
+                 *   we send back the old session ID.
+                 * - If stateless session reuse (using a session ticket)
+                 *   is successful, we send back the client's "session ID"
+                 *   (which doesn't actually identify the session).
+                 * - If it is a new session, we send back the new
+                 *   session ID.
+                 * - However, if we want the new session to be single-use,
+                 *   we send back a 0-length session ID.
+                 * s->hit is non-zero in either case of session reuse,
+                 * so the following won't overwrite an ID that we're supposed
+                 * to send back.
                  */
                 if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER)
                         && !s->hit)
@@ -1439,6 +1559,7 @@ int ssl3_send_server_key_exchange(SSL *s)
         BN_CTX *bn_ctx = NULL; 
 #endif
         EVP_PKEY *pkey;
+        const EVP_MD *md = NULL;
         unsigned char *p,*d;
         int al,i;
         unsigned long type;
@@ -1679,21 +1800,44 @@ int ssl3_send_server_key_exchange(SSL *s)
                                 }
                         else
 #endif /* !OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+                if (type & SSL_kSRP)
+                        {
+                        if ((s->srp_ctx.N == NULL) ||
+                                (s->srp_ctx.g == NULL) ||
+                                (s->srp_ctx.s == NULL) ||
+                                (s->srp_ctx.B == NULL))
+                                {
+                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_SRP_PARAM);
+                                goto err;
+                                }
+                        r[0]=s->srp_ctx.N;
+                        r[1]=s->srp_ctx.g;
+                        r[2]=s->srp_ctx.s;
+                        r[3]=s->srp_ctx.B;
+                        }
+                else 
+#endif
                         {
                         al=SSL_AD_HANDSHAKE_FAILURE;
                         SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
                         goto f_err;
                         }
-                for (i=0; r[i] != NULL; i++)
+                for (i=0; r[i] != NULL && i<4; i++)
                         {
                         nr[i]=BN_num_bytes(r[i]);
+#ifndef OPENSSL_NO_SRP
+                        if ((i == 2) && (type & SSL_kSRP))
+                                n+=1+nr[i];
+                        else
+#endif
                         n+=2+nr[i];
                         }
 
                 if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL)
                         && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK))
                         {
-                        if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher))
+                        if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher,&md))
                                 == NULL)
                                 {
                                 al=SSL_AD_DECODE_ERROR;
@@ -1715,8 +1859,16 @@ int ssl3_send_server_key_exchange(SSL *s)
                 d=(unsigned char *)s->init_buf->data;
                 p= &(d[4]);
 
-                for (i=0; r[i] != NULL; i++)
+                for (i=0; r[i] != NULL && i<4; i++)
                         {
+#ifndef OPENSSL_NO_SRP
+                        if ((i == 2) && (type & SSL_kSRP))
+                                {
+                                *p = nr[i];
+                                p++;
+                                }
+                        else
+#endif
                         s2n(nr[i],p);
                         BN_bn2bin(r[i],p);
                         p+=nr[i];
@@ -1764,12 +1916,15 @@ int ssl3_send_server_key_exchange(SSL *s)
                         /* n is the length of the params, they start at &(d[4])
                          * and p points to the space at the end. */
 #ifndef OPENSSL_NO_RSA
-                        if (pkey->type == EVP_PKEY_RSA)
+                        if (pkey->type == EVP_PKEY_RSA
+                                        && TLS1_get_version(s) < TLS1_2_VERSION)
                                 {
                                 q=md_buf;
                                 j=0;
                                 for (num=2; num > 0; num--)
                                         {
+                                        EVP_MD_CTX_set_flags(&md_ctx,
+                                                EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
                                         EVP_DigestInit_ex(&md_ctx,(num == 2)
                                                 ?s->ctx->md5:s->ctx->sha1, NULL);
                                         EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
@@ -1791,44 +1946,41 @@ int ssl3_send_server_key_exchange(SSL *s)
                                 }
                         else
 #endif
-#if !defined(OPENSSL_NO_DSA)
-                                if (pkey->type == EVP_PKEY_DSA)
+                        if (md)
                                 {
-                                /* lets do DSS */
-                                EVP_SignInit_ex(&md_ctx,EVP_dss1(), NULL);
-                                EVP_SignUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_SignUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
-                                EVP_SignUpdate(&md_ctx,&(d[4]),n);
-                                if (!EVP_SignFinal(&md_ctx,&(p[2]),
-                                        (unsigned int *)&i,pkey))
+                                /* For TLS1.2 and later send signature
+                                 * algorithm */
+                                if (TLS1_get_version(s) >= TLS1_2_VERSION)
                                         {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_DSA);
-                                        goto err;
+                                        if (!tls12_get_sigandhash(p, pkey, md))
+                                                {
+                                                /* Should never happen */
+                                                al=SSL_AD_INTERNAL_ERROR;
+                                                SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                                goto f_err;
+                                                }
+                                        p+=2;
                                         }
-                                s2n(i,p);
-                                n+=i+2;
-                                }
-                        else
+#ifdef SSL_DEBUG
+                                fprintf(stderr, "Using hash %s\n",
+                                                        EVP_MD_name(md));
 #endif
-#if !defined(OPENSSL_NO_ECDSA)
-                                if (pkey->type == EVP_PKEY_EC)
-                                {
-                                /* let's do ECDSA */
-                                EVP_SignInit_ex(&md_ctx,EVP_ecdsa(), NULL);
+                                EVP_SignInit_ex(&md_ctx, md, NULL);
                                 EVP_SignUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE);
                                 EVP_SignUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
                                 EVP_SignUpdate(&md_ctx,&(d[4]),n);
                                 if (!EVP_SignFinal(&md_ctx,&(p[2]),
                                         (unsigned int *)&i,pkey))
                                         {
-                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_ECDSA);
+                                        SSLerr(SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_EVP);
                                         goto err;
                                         }
                                 s2n(i,p);
                                 n+=i+2;
+                                if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                                        n+= 2;
                                 }
                         else
-#endif
                                 {
                                 /* Is this error check actually needed? */
                                 al=SSL_AD_HANDSHAKE_FAILURE;
@@ -1881,6 +2033,14 @@ int ssl3_send_certificate_request(SSL *s)
                 p+=n;
                 n++;
 
+                if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                        {
+                        nl = tls12_get_req_sig_algs(s, p + 2);
+                        s2n(nl, p);
+                        p += nl + 2;
+                        n += nl + 2;
+                        }
+
                 off=n;
                 p+=2;
                 n+=2;
@@ -2600,6 +2760,44 @@ int ssl3_get_client_key_exchange(SSL *s)
                         }
                 else
 #endif
+#ifndef OPENSSL_NO_SRP
+                if (alg_k & SSL_kSRP)
+                        {
+                        int param_len;
+
+                        n2s(p,i);
+                        param_len=i+2;
+                        if (param_len > n)
+                                {
+                                al=SSL_AD_DECODE_ERROR;
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_SRP_A_LENGTH);
+                                goto f_err;
+                                }
+                        if (!(s->srp_ctx.A=BN_bin2bn(p,i,NULL)))
+                                {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_BN_LIB);
+                                goto err;
+                                }
+                        if (s->session->srp_username != NULL)
+                                OPENSSL_free(s->session->srp_username);
+                        s->session->srp_username = BUF_strdup(s->srp_ctx.login);
+                        if (s->session->srp_username == NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
+                                        ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+
+                        if ((s->session->master_key_length = SRP_generate_server_master_secret(s,s->session->master_key))<0)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+
+                        p+=i;
+                        }
+                else
+#endif  /* OPENSSL_NO_SRP */
                 if (alg_k & SSL_kGOST) 
                         {
                         int ret = 0;
@@ -2683,7 +2881,7 @@ int ssl3_get_client_key_exchange(SSL *s)
         return(1);
 f_err:
         ssl3_send_alert(s,SSL3_AL_FATAL,al);
-#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_ECDH)
+#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_ECDH) || defined(OPENSSL_NO_SRP)
 err:
 #endif
 #ifndef OPENSSL_NO_ECDH
@@ -2704,12 +2902,15 @@ int ssl3_get_cert_verify(SSL *s)
         long n;
         int type=0,i,j;
         X509 *peer;
+        const EVP_MD *md = NULL;
+        EVP_MD_CTX mctx;
+        EVP_MD_CTX_init(&mctx);
 
         n=s->method->ssl_get_message(s,
                 SSL3_ST_SR_CERT_VRFY_A,
                 SSL3_ST_SR_CERT_VRFY_B,
                 -1,
-                514, /* 514? */
+                516, /* Enough for 4096 bit RSA key with TLS v1.2 */
                 &ok);
 
         if (!ok) return((int)n);
@@ -2729,7 +2930,7 @@ int ssl3_get_cert_verify(SSL *s)
         if (s->s3->tmp.message_type != SSL3_MT_CERTIFICATE_VERIFY)
                 {
                 s->s3->tmp.reuse_message=1;
-                if ((peer != NULL) && (type | EVP_PKT_SIGN))
+                if ((peer != NULL) && (type & EVP_PKT_SIGN))
                         {
                         al=SSL_AD_UNEXPECTED_MESSAGE;
                         SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_MISSING_VERIFY_MESSAGE);
@@ -2772,6 +2973,36 @@ int ssl3_get_cert_verify(SSL *s)
                 } 
         else 
                 {       
+                if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                        {
+                        int sigalg = tls12_get_sigid(pkey);
+                        /* Should never happen */
+                        if (sigalg == -1)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,ERR_R_INTERNAL_ERROR);
+                                al=SSL_AD_INTERNAL_ERROR;
+                                goto f_err;
+                                }
+                        /* Check key type is consistent with signature */
+                        if (sigalg != (int)p[1])
+                                {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_WRONG_SIGNATURE_TYPE);
+                                al=SSL_AD_DECODE_ERROR;
+                                goto f_err;
+                                }
+                        md = tls12_get_hash(p[0]);
+                        if (md == NULL)
+                                {
+                                SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_UNKNOWN_DIGEST);
+                                al=SSL_AD_DECODE_ERROR;
+                                goto f_err;
+                                }
+#ifdef SSL_DEBUG
+fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md));
+#endif
+                        p += 2;
+                        n -= 2;
+                        }
                 n2s(p,i);
                 n-=2;
                 if (i > n)
@@ -2789,6 +3020,37 @@ int ssl3_get_cert_verify(SSL *s)
                 goto f_err;
                 }
 
+        if (TLS1_get_version(s) >= TLS1_2_VERSION)
+                {
+                long hdatalen = 0;
+                void *hdata;
+                hdatalen = BIO_get_mem_data(s->s3->handshake_buffer, &hdata);
+                if (hdatalen <= 0)
+                        {
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_INTERNAL_ERROR);
+                        al=SSL_AD_INTERNAL_ERROR;
+                        goto f_err;
+                        }
+#ifdef SSL_DEBUG
+                fprintf(stderr, "Using TLS 1.2 with client verify alg %s\n",
+                                                        EVP_MD_name(md));
+#endif
+                if (!EVP_VerifyInit_ex(&mctx, md, NULL)
+                        || !EVP_VerifyUpdate(&mctx, hdata, hdatalen))
+                        {
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY, ERR_R_EVP_LIB);
+                        al=SSL_AD_INTERNAL_ERROR;
+                        goto f_err;
+                        }
+
+                if (EVP_VerifyFinal(&mctx, p , i, pkey) <= 0)
+                        {
+                        al=SSL_AD_DECRYPT_ERROR;
+                        SSLerr(SSL_F_SSL3_GET_CERT_VERIFY,SSL_R_BAD_SIGNATURE);
+                        goto f_err;
+                        }
+                }
+        else
 #ifndef OPENSSL_NO_RSA 
         if (pkey->type == EVP_PKEY_RSA)
                 {
@@ -2879,6 +3141,13 @@ f_err:
                 ssl3_send_alert(s,SSL3_AL_FATAL,al);
                 }
 end:
+        if (s->s3->handshake_buffer)
+                {
+                BIO_free(s->s3->handshake_buffer);
+                s->s3->handshake_buffer = NULL;
+                s->s3->flags &= ~TLS1_FLAGS_KEEP_HANDSHAKE;
+                }
+        EVP_MD_CTX_cleanup(&mctx);
         EVP_PKEY_free(pkey);
         return(ret);
         }
@@ -2991,6 +3260,12 @@ int ssl3_get_client_certificate(SSL *s)
                         al=SSL_AD_HANDSHAKE_FAILURE;
                         goto f_err;
                         }
+                /* No client certificate so digest cached records */
+                if (s->s3->handshake_buffer && !ssl3_digest_cached_records(s))
+                        {
+                        al=SSL_AD_INTERNAL_ERROR;
+                        goto f_err;
+                        }
                 }
         else
                 {
@@ -3067,13 +3342,17 @@ int ssl3_send_server_certificate(SSL *s)
         /* SSL3_ST_SW_CERT_B */
         return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
         }
+
 #ifndef OPENSSL_NO_TLSEXT
+/* send a new session ticket (not necessarily for a new session) */
 int ssl3_send_newsession_ticket(SSL *s)
         {
         if (s->state == SSL3_ST_SW_SESSION_TICKET_A)
                 {
                 unsigned char *p, *senc, *macstart;
-                int len, slen;
+                const unsigned char *const_p;
+                int len, slen_full, slen;
+                SSL_SESSION *sess;
                 unsigned int hlen;
                 EVP_CIPHER_CTX ctx;
                 HMAC_CTX hctx;
@@ -3082,12 +3361,38 @@ int ssl3_send_newsession_ticket(SSL *s)
                 unsigned char key_name[16];
 
                 /* get session encoding length */
-                slen = i2d_SSL_SESSION(s->session, NULL);
+                slen_full = i2d_SSL_SESSION(s->session, NULL);
                 /* Some length values are 16 bits, so forget it if session is
                  * too long
                  */
-                if (slen > 0xFF00)
+                if (slen_full > 0xFF00)
+                        return -1;
+                senc = OPENSSL_malloc(slen_full);
+                if (!senc)
+                        return -1;
+                p = senc;
+                i2d_SSL_SESSION(s->session, &p);
+
+                /* create a fresh copy (not shared with other threads) to clean up */
+                const_p = senc;
+                sess = d2i_SSL_SESSION(NULL, &const_p, slen_full);
+                if (sess == NULL)
+                        {
+                        OPENSSL_free(senc);
                         return -1;
+                        }
+                sess->session_id_length = 0; /* ID is irrelevant for the ticket */
+
+                slen = i2d_SSL_SESSION(sess, NULL);
+                if (slen > slen_full) /* shouldn't ever happen */
+                        {
+                        OPENSSL_free(senc);
+                        return -1;
+                        }
+                p = senc;
+                i2d_SSL_SESSION(sess, &p);
+                SSL_SESSION_free(sess);
+
                 /* Grow buffer if need be: the length calculation is as
                  * follows 1 (size of message name) + 3 (message length
                  * bytes) + 4 (ticket lifetime hint) + 2 (ticket length) +
@@ -3099,11 +3404,6 @@ int ssl3_send_newsession_ticket(SSL *s)
                         26 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH +
                         EVP_MAX_MD_SIZE + slen))
                         return -1;
-                senc = OPENSSL_malloc(slen);
-                if (!senc)
-                        return -1;
-                p = senc;
-                i2d_SSL_SESSION(s->session, &p);
 
                 p=(unsigned char *)s->init_buf->data;
                 /* do the header */
@@ -3134,7 +3434,13 @@ int ssl3_send_newsession_ticket(SSL *s)
                                         tlsext_tick_md(), NULL);
                         memcpy(key_name, tctx->tlsext_tick_key_name, 16);
                         }
-                l2n(s->session->tlsext_tick_lifetime_hint, p);
+
+                /* Ticket lifetime hint (advisory only):
+                 * We leave this unspecified for resumed session (for simplicity),
+                 * and guess that tickets for new sessions will live as long
+                 * as their sessions. */
+                l2n(s->hit ? 0 : s->session->timeout, p);
+
                 /* Skip ticket length for now */
                 p += 2;
                 /* Output key name */
@@ -3209,4 +3515,72 @@ int ssl3_send_cert_status(SSL *s)
         /* SSL3_ST_SW_CERT_STATUS_B */
         return(ssl3_do_write(s,SSL3_RT_HANDSHAKE));
         }
+
+# ifndef OPENSSL_NO_NEXTPROTONEG
+/* ssl3_get_next_proto reads a Next Protocol Negotiation handshake message. It
+ * sets the next_proto member in s if found */
+int ssl3_get_next_proto(SSL *s)
+        {
+        int ok;
+        int proto_len, padding_len;
+        long n;
+        const unsigned char *p;
+
+        /* Clients cannot send a NextProtocol message if we didn't see the
+         * extension in their ClientHello */
+        if (!s->s3->next_proto_neg_seen)
+                {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION);
+                return -1;
+                }
+
+        n=s->method->ssl_get_message(s,
+                SSL3_ST_SR_NEXT_PROTO_A,
+                SSL3_ST_SR_NEXT_PROTO_B,
+                SSL3_MT_NEXT_PROTO,
+                514,  /* See the payload format below */
+                &ok);
+
+        if (!ok)
+                return((int)n);
+
+        /* s->state doesn't reflect whether ChangeCipherSpec has been received
+         * in this handshake, but s->s3->change_cipher_spec does (will be reset
+         * by ssl3_get_finished). */
+        if (!s->s3->change_cipher_spec)
+                {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS);
+                return -1;
+                }
+
+        if (n < 2)
+                return 0;  /* The body must be > 1 bytes long */
+
+        p=(unsigned char *)s->init_msg;
+
+        /* The payload looks like:
+         *   uint8 proto_len;
+         *   uint8 proto[proto_len];
+         *   uint8 padding_len;
+         *   uint8 padding[padding_len];
+         */
+        proto_len = p[0];
+        if (proto_len + 2 > s->init_num)
+                return 0;
+        padding_len = p[proto_len + 1];
+        if (proto_len + padding_len + 2 != s->init_num)
+                return 0;
+
+        s->next_proto_negotiated = OPENSSL_malloc(proto_len);
+        if (!s->next_proto_negotiated)
+                {
+                SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        memcpy(s->next_proto_negotiated, p + 1, proto_len);
+        s->next_proto_negotiated_len = proto_len;
+
+        return 1;
+        }
+# endif
 #endif
diff --git a/src/lib/libssl/src/ssl/ssl-lib.com b/src/lib/libssl/src/ssl/ssl-lib.com
index 180f3a2d88..a77f7707f2 100644
--- a/src/lib/libssl/src/ssl/ssl-lib.com
+++ b/src/lib/libssl/src/ssl/ssl-lib.com
@@ -218,11 +218,11 @@ $ LIB_SSL = "s2_meth,s2_srvr,s2_clnt,s2_lib,s2_enc,s2_pkt,"+ -
             "s23_meth,s23_srvr,s23_clnt,s23_lib,s23_pkt,"+ -
             "t1_meth,t1_srvr,t1_clnt,t1_lib,t1_enc,"+ -
             "d1_meth,d1_srvr,d1_clnt,d1_lib,d1_pkt,"+ -
-            "d1_both,d1_enc,"+ -
+            "d1_both,d1_enc,d1_srtp,"+ -
             "ssl_lib,ssl_err2,ssl_cert,ssl_sess,"+ -
             "ssl_ciph,ssl_stat,ssl_rsa,"+ -
             "ssl_asn1,ssl_txt,ssl_algs,"+ -
-            "bio_ssl,ssl_err,kssl,t1_reneg"
+            "bio_ssl,ssl_err,kssl,tls_srp,t1_reneg"
 $!
 $ COMPILEWITH_CC5 = ""
 $!
diff --git a/src/lib/libssl/src/ssl/ssl.h b/src/lib/libssl/src/ssl/ssl.h
index 8f922eea72..8b0c2a2dac 100644
--- a/src/lib/libssl/src/ssl/ssl.h
+++ b/src/lib/libssl/src/ssl/ssl.h
@@ -252,6 +252,7 @@ extern "C" {
 #define SSL_TXT_kEECDH          "kEECDH"
 #define SSL_TXT_kPSK            "kPSK"
 #define SSL_TXT_kGOST           "kGOST"
+#define SSL_TXT_kSRP            "kSRP"
 
 #define SSL_TXT_aRSA            "aRSA"
 #define SSL_TXT_aDSS            "aDSS"
@@ -275,6 +276,7 @@ extern "C" {
 #define SSL_TXT_ECDSA           "ECDSA"
 #define SSL_TXT_KRB5            "KRB5"
 #define SSL_TXT_PSK             "PSK"
+#define SSL_TXT_SRP             "SRP"
 
 #define SSL_TXT_DES             "DES"
 #define SSL_TXT_3DES            "3DES"
@@ -285,6 +287,7 @@ extern "C" {
 #define SSL_TXT_AES128          "AES128"
 #define SSL_TXT_AES256          "AES256"
 #define SSL_TXT_AES             "AES"
+#define SSL_TXT_AES_GCM         "AESGCM"
 #define SSL_TXT_CAMELLIA128     "CAMELLIA128"
 #define SSL_TXT_CAMELLIA256     "CAMELLIA256"
 #define SSL_TXT_CAMELLIA        "CAMELLIA"
@@ -294,10 +297,14 @@ extern "C" {
 #define SSL_TXT_SHA             "SHA" /* same as "SHA1" */
 #define SSL_TXT_GOST94          "GOST94" 
 #define SSL_TXT_GOST89MAC               "GOST89MAC" 
+#define SSL_TXT_SHA256          "SHA256"
+#define SSL_TXT_SHA384          "SHA384"
 
 #define SSL_TXT_SSLV2           "SSLv2"
 #define SSL_TXT_SSLV3           "SSLv3"
 #define SSL_TXT_TLSV1           "TLSv1"
+#define SSL_TXT_TLSV1_1         "TLSv1.1"
+#define SSL_TXT_TLSV1_2         "TLSv1.2"
 
 #define SSL_TXT_EXP             "EXP"
 #define SSL_TXT_EXPORT          "EXPORT"
@@ -356,9 +363,29 @@ extern "C" {
  * in SSL_CTX. */
 typedef struct ssl_st *ssl_crock_st;
 typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
+typedef struct ssl_method_st SSL_METHOD;
+typedef struct ssl_cipher_st SSL_CIPHER;
+typedef struct ssl_session_st SSL_SESSION;
+
+DECLARE_STACK_OF(SSL_CIPHER)
+
+/* SRTP protection profiles for use with the use_srtp extension (RFC 5764)*/
+typedef struct srtp_protection_profile_st
+       {
+       const char *name;
+       unsigned long id;
+       } SRTP_PROTECTION_PROFILE;
+
+DECLARE_STACK_OF(SRTP_PROTECTION_PROFILE)
+
+typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data, int len, void *arg);
+typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg);
+
+
+#ifndef OPENSSL_NO_SSL_INTERN
 
 /* used to hold info on the particular ciphers used */
-typedef struct ssl_cipher_st
+struct ssl_cipher_st
         {
         int valid;
         const char *name;               /* text name */
@@ -375,15 +402,11 @@ typedef struct ssl_cipher_st
         unsigned long algorithm2;       /* Extra flags */
         int strength_bits;              /* Number of bits really used */
         int alg_bits;                   /* Number of bits for algorithm */
-        } SSL_CIPHER;
-
-DECLARE_STACK_OF(SSL_CIPHER)
+        };
 
-typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data, int len, void *arg);
-typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, STACK_OF(SSL_CIPHER) *peer_ciphers, SSL_CIPHER **cipher, void *arg);
 
 /* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
-typedef struct ssl_method_st
+struct ssl_method_st
         {
         int version;
         int (*ssl_new)(SSL *s);
@@ -416,7 +439,7 @@ typedef struct ssl_method_st
         int (*ssl_version)(void);
         long (*ssl_callback_ctrl)(SSL *s, int cb_id, void (*fp)(void));
         long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void));
-        } SSL_METHOD;
+        };
 
 /* Lets make this into an ASN.1 type structure as follows
  * SSL_SESSION_ID ::= SEQUENCE {
@@ -433,14 +456,17 @@ typedef struct ssl_method_st
  *      Session_ID_context [ 4 ] EXPLICIT OCTET STRING,   -- the Session ID context
  *      Verify_result [ 5 ] EXPLICIT INTEGER,   -- X509_V_... code for `Peer'
  *      HostName [ 6 ] EXPLICIT OCTET STRING,   -- optional HostName from servername TLS extension 
- *      ECPointFormatList [ 7 ] OCTET STRING,     -- optional EC point format list from TLS extension
- *      PSK_identity_hint [ 8 ] EXPLICIT OCTET STRING, -- optional PSK identity hint
- *      PSK_identity [ 9 ] EXPLICIT OCTET STRING -- optional PSK identity
+ *      PSK_identity_hint [ 7 ] EXPLICIT OCTET STRING, -- optional PSK identity hint
+ *      PSK_identity [ 8 ] EXPLICIT OCTET STRING,  -- optional PSK identity
+ *      Ticket_lifetime_hint [9] EXPLICIT INTEGER, -- server's lifetime hint for session ticket
+ *      Ticket [10]             EXPLICIT OCTET STRING, -- session ticket (clients only)
+ *      Compression_meth [11]   EXPLICIT OCTET STRING, -- optional compression method
+ *      SRP_username [ 12 ] EXPLICIT OCTET STRING -- optional SRP username
  *      }
  * Look in ssl/ssl_asn1.c for more details
  * I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
  */
-typedef struct ssl_session_st
+struct ssl_session_st
         {
         int ssl_version;        /* what ssl version session info is
                                  * being kept in here? */
@@ -512,8 +538,12 @@ typedef struct ssl_session_st
         size_t  tlsext_ticklen;         /* Session ticket length */     
         long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */
 #endif
-        } SSL_SESSION;
+#ifndef OPENSSL_NO_SRP
+        char *srp_username;
+#endif
+        };
 
+#endif
 
 #define SSL_OP_MICROSOFT_SESS_ID_BUG                    0x00000001L
 #define SSL_OP_NETSCAPE_CHALLENGE_BUG                   0x00000002L
@@ -536,7 +566,7 @@ typedef struct ssl_session_st
 
 /* SSL_OP_ALL: various bug workarounds that should be rather harmless.
  *             This used to be 0x000FFFFFL before 0.9.7. */
-#define SSL_OP_ALL                                      0x80000FFFL
+#define SSL_OP_ALL                                      0x80000BFFL
 
 /* DTLS options */
 #define SSL_OP_NO_QUERY_MTU                 0x00001000L
@@ -572,11 +602,17 @@ typedef struct ssl_session_st
 #define SSL_OP_NO_SSLv2                                 0x01000000L
 #define SSL_OP_NO_SSLv3                                 0x02000000L
 #define SSL_OP_NO_TLSv1                                 0x04000000L
+#define SSL_OP_NO_TLSv1_2                               0x08000000L
+#define SSL_OP_NO_TLSv1_1                               0x10000000L
 
+/* These next two were never actually used for anything since SSLeay
+ * zap so we have some more flags.
+ */
 /* The next flag deliberately changes the ciphertest, this is a check
  * for the PKCS#1 attack */
-#define SSL_OP_PKCS1_CHECK_1                            0x08000000L
-#define SSL_OP_PKCS1_CHECK_2                            0x10000000L
+#define SSL_OP_PKCS1_CHECK_1                            0x0
+#define SSL_OP_PKCS1_CHECK_2                            0x0
+
 #define SSL_OP_NETSCAPE_CA_DN_BUG                       0x20000000L
 #define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG          0x40000000L
 /* Make server add server-hello extension from early version of
@@ -637,12 +673,53 @@ typedef struct ssl_session_st
 #define SSL_get_secure_renegotiation_support(ssl) \
         SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
 
+#ifndef OPENSSL_NO_HEARTBEATS
+#define SSL_heartbeat(ssl) \
+        SSL_ctrl((ssl),SSL_CTRL_TLS_EXT_SEND_HEARTBEAT,0,NULL)
+#endif
+
 void SSL_CTX_set_msg_callback(SSL_CTX *ctx, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg));
 void SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg));
 #define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
 #define SSL_set_msg_callback_arg(ssl, arg) SSL_ctrl((ssl), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
 
+#ifndef OPENSSL_NO_SRP
 
+#ifndef OPENSSL_NO_SSL_INTERN
+
+typedef struct srp_ctx_st
+        {
+        /* param for all the callbacks */
+        void *SRP_cb_arg;
+        /* set client Hello login callback */
+        int (*TLS_ext_srp_username_callback)(SSL *, int *, void *);
+        /* set SRP N/g param callback for verification */
+        int (*SRP_verify_param_callback)(SSL *, void *);
+        /* set SRP client passwd callback */
+        char *(*SRP_give_srp_client_pwd_callback)(SSL *, void *);
+
+        char *login;
+        BIGNUM *N,*g,*s,*B,*A;
+        BIGNUM *a,*b,*v;
+        char *info;
+        int strength;
+
+        unsigned long srp_Mask;
+        } SRP_CTX;
+
+#endif
+
+/* see tls_srp.c */
+int SSL_SRP_CTX_init(SSL *s);
+int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
+int SSL_SRP_CTX_free(SSL *ctx);
+int SSL_CTX_SRP_CTX_free(SSL_CTX *ctx);
+int SSL_srp_server_param_with_username(SSL *s, int *ad);
+int SRP_generate_server_master_secret(SSL *s,unsigned char *master_key);
+int SRP_Calc_A_param(SSL *s);
+int SRP_generate_client_master_secret(SSL *s,unsigned char *master_key);
+
+#endif
 
 #if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)
 #define SSL_MAX_CERT_LIST_DEFAULT 1024*30 /* 30k max cert list :-) */
@@ -668,7 +745,11 @@ void SSL_set_msg_callback(SSL *ssl, void (*cb)(int write_p, int version, int con
 typedef int (*GEN_SESSION_CB)(const SSL *ssl, unsigned char *id,
                                 unsigned int *id_len);
 
-typedef struct ssl_comp_st
+typedef struct ssl_comp_st SSL_COMP;
+
+#ifndef OPENSSL_NO_SSL_INTERN
+
+struct ssl_comp_st
         {
         int id;
         const char *name;
@@ -677,7 +758,7 @@ typedef struct ssl_comp_st
 #else
         char *method;
 #endif
-        } SSL_COMP;
+        };
 
 DECLARE_STACK_OF(SSL_COMP)
 DECLARE_LHASH_OF(SSL_SESSION);
@@ -846,7 +927,6 @@ struct ssl_ctx_st
         /* Callback for status request */
         int (*tlsext_status_cb)(SSL *ssl, void *arg);
         void *tlsext_status_arg;
-
         /* draft-rescorla-tls-opaque-prf-input-00.txt information */
         int (*tlsext_opaque_prf_input_callback)(SSL *, void *peerinput, size_t len, void *arg);
         void *tlsext_opaque_prf_input_callback_arg;
@@ -867,8 +947,36 @@ struct ssl_ctx_st
         struct ssl3_buf_freelist_st *wbuf_freelist;
         struct ssl3_buf_freelist_st *rbuf_freelist;
 #endif
+#ifndef OPENSSL_NO_SRP
+        SRP_CTX srp_ctx; /* ctx for SRP authentication */
+#endif
+
+#ifndef OPENSSL_NO_TLSEXT
+# ifndef OPENSSL_NO_NEXTPROTONEG
+        /* Next protocol negotiation information */
+        /* (for experimental NPN extension). */
+
+        /* For a server, this contains a callback function by which the set of
+         * advertised protocols can be provided. */
+        int (*next_protos_advertised_cb)(SSL *s, const unsigned char **buf,
+                                         unsigned int *len, void *arg);
+        void *next_protos_advertised_cb_arg;
+        /* For a client, this contains a callback function that selects the
+         * next protocol from the list provided by the server. */
+        int (*next_proto_select_cb)(SSL *s, unsigned char **out,
+                                    unsigned char *outlen,
+                                    const unsigned char *in,
+                                    unsigned int inlen,
+                                    void *arg);
+        void *next_proto_select_cb_arg;
+# endif
+        /* SRTP profiles we are willing to do from RFC 5764 */
+        STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;  
+#endif
         };
 
+#endif
+
 #define SSL_SESS_CACHE_OFF                      0x0000
 #define SSL_SESS_CACHE_CLIENT                   0x0001
 #define SSL_SESS_CACHE_SERVER                   0x0002
@@ -921,6 +1029,32 @@ int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
 #endif
 void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len));
 void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len));
+#ifndef OPENSSL_NO_NEXTPROTONEG
+void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s,
+                                           int (*cb) (SSL *ssl,
+                                                      const unsigned char **out,
+                                                      unsigned int *outlen,
+                                                      void *arg),
+                                           void *arg);
+void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s,
+                                      int (*cb) (SSL *ssl,
+                                                 unsigned char **out,
+                                                 unsigned char *outlen,
+                                                 const unsigned char *in,
+                                                 unsigned int inlen,
+                                                 void *arg),
+                                      void *arg);
+
+int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
+                          const unsigned char *in, unsigned int inlen,
+                          const unsigned char *client, unsigned int client_len);
+void SSL_get0_next_proto_negotiated(const SSL *s,
+                                    const unsigned char **data, unsigned *len);
+
+#define OPENSSL_NPN_UNSUPPORTED 0
+#define OPENSSL_NPN_NEGOTIATED  1
+#define OPENSSL_NPN_NO_OVERLAP  2
+#endif
 
 #ifndef OPENSSL_NO_PSK
 /* the maximum length of the buffer given to callbacks containing the
@@ -961,6 +1095,8 @@ const char *SSL_get_psk_identity(const SSL *s);
 #define SSL_MAC_FLAG_READ_MAC_STREAM 1
 #define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
 
+#ifndef OPENSSL_NO_SSL_INTERN
+
 struct ssl_st
         {
         /* protocol version
@@ -1005,9 +1141,7 @@ struct ssl_st
 
         int server;     /* are we the server side? - mostly used by SSL_clear*/
 
-        int new_session;/* 1 if we are to use a new session.
-                         * 2 if we are a server and are inside a handshake
-                         *   (i.e. not just sending a HelloRequest)
+        int new_session;/* Generate a new session or reuse an old one.
                          * NB: For servers, the 'new' session may actually be a previously
                          * cached session or even the previous session unless
                          * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */
@@ -1177,12 +1311,46 @@ struct ssl_st
         void *tls_session_secret_cb_arg;
 
         SSL_CTX * initial_ctx; /* initial ctx, used to store sessions */
+
+#ifndef OPENSSL_NO_NEXTPROTONEG
+        /* Next protocol negotiation. For the client, this is the protocol that
+         * we sent in NextProtocol and is set when handling ServerHello
+         * extensions.
+         *
+         * For a server, this is the client's selected_protocol from
+         * NextProtocol and is set when handling the NextProtocol message,
+         * before the Finished message. */
+        unsigned char *next_proto_negotiated;
+        unsigned char next_proto_negotiated_len;
+#endif
+
 #define session_ctx initial_ctx
+
+        STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;  /* What we'll do */
+        SRTP_PROTECTION_PROFILE *srtp_profile;            /* What's been chosen */
+
+        unsigned int tlsext_heartbeat;  /* Is use of the Heartbeat extension negotiated?
+                                           0: disabled
+                                           1: enabled
+                                           2: enabled, but not allowed to send Requests
+                                         */
+        unsigned int tlsext_hb_pending; /* Indicates if a HeartbeatRequest is in flight */
+        unsigned int tlsext_hb_seq;     /* HeartbeatRequest sequence number */
 #else
 #define session_ctx ctx
 #endif /* OPENSSL_NO_TLSEXT */
+
+        int renegotiate;/* 1 if we are renegotiating.
+                         * 2 if we are a server and are inside a handshake
+                         * (i.e. not just sending a HelloRequest) */
+
+#ifndef OPENSSL_NO_SRP
+        SRP_CTX srp_ctx; /* ctx for SRP authentication */
+#endif
         };
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif
@@ -1192,6 +1360,7 @@ struct ssl_st
 #include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */
 #include <openssl/dtls1.h> /* Datagram TLS */
 #include <openssl/ssl23.h>
+#include <openssl/srtp.h>  /* Support for the use_srtp extension */
 
 #ifdef  __cplusplus
 extern "C" {
@@ -1408,6 +1577,20 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP        71
 
 #define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB       72
+
+#define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB    75
+#define SSL_CTRL_SET_SRP_VERIFY_PARAM_CB                76
+#define SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB             77
+
+#define SSL_CTRL_SET_SRP_ARG            78
+#define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME               79
+#define SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH               80
+#define SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD               81
+#ifndef OPENSSL_NO_HEARTBEATS
+#define SSL_CTRL_TLS_EXT_SEND_HEARTBEAT                         85
+#define SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING          86
+#define SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS      87
+#endif
 #endif
 
 #define DTLS_CTRL_GET_TIMEOUT           73
@@ -1418,6 +1601,9 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 #define SSL_CTRL_CLEAR_OPTIONS                  77
 #define SSL_CTRL_CLEAR_MODE                     78
 
+#define SSL_CTRL_GET_EXTRA_CHAIN_CERTS          82
+#define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS        83
+
 #define DTLSv1_get_timeout(ssl, arg) \
         SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg)
 #define DTLSv1_handle_timeout(ssl) \
@@ -1454,6 +1640,10 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 
 #define SSL_CTX_add_extra_chain_cert(ctx,x509) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
+#define SSL_CTX_get_extra_chain_certs(ctx,px509) \
+        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_EXTRA_CHAIN_CERTS,0,px509)
+#define SSL_CTX_clear_extra_chain_certs(ctx) \
+        SSL_CTX_ctrl(ctx,SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS,0,NULL)
 
 #ifndef OPENSSL_NO_BIO
 BIO_METHOD *BIO_f_ssl(void);
@@ -1481,6 +1671,7 @@ const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
 int     SSL_CIPHER_get_bits(const SSL_CIPHER *c,int *alg_bits);
 char *  SSL_CIPHER_get_version(const SSL_CIPHER *c);
 const char *    SSL_CIPHER_get_name(const SSL_CIPHER *c);
+unsigned long   SSL_CIPHER_get_id(const SSL_CIPHER *c);
 
 int     SSL_get_fd(const SSL *s);
 int     SSL_get_rfd(const SSL *s);
@@ -1546,10 +1737,14 @@ long	SSL_SESSION_set_time(SSL_SESSION *s, long t);
 long    SSL_SESSION_get_timeout(const SSL_SESSION *s);
 long    SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
 void    SSL_copy_session_id(SSL *to,const SSL *from);
+X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
+int SSL_SESSION_set1_id_context(SSL_SESSION *s,const unsigned char *sid_ctx,
+                               unsigned int sid_ctx_len);
 
 SSL_SESSION *SSL_SESSION_new(void);
 const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
                                         unsigned int *len);
+unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
 #ifndef OPENSSL_NO_FP_API
 int     SSL_SESSION_print_fp(FILE *fp,const SSL_SESSION *ses);
 #endif
@@ -1612,6 +1807,30 @@ int SSL_set_trust(SSL *s, int trust);
 int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
 int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
 
+#ifndef OPENSSL_NO_SRP
+int SSL_CTX_set_srp_username(SSL_CTX *ctx,char *name);
+int SSL_CTX_set_srp_password(SSL_CTX *ctx,char *password);
+int SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength);
+int SSL_CTX_set_srp_client_pwd_callback(SSL_CTX *ctx,
+                                        char *(*cb)(SSL *,void *));
+int SSL_CTX_set_srp_verify_param_callback(SSL_CTX *ctx,
+                                          int (*cb)(SSL *,void *));
+int SSL_CTX_set_srp_username_callback(SSL_CTX *ctx,
+                                      int (*cb)(SSL *,int *,void *));
+int SSL_CTX_set_srp_cb_arg(SSL_CTX *ctx, void *arg);
+
+int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g,
+                             BIGNUM *sa, BIGNUM *v, char *info);
+int SSL_set_srp_server_param_pw(SSL *s, const char *user, const char *pass,
+                                const char *grp);
+
+BIGNUM *SSL_get_srp_g(SSL *s);
+BIGNUM *SSL_get_srp_N(SSL *s);
+
+char *SSL_get_srp_username(SSL *s);
+char *SSL_get_srp_userinfo(SSL *s);
+#endif
+
 void    SSL_free(SSL *ssl);
 int     SSL_accept(SSL *ssl);
 int     SSL_connect(SSL *ssl);
@@ -1647,6 +1866,15 @@ const SSL_METHOD *TLSv1_method(void);		/* TLSv1.0 */
 const SSL_METHOD *TLSv1_server_method(void);    /* TLSv1.0 */
 const SSL_METHOD *TLSv1_client_method(void);    /* TLSv1.0 */
 
+const SSL_METHOD *TLSv1_1_method(void);         /* TLSv1.1 */
+const SSL_METHOD *TLSv1_1_server_method(void);  /* TLSv1.1 */
+const SSL_METHOD *TLSv1_1_client_method(void);  /* TLSv1.1 */
+
+const SSL_METHOD *TLSv1_2_method(void);         /* TLSv1.2 */
+const SSL_METHOD *TLSv1_2_server_method(void);  /* TLSv1.2 */
+const SSL_METHOD *TLSv1_2_client_method(void);  /* TLSv1.2 */
+
+
 const SSL_METHOD *DTLSv1_method(void);          /* DTLSv1.0 */
 const SSL_METHOD *DTLSv1_server_method(void);   /* DTLSv1.0 */
 const SSL_METHOD *DTLSv1_client_method(void);   /* DTLSv1.0 */
@@ -1655,6 +1883,7 @@ STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
 
 int SSL_do_handshake(SSL *s);
 int SSL_renegotiate(SSL *s);
+int SSL_renegotiate_abbreviated(SSL *s);
 int SSL_renegotiate_pending(SSL *s);
 int SSL_shutdown(SSL *s);
 
@@ -1706,6 +1935,7 @@ void SSL_set_info_callback(SSL *ssl,
                            void (*cb)(const SSL *ssl,int type,int val));
 void (*SSL_get_info_callback(const SSL *ssl))(const SSL *ssl,int type,int val);
 int SSL_state(const SSL *ssl);
+void SSL_set_state(SSL *ssl, int state);
 
 void SSL_set_verify_result(SSL *ssl,long v);
 long SSL_get_verify_result(const SSL *ssl);
@@ -1806,6 +2036,9 @@ int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
 /* Pre-shared secret session resumption functions */
 int SSL_set_session_secret_cb(SSL *s, tls_session_secret_cb_fn tls_session_secret_cb, void *arg);
 
+void SSL_set_debug(SSL *s, int debug);
+int SSL_cache_hit(SSL *s);
+
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
@@ -1825,6 +2058,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_DTLS1_ACCEPT                               246
 #define SSL_F_DTLS1_ADD_CERT_TO_BUF                      295
 #define SSL_F_DTLS1_BUFFER_RECORD                        247
+#define SSL_F_DTLS1_CHECK_TIMEOUT_NUM                    316
 #define SSL_F_DTLS1_CLIENT_HELLO                         248
 #define SSL_F_DTLS1_CONNECT                              249
 #define SSL_F_DTLS1_ENC                                  250
@@ -1833,6 +2067,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT                 253
 #define SSL_F_DTLS1_GET_RECORD                           254
 #define SSL_F_DTLS1_HANDLE_TIMEOUT                       297
+#define SSL_F_DTLS1_HEARTBEAT                            305
 #define SSL_F_DTLS1_OUTPUT_CERT_CHAIN                    255
 #define SSL_F_DTLS1_PREPROCESS_FRAGMENT                  288
 #define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE           256
@@ -1901,6 +2136,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_SSL3_GET_KEY_EXCHANGE                      141
 #define SSL_F_SSL3_GET_MESSAGE                           142
 #define SSL_F_SSL3_GET_NEW_SESSION_TICKET                283
+#define SSL_F_SSL3_GET_NEXT_PROTO                        306
 #define SSL_F_SSL3_GET_RECORD                            143
 #define SSL_F_SSL3_GET_SERVER_CERTIFICATE                144
 #define SSL_F_SSL3_GET_SERVER_DONE                       145
@@ -1925,10 +2161,12 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_SSL3_WRITE_PENDING                         159
 #define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT        298
 #define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT                 277
+#define SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT           307
 #define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK         215
 #define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK        216
 #define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT        299
 #define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT                 278
+#define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT           308
 #define SSL_F_SSL_BAD_METHOD                             160
 #define SSL_F_SSL_BYTES_TO_CIPHER_LIST                   161
 #define SSL_F_SSL_CERT_DUP                               221
@@ -1945,6 +2183,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_SSL_CREATE_CIPHER_LIST                     166
 #define SSL_F_SSL_CTRL                                   232
 #define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                  168
+#define SSL_F_SSL_CTX_MAKE_PROFILES                      309
 #define SSL_F_SSL_CTX_NEW                                169
 #define SSL_F_SSL_CTX_SET_CIPHER_LIST                    269
 #define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE             290
@@ -1973,8 +2212,10 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_SSL_NEW                                    186
 #define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT      300
 #define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT               302
+#define SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT         310
 #define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT      301
 #define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT               303
+#define SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT         311
 #define SSL_F_SSL_PEEK                                   270
 #define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT             281
 #define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT             282
@@ -1983,6 +2224,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_SSL_RSA_PUBLIC_ENCRYPT                     188
 #define SSL_F_SSL_SESSION_NEW                            189
 #define SSL_F_SSL_SESSION_PRINT_FP                       190
+#define SSL_F_SSL_SESSION_SET1_ID_CONTEXT                312
 #define SSL_F_SSL_SESS_CERT_NEW                          225
 #define SSL_F_SSL_SET_CERT                               191
 #define SSL_F_SSL_SET_CIPHER_LIST                        271
@@ -1996,6 +2238,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_SSL_SET_TRUST                              228
 #define SSL_F_SSL_SET_WFD                                196
 #define SSL_F_SSL_SHUTDOWN                               224
+#define SSL_F_SSL_SRP_CTX_INIT                           313
 #define SSL_F_SSL_UNDEFINED_CONST_FUNCTION               243
 #define SSL_F_SSL_UNDEFINED_FUNCTION                     197
 #define SSL_F_SSL_UNDEFINED_VOID_FUNCTION                244
@@ -2015,6 +2258,8 @@ void ERR_load_SSL_strings(void);
 #define SSL_F_TLS1_CHANGE_CIPHER_STATE                   209
 #define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT              274
 #define SSL_F_TLS1_ENC                                   210
+#define SSL_F_TLS1_EXPORT_KEYING_MATERIAL                314
+#define SSL_F_TLS1_HEARTBEAT                             315
 #define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT            275
 #define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT            276
 #define SSL_F_TLS1_PRF                                   284
@@ -2054,6 +2299,13 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_BAD_RSA_MODULUS_LENGTH                     121
 #define SSL_R_BAD_RSA_SIGNATURE                          122
 #define SSL_R_BAD_SIGNATURE                              123
+#define SSL_R_BAD_SRP_A_LENGTH                           347
+#define SSL_R_BAD_SRP_B_LENGTH                           348
+#define SSL_R_BAD_SRP_G_LENGTH                           349
+#define SSL_R_BAD_SRP_N_LENGTH                           350
+#define SSL_R_BAD_SRP_S_LENGTH                           351
+#define SSL_R_BAD_SRTP_MKI_VALUE                         352
+#define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST           353
 #define SSL_R_BAD_SSL_FILETYPE                           124
 #define SSL_R_BAD_SSL_SESSION_ID_LENGTH                  125
 #define SSL_R_BAD_STATE                                  126
@@ -2092,12 +2344,15 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE         322
 #define SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE        323
 #define SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER               310
+#define SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST         354
 #define SSL_R_ENCRYPTED_LENGTH_TOO_LONG                  150
 #define SSL_R_ERROR_GENERATING_TMP_RSA_KEY               282
 #define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              151
 #define SSL_R_EXCESSIVE_MESSAGE_SIZE                     152
 #define SSL_R_EXTRA_DATA_IN_MESSAGE                      153
 #define SSL_R_GOT_A_FIN_BEFORE_A_CCS                     154
+#define SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS                355
+#define SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION           356
 #define SSL_R_HTTPS_PROXY_REQUEST                        155
 #define SSL_R_HTTP_REQUEST                               156
 #define SSL_R_ILLEGAL_PADDING                            283
@@ -2106,6 +2361,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_INVALID_COMMAND                            280
 #define SSL_R_INVALID_COMPRESSION_ALGORITHM              341
 #define SSL_R_INVALID_PURPOSE                            278
+#define SSL_R_INVALID_SRP_USERNAME                       357
 #define SSL_R_INVALID_STATUS_RESPONSE                    328
 #define SSL_R_INVALID_TICKET_KEYS_LENGTH                 325
 #define SSL_R_INVALID_TRUST                              279
@@ -2135,6 +2391,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_MISSING_RSA_CERTIFICATE                    168
 #define SSL_R_MISSING_RSA_ENCRYPTING_CERT                169
 #define SSL_R_MISSING_RSA_SIGNING_CERT                   170
+#define SSL_R_MISSING_SRP_PARAM                          358
 #define SSL_R_MISSING_TMP_DH_KEY                         171
 #define SSL_R_MISSING_TMP_ECDH_KEY                       311
 #define SSL_R_MISSING_TMP_RSA_KEY                        172
@@ -2164,6 +2421,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_NO_RENEGOTIATION                           339
 #define SSL_R_NO_REQUIRED_DIGEST                         324
 #define SSL_R_NO_SHARED_CIPHER                           193
+#define SSL_R_NO_SRTP_PROFILES                           359
 #define SSL_R_NO_VERIFY_CALLBACK                         194
 #define SSL_R_NULL_SSL_CTX                               195
 #define SSL_R_NULL_SSL_METHOD_PASSED                     196
@@ -2207,7 +2465,12 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_SERVERHELLO_TLSEXT                         275
 #define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED           277
 #define SSL_R_SHORT_READ                                 219
+#define SSL_R_SIGNATURE_ALGORITHMS_ERROR                 360
 #define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE      220
+#define SSL_R_SRP_A_CALC                                 361
+#define SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES           362
+#define SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG      363
+#define SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE            364
 #define SSL_R_SSL23_DOING_SESSION_ID_REUSE               221
 #define SSL_R_SSL2_CONNECTION_ID_TOO_LONG                299
 #define SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT             321
@@ -2252,6 +2515,9 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_TLSV1_UNRECOGNIZED_NAME                    1112
 #define SSL_R_TLSV1_UNSUPPORTED_EXTENSION                1110
 #define SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER       232
+#define SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT           365
+#define SSL_R_TLS_HEARTBEAT_PENDING                      366
+#define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL                 367
 #define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
 #define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
 #define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    234
@@ -2273,6 +2539,7 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_UNKNOWN_CERTIFICATE_TYPE                   247
 #define SSL_R_UNKNOWN_CIPHER_RETURNED                    248
 #define SSL_R_UNKNOWN_CIPHER_TYPE                        249
+#define SSL_R_UNKNOWN_DIGEST                             368
 #define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE                  250
 #define SSL_R_UNKNOWN_PKEY_TYPE                          251
 #define SSL_R_UNKNOWN_PROTOCOL                           252
@@ -2287,12 +2554,14 @@ void ERR_load_SSL_strings(void);
 #define SSL_R_UNSUPPORTED_PROTOCOL                       258
 #define SSL_R_UNSUPPORTED_SSL_VERSION                    259
 #define SSL_R_UNSUPPORTED_STATUS_TYPE                    329
+#define SSL_R_USE_SRTP_NOT_NEGOTIATED                    369
 #define SSL_R_WRITE_BIO_NOT_SET                          260
 #define SSL_R_WRONG_CIPHER_RETURNED                      261
 #define SSL_R_WRONG_MESSAGE_TYPE                         262
 #define SSL_R_WRONG_NUMBER_OF_KEY_BITS                   263
 #define SSL_R_WRONG_SIGNATURE_LENGTH                     264
 #define SSL_R_WRONG_SIGNATURE_SIZE                       265
+#define SSL_R_WRONG_SIGNATURE_TYPE                       370
 #define SSL_R_WRONG_SSL_VERSION                          266
 #define SSL_R_WRONG_VERSION_NUMBER                       267
 #define SSL_R_X509_LIB                                   268
diff --git a/src/lib/libssl/src/ssl/ssl2.h b/src/lib/libssl/src/ssl/ssl2.h
index 99a52ea0dd..eb25dcb0bf 100644
--- a/src/lib/libssl/src/ssl/ssl2.h
+++ b/src/lib/libssl/src/ssl/ssl2.h
@@ -155,6 +155,8 @@ extern "C" {
 #define  CERT           char
 #endif
 
+#ifndef OPENSSL_NO_SSL_INTERN
+
 typedef struct ssl2_state_st
         {
         int three_byte_header;
@@ -219,6 +221,8 @@ typedef struct ssl2_state_st
                 } tmp;
         } SSL2_STATE;
 
+#endif
+
 /* SSLv2 */
 /* client */
 #define SSL2_ST_SEND_CLIENT_HELLO_A             (0x10|SSL_ST_CONNECT)
diff --git a/src/lib/libssl/src/ssl/ssl3.h b/src/lib/libssl/src/ssl/ssl3.h
index 9c2c41287a..112e627de0 100644
--- a/src/lib/libssl/src/ssl/ssl3.h
+++ b/src/lib/libssl/src/ssl/ssl3.h
@@ -322,6 +322,7 @@ extern "C" {
 #define SSL3_RT_ALERT                   21
 #define SSL3_RT_HANDSHAKE               22
 #define SSL3_RT_APPLICATION_DATA        23
+#define TLS1_RT_HEARTBEAT               24
 
 #define SSL3_AL_WARNING                 1
 #define SSL3_AL_FATAL                   2
@@ -339,6 +340,11 @@ extern "C" {
 #define SSL3_AD_CERTIFICATE_UNKNOWN     46
 #define SSL3_AD_ILLEGAL_PARAMETER       47      /* fatal */
 
+#define TLS1_HB_REQUEST         1
+#define TLS1_HB_RESPONSE        2
+        
+#ifndef OPENSSL_NO_SSL_INTERN
+
 typedef struct ssl3_record_st
         {
 /*r */  int type;               /* type of record */
@@ -360,6 +366,8 @@ typedef struct ssl3_buffer_st
         int left;               /* how many bytes left */
         } SSL3_BUFFER;
 
+#endif
+
 #define SSL3_CT_RSA_SIGN                        1
 #define SSL3_CT_DSS_SIGN                        2
 #define SSL3_CT_RSA_FIXED_DH                    3
@@ -379,6 +387,7 @@ typedef struct ssl3_buffer_st
 #define SSL3_FLAGS_POP_BUFFER                   0x0004
 #define TLS1_FLAGS_TLS_PADDING_BUG              0x0008
 #define TLS1_FLAGS_SKIP_CERT_VERIFY             0x0010
+#define TLS1_FLAGS_KEEP_HANDSHAKE               0x0020
  
 /* SSL3_FLAGS_SGC_RESTART_DONE is set when we
  * restart a handshake because of MS SGC and so prevents us
@@ -391,6 +400,8 @@ typedef struct ssl3_buffer_st
  */
 #define SSL3_FLAGS_SGC_RESTART_DONE             0x0040
 
+#ifndef OPENSSL_NO_SSL_INTERN
+
 typedef struct ssl3_state_st
         {
         long flags;
@@ -475,7 +486,7 @@ typedef struct ssl3_state_st
                 int finish_md_len;
                 unsigned char peer_finish_md[EVP_MAX_MD_SIZE*2];
                 int peer_finish_md_len;
-                
+
                 unsigned long message_size;
                 int message_type;
 
@@ -523,13 +534,23 @@ typedef struct ssl3_state_st
         unsigned char previous_server_finished[EVP_MAX_MD_SIZE];
         unsigned char previous_server_finished_len;
         int send_connection_binding; /* TODOEKR */
+
+#ifndef OPENSSL_NO_NEXTPROTONEG
+        /* Set if we saw the Next Protocol Negotiation extension from our peer. */
+        int next_proto_neg_seen;
+#endif
         } SSL3_STATE;
 
+#endif
 
 /* SSLv3 */
 /*client */
 /* extra state */
 #define SSL3_ST_CW_FLUSH                (0x100|SSL_ST_CONNECT)
+#ifndef OPENSSL_NO_SCTP
+#define DTLS1_SCTP_ST_CW_WRITE_SOCK                     (0x310|SSL_ST_CONNECT)
+#define DTLS1_SCTP_ST_CR_READ_SOCK                      (0x320|SSL_ST_CONNECT)
+#endif  
 /* write to server */
 #define SSL3_ST_CW_CLNT_HELLO_A         (0x110|SSL_ST_CONNECT)
 #define SSL3_ST_CW_CLNT_HELLO_B         (0x111|SSL_ST_CONNECT)
@@ -557,6 +578,8 @@ typedef struct ssl3_state_st
 #define SSL3_ST_CW_CERT_VRFY_B          (0x191|SSL_ST_CONNECT)
 #define SSL3_ST_CW_CHANGE_A             (0x1A0|SSL_ST_CONNECT)
 #define SSL3_ST_CW_CHANGE_B             (0x1A1|SSL_ST_CONNECT)
+#define SSL3_ST_CW_NEXT_PROTO_A         (0x200|SSL_ST_CONNECT)
+#define SSL3_ST_CW_NEXT_PROTO_B         (0x201|SSL_ST_CONNECT)
 #define SSL3_ST_CW_FINISHED_A           (0x1B0|SSL_ST_CONNECT)
 #define SSL3_ST_CW_FINISHED_B           (0x1B1|SSL_ST_CONNECT)
 /* read from server */
@@ -572,6 +595,10 @@ typedef struct ssl3_state_st
 /* server */
 /* extra state */
 #define SSL3_ST_SW_FLUSH                (0x100|SSL_ST_ACCEPT)
+#ifndef OPENSSL_NO_SCTP
+#define DTLS1_SCTP_ST_SW_WRITE_SOCK                     (0x310|SSL_ST_ACCEPT)
+#define DTLS1_SCTP_ST_SR_READ_SOCK                      (0x320|SSL_ST_ACCEPT)
+#endif  
 /* read from client */
 /* Do not change the number values, they do matter */
 #define SSL3_ST_SR_CLNT_HELLO_A         (0x110|SSL_ST_ACCEPT)
@@ -602,6 +629,8 @@ typedef struct ssl3_state_st
 #define SSL3_ST_SR_CERT_VRFY_B          (0x1A1|SSL_ST_ACCEPT)
 #define SSL3_ST_SR_CHANGE_A             (0x1B0|SSL_ST_ACCEPT)
 #define SSL3_ST_SR_CHANGE_B             (0x1B1|SSL_ST_ACCEPT)
+#define SSL3_ST_SR_NEXT_PROTO_A         (0x210|SSL_ST_ACCEPT)
+#define SSL3_ST_SR_NEXT_PROTO_B         (0x211|SSL_ST_ACCEPT)
 #define SSL3_ST_SR_FINISHED_A           (0x1C0|SSL_ST_ACCEPT)
 #define SSL3_ST_SR_FINISHED_B           (0x1C1|SSL_ST_ACCEPT)
 /* write to client */
@@ -626,6 +655,7 @@ typedef struct ssl3_state_st
 #define SSL3_MT_CLIENT_KEY_EXCHANGE             16
 #define SSL3_MT_FINISHED                        20
 #define SSL3_MT_CERTIFICATE_STATUS              22
+#define SSL3_MT_NEXT_PROTO                      67
 #define DTLS1_MT_HELLO_VERIFY_REQUEST    3
 
 
diff --git a/src/lib/libssl/src/ssl/ssl_algs.c b/src/lib/libssl/src/ssl/ssl_algs.c
index 0967b2dfe4..d443143c59 100644
--- a/src/lib/libssl/src/ssl/ssl_algs.c
+++ b/src/lib/libssl/src/ssl/ssl_algs.c
@@ -73,6 +73,9 @@ int SSL_library_init(void)
 #endif
 #ifndef OPENSSL_NO_RC4
         EVP_add_cipher(EVP_rc4());
+#if !defined(OPENSSL_NO_MD5) && (defined(__x86_64) || defined(__x86_64__))
+        EVP_add_cipher(EVP_rc4_hmac_md5());
+#endif
 #endif  
 #ifndef OPENSSL_NO_RC2
         EVP_add_cipher(EVP_rc2_cbc());
@@ -85,6 +88,12 @@ int SSL_library_init(void)
         EVP_add_cipher(EVP_aes_128_cbc());
         EVP_add_cipher(EVP_aes_192_cbc());
         EVP_add_cipher(EVP_aes_256_cbc());
+        EVP_add_cipher(EVP_aes_128_gcm());
+        EVP_add_cipher(EVP_aes_256_gcm());
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
+        EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
+        EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
+#endif
 #endif
 #ifndef OPENSSL_NO_CAMELLIA
         EVP_add_cipher(EVP_camellia_128_cbc());
diff --git a/src/lib/libssl/src/ssl/ssl_asn1.c b/src/lib/libssl/src/ssl/ssl_asn1.c
index d7f4c6087e..38540be1e5 100644
--- a/src/lib/libssl/src/ssl/ssl_asn1.c
+++ b/src/lib/libssl/src/ssl/ssl_asn1.c
@@ -114,6 +114,9 @@ typedef struct ssl_session_asn1_st
         ASN1_OCTET_STRING psk_identity_hint;
         ASN1_OCTET_STRING psk_identity;
 #endif /* OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+        ASN1_OCTET_STRING srp_username;
+#endif /* OPENSSL_NO_SRP */
         } SSL_SESSION_ASN1;
 
 int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
@@ -130,6 +133,9 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
         unsigned char cbuf;
         int v11=0;
 #endif
+#ifndef OPENSSL_NO_SRP
+        int v12=0;
+#endif
         long l;
         SSL_SESSION_ASN1 a;
         M_ASN1_I2D_vars(in);
@@ -267,6 +273,14 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
                 a.psk_identity.data=(unsigned char *)(in->psk_identity);
                 }
 #endif /* OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+        if (in->srp_username)
+                {
+                a.srp_username.length=strlen(in->srp_username);
+                a.srp_username.type=V_ASN1_OCTET_STRING;
+                a.srp_username.data=(unsigned char *)(in->srp_username);
+                }
+#endif /* OPENSSL_NO_SRP */
 
         M_ASN1_I2D_len(&(a.version),            i2d_ASN1_INTEGER);
         M_ASN1_I2D_len(&(a.ssl_version),        i2d_ASN1_INTEGER);
@@ -307,6 +321,10 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
         if (in->psk_identity)
                 M_ASN1_I2D_len_EXP_opt(&(a.psk_identity), i2d_ASN1_OCTET_STRING,8,v8);
 #endif /* OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_SRP
+        if (in->srp_username)
+                M_ASN1_I2D_len_EXP_opt(&(a.srp_username), i2d_ASN1_OCTET_STRING,12,v12);
+#endif /* OPENSSL_NO_SRP */
 
         M_ASN1_I2D_seq_total();
 
@@ -351,6 +369,10 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
         if (in->compress_meth)
                 M_ASN1_I2D_put_EXP_opt(&(a.comp_id), i2d_ASN1_OCTET_STRING,11,v11);
 #endif
+#ifndef OPENSSL_NO_SRP
+        if (in->srp_username)
+                M_ASN1_I2D_put_EXP_opt(&(a.srp_username), i2d_ASN1_OCTET_STRING,12,v12);
+#endif /* OPENSSL_NO_SRP */
         M_ASN1_I2D_finish();
         }
 
@@ -549,6 +571,19 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
                 }
         else
                 ret->psk_identity_hint=NULL;
+
+        os.length=0;
+        os.data=NULL;
+        M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,8);
+        if (os.data)
+                {
+                ret->psk_identity = BUF_strndup((char *)os.data, os.length);
+                OPENSSL_free(os.data);
+                os.data = NULL;
+                os.length = 0;
+                }
+        else
+                ret->psk_identity=NULL;
 #endif /* OPENSSL_NO_PSK */
 
 #ifndef OPENSSL_NO_TLSEXT
@@ -588,5 +623,20 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
                 }
 #endif
 
+#ifndef OPENSSL_NO_SRP
+        os.length=0;
+        os.data=NULL;
+        M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,12);
+        if (os.data)
+                {
+                ret->srp_username = BUF_strndup((char *)os.data, os.length);
+                OPENSSL_free(os.data);
+                os.data = NULL;
+                os.length = 0;
+                }
+        else
+                ret->srp_username=NULL;
+#endif /* OPENSSL_NO_SRP */
+
         M_ASN1_D2I_Finish(a,SSL_SESSION_free,SSL_F_D2I_SSL_SESSION);
         }
diff --git a/src/lib/libssl/src/ssl/ssl_cert.c b/src/lib/libssl/src/ssl/ssl_cert.c
index 27256eea81..917be31876 100644
--- a/src/lib/libssl/src/ssl/ssl_cert.c
+++ b/src/lib/libssl/src/ssl/ssl_cert.c
@@ -160,6 +160,21 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void)
         return ssl_x509_store_ctx_idx;
         }
 
+static void ssl_cert_set_default_md(CERT *cert)
+        {
+        /* Set digest values to defaults */
+#ifndef OPENSSL_NO_DSA
+        cert->pkeys[SSL_PKEY_DSA_SIGN].digest = EVP_dss1();
+#endif
+#ifndef OPENSSL_NO_RSA
+        cert->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1();
+        cert->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1();
+#endif
+#ifndef OPENSSL_NO_ECDSA
+        cert->pkeys[SSL_PKEY_ECC].digest = EVP_ecdsa();
+#endif
+        }
+
 CERT *ssl_cert_new(void)
         {
         CERT *ret;
@@ -174,7 +189,7 @@ CERT *ssl_cert_new(void)
 
         ret->key= &(ret->pkeys[SSL_PKEY_RSA_ENC]);
         ret->references=1;
-
+        ssl_cert_set_default_md(ret);
         return(ret);
         }
 
@@ -307,6 +322,10 @@ CERT *ssl_cert_dup(CERT *cert)
          * chain is held inside SSL_CTX */
 
         ret->references=1;
+        /* Set digests to defaults. NB: we don't copy existing values as they
+         * will be set during handshake.
+         */
+        ssl_cert_set_default_md(ret);
 
         return(ret);
         
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 54ba7ef5b4..92d1e94d6a 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -162,11 +162,13 @@
 #define SSL_ENC_CAMELLIA256_IDX 9
 #define SSL_ENC_GOST89_IDX      10
 #define SSL_ENC_SEED_IDX        11
-#define SSL_ENC_NUM_IDX         12
+#define SSL_ENC_AES128GCM_IDX   12
+#define SSL_ENC_AES256GCM_IDX   13
+#define SSL_ENC_NUM_IDX         14
 
 
 static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={
-        NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+        NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL
         };
 
 #define SSL_COMP_NULL_IDX       0
@@ -179,28 +181,32 @@ static STACK_OF(SSL_COMP) *ssl_comp_methods=NULL;
 #define SSL_MD_SHA1_IDX 1
 #define SSL_MD_GOST94_IDX 2
 #define SSL_MD_GOST89MAC_IDX 3
+#define SSL_MD_SHA256_IDX 4
+#define SSL_MD_SHA384_IDX 5
 /*Constant SSL_MAX_DIGEST equal to size of digests array should be 
  * defined in the
  * ssl_locl.h */
 #define SSL_MD_NUM_IDX  SSL_MAX_DIGEST 
 static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX]={
-        NULL,NULL,NULL,NULL
+        NULL,NULL,NULL,NULL,NULL,NULL
         };
 /* PKEY_TYPE for GOST89MAC is known in advance, but, because
  * implementation is engine-provided, we'll fill it only if
  * corresponding EVP_PKEY_METHOD is found 
  */
 static int  ssl_mac_pkey_id[SSL_MD_NUM_IDX]={
-        EVP_PKEY_HMAC,EVP_PKEY_HMAC,EVP_PKEY_HMAC,NID_undef
+        EVP_PKEY_HMAC,EVP_PKEY_HMAC,EVP_PKEY_HMAC,NID_undef,
+        EVP_PKEY_HMAC,EVP_PKEY_HMAC
         };
 
 static int ssl_mac_secret_size[SSL_MD_NUM_IDX]={
-        0,0,0,0
+        0,0,0,0,0,0
         };
 
 static int ssl_handshake_digest_flag[SSL_MD_NUM_IDX]={
         SSL_HANDSHAKE_MAC_MD5,SSL_HANDSHAKE_MAC_SHA,
-        SSL_HANDSHAKE_MAC_GOST94,0
+        SSL_HANDSHAKE_MAC_GOST94, 0, SSL_HANDSHAKE_MAC_SHA256,
+        SSL_HANDSHAKE_MAC_SHA384
         };
 
 #define CIPHER_ADD      1
@@ -247,6 +253,7 @@ static const SSL_CIPHER cipher_aliases[]={
         {0,SSL_TXT_ECDH,0,    SSL_kECDHr|SSL_kECDHe|SSL_kEECDH,0,0,0,0,0,0,0,0},
 
         {0,SSL_TXT_kPSK,0,    SSL_kPSK,  0,0,0,0,0,0,0,0},
+        {0,SSL_TXT_kSRP,0,    SSL_kSRP,  0,0,0,0,0,0,0,0},
         {0,SSL_TXT_kGOST,0, SSL_kGOST,0,0,0,0,0,0,0,0},
 
         /* server authentication aliases */
@@ -273,6 +280,7 @@ static const SSL_CIPHER cipher_aliases[]={
         {0,SSL_TXT_ADH,0,     SSL_kEDH,SSL_aNULL,0,0,0,0,0,0,0},
         {0,SSL_TXT_AECDH,0,   SSL_kEECDH,SSL_aNULL,0,0,0,0,0,0,0},
         {0,SSL_TXT_PSK,0,     SSL_kPSK,SSL_aPSK,0,0,0,0,0,0,0},
+        {0,SSL_TXT_SRP,0,     SSL_kSRP,0,0,0,0,0,0,0,0},
 
 
         /* symmetric encryption aliases */
@@ -283,9 +291,10 @@ static const SSL_CIPHER cipher_aliases[]={
         {0,SSL_TXT_IDEA,0,    0,0,SSL_IDEA,  0,0,0,0,0,0},
         {0,SSL_TXT_SEED,0,    0,0,SSL_SEED,  0,0,0,0,0,0},
         {0,SSL_TXT_eNULL,0,   0,0,SSL_eNULL, 0,0,0,0,0,0},
-        {0,SSL_TXT_AES128,0,  0,0,SSL_AES128,0,0,0,0,0,0},
-        {0,SSL_TXT_AES256,0,  0,0,SSL_AES256,0,0,0,0,0,0},
-        {0,SSL_TXT_AES,0,     0,0,SSL_AES128|SSL_AES256,0,0,0,0,0,0},
+        {0,SSL_TXT_AES128,0,  0,0,SSL_AES128|SSL_AES128GCM,0,0,0,0,0,0},
+        {0,SSL_TXT_AES256,0,  0,0,SSL_AES256|SSL_AES256GCM,0,0,0,0,0,0},
+        {0,SSL_TXT_AES,0,     0,0,SSL_AES,0,0,0,0,0,0},
+        {0,SSL_TXT_AES_GCM,0, 0,0,SSL_AES128GCM|SSL_AES256GCM,0,0,0,0,0,0},
         {0,SSL_TXT_CAMELLIA128,0,0,0,SSL_CAMELLIA128,0,0,0,0,0,0},
         {0,SSL_TXT_CAMELLIA256,0,0,0,SSL_CAMELLIA256,0,0,0,0,0,0},
         {0,SSL_TXT_CAMELLIA   ,0,0,0,SSL_CAMELLIA128|SSL_CAMELLIA256,0,0,0,0,0,0},
@@ -296,6 +305,8 @@ static const SSL_CIPHER cipher_aliases[]={
         {0,SSL_TXT_SHA,0,     0,0,0,SSL_SHA1,  0,0,0,0,0},
         {0,SSL_TXT_GOST94,0,     0,0,0,SSL_GOST94,  0,0,0,0,0},
         {0,SSL_TXT_GOST89MAC,0,     0,0,0,SSL_GOST89MAC,  0,0,0,0,0},
+        {0,SSL_TXT_SHA256,0,    0,0,0,SSL_SHA256,  0,0,0,0,0},
+        {0,SSL_TXT_SHA384,0,    0,0,0,SSL_SHA384,  0,0,0,0,0},
 
         /* protocol version aliases */
         {0,SSL_TXT_SSLV2,0,   0,0,0,0,SSL_SSLV2, 0,0,0,0},
@@ -379,6 +390,11 @@ void ssl_load_ciphers(void)
         ssl_cipher_methods[SSL_ENC_SEED_IDX]=
           EVP_get_cipherbyname(SN_seed_cbc);
 
+        ssl_cipher_methods[SSL_ENC_AES128GCM_IDX]=
+          EVP_get_cipherbyname(SN_aes_128_gcm);
+        ssl_cipher_methods[SSL_ENC_AES256GCM_IDX]=
+          EVP_get_cipherbyname(SN_aes_256_gcm);
+
         ssl_digest_methods[SSL_MD_MD5_IDX]=
                 EVP_get_digestbyname(SN_md5);
         ssl_mac_secret_size[SSL_MD_MD5_IDX]=
@@ -404,6 +420,14 @@ void ssl_load_ciphers(void)
                         ssl_mac_secret_size[SSL_MD_GOST89MAC_IDX]=32;
                 }               
 
+        ssl_digest_methods[SSL_MD_SHA256_IDX]=
+                EVP_get_digestbyname(SN_sha256);
+        ssl_mac_secret_size[SSL_MD_SHA256_IDX]=
+                EVP_MD_size(ssl_digest_methods[SSL_MD_SHA256_IDX]);
+        ssl_digest_methods[SSL_MD_SHA384_IDX]=
+                EVP_get_digestbyname(SN_sha384);
+        ssl_mac_secret_size[SSL_MD_SHA384_IDX]=
+                EVP_MD_size(ssl_digest_methods[SSL_MD_SHA384_IDX]);
         }
 #ifndef OPENSSL_NO_COMP
 
@@ -526,6 +550,12 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
         case SSL_SEED:
                 i=SSL_ENC_SEED_IDX;
                 break;
+        case SSL_AES128GCM:
+                i=SSL_ENC_AES128GCM_IDX;
+                break;
+        case SSL_AES256GCM:
+                i=SSL_ENC_AES256GCM_IDX;
+                break;
         default:
                 i= -1;
                 break;
@@ -549,6 +579,12 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
         case SSL_SHA1:
                 i=SSL_MD_SHA1_IDX;
                 break;
+        case SSL_SHA256:
+                i=SSL_MD_SHA256_IDX;
+                break;
+        case SSL_SHA384:
+                i=SSL_MD_SHA384_IDX;
+                break;
         case SSL_GOST94:
                 i = SSL_MD_GOST94_IDX;
                 break;
@@ -564,17 +600,45 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
                 *md=NULL; 
                 if (mac_pkey_type!=NULL) *mac_pkey_type = NID_undef;
                 if (mac_secret_size!=NULL) *mac_secret_size = 0;
-
+                if (c->algorithm_mac == SSL_AEAD)
+                        mac_pkey_type = NULL;
         }
         else
         {
                 *md=ssl_digest_methods[i];
                 if (mac_pkey_type!=NULL) *mac_pkey_type = ssl_mac_pkey_id[i];
                 if (mac_secret_size!=NULL) *mac_secret_size = ssl_mac_secret_size[i];
-        }       
+        }
+
+        if ((*enc != NULL) &&
+            (*md != NULL || (EVP_CIPHER_flags(*enc)&EVP_CIPH_FLAG_AEAD_CIPHER)) &&
+            (!mac_pkey_type||*mac_pkey_type != NID_undef))
+                {
+                const EVP_CIPHER *evp;
+
+                if (s->ssl_version>>8 != TLS1_VERSION_MAJOR ||
+                    s->ssl_version < TLS1_VERSION)
+                        return 1;
 
-        if ((*enc != NULL) && (*md != NULL) && (!mac_pkey_type||*mac_pkey_type != NID_undef))
+#ifdef OPENSSL_FIPS
+                if (FIPS_mode())
+                        return 1;
+#endif
+
+                if      (c->algorithm_enc == SSL_RC4 &&
+                         c->algorithm_mac == SSL_MD5 &&
+                         (evp=EVP_get_cipherbyname("RC4-HMAC-MD5")))
+                        *enc = evp, *md = NULL;
+                else if (c->algorithm_enc == SSL_AES128 &&
+                         c->algorithm_mac == SSL_SHA1 &&
+                         (evp=EVP_get_cipherbyname("AES-128-CBC-HMAC-SHA1")))
+                        *enc = evp, *md = NULL;
+                else if (c->algorithm_enc == SSL_AES256 &&
+                         c->algorithm_mac == SSL_SHA1 &&
+                         (evp=EVP_get_cipherbyname("AES-256-CBC-HMAC-SHA1")))
+                        *enc = evp, *md = NULL;
                 return(1);
+                }
         else
                 return(0);
         }
@@ -585,9 +649,11 @@ int ssl_get_handshake_digest(int idx, long *mask, const EVP_MD **md)
                 {
                 return 0;
                 }
-        if (ssl_handshake_digest_flag[idx]==0) return 0;
         *mask = ssl_handshake_digest_flag[idx];
-        *md = ssl_digest_methods[idx];
+        if (*mask)
+                *md = ssl_digest_methods[idx];
+        else
+                *md = NULL;
         return 1;
 }
 
@@ -662,6 +728,9 @@ static void ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth, un
         *mkey |= SSL_kPSK;
         *auth |= SSL_aPSK;
 #endif
+#ifdef OPENSSL_NO_SRP
+        *mkey |= SSL_kSRP;
+#endif
         /* Check for presence of GOST 34.10 algorithms, and if they
          * do not present, disable  appropriate auth and key exchange */
         if (!get_optional_pkey_id("gost94")) {
@@ -687,6 +756,8 @@ static void ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth, un
         *enc |= (ssl_cipher_methods[SSL_ENC_IDEA_IDX] == NULL) ? SSL_IDEA:0;
         *enc |= (ssl_cipher_methods[SSL_ENC_AES128_IDX] == NULL) ? SSL_AES128:0;
         *enc |= (ssl_cipher_methods[SSL_ENC_AES256_IDX] == NULL) ? SSL_AES256:0;
+        *enc |= (ssl_cipher_methods[SSL_ENC_AES128GCM_IDX] == NULL) ? SSL_AES128GCM:0;
+        *enc |= (ssl_cipher_methods[SSL_ENC_AES256GCM_IDX] == NULL) ? SSL_AES256GCM:0;
         *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA128_IDX] == NULL) ? SSL_CAMELLIA128:0;
         *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA256_IDX] == NULL) ? SSL_CAMELLIA256:0;
         *enc |= (ssl_cipher_methods[SSL_ENC_GOST89_IDX] == NULL) ? SSL_eGOST2814789CNT:0;
@@ -694,6 +765,8 @@ static void ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth, un
 
         *mac |= (ssl_digest_methods[SSL_MD_MD5_IDX ] == NULL) ? SSL_MD5 :0;
         *mac |= (ssl_digest_methods[SSL_MD_SHA1_IDX] == NULL) ? SSL_SHA1:0;
+        *mac |= (ssl_digest_methods[SSL_MD_SHA256_IDX] == NULL) ? SSL_SHA256:0;
+        *mac |= (ssl_digest_methods[SSL_MD_SHA384_IDX] == NULL) ? SSL_SHA384:0;
         *mac |= (ssl_digest_methods[SSL_MD_GOST94_IDX] == NULL) ? SSL_GOST94:0;
         *mac |= (ssl_digest_methods[SSL_MD_GOST89MAC_IDX] == NULL || ssl_mac_pkey_id[SSL_MD_GOST89MAC_IDX]==NID_undef)? SSL_GOST89MAC:0;
 
@@ -724,6 +797,9 @@ static void ssl_cipher_collect_ciphers(const SSL_METHOD *ssl_method,
                 c = ssl_method->get_cipher(i);
                 /* drop those that use any of that is not available */
                 if ((c != NULL) && c->valid &&
+#ifdef OPENSSL_FIPS
+                    (!FIPS_mode() || (c->algo_strength & SSL_FIPS)) &&
+#endif
                     !(c->algorithm_mkey & disabled_mkey) &&
                     !(c->algorithm_auth & disabled_auth) &&
                     !(c->algorithm_enc & disabled_enc) &&
@@ -1423,7 +1499,11 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
          */
         for (curr = head; curr != NULL; curr = curr->next)
                 {
+#ifdef OPENSSL_FIPS
+                if (curr->active && (!FIPS_mode() || curr->cipher->algo_strength & SSL_FIPS))
+#else
                 if (curr->active)
+#endif
                         {
                         sk_SSL_CIPHER_push(cipherstack, curr->cipher);
 #ifdef CIPHER_DEBUG
@@ -1480,6 +1560,8 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
                 ver="SSLv2";
         else if (alg_ssl & SSL_SSLV3)
                 ver="SSLv3";
+        else if (alg_ssl & SSL_TLSV1_2)
+                ver="TLSv1.2";
         else
                 ver="unknown";
 
@@ -1512,6 +1594,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
         case SSL_kPSK:
                 kx="PSK";
                 break;
+        case SSL_kSRP:
+                kx="SRP";
+                break;
         default:
                 kx="unknown";
                 }
@@ -1574,6 +1659,12 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
         case SSL_AES256:
                 enc="AES(256)";
                 break;
+        case SSL_AES128GCM:
+                enc="AESGCM(128)";
+                break;
+        case SSL_AES256GCM:
+                enc="AESGCM(256)";
+                break;
         case SSL_CAMELLIA128:
                 enc="Camellia(128)";
                 break;
@@ -1596,6 +1687,15 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
         case SSL_SHA1:
                 mac="SHA1";
                 break;
+        case SSL_SHA256:
+                mac="SHA256";
+                break;
+        case SSL_SHA384:
+                mac="SHA384";
+                break;
+        case SSL_AEAD:
+                mac="AEAD";
+                break;
         default:
                 mac="unknown";
                 break;
@@ -1653,6 +1753,11 @@ int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits)
         return(ret);
         }
 
+unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c)
+        {
+        return c->id;
+        }
+
 SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n)
         {
         SSL_COMP *ctmp;
diff --git a/src/lib/libssl/src/ssl/ssl_err.c b/src/lib/libssl/src/ssl/ssl_err.c
index e9be77109f..2577c6895a 100644
--- a/src/lib/libssl/src/ssl/ssl_err.c
+++ b/src/lib/libssl/src/ssl/ssl_err.c
@@ -80,6 +80,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_DTLS1_ACCEPT),  "DTLS1_ACCEPT"},
 {ERR_FUNC(SSL_F_DTLS1_ADD_CERT_TO_BUF), "DTLS1_ADD_CERT_TO_BUF"},
 {ERR_FUNC(SSL_F_DTLS1_BUFFER_RECORD),   "DTLS1_BUFFER_RECORD"},
+{ERR_FUNC(SSL_F_DTLS1_CHECK_TIMEOUT_NUM),       "DTLS1_CHECK_TIMEOUT_NUM"},
 {ERR_FUNC(SSL_F_DTLS1_CLIENT_HELLO),    "DTLS1_CLIENT_HELLO"},
 {ERR_FUNC(SSL_F_DTLS1_CONNECT), "DTLS1_CONNECT"},
 {ERR_FUNC(SSL_F_DTLS1_ENC),     "DTLS1_ENC"},
@@ -88,6 +89,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT),    "DTLS1_GET_MESSAGE_FRAGMENT"},
 {ERR_FUNC(SSL_F_DTLS1_GET_RECORD),      "DTLS1_GET_RECORD"},
 {ERR_FUNC(SSL_F_DTLS1_HANDLE_TIMEOUT),  "DTLS1_HANDLE_TIMEOUT"},
+{ERR_FUNC(SSL_F_DTLS1_HEARTBEAT),       "DTLS1_HEARTBEAT"},
 {ERR_FUNC(SSL_F_DTLS1_OUTPUT_CERT_CHAIN),       "DTLS1_OUTPUT_CERT_CHAIN"},
 {ERR_FUNC(SSL_F_DTLS1_PREPROCESS_FRAGMENT),     "DTLS1_PREPROCESS_FRAGMENT"},
 {ERR_FUNC(SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE),      "DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE"},
@@ -156,6 +158,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_SSL3_GET_KEY_EXCHANGE), "SSL3_GET_KEY_EXCHANGE"},
 {ERR_FUNC(SSL_F_SSL3_GET_MESSAGE),      "SSL3_GET_MESSAGE"},
 {ERR_FUNC(SSL_F_SSL3_GET_NEW_SESSION_TICKET),   "SSL3_GET_NEW_SESSION_TICKET"},
+{ERR_FUNC(SSL_F_SSL3_GET_NEXT_PROTO),   "SSL3_GET_NEXT_PROTO"},
 {ERR_FUNC(SSL_F_SSL3_GET_RECORD),       "SSL3_GET_RECORD"},
 {ERR_FUNC(SSL_F_SSL3_GET_SERVER_CERTIFICATE),   "SSL3_GET_SERVER_CERTIFICATE"},
 {ERR_FUNC(SSL_F_SSL3_GET_SERVER_DONE),  "SSL3_GET_SERVER_DONE"},
@@ -180,10 +183,12 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_SSL3_WRITE_PENDING),    "SSL3_WRITE_PENDING"},
 {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT),   "SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT"},
 {ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT),    "SSL_ADD_CLIENTHELLO_TLSEXT"},
+{ERR_FUNC(SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT),      "SSL_ADD_CLIENTHELLO_USE_SRTP_EXT"},
 {ERR_FUNC(SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK),    "SSL_add_dir_cert_subjects_to_stack"},
 {ERR_FUNC(SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK),   "SSL_add_file_cert_subjects_to_stack"},
 {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT),   "SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT"},
 {ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT),    "SSL_ADD_SERVERHELLO_TLSEXT"},
+{ERR_FUNC(SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT),      "SSL_ADD_SERVERHELLO_USE_SRTP_EXT"},
 {ERR_FUNC(SSL_F_SSL_BAD_METHOD),        "SSL_BAD_METHOD"},
 {ERR_FUNC(SSL_F_SSL_BYTES_TO_CIPHER_LIST),      "SSL_BYTES_TO_CIPHER_LIST"},
 {ERR_FUNC(SSL_F_SSL_CERT_DUP),  "SSL_CERT_DUP"},
@@ -200,6 +205,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_SSL_CREATE_CIPHER_LIST),        "SSL_CREATE_CIPHER_LIST"},
 {ERR_FUNC(SSL_F_SSL_CTRL),      "SSL_ctrl"},
 {ERR_FUNC(SSL_F_SSL_CTX_CHECK_PRIVATE_KEY),     "SSL_CTX_check_private_key"},
+{ERR_FUNC(SSL_F_SSL_CTX_MAKE_PROFILES), "SSL_CTX_MAKE_PROFILES"},
 {ERR_FUNC(SSL_F_SSL_CTX_NEW),   "SSL_CTX_new"},
 {ERR_FUNC(SSL_F_SSL_CTX_SET_CIPHER_LIST),       "SSL_CTX_set_cipher_list"},
 {ERR_FUNC(SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE),        "SSL_CTX_set_client_cert_engine"},
@@ -228,8 +234,10 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_SSL_NEW),       "SSL_new"},
 {ERR_FUNC(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT), "SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT"},
 {ERR_FUNC(SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT),  "SSL_PARSE_CLIENTHELLO_TLSEXT"},
+{ERR_FUNC(SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT),    "SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT"},
 {ERR_FUNC(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT), "SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT"},
 {ERR_FUNC(SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT),  "SSL_PARSE_SERVERHELLO_TLSEXT"},
+{ERR_FUNC(SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT),    "SSL_PARSE_SERVERHELLO_USE_SRTP_EXT"},
 {ERR_FUNC(SSL_F_SSL_PEEK),      "SSL_peek"},
 {ERR_FUNC(SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT),        "SSL_PREPARE_CLIENTHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT),        "SSL_PREPARE_SERVERHELLO_TLSEXT"},
@@ -238,6 +246,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_SSL_RSA_PUBLIC_ENCRYPT),        "SSL_RSA_PUBLIC_ENCRYPT"},
 {ERR_FUNC(SSL_F_SSL_SESSION_NEW),       "SSL_SESSION_new"},
 {ERR_FUNC(SSL_F_SSL_SESSION_PRINT_FP),  "SSL_SESSION_print_fp"},
+{ERR_FUNC(SSL_F_SSL_SESSION_SET1_ID_CONTEXT),   "SSL_SESSION_set1_id_context"},
 {ERR_FUNC(SSL_F_SSL_SESS_CERT_NEW),     "SSL_SESS_CERT_NEW"},
 {ERR_FUNC(SSL_F_SSL_SET_CERT),  "SSL_SET_CERT"},
 {ERR_FUNC(SSL_F_SSL_SET_CIPHER_LIST),   "SSL_set_cipher_list"},
@@ -251,6 +260,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_SSL_SET_TRUST), "SSL_set_trust"},
 {ERR_FUNC(SSL_F_SSL_SET_WFD),   "SSL_set_wfd"},
 {ERR_FUNC(SSL_F_SSL_SHUTDOWN),  "SSL_shutdown"},
+{ERR_FUNC(SSL_F_SSL_SRP_CTX_INIT),      "SSL_SRP_CTX_init"},
 {ERR_FUNC(SSL_F_SSL_UNDEFINED_CONST_FUNCTION),  "SSL_UNDEFINED_CONST_FUNCTION"},
 {ERR_FUNC(SSL_F_SSL_UNDEFINED_FUNCTION),        "SSL_UNDEFINED_FUNCTION"},
 {ERR_FUNC(SSL_F_SSL_UNDEFINED_VOID_FUNCTION),   "SSL_UNDEFINED_VOID_FUNCTION"},
@@ -270,6 +280,8 @@ static ERR_STRING_DATA SSL_str_functs[]=
 {ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE),      "TLS1_CHANGE_CIPHER_STATE"},
 {ERR_FUNC(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT), "TLS1_CHECK_SERVERHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_TLS1_ENC),      "TLS1_ENC"},
+{ERR_FUNC(SSL_F_TLS1_EXPORT_KEYING_MATERIAL),   "TLS1_EXPORT_KEYING_MATERIAL"},
+{ERR_FUNC(SSL_F_TLS1_HEARTBEAT),        "SSL_F_TLS1_HEARTBEAT"},
 {ERR_FUNC(SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT),       "TLS1_PREPARE_CLIENTHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT),       "TLS1_PREPARE_SERVERHELLO_TLSEXT"},
 {ERR_FUNC(SSL_F_TLS1_PRF),      "tls1_prf"},
@@ -312,6 +324,13 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_BAD_RSA_MODULUS_LENGTH),"bad rsa modulus length"},
 {ERR_REASON(SSL_R_BAD_RSA_SIGNATURE)     ,"bad rsa signature"},
 {ERR_REASON(SSL_R_BAD_SIGNATURE)         ,"bad signature"},
+{ERR_REASON(SSL_R_BAD_SRP_A_LENGTH)      ,"bad srp a length"},
+{ERR_REASON(SSL_R_BAD_SRP_B_LENGTH)      ,"bad srp b length"},
+{ERR_REASON(SSL_R_BAD_SRP_G_LENGTH)      ,"bad srp g length"},
+{ERR_REASON(SSL_R_BAD_SRP_N_LENGTH)      ,"bad srp n length"},
+{ERR_REASON(SSL_R_BAD_SRP_S_LENGTH)      ,"bad srp s length"},
+{ERR_REASON(SSL_R_BAD_SRTP_MKI_VALUE)    ,"bad srtp mki value"},
+{ERR_REASON(SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST),"bad srtp protection profile list"},
 {ERR_REASON(SSL_R_BAD_SSL_FILETYPE)      ,"bad ssl filetype"},
 {ERR_REASON(SSL_R_BAD_SSL_SESSION_ID_LENGTH),"bad ssl session id length"},
 {ERR_REASON(SSL_R_BAD_STATE)             ,"bad state"},
@@ -350,12 +369,15 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE),"ecc cert should have rsa signature"},
 {ERR_REASON(SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE),"ecc cert should have sha1 signature"},
 {ERR_REASON(SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER),"ecgroup too large for cipher"},
+{ERR_REASON(SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST),"empty srtp protection profile list"},
 {ERR_REASON(SSL_R_ENCRYPTED_LENGTH_TOO_LONG),"encrypted length too long"},
 {ERR_REASON(SSL_R_ERROR_GENERATING_TMP_RSA_KEY),"error generating tmp rsa key"},
 {ERR_REASON(SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST),"error in received cipher list"},
 {ERR_REASON(SSL_R_EXCESSIVE_MESSAGE_SIZE),"excessive message size"},
 {ERR_REASON(SSL_R_EXTRA_DATA_IN_MESSAGE) ,"extra data in message"},
 {ERR_REASON(SSL_R_GOT_A_FIN_BEFORE_A_CCS),"got a fin before a ccs"},
+{ERR_REASON(SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS),"got next proto before a ccs"},
+{ERR_REASON(SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION),"got next proto without seeing extension"},
 {ERR_REASON(SSL_R_HTTPS_PROXY_REQUEST)   ,"https proxy request"},
 {ERR_REASON(SSL_R_HTTP_REQUEST)          ,"http request"},
 {ERR_REASON(SSL_R_ILLEGAL_PADDING)       ,"illegal padding"},
@@ -364,6 +386,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_INVALID_COMMAND)       ,"invalid command"},
 {ERR_REASON(SSL_R_INVALID_COMPRESSION_ALGORITHM),"invalid compression algorithm"},
 {ERR_REASON(SSL_R_INVALID_PURPOSE)       ,"invalid purpose"},
+{ERR_REASON(SSL_R_INVALID_SRP_USERNAME)  ,"invalid srp username"},
 {ERR_REASON(SSL_R_INVALID_STATUS_RESPONSE),"invalid status response"},
 {ERR_REASON(SSL_R_INVALID_TICKET_KEYS_LENGTH),"invalid ticket keys length"},
 {ERR_REASON(SSL_R_INVALID_TRUST)         ,"invalid trust"},
@@ -393,6 +416,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_MISSING_RSA_CERTIFICATE),"missing rsa certificate"},
 {ERR_REASON(SSL_R_MISSING_RSA_ENCRYPTING_CERT),"missing rsa encrypting cert"},
 {ERR_REASON(SSL_R_MISSING_RSA_SIGNING_CERT),"missing rsa signing cert"},
+{ERR_REASON(SSL_R_MISSING_SRP_PARAM)     ,"can't find SRP server param"},
 {ERR_REASON(SSL_R_MISSING_TMP_DH_KEY)    ,"missing tmp dh key"},
 {ERR_REASON(SSL_R_MISSING_TMP_ECDH_KEY)  ,"missing tmp ecdh key"},
 {ERR_REASON(SSL_R_MISSING_TMP_RSA_KEY)   ,"missing tmp rsa key"},
@@ -422,6 +446,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_NO_RENEGOTIATION)      ,"no renegotiation"},
 {ERR_REASON(SSL_R_NO_REQUIRED_DIGEST)    ,"digest requred for handshake isn't computed"},
 {ERR_REASON(SSL_R_NO_SHARED_CIPHER)      ,"no shared cipher"},
+{ERR_REASON(SSL_R_NO_SRTP_PROFILES)      ,"no srtp profiles"},
 {ERR_REASON(SSL_R_NO_VERIFY_CALLBACK)    ,"no verify callback"},
 {ERR_REASON(SSL_R_NULL_SSL_CTX)          ,"null ssl ctx"},
 {ERR_REASON(SSL_R_NULL_SSL_METHOD_PASSED),"null ssl method passed"},
@@ -465,7 +490,12 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_SERVERHELLO_TLSEXT)    ,"serverhello tlsext"},
 {ERR_REASON(SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED),"session id context uninitialized"},
 {ERR_REASON(SSL_R_SHORT_READ)            ,"short read"},
+{ERR_REASON(SSL_R_SIGNATURE_ALGORITHMS_ERROR),"signature algorithms error"},
 {ERR_REASON(SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE),"signature for non signing certificate"},
+{ERR_REASON(SSL_R_SRP_A_CALC)            ,"error with the srp params"},
+{ERR_REASON(SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES),"srtp could not allocate profiles"},
+{ERR_REASON(SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG),"srtp protection profile list too long"},
+{ERR_REASON(SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE),"srtp unknown protection profile"},
 {ERR_REASON(SSL_R_SSL23_DOING_SESSION_ID_REUSE),"ssl23 doing session id reuse"},
 {ERR_REASON(SSL_R_SSL2_CONNECTION_ID_TOO_LONG),"ssl2 connection id too long"},
 {ERR_REASON(SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT),"ssl3 ext invalid ecpointformat"},
@@ -510,6 +540,9 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_TLSV1_UNRECOGNIZED_NAME),"tlsv1 unrecognized name"},
 {ERR_REASON(SSL_R_TLSV1_UNSUPPORTED_EXTENSION),"tlsv1 unsupported extension"},
 {ERR_REASON(SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER),"tls client cert req with anon cipher"},
+{ERR_REASON(SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT),"peer does not accept heartbearts"},
+{ERR_REASON(SSL_R_TLS_HEARTBEAT_PENDING) ,"heartbeat request already pending"},
+{ERR_REASON(SSL_R_TLS_ILLEGAL_EXPORTER_LABEL),"tls illegal exporter label"},
 {ERR_REASON(SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST),"tls invalid ecpointformat list"},
 {ERR_REASON(SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST),"tls peer did not respond with certificate list"},
 {ERR_REASON(SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG),"tls rsa encrypted value length is wrong"},
@@ -531,6 +564,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_UNKNOWN_CERTIFICATE_TYPE),"unknown certificate type"},
 {ERR_REASON(SSL_R_UNKNOWN_CIPHER_RETURNED),"unknown cipher returned"},
 {ERR_REASON(SSL_R_UNKNOWN_CIPHER_TYPE)   ,"unknown cipher type"},
+{ERR_REASON(SSL_R_UNKNOWN_DIGEST)        ,"unknown digest"},
 {ERR_REASON(SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE),"unknown key exchange type"},
 {ERR_REASON(SSL_R_UNKNOWN_PKEY_TYPE)     ,"unknown pkey type"},
 {ERR_REASON(SSL_R_UNKNOWN_PROTOCOL)      ,"unknown protocol"},
@@ -545,12 +579,14 @@ static ERR_STRING_DATA SSL_str_reasons[]=
 {ERR_REASON(SSL_R_UNSUPPORTED_PROTOCOL)  ,"unsupported protocol"},
 {ERR_REASON(SSL_R_UNSUPPORTED_SSL_VERSION),"unsupported ssl version"},
 {ERR_REASON(SSL_R_UNSUPPORTED_STATUS_TYPE),"unsupported status type"},
+{ERR_REASON(SSL_R_USE_SRTP_NOT_NEGOTIATED),"use srtp not negotiated"},
 {ERR_REASON(SSL_R_WRITE_BIO_NOT_SET)     ,"write bio not set"},
 {ERR_REASON(SSL_R_WRONG_CIPHER_RETURNED) ,"wrong cipher returned"},
 {ERR_REASON(SSL_R_WRONG_MESSAGE_TYPE)    ,"wrong message type"},
 {ERR_REASON(SSL_R_WRONG_NUMBER_OF_KEY_BITS),"wrong number of key bits"},
 {ERR_REASON(SSL_R_WRONG_SIGNATURE_LENGTH),"wrong signature length"},
 {ERR_REASON(SSL_R_WRONG_SIGNATURE_SIZE)  ,"wrong signature size"},
+{ERR_REASON(SSL_R_WRONG_SIGNATURE_TYPE)  ,"wrong signature type"},
 {ERR_REASON(SSL_R_WRONG_SSL_VERSION)     ,"wrong ssl version"},
 {ERR_REASON(SSL_R_WRONG_VERSION_NUMBER)  ,"wrong version number"},
 {ERR_REASON(SSL_R_X509_LIB)              ,"x509 lib"},
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index 8e89911f48..f82d071d6e 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -176,7 +176,10 @@ SSL3_ENC_METHOD ssl3_undef_enc_method={
         0,      /* client_finished_label_len */
         NULL,   /* server_finished_label */
         0,      /* server_finished_label_len */
-        (int (*)(int))ssl_undefined_function
+        (int (*)(int))ssl_undefined_function,
+        (int (*)(SSL *, unsigned char *, size_t, const char *,
+                 size_t, const unsigned char *, size_t,
+                 int use_context)) ssl_undefined_function,
         };
 
 int SSL_clear(SSL *s)
@@ -202,9 +205,9 @@ int SSL_clear(SSL *s)
        * needed because SSL_clear is not called when doing renegotiation) */
         /* This is set if we are doing dynamic renegotiation so keep
          * the old cipher.  It is sort of a SSL_clear_lite :-) */
-        if (s->new_session) return(1);
+        if (s->renegotiate) return(1);
 #else
-        if (s->new_session)
+        if (s->renegotiate)
                 {
                 SSLerr(SSL_F_SSL_CLEAR,ERR_R_INTERNAL_ERROR);
                 return 0;
@@ -353,6 +356,9 @@ SSL *SSL_new(SSL_CTX *ctx)
         s->tlsext_ocsp_resplen = -1;
         CRYPTO_add(&ctx->references,1,CRYPTO_LOCK_SSL_CTX);
         s->initial_ctx=ctx;
+# ifndef OPENSSL_NO_NEXTPROTONEG
+        s->next_proto_negotiated = NULL;
+# endif
 #endif
 
         s->verify_result=X509_V_OK;
@@ -586,6 +592,14 @@ void SSL_free(SSL *s)
                 kssl_ctx_free(s->kssl_ctx);
 #endif  /* OPENSSL_NO_KRB5 */
 
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
+        if (s->next_proto_negotiated)
+                OPENSSL_free(s->next_proto_negotiated);
+#endif
+
+        if (s->srtp_profiles)
+            sk_SRTP_PROTECTION_PROFILE_free(s->srtp_profiles);
+
         OPENSSL_free(s);
         }
 
@@ -1008,10 +1022,21 @@ int SSL_shutdown(SSL *s)
 
 int SSL_renegotiate(SSL *s)
         {
-        if (s->new_session == 0)
-                {
-                s->new_session=1;
-                }
+        if (s->renegotiate == 0)
+                s->renegotiate=1;
+
+        s->new_session=1;
+
+        return(s->method->ssl_renegotiate(s));
+        }
+
+int SSL_renegotiate_abbreviated(SSL *s)
+        {
+        if (s->renegotiate == 0)
+                s->renegotiate=1;
+
+        s->new_session=0;
+
         return(s->method->ssl_renegotiate(s));
         }
 
@@ -1019,7 +1044,7 @@ int SSL_renegotiate_pending(SSL *s)
         {
         /* becomes true when negotiation is requested;
          * false again once a handshake has finished */
-        return (s->new_session != 0);
+        return (s->renegotiate != 0);
         }
 
 long SSL_ctrl(SSL *s,int cmd,long larg,void *parg)
@@ -1054,8 +1079,10 @@ long SSL_ctrl(SSL *s,int cmd,long larg,void *parg)
                 s->max_cert_list=larg;
                 return(l);
         case SSL_CTRL_SET_MTU:
+#ifndef OPENSSL_NO_DTLS1
                 if (larg < (long)dtls1_min_mtu())
                         return 0;
+#endif
 
                 if (SSL_version(s) == DTLS1_VERSION ||
                     SSL_version(s) == DTLS1_BAD_VER)
@@ -1358,6 +1385,10 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p,
         for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
                 {
                 c=sk_SSL_CIPHER_value(sk,i);
+                /* Skip TLS v1.2 only ciphersuites if lower than v1.2 */
+                if ((c->algorithm_ssl & SSL_TLSV1_2) && 
+                        (TLS1_get_client_version(s) < TLS1_2_VERSION))
+                        continue;
 #ifndef OPENSSL_NO_KRB5
                 if (((c->algorithm_mkey & SSL_kKRB5) || (c->algorithm_auth & SSL_aKRB5)) &&
                     nokrb5)
@@ -1375,7 +1406,7 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p,
         /* If p == q, no ciphers and caller indicates an error. Otherwise
          * add SCSV if not renegotiating.
          */
-        if (p != q && !s->new_session)
+        if (p != q && !s->renegotiate)
                 {
                 static SSL_CIPHER scsv =
                         {
@@ -1422,7 +1453,7 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num,
                         (p[n-1] == (SSL3_CK_SCSV & 0xff)))
                         {
                         /* SCSV fatal if renegotiating */
-                        if (s->new_session)
+                        if (s->renegotiate)
                                 {
                                 SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST,SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING);
                                 ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE); 
@@ -1479,8 +1510,137 @@ int SSL_get_servername_type(const SSL *s)
                 return TLSEXT_NAMETYPE_host_name;
         return -1;
         }
+
+# ifndef OPENSSL_NO_NEXTPROTONEG
+/* SSL_select_next_proto implements the standard protocol selection. It is
+ * expected that this function is called from the callback set by
+ * SSL_CTX_set_next_proto_select_cb.
+ *
+ * The protocol data is assumed to be a vector of 8-bit, length prefixed byte
+ * strings. The length byte itself is not included in the length. A byte
+ * string of length 0 is invalid. No byte string may be truncated.
+ *
+ * The current, but experimental algorithm for selecting the protocol is:
+ *
+ * 1) If the server doesn't support NPN then this is indicated to the
+ * callback. In this case, the client application has to abort the connection
+ * or have a default application level protocol.
+ *
+ * 2) If the server supports NPN, but advertises an empty list then the
+ * client selects the first protcol in its list, but indicates via the
+ * API that this fallback case was enacted.
+ *
+ * 3) Otherwise, the client finds the first protocol in the server's list
+ * that it supports and selects this protocol. This is because it's
+ * assumed that the server has better information about which protocol
+ * a client should use.
+ *
+ * 4) If the client doesn't support any of the server's advertised
+ * protocols, then this is treated the same as case 2.
+ *
+ * It returns either
+ * OPENSSL_NPN_NEGOTIATED if a common protocol was found, or
+ * OPENSSL_NPN_NO_OVERLAP if the fallback case was reached.
+ */
+int SSL_select_next_proto(unsigned char **out, unsigned char *outlen, const unsigned char *server, unsigned int server_len, const unsigned char *client, unsigned int client_len)
+        {
+        unsigned int i, j;
+        const unsigned char *result;
+        int status = OPENSSL_NPN_UNSUPPORTED;
+
+        /* For each protocol in server preference order, see if we support it. */
+        for (i = 0; i < server_len; )
+                {
+                for (j = 0; j < client_len; )
+                        {
+                        if (server[i] == client[j] &&
+                            memcmp(&server[i+1], &client[j+1], server[i]) == 0)
+                                {
+                                /* We found a match */
+                                result = &server[i];
+                                status = OPENSSL_NPN_NEGOTIATED;
+                                goto found;
+                                }
+                        j += client[j];
+                        j++;
+                        }
+                i += server[i];
+                i++;
+                }
+
+        /* There's no overlap between our protocols and the server's list. */
+        result = client;
+        status = OPENSSL_NPN_NO_OVERLAP;
+
+        found:
+        *out = (unsigned char *) result + 1;
+        *outlen = result[0];
+        return status;
+        }
+
+/* SSL_get0_next_proto_negotiated sets *data and *len to point to the client's
+ * requested protocol for this connection and returns 0. If the client didn't
+ * request any protocol, then *data is set to NULL.
+ *
+ * Note that the client can request any protocol it chooses. The value returned
+ * from this function need not be a member of the list of supported protocols
+ * provided by the callback.
+ */
+void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data, unsigned *len)
+        {
+        *data = s->next_proto_negotiated;
+        if (!*data) {
+                *len = 0;
+        } else {
+                *len = s->next_proto_negotiated_len;
+        }
+}
+
+/* SSL_CTX_set_next_protos_advertised_cb sets a callback that is called when a
+ * TLS server needs a list of supported protocols for Next Protocol
+ * Negotiation. The returned list must be in wire format.  The list is returned
+ * by setting |out| to point to it and |outlen| to its length. This memory will
+ * not be modified, but one should assume that the SSL* keeps a reference to
+ * it.
+ *
+ * The callback should return SSL_TLSEXT_ERR_OK if it wishes to advertise. Otherwise, no
+ * such extension will be included in the ServerHello. */
+void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *ctx, int (*cb) (SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg), void *arg)
+        {
+        ctx->next_protos_advertised_cb = cb;
+        ctx->next_protos_advertised_cb_arg = arg;
+        }
+
+/* SSL_CTX_set_next_proto_select_cb sets a callback that is called when a
+ * client needs to select a protocol from the server's provided list. |out|
+ * must be set to point to the selected protocol (which may be within |in|).
+ * The length of the protocol name must be written into |outlen|. The server's
+ * advertised protocols are provided in |in| and |inlen|. The callback can
+ * assume that |in| is syntactically valid.
+ *
+ * The client must select a protocol. It is fatal to the connection if this
+ * callback returns a value other than SSL_TLSEXT_ERR_OK.
+ */
+void SSL_CTX_set_next_proto_select_cb(SSL_CTX *ctx, int (*cb) (SSL *s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg), void *arg)
+        {
+        ctx->next_proto_select_cb = cb;
+        ctx->next_proto_select_cb_arg = arg;
+        }
+# endif
 #endif
 
+int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
+        const char *label, size_t llen, const unsigned char *p, size_t plen,
+        int use_context)
+        {
+        if (s->version < TLS1_VERSION)
+                return -1;
+
+        return s->method->ssl3_enc->export_keying_material(s, out, olen, label,
+                                                           llen, p, plen,
+                                                           use_context);
+        }
+
 static unsigned long ssl_session_hash(const SSL_SESSION *a)
         {
         unsigned long l;
@@ -1524,6 +1684,14 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
                 return(NULL);
                 }
 
+#ifdef OPENSSL_FIPS
+        if (FIPS_mode() && (meth->version < TLS1_VERSION))      
+                {
+                SSLerr(SSL_F_SSL_CTX_NEW, SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
+                return NULL;
+                }
+#endif
+
         if (SSL_get_ex_data_X509_STORE_CTX_idx() < 0)
                 {
                 SSLerr(SSL_F_SSL_CTX_NEW,SSL_R_X509_VERIFICATION_SETUP_PROBLEMS);
@@ -1643,12 +1811,19 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
         ret->tlsext_status_cb = 0;
         ret->tlsext_status_arg = NULL;
 
+# ifndef OPENSSL_NO_NEXTPROTONEG
+        ret->next_protos_advertised_cb = 0;
+        ret->next_proto_select_cb = 0;
+# endif
 #endif
 #ifndef OPENSSL_NO_PSK
         ret->psk_identity_hint=NULL;
         ret->psk_client_callback=NULL;
         ret->psk_server_callback=NULL;
 #endif
+#ifndef OPENSSL_NO_SRP
+        SSL_CTX_SRP_CTX_init(ret);
+#endif
 #ifndef OPENSSL_NO_BUF_FREELISTS
         ret->freelist_max_len = SSL_MAX_BUF_FREELIST_LEN_DEFAULT;
         ret->rbuf_freelist = OPENSSL_malloc(sizeof(SSL3_BUF_FREELIST));
@@ -1777,10 +1952,16 @@ void SSL_CTX_free(SSL_CTX *a)
         a->comp_methods = NULL;
 #endif
 
+        if (a->srtp_profiles)
+                sk_SRTP_PROTECTION_PROFILE_free(a->srtp_profiles);
+
 #ifndef OPENSSL_NO_PSK
         if (a->psk_identity_hint)
                 OPENSSL_free(a->psk_identity_hint);
 #endif
+#ifndef OPENSSL_NO_SRP
+        SSL_CTX_SRP_CTX_free(a);
+#endif
 #ifndef OPENSSL_NO_ENGINE
         if (a->client_cert_engine)
                 ENGINE_finish(a->client_cert_engine);
@@ -2034,12 +2215,13 @@ void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
 
 #ifndef OPENSSL_NO_EC
 
-int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
+int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s)
         {
         unsigned long alg_k, alg_a;
         EVP_PKEY *pkey = NULL;
         int keysize = 0;
         int signature_nid = 0, md_nid = 0, pk_nid = 0;
+        const SSL_CIPHER *cs = s->s3->tmp.new_cipher;
 
         alg_k = cs->algorithm_mkey;
         alg_a = cs->algorithm_auth;
@@ -2069,7 +2251,7 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
                         SSLerr(SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG, SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT);
                         return 0;
                         }
-                if (alg_k & SSL_kECDHe)
+                if ((alg_k & SSL_kECDHe) && TLS1_get_version(s) < TLS1_2_VERSION)
                         {
                         /* signature alg must be ECDSA */
                         if (pk_nid != NID_X9_62_id_ecPublicKey)
@@ -2078,7 +2260,7 @@ int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs)
                                 return 0;
                                 }
                         }
-                if (alg_k & SSL_kECDHr)
+                if ((alg_k & SSL_kECDHr) && TLS1_get_version(s) < TLS1_2_VERSION)
                         {
                         /* signature alg must be RSA */
 
@@ -2168,34 +2350,36 @@ X509 *ssl_get_server_send_cert(SSL *s)
         return(c->pkeys[i].x509);
         }
 
-EVP_PKEY *ssl_get_sign_pkey(SSL *s,const SSL_CIPHER *cipher)
+EVP_PKEY *ssl_get_sign_pkey(SSL *s,const SSL_CIPHER *cipher, const EVP_MD **pmd)
         {
         unsigned long alg_a;
         CERT *c;
+        int idx = -1;
 
         alg_a = cipher->algorithm_auth;
         c=s->cert;
 
         if ((alg_a & SSL_aDSS) &&
                 (c->pkeys[SSL_PKEY_DSA_SIGN].privatekey != NULL))
-                return(c->pkeys[SSL_PKEY_DSA_SIGN].privatekey);
+                idx = SSL_PKEY_DSA_SIGN;
         else if (alg_a & SSL_aRSA)
                 {
                 if (c->pkeys[SSL_PKEY_RSA_SIGN].privatekey != NULL)
-                        return(c->pkeys[SSL_PKEY_RSA_SIGN].privatekey);
+                        idx = SSL_PKEY_RSA_SIGN;
                 else if (c->pkeys[SSL_PKEY_RSA_ENC].privatekey != NULL)
-                        return(c->pkeys[SSL_PKEY_RSA_ENC].privatekey);
-                else
-                        return(NULL);
+                        idx = SSL_PKEY_RSA_ENC;
                 }
         else if ((alg_a & SSL_aECDSA) &&
                  (c->pkeys[SSL_PKEY_ECC].privatekey != NULL))
-                return(c->pkeys[SSL_PKEY_ECC].privatekey);
-        else /* if (alg_a & SSL_aNULL) */
+                idx = SSL_PKEY_ECC;
+        if (idx == -1)
                 {
                 SSLerr(SSL_F_SSL_GET_SIGN_PKEY,ERR_R_INTERNAL_ERROR);
                 return(NULL);
                 }
+        if (pmd)
+                *pmd = c->pkeys[idx].digest;
+        return c->pkeys[idx].privatekey;
         }
 
 void ssl_update_cache(SSL *s,int mode)
@@ -2420,6 +2604,10 @@ SSL_METHOD *ssl_bad_method(int ver)
 
 const char *SSL_get_version(const SSL *s)
         {
+        if (s->version == TLS1_2_VERSION)
+                return("TLSv1.2");
+        else if (s->version == TLS1_1_VERSION)
+                return("TLSv1.1");
         if (s->version == TLS1_VERSION)
                 return("TLSv1");
         else if (s->version == SSL3_VERSION)
@@ -2514,6 +2702,7 @@ SSL *SSL_dup(SSL *s)
         ret->in_handshake = s->in_handshake;
         ret->handshake_func = s->handshake_func;
         ret->server = s->server;
+        ret->renegotiate = s->renegotiate;
         ret->new_session = s->new_session;
         ret->quiet_shutdown = s->quiet_shutdown;
         ret->shutdown=s->shutdown;
@@ -2779,6 +2968,11 @@ int SSL_state(const SSL *ssl)
         return(ssl->state);
         }
 
+void SSL_set_state(SSL *ssl, int state)
+        {
+        ssl->state = state;
+        }
+
 void SSL_set_verify_result(SSL *ssl,long arg)
         {
         ssl->verify_result=arg;
@@ -3037,6 +3231,16 @@ void ssl_clear_hash_ctx(EVP_MD_CTX **hash)
         *hash=NULL;
 }
 
+void SSL_set_debug(SSL *s, int debug)
+        {
+        s->debug = debug;
+        }
+
+int SSL_cache_hit(SSL *s)
+        {
+        return s->hit;
+        }
+
 #if defined(_WINDLL) && defined(OPENSSL_SYS_WIN16)
 #include "../crypto/bio/bss_file.c"
 #endif
@@ -3045,4 +3249,3 @@ IMPLEMENT_STACK_OF(SSL_CIPHER)
 IMPLEMENT_STACK_OF(SSL_COMP)
 IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER,
                                     ssl_cipher_id);
-
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index cea622a2a6..d87fd51cfa 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -170,7 +170,7 @@
 # define OPENSSL_EXTERN OPENSSL_EXPORT
 #endif
 
-#define PKCS1_CHECK
+#undef PKCS1_CHECK
 
 #define c2l(c,l)        (l = ((unsigned long)(*((c)++)))     , \
                          l|=(((unsigned long)(*((c)++)))<< 8), \
@@ -289,6 +289,7 @@
 #define SSL_kEECDH              0x00000080L /* ephemeral ECDH */
 #define SSL_kPSK                0x00000100L /* PSK */
 #define SSL_kGOST       0x00000200L /* GOST key exchange */
+#define SSL_kSRP        0x00000400L /* SRP */
 
 /* Bits for algorithm_auth (server authentication) */
 #define SSL_aRSA                0x00000001L /* RSA auth */
@@ -316,21 +317,29 @@
 #define SSL_CAMELLIA256         0x00000200L
 #define SSL_eGOST2814789CNT     0x00000400L
 #define SSL_SEED                0x00000800L
+#define SSL_AES128GCM           0x00001000L
+#define SSL_AES256GCM           0x00002000L
 
-#define SSL_AES                 (SSL_AES128|SSL_AES256)
+#define SSL_AES                 (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM)
 #define SSL_CAMELLIA            (SSL_CAMELLIA128|SSL_CAMELLIA256)
 
 
 /* Bits for algorithm_mac (symmetric authentication) */
+
 #define SSL_MD5                 0x00000001L
 #define SSL_SHA1                0x00000002L
 #define SSL_GOST94      0x00000004L
 #define SSL_GOST89MAC   0x00000008L
+#define SSL_SHA256              0x00000010L
+#define SSL_SHA384              0x00000020L
+/* Not a real MAC, just an indication it is part of cipher */
+#define SSL_AEAD                0x00000040L
 
 /* Bits for algorithm_ssl (protocol version) */
 #define SSL_SSLV2               0x00000001L
 #define SSL_SSLV3               0x00000002L
 #define SSL_TLSV1               SSL_SSLV3       /* for now */
+#define SSL_TLSV1_2             0x00000004L
 
 
 /* Bits for algorithm2 (handshake digests and other extra flags) */
@@ -338,15 +347,21 @@
 #define SSL_HANDSHAKE_MAC_MD5 0x10
 #define SSL_HANDSHAKE_MAC_SHA 0x20
 #define SSL_HANDSHAKE_MAC_GOST94 0x40
+#define SSL_HANDSHAKE_MAC_SHA256 0x80
+#define SSL_HANDSHAKE_MAC_SHA384 0x100
 #define SSL_HANDSHAKE_MAC_DEFAULT (SSL_HANDSHAKE_MAC_MD5 | SSL_HANDSHAKE_MAC_SHA)
 
 /* When adding new digest in the ssl_ciph.c and increment SSM_MD_NUM_IDX
  * make sure to update this constant too */
-#define SSL_MAX_DIGEST 4
+#define SSL_MAX_DIGEST 6
+
+#define TLS1_PRF_DGST_MASK      (0xff << TLS1_PRF_DGST_SHIFT)
 
-#define TLS1_PRF_DGST_SHIFT 8
+#define TLS1_PRF_DGST_SHIFT 10
 #define TLS1_PRF_MD5 (SSL_HANDSHAKE_MAC_MD5 << TLS1_PRF_DGST_SHIFT)
 #define TLS1_PRF_SHA1 (SSL_HANDSHAKE_MAC_SHA << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF_SHA256 (SSL_HANDSHAKE_MAC_SHA256 << TLS1_PRF_DGST_SHIFT)
+#define TLS1_PRF_SHA384 (SSL_HANDSHAKE_MAC_SHA384 << TLS1_PRF_DGST_SHIFT)
 #define TLS1_PRF_GOST94 (SSL_HANDSHAKE_MAC_GOST94 << TLS1_PRF_DGST_SHIFT)
 #define TLS1_PRF (TLS1_PRF_MD5 | TLS1_PRF_SHA1)
 
@@ -457,6 +472,8 @@ typedef struct cert_pkey_st
         {
         X509 *x509;
         EVP_PKEY *privatekey;
+        /* Digest to use when signing */
+        const EVP_MD *digest;
         } CERT_PKEY;
 
 typedef struct cert_st
@@ -554,6 +571,10 @@ typedef struct ssl3_enc_method
         const char *server_finished_label;
         int server_finished_label_len;
         int (*alert_value)(int);
+        int (*export_keying_material)(SSL *, unsigned char *, size_t,
+                                      const char *, size_t,
+                                      const unsigned char *, size_t,
+                                      int use_context);
         } SSL3_ENC_METHOD;
 
 #ifndef OPENSSL_NO_COMP
@@ -591,11 +612,12 @@ extern SSL3_ENC_METHOD TLSv1_enc_data;
 extern SSL3_ENC_METHOD SSLv3_enc_data;
 extern SSL3_ENC_METHOD DTLSv1_enc_data;
 
-#define IMPLEMENT_tls1_meth_func(func_name, s_accept, s_connect, s_get_meth) \
+#define IMPLEMENT_tls_meth_func(version, func_name, s_accept, s_connect, \
+                                s_get_meth) \
 const SSL_METHOD *func_name(void)  \
         { \
         static const SSL_METHOD func_name##_data= { \
-                TLS1_VERSION, \
+                version, \
                 tls1_new, \
                 tls1_clear, \
                 tls1_free, \
@@ -669,7 +691,7 @@ const SSL_METHOD *func_name(void)  \
 const SSL_METHOD *func_name(void)  \
         { \
         static const SSL_METHOD func_name##_data= { \
-        TLS1_VERSION, \
+        TLS1_2_VERSION, \
         tls1_new, \
         tls1_clear, \
         tls1_free, \
@@ -752,7 +774,7 @@ const SSL_METHOD *func_name(void)  \
                 ssl3_read, \
                 ssl3_peek, \
                 ssl3_write, \
-                ssl3_shutdown, \
+                dtls1_shutdown, \
                 ssl3_renegotiate, \
                 ssl3_renegotiate_check, \
                 dtls1_get_message, \
@@ -809,7 +831,7 @@ int ssl_undefined_function(SSL *s);
 int ssl_undefined_void_function(void);
 int ssl_undefined_const_function(const SSL *s);
 X509 *ssl_get_server_send_cert(SSL *);
-EVP_PKEY *ssl_get_sign_pkey(SSL *,const SSL_CIPHER *);
+EVP_PKEY *ssl_get_sign_pkey(SSL *s,const SSL_CIPHER *c, const EVP_MD **pmd);
 int ssl_cert_type(X509 *x,EVP_PKEY *pkey);
 void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher);
 STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);
@@ -943,6 +965,7 @@ void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr);
 void dtls1_reset_seq_numbers(SSL *s, int rw);
 long dtls1_default_timeout(void);
 struct timeval* dtls1_get_timeout(SSL *s, struct timeval* timeleft);
+int dtls1_check_timeout_num(SSL *s);
 int dtls1_handle_timeout(SSL *s);
 const SSL_CIPHER *dtls1_get_cipher(unsigned int u);
 void dtls1_start_timer(SSL *s);
@@ -968,6 +991,9 @@ int ssl3_get_server_certificate(SSL *s);
 int ssl3_check_cert_and_algorithm(SSL *s);
 #ifndef OPENSSL_NO_TLSEXT
 int ssl3_check_finished(SSL *s);
+# ifndef OPENSSL_NO_NEXTPROTONEG
+int ssl3_send_next_proto(SSL *s);
+# endif
 #endif
 
 int dtls1_client_hello(SSL *s);
@@ -986,6 +1012,9 @@ int ssl3_check_client_hello(SSL *s);
 int ssl3_get_client_certificate(SSL *s);
 int ssl3_get_client_key_exchange(SSL *s);
 int ssl3_get_cert_verify(SSL *s);
+#ifndef OPENSSL_NO_NEXTPROTONEG
+int ssl3_get_next_proto(SSL *s);
+#endif
 
 int dtls1_send_hello_request(SSL *s);
 int dtls1_send_server_hello(SSL *s);
@@ -1013,6 +1042,7 @@ int	dtls1_connect(SSL *s);
 void dtls1_free(SSL *s);
 void dtls1_clear(SSL *s);
 long dtls1_ctrl(SSL *s,int cmd, long larg, void *parg);
+int dtls1_shutdown(SSL *s);
 
 long dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok);
 int dtls1_get_record(SSL *s);
@@ -1033,12 +1063,15 @@ int tls1_cert_verify_mac(SSL *s, int md_nid, unsigned char *p);
 int tls1_mac(SSL *ssl, unsigned char *md, int snd);
 int tls1_generate_master_secret(SSL *s, unsigned char *out,
         unsigned char *p, int len);
+int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
+        const char *label, size_t llen,
+        const unsigned char *p, size_t plen, int use_context);
 int tls1_alert_code(int code);
 int ssl3_alert_code(int code);
 int ssl_ok(SSL *s);
 
 #ifndef OPENSSL_NO_ECDH
-int ssl_check_srvr_ecc_cert_and_alg(X509 *x, const SSL_CIPHER *cs);
+int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);
 #endif
 
 SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n);
@@ -1058,6 +1091,13 @@ int ssl_prepare_serverhello_tlsext(SSL *s);
 int ssl_check_clienthello_tlsext(SSL *s);
 int ssl_check_serverhello_tlsext(SSL *s);
 
+#ifndef OPENSSL_NO_HEARTBEATS
+int tls1_heartbeat(SSL *s);
+int dtls1_heartbeat(SSL *s);
+int tls1_process_heartbeat(SSL *s);
+int dtls1_process_heartbeat(SSL *s);
+#endif
+
 #ifdef OPENSSL_NO_SHA256
 #define tlsext_tick_md  EVP_sha1
 #else
@@ -1065,6 +1105,12 @@ int ssl_check_serverhello_tlsext(SSL *s);
 #endif
 int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
                                 const unsigned char *limit, SSL_SESSION **ret);
+
+int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk,
+                                const EVP_MD *md);
+int tls12_get_sigid(const EVP_PKEY *pk);
+const EVP_MD *tls12_get_hash(unsigned char hash_alg);
+
 #endif
 EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash,const EVP_MD *md) ;
 void ssl_clear_hash_ctx(EVP_MD_CTX **hash);
@@ -1076,4 +1122,13 @@ int ssl_add_clienthello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
                                         int maxlen);
 int ssl_parse_clienthello_renegotiate_ext(SSL *s, unsigned char *d, int len,
                                           int *al);
+long ssl_get_algorithm2(SSL *s);
+int tls1_process_sigalgs(SSL *s, const unsigned char *data, int dsize);
+int tls12_get_req_sig_algs(SSL *s, unsigned char *p);
+
+int ssl_add_clienthello_use_srtp_ext(SSL *s, unsigned char *p, int *len, int maxlen);
+int ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len,int *al);
+int ssl_add_serverhello_use_srtp_ext(SSL *s, unsigned char *p, int *len, int maxlen);
+int ssl_parse_serverhello_use_srtp_ext(SSL *s, unsigned char *d, int len,int *al);
+
 #endif
diff --git a/src/lib/libssl/src/ssl/ssl_sess.c b/src/lib/libssl/src/ssl/ssl_sess.c
index 8e5d8a0972..ad40fadd02 100644
--- a/src/lib/libssl/src/ssl/ssl_sess.c
+++ b/src/lib/libssl/src/ssl/ssl_sess.c
@@ -218,6 +218,9 @@ SSL_SESSION *SSL_SESSION_new(void)
         ss->psk_identity_hint=NULL;
         ss->psk_identity=NULL;
 #endif
+#ifndef OPENSSL_NO_SRP
+        ss->srp_username=NULL;
+#endif
         return(ss);
         }
 
@@ -228,6 +231,11 @@ const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len)
         return s->session_id;
         }
 
+unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s)
+        {
+        return s->compress_meth;
+        }
+
 /* Even with SSLv2, we have 16 bytes (128 bits) of session ID space. SSLv3/TLSv1
  * has 32 bytes (256 bits). As such, filling the ID with random gunk repeatedly
  * until we have no conflict is going to complete in one iteration pretty much
@@ -300,6 +308,16 @@ int ssl_get_new_session(SSL *s, int session)
                         ss->ssl_version=TLS1_VERSION;
                         ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
                         }
+                else if (s->version == TLS1_1_VERSION)
+                        {
+                        ss->ssl_version=TLS1_1_VERSION;
+                        ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
+                        }
+                else if (s->version == TLS1_2_VERSION)
+                        {
+                        ss->ssl_version=TLS1_2_VERSION;
+                        ss->session_id_length=SSL3_SSL_SESSION_ID_LENGTH;
+                        }
                 else if (s->version == DTLS1_BAD_VER)
                         {
                         ss->ssl_version=DTLS1_BAD_VER;
@@ -423,6 +441,25 @@ int ssl_get_new_session(SSL *s, int session)
         return(1);
         }
 
+/* ssl_get_prev attempts to find an SSL_SESSION to be used to resume this
+ * connection. It is only called by servers.
+ *
+ *   session_id: points at the session ID in the ClientHello. This code will
+ *       read past the end of this in order to parse out the session ticket
+ *       extension, if any.
+ *   len: the length of the session ID.
+ *   limit: a pointer to the first byte after the ClientHello.
+ *
+ * Returns:
+ *   -1: error
+ *    0: a session may have been found.
+ *
+ * Side effects:
+ *   - If a session is found then s->session is pointed at it (after freeing an
+ *     existing session if need be) and s->verify_result is set from the session.
+ *   - Both for new and resumed sessions, s->tlsext_ticket_expected is set to 1
+ *     if the server should issue a new session ticket (to 0 otherwise).
+ */
 int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
                         const unsigned char *limit)
         {
@@ -430,27 +467,39 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
 
         SSL_SESSION *ret=NULL;
         int fatal = 0;
+        int try_session_cache = 1;
 #ifndef OPENSSL_NO_TLSEXT
         int r;
 #endif
 
         if (len > SSL_MAX_SSL_SESSION_ID_LENGTH)
                 goto err;
+
+        if (len == 0)
+                try_session_cache = 0;
+
 #ifndef OPENSSL_NO_TLSEXT
-        r = tls1_process_ticket(s, session_id, len, limit, &ret);
-        if (r == -1)
+        r = tls1_process_ticket(s, session_id, len, limit, &ret); /* sets s->tlsext_ticket_expected */
+        switch (r)
                 {
+        case -1: /* Error during processing */
                 fatal = 1;
                 goto err;
+        case 0: /* No ticket found */
+        case 1: /* Zero length ticket found */
+                break; /* Ok to carry on processing session id. */
+        case 2: /* Ticket found but not decrypted. */
+        case 3: /* Ticket decrypted, *ret has been set. */
+                try_session_cache = 0;
+                break;
+        default:
+                abort();
                 }
-        else if (r == 0 || (!ret && !len))
-                goto err;
-        else if (!ret && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
-#else
-        if (len == 0)
-                goto err;
-        if (!(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
 #endif
+
+        if (try_session_cache &&
+            ret == NULL &&
+            !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
                 {
                 SSL_SESSION data;
                 data.ssl_version=s->version;
@@ -461,20 +510,22 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
                 CRYPTO_r_lock(CRYPTO_LOCK_SSL_CTX);
                 ret=lh_SSL_SESSION_retrieve(s->session_ctx->sessions,&data);
                 if (ret != NULL)
-                    /* don't allow other threads to steal it: */
-                    CRYPTO_add(&ret->references,1,CRYPTO_LOCK_SSL_SESSION);
+                        {
+                        /* don't allow other threads to steal it: */
+                        CRYPTO_add(&ret->references,1,CRYPTO_LOCK_SSL_SESSION);
+                        }
                 CRYPTO_r_unlock(CRYPTO_LOCK_SSL_CTX);
+                if (ret == NULL)
+                        s->session_ctx->stats.sess_miss++;
                 }
 
-        if (ret == NULL)
+        if (try_session_cache &&
+            ret == NULL &&
+            s->session_ctx->get_session_cb != NULL)
                 {
                 int copy=1;
         
-                s->session_ctx->stats.sess_miss++;
-                ret=NULL;
-                if (s->session_ctx->get_session_cb != NULL
-                    && (ret=s->session_ctx->get_session_cb(s,session_id,len,&copy))
-                       != NULL)
+                if ((ret=s->session_ctx->get_session_cb(s,session_id,len,&copy)))
                         {
                         s->session_ctx->stats.sess_cb_hit++;
 
@@ -493,23 +544,18 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
                                  * things are very strange */
                                 SSL_CTX_add_session(s->session_ctx,ret);
                         }
-                if (ret == NULL)
-                        goto err;
                 }
 
-        /* Now ret is non-NULL, and we own one of its reference counts. */
+        if (ret == NULL)
+                goto err;
+
+        /* Now ret is non-NULL and we own one of its reference counts. */
 
         if (ret->sid_ctx_length != s->sid_ctx_length
             || memcmp(ret->sid_ctx,s->sid_ctx,ret->sid_ctx_length))
                 {
-                /* We've found the session named by the client, but we don't
+                /* We have the session requested by the client, but we don't
                  * want to use it in this context. */
-
-#if 0 /* The client cannot always know when a session is not appropriate,
-       * so we shouldn't generate an error message. */
-
-                SSLerr(SSL_F_SSL_GET_PREV_SESSION,SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT);
-#endif
                 goto err; /* treat like cache miss */
                 }
         
@@ -546,39 +592,38 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
                         goto err;
                 }
 
-
-#if 0 /* This is way too late. */
-
-        /* If a thread got the session, then 'swaped', and another got
-         * it and then due to a time-out decided to 'OPENSSL_free' it we could
-         * be in trouble.  So I'll increment it now, then double decrement
-         * later - am I speaking rubbish?. */
-        CRYPTO_add(&ret->references,1,CRYPTO_LOCK_SSL_SESSION);
-#endif
-
         if (ret->timeout < (long)(time(NULL) - ret->time)) /* timeout */
                 {
                 s->session_ctx->stats.sess_timeout++;
-                /* remove it from the cache */
-                SSL_CTX_remove_session(s->session_ctx,ret);
+                if (try_session_cache)
+                        {
+                        /* session was from the cache, so remove it */
+                        SSL_CTX_remove_session(s->session_ctx,ret);
+                        }
                 goto err;
                 }
 
         s->session_ctx->stats.sess_hit++;
 
-        /* ret->time=time(NULL); */ /* rezero timeout? */
-        /* again, just leave the session 
-         * if it is the same session, we have just incremented and
-         * then decremented the reference count :-) */
         if (s->session != NULL)
                 SSL_SESSION_free(s->session);
         s->session=ret;
         s->verify_result = s->session->verify_result;
-        return(1);
+        return 1;
 
  err:
         if (ret != NULL)
+                {
                 SSL_SESSION_free(ret);
+#ifndef OPENSSL_NO_TLSEXT
+                if (!try_session_cache)
+                        {
+                        /* The session was from a ticket, so we should
+                         * issue a ticket for the new session */
+                        s->tlsext_ticket_expected = 1;
+                        }
+#endif
+                }
         if (fatal)
                 return -1;
         else
@@ -729,6 +774,10 @@ void SSL_SESSION_free(SSL_SESSION *ss)
         if (ss->psk_identity != NULL)
                 OPENSSL_free(ss->psk_identity);
 #endif
+#ifndef OPENSSL_NO_SRP
+        if (ss->srp_username != NULL)
+                OPENSSL_free(ss->srp_username);
+#endif
         OPENSSL_cleanse(ss,sizeof(*ss));
         OPENSSL_free(ss);
         }
@@ -753,10 +802,6 @@ int SSL_set_session(SSL *s, SSL_SESSION *session)
                         {
                         if (!SSL_set_ssl_method(s,meth))
                                 return(0);
-                        if (s->ctx->session_timeout == 0)
-                                session->timeout=SSL_get_default_timeout(s);
-                        else
-                                session->timeout=s->ctx->session_timeout;
                         }
 
 #ifndef OPENSSL_NO_KRB5
@@ -824,6 +869,25 @@ long SSL_SESSION_set_time(SSL_SESSION *s, long t)
         return(t);
         }
 
+X509 *SSL_SESSION_get0_peer(SSL_SESSION *s)
+        {
+        return s->peer;
+        }
+
+int SSL_SESSION_set1_id_context(SSL_SESSION *s,const unsigned char *sid_ctx,
+                               unsigned int sid_ctx_len)
+        {
+        if(sid_ctx_len > SSL_MAX_SID_CTX_LENGTH)
+                {
+                SSLerr(SSL_F_SSL_SESSION_SET1_ID_CONTEXT,SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG);
+                return 0;
+                }
+        s->sid_ctx_length=sid_ctx_len;
+        memcpy(s->sid_ctx,sid_ctx,sid_ctx_len);
+
+        return 1;
+        }
+
 long SSL_CTX_set_timeout(SSL_CTX *s, long t)
         {
         long l;
diff --git a/src/lib/libssl/src/ssl/ssl_txt.c b/src/lib/libssl/src/ssl/ssl_txt.c
index 3122440e26..6479d52c0c 100644
--- a/src/lib/libssl/src/ssl/ssl_txt.c
+++ b/src/lib/libssl/src/ssl/ssl_txt.c
@@ -115,6 +115,10 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
                 s="SSLv2";
         else if (x->ssl_version == SSL3_VERSION)
                 s="SSLv3";
+        else if (x->ssl_version == TLS1_2_VERSION)
+                s="TLSv1.2";
+        else if (x->ssl_version == TLS1_1_VERSION)
+                s="TLSv1.1";
         else if (x->ssl_version == TLS1_VERSION)
                 s="TLSv1";
         else if (x->ssl_version == DTLS1_VERSION)
@@ -187,6 +191,10 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
         if (BIO_puts(bp,"\n    PSK identity hint: ") <= 0) goto err;
         if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0) goto err;
 #endif
+#ifndef OPENSSL_NO_SRP
+        if (BIO_puts(bp,"\n    SRP username: ") <= 0) goto err;
+        if (BIO_printf(bp, "%s", x->srp_username ? x->srp_username : "None") <= 0) goto err;
+#endif
 #ifndef OPENSSL_NO_TLSEXT
         if (x->tlsext_tick_lifetime_hint)
                 {
diff --git a/src/lib/libssl/src/ssl/ssltest.c b/src/lib/libssl/src/ssl/ssltest.c
index 0bb4fa43bd..0f8fd3902d 100644
--- a/src/lib/libssl/src/ssl/ssltest.c
+++ b/src/lib/libssl/src/ssl/ssltest.c
@@ -181,6 +181,9 @@
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
+#ifndef OPENSSL_NO_SRP
+#include <openssl/srp.h>
+#endif
 #include <openssl/bn.h>
 
 #define _XOPEN_SOURCE_EXTENDED  1 /* Or gethostname won't be declared properly
@@ -246,6 +249,49 @@ static unsigned int psk_server_callback(SSL *ssl, const char *identity, unsigned
         unsigned int max_psk_len);
 #endif
 
+#ifndef OPENSSL_NO_SRP
+/* SRP client */
+/* This is a context that we pass to all callbacks */
+typedef struct srp_client_arg_st
+        {
+        char *srppassin;
+        char *srplogin;
+        } SRP_CLIENT_ARG;
+
+#define PWD_STRLEN 1024
+
+static char * MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
+        {
+        SRP_CLIENT_ARG *srp_client_arg = (SRP_CLIENT_ARG *)arg;
+        return BUF_strdup((char *)srp_client_arg->srppassin);
+        }
+
+/* SRP server */
+/* This is a context that we pass to SRP server callbacks */
+typedef struct srp_server_arg_st
+        {
+        char *expected_user;
+        char *pass;
+        } SRP_SERVER_ARG;
+
+static int MS_CALLBACK ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
+        {
+        SRP_SERVER_ARG * p = (SRP_SERVER_ARG *) arg;
+
+        if (strcmp(p->expected_user, SSL_get_srp_username(s)) != 0)
+                {
+                fprintf(stderr, "User %s doesn't exist\n", SSL_get_srp_username(s));
+                return SSL3_AL_FATAL;
+                }
+        if (SSL_set_srp_server_param_pw(s,p->expected_user,p->pass,"1024")<0)
+                {
+                *ad = SSL_AD_INTERNAL_ERROR;
+                return SSL3_AL_FATAL;
+                }
+        return SSL_ERROR_NONE;
+        }
+#endif
+
 static BIO *bio_err=NULL;
 static BIO *bio_stdout=NULL;
 
@@ -268,6 +314,9 @@ static void sv_usage(void)
         {
         fprintf(stderr,"usage: ssltest [args ...]\n");
         fprintf(stderr,"\n");
+#ifdef OPENSSL_FIPS
+        fprintf(stderr,"-F             - run test in FIPS mode\n");
+#endif
         fprintf(stderr," -server_auth  - check server certificate\n");
         fprintf(stderr," -client_auth  - do client authentication\n");
         fprintf(stderr," -proxy        - allow proxy certificates\n");
@@ -289,6 +338,10 @@ static void sv_usage(void)
 #ifndef OPENSSL_NO_PSK
         fprintf(stderr," -psk arg      - PSK in hex (without 0x)\n");
 #endif
+#ifndef OPENSSL_NO_SRP
+        fprintf(stderr," -srpuser user  - SRP username to use\n");
+        fprintf(stderr," -srppass arg   - password for 'user'\n");
+#endif
 #ifndef OPENSSL_NO_SSL2
         fprintf(stderr," -ssl2         - use SSLv2\n");
 #endif
@@ -476,6 +529,12 @@ int main(int argc, char *argv[])
 #ifndef OPENSSL_NO_ECDH
         EC_KEY *ecdh = NULL;
 #endif
+#ifndef OPENSSL_NO_SRP
+        /* client */
+        SRP_CLIENT_ARG srp_client_arg = {NULL,NULL};
+        /* server */
+        SRP_SERVER_ARG srp_server_arg = {NULL,NULL};
+#endif
         int no_dhe = 0;
         int no_ecdhe = 0;
         int no_psk = 0;
@@ -487,6 +546,9 @@ int main(int argc, char *argv[])
 #endif
         STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
         int test_cipherlist = 0;
+#ifdef OPENSSL_FIPS
+        int fips_mode=0;
+#endif
 
         verbose = 0;
         debug = 0;
@@ -518,7 +580,16 @@ int main(int argc, char *argv[])
 
         while (argc >= 1)
                 {
-                if      (strcmp(*argv,"-server_auth") == 0)
+                if(!strcmp(*argv,"-F"))
+                        {
+#ifdef OPENSSL_FIPS
+                        fips_mode=1;
+#else
+                        fprintf(stderr,"not compiled with FIPS support, so exitting without running.\n");
+                        EXIT(0);
+#endif
+                        }
+                else if (strcmp(*argv,"-server_auth") == 0)
                         server_auth=1;
                 else if (strcmp(*argv,"-client_auth") == 0)
                         client_auth=1;
@@ -572,6 +643,20 @@ int main(int argc, char *argv[])
                         no_psk=1;
 #endif
                         }
+#ifndef OPENSSL_NO_SRP
+                else if (strcmp(*argv,"-srpuser") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srp_server_arg.expected_user = srp_client_arg.srplogin= *(++argv);
+                        tls1=1;
+                        }
+                else if (strcmp(*argv,"-srppass") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        srp_server_arg.pass = srp_client_arg.srppassin= *(++argv);
+                        tls1=1;
+                        }
+#endif
                 else if (strcmp(*argv,"-ssl2") == 0)
                         ssl2=1;
                 else if (strcmp(*argv,"-tls1") == 0)
@@ -714,6 +799,20 @@ bad:
                 EXIT(1);
                 }
 
+#ifdef OPENSSL_FIPS
+        if(fips_mode)
+                {
+                if(!FIPS_mode_set(1))
+                        {
+                        ERR_load_crypto_strings();
+                        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
+                        EXIT(1);
+                        }
+                else
+                        fprintf(stderr,"*** IN FIPS MODE ***\n");
+                }
+#endif
+
         if (print_time)
                 {
                 if (!bio_pair)
@@ -837,7 +936,11 @@ bad:
                                 }
                         }
                 else
+#ifdef OPENSSL_NO_EC2M
+                        nid = NID_X9_62_prime256v1;
+#else
                         nid = NID_sect163r2;
+#endif
 
                 ecdh = EC_KEY_new_by_curve_name(nid);
                 if (ecdh == NULL)
@@ -940,6 +1043,26 @@ bad:
                         }
 #endif
                 }
+#ifndef OPENSSL_NO_SRP
+        if (srp_client_arg.srplogin)
+                {
+                if (!SSL_CTX_set_srp_username(c_ctx, srp_client_arg.srplogin))
+                        {
+                        BIO_printf(bio_err,"Unable to set SRP username\n");
+                        goto end;
+                        }
+                SSL_CTX_set_srp_cb_arg(c_ctx,&srp_client_arg);
+                SSL_CTX_set_srp_client_pwd_callback(c_ctx, ssl_give_srp_client_pwd_cb);
+                /*SSL_CTX_set_srp_strength(c_ctx, srp_client_arg.strength);*/
+                }
+
+        if (srp_server_arg.expected_user != NULL)
+                {
+                SSL_CTX_set_verify(s_ctx,SSL_VERIFY_NONE,verify_callback);
+                SSL_CTX_set_srp_cb_arg(s_ctx, &srp_server_arg);
+                SSL_CTX_set_srp_username_callback(s_ctx, ssl_srp_server_param_cb);
+                }
+#endif
 
         c_ssl=SSL_new(c_ctx);
         s_ssl=SSL_new(s_ctx);
@@ -2164,15 +2287,7 @@ static int MS_CALLBACK app_verify_callback(X509_STORE_CTX *ctx, void *arg)
                 }
 
 #ifndef OPENSSL_NO_X509_VERIFY
-# ifdef OPENSSL_FIPS
-        if(s->version == TLS1_VERSION)
-                FIPS_allow_md5(1);
-# endif
         ok = X509_verify_cert(ctx);
-# ifdef OPENSSL_FIPS
-        if(s->version == TLS1_VERSION)
-                FIPS_allow_md5(0);
-# endif
 #endif
 
         if (cb_arg->proxy_auth)
diff --git a/src/lib/libssl/src/ssl/t1_clnt.c b/src/lib/libssl/src/ssl/t1_clnt.c
index c87af17712..578617ed84 100644
--- a/src/lib/libssl/src/ssl/t1_clnt.c
+++ b/src/lib/libssl/src/ssl/t1_clnt.c
@@ -66,13 +66,26 @@
 static const SSL_METHOD *tls1_get_client_method(int ver);
 static const SSL_METHOD *tls1_get_client_method(int ver)
         {
+        if (ver == TLS1_2_VERSION)
+                return TLSv1_2_client_method();
+        if (ver == TLS1_1_VERSION)
+                return TLSv1_1_client_method();
         if (ver == TLS1_VERSION)
-                return(TLSv1_client_method());
-        else
-                return(NULL);
+                return TLSv1_client_method();
+        return NULL;
         }
 
-IMPLEMENT_tls1_meth_func(TLSv1_client_method,
+IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_client_method,
+                        ssl_undefined_function,
+                        ssl3_connect,
+                        tls1_get_client_method)
+
+IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_client_method,
+                        ssl_undefined_function,
+                        ssl3_connect,
+                        tls1_get_client_method)
+
+IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_client_method,
                         ssl_undefined_function,
                         ssl3_connect,
                         tls1_get_client_method)
diff --git a/src/lib/libssl/src/ssl/t1_enc.c b/src/lib/libssl/src/ssl/t1_enc.c
index 793ea43e90..f7bdeb3b9d 100644
--- a/src/lib/libssl/src/ssl/t1_enc.c
+++ b/src/lib/libssl/src/ssl/t1_enc.c
@@ -143,6 +143,7 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/md5.h>
+#include <openssl/rand.h>
 #ifdef KSSL_DEBUG
 #include <openssl/des.h>
 #endif
@@ -158,68 +159,75 @@ static int tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
                         unsigned char *out, int olen)
         {
         int chunk;
-        unsigned int j;
-        HMAC_CTX ctx;
-        HMAC_CTX ctx_tmp;
+        size_t j;
+        EVP_MD_CTX ctx, ctx_tmp;
+        EVP_PKEY *mac_key;
         unsigned char A1[EVP_MAX_MD_SIZE];
-        unsigned int A1_len;
+        size_t A1_len;
         int ret = 0;
         
         chunk=EVP_MD_size(md);
         OPENSSL_assert(chunk >= 0);
 
-        HMAC_CTX_init(&ctx);
-        HMAC_CTX_init(&ctx_tmp);
-        if (!HMAC_Init_ex(&ctx,sec,sec_len,md, NULL))
+        EVP_MD_CTX_init(&ctx);
+        EVP_MD_CTX_init(&ctx_tmp);
+        EVP_MD_CTX_set_flags(&ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+        EVP_MD_CTX_set_flags(&ctx_tmp, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+        mac_key = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, NULL, sec, sec_len);
+        if (!mac_key)
+                goto err;
+        if (!EVP_DigestSignInit(&ctx,NULL,md, NULL, mac_key))
                 goto err;
-        if (!HMAC_Init_ex(&ctx_tmp,sec,sec_len,md, NULL))
+        if (!EVP_DigestSignInit(&ctx_tmp,NULL,md, NULL, mac_key))
                 goto err;
-        if (seed1 != NULL && !HMAC_Update(&ctx,seed1,seed1_len))
+        if (seed1 && !EVP_DigestSignUpdate(&ctx,seed1,seed1_len))
                 goto err;
-        if (seed2 != NULL && !HMAC_Update(&ctx,seed2,seed2_len))
+        if (seed2 && !EVP_DigestSignUpdate(&ctx,seed2,seed2_len))
                 goto err;
-        if (seed3 != NULL && !HMAC_Update(&ctx,seed3,seed3_len))
+        if (seed3 && !EVP_DigestSignUpdate(&ctx,seed3,seed3_len))
                 goto err;
-        if (seed4 != NULL && !HMAC_Update(&ctx,seed4,seed4_len))
+        if (seed4 && !EVP_DigestSignUpdate(&ctx,seed4,seed4_len))
                 goto err;
-        if (seed5 != NULL && !HMAC_Update(&ctx,seed5,seed5_len))
+        if (seed5 && !EVP_DigestSignUpdate(&ctx,seed5,seed5_len))
                 goto err;
-        if (!HMAC_Final(&ctx,A1,&A1_len))
+        if (!EVP_DigestSignFinal(&ctx,A1,&A1_len))
                 goto err;
 
         for (;;)
                 {
-                if (!HMAC_Init_ex(&ctx,NULL,0,NULL,NULL)) /* re-init */
+                /* Reinit mac contexts */
+                if (!EVP_DigestSignInit(&ctx,NULL,md, NULL, mac_key))
                         goto err;
-                if (!HMAC_Init_ex(&ctx_tmp,NULL,0,NULL,NULL)) /* re-init */
+                if (!EVP_DigestSignInit(&ctx_tmp,NULL,md, NULL, mac_key))
                         goto err;
-                if (!HMAC_Update(&ctx,A1,A1_len))
+                if (!EVP_DigestSignUpdate(&ctx,A1,A1_len))
                         goto err;
-                if (!HMAC_Update(&ctx_tmp,A1,A1_len))
+                if (!EVP_DigestSignUpdate(&ctx_tmp,A1,A1_len))
                         goto err;
-                if (seed1 != NULL && !HMAC_Update(&ctx,seed1,seed1_len))
+                if (seed1 && !EVP_DigestSignUpdate(&ctx,seed1,seed1_len))
                         goto err;
-                if (seed2 != NULL && !HMAC_Update(&ctx,seed2,seed2_len))
+                if (seed2 && !EVP_DigestSignUpdate(&ctx,seed2,seed2_len))
                         goto err;
-                if (seed3 != NULL && !HMAC_Update(&ctx,seed3,seed3_len))
+                if (seed3 && !EVP_DigestSignUpdate(&ctx,seed3,seed3_len))
                         goto err;
-                if (seed4 != NULL && !HMAC_Update(&ctx,seed4,seed4_len))
+                if (seed4 && !EVP_DigestSignUpdate(&ctx,seed4,seed4_len))
                         goto err;
-                if (seed5 != NULL && !HMAC_Update(&ctx,seed5,seed5_len))
+                if (seed5 && !EVP_DigestSignUpdate(&ctx,seed5,seed5_len))
                         goto err;
 
                 if (olen > chunk)
                         {
-                        if (!HMAC_Final(&ctx,out,&j))
+                        if (!EVP_DigestSignFinal(&ctx,out,&j))
                                 goto err;
                         out+=j;
                         olen-=j;
-                        if (!HMAC_Final(&ctx_tmp,A1,&A1_len)) /* calc the next A1 value */
+                        /* calc the next A1 value */
+                        if (!EVP_DigestSignFinal(&ctx_tmp,A1,&A1_len))
                                 goto err;
                         }
                 else    /* last one */
                         {
-                        if (!HMAC_Final(&ctx,A1,&A1_len))
+                        if (!EVP_DigestSignFinal(&ctx,A1,&A1_len))
                                 goto err;
                         memcpy(out,A1,olen);
                         break;
@@ -227,8 +235,9 @@ static int tls1_P_hash(const EVP_MD *md, const unsigned char *sec,
                 }
         ret = 1;
 err:
-        HMAC_CTX_cleanup(&ctx);
-        HMAC_CTX_cleanup(&ctx_tmp);
+        EVP_PKEY_free(mac_key);
+        EVP_MD_CTX_cleanup(&ctx);
+        EVP_MD_CTX_cleanup(&ctx_tmp);
         OPENSSL_cleanse(A1,sizeof(A1));
         return ret;
         }
@@ -256,6 +265,8 @@ static int tls1_PRF(long digest_mask,
                 if ((m<<TLS1_PRF_DGST_SHIFT) & digest_mask) count++;
         }       
         len=slen/count;
+        if (count == 1)
+                slen = 0;
         S1=sec;
         memset(out1,0,olen);
         for (idx=0;ssl_get_handshake_digest(idx,&m,&md);idx++) {
@@ -284,7 +295,7 @@ static int tls1_generate_key_block(SSL *s, unsigned char *km,
              unsigned char *tmp, int num)
         {
         int ret;
-        ret = tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
+        ret = tls1_PRF(ssl_get_algorithm2(s),
                  TLS_MD_KEY_EXPANSION_CONST,TLS_MD_KEY_EXPANSION_CONST_SIZE,
                  s->s3->server_random,SSL3_RANDOM_SIZE,
                  s->s3->client_random,SSL3_RANDOM_SIZE,
@@ -358,7 +369,7 @@ int tls1_change_cipher_state(SSL *s, int which)
                 {
                 if (s->s3->tmp.new_cipher->algorithm2 & TLS1_STREAM_MAC)
                         s->mac_flags |= SSL_MAC_FLAG_READ_MAC_STREAM;
-                        else
+                else
                         s->mac_flags &= ~SSL_MAC_FLAG_READ_MAC_STREAM;
 
                 if (s->enc_read_ctx != NULL)
@@ -445,7 +456,11 @@ int tls1_change_cipher_state(SSL *s, int which)
         j=is_export ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ?
                        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);
+        /* If GCM mode only part of IV comes from PRF */
+        if (EVP_CIPHER_mode(c) == EVP_CIPH_GCM_MODE)
+                k = EVP_GCM_TLS_FIXED_IV_LEN;
+        else
+                k=EVP_CIPHER_iv_length(c);
         if (    (which == SSL3_CHANGE_CIPHER_CLIENT_WRITE) ||
                 (which == SSL3_CHANGE_CIPHER_SERVER_READ))
                 {
@@ -474,10 +489,14 @@ int tls1_change_cipher_state(SSL *s, int which)
                 }
 
         memcpy(mac_secret,ms,i);
-        mac_key = EVP_PKEY_new_mac_key(mac_type, NULL,
-                        mac_secret,*mac_secret_size);
-        EVP_DigestSignInit(mac_ctx,NULL,m,NULL,mac_key);
-        EVP_PKEY_free(mac_key);
+
+        if (!(EVP_CIPHER_flags(c)&EVP_CIPH_FLAG_AEAD_CIPHER))
+                {
+                mac_key = EVP_PKEY_new_mac_key(mac_type, NULL,
+                                mac_secret,*mac_secret_size);
+                EVP_DigestSignInit(mac_ctx,NULL,m,NULL,mac_key);
+                EVP_PKEY_free(mac_key);
+                }
 #ifdef TLS_DEBUG
 printf("which = %04X\nmac key=",which);
 { int z; for (z=0; z<i; z++) printf("%02X%c",ms[z],((z+1)%16)?' ':'\n'); }
@@ -487,7 +506,7 @@ printf("which = %04X\nmac key=",which);
                 /* In here I set both the read and write key/iv to the
                  * same value since only the correct one will be used :-).
                  */
-                if (!tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
+                if (!tls1_PRF(ssl_get_algorithm2(s),
                                 exp_label,exp_label_len,
                                 s->s3->client_random,SSL3_RANDOM_SIZE,
                                 s->s3->server_random,SSL3_RANDOM_SIZE,
@@ -498,7 +517,7 @@ printf("which = %04X\nmac key=",which);
 
                 if (k > 0)
                         {
-                        if (!tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
+                        if (!tls1_PRF(ssl_get_algorithm2(s),
                                         TLS_MD_IV_BLOCK_CONST,TLS_MD_IV_BLOCK_CONST_SIZE,
                                         s->s3->client_random,SSL3_RANDOM_SIZE,
                                         s->s3->server_random,SSL3_RANDOM_SIZE,
@@ -524,7 +543,19 @@ printf("which = %04X\nmac key=",which);
         }
 #endif  /* KSSL_DEBUG */
 
-        EVP_CipherInit_ex(dd,c,NULL,key,iv,(which & SSL3_CC_WRITE));
+        if (EVP_CIPHER_mode(c) == EVP_CIPH_GCM_MODE)
+                {
+                EVP_CipherInit_ex(dd,c,NULL,key,NULL,(which & SSL3_CC_WRITE));
+                EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_GCM_SET_IV_FIXED, k, iv);
+                }
+        else    
+                EVP_CipherInit_ex(dd,c,NULL,key,iv,(which & SSL3_CC_WRITE));
+
+        /* Needed for "composite" AEADs, such as RC4-HMAC-MD5 */
+        if ((EVP_CIPHER_flags(c)&EVP_CIPH_FLAG_AEAD_CIPHER) && *mac_secret_size)
+                EVP_CIPHER_CTX_ctrl(dd,EVP_CTRL_AEAD_SET_MAC_KEY,
+                                *mac_secret_size,mac_secret);
+
 #ifdef TLS_DEBUG
 printf("which = %04X\nkey=",which);
 { int z; for (z=0; z<EVP_CIPHER_key_length(c); z++) printf("%02X%c",key[z],((z+1)%16)?' ':'\n'); }
@@ -606,7 +637,8 @@ printf("\nkey block\n");
 { int z; for (z=0; z<num; z++) printf("%02X%c",p1[z],((z+1)%16)?' ':'\n'); }
 #endif
 
-        if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS))
+        if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS)
+                && s->method->version <= TLS1_VERSION)
                 {
                 /* enable vulnerability countermeasure for CBC ciphers with
                  * known-IV problem (http://www.openssl.org/~bodo/tls-cbc.txt)
@@ -640,14 +672,14 @@ int tls1_enc(SSL *s, int send)
         SSL3_RECORD *rec;
         EVP_CIPHER_CTX *ds;
         unsigned long l;
-        int bs,i,ii,j,k,n=0;
+        int bs,i,ii,j,k,pad=0;
         const EVP_CIPHER *enc;
 
         if (send)
                 {
                 if (EVP_MD_CTX_md(s->write_hash))
                         {
-                        n=EVP_MD_CTX_size(s->write_hash);
+                        int n=EVP_MD_CTX_size(s->write_hash);
                         OPENSSL_assert(n >= 0);
                         }
                 ds=s->enc_write_ctx;
@@ -655,13 +687,34 @@ int tls1_enc(SSL *s, int send)
                 if (s->enc_write_ctx == NULL)
                         enc=NULL;
                 else
+                        {
+                        int ivlen;
                         enc=EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
+                        /* For TLSv1.1 and later explicit IV */
+                        if (s->version >= TLS1_1_VERSION
+                                && EVP_CIPHER_mode(enc) == EVP_CIPH_CBC_MODE)
+                                ivlen = EVP_CIPHER_iv_length(enc);
+                        else
+                                ivlen = 0;
+                        if (ivlen > 1)
+                                {
+                                if ( rec->data != rec->input)
+                                        /* we can't write into the input stream:
+                                         * Can this ever happen?? (steve)
+                                         */
+                                        fprintf(stderr,
+                                                "%s:%d: rec->data != rec->input\n",
+                                                __FILE__, __LINE__);
+                                else if (RAND_bytes(rec->input, ivlen) <= 0)
+                                        return -1;
+                                }
+                        }
                 }
         else
                 {
                 if (EVP_MD_CTX_md(s->read_hash))
                         {
-                        n=EVP_MD_CTX_size(s->read_hash);
+                        int n=EVP_MD_CTX_size(s->read_hash);
                         OPENSSL_assert(n >= 0);
                         }
                 ds=s->enc_read_ctx;
@@ -687,7 +740,43 @@ int tls1_enc(SSL *s, int send)
                 l=rec->length;
                 bs=EVP_CIPHER_block_size(ds->cipher);
 
-                if ((bs != 1) && send)
+                if (EVP_CIPHER_flags(ds->cipher)&EVP_CIPH_FLAG_AEAD_CIPHER)
+                        {
+                        unsigned char buf[13],*seq;
+
+                        seq = send?s->s3->write_sequence:s->s3->read_sequence;
+
+                        if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER)
+                                {
+                                unsigned char dtlsseq[9],*p=dtlsseq;
+
+                                s2n(send?s->d1->w_epoch:s->d1->r_epoch,p);
+                                memcpy(p,&seq[2],6);
+                                memcpy(buf,dtlsseq,8);
+                                }
+                        else
+                                {
+                                memcpy(buf,seq,8);
+                                for (i=7; i>=0; i--)    /* increment */
+                                        {
+                                        ++seq[i];
+                                        if (seq[i] != 0) break; 
+                                        }
+                                }
+
+                        buf[8]=rec->type;
+                        buf[9]=(unsigned char)(s->version>>8);
+                        buf[10]=(unsigned char)(s->version);
+                        buf[11]=rec->length>>8;
+                        buf[12]=rec->length&0xff;
+                        pad=EVP_CIPHER_CTX_ctrl(ds,EVP_CTRL_AEAD_TLS1_AAD,13,buf);
+                        if (send)
+                                {
+                                l+=pad;
+                                rec->length+=pad;
+                                }
+                        }
+                else if ((bs != 1) && send)
                         {
                         i=bs-((int)l%bs);
 
@@ -728,13 +817,25 @@ int tls1_enc(SSL *s, int send)
                         {
                         if (l == 0 || l%bs != 0)
                                 {
+                                if (s->version >= TLS1_1_VERSION)
+                                        return -1;
                                 SSLerr(SSL_F_TLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
                                 ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED);
                                 return 0;
                                 }
                         }
                 
-                EVP_Cipher(ds,rec->data,rec->input,l);
+                i = EVP_Cipher(ds,rec->data,rec->input,l);
+                if ((EVP_CIPHER_flags(ds->cipher)&EVP_CIPH_FLAG_CUSTOM_CIPHER)
+                                                ?(i<0)
+                                                :(i==0))
+                        return -1;      /* AEAD can fail to verify MAC */
+                if (EVP_CIPHER_mode(enc) == EVP_CIPH_GCM_MODE && !send)
+                        {
+                        rec->data += EVP_GCM_TLS_EXPLICIT_IV_LEN;
+                        rec->input += EVP_GCM_TLS_EXPLICIT_IV_LEN;
+                        rec->length -= EVP_GCM_TLS_EXPLICIT_IV_LEN;
+                        }
 
 #ifdef KSSL_DEBUG
                 {
@@ -784,8 +885,19 @@ int tls1_enc(SSL *s, int send)
                                         return -1;
                                         }
                                 }
-                        rec->length-=i;
+                        rec->length -=i;
+                        if (s->version >= TLS1_1_VERSION
+                                && EVP_CIPHER_CTX_mode(ds) == EVP_CIPH_CBC_MODE)
+                                {
+                                if (bs > (int)rec->length)
+                                        return -1;
+                                rec->data += bs;    /* skip the explicit IV */
+                                rec->input += bs;
+                                rec->length -= bs;
+                                }
                         }
+                if (pad && !send)
+                        rec->length -= pad;
                 }
         return(1);
         }
@@ -841,7 +953,7 @@ int tls1_final_finish_mac(SSL *s,
 
         for (idx=0;ssl_get_handshake_digest(idx,&mask,&md);idx++)
                 {
-                if (mask & s->s3->tmp.new_cipher->algorithm2)
+                if (mask & ssl_get_algorithm2(s))
                         {
                         int hashsize = EVP_MD_size(md);
                         if (hashsize < 0 || hashsize > (int)(sizeof buf - (size_t)(q-buf)))
@@ -860,7 +972,7 @@ int tls1_final_finish_mac(SSL *s,
                         }
                 }
                 
-        if (!tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
+        if (!tls1_PRF(ssl_get_algorithm2(s),
                         str,slen, buf,(int)(q-buf), NULL,0, NULL,0, NULL,0,
                         s->session->master_key,s->session->master_key_length,
                         out,buf2,sizeof buf2))
@@ -970,6 +1082,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
         const void *co = NULL, *so = NULL;
         int col = 0, sol = 0;
 
+
 #ifdef KSSL_DEBUG
         printf ("tls1_generate_master_secret(%p,%p, %p, %d)\n", s,out, p,len);
 #endif  /* KSSL_DEBUG */
@@ -986,7 +1099,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
                 }
 #endif
 
-        tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
+        tls1_PRF(ssl_get_algorithm2(s),
                 TLS_MD_MASTER_SECRET_CONST,TLS_MD_MASTER_SECRET_CONST_SIZE,
                 s->s3->client_random,SSL3_RANDOM_SIZE,
                 co, col,
@@ -994,6 +1107,16 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
                 so, sol,
                 p,len,
                 s->session->master_key,buff,sizeof buff);
+#ifdef SSL_DEBUG
+        fprintf(stderr, "Premaster Secret:\n");
+        BIO_dump_fp(stderr, (char *)p, len);
+        fprintf(stderr, "Client Random:\n");
+        BIO_dump_fp(stderr, (char *)s->s3->client_random, SSL3_RANDOM_SIZE);
+        fprintf(stderr, "Server Random:\n");
+        BIO_dump_fp(stderr, (char *)s->s3->server_random, SSL3_RANDOM_SIZE);
+        fprintf(stderr, "Master Secret:\n");
+        BIO_dump_fp(stderr, (char *)s->session->master_key, SSL3_MASTER_SECRET_SIZE);
+#endif
 
 #ifdef KSSL_DEBUG
         printf ("tls1_generate_master_secret() complete\n");
@@ -1001,6 +1124,95 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,
         return(SSL3_MASTER_SECRET_SIZE);
         }
 
+int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
+         const char *label, size_t llen, const unsigned char *context,
+         size_t contextlen, int use_context)
+        {
+        unsigned char *buff;
+        unsigned char *val = NULL;
+        size_t vallen, currentvalpos;
+        int rv;
+
+#ifdef KSSL_DEBUG
+        printf ("tls1_export_keying_material(%p,%p,%d,%s,%d,%p,%d)\n", s, out, olen, label, llen, p, plen);
+#endif  /* KSSL_DEBUG */
+
+        buff = OPENSSL_malloc(olen);
+        if (buff == NULL) goto err2;
+
+        /* construct PRF arguments
+         * we construct the PRF argument ourself rather than passing separate
+         * values into the TLS PRF to ensure that the concatenation of values
+         * does not create a prohibited label.
+         */
+        vallen = llen + SSL3_RANDOM_SIZE * 2;
+        if (use_context)
+                {
+                vallen += 2 + contextlen;
+                }
+
+        val = OPENSSL_malloc(vallen);
+        if (val == NULL) goto err2;
+        currentvalpos = 0;
+        memcpy(val + currentvalpos, (unsigned char *) label, llen);
+        currentvalpos += llen;
+        memcpy(val + currentvalpos, s->s3->client_random, SSL3_RANDOM_SIZE);
+        currentvalpos += SSL3_RANDOM_SIZE;
+        memcpy(val + currentvalpos, s->s3->server_random, SSL3_RANDOM_SIZE);
+        currentvalpos += SSL3_RANDOM_SIZE;
+
+        if (use_context)
+                {
+                val[currentvalpos] = (contextlen >> 8) & 0xff;
+                currentvalpos++;
+                val[currentvalpos] = contextlen & 0xff;
+                currentvalpos++;
+                if ((contextlen > 0) || (context != NULL))
+                        {
+                        memcpy(val + currentvalpos, context, contextlen);
+                        }
+                }
+
+        /* disallow prohibited labels
+         * note that SSL3_RANDOM_SIZE > max(prohibited label len) =
+         * 15, so size of val > max(prohibited label len) = 15 and the
+         * comparisons won't have buffer overflow
+         */
+        if (memcmp(val, TLS_MD_CLIENT_FINISH_CONST,
+                 TLS_MD_CLIENT_FINISH_CONST_SIZE) == 0) goto err1;
+        if (memcmp(val, TLS_MD_SERVER_FINISH_CONST,
+                 TLS_MD_SERVER_FINISH_CONST_SIZE) == 0) goto err1;
+        if (memcmp(val, TLS_MD_MASTER_SECRET_CONST,
+                 TLS_MD_MASTER_SECRET_CONST_SIZE) == 0) goto err1;
+        if (memcmp(val, TLS_MD_KEY_EXPANSION_CONST,
+                 TLS_MD_KEY_EXPANSION_CONST_SIZE) == 0) goto err1;
+
+        rv = tls1_PRF(s->s3->tmp.new_cipher->algorithm2,
+                      val, vallen,
+                      NULL, 0,
+                      NULL, 0,
+                      NULL, 0,
+                      NULL, 0,
+                      s->session->master_key,s->session->master_key_length,
+                      out,buff,olen);
+
+#ifdef KSSL_DEBUG
+        printf ("tls1_export_keying_material() complete\n");
+#endif  /* KSSL_DEBUG */
+        goto ret;
+err1:
+        SSLerr(SSL_F_TLS1_EXPORT_KEYING_MATERIAL, SSL_R_TLS_ILLEGAL_EXPORTER_LABEL);
+        rv = 0;
+        goto ret;
+err2:
+        SSLerr(SSL_F_TLS1_EXPORT_KEYING_MATERIAL, ERR_R_MALLOC_FAILURE);
+        rv = 0;
+ret:
+        if (buff != NULL) OPENSSL_free(buff);
+        if (val != NULL) OPENSSL_free(val);
+        return(rv);
+        }
+
 int tls1_alert_code(int code)
         {
         switch (code)
@@ -1042,4 +1254,3 @@ int tls1_alert_code(int code)
         default:                        return(-1);
                 }
         }
-
diff --git a/src/lib/libssl/src/ssl/t1_lib.c b/src/lib/libssl/src/ssl/t1_lib.c
index 26cbae449e..27c8e3460d 100644
--- a/src/lib/libssl/src/ssl/t1_lib.c
+++ b/src/lib/libssl/src/ssl/t1_lib.c
@@ -114,6 +114,7 @@
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/ocsp.h>
+#include <openssl/rand.h>
 #include "ssl_locl.h"
 
 const char tls1_version_str[]="TLSv1" OPENSSL_VERSION_PTEXT;
@@ -136,6 +137,7 @@ SSL3_ENC_METHOD TLSv1_enc_data={
         TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
         TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE,
         tls1_alert_code,
+        tls1_export_keying_material,
         };
 
 long tls1_default_timeout(void)
@@ -166,10 +168,11 @@ void tls1_free(SSL *s)
 void tls1_clear(SSL *s)
         {
         ssl3_clear(s);
-        s->version=TLS1_VERSION;
+        s->version = s->method->version;
         }
 
 #ifndef OPENSSL_NO_EC
+
 static int nid_list[] =
         {
                 NID_sect163k1, /* sect163k1 (1) */
@@ -198,7 +201,36 @@ static int nid_list[] =
                 NID_secp384r1, /* secp384r1 (24) */
                 NID_secp521r1  /* secp521r1 (25) */     
         };
-        
+
+static int pref_list[] =
+        {
+                NID_sect571r1, /* sect571r1 (14) */ 
+                NID_sect571k1, /* sect571k1 (13) */ 
+                NID_secp521r1, /* secp521r1 (25) */     
+                NID_sect409k1, /* sect409k1 (11) */ 
+                NID_sect409r1, /* sect409r1 (12) */
+                NID_secp384r1, /* secp384r1 (24) */
+                NID_sect283k1, /* sect283k1 (9) */
+                NID_sect283r1, /* sect283r1 (10) */ 
+                NID_secp256k1, /* secp256k1 (22) */ 
+                NID_X9_62_prime256v1, /* secp256r1 (23) */ 
+                NID_sect239k1, /* sect239k1 (8) */ 
+                NID_sect233k1, /* sect233k1 (6) */
+                NID_sect233r1, /* sect233r1 (7) */ 
+                NID_secp224k1, /* secp224k1 (20) */ 
+                NID_secp224r1, /* secp224r1 (21) */
+                NID_sect193r1, /* sect193r1 (4) */ 
+                NID_sect193r2, /* sect193r2 (5) */ 
+                NID_secp192k1, /* secp192k1 (18) */
+                NID_X9_62_prime192v1, /* secp192r1 (19) */ 
+                NID_sect163k1, /* sect163k1 (1) */
+                NID_sect163r1, /* sect163r1 (2) */
+                NID_sect163r2, /* sect163r2 (3) */
+                NID_secp160k1, /* secp160k1 (15) */
+                NID_secp160r1, /* secp160r1 (16) */ 
+                NID_secp160r2, /* secp160r2 (17) */ 
+        };
+
 int tls1_ec_curve_id2nid(int curve_id)
         {
         /* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */
@@ -270,6 +302,64 @@ int tls1_ec_nid2curve_id(int nid)
 #endif /* OPENSSL_NO_EC */
 
 #ifndef OPENSSL_NO_TLSEXT
+
+/* List of supported signature algorithms and hashes. Should make this
+ * customisable at some point, for now include everything we support.
+ */
+
+#ifdef OPENSSL_NO_RSA
+#define tlsext_sigalg_rsa(md) /* */
+#else
+#define tlsext_sigalg_rsa(md) md, TLSEXT_signature_rsa,
+#endif
+
+#ifdef OPENSSL_NO_DSA
+#define tlsext_sigalg_dsa(md) /* */
+#else
+#define tlsext_sigalg_dsa(md) md, TLSEXT_signature_dsa,
+#endif
+
+#ifdef OPENSSL_NO_ECDSA
+#define tlsext_sigalg_ecdsa(md) /* */
+#else
+#define tlsext_sigalg_ecdsa(md) md, TLSEXT_signature_ecdsa,
+#endif
+
+#define tlsext_sigalg(md) \
+                tlsext_sigalg_rsa(md) \
+                tlsext_sigalg_dsa(md) \
+                tlsext_sigalg_ecdsa(md)
+
+static unsigned char tls12_sigalgs[] = {
+#ifndef OPENSSL_NO_SHA512
+        tlsext_sigalg(TLSEXT_hash_sha512)
+        tlsext_sigalg(TLSEXT_hash_sha384)
+#endif
+#ifndef OPENSSL_NO_SHA256
+        tlsext_sigalg(TLSEXT_hash_sha256)
+        tlsext_sigalg(TLSEXT_hash_sha224)
+#endif
+#ifndef OPENSSL_NO_SHA
+        tlsext_sigalg(TLSEXT_hash_sha1)
+#endif
+#ifndef OPENSSL_NO_MD5
+        tlsext_sigalg_rsa(TLSEXT_hash_md5)
+#endif
+};
+
+int tls12_get_req_sig_algs(SSL *s, unsigned char *p)
+        {
+        size_t slen = sizeof(tls12_sigalgs);
+#ifdef OPENSSL_FIPS
+        /* If FIPS mode don't include MD5 which is last */
+        if (FIPS_mode())
+                slen -= 2;
+#endif
+        if (p)
+                memcpy(p, tls12_sigalgs, slen);
+        return (int)slen;
+        }
+
 unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
         {
         int extdatalen=0;
@@ -317,7 +407,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
                 }
 
         /* Add RI if renegotiating */
-        if (s->new_session)
+        if (s->renegotiate)
           {
           int el;
           
@@ -341,6 +431,34 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
           ret += el;
         }
 
+#ifndef OPENSSL_NO_SRP
+        /* Add SRP username if there is one */
+        if (s->srp_ctx.login != NULL)
+                { /* Add TLS extension SRP username to the Client Hello message */
+
+                int login_len = strlen(s->srp_ctx.login);       
+                if (login_len > 255 || login_len == 0)
+                        {
+                        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                        return NULL;
+                        } 
+
+                /* check for enough space.
+                   4 for the srp type type and entension length
+                   1 for the srp user identity
+                   + srp user identity length 
+                */
+                if ((limit - ret - 5 - login_len) < 0) return NULL; 
+
+                /* fill in the extension */
+                s2n(TLSEXT_TYPE_srp,ret);
+                s2n(login_len+1,ret);
+                (*ret++) = (unsigned char) login_len;
+                memcpy(ret, s->srp_ctx.login, login_len);
+                ret+=login_len;
+                }
+#endif
+
 #ifndef OPENSSL_NO_EC
         if (s->tlsext_ecpointformatlist != NULL &&
             s->version != DTLS1_VERSION)
@@ -426,6 +544,17 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
                 }
                 skip_ext:
 
+        if (TLS1_get_client_version(s) >= TLS1_2_VERSION)
+                {
+                if ((size_t)(limit - ret) < sizeof(tls12_sigalgs) + 6)
+                        return NULL; 
+                s2n(TLSEXT_TYPE_signature_algorithms,ret);
+                s2n(sizeof(tls12_sigalgs) + 2, ret);
+                s2n(sizeof(tls12_sigalgs), ret);
+                memcpy(ret, tls12_sigalgs, sizeof(tls12_sigalgs));
+                ret += sizeof(tls12_sigalgs);
+                }
+
 #ifdef TLSEXT_TYPE_opaque_prf_input
         if (s->s3->client_opaque_prf_input != NULL &&
             s->version != DTLS1_VERSION)
@@ -494,6 +623,51 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha
                         i2d_X509_EXTENSIONS(s->tlsext_ocsp_exts, &ret);
                 }
 
+#ifndef OPENSSL_NO_HEARTBEATS
+        /* Add Heartbeat extension */
+        s2n(TLSEXT_TYPE_heartbeat,ret);
+        s2n(1,ret);
+        /* Set mode:
+         * 1: peer may send requests
+         * 2: peer not allowed to send requests
+         */
+        if (s->tlsext_heartbeat & SSL_TLSEXT_HB_DONT_RECV_REQUESTS)
+                *(ret++) = SSL_TLSEXT_HB_DONT_SEND_REQUESTS;
+        else
+                *(ret++) = SSL_TLSEXT_HB_ENABLED;
+#endif
+
+#ifndef OPENSSL_NO_NEXTPROTONEG
+        if (s->ctx->next_proto_select_cb && !s->s3->tmp.finish_md_len)
+                {
+                /* The client advertises an emtpy extension to indicate its
+                 * support for Next Protocol Negotiation */
+                if (limit - ret - 4 < 0)
+                        return NULL;
+                s2n(TLSEXT_TYPE_next_proto_neg,ret);
+                s2n(0,ret);
+                }
+#endif
+
+        if(SSL_get_srtp_profiles(s))
+                {
+                int el;
+
+                ssl_add_clienthello_use_srtp_ext(s, 0, &el, 0);
+                
+                if((limit - p - 4 - el) < 0) return NULL;
+
+                s2n(TLSEXT_TYPE_use_srtp,ret);
+                s2n(el,ret);
+
+                if(ssl_add_clienthello_use_srtp_ext(s, ret, &el, el))
+                        {
+                        SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                        return NULL;
+                        }
+                ret += el;
+                }
+
         if ((extdatalen = ret-p-2)== 0) 
                 return p;
 
@@ -505,6 +679,9 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
         {
         int extdatalen=0;
         unsigned char *ret = p;
+#ifndef OPENSSL_NO_NEXTPROTONEG
+        int next_proto_neg_seen;
+#endif
 
         /* don't add extensions for SSLv3, unless doing secure renegotiation */
         if (s->version == SSL3_VERSION && !s->s3->send_connection_binding)
@@ -603,6 +780,26 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
                 ret += sol;
                 }
 #endif
+
+        if(s->srtp_profile)
+                {
+                int el;
+
+                ssl_add_serverhello_use_srtp_ext(s, 0, &el, 0);
+                
+                if((limit - p - 4 - el) < 0) return NULL;
+
+                s2n(TLSEXT_TYPE_use_srtp,ret);
+                s2n(el,ret);
+
+                if(ssl_add_serverhello_use_srtp_ext(s, ret, &el, el))
+                        {
+                        SSLerr(SSL_F_SSL_ADD_SERVERHELLO_TLSEXT, ERR_R_INTERNAL_ERROR);
+                        return NULL;
+                        }
+                ret+=el;
+                }
+
         if (((s->s3->tmp.new_cipher->id & 0xFFFF)==0x80 || (s->s3->tmp.new_cipher->id & 0xFFFF)==0x81) 
                 && (SSL_get_options(s) & SSL_OP_CRYPTOPRO_TLSEXT_BUG))
                 { const unsigned char cryptopro_ext[36] = {
@@ -618,6 +815,46 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
 
                 }
 
+#ifndef OPENSSL_NO_HEARTBEATS
+        /* Add Heartbeat extension if we've received one */
+        if (s->tlsext_heartbeat & SSL_TLSEXT_HB_ENABLED)
+                {
+                s2n(TLSEXT_TYPE_heartbeat,ret);
+                s2n(1,ret);
+                /* Set mode:
+                 * 1: peer may send requests
+                 * 2: peer not allowed to send requests
+                 */
+                if (s->tlsext_heartbeat & SSL_TLSEXT_HB_DONT_RECV_REQUESTS)
+                        *(ret++) = SSL_TLSEXT_HB_DONT_SEND_REQUESTS;
+                else
+                        *(ret++) = SSL_TLSEXT_HB_ENABLED;
+
+                }
+#endif
+
+#ifndef OPENSSL_NO_NEXTPROTONEG
+        next_proto_neg_seen = s->s3->next_proto_neg_seen;
+        s->s3->next_proto_neg_seen = 0;
+        if (next_proto_neg_seen && s->ctx->next_protos_advertised_cb)
+                {
+                const unsigned char *npa;
+                unsigned int npalen;
+                int r;
+
+                r = s->ctx->next_protos_advertised_cb(s, &npa, &npalen, s->ctx->next_protos_advertised_cb_arg);
+                if (r == SSL_TLSEXT_ERR_OK)
+                        {
+                        if ((long)(limit - ret - 4 - npalen) < 0) return NULL;
+                        s2n(TLSEXT_TYPE_next_proto_neg,ret);
+                        s2n(npalen,ret);
+                        memcpy(ret, npa, npalen);
+                        ret += npalen;
+                        s->s3->next_proto_neg_seen = 1;
+                        }
+                }
+#endif
+
         if ((extdatalen = ret-p-2)== 0) 
                 return p;
 
@@ -632,9 +869,18 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
         unsigned short len;
         unsigned char *data = *p;
         int renegotiate_seen = 0;
+        int sigalg_seen = 0;
 
         s->servername_done = 0;
         s->tlsext_status_type = -1;
+#ifndef OPENSSL_NO_NEXTPROTONEG
+        s->s3->next_proto_neg_seen = 0;
+#endif
+
+#ifndef OPENSSL_NO_HEARTBEATS
+        s->tlsext_heartbeat &= ~(SSL_TLSEXT_HB_ENABLED |
+                               SSL_TLSEXT_HB_DONT_SEND_REQUESTS);
+#endif
 
         if (data >= (d+n-2))
                 goto ri_check;
@@ -762,6 +1008,31 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                                 }
 
                         }
+#ifndef OPENSSL_NO_SRP
+                else if (type == TLSEXT_TYPE_srp)
+                        {
+                        if (size <= 0 || ((len = data[0])) != (size -1))
+                                {
+                                *al = SSL_AD_DECODE_ERROR;
+                                return 0;
+                                }
+                        if (s->srp_ctx.login != NULL)
+                                {
+                                *al = SSL_AD_DECODE_ERROR;
+                                return 0;
+                                }
+                        if ((s->srp_ctx.login = OPENSSL_malloc(len+1)) == NULL)
+                                return -1;
+                        memcpy(s->srp_ctx.login, &data[1], len);
+                        s->srp_ctx.login[len]='\0';
+  
+                        if (strlen(s->srp_ctx.login) != len) 
+                                {
+                                *al = SSL_AD_DECODE_ERROR;
+                                return 0;
+                                }
+                        }
+#endif
 
 #ifndef OPENSSL_NO_EC
                 else if (type == TLSEXT_TYPE_ec_point_formats &&
@@ -882,6 +1153,28 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                                 return 0;
                         renegotiate_seen = 1;
                         }
+                else if (type == TLSEXT_TYPE_signature_algorithms)
+                        {
+                        int dsize;
+                        if (sigalg_seen || size < 2) 
+                                {
+                                *al = SSL_AD_DECODE_ERROR;
+                                return 0;
+                                }
+                        sigalg_seen = 1;
+                        n2s(data,dsize);
+                        size -= 2;
+                        if (dsize != size || dsize & 1) 
+                                {
+                                *al = SSL_AD_DECODE_ERROR;
+                                return 0;
+                                }
+                        if (!tls1_process_sigalgs(s, data, dsize))
+                                {
+                                *al = SSL_AD_DECODE_ERROR;
+                                return 0;
+                                }
+                        }
                 else if (type == TLSEXT_TYPE_status_request &&
                          s->version != DTLS1_VERSION && s->ctx->tlsext_status_cb)
                         {
@@ -994,8 +1287,54 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                                 else
                                         s->tlsext_status_type = -1;
                         }
+#ifndef OPENSSL_NO_HEARTBEATS
+                else if (type == TLSEXT_TYPE_heartbeat)
+                        {
+                        switch(data[0])
+                                {
+                                case 0x01:      /* Client allows us to send HB requests */
+                                                        s->tlsext_heartbeat |= SSL_TLSEXT_HB_ENABLED;
+                                                        break;
+                                case 0x02:      /* Client doesn't accept HB requests */
+                                                        s->tlsext_heartbeat |= SSL_TLSEXT_HB_ENABLED;
+                                                        s->tlsext_heartbeat |= SSL_TLSEXT_HB_DONT_SEND_REQUESTS;
+                                                        break;
+                                default:        *al = SSL_AD_ILLEGAL_PARAMETER;
+                                                        return 0;
+                                }
+                        }
+#endif
+#ifndef OPENSSL_NO_NEXTPROTONEG
+                else if (type == TLSEXT_TYPE_next_proto_neg &&
+                         s->s3->tmp.finish_md_len == 0)
+                        {
+                        /* We shouldn't accept this extension on a
+                         * renegotiation.
+                         *
+                         * s->new_session will be set on renegotiation, but we
+                         * probably shouldn't rely that it couldn't be set on
+                         * the initial renegotation too in certain cases (when
+                         * there's some other reason to disallow resuming an
+                         * earlier session -- the current code won't be doing
+                         * anything like that, but this might change).
+
+                         * A valid sign that there's been a previous handshake
+                         * in this connection is if s->s3->tmp.finish_md_len >
+                         * 0.  (We are talking about a check that will happen
+                         * in the Hello protocol round, well before a new
+                         * Finished message could have been computed.) */
+                        s->s3->next_proto_neg_seen = 1;
+                        }
+#endif
 
                 /* session ticket processed earlier */
+                else if (type == TLSEXT_TYPE_use_srtp)
+                        {
+                        if(ssl_parse_clienthello_use_srtp_ext(s, data, size,
+                                                              al))
+                                return 0;
+                        }
+
                 data+=size;
                 }
                                 
@@ -1005,7 +1344,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
 
         /* Need RI if renegotiating */
 
-        if (!renegotiate_seen && s->new_session &&
+        if (!renegotiate_seen && s->renegotiate &&
                 !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
                 {
                 *al = SSL_AD_HANDSHAKE_FAILURE;
@@ -1017,6 +1356,26 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
         return 1;
         }
 
+#ifndef OPENSSL_NO_NEXTPROTONEG
+/* ssl_next_proto_validate validates a Next Protocol Negotiation block. No
+ * elements of zero length are allowed and the set of elements must exactly fill
+ * the length of the block. */
+static char ssl_next_proto_validate(unsigned char *d, unsigned len)
+        {
+        unsigned int off = 0;
+
+        while (off < len)
+                {
+                if (d[off] == 0)
+                        return 0;
+                off += d[off];
+                off++;
+                }
+
+        return off == len;
+        }
+#endif
+
 int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, int n, int *al)
         {
         unsigned short length;
@@ -1026,6 +1385,15 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
         int tlsext_servername = 0;
         int renegotiate_seen = 0;
 
+#ifndef OPENSSL_NO_NEXTPROTONEG
+        s->s3->next_proto_neg_seen = 0;
+#endif
+
+#ifndef OPENSSL_NO_HEARTBEATS
+        s->tlsext_heartbeat &= ~(SSL_TLSEXT_HB_ENABLED |
+                               SSL_TLSEXT_HB_DONT_SEND_REQUESTS);
+#endif
+
         if (data >= (d+n-2))
                 goto ri_check;
 
@@ -1151,12 +1519,71 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in
                         /* Set flag to expect CertificateStatus message */
                         s->tlsext_status_expected = 1;
                         }
+#ifndef OPENSSL_NO_NEXTPROTONEG
+                else if (type == TLSEXT_TYPE_next_proto_neg &&
+                         s->s3->tmp.finish_md_len == 0)
+                        {
+                        unsigned char *selected;
+                        unsigned char selected_len;
+
+                        /* We must have requested it. */
+                        if ((s->ctx->next_proto_select_cb == NULL))
+                                {
+                                *al = TLS1_AD_UNSUPPORTED_EXTENSION;
+                                return 0;
+                                }
+                        /* The data must be valid */
+                        if (!ssl_next_proto_validate(data, size))
+                                {
+                                *al = TLS1_AD_DECODE_ERROR;
+                                return 0;
+                                }
+                        if (s->ctx->next_proto_select_cb(s, &selected, &selected_len, data, size, s->ctx->next_proto_select_cb_arg) != SSL_TLSEXT_ERR_OK)
+                                {
+                                *al = TLS1_AD_INTERNAL_ERROR;
+                                return 0;
+                                }
+                        s->next_proto_negotiated = OPENSSL_malloc(selected_len);
+                        if (!s->next_proto_negotiated)
+                                {
+                                *al = TLS1_AD_INTERNAL_ERROR;
+                                return 0;
+                                }
+                        memcpy(s->next_proto_negotiated, selected, selected_len);
+                        s->next_proto_negotiated_len = selected_len;
+                        s->s3->next_proto_neg_seen = 1;
+                        }
+#endif
                 else if (type == TLSEXT_TYPE_renegotiate)
                         {
                         if(!ssl_parse_serverhello_renegotiate_ext(s, data, size, al))
                                 return 0;
                         renegotiate_seen = 1;
                         }
+#ifndef OPENSSL_NO_HEARTBEATS
+                else if (type == TLSEXT_TYPE_heartbeat)
+                        {
+                        switch(data[0])
+                                {
+                                case 0x01:      /* Server allows us to send HB requests */
+                                                        s->tlsext_heartbeat |= SSL_TLSEXT_HB_ENABLED;
+                                                        break;
+                                case 0x02:      /* Server doesn't accept HB requests */
+                                                        s->tlsext_heartbeat |= SSL_TLSEXT_HB_ENABLED;
+                                                        s->tlsext_heartbeat |= SSL_TLSEXT_HB_DONT_SEND_REQUESTS;
+                                                        break;
+                                default:        *al = SSL_AD_ILLEGAL_PARAMETER;
+                                                        return 0;
+                                }
+                        }
+#endif
+                else if (type == TLSEXT_TYPE_use_srtp)
+                        {
+                        if(ssl_parse_serverhello_use_srtp_ext(s, data, size,
+                                                              al))
+                                return 0;
+                        }
+
                 data+=size;             
                 }
 
@@ -1236,7 +1663,7 @@ int ssl_prepare_clienthello_tlsext(SSL *s)
                         break;
                         }
                 }
-        using_ecc = using_ecc && (s->version == TLS1_VERSION);
+        using_ecc = using_ecc && (s->version >= TLS1_VERSION);
         if (using_ecc)
                 {
                 if (s->tlsext_ecpointformatlist != NULL) OPENSSL_free(s->tlsext_ecpointformatlist);
@@ -1252,16 +1679,19 @@ int ssl_prepare_clienthello_tlsext(SSL *s)
 
                 /* we support all named elliptic curves in draft-ietf-tls-ecc-12 */
                 if (s->tlsext_ellipticcurvelist != NULL) OPENSSL_free(s->tlsext_ellipticcurvelist);
-                s->tlsext_ellipticcurvelist_length = sizeof(nid_list)/sizeof(nid_list[0]) * 2;
+                s->tlsext_ellipticcurvelist_length = sizeof(pref_list)/sizeof(pref_list[0]) * 2;
                 if ((s->tlsext_ellipticcurvelist = OPENSSL_malloc(s->tlsext_ellipticcurvelist_length)) == NULL)
                         {
                         s->tlsext_ellipticcurvelist_length = 0;
                         SSLerr(SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT,ERR_R_MALLOC_FAILURE);
                         return -1;
                         }
-                for (i = 1, j = s->tlsext_ellipticcurvelist; (unsigned int)i <=
-                                sizeof(nid_list)/sizeof(nid_list[0]); i++)
-                        s2n(i,j);
+                for (i = 0, j = s->tlsext_ellipticcurvelist; (unsigned int)i <
+                                sizeof(pref_list)/sizeof(pref_list[0]); i++)
+                        {
+                        int id = tls1_ec_nid2curve_id(pref_list[i]);
+                        s2n(id,j);
+                        }
                 }
 #endif /* OPENSSL_NO_EC */
 
@@ -1570,26 +2000,56 @@ int ssl_check_serverhello_tlsext(SSL *s)
                 }
         }
 
-/* Since the server cache lookup is done early on in the processing of client
- * hello and other operations depend on the result we need to handle any TLS
- * session ticket extension at the same time.
+/* Since the server cache lookup is done early on in the processing of the
+ * ClientHello, and other operations depend on the result, we need to handle
+ * any TLS session ticket extension at the same time.
+ *
+ *   session_id: points at the session ID in the ClientHello. This code will
+ *       read past the end of this in order to parse out the session ticket
+ *       extension, if any.
+ *   len: the length of the session ID.
+ *   limit: a pointer to the first byte after the ClientHello.
+ *   ret: (output) on return, if a ticket was decrypted, then this is set to
+ *       point to the resulting session.
+ *
+ * If s->tls_session_secret_cb is set then we are expecting a pre-shared key
+ * ciphersuite, in which case we have no use for session tickets and one will
+ * never be decrypted, nor will s->tlsext_ticket_expected be set to 1.
+ *
+ * Returns:
+ *   -1: fatal error, either from parsing or decrypting the ticket.
+ *    0: no ticket was found (or was ignored, based on settings).
+ *    1: a zero length extension was found, indicating that the client supports
+ *       session tickets but doesn't currently have one to offer.
+ *    2: either s->tls_session_secret_cb was set, or a ticket was offered but
+ *       couldn't be decrypted because of a non-fatal error.
+ *    3: a ticket was successfully decrypted and *ret was set.
+ *
+ * Side effects:
+ *   Sets s->tlsext_ticket_expected to 1 if the server will have to issue
+ *   a new session ticket to the client because the client indicated support
+ *   (and s->tls_session_secret_cb is NULL) but the client either doesn't have
+ *   a session ticket or we couldn't use the one it gave us, or if
+ *   s->ctx->tlsext_ticket_key_cb asked to renew the client's ticket.
+ *   Otherwise, s->tlsext_ticket_expected is set to 0.
  */
-
 int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
-                                const unsigned char *limit, SSL_SESSION **ret)
+                        const unsigned char *limit, SSL_SESSION **ret)
         {
         /* Point after session ID in client hello */
         const unsigned char *p = session_id + len;
         unsigned short i;
 
+        *ret = NULL;
+        s->tlsext_ticket_expected = 0;
+
         /* If tickets disabled behave as if no ticket present
-         * to permit stateful resumption.
-         */
+         * to permit stateful resumption.
+         */
         if (SSL_get_options(s) & SSL_OP_NO_TICKET)
-                return 1;
-
+                return 0;
         if ((s->version <= SSL3_VERSION) || !limit)
-                return 1;
+                return 0;
         if (p >= limit)
                 return -1;
         /* Skip past DTLS cookie */
@@ -1612,7 +2072,7 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
                 return -1;
         /* Now at start of extensions */
         if ((p + 2) >= limit)
-                return 1;
+                return 0;
         n2s(p, i);
         while ((p + 4) <= limit)
                 {
@@ -1620,39 +2080,61 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len,
                 n2s(p, type);
                 n2s(p, size);
                 if (p + size > limit)
-                        return 1;
+                        return 0;
                 if (type == TLSEXT_TYPE_session_ticket)
                         {
-                        /* If tickets disabled indicate cache miss which will
-                         * trigger a full handshake
-                         */
-                        if (SSL_get_options(s) & SSL_OP_NO_TICKET)
-                                return 1;
-                        /* If zero length note client will accept a ticket
-                         * and indicate cache miss to trigger full handshake
-                         */
+                        int r;
                         if (size == 0)
                                 {
+                                /* The client will accept a ticket but doesn't
+                                 * currently have one. */
                                 s->tlsext_ticket_expected = 1;
-                                return 0;       /* Cache miss */
+                                return 1;
                                 }
                         if (s->tls_session_secret_cb)
                                 {
-                                /* Indicate cache miss here and instead of
-                                 * generating the session from ticket now,
-                                 * trigger abbreviated handshake based on
-                                 * external mechanism to calculate the master
-                                 * secret later. */
-                                return 0;
+                                /* Indicate that the ticket couldn't be
+                                 * decrypted rather than generating the session
+                                 * from ticket now, trigger abbreviated
+                                 * handshake based on external mechanism to
+                                 * calculate the master secret later. */
+                                return 2;
+                                }
+                        r = tls_decrypt_ticket(s, p, size, session_id, len, ret);
+                        switch (r)
+                                {
+                                case 2: /* ticket couldn't be decrypted */
+                                        s->tlsext_ticket_expected = 1;
+                                        return 2;
+                                case 3: /* ticket was decrypted */
+                                        return r;
+                                case 4: /* ticket decrypted but need to renew */
+                                        s->tlsext_ticket_expected = 1;
+                                        return 3;
+                                default: /* fatal error */
+                                        return -1;
                                 }
-                        return tls_decrypt_ticket(s, p, size, session_id, len,
-                                                                        ret);
                         }
                 p += size;
                 }
-        return 1;
+        return 0;
         }
 
+/* tls_decrypt_ticket attempts to decrypt a session ticket.
+ *
+ *   etick: points to the body of the session ticket extension.
+ *   eticklen: the length of the session tickets extenion.
+ *   sess_id: points at the session ID.
+ *   sesslen: the length of the session ID.
+ *   psess: (output) on return, if a ticket was decrypted, then this is set to
+ *       point to the resulting session.
+ *
+ * Returns:
+ *   -1: fatal error, either from parsing or decrypting the ticket.
+ *    2: the ticket couldn't be decrypted.
+ *    3: a ticket was successfully decrypted and *psess was set.
+ *    4: same as 3, but the ticket needs to be renewed.
+ */
 static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
                                 const unsigned char *sess_id, int sesslen,
                                 SSL_SESSION **psess)
@@ -1667,7 +2149,7 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
         SSL_CTX *tctx = s->initial_ctx;
         /* Need at least keyname + iv + some encrypted data */
         if (eticklen < 48)
-                goto tickerr;
+                return 2;
         /* Initialize session ticket encryption and HMAC contexts */
         HMAC_CTX_init(&hctx);
         EVP_CIPHER_CTX_init(&ctx);
@@ -1679,7 +2161,7 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
                 if (rv < 0)
                         return -1;
                 if (rv == 0)
-                        goto tickerr;
+                        return 2;
                 if (rv == 2)
                         renew_ticket = 1;
                 }
@@ -1687,15 +2169,15 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
                 {
                 /* Check key name matches */
                 if (memcmp(etick, tctx->tlsext_tick_key_name, 16))
-                        goto tickerr;
+                        return 2;
                 HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16,
                                         tlsext_tick_md(), NULL);
                 EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL,
                                 tctx->tlsext_tick_aes_key, etick + 16);
                 }
         /* Attempt to process session ticket, first conduct sanity and
-         * integrity checks on ticket.
-         */
+         * integrity checks on ticket.
+         */
         mlen = HMAC_size(&hctx);
         if (mlen < 0)
                 {
@@ -1708,7 +2190,7 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
         HMAC_Final(&hctx, tick_hmac, NULL);
         HMAC_CTX_cleanup(&hctx);
         if (memcmp(tick_hmac, etick + eticklen, mlen))
-                goto tickerr;
+                return 2;
         /* Attempt to decrypt session data */
         /* Move p after IV to start of encrypted ticket, update length */
         p = etick + 16 + EVP_CIPHER_CTX_iv_length(&ctx);
@@ -1721,33 +2203,376 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
                 }
         EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen);
         if (EVP_DecryptFinal(&ctx, sdec + slen, &mlen) <= 0)
-                goto tickerr;
+                return 2;
         slen += mlen;
         EVP_CIPHER_CTX_cleanup(&ctx);
         p = sdec;
-                
+
         sess = d2i_SSL_SESSION(NULL, &p, slen);
         OPENSSL_free(sdec);
         if (sess)
                 {
-                /* The session ID if non-empty is used by some clients to
-                 * detect that the ticket has been accepted. So we copy it to
-                 * the session structure. If it is empty set length to zero
-                 * as required by standard.
-                 */
+                /* The session ID, if non-empty, is used by some clients to
+                 * detect that the ticket has been accepted. So we copy it to
+                 * the session structure. If it is empty set length to zero
+                 * as required by standard.
+                 */
                 if (sesslen)
                         memcpy(sess->session_id, sess_id, sesslen);
                 sess->session_id_length = sesslen;
                 *psess = sess;
-                s->tlsext_ticket_expected = renew_ticket;
+                if (renew_ticket)
+                        return 4;
+                else
+                        return 3;
+                }
+        ERR_clear_error();
+        /* For session parse failure, indicate that we need to send a new
+         * ticket. */
+        return 2;
+        }
+
+/* Tables to translate from NIDs to TLS v1.2 ids */
+
+typedef struct 
+        {
+        int nid;
+        int id;
+        } tls12_lookup;
+
+static tls12_lookup tls12_md[] = {
+#ifndef OPENSSL_NO_MD5
+        {NID_md5, TLSEXT_hash_md5},
+#endif
+#ifndef OPENSSL_NO_SHA
+        {NID_sha1, TLSEXT_hash_sha1},
+#endif
+#ifndef OPENSSL_NO_SHA256
+        {NID_sha224, TLSEXT_hash_sha224},
+        {NID_sha256, TLSEXT_hash_sha256},
+#endif
+#ifndef OPENSSL_NO_SHA512
+        {NID_sha384, TLSEXT_hash_sha384},
+        {NID_sha512, TLSEXT_hash_sha512}
+#endif
+};
+
+static tls12_lookup tls12_sig[] = {
+#ifndef OPENSSL_NO_RSA
+        {EVP_PKEY_RSA, TLSEXT_signature_rsa},
+#endif
+#ifndef OPENSSL_NO_DSA
+        {EVP_PKEY_DSA, TLSEXT_signature_dsa},
+#endif
+#ifndef OPENSSL_NO_ECDSA
+        {EVP_PKEY_EC, TLSEXT_signature_ecdsa}
+#endif
+};
+
+static int tls12_find_id(int nid, tls12_lookup *table, size_t tlen)
+        {
+        size_t i;
+        for (i = 0; i < tlen; i++)
+                {
+                if (table[i].nid == nid)
+                        return table[i].id;
+                }
+        return -1;
+        }
+#if 0
+static int tls12_find_nid(int id, tls12_lookup *table, size_t tlen)
+        {
+        size_t i;
+        for (i = 0; i < tlen; i++)
+                {
+                if (table[i].id == id)
+                        return table[i].nid;
+                }
+        return -1;
+        }
+#endif
+
+int tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, const EVP_MD *md)
+        {
+        int sig_id, md_id;
+        if (!md)
+                return 0;
+        md_id = tls12_find_id(EVP_MD_type(md), tls12_md,
+                                sizeof(tls12_md)/sizeof(tls12_lookup));
+        if (md_id == -1)
+                return 0;
+        sig_id = tls12_get_sigid(pk);
+        if (sig_id == -1)
+                return 0;
+        p[0] = (unsigned char)md_id;
+        p[1] = (unsigned char)sig_id;
+        return 1;
+        }
+
+int tls12_get_sigid(const EVP_PKEY *pk)
+        {
+        return tls12_find_id(pk->type, tls12_sig,
+                                sizeof(tls12_sig)/sizeof(tls12_lookup));
+        }
+
+const EVP_MD *tls12_get_hash(unsigned char hash_alg)
+        {
+        switch(hash_alg)
+                {
+#ifndef OPENSSL_NO_MD5
+                case TLSEXT_hash_md5:
+#ifdef OPENSSL_FIPS
+                if (FIPS_mode())
+                        return NULL;
+#endif
+                return EVP_md5();
+#endif
+#ifndef OPENSSL_NO_SHA
+                case TLSEXT_hash_sha1:
+                return EVP_sha1();
+#endif
+#ifndef OPENSSL_NO_SHA256
+                case TLSEXT_hash_sha224:
+                return EVP_sha224();
+
+                case TLSEXT_hash_sha256:
+                return EVP_sha256();
+#endif
+#ifndef OPENSSL_NO_SHA512
+                case TLSEXT_hash_sha384:
+                return EVP_sha384();
+
+                case TLSEXT_hash_sha512:
+                return EVP_sha512();
+#endif
+                default:
+                return NULL;
+
+                }
+        }
+
+/* Set preferred digest for each key type */
+
+int tls1_process_sigalgs(SSL *s, const unsigned char *data, int dsize)
+        {
+        int i, idx;
+        const EVP_MD *md;
+        CERT *c = s->cert;
+        /* Extension ignored for TLS versions below 1.2 */
+        if (TLS1_get_version(s) < TLS1_2_VERSION)
                 return 1;
+        /* Should never happen */
+        if (!c)
+                return 0;
+
+        c->pkeys[SSL_PKEY_DSA_SIGN].digest = NULL;
+        c->pkeys[SSL_PKEY_RSA_SIGN].digest = NULL;
+        c->pkeys[SSL_PKEY_RSA_ENC].digest = NULL;
+        c->pkeys[SSL_PKEY_ECC].digest = NULL;
+
+        for (i = 0; i < dsize; i += 2)
+                {
+                unsigned char hash_alg = data[i], sig_alg = data[i+1];
+
+                switch(sig_alg)
+                        {
+#ifndef OPENSSL_NO_RSA
+                        case TLSEXT_signature_rsa:
+                        idx = SSL_PKEY_RSA_SIGN;
+                        break;
+#endif
+#ifndef OPENSSL_NO_DSA
+                        case TLSEXT_signature_dsa:
+                        idx = SSL_PKEY_DSA_SIGN;
+                        break;
+#endif
+#ifndef OPENSSL_NO_ECDSA
+                        case TLSEXT_signature_ecdsa:
+                        idx = SSL_PKEY_ECC;
+                        break;
+#endif
+                        default:
+                        continue;
+                        }
+
+                if (c->pkeys[idx].digest == NULL)
+                        {
+                        md = tls12_get_hash(hash_alg);
+                        if (md)
+                                {
+                                c->pkeys[idx].digest = md;
+                                if (idx == SSL_PKEY_RSA_SIGN)
+                                        c->pkeys[SSL_PKEY_RSA_ENC].digest = md;
+                                }
+                        }
+
                 }
-        /* If session decrypt failure indicate a cache miss and set state to
-         * send a new ticket
-         */
-        tickerr:        
-        s->tlsext_ticket_expected = 1;
+
+
+        /* Set any remaining keys to default values. NOTE: if alg is not
+         * supported it stays as NULL.
+         */
+#ifndef OPENSSL_NO_DSA
+        if (!c->pkeys[SSL_PKEY_DSA_SIGN].digest)
+                c->pkeys[SSL_PKEY_DSA_SIGN].digest = EVP_dss1();
+#endif
+#ifndef OPENSSL_NO_RSA
+        if (!c->pkeys[SSL_PKEY_RSA_SIGN].digest)
+                {
+                c->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1();
+                c->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1();
+                }
+#endif
+#ifndef OPENSSL_NO_ECDSA
+        if (!c->pkeys[SSL_PKEY_ECC].digest)
+                c->pkeys[SSL_PKEY_ECC].digest = EVP_ecdsa();
+#endif
+        return 1;
+        }
+
+#endif
+
+#ifndef OPENSSL_NO_HEARTBEATS
+int
+tls1_process_heartbeat(SSL *s)
+        {
+        unsigned char *p = &s->s3->rrec.data[0], *pl;
+        unsigned short hbtype;
+        unsigned int payload;
+        unsigned int padding = 16; /* Use minimum padding */
+
+        /* Read type and payload length first */
+        hbtype = *p++;
+        n2s(p, payload);
+        pl = p;
+
+        if (s->msg_callback)
+                s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT,
+                        &s->s3->rrec.data[0], s->s3->rrec.length,
+                        s, s->msg_callback_arg);
+
+        if (hbtype == TLS1_HB_REQUEST)
+                {
+                unsigned char *buffer, *bp;
+                int r;
+
+                /* Allocate memory for the response, size is 1 bytes
+                 * message type, plus 2 bytes payload length, plus
+                 * payload, plus padding
+                 */
+                buffer = OPENSSL_malloc(1 + 2 + payload + padding);
+                bp = buffer;
+                
+                /* Enter response type, length and copy payload */
+                *bp++ = TLS1_HB_RESPONSE;
+                s2n(payload, bp);
+                memcpy(bp, pl, payload);
+                bp += payload;
+                /* Random padding */
+                RAND_pseudo_bytes(bp, padding);
+
+                r = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, 3 + payload + padding);
+
+                if (r >= 0 && s->msg_callback)
+                        s->msg_callback(1, s->version, TLS1_RT_HEARTBEAT,
+                                buffer, 3 + payload + padding,
+                                s, s->msg_callback_arg);
+
+                OPENSSL_free(buffer);
+
+                if (r < 0)
+                        return r;
+                }
+        else if (hbtype == TLS1_HB_RESPONSE)
+                {
+                unsigned int seq;
+                
+                /* We only send sequence numbers (2 bytes unsigned int),
+                 * and 16 random bytes, so we just try to read the
+                 * sequence number */
+                n2s(pl, seq);
+                
+                if (payload == 18 && seq == s->tlsext_hb_seq)
+                        {
+                        s->tlsext_hb_seq++;
+                        s->tlsext_hb_pending = 0;
+                        }
+                }
+
         return 0;
         }
 
+int
+tls1_heartbeat(SSL *s)
+        {
+        unsigned char *buf, *p;
+        int ret;
+        unsigned int payload = 18; /* Sequence number + random bytes */
+        unsigned int padding = 16; /* Use minimum padding */
+
+        /* Only send if peer supports and accepts HB requests... */
+        if (!(s->tlsext_heartbeat & SSL_TLSEXT_HB_ENABLED) ||
+            s->tlsext_heartbeat & SSL_TLSEXT_HB_DONT_SEND_REQUESTS)
+                {
+                SSLerr(SSL_F_TLS1_HEARTBEAT,SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT);
+                return -1;
+                }
+
+        /* ...and there is none in flight yet... */
+        if (s->tlsext_hb_pending)
+                {
+                SSLerr(SSL_F_TLS1_HEARTBEAT,SSL_R_TLS_HEARTBEAT_PENDING);
+                return -1;
+                }
+                
+        /* ...and no handshake in progress. */
+        if (SSL_in_init(s) || s->in_handshake)
+                {
+                SSLerr(SSL_F_TLS1_HEARTBEAT,SSL_R_UNEXPECTED_MESSAGE);
+                return -1;
+                }
+                
+        /* Check if padding is too long, payload and padding
+         * must not exceed 2^14 - 3 = 16381 bytes in total.
+         */
+        OPENSSL_assert(payload + padding <= 16381);
+
+        /* Create HeartBeat message, we just use a sequence number
+         * as payload to distuingish different messages and add
+         * some random stuff.
+         *  - Message Type, 1 byte
+         *  - Payload Length, 2 bytes (unsigned int)
+         *  - Payload, the sequence number (2 bytes uint)
+         *  - Payload, random bytes (16 bytes uint)
+         *  - Padding
+         */
+        buf = OPENSSL_malloc(1 + 2 + payload + padding);
+        p = buf;
+        /* Message Type */
+        *p++ = TLS1_HB_REQUEST;
+        /* Payload length (18 bytes here) */
+        s2n(payload, p);
+        /* Sequence number */
+        s2n(s->tlsext_hb_seq, p);
+        /* 16 random bytes */
+        RAND_pseudo_bytes(p, 16);
+        p += 16;
+        /* Random padding */
+        RAND_pseudo_bytes(p, padding);
+
+        ret = ssl3_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding);
+        if (ret >= 0)
+                {
+                if (s->msg_callback)
+                        s->msg_callback(1, s->version, TLS1_RT_HEARTBEAT,
+                                buf, 3 + payload + padding,
+                                s, s->msg_callback_arg);
+
+                s->tlsext_hb_pending = 1;
+                }
+                
+        OPENSSL_free(buf);
+
+        return ret;
+        }
 #endif
diff --git a/src/lib/libssl/src/ssl/t1_meth.c b/src/lib/libssl/src/ssl/t1_meth.c
index 6ce7c0bbf5..53c807de28 100644
--- a/src/lib/libssl/src/ssl/t1_meth.c
+++ b/src/lib/libssl/src/ssl/t1_meth.c
@@ -60,16 +60,28 @@
 #include <openssl/objects.h>
 #include "ssl_locl.h"
 
-static const SSL_METHOD *tls1_get_method(int ver);
 static const SSL_METHOD *tls1_get_method(int ver)
         {
+        if (ver == TLS1_2_VERSION)
+                return TLSv1_2_method();
+        if (ver == TLS1_1_VERSION)
+                return TLSv1_1_method();
         if (ver == TLS1_VERSION)
-                return(TLSv1_method());
-        else
-                return(NULL);
+                return TLSv1_method();
+        return NULL;
         }
 
-IMPLEMENT_tls1_meth_func(TLSv1_method,
+IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_method,
+                        ssl3_accept,
+                        ssl3_connect,
+                        tls1_get_method)
+
+IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method,
+                        ssl3_accept,
+                        ssl3_connect,
+                        tls1_get_method)
+
+IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method,
                         ssl3_accept,
                         ssl3_connect,
                         tls1_get_method)
diff --git a/src/lib/libssl/src/ssl/t1_srvr.c b/src/lib/libssl/src/ssl/t1_srvr.c
index 42525e9e89..f1d1565769 100644
--- a/src/lib/libssl/src/ssl/t1_srvr.c
+++ b/src/lib/libssl/src/ssl/t1_srvr.c
@@ -67,13 +67,26 @@
 static const SSL_METHOD *tls1_get_server_method(int ver);
 static const SSL_METHOD *tls1_get_server_method(int ver)
         {
+        if (ver == TLS1_2_VERSION)
+                return TLSv1_2_server_method();
+        if (ver == TLS1_1_VERSION)
+                return TLSv1_1_server_method();
         if (ver == TLS1_VERSION)
-                return(TLSv1_server_method());
-        else
-                return(NULL);
+                return TLSv1_server_method();
+        return NULL;
         }
 
-IMPLEMENT_tls1_meth_func(TLSv1_server_method,
+IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_server_method,
+                        ssl3_accept,
+                        ssl_undefined_function,
+                        tls1_get_server_method)
+
+IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_server_method,
+                        ssl3_accept,
+                        ssl_undefined_function,
+                        tls1_get_server_method)
+
+IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_server_method,
                         ssl3_accept,
                         ssl_undefined_function,
                         tls1_get_server_method)
diff --git a/src/lib/libssl/src/ssl/tls1.h b/src/lib/libssl/src/ssl/tls1.h
index b3cc8f098b..c39c267f0b 100644
--- a/src/lib/libssl/src/ssl/tls1.h
+++ b/src/lib/libssl/src/ssl/tls1.h
@@ -159,10 +159,24 @@ extern "C" {
 
 #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES    0
 
+#define TLS1_2_VERSION                  0x0303
+#define TLS1_2_VERSION_MAJOR            0x03
+#define TLS1_2_VERSION_MINOR            0x03
+
+#define TLS1_1_VERSION                  0x0302
+#define TLS1_1_VERSION_MAJOR            0x03
+#define TLS1_1_VERSION_MINOR            0x02
+
 #define TLS1_VERSION                    0x0301
 #define TLS1_VERSION_MAJOR              0x03
 #define TLS1_VERSION_MINOR              0x01
 
+#define TLS1_get_version(s) \
+                ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0)
+
+#define TLS1_get_client_version(s) \
+                ((s->client_version >> 8) == TLS1_VERSION_MAJOR ? s->client_version : 0)
+
 #define TLS1_AD_DECRYPTION_FAILED       21
 #define TLS1_AD_RECORD_OVERFLOW         22
 #define TLS1_AD_UNKNOWN_CA              48      /* fatal */
@@ -183,17 +197,42 @@ extern "C" {
 #define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
 #define TLS1_AD_UNKNOWN_PSK_IDENTITY    115     /* fatal */
 
-/* ExtensionType values from RFC3546 / RFC4366 */
+/* ExtensionType values from RFC3546 / RFC4366 / RFC6066 */
 #define TLSEXT_TYPE_server_name                 0
 #define TLSEXT_TYPE_max_fragment_length         1
 #define TLSEXT_TYPE_client_certificate_url      2
 #define TLSEXT_TYPE_trusted_ca_keys             3
 #define TLSEXT_TYPE_truncated_hmac              4
 #define TLSEXT_TYPE_status_request              5
+/* ExtensionType values from RFC4681 */
+#define TLSEXT_TYPE_user_mapping                6
+
+/* ExtensionType values from RFC5878 */
+#define TLSEXT_TYPE_client_authz                7
+#define TLSEXT_TYPE_server_authz                8
+
+/* ExtensionType values from RFC6091 */
+#define TLSEXT_TYPE_cert_type           9
+
 /* ExtensionType values from RFC4492 */
 #define TLSEXT_TYPE_elliptic_curves             10
 #define TLSEXT_TYPE_ec_point_formats            11
+
+/* ExtensionType value from RFC5054 */
+#define TLSEXT_TYPE_srp                         12
+
+/* ExtensionType values from RFC5246 */
+#define TLSEXT_TYPE_signature_algorithms        13
+
+/* ExtensionType value from RFC5764 */
+#define TLSEXT_TYPE_use_srtp    14
+
+/* ExtensionType value from RFC5620 */
+#define TLSEXT_TYPE_heartbeat   15
+
+/* ExtensionType value from RFC4507 */
 #define TLSEXT_TYPE_session_ticket              35
+
 /* ExtensionType value from draft-rescorla-tls-opaque-prf-input-00.txt */
 #if 0 /* will have to be provided externally for now ,
        * i.e. build with -DTLSEXT_TYPE_opaque_prf_input=38183
@@ -204,6 +243,11 @@ extern "C" {
 /* Temporary extension type */
 #define TLSEXT_TYPE_renegotiate                 0xff01
 
+#ifndef OPENSSL_NO_NEXTPROTONEG
+/* This is not an IANA defined extension number */
+#define TLSEXT_TYPE_next_proto_neg              13172
+#endif
+
 /* NameType value from RFC 3546 */
 #define TLSEXT_NAMETYPE_host_name 0
 /* status request value from RFC 3546 */
@@ -216,12 +260,37 @@ extern "C" {
 #define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2  2
 #define TLSEXT_ECPOINTFORMAT_last                       2
 
+/* Signature and hash algorithms from RFC 5246 */
+
+#define TLSEXT_signature_anonymous                      0
+#define TLSEXT_signature_rsa                            1
+#define TLSEXT_signature_dsa                            2
+#define TLSEXT_signature_ecdsa                          3
+
+#define TLSEXT_hash_none                                0
+#define TLSEXT_hash_md5                                 1
+#define TLSEXT_hash_sha1                                2
+#define TLSEXT_hash_sha224                              3
+#define TLSEXT_hash_sha256                              4
+#define TLSEXT_hash_sha384                              5
+#define TLSEXT_hash_sha512                              6
+
 #ifndef OPENSSL_NO_TLSEXT
 
 #define TLSEXT_MAXLEN_host_name 255
 
-const char *SSL_get_servername(const SSL *s, const int type) ;
-int SSL_get_servername_type(const SSL *s) ;
+const char *SSL_get_servername(const SSL *s, const int type);
+int SSL_get_servername_type(const SSL *s);
+/* SSL_export_keying_material exports a value derived from the master secret,
+ * as specified in RFC 5705. It writes |olen| bytes to |out| given a label and
+ * optional context. (Since a zero length context is allowed, the |use_context|
+ * flag controls whether a context is included.)
+ *
+ * It returns 1 on success and zero otherwise.
+ */
+int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
+        const char *label, size_t llen, const unsigned char *p, size_t plen,
+        int use_context);
 
 #define SSL_set_tlsext_host_name(s,name) \
 SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)
@@ -285,6 +354,16 @@ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg)
 #define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
 SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 
+#ifndef OPENSSL_NO_HEARTBEATS
+#define SSL_TLSEXT_HB_ENABLED                           0x01
+#define SSL_TLSEXT_HB_DONT_SEND_REQUESTS        0x02
+#define SSL_TLSEXT_HB_DONT_RECV_REQUESTS        0x04
+
+#define SSL_get_tlsext_heartbeat_pending(ssl) \
+        SSL_ctrl((ssl),SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING,0,NULL)
+#define SSL_set_tlsext_heartbeat_no_requests(ssl, arg) \
+        SSL_ctrl((ssl),SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS,arg,NULL)
+#endif
 #endif
 
 /* PSK ciphersuites from 4279 */
@@ -322,6 +401,14 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 #define TLS1_CK_DHE_RSA_WITH_AES_256_SHA                0x03000039
 #define TLS1_CK_ADH_WITH_AES_256_SHA                    0x0300003A
 
+/* TLS v1.2 ciphersuites */
+#define TLS1_CK_RSA_WITH_NULL_SHA256                    0x0300003B
+#define TLS1_CK_RSA_WITH_AES_128_SHA256                 0x0300003C
+#define TLS1_CK_RSA_WITH_AES_256_SHA256                 0x0300003D
+#define TLS1_CK_DH_DSS_WITH_AES_128_SHA256              0x0300003E
+#define TLS1_CK_DH_RSA_WITH_AES_128_SHA256              0x0300003F
+#define TLS1_CK_DHE_DSS_WITH_AES_128_SHA256             0x03000040
+
 /* Camellia ciphersuites from RFC4132 */
 #define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA           0x03000041
 #define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA        0x03000042
@@ -330,6 +417,16 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 #define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA       0x03000045
 #define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA           0x03000046
 
+/* TLS v1.2 ciphersuites */
+#define TLS1_CK_DHE_RSA_WITH_AES_128_SHA256             0x03000067
+#define TLS1_CK_DH_DSS_WITH_AES_256_SHA256              0x03000068
+#define TLS1_CK_DH_RSA_WITH_AES_256_SHA256              0x03000069
+#define TLS1_CK_DHE_DSS_WITH_AES_256_SHA256             0x0300006A
+#define TLS1_CK_DHE_RSA_WITH_AES_256_SHA256             0x0300006B
+#define TLS1_CK_ADH_WITH_AES_128_SHA256                 0x0300006C
+#define TLS1_CK_ADH_WITH_AES_256_SHA256                 0x0300006D
+
+/* Camellia ciphersuites from RFC4132 */
 #define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA           0x03000084
 #define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA        0x03000085
 #define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA        0x03000086
@@ -345,6 +442,20 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 #define TLS1_CK_DHE_RSA_WITH_SEED_SHA                   0x0300009A
 #define TLS1_CK_ADH_WITH_SEED_SHA                       0x0300009B
 
+/* TLS v1.2 GCM ciphersuites from RFC5288 */
+#define TLS1_CK_RSA_WITH_AES_128_GCM_SHA256             0x0300009C
+#define TLS1_CK_RSA_WITH_AES_256_GCM_SHA384             0x0300009D
+#define TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256         0x0300009E
+#define TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384         0x0300009F
+#define TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256          0x030000A0
+#define TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384          0x030000A1
+#define TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256         0x030000A2
+#define TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384         0x030000A3
+#define TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256          0x030000A4
+#define TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384          0x030000A5
+#define TLS1_CK_ADH_WITH_AES_128_GCM_SHA256             0x030000A6
+#define TLS1_CK_ADH_WITH_AES_256_GCM_SHA384             0x030000A7
+
 /* ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in draft 13 */
 #define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA                0x0300C001
 #define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA             0x0300C002
@@ -376,6 +487,38 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 #define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA          0x0300C018
 #define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA          0x0300C019
 
+/* SRP ciphersuites from RFC 5054 */
+#define TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA           0x0300C01A
+#define TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA       0x0300C01B
+#define TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA       0x0300C01C
+#define TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA            0x0300C01D
+#define TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA        0x0300C01E
+#define TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA        0x0300C01F
+#define TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA            0x0300C020
+#define TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA        0x0300C021
+#define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA        0x0300C022
+
+/* ECDH HMAC based ciphersuites from RFC5289 */
+
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256         0x0300C023
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384         0x0300C024
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256          0x0300C025
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384          0x0300C026
+#define TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256           0x0300C027
+#define TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384           0x0300C028
+#define TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256            0x0300C029
+#define TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384            0x0300C02A
+
+/* ECDH GCM based ciphersuites from RFC5289 */
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256     0x0300C02B
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384     0x0300C02C
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256      0x0300C02D
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384      0x0300C02E
+#define TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256       0x0300C02F
+#define TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384       0x0300C030
+#define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256        0x0300C031
+#define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384        0x0300C032
+
 /* XXX
  * Inconsistency alert:
  * The OpenSSL names of ciphers with ephemeral DH here include the string
@@ -443,6 +586,17 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 #define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA               "PSK-AES128-CBC-SHA"
 #define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA               "PSK-AES256-CBC-SHA"
 
+/* SRP ciphersuite from RFC 5054 */
+#define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA          "SRP-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA      "SRP-RSA-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA      "SRP-DSS-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA           "SRP-AES-128-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA       "SRP-RSA-AES-128-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA       "SRP-DSS-AES-128-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA           "SRP-AES-256-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA       "SRP-RSA-AES-256-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA       "SRP-DSS-AES-256-CBC-SHA"
+
 /* Camellia ciphersuites from RFC4132 */
 #define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA          "CAMELLIA128-SHA"
 #define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA       "DH-DSS-CAMELLIA128-SHA"
@@ -466,6 +620,55 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
 #define TLS1_TXT_DHE_RSA_WITH_SEED_SHA                  "DHE-RSA-SEED-SHA"
 #define TLS1_TXT_ADH_WITH_SEED_SHA                      "ADH-SEED-SHA"
 
+/* TLS v1.2 ciphersuites */
+#define TLS1_TXT_RSA_WITH_NULL_SHA256                   "NULL-SHA256"
+#define TLS1_TXT_RSA_WITH_AES_128_SHA256                "AES128-SHA256"
+#define TLS1_TXT_RSA_WITH_AES_256_SHA256                "AES256-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_AES_128_SHA256             "DH-DSS-AES128-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_AES_128_SHA256             "DH-RSA-AES128-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256            "DHE-DSS-AES128-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256            "DHE-RSA-AES128-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_AES_256_SHA256             "DH-DSS-AES256-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_AES_256_SHA256             "DH-RSA-AES256-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256            "DHE-DSS-AES256-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256            "DHE-RSA-AES256-SHA256"
+#define TLS1_TXT_ADH_WITH_AES_128_SHA256                "ADH-AES128-SHA256"
+#define TLS1_TXT_ADH_WITH_AES_256_SHA256                "ADH-AES256-SHA256"
+
+/* TLS v1.2 GCM ciphersuites from RFC5288 */
+#define TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256            "AES128-GCM-SHA256"
+#define TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384            "AES256-GCM-SHA384"
+#define TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256        "DHE-RSA-AES128-GCM-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384        "DHE-RSA-AES256-GCM-SHA384"
+#define TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256         "DH-RSA-AES128-GCM-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384         "DH-RSA-AES256-GCM-SHA384"
+#define TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256        "DHE-DSS-AES128-GCM-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384        "DHE-DSS-AES256-GCM-SHA384"
+#define TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256         "DH-DSS-AES128-GCM-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384         "DH-DSS-AES256-GCM-SHA384"
+#define TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256            "ADH-AES128-GCM-SHA256"
+#define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384            "ADH-AES256-GCM-SHA384"
+
+/* ECDH HMAC based ciphersuites from RFC5289 */
+
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256    "ECDHE-ECDSA-AES128-SHA256"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384    "ECDHE-ECDSA-AES256-SHA384"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256     "ECDH-ECDSA-AES128-SHA256"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384     "ECDH-ECDSA-AES256-SHA384"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256      "ECDHE-RSA-AES128-SHA256"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384      "ECDHE-RSA-AES256-SHA384"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256       "ECDH-RSA-AES128-SHA256"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384       "ECDH-RSA-AES256-SHA384"
+
+/* ECDH GCM based ciphersuites from RFC5289 */
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256    "ECDHE-ECDSA-AES128-GCM-SHA256"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384    "ECDHE-ECDSA-AES256-GCM-SHA384"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256     "ECDH-ECDSA-AES128-GCM-SHA256"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384     "ECDH-ECDSA-AES256-GCM-SHA384"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256      "ECDHE-RSA-AES128-GCM-SHA256"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384      "ECDHE-RSA-AES256-GCM-SHA384"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256       "ECDH-RSA-AES128-GCM-SHA256"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384       "ECDH-RSA-AES256-GCM-SHA384"
 
 #define TLS_CT_RSA_SIGN                 1
 #define TLS_CT_DSS_SIGN                 2
diff --git a/src/lib/libssl/src/test/CAss.cnf b/src/lib/libssl/src/test/CAss.cnf
index 20f8f05e3d..109bc8c10b 100644
--- a/src/lib/libssl/src/test/CAss.cnf
+++ b/src/lib/libssl/src/test/CAss.cnf
@@ -7,7 +7,7 @@ RANDFILE		= ./.rnd
 
 ####################################################################
 [ req ]
-default_bits            = 512
+default_bits            = 2048
 default_keyfile         = keySS.pem
 distinguished_name      = req_distinguished_name
 encrypt_rsa_key         = no
diff --git a/src/lib/libssl/src/test/Makefile b/src/lib/libssl/src/test/Makefile
index 3912f82427..09e6848764 100644
--- a/src/lib/libssl/src/test/Makefile
+++ b/src/lib/libssl/src/test/Makefile
@@ -61,6 +61,7 @@ ENGINETEST=	enginetest
 EVPTEST=        evp_test
 IGETEST=        igetest
 JPAKETEST=      jpaketest
+SRPTEST=        srptest
 ASN1TEST=       asn1test
 
 TESTS=          alltests
@@ -72,7 +73,7 @@ EXE=	$(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT)  $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)
         $(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \
         $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \
         $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \
-        $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) \
+        $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \
         $(ASN1TEST)$(EXE_EXT)
 
 # $(METHTEST)$(EXE_EXT)
@@ -93,7 +94,7 @@ SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
         $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
         $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
         $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c \
-        $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(ASN1TEST).c
+        $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c
 
 EXHEADER= 
 HEADER= $(EXHEADER)
@@ -136,7 +137,7 @@ alltests: \
         test_enc test_x509 test_rsa test_crl test_sid \
         test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
         test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \
-        test_jpake test_cms
+        test_jpake test_srp test_cms
 
 test_evp:
         ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
@@ -274,6 +275,9 @@ test_engine:
 test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
                 intP1.ss intP2.ss
         @echo "test SSL protocol"
+        @if [ -n "$(FIPSCANLIB)" ]; then \
+          sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
+        fi
         ../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist
         @sh ./testssl keyU.ss certU.ss certCA.ss
         @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
@@ -310,6 +314,10 @@ test_cms:
         @echo "CMS consistency test"
         $(PERL) cms-test.pl
 
+test_srp: $(SRPTEST)$(EXE_EXT)
+        @echo "Test SRP"
+        ../util/shlib_wrap.sh ./srptest
+
 lint:
         lint -DLINT $(INCLUDES) $(SRC)>fluff
 
@@ -340,7 +348,19 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
         fi; \
         LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
         $(MAKE) -f $(TOP)/Makefile.shared -e \
-                APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
+                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
+                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+                link_app.$${shlib_target}
+
+FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
+                shlib_target="$(SHLIB_TARGET)"; \
+        fi; \
+        LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
+        if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
+                FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
+        fi; \
+        $(MAKE) -f $(TOP)/Makefile.shared -e \
+                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
                 LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
                 link_app.$${shlib_target}
 
@@ -423,7 +443,7 @@ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
         @target=$(METHTEST); $(BUILD_CMD)
 
 $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
-        @target=$(SSLTEST); $(BUILD_CMD)
+        @target=$(SSLTEST); $(FIPS_BUILD_CMD)
 
 $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
         @target=$(ENGINETEST); $(BUILD_CMD)
@@ -446,6 +466,9 @@ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
 $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
         @target=$(ASN1TEST); $(BUILD_CMD)
 
+$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+        @target=$(SRPTEST); $(BUILD_CMD)
+
 #$(AESTEST).o: $(AESTEST).c
 #       $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
 
@@ -669,6 +692,13 @@ shatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 shatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 shatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h shatest.c
+srptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+srptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+srptest.o: ../include/openssl/err.h ../include/openssl/lhash.h
+srptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+srptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+srptest.o: ../include/openssl/safestack.h ../include/openssl/srp.h
+srptest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h srptest.c
 ssltest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssltest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ssltest.o: ../include/openssl/comp.h ../include/openssl/conf.h
@@ -685,7 +715,8 @@ ssltest.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssltest.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssltest.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ssltest.o: ../include/openssl/sha.h ../include/openssl/srp.h
+ssltest.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 ssltest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 ssltest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 ssltest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
diff --git a/src/lib/libssl/src/test/P1ss.cnf b/src/lib/libssl/src/test/P1ss.cnf
index 876a0d35f8..326cce2ba8 100644
--- a/src/lib/libssl/src/test/P1ss.cnf
+++ b/src/lib/libssl/src/test/P1ss.cnf
@@ -7,7 +7,7 @@ RANDFILE		= ./.rnd
 
 ####################################################################
 [ req ]
-default_bits            = 512
+default_bits            = 1024
 default_keyfile         = keySS.pem
 distinguished_name      = req_distinguished_name
 encrypt_rsa_key         = no
diff --git a/src/lib/libssl/src/test/P2ss.cnf b/src/lib/libssl/src/test/P2ss.cnf
index 373a87e7c2..8b502321b8 100644
--- a/src/lib/libssl/src/test/P2ss.cnf
+++ b/src/lib/libssl/src/test/P2ss.cnf
@@ -7,7 +7,7 @@ RANDFILE		= ./.rnd
 
 ####################################################################
 [ req ]
-default_bits            = 512
+default_bits            = 1024
 default_keyfile         = keySS.pem
 distinguished_name      = req_distinguished_name
 encrypt_rsa_key         = no
diff --git a/src/lib/libssl/src/test/Uss.cnf b/src/lib/libssl/src/test/Uss.cnf
index 0c0ebb5f67..58ac0ca54d 100644
--- a/src/lib/libssl/src/test/Uss.cnf
+++ b/src/lib/libssl/src/test/Uss.cnf
@@ -7,11 +7,11 @@ RANDFILE		= ./.rnd
 
 ####################################################################
 [ req ]
-default_bits            = 512
+default_bits            = 2048
 default_keyfile         = keySS.pem
 distinguished_name      = req_distinguished_name
 encrypt_rsa_key         = no
-default_md              = md2
+default_md              = sha256
 
 [ req_distinguished_name ]
 countryName                     = Country Name (2 letter code)
diff --git a/src/lib/libssl/src/test/evptests.txt b/src/lib/libssl/src/test/evptests.txt
index beb12144b6..c273707c14 100644
--- a/src/lib/libssl/src/test/evptests.txt
+++ b/src/lib/libssl/src/test/evptests.txt
@@ -158,6 +158,19 @@ AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7B
 AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:0
 AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:0
 
+# AES Counter test vectors from RFC3686
+aes-128-ctr:AE6852F8121067CC4BF7A5765577F39E:00000030000000000000000000000001:53696E676C6520626C6F636B206D7367:E4095D4FB7A7B3792D6175A3261311B8:1
+aes-128-ctr:7E24067817FAE0D743D6CE1F32539163:006CB6DBC0543B59DA48D90B00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28:1
+aes-128-ctr:7691BE035E5020A8AC6E618529F9A0DC:00E0017B27777F3F4A1786F000000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F:1
+
+aes-192-ctr:16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515:0000004836733C147D6D93CB00000001:53696E676C6520626C6F636B206D7367:4B55384FE259C9C84E7935A003CBE928:1
+aes-192-ctr:7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A:0096B03B020C6EADC2CB500D00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:453243FC609B23327EDFAAFA7131CD9F8490701C5AD4A79CFC1FE0FF42F4FB00:1
+aes-192-ctr:02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE:0007BDFD5CBD60278DCC091200000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:96893FC55E5C722F540B7DD1DDF7E758D288BC95C69165884536C811662F2188ABEE0935:1
+
+aes-256-ctr:776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104:00000060DB5672C97AA8F0B200000001:53696E676C6520626C6F636B206D7367:145AD01DBF824EC7560863DC71E3E0C0:1
+aes-256-ctr:F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884:00FAAC24C1585EF15A43D87500000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C:1
+aes-256-ctr:FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D:001CC5B751A51D70A1C1114800000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8:1
+
 # DES ECB tests (from destest)
 
 DES-ECB:0000000000000000::0000000000000000:8CA64DE9C1B123A7
diff --git a/src/lib/libssl/src/test/maketests.com b/src/lib/libssl/src/test/maketests.com
index 386e5cf3c1..9b64cba234 100644
--- a/src/lib/libssl/src/test/maketests.com
+++ b/src/lib/libssl/src/test/maketests.com
@@ -146,7 +146,8 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
                "MDC2TEST,RMDTEST,"+ -
                "RANDTEST,DHTEST,ENGINETEST,"+ -
                "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
-               "EVP_TEST,IGETEST,JPAKETEST,ASN1TEST"
+               "EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ -
+               "ASN1TEST"
 $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?
 $!
 $! Additional directory information.
@@ -182,6 +183,7 @@ $ T_D_RSA_TEST   := [-.crypto.rsa]
 $ T_D_EVP_TEST   := [-.crypto.evp]
 $ T_D_IGETEST    := [-.test]
 $ T_D_JPAKETEST  := [-.crypto.jpake]
+$ T_D_SRPTEST    := [-.crypto.srp]
 $ T_D_ASN1TEST   := [-.test]
 $!
 $ TCPIP_PROGRAMS = ",,"
diff --git a/src/lib/libssl/src/test/test.cnf b/src/lib/libssl/src/test/test.cnf
index faad3914a8..10834442a1 100644
--- a/src/lib/libssl/src/test/test.cnf
+++ b/src/lib/libssl/src/test/test.cnf
@@ -56,7 +56,7 @@ emailAddress		= optional
 
 ####################################################################
 [ req ]
-default_bits            = 512
+default_bits            = 1024
 default_keyfile         = testkey.pem
 distinguished_name      = req_distinguished_name
 encrypt_rsa_key         = no
diff --git a/src/lib/libssl/src/test/tests.com b/src/lib/libssl/src/test/tests.com
index 373dd16eac..a840d5078f 100644
--- a/src/lib/libssl/src/test/tests.com
+++ b/src/lib/libssl/src/test/tests.com
@@ -56,7 +56,7 @@ $	    tests := -
         test_enc,test_x509,test_rsa,test_crl,test_sid,-
         test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
         test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,-
-        test_jpake,test_cms
+        test_jpake,test_srp,test_cms
 $       endif
 $       tests = f$edit(tests,"COLLAPSE")
 $
@@ -68,6 +68,8 @@ $	EXPTEST :=	exptest
 $       IDEATEST :=     ideatest
 $       SHATEST :=      shatest
 $       SHA1TEST :=     sha1test
+$       SHA256TEST :=   sha256t
+$       SHA512TEST :=   sha512t
 $       MDC2TEST :=     mdc2test
 $       RMDTEST :=      rmdtest
 $       MD2TEST :=      md2test
@@ -91,6 +93,7 @@ $	ENGINETEST :=	enginetest
 $       EVPTEST :=      evp_test
 $       IGETEST :=      igetest
 $       JPAKETEST :=    jpaketest
+$       SRPTEST :=      srptest
 $       ASN1TEST :=     asn1test
 $!
 $       tests_i = 0
@@ -114,6 +117,8 @@ $	return
 $ test_sha:
 $       mcr 'texe_dir''shatest'
 $       mcr 'texe_dir''sha1test'
+$       mcr 'texe_dir''sha256test'
+$       mcr 'texe_dir''sha512test'
 $       return
 $ test_mdc2:
 $       mcr 'texe_dir''mdc2test'
@@ -357,6 +362,10 @@ $	! Define the logical name used to find openssl.exe in the perl script.
 $       define /user_mode osslx 'exe_dir'
 $       perl CMS-TEST.PL
 $       return
+$ test_srp: 
+$       write sys$output "Test SRP"
+$       mcr 'texe_dir''srptest'
+$       return
 $
 $
 $ exit:
diff --git a/src/lib/libssl/src/test/testssl b/src/lib/libssl/src/test/testssl
index b55364ae88..5ae4dc8720 100644
--- a/src/lib/libssl/src/test/testssl
+++ b/src/lib/libssl/src/test/testssl
@@ -148,4 +148,14 @@ $ssltest -tls1 -cipher PSK -psk abc123 $extra || exit 1
 echo test tls1 with PSK via BIO pair
 $ssltest -bio_pair -tls1 -cipher PSK -psk abc123 $extra || exit 1
 
+if ../util/shlib_wrap.sh ../apps/openssl no-srp; then
+  echo skipping SRP tests
+else
+  echo test tls1 with SRP
+  $ssltest -tls1 -cipher SRP -srpuser test -srppass abc123
+
+  echo test tls1 with SRP via BIO pair
+  $ssltest -bio_pair -tls1 -cipher SRP -srpuser test -srppass abc123
+fi
+
 exit 0
diff --git a/src/lib/libssl/src/util/cygwin.sh b/src/lib/libssl/src/util/cygwin.sh
index d6228521e6..cfdb04d2a4 100644
--- a/src/lib/libssl/src/util/cygwin.sh
+++ b/src/lib/libssl/src/util/cygwin.sh
@@ -11,6 +11,7 @@ CONFIG_OPTIONS="--prefix=/usr shared zlib no-idea no-rc5"
 INSTALL_PREFIX=/tmp/install/INSTALL
 
 VERSION=
+SHLIB_VERSION_NUMBER=
 SUBVERSION=$1
 
 function cleanup()
@@ -28,6 +29,13 @@ function get_openssl_version()
     echo "       Check value of variable VERSION in Makefile."
     exit 1
   fi
+  eval `grep '^SHLIB_VERSION_NUMBER=' Makefile`
+  if [ -z "${SHLIB_VERSION_NUMBER}" ]
+  then
+    echo "Error: Couldn't retrieve OpenSSL shared lib version from Makefile."
+    echo " Check value of variable SHLIB_VERSION_NUMBER in Makefile."
+    exit 1
+  fi
 }
 
 function base_install()
@@ -124,7 +132,7 @@ strip usr/bin/*.exe usr/bin/*.dll usr/lib/engines/*.so
 chmod u-w usr/lib/engines/*.so
 
 # Runtime package
-tar cjf libopenssl${VERSION//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2 \
+tar cjf libopenssl${SHLIB_VERSION_NUMBER//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2 \
      usr/bin/cyg*dll
 # Base package
 find etc usr/bin/openssl.exe usr/bin/c_rehash usr/lib/engines usr/share/doc \
@@ -139,7 +147,7 @@ tar cjfT openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2 -
 
 ls -l openssl-${VERSION}-${SUBVERSION}.tar.bz2
 ls -l openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2
-ls -l libopenssl${VERSION//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2
+ls -l libopenssl${SHLIB_VERSION_NUMBER//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2
 
 cleanup
 
diff --git a/src/lib/libssl/src/util/libeay.num b/src/lib/libssl/src/util/libeay.num
index b23619f20a..93f80ba0c6 100644
--- a/src/lib/libssl/src/util/libeay.num
+++ b/src/lib/libssl/src/util/libeay.num
@@ -1050,7 +1050,7 @@ ASN1_TYPE_get_octetstring               1077	EXIST::FUNCTION:
 ASN1_TYPE_set_int_octetstring           1078    EXIST::FUNCTION:
 ASN1_TYPE_set_octetstring               1079    EXIST::FUNCTION:
 ASN1_UTCTIME_set_string                 1080    EXIST::FUNCTION:
-ERR_add_error_data                      1081    EXIST::FUNCTION:BIO
+ERR_add_error_data                      1081    EXIST::FUNCTION:
 ERR_set_error_data                      1082    EXIST::FUNCTION:
 EVP_CIPHER_asn1_to_param                1083    EXIST::FUNCTION:
 EVP_CIPHER_param_to_asn1                1084    EXIST::FUNCTION:
@@ -2808,7 +2808,7 @@ FIPS_corrupt_rsa                        3249	NOEXIST::FUNCTION:
 FIPS_selftest_des                       3250    NOEXIST::FUNCTION:
 EVP_aes_128_cfb1                        3251    EXIST::FUNCTION:AES
 EVP_aes_192_cfb8                        3252    EXIST::FUNCTION:AES
-FIPS_mode_set                           3253    NOEXIST::FUNCTION:
+FIPS_mode_set                           3253    EXIST::FUNCTION:
 FIPS_selftest_dsa                       3254    NOEXIST::FUNCTION:
 EVP_aes_256_cfb8                        3255    EXIST::FUNCTION:AES
 FIPS_allow_md5                          3256    NOEXIST::FUNCTION:
@@ -2838,23 +2838,23 @@ AES_cfb1_encrypt                        3279	EXIST::FUNCTION:AES
 EVP_des_ede3_cfb1                       3280    EXIST::FUNCTION:DES
 FIPS_rand_check                         3281    NOEXIST::FUNCTION:
 FIPS_md5_allowed                        3282    NOEXIST::FUNCTION:
-FIPS_mode                               3283    NOEXIST::FUNCTION:
+FIPS_mode                               3283    EXIST::FUNCTION:
 FIPS_selftest_failed                    3284    NOEXIST::FUNCTION:
 sk_is_sorted                            3285    EXIST::FUNCTION:
 X509_check_ca                           3286    EXIST::FUNCTION:
-private_idea_set_encrypt_key            3287    NOEXIST::FUNCTION:
+private_idea_set_encrypt_key            3287    EXIST:OPENSSL_FIPS:FUNCTION:IDEA
 HMAC_CTX_set_flags                      3288    EXIST::FUNCTION:HMAC
-private_SHA_Init                        3289    NOEXIST::FUNCTION:
-private_CAST_set_key                    3290    NOEXIST::FUNCTION:
-private_RIPEMD160_Init                  3291    NOEXIST::FUNCTION:
+private_SHA_Init                        3289    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA0
+private_CAST_set_key                    3290    EXIST:OPENSSL_FIPS:FUNCTION:CAST
+private_RIPEMD160_Init                  3291    EXIST:OPENSSL_FIPS:FUNCTION:RIPEMD
 private_RC5_32_set_key                  3292    NOEXIST::FUNCTION:
-private_MD5_Init                        3293    NOEXIST::FUNCTION:
-private_RC4_set_key                     3294    NOEXIST::FUNCTION:
-private_MDC2_Init                       3295    NOEXIST::FUNCTION:
-private_RC2_set_key                     3296    NOEXIST::FUNCTION:
-private_MD4_Init                        3297    NOEXIST::FUNCTION:
-private_BF_set_key                      3298    NOEXIST::FUNCTION:
-private_MD2_Init                        3299    NOEXIST::FUNCTION:
+private_MD5_Init                        3293    EXIST:OPENSSL_FIPS:FUNCTION:MD5
+private_RC4_set_key                     3294    EXIST::FUNCTION:RC4
+private_MDC2_Init                       3295    EXIST:OPENSSL_FIPS:FUNCTION:MDC2
+private_RC2_set_key                     3296    EXIST:OPENSSL_FIPS:FUNCTION:RC2
+private_MD4_Init                        3297    EXIST:OPENSSL_FIPS:FUNCTION:MD4
+private_BF_set_key                      3298    EXIST:OPENSSL_FIPS:FUNCTION:BF
+private_MD2_Init                        3299    EXIST:OPENSSL_FIPS:FUNCTION:MD2
 d2i_PROXY_CERT_INFO_EXTENSION           3300    EXIST::FUNCTION:
 PROXY_POLICY_it                         3301    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PROXY_POLICY_it                         3301    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
@@ -2882,7 +2882,7 @@ RSA_verify_PKCS1_PSS                    3321	EXIST::FUNCTION:RSA
 RSA_padding_add_X931                    3322    EXIST::FUNCTION:RSA
 RSA_padding_add_PKCS1_PSS               3323    EXIST::FUNCTION:RSA
 PKCS1_MGF1                              3324    EXIST::FUNCTION:RSA
-BN_X931_generate_Xpq                    3325    NOEXIST::FUNCTION:
+BN_X931_generate_Xpq                    3325    EXIST::FUNCTION:
 RSA_X931_generate_key                   3326    NOEXIST::FUNCTION:
 BN_X931_derive_prime                    3327    NOEXIST::FUNCTION:
 BN_X931_generate_prime                  3328    NOEXIST::FUNCTION:
@@ -2906,7 +2906,7 @@ STORE_parse_attrs_start                 3343	NOEXIST::FUNCTION:
 POLICY_CONSTRAINTS_free                 3344    EXIST::FUNCTION:
 EVP_PKEY_add1_attr_by_NID               3345    EXIST::FUNCTION:
 BN_nist_mod_192                         3346    EXIST::FUNCTION:
-EC_GROUP_get_trinomial_basis            3347    EXIST::FUNCTION:EC
+EC_GROUP_get_trinomial_basis            3347    EXIST::FUNCTION:EC,EC2M
 STORE_set_method                        3348    NOEXIST::FUNCTION:
 GENERAL_SUBTREE_free                    3349    EXIST::FUNCTION:
 NAME_CONSTRAINTS_it                     3350    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
@@ -2921,14 +2921,14 @@ SHA512_Update                           3356	EXIST:!VMSVAX:FUNCTION:SHA,SHA512
 i2d_ECPrivateKey                        3357    EXIST::FUNCTION:EC
 BN_get0_nist_prime_192                  3358    EXIST::FUNCTION:
 STORE_modify_certificate                3359    NOEXIST::FUNCTION:
-EC_POINT_set_affine_coordinates_GF2m    3360    EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_affine_coords_GF2m         3360    EXIST:VMS:FUNCTION:EC
-BN_GF2m_mod_exp_arr                     3361    EXIST::FUNCTION:
+EC_POINT_set_affine_coordinates_GF2m    3360    EXIST:!VMS:FUNCTION:EC,EC2M
+EC_POINT_set_affine_coords_GF2m         3360    EXIST:VMS:FUNCTION:EC,EC2M
+BN_GF2m_mod_exp_arr                     3361    EXIST::FUNCTION:EC2M
 STORE_ATTR_INFO_modify_number           3362    NOEXIST::FUNCTION:
 X509_keyid_get0                         3363    EXIST::FUNCTION:
 ENGINE_load_gmp                         3364    EXIST::FUNCTION:ENGINE,GMP,STATIC_ENGINE
 pitem_new                               3365    EXIST::FUNCTION:
-BN_GF2m_mod_mul_arr                     3366    EXIST::FUNCTION:
+BN_GF2m_mod_mul_arr                     3366    EXIST::FUNCTION:EC2M
 STORE_list_public_key_endp              3367    NOEXIST::FUNCTION:
 o2i_ECPublicKey                         3368    EXIST::FUNCTION:EC
 EC_KEY_copy                             3369    EXIST::FUNCTION:EC
@@ -2945,7 +2945,7 @@ X509_VERIFY_PARAM_inherit               3378	EXIST::FUNCTION:
 EC_POINT_point2bn                       3379    EXIST::FUNCTION:EC
 STORE_ATTR_INFO_set_dn                  3380    NOEXIST::FUNCTION:
 X509_policy_tree_get0_policies          3381    EXIST::FUNCTION:
-EC_GROUP_new_curve_GF2m                 3382    EXIST::FUNCTION:EC
+EC_GROUP_new_curve_GF2m                 3382    EXIST::FUNCTION:EC,EC2M
 STORE_destroy_method                    3383    NOEXIST::FUNCTION:
 ENGINE_unregister_STORE                 3384    EXIST::FUNCTION:ENGINE
 EVP_PKEY_get1_EC_KEY                    3385    EXIST::FUNCTION:EC
@@ -2961,7 +2961,7 @@ ENGINE_get_static_state                 3393	EXIST::FUNCTION:ENGINE
 pqueue_iterator                         3394    EXIST::FUNCTION:
 ECDSA_SIG_new                           3395    EXIST::FUNCTION:ECDSA
 OPENSSL_DIR_end                         3396    EXIST::FUNCTION:
-BN_GF2m_mod_sqr                         3397    EXIST::FUNCTION:
+BN_GF2m_mod_sqr                         3397    EXIST::FUNCTION:EC2M
 EC_POINT_bn2point                       3398    EXIST::FUNCTION:EC
 X509_VERIFY_PARAM_set_depth             3399    EXIST::FUNCTION:
 EC_KEY_set_asn1_flag                    3400    EXIST::FUNCTION:EC
@@ -2974,7 +2974,7 @@ EC_GROUP_get_point_conv_form            3405	EXIST:VMS:FUNCTION:EC
 STORE_method_set_store_function         3406    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_in                      3407    NOEXIST::FUNCTION:
 PEM_read_bio_ECPKParameters             3408    EXIST::FUNCTION:EC
-EC_GROUP_get_pentanomial_basis          3409    EXIST::FUNCTION:EC
+EC_GROUP_get_pentanomial_basis          3409    EXIST::FUNCTION:EC,EC2M
 EVP_PKEY_add1_attr_by_txt               3410    EXIST::FUNCTION:
 BN_BLINDING_set_flags                   3411    EXIST::FUNCTION:
 X509_VERIFY_PARAM_set1_policies         3412    EXIST::FUNCTION:
@@ -2982,10 +2982,10 @@ X509_VERIFY_PARAM_set1_name             3413	EXIST::FUNCTION:
 X509_VERIFY_PARAM_set_purpose           3414    EXIST::FUNCTION:
 STORE_get_number                        3415    NOEXIST::FUNCTION:
 ECDSA_sign_setup                        3416    EXIST::FUNCTION:ECDSA
-BN_GF2m_mod_solve_quad_arr              3417    EXIST::FUNCTION:
+BN_GF2m_mod_solve_quad_arr              3417    EXIST::FUNCTION:EC2M
 EC_KEY_up_ref                           3418    EXIST::FUNCTION:EC
 POLICY_MAPPING_free                     3419    EXIST::FUNCTION:
-BN_GF2m_mod_div                         3420    EXIST::FUNCTION:
+BN_GF2m_mod_div                         3420    EXIST::FUNCTION:EC2M
 X509_VERIFY_PARAM_set_flags             3421    EXIST::FUNCTION:
 EC_KEY_free                             3422    EXIST::FUNCTION:EC
 STORE_meth_set_list_next_fn             3423    NOEXIST::FUNCTION:
@@ -2999,7 +2999,7 @@ STORE_method_set_list_end_function      3427	NOEXIST::FUNCTION:
 pqueue_print                            3428    EXIST::FUNCTION:
 EC_GROUP_have_precompute_mult           3429    EXIST::FUNCTION:EC
 EC_KEY_print_fp                         3430    EXIST::FUNCTION:EC,FP_API
-BN_GF2m_mod_arr                         3431    EXIST::FUNCTION:
+BN_GF2m_mod_arr                         3431    EXIST::FUNCTION:EC2M
 PEM_write_bio_X509_CERT_PAIR            3432    EXIST::FUNCTION:
 EVP_PKEY_cmp                            3433    EXIST::FUNCTION:
 X509_policy_level_node_count            3434    EXIST::FUNCTION:
@@ -3020,7 +3020,7 @@ X509_policy_node_get0_qualifiers        3448	EXIST:!VMS:FUNCTION:
 X509_pcy_node_get0_qualifiers           3448    EXIST:VMS:FUNCTION:
 STORE_list_crl_end                      3449    NOEXIST::FUNCTION:
 EVP_PKEY_set1_EC_KEY                    3450    EXIST::FUNCTION:EC
-BN_GF2m_mod_sqrt_arr                    3451    EXIST::FUNCTION:
+BN_GF2m_mod_sqrt_arr                    3451    EXIST::FUNCTION:EC2M
 i2d_ECPrivateKey_bio                    3452    EXIST::FUNCTION:BIO,EC
 ECPKParameters_print_fp                 3453    EXIST::FUNCTION:EC,FP_API
 pqueue_find                             3454    EXIST::FUNCTION:
@@ -3037,7 +3037,7 @@ PKCS12_add_safes                        3464	EXIST::FUNCTION:
 BN_BLINDING_convert_ex                  3465    EXIST::FUNCTION:
 X509_policy_tree_free                   3466    EXIST::FUNCTION:
 OPENSSL_ia32cap_loc                     3467    EXIST::FUNCTION:
-BN_GF2m_poly2arr                        3468    EXIST::FUNCTION:
+BN_GF2m_poly2arr                        3468    EXIST::FUNCTION:EC2M
 STORE_ctrl                              3469    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_compare                 3470    NOEXIST::FUNCTION:
 BN_get0_nist_prime_224                  3471    EXIST::FUNCTION:
@@ -3061,7 +3061,7 @@ STORE_method_set_delete_function        3486	NOEXIST::FUNCTION:
 STORE_list_certificate_next             3487    NOEXIST::FUNCTION:
 ASN1_generate_nconf                     3488    EXIST::FUNCTION:
 BUF_memdup                              3489    EXIST::FUNCTION:
-BN_GF2m_mod_mul                         3490    EXIST::FUNCTION:
+BN_GF2m_mod_mul                         3490    EXIST::FUNCTION:EC2M
 STORE_meth_get_list_next_fn             3491    NOEXIST::FUNCTION:
 STORE_method_get_list_next_function     3491    NOEXIST::FUNCTION:
 STORE_ATTR_INFO_get0_dn                 3492    NOEXIST::FUNCTION:
@@ -3072,7 +3072,7 @@ STORE_ATTR_INFO_free                    3496	NOEXIST::FUNCTION:
 STORE_get_private_key                   3497    NOEXIST::FUNCTION:
 EVP_PKEY_get_attr_count                 3498    EXIST::FUNCTION:
 STORE_ATTR_INFO_new                     3499    NOEXIST::FUNCTION:
-EC_GROUP_get_curve_GF2m                 3500    EXIST::FUNCTION:EC
+EC_GROUP_get_curve_GF2m                 3500    EXIST::FUNCTION:EC,EC2M
 STORE_meth_set_revoke_fn                3501    NOEXIST::FUNCTION:
 STORE_method_set_revoke_function        3501    NOEXIST::FUNCTION:
 STORE_store_number                      3502    NOEXIST::FUNCTION:
@@ -3088,7 +3088,7 @@ BIO_dump_indent_fp                      3511	EXIST::FUNCTION:FP_API
 EC_KEY_set_group                        3512    EXIST::FUNCTION:EC
 BUF_strndup                             3513    EXIST::FUNCTION:
 STORE_list_certificate_start            3514    NOEXIST::FUNCTION:
-BN_GF2m_mod                             3515    EXIST::FUNCTION:
+BN_GF2m_mod                             3515    EXIST::FUNCTION:EC2M
 X509_REQ_check_private_key              3516    EXIST::FUNCTION:
 EC_GROUP_get_seed_len                   3517    EXIST::FUNCTION:EC
 ERR_load_STORE_strings                  3518    NOEXIST::FUNCTION:
@@ -3117,19 +3117,19 @@ STORE_method_set_get_function           3536	NOEXIST::FUNCTION:
 STORE_modify_number                     3537    NOEXIST::FUNCTION:
 STORE_method_get_store_function         3538    NOEXIST::FUNCTION:
 STORE_store_private_key                 3539    NOEXIST::FUNCTION:
-BN_GF2m_mod_sqr_arr                     3540    EXIST::FUNCTION:
+BN_GF2m_mod_sqr_arr                     3540    EXIST::FUNCTION:EC2M
 RSA_setup_blinding                      3541    EXIST::FUNCTION:RSA
 BIO_s_datagram                          3542    EXIST::FUNCTION:DGRAM
 STORE_Memory                            3543    NOEXIST::FUNCTION:
 sk_find_ex                              3544    EXIST::FUNCTION:
-EC_GROUP_set_curve_GF2m                 3545    EXIST::FUNCTION:EC
+EC_GROUP_set_curve_GF2m                 3545    EXIST::FUNCTION:EC,EC2M
 ENGINE_set_default_ECDSA                3546    EXIST::FUNCTION:ENGINE
 POLICY_CONSTRAINTS_new                  3547    EXIST::FUNCTION:
-BN_GF2m_mod_sqrt                        3548    EXIST::FUNCTION:
+BN_GF2m_mod_sqrt                        3548    EXIST::FUNCTION:EC2M
 ECDH_set_default_method                 3549    EXIST::FUNCTION:ECDH
 EC_KEY_generate_key                     3550    EXIST::FUNCTION:EC
 SHA384_Update                           3551    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
-BN_GF2m_arr2poly                        3552    EXIST::FUNCTION:
+BN_GF2m_arr2poly                        3552    EXIST::FUNCTION:EC2M
 STORE_method_get_get_function           3553    NOEXIST::FUNCTION:
 STORE_meth_set_cleanup_fn               3554    NOEXIST::FUNCTION:
 STORE_method_set_cleanup_function       3554    NOEXIST::FUNCTION:
@@ -3154,7 +3154,7 @@ EC_GROUP_get_degree                     3570	EXIST::FUNCTION:EC
 ASN1_generate_v3                        3571    EXIST::FUNCTION:
 STORE_ATTR_INFO_modify_cstr             3572    NOEXIST::FUNCTION:
 X509_policy_tree_level_count            3573    EXIST::FUNCTION:
-BN_GF2m_add                             3574    EXIST::FUNCTION:
+BN_GF2m_add                             3574    EXIST::FUNCTION:EC2M
 EC_KEY_get0_group                       3575    EXIST::FUNCTION:EC
 STORE_generate_crl                      3576    NOEXIST::FUNCTION:
 STORE_store_public_key                  3577    NOEXIST::FUNCTION:
@@ -3179,8 +3179,8 @@ STORE_store_certificate                 3593	NOEXIST::FUNCTION:
 OBJ_bsearch_ex                          3594    NOEXIST::FUNCTION:
 X509_STORE_CTX_set_default              3595    EXIST::FUNCTION:
 STORE_ATTR_INFO_set_sha1str             3596    NOEXIST::FUNCTION:
-BN_GF2m_mod_inv                         3597    EXIST::FUNCTION:
-BN_GF2m_mod_exp                         3598    EXIST::FUNCTION:
+BN_GF2m_mod_inv                         3597    EXIST::FUNCTION:EC2M
+BN_GF2m_mod_exp                         3598    EXIST::FUNCTION:EC2M
 STORE_modify_public_key                 3599    NOEXIST::FUNCTION:
 STORE_meth_get_list_start_fn            3600    NOEXIST::FUNCTION:
 STORE_method_get_list_start_function    3600    NOEXIST::FUNCTION:
@@ -3188,7 +3188,7 @@ EC_GROUP_get0_seed                      3601	EXIST::FUNCTION:EC
 STORE_store_arbitrary                   3602    NOEXIST::FUNCTION:
 STORE_meth_set_unlock_store_fn          3603    NOEXIST::FUNCTION:
 STORE_method_set_unlock_store_function  3603    NOEXIST::FUNCTION:
-BN_GF2m_mod_div_arr                     3604    EXIST::FUNCTION:
+BN_GF2m_mod_div_arr                     3604    EXIST::FUNCTION:EC2M
 ENGINE_set_ECDSA                        3605    EXIST::FUNCTION:ENGINE
 STORE_create_method                     3606    NOEXIST::FUNCTION:
 ECPKParameters_print                    3607    EXIST::FUNCTION:BIO,EC
@@ -3211,8 +3211,8 @@ EC_KEY_get_enc_flags                    3622	EXIST::FUNCTION:EC
 ASN1_const_check_infinite_end           3623    EXIST::FUNCTION:
 EVP_PKEY_delete_attr                    3624    EXIST::FUNCTION:
 ECDSA_set_default_method                3625    EXIST::FUNCTION:ECDSA
-EC_POINT_set_compressed_coordinates_GF2m 3626   EXIST:!VMS:FUNCTION:EC
-EC_POINT_set_compr_coords_GF2m          3626    EXIST:VMS:FUNCTION:EC
+EC_POINT_set_compressed_coordinates_GF2m 3626   EXIST:!VMS:FUNCTION:EC,EC2M
+EC_POINT_set_compr_coords_GF2m          3626    EXIST:VMS:FUNCTION:EC,EC2M
 EC_GROUP_cmp                            3627    EXIST::FUNCTION:EC
 STORE_revoke_certificate                3628    NOEXIST::FUNCTION:
 BN_get0_nist_prime_256                  3629    EXIST::FUNCTION:
@@ -3241,7 +3241,7 @@ POLICY_CONSTRAINTS_it                   3649	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 STORE_get_ex_new_index                  3650    NOEXIST::FUNCTION:
 EVP_PKEY_get_attr_by_OBJ                3651    EXIST::FUNCTION:
 X509_VERIFY_PARAM_add0_policy           3652    EXIST::FUNCTION:
-BN_GF2m_mod_solve_quad                  3653    EXIST::FUNCTION:
+BN_GF2m_mod_solve_quad                  3653    EXIST::FUNCTION:EC2M
 SHA256                                  3654    EXIST::FUNCTION:SHA,SHA256
 i2d_ECPrivateKey_fp                     3655    EXIST::FUNCTION:EC,FP_API
 X509_policy_tree_get0_user_policies     3656    EXIST:!VMS:FUNCTION:
@@ -3249,8 +3249,8 @@ X509_pcy_tree_get0_usr_policies         3656	EXIST:VMS:FUNCTION:
 OPENSSL_DIR_read                        3657    EXIST::FUNCTION:
 ENGINE_register_all_ECDSA               3658    EXIST::FUNCTION:ENGINE
 X509_VERIFY_PARAM_lookup                3659    EXIST::FUNCTION:
-EC_POINT_get_affine_coordinates_GF2m    3660    EXIST:!VMS:FUNCTION:EC
-EC_POINT_get_affine_coords_GF2m         3660    EXIST:VMS:FUNCTION:EC
+EC_POINT_get_affine_coordinates_GF2m    3660    EXIST:!VMS:FUNCTION:EC,EC2M
+EC_POINT_get_affine_coords_GF2m         3660    EXIST:VMS:FUNCTION:EC,EC2M
 EC_GROUP_dup                            3661    EXIST::FUNCTION:EC
 ENGINE_get_default_ECDSA                3662    EXIST::FUNCTION:ENGINE
 EC_KEY_new                              3663    EXIST::FUNCTION:EC
@@ -3332,7 +3332,7 @@ STORE_list_certificate_end              3734	NOEXIST::FUNCTION:
 STORE_get_crl                           3735    NOEXIST::FUNCTION:
 X509_POLICY_NODE_print                  3736    EXIST::FUNCTION:
 SHA384_Init                             3737    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
-EC_GF2m_simple_method                   3738    EXIST::FUNCTION:EC
+EC_GF2m_simple_method                   3738    EXIST::FUNCTION:EC,EC2M
 ECDSA_set_ex_data                       3739    EXIST::FUNCTION:ECDSA
 SHA384_Final                            3740    EXIST:!VMSVAX:FUNCTION:SHA,SHA512
 PKCS7_set_digest                        3741    EXIST::FUNCTION:
@@ -3364,7 +3364,7 @@ BIO_dump_cb                             3764	EXIST::FUNCTION:
 SHA256_Update                           3765    EXIST::FUNCTION:SHA,SHA256
 pqueue_insert                           3766    EXIST::FUNCTION:
 pitem_free                              3767    EXIST::FUNCTION:
-BN_GF2m_mod_inv_arr                     3768    EXIST::FUNCTION:
+BN_GF2m_mod_inv_arr                     3768    EXIST::FUNCTION:EC2M
 ENGINE_unregister_ECDSA                 3769    EXIST::FUNCTION:ENGINE
 BN_BLINDING_set_thread_id               3770    EXIST::FUNCTION:DEPRECATED
 get_rfc3526_prime_8192                  3771    EXIST::FUNCTION:
@@ -3670,7 +3670,7 @@ int_EVP_MD_set_engine_callbacks         4056	NOEXIST::FUNCTION:
 int_CRYPTO_set_do_dynlock_callback      4057    NOEXIST::FUNCTION:
 FIPS_rng_stick                          4058    NOEXIST::FUNCTION:
 EVP_CIPHER_CTX_set_flags                4059    EXIST::FUNCTION:
-BN_X931_generate_prime_ex               4060    NOEXIST::FUNCTION:
+BN_X931_generate_prime_ex               4060    EXIST::FUNCTION:
 FIPS_selftest_check                     4061    NOEXIST::FUNCTION:
 FIPS_rand_set_dt                        4062    NOEXIST::FUNCTION:
 CRYPTO_dbg_pop_info                     4063    NOEXIST::FUNCTION:
@@ -3695,14 +3695,14 @@ FIPS_rand_test_mode                     4081	NOEXIST::FUNCTION:
 FIPS_rand_reset                         4082    NOEXIST::FUNCTION:
 FIPS_dsa_new                            4083    NOEXIST::FUNCTION:
 int_RAND_set_callbacks                  4084    NOEXIST::FUNCTION:
-BN_X931_derive_prime_ex                 4085    NOEXIST::FUNCTION:
+BN_X931_derive_prime_ex                 4085    EXIST::FUNCTION:
 int_ERR_lib_init                        4086    NOEXIST::FUNCTION:
 int_EVP_CIPHER_init_engine_callbacks    4087    NOEXIST::FUNCTION:
 FIPS_rsa_free                           4088    NOEXIST::FUNCTION:
 FIPS_dsa_sig_encode                     4089    NOEXIST::FUNCTION:
 CRYPTO_dbg_remove_all_info              4090    NOEXIST::FUNCTION:
-OPENSSL_init                            4091    NOEXIST::FUNCTION:
-private_Camellia_set_key                4092    NOEXIST::FUNCTION:
+OPENSSL_init                            4091    EXIST::FUNCTION:
+private_Camellia_set_key                4092    EXIST:OPENSSL_FIPS:FUNCTION:CAMELLIA
 CRYPTO_strdup                           4093    EXIST::FUNCTION:
 JPAKE_STEP3A_process                    4094    EXIST::FUNCTION:JPAKE
 JPAKE_STEP1_release                     4095    EXIST::FUNCTION:JPAKE
@@ -4194,3 +4194,119 @@ OPENSSL_memcmp                          4565	EXIST::FUNCTION:
 OPENSSL_strncasecmp                     4566    EXIST::FUNCTION:
 OPENSSL_gmtime                          4567    EXIST::FUNCTION:
 OPENSSL_gmtime_adj                      4568    EXIST::FUNCTION:
+SRP_VBASE_get_by_user                   4569    EXIST::FUNCTION:SRP
+SRP_Calc_server_key                     4570    EXIST::FUNCTION:SRP
+SRP_create_verifier                     4571    EXIST::FUNCTION:SRP
+SRP_create_verifier_BN                  4572    EXIST::FUNCTION:SRP
+SRP_Calc_u                              4573    EXIST::FUNCTION:SRP
+SRP_VBASE_free                          4574    EXIST::FUNCTION:SRP
+SRP_Calc_client_key                     4575    EXIST::FUNCTION:SRP
+SRP_get_default_gN                      4576    EXIST::FUNCTION:SRP
+SRP_Calc_x                              4577    EXIST::FUNCTION:SRP
+SRP_Calc_B                              4578    EXIST::FUNCTION:SRP
+SRP_VBASE_new                           4579    EXIST::FUNCTION:SRP
+SRP_check_known_gN_param                4580    EXIST::FUNCTION:SRP
+SRP_Calc_A                              4581    EXIST::FUNCTION:SRP
+SRP_Verify_A_mod_N                      4582    EXIST::FUNCTION:SRP
+SRP_VBASE_init                          4583    EXIST::FUNCTION:SRP
+SRP_Verify_B_mod_N                      4584    EXIST::FUNCTION:SRP
+EC_KEY_set_public_key_affine_coordinates 4585   EXIST:!VMS:FUNCTION:EC
+EC_KEY_set_pub_key_aff_coords           4585    EXIST:VMS:FUNCTION:EC
+EVP_aes_192_ctr                         4586    EXIST::FUNCTION:AES
+EVP_PKEY_meth_get0_info                 4587    EXIST::FUNCTION:
+EVP_PKEY_meth_copy                      4588    EXIST::FUNCTION:
+ERR_add_error_vdata                     4589    EXIST::FUNCTION:
+EVP_aes_128_ctr                         4590    EXIST::FUNCTION:AES
+EVP_aes_256_ctr                         4591    EXIST::FUNCTION:AES
+EC_GFp_nistp224_method                  4592    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+EC_KEY_get_flags                        4593    EXIST::FUNCTION:EC
+RSA_padding_add_PKCS1_PSS_mgf1          4594    EXIST::FUNCTION:RSA
+EVP_aes_128_xts                         4595    EXIST::FUNCTION:AES
+private_SHA224_Init                     4596    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256
+private_AES_set_decrypt_key             4597    EXIST::FUNCTION:AES
+private_WHIRLPOOL_Init                  4598    EXIST:OPENSSL_FIPS:FUNCTION:WHIRLPOOL
+EVP_aes_256_xts                         4599    EXIST::FUNCTION:AES
+private_SHA512_Init                     4600    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512
+EVP_aes_128_gcm                         4601    EXIST::FUNCTION:AES
+EC_KEY_clear_flags                      4602    EXIST::FUNCTION:EC
+EC_KEY_set_flags                        4603    EXIST::FUNCTION:EC
+private_DES_set_key_unchecked           4604    EXIST:OPENSSL_FIPS:FUNCTION:DES
+EVP_aes_256_ccm                         4605    EXIST::FUNCTION:AES
+private_AES_set_encrypt_key             4606    EXIST::FUNCTION:AES
+RSA_verify_PKCS1_PSS_mgf1               4607    EXIST::FUNCTION:RSA
+private_SHA1_Init                       4608    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA1
+EVP_aes_128_ccm                         4609    EXIST::FUNCTION:AES
+private_SEED_set_key                    4610    EXIST:OPENSSL_FIPS:FUNCTION:SEED
+EVP_aes_192_gcm                         4611    EXIST::FUNCTION:AES
+X509_ALGOR_set_md                       4612    EXIST::FUNCTION:
+private_SHA256_Init                     4613    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA256
+RAND_init_fips                          4614    EXIST:OPENSSL_FIPS:FUNCTION:
+EVP_aes_256_gcm                         4615    EXIST::FUNCTION:AES
+private_SHA384_Init                     4616    EXIST:OPENSSL_FIPS:FUNCTION:SHA,SHA512
+EVP_aes_192_ccm                         4617    EXIST::FUNCTION:AES
+CMAC_CTX_copy                           4618    EXIST::FUNCTION:
+CMAC_CTX_free                           4619    EXIST::FUNCTION:
+CMAC_CTX_get0_cipher_ctx                4620    EXIST::FUNCTION:
+CMAC_CTX_cleanup                        4621    EXIST::FUNCTION:
+CMAC_Init                               4622    EXIST::FUNCTION:
+CMAC_Update                             4623    EXIST::FUNCTION:
+CMAC_resume                             4624    EXIST::FUNCTION:
+CMAC_CTX_new                            4625    EXIST::FUNCTION:
+CMAC_Final                              4626    EXIST::FUNCTION:
+CRYPTO_ctr128_encrypt_ctr32             4627    EXIST::FUNCTION:
+CRYPTO_gcm128_release                   4628    EXIST::FUNCTION:
+CRYPTO_ccm128_decrypt_ccm64             4629    EXIST::FUNCTION:
+CRYPTO_ccm128_encrypt                   4630    EXIST::FUNCTION:
+CRYPTO_gcm128_encrypt                   4631    EXIST::FUNCTION:
+CRYPTO_xts128_encrypt                   4632    EXIST::FUNCTION:
+EVP_rc4_hmac_md5                        4633    EXIST::FUNCTION:MD5,RC4
+CRYPTO_nistcts128_decrypt_block         4634    EXIST::FUNCTION:
+CRYPTO_gcm128_setiv                     4635    EXIST::FUNCTION:
+CRYPTO_nistcts128_encrypt               4636    EXIST::FUNCTION:
+EVP_aes_128_cbc_hmac_sha1               4637    EXIST::FUNCTION:AES,SHA,SHA1
+CRYPTO_gcm128_tag                       4638    EXIST::FUNCTION:
+CRYPTO_ccm128_encrypt_ccm64             4639    EXIST::FUNCTION:
+ENGINE_load_rdrand                      4640    EXIST::FUNCTION:ENGINE
+CRYPTO_ccm128_setiv                     4641    EXIST::FUNCTION:
+CRYPTO_nistcts128_encrypt_block         4642    EXIST::FUNCTION:
+CRYPTO_gcm128_aad                       4643    EXIST::FUNCTION:
+CRYPTO_ccm128_init                      4644    EXIST::FUNCTION:
+CRYPTO_nistcts128_decrypt               4645    EXIST::FUNCTION:
+CRYPTO_gcm128_new                       4646    EXIST::FUNCTION:
+CRYPTO_ccm128_tag                       4647    EXIST::FUNCTION:
+CRYPTO_ccm128_decrypt                   4648    EXIST::FUNCTION:
+CRYPTO_ccm128_aad                       4649    EXIST::FUNCTION:
+CRYPTO_gcm128_init                      4650    EXIST::FUNCTION:
+CRYPTO_gcm128_decrypt                   4651    EXIST::FUNCTION:
+ENGINE_load_rsax                        4652    EXIST::FUNCTION:ENGINE
+CRYPTO_gcm128_decrypt_ctr32             4653    EXIST::FUNCTION:
+CRYPTO_gcm128_encrypt_ctr32             4654    EXIST::FUNCTION:
+CRYPTO_gcm128_finish                    4655    EXIST::FUNCTION:
+EVP_aes_256_cbc_hmac_sha1               4656    EXIST::FUNCTION:AES,SHA,SHA1
+PKCS5_pbkdf2_set                        4657    EXIST::FUNCTION:
+CMS_add0_recipient_password             4658    EXIST::FUNCTION:CMS
+CMS_decrypt_set1_password               4659    EXIST::FUNCTION:CMS
+CMS_RecipientInfo_set0_password         4660    EXIST::FUNCTION:CMS
+RAND_set_fips_drbg_type                 4661    EXIST:OPENSSL_FIPS:FUNCTION:
+X509_REQ_sign_ctx                       4662    EXIST::FUNCTION:EVP
+RSA_PSS_PARAMS_new                      4663    EXIST::FUNCTION:RSA
+X509_CRL_sign_ctx                       4664    EXIST::FUNCTION:EVP
+X509_signature_dump                     4665    EXIST::FUNCTION:EVP
+d2i_RSA_PSS_PARAMS                      4666    EXIST::FUNCTION:RSA
+RSA_PSS_PARAMS_it                       4667    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA
+RSA_PSS_PARAMS_it                       4667    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA
+RSA_PSS_PARAMS_free                     4668    EXIST::FUNCTION:RSA
+X509_sign_ctx                           4669    EXIST::FUNCTION:EVP
+i2d_RSA_PSS_PARAMS                      4670    EXIST::FUNCTION:RSA
+ASN1_item_sign_ctx                      4671    EXIST::FUNCTION:EVP
+EC_GFp_nistp521_method                  4672    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+EC_GFp_nistp256_method                  4673    EXIST::FUNCTION:EC,EC_NISTP_64_GCC_128
+OPENSSL_stderr                          4674    EXIST::FUNCTION:
+OPENSSL_cpuid_setup                     4675    EXIST::FUNCTION:
+OPENSSL_showfatal                       4676    EXIST::FUNCTION:
+BIO_new_dgram_sctp                      4677    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_msg_waiting              4678    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_wait_for_dry             4679    EXIST::FUNCTION:SCTP
+BIO_s_datagram_sctp                     4680    EXIST::FUNCTION:DGRAM,SCTP
+BIO_dgram_is_sctp                       4681    EXIST::FUNCTION:SCTP
+BIO_dgram_sctp_notification_cb          4682    EXIST::FUNCTION:SCTP
diff --git a/src/lib/libssl/src/util/mk1mf.pl b/src/lib/libssl/src/util/mk1mf.pl
index afe8c7326d..72fa089f6b 100644
--- a/src/lib/libssl/src/util/mk1mf.pl
+++ b/src/lib/libssl/src/util/mk1mf.pl
@@ -18,6 +18,8 @@ local $zlib_opt = 0;	# 0 = no zlib, 1 = static, 2 = dynamic
 local $zlib_lib = "";
 local $perl_asm = 0;    # 1 to autobuild asm files from perl scripts
 
+my $ex_l_libs = "";
+
 # Options to import from top level Makefile
 
 my %mf_import = (
@@ -40,7 +42,9 @@ my %mf_import = (
         SHA1_ASM_OBJ   => \$mf_sha_asm,
         RMD160_ASM_OBJ => \$mf_rmd_asm,
         WP_ASM_OBJ     => \$mf_wp_asm,
-        CMLL_ENC       => \$mf_cm_asm
+        CMLL_ENC       => \$mf_cm_asm,
+        BASEADDR       => \$baseaddr,
+        FIPSDIR        => \$fipsdir,
 );
 
 
@@ -104,6 +108,7 @@ and [options] can be one of
         just-ssl                                - remove all non-ssl keys/digest
         no-asm                                  - No x86 asm
         no-krb5                                 - No KRB5
+        no-srp                                  - No SRP
         no-ec                                   - No EC
         no-ecdsa                                - No ECDSA
         no-ecdh                                 - No ECDH
@@ -228,6 +233,8 @@ else
         $cflags.=' -DTERMIO';
         }
 
+$fipsdir =~ s/\//${o}/g;
+
 $out_dir=(defined($VARS{'OUT'}))?$VARS{'OUT'}:$out_def.($debug?".dbg":"");
 $tmp_dir=(defined($VARS{'TMP'}))?$VARS{'TMP'}:$tmp_def.($debug?".dbg":"");
 $inc_dir=(defined($VARS{'INC'}))?$VARS{'INC'}:$inc_def;
@@ -261,6 +268,7 @@ $cflags.=" -DOPENSSL_NO_SOCK" if $no_sock;
 $cflags.=" -DOPENSSL_NO_SSL2" if $no_ssl2;
 $cflags.=" -DOPENSSL_NO_SSL3" if $no_ssl3;
 $cflags.=" -DOPENSSL_NO_TLSEXT" if $no_tlsext;
+$cflags.=" -DOPENSSL_NO_SRP" if $no_srp;
 $cflags.=" -DOPENSSL_NO_CMS" if $no_cms;
 $cflags.=" -DOPENSSL_NO_ERR"  if $no_err;
 $cflags.=" -DOPENSSL_NO_KRB5" if $no_krb5;
@@ -270,7 +278,9 @@ $cflags.=" -DOPENSSL_NO_ECDH" if $no_ecdh;
 $cflags.=" -DOPENSSL_NO_GOST" if $no_gost;
 $cflags.=" -DOPENSSL_NO_ENGINE"   if $no_engine;
 $cflags.=" -DOPENSSL_NO_HW"   if $no_hw;
+$cflags.=" -DOPENSSL_FIPS"    if $fips;
 $cflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;
+$cflags.=" -DOPENSSL_NO_EC2M"    if $no_ec2m;
 $cflags.= " -DZLIB" if $zlib_opt;
 $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
 
@@ -404,6 +414,11 @@ else
         \$(CP) \"\$(O_CRYPTO)\" \"\$(INSTALLTOP)${o}lib\"
 EOF
         $ex_libs .= " $zlib_lib" if $zlib_opt == 1;
+        if ($fips)
+                {
+                $build_targets .= " \$(LIB_D)$o$crypto_compat \$(PREMAIN_DSO_EXE)";
+                $ex_l_libs .= " \$(O_FIPSCANISTER)";
+                }
         }
 
 $defs= <<"EOF";
@@ -465,6 +480,18 @@ MKLIB=$bin_dir$mklib
 MLFLAGS=$mlflags
 ASM=$bin_dir$asm
 
+# FIPS validated module and support file locations
+
+FIPSDIR=$fipsdir
+BASEADDR=$baseaddr
+FIPSLIB_D=\$(FIPSDIR)${o}lib
+FIPS_PREMAIN_SRC=\$(FIPSLIB_D)${o}fips_premain.c
+O_FIPSCANISTER=\$(FIPSLIB_D)${o}fipscanister.lib
+FIPS_SHA1_EXE=\$(FIPSDIR)${o}bin${o}fips_standalone_sha1${exep}
+E_PREMAIN_DSO=fips_premain_dso
+PREMAIN_DSO_EXE=\$(BIN_D)${o}fips_premain_dso$exep
+FIPSLINK=\$(PERL) \$(FIPSDIR)${o}bin${o}fipslink.pl
+
 ######################################################
 # You should not need to touch anything below this point
 ######################################################
@@ -497,7 +524,7 @@ SO_CRYPTO= $plib\$(CRYPTO)$so_shlibp
 L_SSL=     \$(LIB_D)$o$plib\$(SSL)$libp
 L_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$libp
 
-L_LIBS= \$(L_SSL) \$(L_CRYPTO)
+L_LIBS= \$(L_SSL) \$(L_CRYPTO) $ex_l_libs
 
 ######################################################
 # Don't touch anything below this point
@@ -513,7 +540,7 @@ LIBS_DEP=\$(O_CRYPTO) \$(O_SSL)
 EOF
 
 $rules=<<"EOF";
-all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe
+all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe $build_targets
 
 banner:
 $banner
@@ -629,6 +656,16 @@ $rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");
 $defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj);
 $rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
 
+# Special case rule for fips_premain_dso
+
+if ($fips)
+        {
+        $rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj",
+                "\$(FIPS_PREMAIN_SRC)",
+                "-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)", "");
+        $rules.=&do_link_rule("\$(PREMAIN_DSO_EXE)","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(CRYPTOOBJ) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1);
+        }
+
 foreach (values %lib_nam)
         {
         $lib_obj=$lib_obj{$_};
@@ -677,7 +714,28 @@ foreach (split(/\s+/,$engines))
 
 
 $rules.= &do_lib_rule("\$(SSLOBJ)","\$(O_SSL)",$ssl,$shlib,"\$(SO_SSL)");
-$rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)");
+
+if ($fips)
+        {
+        if ($shlib)
+                {
+                $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
+                                "\$(O_CRYPTO)", "$crypto",
+                                $shlib, "\$(SO_CRYPTO)", "\$(BASEADDR)");
+                }
+        else
+                {
+                $rules.= &do_lib_rule("\$(CRYPTOOBJ)",
+                        "\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)", "");
+                $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
+                        "\$(LIB_D)$o$crypto_compat",$crypto,$shlib,"\$(SO_CRYPTO)", "");
+                }
+        }
+        else
+        {
+        $rules.= &do_lib_rule("\$(CRYPTOOBJ)","\$(O_CRYPTO)",$crypto,$shlib,
+                                                        "\$(SO_CRYPTO)");
+        }
 
 foreach (split(" ",$otherlibs))
         {
@@ -687,7 +745,7 @@ foreach (split(" ",$otherlibs))
 
         }
 
-$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");
+$rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)", ($fips && !$shlib) ? 2 : 0);
 
 print $defs;
 
@@ -781,6 +839,8 @@ sub var_add
         @a=grep(!/(^sha1)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;
         @a=grep(!/_mdc2$/,@a) if $no_mdc2;
 
+        @a=grep(!/(srp)/,@a) if $no_srp;
+
         @a=grep(!/^engine$/,@a) if $no_engine;
         @a=grep(!/^hw$/,@a) if $no_hw;
         @a=grep(!/(^rsa$)|(^genrsa$)/,@a) if $no_rsa;
@@ -939,14 +999,15 @@ sub Sasm_compile_target
 
 sub cc_compile_target
         {
-        local($target,$source,$ex_flags)=@_;
+        local($target,$source,$ex_flags, $srcd)=@_;
         local($ret);
         
         $ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);
         $target =~ s/\//$o/g if $o ne "/";
         $source =~ s/\//$o/g if $o ne "/";
-        $ret ="$target: \$(SRC_D)$o$source\n\t";
-        $ret.="\$(CC) ${ofile}$target $ex_flags -c \$(SRC_D)$o$source\n\n";
+        $srcd = "\$(SRC_D)$o" unless defined $srcd;
+        $ret ="$target: $srcd$source\n\t";
+        $ret.="\$(CC) ${ofile}$target $ex_flags -c $srcd$source\n\n";
         return($ret);
         }
 
@@ -1056,8 +1117,11 @@ sub read_options
                 "no-ssl2" => \$no_ssl2,
                 "no-ssl3" => \$no_ssl3,
                 "no-tlsext" => \$no_tlsext,
+                "no-srp" => \$no_srp,
                 "no-cms" => \$no_cms,
+                "no-ec2m" => \$no_ec2m,
                 "no-jpake" => \$no_jpake,
+                "no-ec_nistp_64_gcc_128" => 0,
                 "no-err" => \$no_err,
                 "no-sock" => \$no_sock,
                 "no-krb5" => \$no_krb5,
@@ -1067,11 +1131,12 @@ sub read_options
                 "no-gost" => \$no_gost,
                 "no-engine" => \$no_engine,
                 "no-hw" => \$no_hw,
+                "no-rsax" => 0,
                 "just-ssl" =>
                         [\$no_rc2, \$no_idea, \$no_des, \$no_bf, \$no_cast,
                           \$no_md2, \$no_sha, \$no_mdc2, \$no_dsa, \$no_dh,
                           \$no_ssl2, \$no_err, \$no_ripemd, \$no_rc5,
-                          \$no_aes, \$no_camellia, \$no_seed],
+                          \$no_aes, \$no_camellia, \$no_seed, \$no_srp],
                 "rsaref" => 0,
                 "gcc" => \$gcc,
                 "debug" => \$debug,
@@ -1079,6 +1144,7 @@ sub read_options
                 "shlib" => \$shlib,
                 "dll" => \$shlib,
                 "shared" => 0,
+                "no-sctp" => 0,
                 "no-gmp" => 0,
                 "no-rfc3779" => 0,
                 "no-montasm" => 0,
@@ -1086,6 +1152,7 @@ sub read_options
                 "no-store" => 0,
                 "no-zlib" => 0,
                 "no-zlib-dynamic" => 0,
+                "fips" => \$fips
                 );
 
         if (exists $valid_options{$_})
diff --git a/src/lib/libssl/src/util/mkdef.pl b/src/lib/libssl/src/util/mkdef.pl
index ab47329097..9a8c7b87d1 100644
--- a/src/lib/libssl/src/util/mkdef.pl
+++ b/src/lib/libssl/src/util/mkdef.pl
@@ -79,13 +79,15 @@ my $OS2=0;
 my $safe_stack_def = 0;
 
 my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
-                        "EXPORT_VAR_AS_FUNCTION", "ZLIB" );
+                        "EXPORT_VAR_AS_FUNCTION", "ZLIB", "OPENSSL_FIPS" );
 my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
                          "SHA256", "SHA512", "RIPEMD",
-                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA",
+                         "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M",
                          "HMAC", "AES", "CAMELLIA", "SEED", "GOST",
+                         # EC_NISTP_64_GCC_128
+                         "EC_NISTP_64_GCC_128",
                          # Envelope "algorithms"
                          "EVP", "X509", "ASN1_TYPEDEFS",
                          # Helper "algorithms"
@@ -98,7 +100,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          # RFC3779
                          "RFC3779",
                          # TLS
-                         "TLSEXT", "PSK",
+                         "TLSEXT", "PSK", "SRP", "HEARTBEATS",
                          # CMS
                          "CMS",
                          # CryptoAPI Engine
@@ -107,8 +109,14 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          "SSL2",
                          # JPAKE
                          "JPAKE",
+                         # NEXTPROTONEG
+                         "NEXTPROTONEG",
                          # Deprecated functions
-                         "DEPRECATED" );
+                         "DEPRECATED",
+                         # Hide SSL internals
+                         "SSL_INTERN",
+                         # SCTP
+                         "SCTP");
 
 my $options="";
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -127,7 +135,10 @@ my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5;
 my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw;
 my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated;
 my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
-my $no_jpake; my $no_ssl2;
+my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; 
+my $no_nextprotoneg; my $no_sctp;
+
+my $fips;
 
 my $zlib;
 
@@ -151,6 +162,7 @@ foreach (@ARGV, split(/ /, $options))
         }
         $VMS=1 if $_ eq "VMS";
         $OS2=1 if $_ eq "OS2";
+        $fips=1 if /^fips/;
         if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic"
                          || $_ eq "enable-zlib-dynamic") {
                 $zlib = 1;
@@ -215,9 +227,14 @@ foreach (@ARGV, split(/ /, $options))
         elsif (/^no-rfc3779$/)  { $no_rfc3779=1; }
         elsif (/^no-tlsext$/)   { $no_tlsext=1; }
         elsif (/^no-cms$/)      { $no_cms=1; }
+        elsif (/^no-ec2m$/)     { $no_ec2m=1; }
+        elsif (/^no-ec_nistp_64_gcc_128$/)      { $no_nistp_gcc=1; }
+        elsif (/^no-nextprotoneg$/)     { $no_nextprotoneg=1; }
         elsif (/^no-ssl2$/)     { $no_ssl2=1; }
         elsif (/^no-capieng$/)  { $no_capieng=1; }
         elsif (/^no-jpake$/)    { $no_jpake=1; }
+        elsif (/^no-srp$/)      { $no_srp=1; }
+        elsif (/^no-sctp$/)     { $no_sctp=1; }
         }
 
 
@@ -254,8 +271,10 @@ $max_crypto = $max_num;
 my $ssl="ssl/ssl.h";
 $ssl.=" ssl/kssl.h";
 $ssl.=" ssl/tls1.h";
+$ssl.=" ssl/srtp.h";
 
 my $crypto ="crypto/crypto.h";
+$crypto.=" crypto/cryptlib.h";
 $crypto.=" crypto/o_dir.h";
 $crypto.=" crypto/o_str.h";
 $crypto.=" crypto/o_time.h";
@@ -285,6 +304,7 @@ $crypto.=" crypto/ec/ec.h" ; # unless $no_ec;
 $crypto.=" crypto/ecdsa/ecdsa.h" ; # unless $no_ecdsa;
 $crypto.=" crypto/ecdh/ecdh.h" ; # unless $no_ecdh;
 $crypto.=" crypto/hmac/hmac.h" ; # unless $no_hmac;
+$crypto.=" crypto/cmac/cmac.h" ; # unless $no_hmac;
 
 $crypto.=" crypto/engine/engine.h"; # unless $no_engine;
 $crypto.=" crypto/stack/stack.h" ; # unless $no_stack;
@@ -319,6 +339,7 @@ $crypto.=" crypto/pqueue/pqueue.h";
 $crypto.=" crypto/cms/cms.h";
 $crypto.=" crypto/jpake/jpake.h";
 $crypto.=" crypto/modes/modes.h";
+$crypto.=" crypto/srp/srp.h";
 
 my $symhacks="crypto/symhacks.h";
 
@@ -1126,6 +1147,9 @@ sub is_valid
                         if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32 || $W16)) {
                                 return 1;
                         }
+                        if ($keyword eq "OPENSSL_FIPS" && $fips) {
+                                return 1;
+                        }
                         if ($keyword eq "ZLIB" && $zlib) { return 1; }
                         return 0;
                 } else {
@@ -1172,9 +1196,15 @@ sub is_valid
                         if ($keyword eq "TLSEXT" && $no_tlsext) { return 0; }
                         if ($keyword eq "PSK" && $no_psk) { return 0; }
                         if ($keyword eq "CMS" && $no_cms) { return 0; }
+                        if ($keyword eq "EC2M" && $no_ec2m) { return 0; }
+                        if ($keyword eq "NEXTPROTONEG" && $no_nextprotoneg) { return 0; }
+                        if ($keyword eq "EC_NISTP_64_GCC_128" && $no_nistp_gcc)
+                                        { return 0; }
                         if ($keyword eq "SSL2" && $no_ssl2) { return 0; }
                         if ($keyword eq "CAPIENG" && $no_capieng) { return 0; }
                         if ($keyword eq "JPAKE" && $no_jpake) { return 0; }
+                        if ($keyword eq "SRP" && $no_srp) { return 0; }
+                        if ($keyword eq "SCTP" && $no_sctp) { return 0; }
                         if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
 
                         # Nothing recognise as true
diff --git a/src/lib/libssl/src/util/mkfiles.pl b/src/lib/libssl/src/util/mkfiles.pl
index 6d15831450..7d9a9d5e5c 100644
--- a/src/lib/libssl/src/util/mkfiles.pl
+++ b/src/lib/libssl/src/util/mkfiles.pl
@@ -15,6 +15,7 @@ my @dirs = (
 "crypto/sha",
 "crypto/mdc2",
 "crypto/hmac",
+"crypto/cmac",
 "crypto/ripemd",
 "crypto/des",
 "crypto/rc2",
@@ -62,6 +63,7 @@ my @dirs = (
 "crypto/pqueue",
 "crypto/whrlpool",
 "crypto/ts",
+"crypto/srp",
 "ssl",
 "apps",
 "engines",
diff --git a/src/lib/libssl/src/util/pl/VC-32.pl b/src/lib/libssl/src/util/pl/VC-32.pl
index 5f25fc41bf..c503bd52b9 100644
--- a/src/lib/libssl/src/util/pl/VC-32.pl
+++ b/src/lib/libssl/src/util/pl/VC-32.pl
@@ -6,6 +6,16 @@
 $ssl=   "ssleay32";
 $crypto="libeay32";
 
+if ($fips && !$shlib)
+        {
+        $crypto="libeayfips32";
+        $crypto_compat = "libeaycompat32.lib";
+        }
+else
+        {
+        $crypto="libeay32";
+        }
+
 $o='\\';
 $cp='$(PERL) util/copy.pl';
 $mkdir='$(PERL) util/mkdir-p.pl';
@@ -33,7 +43,7 @@ if ($FLAVOR =~ /WIN64/)
     # considered safe to ignore.
     # 
     $base_cflags= " $mf_cflag";
-    my $f = $shlib?' /MD':' /MT';
+    my $f = $shlib || $fips ?' /MD':' /MT';
     $lib_cflag='/Zl' if (!$shlib);      # remove /DEFAULTLIBs from static lib
     $opt_cflags=$f.' /Ox';
     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
@@ -114,7 +124,7 @@ elsif ($FLAVOR =~ /CE/)
 else    # Win32
     {
     $base_cflags= " $mf_cflag";
-    my $f = $shlib?' /MD':' /MT';
+    my $f = $shlib || $fips ?' /MD':' /MT';
     $lib_cflag='/Zl' if (!$shlib);      # remove /DEFAULTLIBs from static lib
     $opt_cflags=$f.' /Ox /O2 /Ob2';
     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
@@ -266,10 +276,19 @@ elsif ($shlib && $FLAVOR =~ /CE/)
 
 sub do_lib_rule
         {
-        local($objs,$target,$name,$shlib)=@_;
+        my($objs,$target,$name,$shlib,$ign,$base_addr) = @_;
         local($ret);
 
         $taget =~ s/\//$o/g if $o ne '/';
+        my $base_arg;
+        if ($base_addr ne "")
+                {
+                $base_arg= " /base:$base_addr";
+                }
+        else
+                {
+                $base_arg = "";
+                }
         if ($name ne "")
                 {
                 $name =~ tr/a-z/A-Z/;
@@ -277,17 +296,37 @@ sub do_lib_rule
                 }
 
 #       $target="\$(LIB_D)$o$target";
-        $ret.="$target: $objs\n";
+#       $ret.="$target: $objs\n";
         if (!$shlib)
                 {
 #               $ret.="\t\$(RM) \$(O_$Name)\n";
+                $ret.="$target: $objs\n";
                 $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs\n<<\n";
                 }
         else
                 {
                 local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)';
                 $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
-                $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n";
+
+                if ($fips && $target =~ /O_CRYPTO/)
+                        {
+                        $ret.="$target: $objs \$(PREMAIN_DSO_EXE)";
+                        $ret.="\n\tSET FIPS_LINK=\$(LINK)\n";
+                        $ret.="\tSET FIPS_CC=\$(CC)\n";
+                        $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
+                        $ret.="\tSET PREMAIN_DSO_EXE=\$(PREMAIN_DSO_EXE)\n";
+                        $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
+                        $ret.="\tSET FIPS_TARGET=$target\n";
+                        $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
+                        $ret.="\t\$(FIPSLINK) \$(MLFLAGS) /map $base_arg $efile$target ";
+                        $ret.="$name @<<\n  \$(SHLIB_EX_OBJ) $objs \$(EX_LIBS) ";
+                        $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n";
+                        }
+                else
+                        {
+                        $ret.="$target: $objs";
+                        $ret.="\n\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n  \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n";
+                        }
                 $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n";
                 }
         $ret.="\n";
@@ -296,15 +335,35 @@ sub do_lib_rule
 
 sub do_link_rule
         {
-        local($target,$files,$dep_libs,$libs)=@_;
+        my($target,$files,$dep_libs,$libs,$standalone)=@_;
         local($ret,$_);
-        
         $file =~ s/\//$o/g if $o ne '/';
         $n=&bname($targer);
         $ret.="$target: $files $dep_libs\n";
-        $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
-        $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
-        $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
+        if ($standalone == 1)
+                {
+                $ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";
+                $ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
+                $ret.="$files $libs\n<<\n";
+                }
+        elsif ($standalone == 2)
+                {
+                $ret.="\tSET FIPS_LINK=\$(LINK)\n";
+                $ret.="\tSET FIPS_CC=\$(CC)\n";
+                $ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
+                $ret.="\tSET PREMAIN_DSO_EXE=\n";
+                $ret.="\tSET FIPS_TARGET=$target\n";
+                $ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
+                $ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
+                $ret.="\t\$(FIPSLINK) \$(LFLAGS) /map $efile$target @<<\n";
+                $ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";
+                }
+        else
+                {
+                $ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
+                $ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n";
+                }
+        $ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
         return($ret);
         }
 
diff --git a/src/lib/libssl/src/util/ssleay.num b/src/lib/libssl/src/util/ssleay.num
index 15a58e7b13..37655bc40a 100644
--- a/src/lib/libssl/src/util/ssleay.num
+++ b/src/lib/libssl/src/util/ssleay.num
@@ -259,3 +259,64 @@ SSL_set_session_secret_cb               307	EXIST::FUNCTION:
 SSL_set_session_ticket_ext_cb           308     EXIST::FUNCTION:
 SSL_set1_param                          309     EXIST::FUNCTION:
 SSL_CTX_set1_param                      310     EXIST::FUNCTION:
+SSL_tls1_key_exporter                   311     NOEXIST::FUNCTION:
+SSL_renegotiate_abbreviated             312     EXIST::FUNCTION:
+TLSv1_1_method                          313     EXIST::FUNCTION:
+TLSv1_1_client_method                   314     EXIST::FUNCTION:
+TLSv1_1_server_method                   315     EXIST::FUNCTION:
+SSL_CTX_set_srp_client_pwd_callback     316     EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_client_pwd_cb           316     EXIST:VMS:FUNCTION:SRP
+SSL_get_srp_g                           317     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_username_callback       318     EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_un_cb                   318     EXIST:VMS:FUNCTION:SRP
+SSL_get_srp_userinfo                    319     EXIST::FUNCTION:SRP
+SSL_set_srp_server_param                320     EXIST::FUNCTION:SRP
+SSL_set_srp_server_param_pw             321     EXIST::FUNCTION:SRP
+SSL_get_srp_N                           322     EXIST::FUNCTION:SRP
+SSL_get_srp_username                    323     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_password                324     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_strength                325     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_verify_param_callback   326     EXIST:!VMS:FUNCTION:SRP
+SSL_CTX_set_srp_vfy_param_cb            326     EXIST:VMS:FUNCTION:SRP
+SSL_CTX_set_srp_miss_srp_un_cb          327     NOEXIST::FUNCTION:
+SSL_CTX_set_srp_missing_srp_username_callback 327       NOEXIST::FUNCTION:
+SSL_CTX_set_srp_cb_arg                  328     EXIST::FUNCTION:SRP
+SSL_CTX_set_srp_username                329     EXIST::FUNCTION:SRP
+SSL_CTX_SRP_CTX_init                    330     EXIST::FUNCTION:SRP
+SSL_SRP_CTX_init                        331     EXIST::FUNCTION:SRP
+SRP_Calc_A_param                        332     EXIST::FUNCTION:SRP
+SRP_generate_server_master_secret       333     EXIST:!VMS:FUNCTION:SRP
+SRP_gen_server_master_secret            333     EXIST:VMS:FUNCTION:SRP
+SSL_CTX_SRP_CTX_free                    334     EXIST::FUNCTION:SRP
+SRP_generate_client_master_secret       335     EXIST:!VMS:FUNCTION:SRP
+SRP_gen_client_master_secret            335     EXIST:VMS:FUNCTION:SRP
+SSL_srp_server_param_with_username      336     EXIST:!VMS:FUNCTION:SRP
+SSL_srp_server_param_with_un            336     EXIST:VMS:FUNCTION:SRP
+SRP_have_to_put_srp_username            337     NOEXIST::FUNCTION:
+SSL_SRP_CTX_free                        338     EXIST::FUNCTION:SRP
+SSL_set_debug                           339     EXIST::FUNCTION:
+SSL_SESSION_get0_peer                   340     EXIST::FUNCTION:
+TLSv1_2_client_method                   341     EXIST::FUNCTION:
+SSL_SESSION_set1_id_context             342     EXIST::FUNCTION:
+TLSv1_2_server_method                   343     EXIST::FUNCTION:
+SSL_cache_hit                           344     EXIST::FUNCTION:
+SSL_get0_kssl_ctx                       345     EXIST::FUNCTION:KRB5
+SSL_set0_kssl_ctx                       346     EXIST::FUNCTION:KRB5
+SSL_SESSION_get0_id                     347     NOEXIST::FUNCTION:
+SSL_set_state                           348     EXIST::FUNCTION:
+SSL_CIPHER_get_id                       349     EXIST::FUNCTION:
+TLSv1_2_method                          350     EXIST::FUNCTION:
+SSL_SESSION_get_id_len                  351     NOEXIST::FUNCTION:
+kssl_ctx_get0_client_princ              352     EXIST::FUNCTION:KRB5
+SSL_export_keying_material              353     EXIST::FUNCTION:TLSEXT
+SSL_set_tlsext_use_srtp                 354     EXIST::FUNCTION:
+SSL_CTX_set_next_protos_advertised_cb   355     EXIST:!VMS:FUNCTION:NEXTPROTONEG
+SSL_CTX_set_next_protos_adv_cb          355     EXIST:VMS:FUNCTION:NEXTPROTONEG
+SSL_get0_next_proto_negotiated          356     EXIST::FUNCTION:NEXTPROTONEG
+SSL_get_selected_srtp_profile           357     EXIST::FUNCTION:
+SSL_CTX_set_tlsext_use_srtp             358     EXIST::FUNCTION:
+SSL_select_next_proto                   359     EXIST::FUNCTION:NEXTPROTONEG
+SSL_get_srtp_profiles                   360     EXIST::FUNCTION:
+SSL_CTX_set_next_proto_select_cb        361     EXIST:!VMS:FUNCTION:NEXTPROTONEG
+SSL_CTX_set_next_proto_sel_cb           361     EXIST:VMS:FUNCTION:NEXTPROTONEG
+SSL_SESSION_get_compress_id             362     EXIST::FUNCTION:
diff --git a/src/lib/libssl/test/Makefile b/src/lib/libssl/test/Makefile
index 3912f82427..09e6848764 100644
--- a/src/lib/libssl/test/Makefile
+++ b/src/lib/libssl/test/Makefile
@@ -61,6 +61,7 @@ ENGINETEST=	enginetest
 EVPTEST=        evp_test
 IGETEST=        igetest
 JPAKETEST=      jpaketest
+SRPTEST=        srptest
 ASN1TEST=       asn1test
 
 TESTS=          alltests
@@ -72,7 +73,7 @@ EXE=	$(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT)  $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)
         $(MDC2TEST)$(EXE_EXT) $(RMDTEST)$(EXE_EXT) \
         $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \
         $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \
-        $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) \
+        $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \
         $(ASN1TEST)$(EXE_EXT)
 
 # $(METHTEST)$(EXE_EXT)
@@ -93,7 +94,7 @@ SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
         $(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
         $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
         $(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c \
-        $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(ASN1TEST).c
+        $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c
 
 EXHEADER= 
 HEADER= $(EXHEADER)
@@ -136,7 +137,7 @@ alltests: \
         test_enc test_x509 test_rsa test_crl test_sid \
         test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
         test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \
-        test_jpake test_cms
+        test_jpake test_srp test_cms
 
 test_evp:
         ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
@@ -274,6 +275,9 @@ test_engine:
 test_ssl: keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \
                 intP1.ss intP2.ss
         @echo "test SSL protocol"
+        @if [ -n "$(FIPSCANLIB)" ]; then \
+          sh ./testfipsssl keyU.ss certU.ss certCA.ss; \
+        fi
         ../util/shlib_wrap.sh ./$(SSLTEST) -test_cipherlist
         @sh ./testssl keyU.ss certU.ss certCA.ss
         @sh ./testsslproxy keyP1.ss certP1.ss intP1.ss
@@ -310,6 +314,10 @@ test_cms:
         @echo "CMS consistency test"
         $(PERL) cms-test.pl
 
+test_srp: $(SRPTEST)$(EXE_EXT)
+        @echo "Test SRP"
+        ../util/shlib_wrap.sh ./srptest
+
 lint:
         lint -DLINT $(INCLUDES) $(SRC)>fluff
 
@@ -340,7 +348,19 @@ BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
         fi; \
         LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
         $(MAKE) -f $(TOP)/Makefile.shared -e \
-                APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
+                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
+                LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
+                link_app.$${shlib_target}
+
+FIPS_BUILD_CMD=shlib_target=; if [ -n "$(SHARED_LIBS)" ]; then \
+                shlib_target="$(SHLIB_TARGET)"; \
+        fi; \
+        LIBRARIES="$(LIBSSL) $(LIBCRYPTO) $(LIBKRB5)"; \
+        if [ -z "$(SHARED_LIBS)" -a -n "$(FIPSCANLIB)" ] ; then \
+                FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; export CC FIPSLD_CC; \
+        fi; \
+        $(MAKE) -f $(TOP)/Makefile.shared -e \
+                CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
                 LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
                 link_app.$${shlib_target}
 
@@ -423,7 +443,7 @@ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
         @target=$(METHTEST); $(BUILD_CMD)
 
 $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
-        @target=$(SSLTEST); $(BUILD_CMD)
+        @target=$(SSLTEST); $(FIPS_BUILD_CMD)
 
 $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
         @target=$(ENGINETEST); $(BUILD_CMD)
@@ -446,6 +466,9 @@ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
 $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
         @target=$(ASN1TEST); $(BUILD_CMD)
 
+$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+        @target=$(SRPTEST); $(BUILD_CMD)
+
 #$(AESTEST).o: $(AESTEST).c
 #       $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
 
@@ -669,6 +692,13 @@ shatest.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
 shatest.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
 shatest.o: ../include/openssl/safestack.h ../include/openssl/sha.h
 shatest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h shatest.c
+srptest.o: ../include/openssl/bio.h ../include/openssl/bn.h
+srptest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
+srptest.o: ../include/openssl/err.h ../include/openssl/lhash.h
+srptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+srptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+srptest.o: ../include/openssl/safestack.h ../include/openssl/srp.h
+srptest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h srptest.c
 ssltest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 ssltest.o: ../include/openssl/bn.h ../include/openssl/buffer.h
 ssltest.o: ../include/openssl/comp.h ../include/openssl/conf.h
@@ -685,7 +715,8 @@ ssltest.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
 ssltest.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
 ssltest.o: ../include/openssl/pqueue.h ../include/openssl/rand.h
 ssltest.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-ssltest.o: ../include/openssl/sha.h ../include/openssl/ssl.h
+ssltest.o: ../include/openssl/sha.h ../include/openssl/srp.h
+ssltest.o: ../include/openssl/srtp.h ../include/openssl/ssl.h
 ssltest.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h
 ssltest.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
 ssltest.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h
diff --git a/src/lib/libssl/test/evptests.txt b/src/lib/libssl/test/evptests.txt
index beb12144b6..c273707c14 100644
--- a/src/lib/libssl/test/evptests.txt
+++ b/src/lib/libssl/test/evptests.txt
@@ -158,6 +158,19 @@ AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:B7B
 AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:E1C656305ED1A7A6563805746FE03EDC:30C81C46A35CE411E5FBC1191A0A52EF:71AB47A086E86EEDF39D1C5BBA97C408:0
 AES-256-OFB:603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:41635BE625B48AFC1666DD42A09D96E7:F69F2445DF4F9B17AD2B417BE66C3710:0126141D67F37BE8538F5A8BE740E484:0
 
+# AES Counter test vectors from RFC3686
+aes-128-ctr:AE6852F8121067CC4BF7A5765577F39E:00000030000000000000000000000001:53696E676C6520626C6F636B206D7367:E4095D4FB7A7B3792D6175A3261311B8:1
+aes-128-ctr:7E24067817FAE0D743D6CE1F32539163:006CB6DBC0543B59DA48D90B00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:5104A106168A72D9790D41EE8EDAD388EB2E1EFC46DA57C8FCE630DF9141BE28:1
+aes-128-ctr:7691BE035E5020A8AC6E618529F9A0DC:00E0017B27777F3F4A1786F000000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:C1CF48A89F2FFDD9CF4652E9EFDB72D74540A42BDE6D7836D59A5CEAAEF3105325B2072F:1
+
+aes-192-ctr:16AF5B145FC9F579C175F93E3BFB0EED863D06CCFDB78515:0000004836733C147D6D93CB00000001:53696E676C6520626C6F636B206D7367:4B55384FE259C9C84E7935A003CBE928:1
+aes-192-ctr:7C5CB2401B3DC33C19E7340819E0F69C678C3DB8E6F6A91A:0096B03B020C6EADC2CB500D00000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:453243FC609B23327EDFAAFA7131CD9F8490701C5AD4A79CFC1FE0FF42F4FB00:1
+aes-192-ctr:02BF391EE8ECB159B959617B0965279BF59B60A786D3E0FE:0007BDFD5CBD60278DCC091200000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:96893FC55E5C722F540B7DD1DDF7E758D288BC95C69165884536C811662F2188ABEE0935:1
+
+aes-256-ctr:776BEFF2851DB06F4C8A0542C8696F6C6A81AF1EEC96B4D37FC1D689E6C1C104:00000060DB5672C97AA8F0B200000001:53696E676C6520626C6F636B206D7367:145AD01DBF824EC7560863DC71E3E0C0:1
+aes-256-ctr:F6D66D6BD52D59BB0796365879EFF886C66DD51A5B6A99744B50590C87A23884:00FAAC24C1585EF15A43D87500000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F:F05E231B3894612C49EE000B804EB2A9B8306B508F839D6A5530831D9344AF1C:1
+aes-256-ctr:FF7A617CE69148E4F1726E2F43581DE2AA62D9F805532EDFF1EED687FB54153D:001CC5B751A51D70A1C1114800000001:000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223:EB6C52821D0BBBF7CE7594462ACA4FAAB407DF866569FD07F48CC0B583D6071F1EC0E6B8:1
+
 # DES ECB tests (from destest)
 
 DES-ECB:0000000000000000::0000000000000000:8CA64DE9C1B123A7
diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com
index 386e5cf3c1..9b64cba234 100644
--- a/src/lib/libssl/test/maketests.com
+++ b/src/lib/libssl/test/maketests.com
@@ -146,7 +146,8 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
                "MDC2TEST,RMDTEST,"+ -
                "RANDTEST,DHTEST,ENGINETEST,"+ -
                "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
-               "EVP_TEST,IGETEST,JPAKETEST,ASN1TEST"
+               "EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ -
+               "ASN1TEST"
 $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?
 $!
 $! Additional directory information.
@@ -182,6 +183,7 @@ $ T_D_RSA_TEST   := [-.crypto.rsa]
 $ T_D_EVP_TEST   := [-.crypto.evp]
 $ T_D_IGETEST    := [-.test]
 $ T_D_JPAKETEST  := [-.crypto.jpake]
+$ T_D_SRPTEST    := [-.crypto.srp]
 $ T_D_ASN1TEST   := [-.test]
 $!
 $ TCPIP_PROGRAMS = ",,"
diff --git a/src/lib/libssl/test/tests.com b/src/lib/libssl/test/tests.com
index 373dd16eac..a840d5078f 100644
--- a/src/lib/libssl/test/tests.com
+++ b/src/lib/libssl/test/tests.com
@@ -56,7 +56,7 @@ $	    tests := -
         test_enc,test_x509,test_rsa,test_crl,test_sid,-
         test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
         test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,-
-        test_jpake,test_cms
+        test_jpake,test_srp,test_cms
 $       endif
 $       tests = f$edit(tests,"COLLAPSE")
 $
@@ -68,6 +68,8 @@ $	EXPTEST :=	exptest
 $       IDEATEST :=     ideatest
 $       SHATEST :=      shatest
 $       SHA1TEST :=     sha1test
+$       SHA256TEST :=   sha256t
+$       SHA512TEST :=   sha512t
 $       MDC2TEST :=     mdc2test
 $       RMDTEST :=      rmdtest
 $       MD2TEST :=      md2test
@@ -91,6 +93,7 @@ $	ENGINETEST :=	enginetest
 $       EVPTEST :=      evp_test
 $       IGETEST :=      igetest
 $       JPAKETEST :=    jpaketest
+$       SRPTEST :=      srptest
 $       ASN1TEST :=     asn1test
 $!
 $       tests_i = 0
@@ -114,6 +117,8 @@ $	return
 $ test_sha:
 $       mcr 'texe_dir''shatest'
 $       mcr 'texe_dir''sha1test'
+$       mcr 'texe_dir''sha256test'
+$       mcr 'texe_dir''sha512test'
 $       return
 $ test_mdc2:
 $       mcr 'texe_dir''mdc2test'
@@ -357,6 +362,10 @@ $	! Define the logical name used to find openssl.exe in the perl script.
 $       define /user_mode osslx 'exe_dir'
 $       perl CMS-TEST.PL
 $       return
+$ test_srp: 
+$       write sys$output "Test SRP"
+$       mcr 'texe_dir''srptest'
+$       return
 $
 $
 $ exit: