This commit was manufactured by cvs2git to create tag 'openssl_0_9_8_h'.openssl_0_9_8_h

395 files changed, 60860 insertions, 47615 deletions

diff --git a/src/lib/libssl/src/INSTALL.NW b/src/lib/libssl/src/INSTALL.NW
new file mode 100644
index 0000000000..609a7309e1
--- /dev/null
+++ b/src/lib/libssl/src/INSTALL.NW
@@ -0,0 +1,454 @@
+
+INSTALLATION ON THE NETWARE PLATFORM
+------------------------------------
+
+Notes about building OpenSSL for NetWare.
+
+
+BUILD PLATFORM:
+---------------
+The build scripts (batch files, perl scripts, etc) have been developed and
+tested on W2K.  The scripts should run fine on other Windows platforms
+(NT, Win9x, WinXP) but they have not been tested.  They may require some
+modifications.
+
+
+Supported NetWare Platforms - NetWare 5.x, NetWare 6.x:
+-------------------------------------------------------
+OpenSSL can either use the WinSock interfaces introduced in NetWare 5,
+or the BSD socket interface.  Previous versions of NetWare, 4.x and 3.x,
+are only supported if OpenSSL is build for CLIB and BSD sockets;
+WinSock builds only support NetWare 5 and up.
+
+On NetWare there are two c-runtime libraries.  There is the legacy CLIB 
+interfaces and the newer LIBC interfaces.  Being ANSI-C libraries, the 
+functionality in CLIB and LIBC is similar but the LIBC interfaces are built 
+using Novell Kernal Services (NKS) which is designed to leverage 
+multi-processor environments.
+
+The NetWare port of OpenSSL can be configured to build using CLIB or LIBC.
+The CLIB build was developed and tested using NetWare 5.0 sp6.0a.  The LIBC 
+build was developed and tested using the NetWare 6.0 FCS.  
+
+The necessary LIBC functionality ships with NetWare 6.  However, earlier 
+NetWare 5.x versions will require updates in order to run the OpenSSL LIBC
+build (NetWare 5.1 SP8 is known to work).
+
+As of June 2005, the LIBC build can be configured to use BSD sockets instead
+of WinSock sockets. Call Configure (usually through netware\build.bat) using
+a target of "netware-libc-bsdsock" instead of "netware-libc".
+
+As of June 2007, support for CLIB and BSD sockets is also now available
+using a target of "netware-clib-bsdsock" instead of "netware-clib";
+also gcc builds are now supported on both Linux and Win32 (post 0.9.8e).
+
+REQUIRED TOOLS:
+---------------
+Based upon the configuration and build options used, some or all of the
+following tools may be required:
+
+* Perl for Win32 - required (http://www.activestate.com/ActivePerl)
+   Used to run the various perl scripts on the build platform.
+
+* Perl 5.8.0 for NetWare v3.20 (or later) - required 
+   (http://developer.novell.com) Used to run the test script on NetWare 
+   after building.
+
+* Compiler / Linker - required:
+   Metrowerks CodeWarrior PDK 2.1 (or later) for NetWare (commercial):
+      Provides command line tools used for building.
+      Tools:
+      mwccnlm.exe  - C/C++ Compiler for NetWare
+      mwldnlm.exe  - Linker for NetWare
+      mwasmnlm.exe - x86 assembler for NetWare (if using assembly option)
+
+   gcc / nlmconv Cross-Compiler, available from Novell Forge (free):
+         http://forge.novell.com/modules/xfmod/project/?aunixnw
+
+* Assemblers - optional:
+   If you intend to build using the assembly options you will need an
+   assembler.  Work has been completed to support two assemblers, Metrowerks
+   and NASM.  However, during development, a bug was found in the Metrowerks
+   assembler which generates incorrect code.  Until this problem is fixed,
+   the Metrowerks assembler cannot be used.
+
+   mwasmnlm.exe - Metrowerks x86 assembler - part of CodeWarrior tools.
+         (version 2.2 Built Aug 23, 1999 - not useable due to code
+          generation bug)
+
+   nasmw.exe - Netwide Assembler NASM
+         version 0.98 was used in development and testing
+
+* Make Tool - required:
+   In order to build you will need a make tool.  Two make tools are
+   supported, GNU make (gmake.exe) or Microsoft nmake.exe.
+
+   make.exe - GNU make for Windows (version 3.75 used for development)
+         http://gnuwin32.sourceforge.net/packages/make.htm
+
+   nmake.exe - Microsoft make (Version 6.00.8168.0 used for development)
+         http://support.microsoft.com/kb/132084/EN-US/
+
+* Novell Developer Kit (NDK) - required: (http://developer.novell.com)
+
+   CLIB - BUILDS:
+
+      WinSock2 Developer Components for NetWare:
+         For initial development, the October 27, 2000 version was used.
+         However, future versions should also work.
+
+         NOTE:  The WinSock2 components include headers & import files for
+         NetWare, but you will also need the winsock2.h and supporting
+         headers (pshpack4.h, poppack.h, qos.h) delivered in the
+         Microsoft SDK.  Note: The winsock2.h support headers may change
+         with various versions of winsock2.h.  Check the dependencies
+         section on the NDK WinSock2 download page for the latest
+         information on dependencies. These components are unsupported by
+         Novell. They are provided as a courtesy, but it is strongly
+         suggested that all development be done using LIBC, not CLIB.
+
+         As of June 2005, the WinSock2 components are available at:
+         http://forgeftp.novell.com//ws2comp/
+
+
+      NLM and NetWare libraries for C (including CLIB and XPlat):
+         If you are going to build a CLIB version of OpenSSL, you will
+         need the CLIB headers and imports.  The March, 2001 NDK release or 
+         later is recommended.
+
+         Earlier versions should work but haven't been tested.  In recent
+         versions the import files have been consolidated and function
+         names moved.  This means you may run into link problems
+         (undefined symbols) when using earlier versions.   The functions
+         are available in earlier versions, but you will have to modifiy
+         the make files to include additional import files (see
+         openssl\util\pl\netware.pl).
+
+
+   LIBC - BUILDS:
+   
+      Libraries for C (LIBC) - LIBC headers and import files
+         If you are going to build a LIBC version of OpenSSL, you will
+         need the LIBC headers and imports.  The March 14, 2002 NDK release or
+         later is required.  
+         
+         NOTE: The LIBC SDK includes the necessary WinSock2 support.
+         It is not necessary to download the WinSock2 NDK when building for
+         LIBC. The LIBC SDK also includes the appropriate BSD socket support
+         if configuring to use BSD sockets.
+
+
+BUILDING:
+---------
+Before building, you will need to set a few environment variables.  You can
+set them manually or you can modify the "netware\set_env.bat" file.
+
+The set_env.bat file is a template you can use to set up the path
+and environment variables you will need to build.  Modify the
+various lines to point to YOUR tools and run set_env.bat.
+
+   netware\set_env.bat <target> [compiler]
+
+      target        - "netware-clib" - CLIB NetWare build
+                    - "netware-libc" - LIBC NetWare build
+
+      compiler      - "gnuc"         - GNU GCC Compiler
+                    - "codewarrior"  - MetroWerks CodeWarrior (default)
+
+If you don't use set_env.bat, you will need to set up the following
+environment variables:
+
+   PATH - Set PATH to point to the tools you will use.
+
+   INCLUDE - The location of the NDK include files.
+         
+            CLIB ex: set INCLUDE=c:\ndk\nwsdk\include\nlm
+            LIBC ex: set INCLUDE=c:\ndk\libc\include
+
+   PRELUDE - The absolute path of the prelude object to link with.  For
+            a CLIB build it is recommended you use the "clibpre.o" files shipped
+            with the Metrowerks PDK for NetWare.  For a LIBC build you should 
+            use the "libcpre.o" file delivered with the LIBC NDK components.
+
+            CLIB ex: set PRELUDE=c:\ndk\nwsdk\imports\clibpre.o
+            LIBC ex: set PRELUDE=c:\ndk\libc\imports\libcpre.o
+
+   IMPORTS - The locaton of the NDK import files.
+
+            CLIB ex: set IMPORTS=c:\ndk\nwsdk\imports
+            LIBC ex: set IMPORTS=c:\ndk\libc\imports
+
+
+In order to build, you need to run the Perl scripts to configure the build
+process and generate a make file.  There is a batch file,
+"netware\build.bat", to automate the process.
+
+Build.bat runs the build configuration scripts and generates a make file.
+If an assembly option is specified, it also runs the scripts to generate 
+the assembly code.  Always run build.bat from the "openssl" directory.
+
+   netware\build [target] [debug opts] [assembly opts] [configure opts]
+
+      target        - "netware-clib" - CLIB NetWare build (WinSock Sockets)
+                    - "netware-clib-bsdsock" - CLIB NetWare build (BSD Sockets)
+                    - "netware-libc" - LIBC NetWare build (WinSock Sockets)
+                    - "netware-libc-bsdsock" - LIBC NetWare build (BSD Sockets)
+ 
+      debug opts    - "debug"  - build debug
+
+      assembly opts - "nw-mwasm" - use Metrowerks assembler
+                      "nw-nasm"  - use NASM assembler
+                      "no-asm"   - don't use assembly
+
+      configure opts- all unrecognized arguments are passed to the
+                      perl 'configure' script. See that script for
+                      internal documentation regarding options that
+                      are available.
+
+   examples:
+
+      CLIB build, debug, without assembly:
+         netware\build.bat netware-clib debug no-asm
+
+      LIBC build, non-debug, using NASM assembly, add mdc2 support:
+         netware\build.bat netware-libc nw-nasm enable-mdc2
+
+      LIBC build, BSD sockets, non-debug, without assembly:
+         netware\build.bat netware-libc-bsdsock no-asm
+
+Running build.bat generates a make file to be processed by your make 
+tool (gmake or nmake):
+
+   CLIB ex: gmake -f netware\nlm_clib_dbg.mak 
+   LIBC ex: gmake -f netware\nlm_libc.mak 
+   LIBC ex: gmake -f netware\nlm_libc_bsdsock.mak 
+
+
+You can also run the build scripts manually if you do not want to use the
+build.bat file.  Run the following scripts in the "\openssl"
+subdirectory (in the order listed below):
+
+   perl configure no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock]
+      configures no assembly build for specified netware environment
+      (CLIB or LIBC).
+
+   perl util\mkfiles.pl >MINFO
+      generates a listing of source files (used by mk1mf)
+
+   perl util\mk1mf.pl no-asm [other config opts] [netware-clib|netware-libc|netware-libc-bsdsock >netware\nlm.mak
+      generates the makefile for NetWare
+
+   gmake -f netware\nlm.mak
+      build with the make tool (nmake.exe also works)
+
+NOTE:  If you are building using the assembly option, you must also run the
+various Perl scripts to generate the assembly files.  See build.bat
+for an example of running the various assembly scripts.  You must use the
+"no-asm" option to build without assembly.  The configure and mk1mf scripts
+also have various other options.  See the scripts for more information.
+
+
+The output from the build is placed in the following directories:
+
+   CLIB Debug build:
+      out_nw_clib.dbg     - static libs & test nlm(s)
+      tmp_nw_clib.dbg     - temporary build files
+      outinc_nw_clib      - necessary include files
+
+   CLIB Non-debug build:
+      out_nw_clib         - static libs & test nlm(s)
+      tmp_nw_clib         - temporary build files
+      outinc_nw_clib      - necesary include files
+
+   LIBC Debug build:
+      out_nw_libc.dbg     - static libs & test nlm(s)
+      tmp_nw_libc.dbg     - temporary build files
+      outinc_nw_libc      - necessary include files
+
+   LIBC Non-debug build:
+      out_nw_libc         - static libs & test nlm(s)
+      tmp_nw_libc         - temporary build files
+      outinc_nw_libc      - necesary include files
+
+
+TESTING:
+--------
+The build process creates the OpenSSL static libs ( crypto.lib, ssl.lib,
+rsaglue.lib ) and several test programs.  You should copy the test programs
+to your NetWare server and run the tests.
+
+The batch file "netware\cpy_tests.bat" will copy all the necessary files
+to your server for testing.  In order to run the batch file, you need a
+drive mapped to your target server.  It will create an "OpenSSL" directory
+on the drive and copy the test files to it.  CAUTION: If a directory with the
+name of "OpenSSL" already exists, it will be deleted.
+
+To run cpy_tests.bat:
+
+   netware\cpy_tests [output directory] [NetWare drive]
+
+      output directory - "out_nw_clib.dbg", "out_nw_libc", etc.
+      NetWare drive    - drive letter of mapped drive
+
+      CLIB ex: netware\cpy_tests out_nw_clib m:
+      LIBC ex: netware\cpy_tests out_nw_libc m:
+
+
+The Perl script, "do_tests.pl", in the "OpenSSL" directory on the server
+should be used to execute the tests.  Before running the script, make sure
+your SEARCH PATH includes the "OpenSSL" directory.  For example, if you
+copied the files to the "sys:" volume you use the command:
+
+   SEARCH ADD SYS:\OPENSSL
+
+
+To run do_tests.pl type (at the console prompt):
+
+   perl \openssl\do_tests.pl [options]
+
+      options:
+         -p    - pause after executing each test
+
+The do_tests.pl script generates a log file "\openssl\test_out\tests.log"
+which should be reviewed for errors.  Any errors will be denoted by the word
+"ERROR" in the log.
+
+DEVELOPING WITH THE OPENSSL SDK:
+--------------------------------
+Now that everything is built and tested, you are ready to use the OpenSSL
+libraries in your development.
+
+There is no real installation procedure, just copy the static libs and
+headers to your build location.  The libs (crypto.lib & ssl.lib) are
+located in the appropriate "out_nw_XXXX" directory 
+(out_nw_clib, out_nw_libc, etc).  
+
+The headers are located in the appropriate "outinc_nw_XXX" directory 
+(outinc_nw_clib, outinc_nw_libc).  
+
+One suggestion is to create the following directory 
+structure for the OpenSSL SDK:
+
+   \openssl
+      |- bin
+      |   |- openssl.nlm
+      |   |- (other tests you want)
+      |
+      |- lib
+      |   | - crypto.lib
+      |   | - ssl.lib
+      |
+      |- include
+      |   | - openssl
+      |   |    | - (all the headers in "outinc_nw\openssl")
+
+
+The program "openssl.nlm" can be very useful.  It has dozens of
+options and you may want to keep it handy for debugging, testing, etc.
+
+When building your apps using OpenSSL, define "NETWARE".  It is needed by
+some of the OpenSSL headers.  One way to do this is with a compile option,
+for example "-DNETWARE".
+
+
+
+NOTES:
+------
+
+Resource leaks in Tests
+------------------------
+Some OpenSSL tests do not clean up resources and NetWare reports
+the resource leaks when the tests unload.  If this really bugs you,
+you can stop the messages by setting the developer option off at the console
+prompt (set developer option = off).  Or better yet, fix the tests to
+clean up the resources!
+
+
+Multi-threaded Development
+---------------------------
+The NetWare version of OpenSSL is thread-safe, however multi-threaded
+applications must provide the necessary locking function callbacks.  This
+is described in doc\threads.doc.  The file "openssl-x.x.x\crypto\threads\mttest.c"
+is a multi-threaded test program and demonstrates the locking functions.
+
+
+What is openssl2.nlm?
+---------------------
+The openssl program has numerous options and can be used for many different
+things.  Many of the options operate in an interactive mode requiring the
+user to enter data.  Because of this, a default screen is created for the
+program.  However, when running the test script it is not desirable to
+have a seperate screen.  Therefore, the build also creates openssl2.nlm.
+Openssl2.nlm is functionally identical but uses the console screen.
+Openssl2 can be used when a non-interactive mode is desired.
+
+NOTE:  There are may other possibilities (command line options, etc)
+which could have been used to address the screen issue.  The openssl2.nlm
+option was chosen because it impacted only the build not the code.
+
+
+Why only static libraries?
+--------------------------
+Globals, globals, and more globals.  The OpenSSL code uses many global
+variables that are allocated and initialized when used for the first time.
+
+On NetWare, most applications (at least historically) run in the kernel.
+When running in the kernel, there is one instance of global variables.
+For regular application type NLM(s) this isn't a problem because they are
+the only ones using the globals.  However, for a library NLM (an NLM which
+exposes functions and has no threads of execution), the globals cause
+problems.  Applications could inadvertently step on each other if they
+change some globals.  Even worse, the first application that triggers a
+global to be allocated and initialized has the allocated memory charged to
+itself.  Now when that application unloads, NetWare will clean up all the
+applicaton's memory.  The global pointer variables inside OpenSSL now
+point to freed memory.  An abend waiting to happen!
+
+To work correctly in the kernel, library NLM(s) that use globals need to
+provide a set of globals (instance data) for each application.  Another
+option is to require the library only be loaded in a protected address
+space along with the application using it.
+
+Modifying the OpenSSL code to provide a set of globals (instance data) for
+each application isn't technically difficult, but due to the large number
+globals it would require substantial code changes and it wasn't done.  Hence,
+the build currently only builds static libraries which are then linked
+into each application.
+
+NOTE:  If you are building a library NLM that uses the OpenSSL static
+libraries, you will still have to deal with the global variable issue.
+This is because when you link in the OpenSSL code you bring in all the
+globals.  One possible solution for the global pointer variables is to
+register memory functions with OpenSSL which allocate memory and charge it
+to your library NLM (see the function CRYPTO_set_mem_functions).  However,
+be aware that now all memory allocated by OpenSSL is charged to your NLM.
+
+
+CodeWarrior Tools and W2K
+---------------------------
+There have been problems reported with the CodeWarrior Linker
+(mwldnlm.exe) in the PDK 2.1 for NetWare when running on Windows 2000.  The
+problems cause the link step to fail.  The only work around is to obtain an
+updated linker from Metrowerks.  It is expected Metrowerks will release
+PDK 3.0 (in beta testing at this time - May, 2001) in the near future which
+will fix these problems.
+
+
+Makefile "vclean"
+------------------
+The generated makefile has a "vclean" target which cleans up the build
+directories.  If you have been building successfully and suddenly
+experience problems, use "vclean" (gmake -f netware\nlm_xxxx.mak vclean) and retry.
+
+
+"Undefined Symbol" Linker errors
+--------------------------------
+There have been linker errors reported when doing a CLIB build.  The problems
+occur because some versions of the CLIB SDK import files inadvertently 
+left out some symbols.  One symbol in particular is "_lrotl".  The missing
+functions are actually delivered in the binaries, but they were left out of
+the import files.  The issues should be fixed in the September 2001 release 
+of the NDK.  If you experience the problems you can temporarily
+work around it by manually adding the missing symbols to your version of 
+"clib.imp".
+
diff --git a/src/lib/libssl/src/INSTALL.W64 b/src/lib/libssl/src/INSTALL.W64
new file mode 100644
index 0000000000..9fa7a19205
--- /dev/null
+++ b/src/lib/libssl/src/INSTALL.W64
@@ -0,0 +1,66 @@
+
+ INSTALLATION ON THE WIN64 PLATFORM
+ ----------------------------------
+
+ Caveat lector
+ -------------
+
+ As of moment of this writing Win64 support is classified "initial"
+ for the following reasons.
+
+ - No assembler modules are engaged upon initial 0.9.8 release.
+ - API might change within 0.9.8 life-span, *but* in a manner which
+   doesn't break backward binary compatibility. Or in other words,
+   application programs compiled with initial 0.9.8 headers will
+   be expected to work with future minor release .DLL without need
+   to re-compile, even if future minor release features modified API.
+ - Above mentioned API modifications have everything to do with
+   elimination of a number of limitations, which are normally
+   considered inherent to 32-bit platforms. Which in turn is why they
+   are treated as limitations on 64-bit platform such as Win64:-)
+   The current list comprises [but not necessarily limited to]:
+
+   - null-terminated strings may not be longer than 2G-1 bytes,
+     longer strings are treated as zero-length;
+   - dynamically and *internally* allocated chunks can't be larger
+     than 2G-1 bytes;
+   - inability to encrypt/decrypt chunks of data larger than 4GB
+     [it's possibly to *hash* chunks of arbitrary size through];
+
+   Neither of these is actually big deal and hardly encountered
+   in real-life applications.
+
+ Compiling procedure
+ -------------------
+
+ You will need Perl. You can run under Cygwin or you can download
+ ActiveState Perl from http://www.activestate.com/ActivePerl.
+
+ You will need Microsoft Platform SDK, available for download at
+ http://www.microsoft.com/msdownload/platformsdk/sdkupdate/. As per
+ April 2005 Platform SDK is equipped with Win64 compilers, as well
+ as assemblers, but it might change in the future.
+
+ To build for Win64/x64:
+
+ > perl Configure VC-WIN64A
+ > ms\do_win64a
+ > nmake -f ms\ntdll.mak
+ > cd out32dll
+ > ..\ms\test
+
+ To build for Win64/IA64:
+
+ > perl Configure VC-WIN64I
+ > ms\do_win64i
+ > nmake -f ms\ntdll.mak
+ > cd out32dll
+ > ..\ms\test
+
+ Naturally test-suite itself has to be executed on the target platform.
+
+ Installation
+ ------------
+
+ TBD, for now see INSTALL.W32.
+
diff --git a/src/lib/libssl/src/Makefile.shared b/src/lib/libssl/src/Makefile.shared
new file mode 100644
index 0000000000..97035a3c01
--- /dev/null
+++ b/src/lib/libssl/src/Makefile.shared
@@ -0,0 +1,609 @@
+#
+# Helper makefile to link shared libraries in a portable way.
+# This is much simpler than libtool, and hopefully not too error-prone.
+#
+# The following variables need to be set on the command line to build
+# properly
+
+# CC contains the current compiler.  This one MUST be defined
+CC=cc
+CFLAGS=$(CFLAG)
+# LDFLAGS contains flags to be used when temporary object files (when building
+# shared libraries) are created, or when an application is linked.
+# SHARED_LDFLAGS contains flags to be used when the shared library is created.
+LDFLAGS=
+SHARED_LDFLAGS=
+
+# LIBNAME contains just the name of the library, without prefix ("lib"
+# on Unix, "cyg" for certain forms under Cygwin...) or suffix (.a, .so,
+# .dll, ...).  This one MUST have a value when using this makefile to
+# build shared libraries.
+# For example, to build libfoo.so, you need to do the following:
+#LIBNAME=foo
+LIBNAME=
+
+# APPNAME contains just the name of the application, without suffix (""
+# on Unix, ".exe" on Windows, ...).  This one MUST have a value when using
+# this makefile to build applications.
+# For example, to build foo, you need to do the following:
+#APPNAME=foo
+APPNAME=
+
+# OBJECTS contains all the object files to link together into the application.
+# This must contain at least one object file.
+#OBJECTS=foo.o
+OBJECTS=
+
+# LIBEXTRAS contains extra modules to link together with the library.
+# For example, if a second library, say libbar.a needs to be linked into
+# libfoo.so, you need to do the following:
+#LIBEXTRAS=libbar.a
+# Note that this MUST be used when using the link_o targets, to hold the
+# names of all object files that go into the target library.
+LIBEXTRAS=
+
+# LIBVERSION contains the current version of the library.
+# For example, to build libfoo.so.1.2, you need to do the following:
+#LIBVERSION=1.2
+LIBVERSION=
+
+# LIBCOMPATVERSIONS contains the compatibility versions (a list) of
+# the library.  They MUST be in decreasing order.
+# For example, if libfoo.so.1.2.1 is backward compatible with libfoo.so.1.2
+# and libfoo.so.1, you need to do the following:
+#LIBCOMPATVERSIONS=1.2 1
+# Note that on systems that use sonames, the last number will appear as
+# part of it.
+# It's also possible, for systems that support it (Tru64, for example),
+# to add extra compatibility info with more precision, by adding a second
+# list of versions, separated from the first with a semicolon, like this:
+#LIBCOMPATVERSIONS=1.2 1;1.2.0 1.1.2 1.1.1 1.1.0 1.0.0
+LIBCOMPATVERSIONS=
+
+# LIBDEPS contains all the flags necessary to cover all necessary
+# dependencies to other libraries.
+LIBDEPS=
+
+#------------------------------------------------------------------------------
+# The rest is private to this makefile.
+
+SET_X=:
+#SET_X=set -x
+
+top:
+        echo "Trying to use this makefile interactively?  Don't."
+
+CALC_VERSIONS=  \
+        SHLIB_COMPAT=; SHLIB_SOVER=; \
+        if [ -n "$(LIBVERSION)$(LIBCOMPATVERSIONS)" ]; then \
+                prev=""; \
+                for v in `echo "$(LIBVERSION) $(LIBCOMPATVERSIONS)" | cut -d';' -f1`; do \
+                        SHLIB_SOVER_NODOT=$$v; \
+                        SHLIB_SOVER=.$$v; \
+                        if [ -n "$$prev" ]; then \
+                                SHLIB_COMPAT="$$SHLIB_COMPAT .$$prev"; \
+                        fi; \
+                        prev=$$v; \
+                done; \
+        fi
+
+LINK_APP=       \
+  ( $(SET_X);   \
+    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+    LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \
+    LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
+    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+    $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} )
+
+LINK_SO=        \
+  ( $(SET_X);   \
+    LIBDEPS="$${LIBDEPS:-$(LIBDEPS)}"; \
+    SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
+    SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+    nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \
+    LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
+    LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+    LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+    $${SHAREDCMD} $${SHAREDFLAGS} \
+        -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+        $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
+  ) && $(SYMLINK_SO); \
+  ( $(SET_X); rm -f lib$(LIBNAME).exp )
+
+SYMLINK_SO=     \
+        if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
+                prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
+                if [ -n "$$SHLIB_COMPAT" ]; then \
+                        for x in $$SHLIB_COMPAT; do \
+                                ( $(SET_X); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
+                                  ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
+                                prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
+                        done; \
+                fi; \
+                if [ -n "$$SHLIB_SOVER" ]; then \
+                        ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+                          ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+                fi; \
+        fi
+
+LINK_SO_A=      SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
+LINK_SO_O=      SHOBJECTS="$(LIBEXTRAS)"; $(LINK_SO)
+
+LINK_SO_A_VIA_O=        \
+  SHOBJECTS=lib$(LIBNAME).o; \
+  ALL=$$ALLSYMSFLAGS; ALLSYMSFLAGS=; NOALLSYMSFLAGS=; \
+  ( $(SET_X); \
+    ld $(LDFLAGS) -r -o lib$(LIBNAME).o $$ALL lib$(LIBNAME).a $(LIBEXTRAS) ); \
+  $(LINK_SO) && rm -f $(LIBNAME).o
+
+LINK_SO_A_UNPACKED=     \
+  UNPACKDIR=link_tmp.$$$$; rm -rf $$UNPACKDIR; mkdir $$UNPACKDIR; \
+  (cd $$UNPACKDIR; ar x ../lib$(LIBNAME).a) && \
+  ([ -z "$(LIBEXTRAS)" ] || cp $(LIBEXTRAS) $$UNPACKDIR) && \
+  SHOBJECTS=$$UNPACKDIR/*.o; \
+  $(LINK_SO) && rm -rf $$UNPACKDIR
+
+DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
+
+DO_GNU_SO=$(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        ALLSYMSFLAGS='-Wl,--whole-archive'; \
+        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+
+DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
+
+#This is rather special.  It's a special target with which one can link
+#applications without bothering with any features that have anything to
+#do with shared libraries, for example when linking against static
+#libraries.  It's mostly here to avoid a lot of conditionals everywhere
+#else...
+link_app.:
+        $(LINK_APP)
+
+link_o.gnu:
+        @ $(DO_GNU_SO); $(LINK_SO_O)
+link_a.gnu:
+        @ $(DO_GNU_SO); $(LINK_SO_A)
+link_app.gnu:
+        @ $(DO_GNU_APP); $(LINK_APP)
+
+link_o.bsd:
+        @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
+        $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        LIBDEPS=" "; \
+        ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
+        NOALLSYMSFLAGS=; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
+        fi; $(LINK_SO_O)
+link_a.bsd:
+        @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
+        $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        LIBDEPS=" "; \
+        ALLSYMSFLAGS="-Wl,-Bforcearchive"; \
+        NOALLSYMSFLAGS=; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -nostdlib"; \
+        fi; $(LINK_SO_A)
+link_app.bsd:
+        @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
+        LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBPATH)"; \
+        fi; $(LINK_APP)
+
+# For Darwin AKA Mac OS/X (dyld)
+# link_o.darwin produces .so, because we let it use dso_dlfcn module,
+# which has .so extension hard-coded. One can argue that one should
+# develop special dso module for MacOS X. At least manual encourages
+# to use native NSModule(3) API and refers to dlfcn as termporary hack.
+link_o.darwin:
+        @ $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME); \
+        SHLIB_SUFFIX=.so; \
+        ALLSYMSFLAGS='-all_load'; \
+        NOALLSYMSFLAGS=''; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
+        if [ -n "$(LIBVERSION)" ]; then \
+                SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
+        fi; \
+        if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
+                SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
+        fi; \
+        $(LINK_SO_O)
+link_a.darwin:
+        @ $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME); \
+        SHLIB_SUFFIX=.dylib; \
+        ALLSYMSFLAGS='-all_load'; \
+        NOALLSYMSFLAGS=''; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS)"; \
+        if [ -n "$(LIBVERSION)" ]; then \
+                SHAREDFLAGS="$$SHAREDFLAGS -current_version $(LIBVERSION)"; \
+        fi; \
+        if [ -n "$$SHLIB_SOVER_NODOT" ]; then \
+                SHAREDFLAGS="$$SHAREDFLAGS -compatibility_version $$SHLIB_SOVER_NODOT"; \
+        fi; \
+        SHAREDFLAGS="$$SHAREDFLAGS -install_name ${INSTALLTOP}/lib/$$SHLIB${SHLIB_EXT}"; \
+        $(LINK_SO_A)
+link_app.darwin:        # is there run-path on darwin?
+        $(LINK_APP)
+
+link_o.cygwin:
+        @ $(CALC_VERSIONS); \
+        INHIBIT_SYMLINKS=yes; \
+        SHLIB=cyg$(LIBNAME); \
+        base=-Wl,--enable-auto-image-base; \
+        if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+                SHLIB=$(LIBNAME)eay32; base=; \
+        fi; \
+        SHLIB_SUFFIX=.dll; \
+        LIBVERSION="$(LIBVERSION)"; \
+        SHLIB_SOVER=${LIBVERSION:+"-$(LIBVERSION)"}; \
+        ALLSYMSFLAGS='-Wl,--whole-archive'; \
+        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+        $(LINK_SO_O)
+link_a.cygwin:
+        @ $(CALC_VERSIONS); \
+        INHIBIT_SYMLINKS=yes; \
+        SHLIB=cyg$(LIBNAME); \
+        base=-Wl,--enable-auto-image-base; \
+        if expr $(PLATFORM) : 'mingw' > /dev/null; then \
+                SHLIB=$(LIBNAME)eay32; \
+                base=;  [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
+        fi; \
+        SHLIB_SUFFIX=.dll; \
+        SHLIB_SOVER=-$(LIBVERSION); \
+        ALLSYMSFLAGS='-Wl,--whole-archive'; \
+        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a"; \
+        [ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
+        [ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
+        $(LINK_SO_A) || exit 1; \
+        cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX apps/; \
+        cp -p $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX test/
+link_app.cygwin:
+        $(LINK_APP)
+
+link_o.alpha-osf1:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
+                if [ -n "$$SHLIB_HIST" ]; then \
+                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
+                else \
+                        SHLIB_HIST="$(LIBVERSION)"; \
+                fi; \
+                SHLIB_SOVER=; \
+                ALLSYMSFLAGS='-all'; \
+                NOALLSYMSFLAGS='-none'; \
+                SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
+                if [ -n "$$SHLIB_HIST" ]; then \
+                        SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
+                fi; \
+        fi; \
+        $(LINK_SO_O)
+link_a.alpha-osf1:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                SHLIB_HIST=`echo "$(LIBCOMPATVERSIONS)" | cut -d';' -f2 | sed -e 's/ */:/'`; \
+                if [ -n "$$SHLIB_HIST" ]; then \
+                        SHLIB_HIST="$${SHLIB_HIST}:$(LIBVERSION)"; \
+                else \
+                        SHLIB_HIST="$(LIBVERSION)"; \
+                fi; \
+                SHLIB_SOVER=; \
+                ALLSYMSFLAGS='-all'; \
+                NOALLSYMSFLAGS='-none'; \
+                SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-B,symbolic"; \
+                if [ -n "$$SHLIB_HIST" ]; then \
+                        SHAREDFLAGS="$$SHAREDFLAGS -set_version $$SHLIB_HIST"; \
+                fi; \
+        fi; \
+        $(LINK_SO_A)
+link_app.alpha-osf1:
+        @if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_APP); \
+        else \
+                LDFLAGS="$(CFLAGS) -rpath $(LIBRPATH)"; \
+        fi; \
+        $(LINK_APP)
+
+link_o.solaris:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                $(CALC_VERSIONS); \
+                MINUSZ='-z '; \
+                ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+                NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+                SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
+        fi; \
+        $(LINK_SO_O)
+link_a.solaris:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                $(CALC_VERSIONS); \
+                MINUSZ='-z '; \
+                (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=;\
+                ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+                NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+                SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX -Wl,-Bsymbolic"; \
+        fi; \
+        $(LINK_SO_A)
+link_app.solaris:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_APP); \
+        else \
+                LDFLAGS="$(CFLAGS) -R $(LIBRPATH)"; \
+        fi; \
+        $(LINK_APP)
+
+# OpenServer 5 native compilers used
+link_o.svr3:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                $(CALC_VERSIONS); \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                ALLSYMSFLAGS=''; \
+                NOALLSYMSFLAGS=''; \
+                SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+        fi; \
+        $(LINK_SO_O)
+link_a.svr3:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                $(CALC_VERSIONS); \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                ALLSYMSFLAGS=''; \
+                NOALLSYMSFLAGS=''; \
+                SHAREDFLAGS="$(CFLAGS) -G -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+        fi; \
+        $(LINK_SO_A_UNPACKED)
+link_app.svr3:
+        @${DETECT_GNU_LD} && $(DO_GNU_APP); \
+        $(LINK_APP)
+
+# UnixWare 7 and OpenUNIX 8 native compilers used
+link_o.svr5:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                $(CALC_VERSIONS); \
+                SHARE_FLAG='-G'; \
+                ($(CC) -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                ALLSYMSFLAGS=''; \
+                NOALLSYMSFLAGS=''; \
+                SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+        fi; \
+        $(LINK_SO_O)
+link_a.svr5:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                $(CALC_VERSIONS); \
+                SHARE_FLAG='-G'; \
+                (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                ALLSYMSFLAGS=''; \
+                NOALLSYMSFLAGS=''; \
+                SHAREDFLAGS="$(CFLAGS) $${SHARE_FLAG} -h $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"; \
+        fi; \
+        $(LINK_SO_A_UNPACKED)
+link_app.svr5:
+        @${DETECT_GNU_LD} && $(DO_GNU_APP); \
+        $(LINK_APP)
+
+link_o.irix:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                $(CALC_VERSIONS); \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                MINUSWL=""; \
+                ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
+                ALLSYMSFLAGS="$${MINUSWL}-all"; \
+                NOALLSYMSFLAGS="$${MINUSWL}-none"; \
+                SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
+        fi; \
+        $(LINK_SO_O)
+link_a.irix:
+        @ if ${DETECT_GNU_LD}; then \
+                $(DO_GNU_SO); \
+        else \
+                $(CALC_VERSIONS); \
+                SHLIB=lib$(LIBNAME).so; \
+                SHLIB_SUFFIX=; \
+                MINUSWL=""; \
+                ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSWL="-Wl,"; \
+                ALLSYMSFLAGS="$${MINUSWL}-all"; \
+                NOALLSYMSFLAGS="$${MINUSWL}-none"; \
+                SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,-B,symbolic"; \
+        fi; \
+        $(LINK_SO_A)
+link_app.irix:
+        @LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"; \
+        $(LINK_APP)
+
+# 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so
+# we compensate for it with +cdp ../: and +cdp ./:. Yes, these rewrite
+# rules imply that we can only link one level down in catalog structure,
+# but that's what takes place for the moment of this writing. +cdp option
+# was introduced in HP-UX 11.x and applies in 32-bit PA-RISC link
+# editor context only [it's simply ignored in other cases, which are all
+# ELFs by the way].
+#
+link_o.hpux:
+        @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
+        $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).sl; \
+        expr "$(CFLAGS)" : '.*DSO_DLFCN' > /dev/null && SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        ALLSYMSFLAGS='-Wl,-Fl'; \
+        NOALLSYMSFLAGS=''; \
+        expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
+        fi; \
+        rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
+        $(LINK_SO_O) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
+link_a.hpux:
+        @if ${DETECT_GNU_LD}; then $(DO_GNU_SO); else \
+        $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).sl; \
+        expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        ALLSYMSFLAGS='-Wl,-Fl'; \
+        NOALLSYMSFLAGS=''; \
+        expr $(PLATFORM) : 'hpux64' > /dev/null && ALLSYMSFLAGS='-Wl,+forceload'; \
+        SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-B,symbolic,+vnocompatwarnings,-z,+s,+h,$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX,+cdp,../:,+cdp,./:"; \
+        fi; \
+        rm -f $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX || :; \
+        $(LINK_SO_A) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX
+link_app.hpux:
+        @if ${DETECT_GNU_LD}; then $(DO_GNU_APP); else \
+        LDFLAGS="$(CFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \
+        fi; \
+        $(LINK_APP)
+
+link_o.aix:
+        @ $(CALC_VERSIONS); \
+        OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || :; \
+        OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
+        SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        ALLSYMSFLAGS=''; \
+        NOALLSYMSFLAGS=''; \
+        SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
+        $(LINK_SO_O);
+link_a.aix:
+        @ $(CALC_VERSIONS); \
+        OBJECT_MODE=`expr x$(SHARED_LDFLAGS) : 'x\-[a-z]*\(64\)'` || : ; \
+        OBJECT_MODE=$${OBJECT_MODE:-32}; export OBJECT_MODE; \
+        SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        ALLSYMSFLAGS='-bnogc'; \
+        NOALLSYMSFLAGS=''; \
+        SHAREDFLAGS='$(CFLAGS) $(SHARED_LDFLAGS) -Wl,-G,-bexpall,-bnolibpath,-bM:SRE'; \
+        $(LINK_SO_A_VIA_O)
+link_app.aix:
+        LDFLAGS="$(CFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \
+        $(LINK_APP)
+
+link_o.reliantunix:
+        @ $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        ALLSYMSFLAGS=; \
+        NOALLSYMSFLAGS=''; \
+        SHAREDFLAGS='$(CFLAGS) -G'; \
+        $(LINK_SO_O)
+link_a.reliantunix:
+        @ $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).so; \
+        SHLIB_SUFFIX=; \
+        ALLSYMSFLAGS=; \
+        NOALLSYMSFLAGS=''; \
+        SHAREDFLAGS='$(CFLAGS) -G'; \
+        $(LINK_SO_A_UNPACKED)
+link_app.reliantunix:
+        $(LINK_APP)
+
+# Targets to build symbolic links when needed
+symlink.gnu symlink.solaris symlink.svr3 symlink.svr5 symlink.irix \
+symlink.aix symlink.reliantunix:
+        @ $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).so; \
+        $(SYMLINK_SO)
+symlink.darwin:
+        @ $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME); \
+        SHLIB_SUFFIX=.dylib; \
+        $(SYMLINK_SO)
+symlink.hpux:
+        @ $(CALC_VERSIONS); \
+        SHLIB=lib$(LIBNAME).sl; \
+        expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
+        $(SYMLINK_SO)
+# The following lines means those specific architectures do no symlinks
+symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
+
+# Compatibility targets
+link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
+link_a.bsd-gcc-shared link_a.linux-shared link_a.gnu-shared: link_a.gnu
+link_app.bsd-gcc-shared link_app.linux-shared link_app.gnu-shared: link_app.gnu
+symlink.bsd-gcc-shared symlink.bsd-shared symlink.linux-shared symlink.gnu-shared: symlink.gnu
+link_o.bsd-shared: link_o.bsd
+link_a.bsd-shared: link_a.bsd
+link_app.bsd-shared: link_app.bsd
+link_o.darwin-shared: link_o.darwin
+link_a.darwin-shared: link_a.darwin
+link_app.darwin-shared: link_app.darwin
+symlink.darwin-shared: symlink.darwin
+link_o.cygwin-shared: link_o.cygwin
+link_a.cygwin-shared: link_a.cygwin
+link_app.cygwin-shared: link_app.cygwin
+symlink.cygwin-shared: symlink.cygwin
+link_o.alpha-osf1-shared: link_o.alpha-osf1
+link_a.alpha-osf1-shared: link_a.alpha-osf1
+link_app.alpha-osf1-shared: link_app.alpha-osf1
+symlink.alpha-osf1-shared: symlink.alpha-osf1
+link_o.tru64-shared: link_o.tru64
+link_a.tru64-shared: link_a.tru64
+link_app.tru64-shared: link_app.tru64
+symlink.tru64-shared: symlink.tru64
+link_o.tru64-shared-rpath: link_o.tru64-rpath
+link_a.tru64-shared-rpath: link_a.tru64-rpath
+link_app.tru64-shared-rpath: link_app.tru64-rpath
+symlink.tru64-shared-rpath: symlink.tru64-rpath
+link_o.solaris-shared: link_o.solaris
+link_a.solaris-shared: link_a.solaris
+link_app.solaris-shared: link_app.solaris
+symlink.solaris-shared: symlink.solaris
+link_o.svr3-shared: link_o.svr3
+link_a.svr3-shared: link_a.svr3
+link_app.svr3-shared: link_app.svr3
+symlink.svr3-shared: symlink.svr3
+link_o.svr5-shared: link_o.svr5
+link_a.svr5-shared: link_a.svr5
+link_app.svr5-shared: link_app.svr5
+symlink.svr5-shared: symlink.svr5
+link_o.irix-shared: link_o.irix
+link_a.irix-shared: link_a.irix
+link_app.irix-shared: link_app.irix
+symlink.irix-shared: symlink.irix
+link_o.hpux-shared: link_o.hpux
+link_a.hpux-shared: link_a.hpux
+link_app.hpux-shared: link_app.hpux
+symlink.hpux-shared: symlink.hpux
+link_o.aix-shared: link_o.aix
+link_a.aix-shared: link_a.aix
+link_app.aix-shared: link_app.aix
+symlink.aix-shared: symlink.aix
+link_o.reliantunix-shared: link_o.reliantunix
+link_a.reliantunix-shared: link_a.reliantunix
+link_app.reliantunix-shared: link_app.reliantunix
+symlink.reliantunix-shared: symlink.reliantunix
diff --git a/src/lib/libssl/src/apps/cms.c b/src/lib/libssl/src/apps/cms.c
new file mode 100644
index 0000000000..6d227acabe
--- /dev/null
+++ b/src/lib/libssl/src/apps/cms.c
@@ -0,0 +1,1347 @@
+/* apps/cms.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+/* CMS utility function */
+
+#include <stdio.h>
+#include <string.h>
+#include "apps.h"
+
+#ifndef OPENSSL_NO_CMS
+
+#include <openssl/crypto.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
+#include <openssl/x509_vfy.h>
+#include <openssl/x509v3.h>
+#include <openssl/cms.h>
+
+#undef PROG
+#define PROG cms_main
+static int save_certs(char *signerfile, STACK_OF(X509) *signers);
+static int cms_cb(int ok, X509_STORE_CTX *ctx);
+static void receipt_request_print(BIO *out, CMS_ContentInfo *cms);
+static CMS_ReceiptRequest *make_receipt_request(STACK *rr_to, int rr_allorfirst,
+                                                                STACK *rr_from);
+
+#define SMIME_OP        0x10
+#define SMIME_IP        0x20
+#define SMIME_SIGNERS   0x40
+#define SMIME_ENCRYPT           (1 | SMIME_OP)
+#define SMIME_DECRYPT           (2 | SMIME_IP)
+#define SMIME_SIGN              (3 | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_VERIFY            (4 | SMIME_IP)
+#define SMIME_CMSOUT            (5 | SMIME_IP | SMIME_OP)
+#define SMIME_RESIGN            (6 | SMIME_IP | SMIME_OP | SMIME_SIGNERS)
+#define SMIME_DATAOUT           (7 | SMIME_IP)
+#define SMIME_DATA_CREATE       (8 | SMIME_OP)
+#define SMIME_DIGEST_VERIFY     (9 | SMIME_IP)
+#define SMIME_DIGEST_CREATE     (10 | SMIME_OP)
+#define SMIME_UNCOMPRESS        (11 | SMIME_IP)
+#define SMIME_COMPRESS          (12 | SMIME_OP)
+#define SMIME_ENCRYPTED_DECRYPT (13 | SMIME_IP)
+#define SMIME_ENCRYPTED_ENCRYPT (14 | SMIME_OP)
+#define SMIME_SIGN_RECEIPT      (15 | SMIME_IP | SMIME_OP)
+#define SMIME_VERIFY_RECEIPT    (16 | SMIME_IP)
+
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
+        {
+        ENGINE *e = NULL;
+        int operation = 0;
+        int ret = 0;
+        char **args;
+        const char *inmode = "r", *outmode = "w";
+        char *infile = NULL, *outfile = NULL, *rctfile = NULL;
+        char *signerfile = NULL, *recipfile = NULL;
+        STACK *sksigners = NULL, *skkeys = NULL;
+        char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
+        char *certsoutfile = NULL;
+        const EVP_CIPHER *cipher = NULL;
+        CMS_ContentInfo *cms = NULL, *rcms = NULL;
+        X509_STORE *store = NULL;
+        X509 *cert = NULL, *recip = NULL, *signer = NULL;
+        EVP_PKEY *key = NULL;
+        STACK_OF(X509) *encerts = NULL, *other = NULL;
+        BIO *in = NULL, *out = NULL, *indata = NULL, *rctin = NULL;
+        int badarg = 0;
+        int flags = CMS_DETACHED;
+        int rr_print = 0, rr_allorfirst = -1;
+        STACK *rr_to = NULL, *rr_from = NULL;
+        CMS_ReceiptRequest *rr = NULL;
+        char *to = NULL, *from = NULL, *subject = NULL;
+        char *CAfile = NULL, *CApath = NULL;
+        char *passargin = NULL, *passin = NULL;
+        char *inrand = NULL;
+        int need_rand = 0;
+        const EVP_MD *sign_md = NULL;
+        int informat = FORMAT_SMIME, outformat = FORMAT_SMIME;
+        int rctformat = FORMAT_SMIME, keyform = FORMAT_PEM;
+#ifndef OPENSSL_NO_ENGINE
+        char *engine=NULL;
+#endif
+        unsigned char *secret_key = NULL, *secret_keyid = NULL;
+        size_t secret_keylen = 0, secret_keyidlen = 0;
+
+        ASN1_OBJECT *econtent_type = NULL;
+
+        X509_VERIFY_PARAM *vpm = NULL;
+
+        args = argv + 1;
+        ret = 1;
+
+        apps_startup();
+
+        if (bio_err == NULL)
+                {
+                if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+                        BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
+                }
+
+        if (!load_config(bio_err, NULL))
+                goto end;
+
+        while (!badarg && *args && *args[0] == '-')
+                {
+                if (!strcmp (*args, "-encrypt"))
+                        operation = SMIME_ENCRYPT;
+                else if (!strcmp (*args, "-decrypt"))
+                        operation = SMIME_DECRYPT;
+                else if (!strcmp (*args, "-sign"))
+                        operation = SMIME_SIGN;
+                else if (!strcmp (*args, "-sign_receipt"))
+                        operation = SMIME_SIGN_RECEIPT;
+                else if (!strcmp (*args, "-resign"))
+                        operation = SMIME_RESIGN;
+                else if (!strcmp (*args, "-verify"))
+                        operation = SMIME_VERIFY;
+                else if (!strcmp(*args,"-verify_receipt"))
+                        {
+                        operation = SMIME_VERIFY_RECEIPT;
+                        if (!args[1])
+                                goto argerr;
+                        args++;
+                        rctfile = *args;
+                        }
+                else if (!strcmp (*args, "-cmsout"))
+                        operation = SMIME_CMSOUT;
+                else if (!strcmp (*args, "-data_out"))
+                        operation = SMIME_DATAOUT;
+                else if (!strcmp (*args, "-data_create"))
+                        operation = SMIME_DATA_CREATE;
+                else if (!strcmp (*args, "-digest_verify"))
+                        operation = SMIME_DIGEST_VERIFY;
+                else if (!strcmp (*args, "-digest_create"))
+                        operation = SMIME_DIGEST_CREATE;
+                else if (!strcmp (*args, "-compress"))
+                        operation = SMIME_COMPRESS;
+                else if (!strcmp (*args, "-uncompress"))
+                        operation = SMIME_UNCOMPRESS;
+                else if (!strcmp (*args, "-EncryptedData_decrypt"))
+                        operation = SMIME_ENCRYPTED_DECRYPT;
+                else if (!strcmp (*args, "-EncryptedData_encrypt"))
+                        operation = SMIME_ENCRYPTED_ENCRYPT;
+#ifndef OPENSSL_NO_DES
+                else if (!strcmp (*args, "-des3")) 
+                                cipher = EVP_des_ede3_cbc();
+                else if (!strcmp (*args, "-des")) 
+                                cipher = EVP_des_cbc();
+#endif
+#ifndef OPENSSL_NO_SEED
+                else if (!strcmp (*args, "-seed")) 
+                                cipher = EVP_seed_cbc();
+#endif
+#ifndef OPENSSL_NO_RC2
+                else if (!strcmp (*args, "-rc2-40")) 
+                                cipher = EVP_rc2_40_cbc();
+                else if (!strcmp (*args, "-rc2-128")) 
+                                cipher = EVP_rc2_cbc();
+                else if (!strcmp (*args, "-rc2-64")) 
+                                cipher = EVP_rc2_64_cbc();
+#endif
+#ifndef OPENSSL_NO_AES
+                else if (!strcmp(*args,"-aes128"))
+                                cipher = EVP_aes_128_cbc();
+                else if (!strcmp(*args,"-aes192"))
+                                cipher = EVP_aes_192_cbc();
+                else if (!strcmp(*args,"-aes256"))
+                                cipher = EVP_aes_256_cbc();
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+                else if (!strcmp(*args,"-camellia128"))
+                                cipher = EVP_camellia_128_cbc();
+                else if (!strcmp(*args,"-camellia192"))
+                                cipher = EVP_camellia_192_cbc();
+                else if (!strcmp(*args,"-camellia256"))
+                                cipher = EVP_camellia_256_cbc();
+#endif
+                else if (!strcmp (*args, "-text")) 
+                                flags |= CMS_TEXT;
+                else if (!strcmp (*args, "-nointern")) 
+                                flags |= CMS_NOINTERN;
+                else if (!strcmp (*args, "-noverify") 
+                        || !strcmp (*args, "-no_signer_cert_verify")) 
+                                flags |= CMS_NO_SIGNER_CERT_VERIFY;
+                else if (!strcmp (*args, "-nocerts")) 
+                                flags |= CMS_NOCERTS;
+                else if (!strcmp (*args, "-noattr")) 
+                                flags |= CMS_NOATTR;
+                else if (!strcmp (*args, "-nodetach")) 
+                                flags &= ~CMS_DETACHED;
+                else if (!strcmp (*args, "-nosmimecap"))
+                                flags |= CMS_NOSMIMECAP;
+                else if (!strcmp (*args, "-binary"))
+                                flags |= CMS_BINARY;
+                else if (!strcmp (*args, "-keyid"))
+                                flags |= CMS_USE_KEYID;
+                else if (!strcmp (*args, "-nosigs"))
+                                flags |= CMS_NOSIGS;
+                else if (!strcmp (*args, "-no_content_verify"))
+                                flags |= CMS_NO_CONTENT_VERIFY;
+                else if (!strcmp (*args, "-no_attr_verify"))
+                                flags |= CMS_NO_ATTR_VERIFY;
+                else if (!strcmp (*args, "-stream"))
+                                {
+                                args++;
+                                continue;
+                                }
+                else if (!strcmp (*args, "-indef"))
+                                {
+                                args++;
+                                continue;
+                                }
+                else if (!strcmp (*args, "-noindef"))
+                                flags &= ~CMS_STREAM;
+                else if (!strcmp (*args, "-nooldmime"))
+                                flags |= CMS_NOOLDMIMETYPE;
+                else if (!strcmp (*args, "-crlfeol"))
+                                flags |= CMS_CRLFEOL;
+                else if (!strcmp (*args, "-receipt_request_print"))
+                                rr_print = 1;
+                else if (!strcmp (*args, "-receipt_request_all"))
+                                rr_allorfirst = 0;
+                else if (!strcmp (*args, "-receipt_request_first"))
+                                rr_allorfirst = 1;
+                else if (!strcmp(*args,"-receipt_request_from"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        args++;
+                        if (!rr_from)
+                                rr_from = sk_new_null();
+                        sk_push(rr_from, *args);
+                        }
+                else if (!strcmp(*args,"-receipt_request_to"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        args++;
+                        if (!rr_to)
+                                rr_to = sk_new_null();
+                        sk_push(rr_to, *args);
+                        }
+                else if (!strcmp(*args,"-secretkey"))
+                        {
+                        long ltmp;
+                        if (!args[1])
+                                goto argerr;
+                        args++;
+                        secret_key = string_to_hex(*args, &ltmp);
+                        if (!secret_key)
+                                {
+                                BIO_printf(bio_err, "Invalid key %s\n", *args);
+                                goto argerr;
+                                }
+                        secret_keylen = (size_t)ltmp;
+                        }
+                else if (!strcmp(*args,"-secretkeyid"))
+                        {
+                        long ltmp;
+                        if (!args[1])
+                                goto argerr;
+                        args++;
+                        secret_keyid = string_to_hex(*args, &ltmp);
+                        if (!secret_keyid)
+                                {
+                                BIO_printf(bio_err, "Invalid id %s\n", *args);
+                                goto argerr;
+                                }
+                        secret_keyidlen = (size_t)ltmp;
+                        }
+                else if (!strcmp(*args,"-econtent_type"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        args++;
+                        econtent_type = OBJ_txt2obj(*args, 0);
+                        if (!econtent_type)
+                                {
+                                BIO_printf(bio_err, "Invalid OID %s\n", *args);
+                                goto argerr;
+                                }
+                        }
+                else if (!strcmp(*args,"-rand"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        args++;
+                        inrand = *args;
+                        need_rand = 1;
+                        }
+#ifndef OPENSSL_NO_ENGINE
+                else if (!strcmp(*args,"-engine"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        engine = *++args;
+                        }
+#endif
+                else if (!strcmp(*args,"-passin"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        passargin = *++args;
+                        }
+                else if (!strcmp (*args, "-to"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        to = *++args;
+                        }
+                else if (!strcmp (*args, "-from"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        from = *++args;
+                        }
+                else if (!strcmp (*args, "-subject"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        subject = *++args;
+                        }
+                else if (!strcmp (*args, "-signer"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        /* If previous -signer argument add signer to list */
+
+                        if (signerfile)
+                                {
+                                if (!sksigners)
+                                        sksigners = sk_new_null();
+                                sk_push(sksigners, signerfile);
+                                if (!keyfile)
+                                        keyfile = signerfile;
+                                if (!skkeys)
+                                        skkeys = sk_new_null();
+                                sk_push(skkeys, keyfile);
+                                keyfile = NULL;
+                                }
+                        signerfile = *++args;
+                        }
+                else if (!strcmp (*args, "-recip"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        recipfile = *++args;
+                        }
+                else if (!strcmp (*args, "-certsout"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        certsoutfile = *++args;
+                        }
+                else if (!strcmp (*args, "-md"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        sign_md = EVP_get_digestbyname(*++args);
+                        if (sign_md == NULL)
+                                {
+                                BIO_printf(bio_err, "Unknown digest %s\n",
+                                                        *args);
+                                goto argerr;
+                                }
+                        }
+                else if (!strcmp (*args, "-inkey"))
+                        {
+                        if (!args[1])   
+                                goto argerr;
+                        /* If previous -inkey arument add signer to list */
+                        if (keyfile)
+                                {
+                                if (!signerfile)
+                                        {
+                                        BIO_puts(bio_err, "Illegal -inkey without -signer\n");
+                                        goto argerr;
+                                        }
+                                if (!sksigners)
+                                        sksigners = sk_new_null();
+                                sk_push(sksigners, signerfile);
+                                signerfile = NULL;
+                                if (!skkeys)
+                                        skkeys = sk_new_null();
+                                sk_push(skkeys, keyfile);
+                                }
+                        keyfile = *++args;
+                        }
+                else if (!strcmp (*args, "-keyform"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        keyform = str2fmt(*++args);
+                        }
+                else if (!strcmp (*args, "-rctform"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        rctformat = str2fmt(*++args);
+                        }
+                else if (!strcmp (*args, "-certfile"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        certfile = *++args;
+                        }
+                else if (!strcmp (*args, "-CAfile"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        CAfile = *++args;
+                        }
+                else if (!strcmp (*args, "-CApath"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        CApath = *++args;
+                        }
+                else if (!strcmp (*args, "-in"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        infile = *++args;
+                        }
+                else if (!strcmp (*args, "-inform"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        informat = str2fmt(*++args);
+                        }
+                else if (!strcmp (*args, "-outform"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        outformat = str2fmt(*++args);
+                        }
+                else if (!strcmp (*args, "-out"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        outfile = *++args;
+                        }
+                else if (!strcmp (*args, "-content"))
+                        {
+                        if (!args[1])
+                                goto argerr;
+                        contfile = *++args;
+                        }
+                else if (args_verify(&args, NULL, &badarg, bio_err, &vpm))
+                        continue;
+                else if ((cipher = EVP_get_cipherbyname(*args + 1)) == NULL)
+                        badarg = 1;
+                args++;
+                }
+
+        if (((rr_allorfirst != -1) || rr_from) && !rr_to)
+                {
+                BIO_puts(bio_err, "No Signed Receipts Recipients\n");
+                goto argerr;
+                }
+
+        if (!(operation & SMIME_SIGNERS)  && (rr_to || rr_from))
+                {
+                BIO_puts(bio_err, "Signed receipts only allowed with -sign\n");
+                goto argerr;
+                }
+        if (!(operation & SMIME_SIGNERS) && (skkeys || sksigners))
+                {
+                BIO_puts(bio_err, "Multiple signers or keys not allowed\n");
+                goto argerr;
+                }
+
+        if (operation & SMIME_SIGNERS)
+                {
+                if (keyfile && !signerfile)
+                        {
+                        BIO_puts(bio_err, "Illegal -inkey without -signer\n");
+                        goto argerr;
+                        }
+                /* Check to see if any final signer needs to be appended */
+                if (signerfile)
+                        {
+                        if (!sksigners)
+                                sksigners = sk_new_null();
+                        sk_push(sksigners, signerfile);
+                        if (!skkeys)
+                                skkeys = sk_new_null();
+                        if (!keyfile)
+                                keyfile = signerfile;
+                        sk_push(skkeys, keyfile);
+                        }
+                if (!sksigners)
+                        {
+                        BIO_printf(bio_err, "No signer certificate specified\n");
+                        badarg = 1;
+                        }
+                signerfile = NULL;
+                keyfile = NULL;
+                need_rand = 1;
+                }
+
+        else if (operation == SMIME_DECRYPT)
+                {
+                if (!recipfile && !keyfile && !secret_key)
+                        {
+                        BIO_printf(bio_err, "No recipient certificate or key specified\n");
+                        badarg = 1;
+                        }
+                }
+        else if (operation == SMIME_ENCRYPT)
+                {
+                if (!*args && !secret_key)
+                        {
+                        BIO_printf(bio_err, "No recipient(s) certificate(s) specified\n");
+                        badarg = 1;
+                        }
+                need_rand = 1;
+                }
+        else if (!operation)
+                badarg = 1;
+
+        if (badarg)
+                {
+                argerr:
+                BIO_printf (bio_err, "Usage cms [options] cert.pem ...\n");
+                BIO_printf (bio_err, "where options are\n");
+                BIO_printf (bio_err, "-encrypt       encrypt message\n");
+                BIO_printf (bio_err, "-decrypt       decrypt encrypted message\n");
+                BIO_printf (bio_err, "-sign          sign message\n");
+                BIO_printf (bio_err, "-verify        verify signed message\n");
+                BIO_printf (bio_err, "-cmsout        output CMS structure\n");
+#ifndef OPENSSL_NO_DES
+                BIO_printf (bio_err, "-des3          encrypt with triple DES\n");
+                BIO_printf (bio_err, "-des           encrypt with DES\n");
+#endif
+#ifndef OPENSSL_NO_SEED
+                BIO_printf (bio_err, "-seed          encrypt with SEED\n");
+#endif
+#ifndef OPENSSL_NO_RC2
+                BIO_printf (bio_err, "-rc2-40        encrypt with RC2-40 (default)\n");
+                BIO_printf (bio_err, "-rc2-64        encrypt with RC2-64\n");
+                BIO_printf (bio_err, "-rc2-128       encrypt with RC2-128\n");
+#endif
+#ifndef OPENSSL_NO_AES
+                BIO_printf (bio_err, "-aes128, -aes192, -aes256\n");
+                BIO_printf (bio_err, "               encrypt PEM output with cbc aes\n");
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+                BIO_printf (bio_err, "-camellia128, -camellia192, -camellia256\n");
+                BIO_printf (bio_err, "               encrypt PEM output with cbc camellia\n");
+#endif
+                BIO_printf (bio_err, "-nointern      don't search certificates in message for signer\n");
+                BIO_printf (bio_err, "-nosigs        don't verify message signature\n");
+                BIO_printf (bio_err, "-noverify      don't verify signers certificate\n");
+                BIO_printf (bio_err, "-nocerts       don't include signers certificate when signing\n");
+                BIO_printf (bio_err, "-nodetach      use opaque signing\n");
+                BIO_printf (bio_err, "-noattr        don't include any signed attributes\n");
+                BIO_printf (bio_err, "-binary        don't translate message to text\n");
+                BIO_printf (bio_err, "-certfile file other certificates file\n");
+                BIO_printf (bio_err, "-certsout file certificate output file\n");
+                BIO_printf (bio_err, "-signer file   signer certificate file\n");
+                BIO_printf (bio_err, "-recip  file   recipient certificate file for decryption\n");
+                BIO_printf (bio_err, "-skeyid        use subject key identifier\n");
+                BIO_printf (bio_err, "-in file       input file\n");
+                BIO_printf (bio_err, "-inform arg    input format SMIME (default), PEM or DER\n");
+                BIO_printf (bio_err, "-inkey file    input private key (if not signer or recipient)\n");
+                BIO_printf (bio_err, "-keyform arg   input private key format (PEM or ENGINE)\n");
+                BIO_printf (bio_err, "-out file      output file\n");
+                BIO_printf (bio_err, "-outform arg   output format SMIME (default), PEM or DER\n");
+                BIO_printf (bio_err, "-content file  supply or override content for detached signature\n");
+                BIO_printf (bio_err, "-to addr       to address\n");
+                BIO_printf (bio_err, "-from ad       from address\n");
+                BIO_printf (bio_err, "-subject s     subject\n");
+                BIO_printf (bio_err, "-text          include or delete text MIME headers\n");
+                BIO_printf (bio_err, "-CApath dir    trusted certificates directory\n");
+                BIO_printf (bio_err, "-CAfile file   trusted certificates file\n");
+                BIO_printf (bio_err, "-crl_check     check revocation status of signer's certificate using CRLs\n");
+                BIO_printf (bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
+#ifndef OPENSSL_NO_ENGINE
+                BIO_printf (bio_err, "-engine e      use engine e, possibly a hardware device.\n");
+#endif
+                BIO_printf (bio_err, "-passin arg    input file pass phrase source\n");
+                BIO_printf(bio_err,  "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
+                BIO_printf(bio_err,  "               load the file (or the files in the directory) into\n");
+                BIO_printf(bio_err,  "               the random number generator\n");
+                BIO_printf (bio_err, "cert.pem       recipient certificate(s) for encryption\n");
+                goto end;
+                }
+
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
+        if (!app_passwd(bio_err, passargin, NULL, &passin, NULL))
+                {
+                BIO_printf(bio_err, "Error getting password\n");
+                goto end;
+                }
+
+        if (need_rand)
+                {
+                app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+                if (inrand != NULL)
+                        BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                                app_RAND_load_files(inrand));
+                }
+
+        ret = 2;
+
+        if (!(operation & SMIME_SIGNERS))
+                flags &= ~CMS_DETACHED;
+
+        if (operation & SMIME_OP)
+                {
+                if (outformat == FORMAT_ASN1)
+                        outmode = "wb";
+                }
+        else
+                {
+                if (flags & CMS_BINARY)
+                        outmode = "wb";
+                }
+
+        if (operation & SMIME_IP)
+                {
+                if (informat == FORMAT_ASN1)
+                        inmode = "rb";
+                }
+        else
+                {
+                if (flags & CMS_BINARY)
+                        inmode = "rb";
+                }
+
+        if (operation == SMIME_ENCRYPT)
+                {
+                if (!cipher)
+                        {
+#ifndef OPENSSL_NO_DES                  
+                        cipher = EVP_des_ede3_cbc();
+#else
+                        BIO_printf(bio_err, "No cipher selected\n");
+                        goto end;
+#endif
+                        }
+
+                if (secret_key && !secret_keyid)
+                        {
+                        BIO_printf(bio_err, "No sectre key id\n");
+                        goto end;
+                        }
+
+                if (*args)
+                        encerts = sk_X509_new_null();
+                while (*args)
+                        {
+                        if (!(cert = load_cert(bio_err,*args,FORMAT_PEM,
+                                NULL, e, "recipient certificate file")))
+                                goto end;
+                        sk_X509_push(encerts, cert);
+                        cert = NULL;
+                        args++;
+                        }
+                }
+
+        if (certfile)
+                {
+                if (!(other = load_certs(bio_err,certfile,FORMAT_PEM, NULL,
+                        e, "certificate file")))
+                        {
+                        ERR_print_errors(bio_err);
+                        goto end;
+                        }
+                }
+
+        if (recipfile && (operation == SMIME_DECRYPT))
+                {
+                if (!(recip = load_cert(bio_err,recipfile,FORMAT_PEM,NULL,
+                        e, "recipient certificate file")))
+                        {
+                        ERR_print_errors(bio_err);
+                        goto end;
+                        }
+                }
+
+        if (operation == SMIME_SIGN_RECEIPT)
+                {
+                if (!(signer = load_cert(bio_err,signerfile,FORMAT_PEM,NULL,
+                        e, "receipt signer certificate file")))
+                        {
+                        ERR_print_errors(bio_err);
+                        goto end;
+                        }
+                }
+
+        if (operation == SMIME_DECRYPT)
+                {
+                if (!keyfile)
+                        keyfile = recipfile;
+                }
+        else if ((operation == SMIME_SIGN) || (operation == SMIME_SIGN_RECEIPT))
+                {
+                if (!keyfile)
+                        keyfile = signerfile;
+                }
+        else keyfile = NULL;
+
+        if (keyfile)
+                {
+                key = load_key(bio_err, keyfile, keyform, 0, passin, e,
+                               "signing key file");
+                if (!key)
+                        goto end;
+                }
+
+        if (infile)
+                {
+                if (!(in = BIO_new_file(infile, inmode)))
+                        {
+                        BIO_printf (bio_err,
+                                 "Can't open input file %s\n", infile);
+                        goto end;
+                        }
+                }
+        else
+                in = BIO_new_fp(stdin, BIO_NOCLOSE);
+
+        if (operation & SMIME_IP)
+                {
+                if (informat == FORMAT_SMIME) 
+                        cms = SMIME_read_CMS(in, &indata);
+                else if (informat == FORMAT_PEM) 
+                        cms = PEM_read_bio_CMS(in, NULL, NULL, NULL);
+                else if (informat == FORMAT_ASN1) 
+                        cms = d2i_CMS_bio(in, NULL);
+                else
+                        {
+                        BIO_printf(bio_err, "Bad input format for CMS file\n");
+                        goto end;
+                        }
+
+                if (!cms)
+                        {
+                        BIO_printf(bio_err, "Error reading S/MIME message\n");
+                        goto end;
+                        }
+                if (contfile)
+                        {
+                        BIO_free(indata);
+                        if (!(indata = BIO_new_file(contfile, "rb")))
+                                {
+                                BIO_printf(bio_err, "Can't read content file %s\n", contfile);
+                                goto end;
+                                }
+                        }
+                if (certsoutfile)
+                        {
+                        STACK_OF(X509) *allcerts;
+                        allcerts = CMS_get1_certs(cms);
+                        if (!save_certs(certsoutfile, allcerts))
+                                {
+                                BIO_printf(bio_err,
+                                                "Error writing certs to %s\n",
+                                                                certsoutfile);
+                                ret = 5;
+                                goto end;
+                                }
+                        sk_X509_pop_free(allcerts, X509_free);
+                        }
+                }
+
+        if (rctfile)
+                {
+                char *rctmode = (rctformat == FORMAT_ASN1) ? "rb" : "r";
+                if (!(rctin = BIO_new_file(rctfile, rctmode)))
+                        {
+                        BIO_printf (bio_err,
+                                 "Can't open receipt file %s\n", rctfile);
+                        goto end;
+                        }
+                
+                if (rctformat == FORMAT_SMIME) 
+                        rcms = SMIME_read_CMS(rctin, NULL);
+                else if (rctformat == FORMAT_PEM) 
+                        rcms = PEM_read_bio_CMS(rctin, NULL, NULL, NULL);
+                else if (rctformat == FORMAT_ASN1) 
+                        rcms = d2i_CMS_bio(rctin, NULL);
+                else
+                        {
+                        BIO_printf(bio_err, "Bad input format for receipt\n");
+                        goto end;
+                        }
+
+                if (!rcms)
+                        {
+                        BIO_printf(bio_err, "Error reading receipt\n");
+                        goto end;
+                        }
+                }
+
+        if (outfile)
+                {
+                if (!(out = BIO_new_file(outfile, outmode)))
+                        {
+                        BIO_printf (bio_err,
+                                 "Can't open output file %s\n", outfile);
+                        goto end;
+                        }
+                }
+        else
+                {
+                out = BIO_new_fp(stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+                {
+                    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                    out = BIO_push(tmpbio, out);
+                }
+#endif
+                }
+
+        if ((operation == SMIME_VERIFY) || (operation == SMIME_VERIFY_RECEIPT))
+                {
+                if (!(store = setup_verify(bio_err, CAfile, CApath)))
+                        goto end;
+                X509_STORE_set_verify_cb_func(store, cms_cb);
+                if (vpm)
+                        X509_STORE_set1_param(store, vpm);
+                }
+
+
+        ret = 3;
+
+        if (operation == SMIME_DATA_CREATE)
+                {
+                cms = CMS_data_create(in, flags);
+                }
+        else if (operation == SMIME_DIGEST_CREATE)
+                {
+                cms = CMS_digest_create(in, sign_md, flags);
+                }
+        else if (operation == SMIME_COMPRESS)
+                {
+                cms = CMS_compress(in, -1, flags);
+                }
+        else if (operation == SMIME_ENCRYPT)
+                {
+                flags |= CMS_PARTIAL;
+                cms = CMS_encrypt(encerts, in, cipher, flags);
+                if (!cms)
+                        goto end;
+                if (secret_key)
+                        {
+                        if (!CMS_add0_recipient_key(cms, NID_undef, 
+                                                secret_key, secret_keylen,
+                                                secret_keyid, secret_keyidlen,
+                                                NULL, NULL, NULL))
+                                goto end;
+                        /* NULL these because call absorbs them */
+                        secret_key = NULL;
+                        secret_keyid = NULL;
+                        }
+                if (!(flags & CMS_STREAM))
+                        {
+                        if (!CMS_final(cms, in, NULL, flags))
+                                goto end;
+                        }
+                }
+        else if (operation == SMIME_ENCRYPTED_ENCRYPT)
+                {
+                cms = CMS_EncryptedData_encrypt(in, cipher,
+                                                secret_key, secret_keylen,
+                                                flags);
+
+                }
+        else if (operation == SMIME_SIGN_RECEIPT)
+                {
+                CMS_ContentInfo *srcms = NULL;
+                STACK_OF(CMS_SignerInfo) *sis;
+                CMS_SignerInfo *si;
+                sis = CMS_get0_SignerInfos(cms);
+                if (!sis)
+                        goto end;
+                si = sk_CMS_SignerInfo_value(sis, 0);
+                srcms = CMS_sign_receipt(si, signer, key, other, flags);
+                if (!srcms)
+                        goto end;
+                CMS_ContentInfo_free(cms);
+                cms = srcms;
+                }
+        else if (operation & SMIME_SIGNERS)
+                {
+                int i;
+                /* If detached data content we enable streaming if
+                 * S/MIME output format.
+                 */
+                if (operation == SMIME_SIGN)
+                        {
+                                
+                        if (flags & CMS_DETACHED)
+                                {
+                                if (outformat == FORMAT_SMIME)
+                                        flags |= CMS_STREAM;
+                                }
+                        flags |= CMS_PARTIAL;
+                        cms = CMS_sign(NULL, NULL, other, in, flags);
+                        if (!cms)
+                                goto end;
+                        if (econtent_type)
+                                CMS_set1_eContentType(cms, econtent_type);
+
+                        if (rr_to)
+                                {
+                                rr = make_receipt_request(rr_to, rr_allorfirst,
+                                                                rr_from);
+                                if (!rr)
+                                        {
+                                        BIO_puts(bio_err,
+                                "Signed Receipt Request Creation Error\n");
+                                        goto end;
+                                        }
+                                }
+                        }
+                else
+                        flags |= CMS_REUSE_DIGEST;
+                for (i = 0; i < sk_num(sksigners); i++)
+                        {
+                        CMS_SignerInfo *si;
+                        signerfile = sk_value(sksigners, i);
+                        keyfile = sk_value(skkeys, i);
+                        signer = load_cert(bio_err, signerfile,FORMAT_PEM, NULL,
+                                        e, "signer certificate");
+                        if (!signer)
+                                goto end;
+                        key = load_key(bio_err, keyfile, keyform, 0, passin, e,
+                               "signing key file");
+                        if (!key)
+                                goto end;
+                        si = CMS_add1_signer(cms, signer, key, sign_md, flags);
+                        if (!si)
+                                goto end;
+                        if (rr && !CMS_add1_ReceiptRequest(si, rr))
+                                goto end;
+                        X509_free(signer);
+                        signer = NULL;
+                        EVP_PKEY_free(key);
+                        key = NULL;
+                        }
+                /* If not streaming or resigning finalize structure */
+                if ((operation == SMIME_SIGN) && !(flags & CMS_STREAM))
+                        {
+                        if (!CMS_final(cms, in, NULL, flags))
+                                goto end;
+                        }
+                }
+
+        if (!cms)
+                {
+                BIO_printf(bio_err, "Error creating CMS structure\n");
+                goto end;
+                }
+
+        ret = 4;
+        if (operation == SMIME_DECRYPT)
+                {
+
+                if (secret_key)
+                        {
+                        if (!CMS_decrypt_set1_key(cms,
+                                                secret_key, secret_keylen,
+                                                secret_keyid, secret_keyidlen))
+                                {
+                                BIO_puts(bio_err,
+                                        "Error decrypting CMS using secret key\n");
+                                goto end;
+                                }
+                        }
+
+                if (key)
+                        {
+                        if (!CMS_decrypt_set1_pkey(cms, key, recip))
+                                {
+                                BIO_puts(bio_err,
+                                        "Error decrypting CMS using private key\n");
+                                goto end;
+                                }
+                        }
+
+                if (!CMS_decrypt(cms, NULL, NULL, indata, out, flags))
+                        {
+                        BIO_printf(bio_err, "Error decrypting CMS structure\n");
+                        goto end;
+                        }
+                }
+        else if (operation == SMIME_DATAOUT)
+                {
+                if (!CMS_data(cms, out, flags))
+                        goto end;
+                }
+        else if (operation == SMIME_UNCOMPRESS)
+                {
+                if (!CMS_uncompress(cms, indata, out, flags))
+                        goto end;
+                }
+        else if (operation == SMIME_DIGEST_VERIFY)
+                {
+                if (CMS_digest_verify(cms, indata, out, flags) > 0)
+                        BIO_printf(bio_err, "Verification successful\n");
+                else
+                        {
+                        BIO_printf(bio_err, "Verification failure\n");
+                        goto end;
+                        }
+                }
+        else if (operation == SMIME_ENCRYPTED_DECRYPT)
+                {
+                if (!CMS_EncryptedData_decrypt(cms, secret_key, secret_keylen,
+                                                indata, out, flags))
+                        goto end;
+                }
+        else if (operation == SMIME_VERIFY)
+                {
+                if (CMS_verify(cms, other, store, indata, out, flags) > 0)
+                        BIO_printf(bio_err, "Verification successful\n");
+                else
+                        {
+                        BIO_printf(bio_err, "Verification failure\n");
+                        goto end;
+                        }
+                if (signerfile)
+                        {
+                        STACK_OF(X509) *signers;
+                        signers = CMS_get0_signers(cms);
+                        if (!save_certs(signerfile, signers))
+                                {
+                                BIO_printf(bio_err,
+                                                "Error writing signers to %s\n",
+                                                                signerfile);
+                                ret = 5;
+                                goto end;
+                                }
+                        sk_X509_free(signers);
+                        }
+                if (rr_print)
+                        receipt_request_print(bio_err, cms);
+                                        
+                }
+        else if (operation == SMIME_VERIFY_RECEIPT)
+                {
+                if (CMS_verify_receipt(rcms, cms, other, store, flags) > 0)
+                        BIO_printf(bio_err, "Verification successful\n");
+                else
+                        {
+                        BIO_printf(bio_err, "Verification failure\n");
+                        goto end;
+                        }
+                }
+        else
+                {
+                if (outformat == FORMAT_SMIME)
+                        {
+                        if (to)
+                                BIO_printf(out, "To: %s\n", to);
+                        if (from)
+                                BIO_printf(out, "From: %s\n", from);
+                        if (subject)
+                                BIO_printf(out, "Subject: %s\n", subject);
+                        if (operation == SMIME_RESIGN)
+                                ret = SMIME_write_CMS(out, cms, indata, flags);
+                        else
+                                ret = SMIME_write_CMS(out, cms, in, flags);
+                        }
+                else if (outformat == FORMAT_PEM) 
+                        ret = PEM_write_bio_CMS(out, cms);
+                else if (outformat == FORMAT_ASN1) 
+                        ret = i2d_CMS_bio(out,cms);
+                else
+                        {
+                        BIO_printf(bio_err, "Bad output format for CMS file\n");
+                        goto end;
+                        }
+                if (ret <= 0)
+                        {
+                        ret = 6;
+                        goto end;
+                        }
+                }
+        ret = 0;
+end:
+        if (ret)
+                ERR_print_errors(bio_err);
+        if (need_rand)
+                app_RAND_write_file(NULL, bio_err);
+        sk_X509_pop_free(encerts, X509_free);
+        sk_X509_pop_free(other, X509_free);
+        if (vpm)
+                X509_VERIFY_PARAM_free(vpm);
+        if (sksigners)
+                sk_free(sksigners);
+        if (skkeys)
+                sk_free(skkeys);
+        if (secret_key)
+                OPENSSL_free(secret_key);
+        if (secret_keyid)
+                OPENSSL_free(secret_keyid);
+        if (econtent_type)
+                ASN1_OBJECT_free(econtent_type);
+        if (rr)
+                CMS_ReceiptRequest_free(rr);
+        if (rr_to)
+                sk_free(rr_to);
+        if (rr_from)
+                sk_free(rr_from);
+        X509_STORE_free(store);
+        X509_free(cert);
+        X509_free(recip);
+        X509_free(signer);
+        EVP_PKEY_free(key);
+        CMS_ContentInfo_free(cms);
+        CMS_ContentInfo_free(rcms);
+        BIO_free(rctin);
+        BIO_free(in);
+        BIO_free(indata);
+        BIO_free_all(out);
+        if (passin) OPENSSL_free(passin);
+        return (ret);
+}
+
+static int save_certs(char *signerfile, STACK_OF(X509) *signers)
+        {
+        int i;
+        BIO *tmp;
+        if (!signerfile)
+                return 1;
+        tmp = BIO_new_file(signerfile, "w");
+        if (!tmp) return 0;
+        for(i = 0; i < sk_X509_num(signers); i++)
+                PEM_write_bio_X509(tmp, sk_X509_value(signers, i));
+        BIO_free(tmp);
+        return 1;
+        }
+        
+
+/* Minimal callback just to output policy info (if any) */
+
+static int cms_cb(int ok, X509_STORE_CTX *ctx)
+        {
+        int error;
+
+        error = X509_STORE_CTX_get_error(ctx);
+
+        if ((error != X509_V_ERR_NO_EXPLICIT_POLICY)
+                && ((error != X509_V_OK) || (ok != 2)))
+                return ok;
+
+        policies_print(NULL, ctx);
+
+        return ok;
+
+        }
+
+static void gnames_stack_print(BIO *out, STACK_OF(GENERAL_NAMES) *gns)
+        {
+        STACK_OF(GENERAL_NAME) *gens;
+        GENERAL_NAME *gen;
+        int i, j;
+        for (i = 0; i < sk_GENERAL_NAMES_num(gns); i++)
+                {
+                gens = sk_GENERAL_NAMES_value(gns, i);
+                for (j = 0; j < sk_GENERAL_NAME_num(gens); j++)
+                        {
+                        gen = sk_GENERAL_NAME_value(gens, j);
+                        BIO_puts(out, "    ");
+                        GENERAL_NAME_print(out, gen);
+                        BIO_puts(out, "\n");
+                        }
+                }
+        return;
+        }
+
+static void receipt_request_print(BIO *out, CMS_ContentInfo *cms)
+        {
+        STACK_OF(CMS_SignerInfo) *sis;
+        CMS_SignerInfo *si;
+        CMS_ReceiptRequest *rr;
+        int allorfirst;
+        STACK_OF(GENERAL_NAMES) *rto, *rlist;
+        ASN1_STRING *scid;
+        int i, rv;
+        sis = CMS_get0_SignerInfos(cms);
+        for (i = 0; i < sk_CMS_SignerInfo_num(sis); i++)
+                {
+                si = sk_CMS_SignerInfo_value(sis, i);
+                rv = CMS_get1_ReceiptRequest(si, &rr);
+                BIO_printf(bio_err, "Signer %d:\n", i + 1);
+                if (rv == 0)
+                        BIO_puts(bio_err, "  No Receipt Request\n");
+                else if (rv < 0)
+                        {
+                        BIO_puts(bio_err, "  Receipt Request Parse Error\n");
+                        ERR_print_errors(bio_err);
+                        }
+                else
+                        {
+                        char *id;
+                        int idlen;
+                        CMS_ReceiptRequest_get0_values(rr, &scid, &allorfirst,
+                                                        &rlist, &rto);
+                        BIO_puts(out, "  Signed Content ID:\n");
+                        idlen = ASN1_STRING_length(scid);
+                        id = (char *)ASN1_STRING_data(scid);
+                        BIO_dump_indent(out, id, idlen, 4);
+                        BIO_puts(out, "  Receipts From");
+                        if (rlist)
+                                {
+                                BIO_puts(out, " List:\n");
+                                gnames_stack_print(out, rlist);
+                                }
+                        else if (allorfirst == 1)
+                                BIO_puts(out, ": First Tier\n");
+                        else if (allorfirst == 0)
+                                BIO_puts(out, ": All\n");
+                        else
+                                BIO_printf(out, " Unknown (%d)\n", allorfirst);
+                        BIO_puts(out, "  Receipts To:\n");
+                        gnames_stack_print(out, rto);
+                        }
+                if (rr)
+                        CMS_ReceiptRequest_free(rr);
+                }
+        }
+
+static STACK_OF(GENERAL_NAMES) *make_names_stack(STACK *ns)
+        {
+        int i;
+        STACK_OF(GENERAL_NAMES) *ret;
+        GENERAL_NAMES *gens = NULL;
+        GENERAL_NAME *gen = NULL;
+        ret = sk_GENERAL_NAMES_new_null();
+        if (!ret)
+                goto err;
+        for (i = 0; i < sk_num(ns); i++)
+                {
+                CONF_VALUE cnf;
+                cnf.name = "email";
+                cnf.value = sk_value(ns, i);
+                gen = v2i_GENERAL_NAME(NULL, NULL, &cnf);
+                if (!gen)
+                        goto err;
+                gens = GENERAL_NAMES_new();
+                if (!gens)
+                        goto err;
+                if (!sk_GENERAL_NAME_push(gens, gen))
+                        goto err;
+                gen = NULL;
+                if (!sk_GENERAL_NAMES_push(ret, gens))
+                        goto err;
+                gens = NULL;
+                }
+
+        return ret;
+
+        err:
+        if (ret)
+                sk_GENERAL_NAMES_pop_free(ret, GENERAL_NAMES_free);
+        if (gens)
+                GENERAL_NAMES_free(gens);
+        if (gen)
+                GENERAL_NAME_free(gen);
+        return NULL;
+        }
+
+
+static CMS_ReceiptRequest *make_receipt_request(STACK *rr_to, int rr_allorfirst,
+                                                                STACK *rr_from)
+        {
+        STACK_OF(GENERAL_NAMES) *rct_to, *rct_from;
+        CMS_ReceiptRequest *rr;
+        rct_to = make_names_stack(rr_to);
+        if (!rct_to)
+                goto err;
+        if (rr_from)
+                {
+                rct_from = make_names_stack(rr_from);
+                if (!rct_from)
+                        goto err;
+                }
+        else
+                rct_from = NULL;
+        rr = CMS_ReceiptRequest_create0(NULL, -1, rr_allorfirst, rct_from,
+                                                rct_to);
+        return rr;
+        err:
+        return NULL;
+        }
+
+#endif
diff --git a/src/lib/libssl/src/apps/ec.c b/src/lib/libssl/src/apps/ec.c
new file mode 100644
index 0000000000..771e15f357
--- /dev/null
+++ b/src/lib/libssl/src/apps/ec.c
@@ -0,0 +1,403 @@
+/* apps/ec.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project.
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_EC
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "apps.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/pem.h>
+
+#undef PROG
+#define PROG    ec_main
+
+/* -inform arg    - input format - default PEM (one of DER, NET or PEM)
+ * -outform arg   - output format - default PEM
+ * -in arg        - input file - default stdin
+ * -out arg       - output file - default stdout
+ * -des           - encrypt output if PEM format with DES in cbc mode
+ * -text          - print a text version
+ * -param_out     - print the elliptic curve parameters
+ * -conv_form arg - specifies the point encoding form
+ * -param_enc arg - specifies the parameter encoding
+ */
+
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
+{
+#ifndef OPENSSL_NO_ENGINE
+        ENGINE  *e = NULL;
+#endif
+        int     ret = 1;
+        EC_KEY  *eckey = NULL;
+        const EC_GROUP *group;
+        int     i, badops = 0;
+        const EVP_CIPHER *enc = NULL;
+        BIO     *in = NULL, *out = NULL;
+        int     informat, outformat, text=0, noout=0;
+        int     pubin = 0, pubout = 0, param_out = 0;
+        char    *infile, *outfile, *prog, *engine;
+        char    *passargin = NULL, *passargout = NULL;
+        char    *passin = NULL, *passout = NULL;
+        point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED;
+        int     new_form = 0;
+        int     asn1_flag = OPENSSL_EC_NAMED_CURVE;
+        int     new_asn1_flag = 0;
+
+        apps_startup();
+
+        if (bio_err == NULL)
+                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+                        BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
+
+        if (!load_config(bio_err, NULL))
+                goto end;
+
+        engine = NULL;
+        infile = NULL;
+        outfile = NULL;
+        informat = FORMAT_PEM;
+        outformat = FORMAT_PEM;
+
+        prog = argv[0];
+        argc--;
+        argv++;
+        while (argc >= 1)
+                {
+                if (strcmp(*argv,"-inform") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        informat=str2fmt(*(++argv));
+                        }
+                else if (strcmp(*argv,"-outform") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        outformat=str2fmt(*(++argv));
+                        }
+                else if (strcmp(*argv,"-in") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        infile= *(++argv);
+                        }
+                else if (strcmp(*argv,"-out") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        outfile= *(++argv);
+                        }
+                else if (strcmp(*argv,"-passin") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        passargin= *(++argv);
+                        }
+                else if (strcmp(*argv,"-passout") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        passargout= *(++argv);
+                        }
+                else if (strcmp(*argv, "-engine") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        engine= *(++argv);
+                        }
+                else if (strcmp(*argv, "-noout") == 0)
+                        noout = 1;
+                else if (strcmp(*argv, "-text") == 0)
+                        text = 1;
+                else if (strcmp(*argv, "-conv_form") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        ++argv;
+                        new_form = 1;
+                        if (strcmp(*argv, "compressed") == 0)
+                                form = POINT_CONVERSION_COMPRESSED;
+                        else if (strcmp(*argv, "uncompressed") == 0)
+                                form = POINT_CONVERSION_UNCOMPRESSED;
+                        else if (strcmp(*argv, "hybrid") == 0)
+                                form = POINT_CONVERSION_HYBRID;
+                        else
+                                goto bad;
+                        }
+                else if (strcmp(*argv, "-param_enc") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        ++argv;
+                        new_asn1_flag = 1;
+                        if (strcmp(*argv, "named_curve") == 0)
+                                asn1_flag = OPENSSL_EC_NAMED_CURVE;
+                        else if (strcmp(*argv, "explicit") == 0)
+                                asn1_flag = 0;
+                        else
+                                goto bad;
+                        }
+                else if (strcmp(*argv, "-param_out") == 0)
+                        param_out = 1;
+                else if (strcmp(*argv, "-pubin") == 0)
+                        pubin=1;
+                else if (strcmp(*argv, "-pubout") == 0)
+                        pubout=1;
+                else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+                        {
+                        BIO_printf(bio_err, "unknown option %s\n", *argv);
+                        badops=1;
+                        break;
+                        }
+                argc--;
+                argv++;
+                }
+
+        if (badops)
+                {
+bad:
+                BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
+                BIO_printf(bio_err, "where options are\n");
+                BIO_printf(bio_err, " -inform arg     input format - "
+                                "DER or PEM\n");
+                BIO_printf(bio_err, " -outform arg    output format - "
+                                "DER or PEM\n");
+                BIO_printf(bio_err, " -in arg         input file\n");
+                BIO_printf(bio_err, " -passin arg     input file pass "
+                                "phrase source\n");
+                BIO_printf(bio_err, " -out arg        output file\n");
+                BIO_printf(bio_err, " -passout arg    output file pass "
+                                "phrase source\n");
+                BIO_printf(bio_err, " -engine e       use engine e, "
+                                "possibly a hardware device.\n");
+                BIO_printf(bio_err, " -des            encrypt PEM output, "
+                                "instead of 'des' every other \n"
+                                "                 cipher "
+                                "supported by OpenSSL can be used\n");
+                BIO_printf(bio_err, " -text           print the key\n");
+                BIO_printf(bio_err, " -noout          don't print key out\n");
+                BIO_printf(bio_err, " -param_out      print the elliptic "
+                                "curve parameters\n");
+                BIO_printf(bio_err, " -conv_form arg  specifies the "
+                                "point conversion form \n");
+                BIO_printf(bio_err, "                 possible values:"
+                                " compressed\n");
+                BIO_printf(bio_err, "                                 "
+                                " uncompressed (default)\n");
+                BIO_printf(bio_err, "                                  "
+                                " hybrid\n");
+                BIO_printf(bio_err, " -param_enc arg  specifies the way"
+                                " the ec parameters are encoded\n");
+                BIO_printf(bio_err, "                 in the asn1 der "
+                                "encoding\n");
+                BIO_printf(bio_err, "                 possible values:"
+                                " named_curve (default)\n");
+                BIO_printf(bio_err,"                                  "
+                                "explicit\n");
+                goto end;
+                }
+
+        ERR_load_crypto_strings();
+
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
+        if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) 
+                {
+                BIO_printf(bio_err, "Error getting passwords\n");
+                goto end;
+                }
+
+        in = BIO_new(BIO_s_file());
+        out = BIO_new(BIO_s_file());
+        if ((in == NULL) || (out == NULL))
+                {
+                ERR_print_errors(bio_err);
+                goto end;
+                }
+
+        if (infile == NULL)
+                BIO_set_fp(in, stdin, BIO_NOCLOSE);
+        else
+                {
+                if (BIO_read_filename(in, infile) <= 0)
+                        {
+                        perror(infile);
+                        goto end;
+                        }
+                }
+
+        BIO_printf(bio_err, "read EC key\n");
+        if (informat == FORMAT_ASN1) 
+                {
+                if (pubin) 
+                        eckey = d2i_EC_PUBKEY_bio(in, NULL);
+                else 
+                        eckey = d2i_ECPrivateKey_bio(in, NULL);
+                } 
+        else if (informat == FORMAT_PEM) 
+                {
+                if (pubin) 
+                        eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, 
+                                NULL);
+                else 
+                        eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL,
+                                passin);
+                } 
+        else
+                {
+                BIO_printf(bio_err, "bad input format specified for key\n");
+                goto end;
+                }
+        if (eckey == NULL)
+                {
+                BIO_printf(bio_err,"unable to load Key\n");
+                ERR_print_errors(bio_err);
+                goto end;
+                }
+
+        if (outfile == NULL)
+                {
+                BIO_set_fp(out, stdout, BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+                        {
+                        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                        out = BIO_push(tmpbio, out);
+                        }
+#endif
+                }
+        else
+                {
+                if (BIO_write_filename(out, outfile) <= 0)
+                        {
+                        perror(outfile);
+                        goto end;
+                        }
+                }
+
+        group = EC_KEY_get0_group(eckey);
+
+        if (new_form)
+                EC_KEY_set_conv_form(eckey, form);
+
+        if (new_asn1_flag)
+                EC_KEY_set_asn1_flag(eckey, asn1_flag);
+
+        if (text) 
+                if (!EC_KEY_print(out, eckey, 0))
+                        {
+                        perror(outfile);
+                        ERR_print_errors(bio_err);
+                        goto end;
+                        }
+
+        if (noout) 
+                {
+                ret = 0;
+                goto end;
+                }
+
+        BIO_printf(bio_err, "writing EC key\n");
+        if (outformat == FORMAT_ASN1) 
+                {
+                if (param_out)
+                        i = i2d_ECPKParameters_bio(out, group);
+                else if (pubin || pubout) 
+                        i = i2d_EC_PUBKEY_bio(out, eckey);
+                else 
+                        i = i2d_ECPrivateKey_bio(out, eckey);
+                } 
+        else if (outformat == FORMAT_PEM) 
+                {
+                if (param_out)
+                        i = PEM_write_bio_ECPKParameters(out, group);
+                else if (pubin || pubout)
+                        i = PEM_write_bio_EC_PUBKEY(out, eckey);
+                else 
+                        i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
+                                                NULL, 0, NULL, passout);
+                } 
+        else 
+                {
+                BIO_printf(bio_err, "bad output format specified for "
+                        "outfile\n");
+                goto end;
+                }
+
+        if (!i)
+                {
+                BIO_printf(bio_err, "unable to write private key\n");
+                ERR_print_errors(bio_err);
+                }
+        else
+                ret=0;
+end:
+        if (in)
+                BIO_free(in);
+        if (out)
+                BIO_free_all(out);
+        if (eckey)
+                EC_KEY_free(eckey);
+        if (passin)
+                OPENSSL_free(passin);
+        if (passout)
+                OPENSSL_free(passout);
+        apps_shutdown();
+        OPENSSL_EXIT(ret);
+}
+#endif
diff --git a/src/lib/libssl/src/apps/ecparam.c b/src/lib/libssl/src/apps/ecparam.c
new file mode 100644
index 0000000000..4e1fc837ed
--- /dev/null
+++ b/src/lib/libssl/src/apps/ecparam.c
@@ -0,0 +1,728 @@
+/* apps/ecparam.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project.
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the OpenSSL open source
+ * license provided above.
+ *
+ * The elliptic curve binary polynomial software is originally written by 
+ * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_EC
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
+#include "apps.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/ec.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+
+#undef PROG
+#define PROG    ecparam_main
+
+/* -inform arg      - input format - default PEM (DER or PEM)
+ * -outform arg     - output format - default PEM
+ * -in  arg         - input file  - default stdin
+ * -out arg         - output file - default stdout
+ * -noout           - do not print the ec parameter
+ * -text            - print the ec parameters in text form
+ * -check           - validate the ec parameters
+ * -C               - print a 'C' function creating the parameters
+ * -name arg        - use the ec parameters with 'short name' name
+ * -list_curves     - prints a list of all currently available curve 'short names'
+ * -conv_form arg   - specifies the point conversion form 
+ *                  - possible values: compressed
+ *                                     uncompressed (default)
+ *                                     hybrid
+ * -param_enc arg   - specifies the way the ec parameters are encoded
+ *                    in the asn1 der encoding
+ *                    possible values: named_curve (default)
+ *                                     explicit
+ * -no_seed         - if 'explicit' parameters are choosen do not use the seed
+ * -genkey          - generate ec key
+ * -rand file       - files to use for random number input
+ * -engine e        - use engine e, possibly a hardware device
+ */
+
+
+static int ecparam_print_var(BIO *,BIGNUM *,const char *,int,unsigned char *);
+
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
+        {
+        EC_GROUP *group = NULL;
+        point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED; 
+        int     new_form = 0;
+        int     asn1_flag = OPENSSL_EC_NAMED_CURVE;
+        int     new_asn1_flag = 0;
+        char    *curve_name = NULL, *inrand = NULL;
+        int     list_curves = 0, no_seed = 0, check = 0,
+                badops = 0, text = 0, i, need_rand = 0, genkey = 0;
+        char    *infile = NULL, *outfile = NULL, *prog;
+        BIO     *in = NULL, *out = NULL;
+        int     informat, outformat, noout = 0, C = 0, ret = 1;
+#ifndef OPENSSL_NO_ENGINE
+        ENGINE  *e = NULL;
+#endif
+        char    *engine = NULL;
+
+        BIGNUM  *ec_p = NULL, *ec_a = NULL, *ec_b = NULL,
+                *ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL;
+        unsigned char *buffer = NULL;
+
+        apps_startup();
+
+        if (bio_err == NULL)
+                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+
+        if (!load_config(bio_err, NULL))
+                goto end;
+
+        informat=FORMAT_PEM;
+        outformat=FORMAT_PEM;
+
+        prog=argv[0];
+        argc--;
+        argv++;
+        while (argc >= 1)
+                {
+                if      (strcmp(*argv,"-inform") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        informat=str2fmt(*(++argv));
+                        }
+                else if (strcmp(*argv,"-outform") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        outformat=str2fmt(*(++argv));
+                        }
+                else if (strcmp(*argv,"-in") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        infile= *(++argv);
+                        }
+                else if (strcmp(*argv,"-out") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        outfile= *(++argv);
+                        }
+                else if (strcmp(*argv,"-text") == 0)
+                        text = 1;
+                else if (strcmp(*argv,"-C") == 0)
+                        C = 1;
+                else if (strcmp(*argv,"-check") == 0)
+                        check = 1;
+                else if (strcmp (*argv, "-name") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        curve_name = *(++argv);
+                        }
+                else if (strcmp(*argv, "-list_curves") == 0)
+                        list_curves = 1;
+                else if (strcmp(*argv, "-conv_form") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        ++argv;
+                        new_form = 1;
+                        if (strcmp(*argv, "compressed") == 0)
+                                form = POINT_CONVERSION_COMPRESSED;
+                        else if (strcmp(*argv, "uncompressed") == 0)
+                                form = POINT_CONVERSION_UNCOMPRESSED;
+                        else if (strcmp(*argv, "hybrid") == 0)
+                                form = POINT_CONVERSION_HYBRID;
+                        else
+                                goto bad;
+                        }
+                else if (strcmp(*argv, "-param_enc") == 0)
+                        {
+                        if (--argc < 1)
+                                goto bad;
+                        ++argv;
+                        new_asn1_flag = 1;
+                        if (strcmp(*argv, "named_curve") == 0)
+                                asn1_flag = OPENSSL_EC_NAMED_CURVE;
+                        else if (strcmp(*argv, "explicit") == 0)
+                                asn1_flag = 0;
+                        else
+                                goto bad;
+                        }
+                else if (strcmp(*argv, "-no_seed") == 0)
+                        no_seed = 1;
+                else if (strcmp(*argv, "-noout") == 0)
+                        noout=1;
+                else if (strcmp(*argv,"-genkey") == 0)
+                        {
+                        genkey=1;
+                        need_rand=1;
+                        }
+                else if (strcmp(*argv, "-rand") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        inrand= *(++argv);
+                        need_rand=1;
+                        }
+                else if(strcmp(*argv, "-engine") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        engine = *(++argv);
+                        }       
+                else
+                        {
+                        BIO_printf(bio_err,"unknown option %s\n",*argv);
+                        badops=1;
+                        break;
+                        }
+                argc--;
+                argv++;
+                }
+
+        if (badops)
+                {
+bad:
+                BIO_printf(bio_err, "%s [options] <infile >outfile\n",prog);
+                BIO_printf(bio_err, "where options are\n");
+                BIO_printf(bio_err, " -inform arg       input format - "
+                                "default PEM (DER or PEM)\n");
+                BIO_printf(bio_err, " -outform arg      output format - "
+                                "default PEM\n");
+                BIO_printf(bio_err, " -in  arg          input file  - "
+                                "default stdin\n");
+                BIO_printf(bio_err, " -out arg          output file - "
+                                "default stdout\n");
+                BIO_printf(bio_err, " -noout            do not print the "
+                                "ec parameter\n");
+                BIO_printf(bio_err, " -text             print the ec "
+                                "parameters in text form\n");
+                BIO_printf(bio_err, " -check            validate the ec "
+                                "parameters\n");
+                BIO_printf(bio_err, " -C                print a 'C' "
+                                "function creating the parameters\n");
+                BIO_printf(bio_err, " -name arg         use the "
+                                "ec parameters with 'short name' name\n");
+                BIO_printf(bio_err, " -list_curves      prints a list of "
+                                "all currently available curve 'short names'\n");
+                BIO_printf(bio_err, " -conv_form arg    specifies the "
+                                "point conversion form \n");
+                BIO_printf(bio_err, "                   possible values:"
+                                " compressed\n");
+                BIO_printf(bio_err, "                                   "
+                                " uncompressed (default)\n");
+                BIO_printf(bio_err, "                                   "
+                                " hybrid\n");
+                BIO_printf(bio_err, " -param_enc arg    specifies the way"
+                                " the ec parameters are encoded\n");
+                BIO_printf(bio_err, "                   in the asn1 der "
+                                "encoding\n");
+                BIO_printf(bio_err, "                   possible values:"
+                                " named_curve (default)\n");
+                BIO_printf(bio_err, "                                   "
+                                " explicit\n");
+                BIO_printf(bio_err, " -no_seed          if 'explicit'"
+                                " parameters are choosen do not"
+                                " use the seed\n");
+                BIO_printf(bio_err, " -genkey           generate ec"
+                                " key\n");
+                BIO_printf(bio_err, " -rand file        files to use for"
+                                " random number input\n");
+                BIO_printf(bio_err, " -engine e         use engine e, "
+                                "possibly a hardware device\n");
+                goto end;
+                }
+
+        ERR_load_crypto_strings();
+
+        in=BIO_new(BIO_s_file());
+        out=BIO_new(BIO_s_file());
+        if ((in == NULL) || (out == NULL))
+                {
+                ERR_print_errors(bio_err);
+                goto end;
+                }
+
+        if (infile == NULL)
+                BIO_set_fp(in,stdin,BIO_NOCLOSE);
+        else
+                {
+                if (BIO_read_filename(in,infile) <= 0)
+                        {
+                        perror(infile);
+                        goto end;
+                        }
+                }
+        if (outfile == NULL)
+                {
+                BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+                {
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                out = BIO_push(tmpbio, out);
+                }
+#endif
+                }
+        else
+                {
+                if (BIO_write_filename(out,outfile) <= 0)
+                        {
+                        perror(outfile);
+                        goto end;
+                        }
+                }
+
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
+        if (list_curves)
+                {
+                EC_builtin_curve *curves = NULL;
+                size_t crv_len = 0;
+                size_t n = 0;
+
+                crv_len = EC_get_builtin_curves(NULL, 0);
+
+                curves = OPENSSL_malloc((int)(sizeof(EC_builtin_curve) * crv_len));
+
+                if (curves == NULL)
+                        goto end;
+
+                if (!EC_get_builtin_curves(curves, crv_len))
+                        {
+                        OPENSSL_free(curves);
+                        goto end;
+                        }
+
+                
+                for (n = 0; n < crv_len; n++)
+                        {
+                        const char *comment;
+                        const char *sname;
+                        comment = curves[n].comment;
+                        sname   = OBJ_nid2sn(curves[n].nid);
+                        if (comment == NULL)
+                                comment = "CURVE DESCRIPTION NOT AVAILABLE";
+                        if (sname == NULL)
+                                sname = "";
+
+                        BIO_printf(out, "  %-10s: ", sname);
+                        BIO_printf(out, "%s\n", comment);
+                        } 
+
+                OPENSSL_free(curves);
+                ret = 0;
+                goto end;
+                }
+
+        if (curve_name != NULL)
+                {
+                int nid;
+
+                /* workaround for the SECG curve names secp192r1
+                 * and secp256r1 (which are the same as the curves
+                 * prime192v1 and prime256v1 defined in X9.62)
+                 */
+                if (!strcmp(curve_name, "secp192r1"))
+                        {
+                        BIO_printf(bio_err, "using curve name prime192v1 "
+                                "instead of secp192r1\n");
+                        nid = NID_X9_62_prime192v1;
+                        }
+                else if (!strcmp(curve_name, "secp256r1"))
+                        {
+                        BIO_printf(bio_err, "using curve name prime256v1 "
+                                "instead of secp256r1\n");
+                        nid = NID_X9_62_prime256v1;
+                        }
+                else
+                        nid = OBJ_sn2nid(curve_name);
+        
+                if (nid == 0)
+                        {
+                        BIO_printf(bio_err, "unknown curve name (%s)\n", 
+                                curve_name);
+                        goto end;
+                        }
+
+                group = EC_GROUP_new_by_curve_name(nid);
+                if (group == NULL)
+                        {
+                        BIO_printf(bio_err, "unable to create curve (%s)\n", 
+                                curve_name);
+                        goto end;
+                        }
+                EC_GROUP_set_asn1_flag(group, asn1_flag);
+                EC_GROUP_set_point_conversion_form(group, form);
+                }
+        else if (informat == FORMAT_ASN1)
+                {
+                group = d2i_ECPKParameters_bio(in, NULL);
+                }
+        else if (informat == FORMAT_PEM)
+                {
+                group = PEM_read_bio_ECPKParameters(in,NULL,NULL,NULL);
+                }
+        else
+                {
+                BIO_printf(bio_err, "bad input format specified\n");
+                goto end;
+                }
+
+        if (group == NULL)
+                {
+                BIO_printf(bio_err, 
+                        "unable to load elliptic curve parameters\n");
+                ERR_print_errors(bio_err);
+                goto end;
+                }
+
+        if (new_form)
+                EC_GROUP_set_point_conversion_form(group, form);
+
+        if (new_asn1_flag)
+                EC_GROUP_set_asn1_flag(group, asn1_flag);
+
+        if (no_seed)
+                {
+                EC_GROUP_set_seed(group, NULL, 0);
+                }
+
+        if (text)
+                {
+                if (!ECPKParameters_print(out, group, 0))
+                        goto end;
+                }
+
+        if (check)
+                {
+                if (group == NULL)
+                        BIO_printf(bio_err, "no elliptic curve parameters\n");
+                BIO_printf(bio_err, "checking elliptic curve parameters: ");
+                if (!EC_GROUP_check(group, NULL))
+                        {
+                        BIO_printf(bio_err, "failed\n");
+                        ERR_print_errors(bio_err);
+                        }
+                else
+                        BIO_printf(bio_err, "ok\n");
+                        
+                }
+
+        if (C)
+                {
+                size_t  buf_len = 0, tmp_len = 0;
+                const EC_POINT *point;
+                int     is_prime, len = 0;
+                const EC_METHOD *meth = EC_GROUP_method_of(group);
+
+                if ((ec_p = BN_new()) == NULL || (ec_a = BN_new()) == NULL ||
+                    (ec_b = BN_new()) == NULL || (ec_gen = BN_new()) == NULL ||
+                    (ec_order = BN_new()) == NULL || 
+                    (ec_cofactor = BN_new()) == NULL )
+                        {
+                        perror("OPENSSL_malloc");
+                        goto end;
+                        }
+
+                is_prime = (EC_METHOD_get_field_type(meth) == 
+                        NID_X9_62_prime_field);
+
+                if (is_prime)
+                        {
+                        if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a,
+                                ec_b, NULL))
+                                goto end;
+                        }
+                else
+                        {
+                        /* TODO */
+                        goto end;
+                        }
+
+                if ((point = EC_GROUP_get0_generator(group)) == NULL)
+                        goto end;
+                if (!EC_POINT_point2bn(group, point, 
+                        EC_GROUP_get_point_conversion_form(group), ec_gen, 
+                        NULL))
+                        goto end;
+                if (!EC_GROUP_get_order(group, ec_order, NULL))
+                        goto end;
+                if (!EC_GROUP_get_cofactor(group, ec_cofactor, NULL))
+                        goto end;
+
+                if (!ec_p || !ec_a || !ec_b || !ec_gen || 
+                        !ec_order || !ec_cofactor)
+                        goto end;
+
+                len = BN_num_bits(ec_order);
+
+                if ((tmp_len = (size_t)BN_num_bytes(ec_p)) > buf_len)
+                        buf_len = tmp_len;
+                if ((tmp_len = (size_t)BN_num_bytes(ec_a)) > buf_len)
+                        buf_len = tmp_len;
+                if ((tmp_len = (size_t)BN_num_bytes(ec_b)) > buf_len)
+                        buf_len = tmp_len;
+                if ((tmp_len = (size_t)BN_num_bytes(ec_gen)) > buf_len)
+                        buf_len = tmp_len;
+                if ((tmp_len = (size_t)BN_num_bytes(ec_order)) > buf_len)
+                        buf_len = tmp_len;
+                if ((tmp_len = (size_t)BN_num_bytes(ec_cofactor)) > buf_len)
+                        buf_len = tmp_len;
+
+                buffer = (unsigned char *)OPENSSL_malloc(buf_len);
+
+                if (buffer == NULL)
+                        {
+                        perror("OPENSSL_malloc");
+                        goto end;
+                        }
+
+                ecparam_print_var(out, ec_p, "ec_p", len, buffer);
+                ecparam_print_var(out, ec_a, "ec_a", len, buffer);
+                ecparam_print_var(out, ec_b, "ec_b", len, buffer);
+                ecparam_print_var(out, ec_gen, "ec_gen", len, buffer);
+                ecparam_print_var(out, ec_order, "ec_order", len, buffer);
+                ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, 
+                        buffer);
+
+                BIO_printf(out, "\n\n");
+
+                BIO_printf(out, "EC_GROUP *get_ec_group_%d(void)\n\t{\n", len);
+                BIO_printf(out, "\tint ok=0;\n");
+                BIO_printf(out, "\tEC_GROUP *group = NULL;\n");
+                BIO_printf(out, "\tEC_POINT *point = NULL;\n");
+                BIO_printf(out, "\tBIGNUM   *tmp_1 = NULL, *tmp_2 = NULL, "
+                                "*tmp_3 = NULL;\n\n");
+                BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_p_%d, "
+                                "sizeof(ec_p_%d), NULL)) == NULL)\n\t\t"
+                                "goto err;\n", len, len);
+                BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_a_%d, "
+                                "sizeof(ec_a_%d), NULL)) == NULL)\n\t\t"
+                                "goto err;\n", len, len);
+                BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_b_%d, "
+                                "sizeof(ec_b_%d), NULL)) == NULL)\n\t\t"
+                                "goto err;\n", len, len);
+                if (is_prime)
+                        {
+                        BIO_printf(out, "\tif ((group = EC_GROUP_new_curve_"
+                                "GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)"
+                                "\n\t\tgoto err;\n\n");
+                        }
+                else
+                        {
+                        /* TODO */
+                        goto end;
+                        }
+                BIO_printf(out, "\t/* build generator */\n");
+                BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_gen_%d, "
+                                "sizeof(ec_gen_%d), tmp_1)) == NULL)"
+                                "\n\t\tgoto err;\n", len, len);
+                BIO_printf(out, "\tpoint = EC_POINT_bn2point(group, tmp_1, "
+                                "NULL, NULL);\n");
+                BIO_printf(out, "\tif (point == NULL)\n\t\tgoto err;\n");
+                BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_order_%d, "
+                                "sizeof(ec_order_%d), tmp_2)) == NULL)"
+                                "\n\t\tgoto err;\n", len, len);
+                BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_cofactor_%d, "
+                                "sizeof(ec_cofactor_%d), tmp_3)) == NULL)"
+                                "\n\t\tgoto err;\n", len, len);
+                BIO_printf(out, "\tif (!EC_GROUP_set_generator(group, point,"
+                                " tmp_2, tmp_3))\n\t\tgoto err;\n");
+                BIO_printf(out, "\n\tok=1;\n");
+                BIO_printf(out, "err:\n");
+                BIO_printf(out, "\tif (tmp_1)\n\t\tBN_free(tmp_1);\n");
+                BIO_printf(out, "\tif (tmp_2)\n\t\tBN_free(tmp_2);\n");
+                BIO_printf(out, "\tif (tmp_3)\n\t\tBN_free(tmp_3);\n");
+                BIO_printf(out, "\tif (point)\n\t\tEC_POINT_free(point);\n");
+                BIO_printf(out, "\tif (!ok)\n");
+                BIO_printf(out, "\t\t{\n");
+                BIO_printf(out, "\t\tEC_GROUP_free(group);\n");
+                BIO_printf(out, "\t\tgroup = NULL;\n");
+                BIO_printf(out, "\t\t}\n");
+                BIO_printf(out, "\treturn(group);\n\t}\n");
+        }
+
+        if (!noout)
+                {
+                if (outformat == FORMAT_ASN1)
+                        i = i2d_ECPKParameters_bio(out, group);
+                else if (outformat == FORMAT_PEM)
+                        i = PEM_write_bio_ECPKParameters(out, group);
+                else    
+                        {
+                        BIO_printf(bio_err,"bad output format specified for"
+                                " outfile\n");
+                        goto end;
+                        }
+                if (!i)
+                        {
+                        BIO_printf(bio_err, "unable to write elliptic "
+                                "curve parameters\n");
+                        ERR_print_errors(bio_err);
+                        goto end;
+                        }
+                }
+        
+        if (need_rand)
+                {
+                app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+                if (inrand != NULL)
+                        BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                                app_RAND_load_files(inrand));
+                }
+
+        if (genkey)
+                {
+                EC_KEY *eckey = EC_KEY_new();
+
+                if (eckey == NULL)
+                        goto end;
+
+                assert(need_rand);
+
+                if (EC_KEY_set_group(eckey, group) == 0)
+                        goto end;
+                
+                if (!EC_KEY_generate_key(eckey))
+                        {
+                        EC_KEY_free(eckey);
+                        goto end;
+                        }
+                if (outformat == FORMAT_ASN1)
+                        i = i2d_ECPrivateKey_bio(out, eckey);
+                else if (outformat == FORMAT_PEM)
+                        i = PEM_write_bio_ECPrivateKey(out, eckey, NULL,
+                                NULL, 0, NULL, NULL);
+                else    
+                        {
+                        BIO_printf(bio_err, "bad output format specified "
+                                "for outfile\n");
+                        EC_KEY_free(eckey);
+                        goto end;
+                        }
+                EC_KEY_free(eckey);
+                }
+
+        if (need_rand)
+                app_RAND_write_file(NULL, bio_err);
+
+        ret=0;
+end:
+        if (ec_p)
+                BN_free(ec_p);
+        if (ec_a)
+                BN_free(ec_a);
+        if (ec_b)
+                BN_free(ec_b);
+        if (ec_gen)
+                BN_free(ec_gen);
+        if (ec_order)
+                BN_free(ec_order);
+        if (ec_cofactor)
+                BN_free(ec_cofactor);
+        if (buffer)
+                OPENSSL_free(buffer);
+        if (in != NULL)
+                BIO_free(in);
+        if (out != NULL)
+                BIO_free_all(out);
+        if (group != NULL)
+                EC_GROUP_free(group);
+        apps_shutdown();
+        OPENSSL_EXIT(ret);
+}
+
+static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
+        int len, unsigned char *buffer)
+        {
+        BIO_printf(out, "static unsigned char %s_%d[] = {", var, len);
+        if (BN_is_zero(in))
+                BIO_printf(out, "\n\t0x00");
+        else 
+                {
+                int i, l;
+
+                l = BN_bn2bin(in, buffer);
+                for (i=0; i<l-1; i++)
+                        {
+                        if ((i%12) == 0) 
+                                BIO_printf(out, "\n\t");
+                        BIO_printf(out, "0x%02X,", buffer[i]);
+                        }
+                if ((i%12) == 0) 
+                        BIO_printf(out, "\n\t");
+                BIO_printf(out, "0x%02X", buffer[i]);
+                }
+        BIO_printf(out, "\n\t};\n\n");
+        return 1;
+        }
+#endif
diff --git a/src/lib/libssl/src/fips/rand/fips_rand.h b/src/lib/libssl/src/apps/timeouts.h
index 1286b63ab2..89b5dc76f6 100644
--- a/src/lib/libssl/src/fips/rand/fips_rand.h
+++ b/src/lib/libssl/src/apps/timeouts.h
@@ -1,5 +1,10 @@
+/* apps/timeouts.h */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
 /* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -16,12 +21,12 @@
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
  *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
  *
  * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
+ *    openssl-core@OpenSSL.org.
  *
  * 5. Products derived from this software may not be called "OpenSSL"
  *    nor may "OpenSSL" appear in their names without prior written
@@ -30,7 +35,7 @@
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
  *
  * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -44,30 +49,19 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
  *
  */
 
-#ifndef HEADER_FIPS_RAND_H
-#define HEADER_FIPS_RAND_H
-
-#include "des.h"
-
-#ifdef OPENSSL_FIPS
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-void FIPS_set_prng_key(const unsigned char k1[8],const unsigned char k2[8]);
-void FIPS_test_mode(int test,const unsigned char faketime[8]);
-void FIPS_rand_seed(const void *buf, FIPS_RAND_SIZE_T num);
-/* NB: this returns true if _partially_ seeded */
-int FIPS_rand_seeded(void);
+#ifndef INCLUDED_TIMEOUTS_H
+#define INCLUDED_TIMEOUTS_H
 
-RAND_METHOD *FIPS_rand_method(void);
+/* numbers in us */
+#define DGRAM_RCV_TIMEOUT         250000
+#define DGRAM_SND_TIMEOUT         250000
 
-#ifdef  __cplusplus
-}
-#endif
-#endif
-#endif
+#endif /* ! INCLUDED_TIMEOUTS_H */
diff --git a/src/lib/libssl/src/bugs/VC16.bug b/src/lib/libssl/src/bugs/VC16.bug
deleted file mode 100644
index 7815bb5c77..0000000000
--- a/src/lib/libssl/src/bugs/VC16.bug
+++ /dev/null
@@ -1,18 +0,0 @@
-Microsoft (R) C/C++ Optimizing Compiler Version 8.00c
-
-Compile with /O2 chokes the compiler on these files
-
-crypto\md\md5_dgst.c            warning '@(#)reg86.c:1.26', line 1110
-crypto\des\ofb64ede.c           warning '@(#)grammar.c:1.147', line 168
-crypto\des\ofb64enc.c           warning '@(#)grammar.c:1.147', line 168
-crypto\des\qud_cksm.c           warning '@(#)grammar.c:1.147', line 168
-crypto\rc2\rc2ofb64.c           warning '@(#)grammar.c:1.147', line 168
-crypto\objects\obj_dat.c        warning '@(#)grammar.c:1.147', line 168
-                                fatal   '@(#)grammar.c:1.147', line 168
-crypto\objects\obj_lib.c        warning '@(#)grammar.c:1.147', line 168
-                                fatal   '@(#)grammar.c:1.147', line 168
-ssl\ssl_auth.c                  warning '@(#)grammar.c:1.147', line 168
-                                fatal   '@(#)grammar.c:1.147', line 168
-
-Turning on /G3 with build flags that worked fine for /G2 came up with
-divide by zero errors in 'normal' code in speed.c :-(
diff --git a/src/lib/libssl/src/certs/README.RootCerts b/src/lib/libssl/src/certs/README.RootCerts
new file mode 100644
index 0000000000..c760b61033
--- /dev/null
+++ b/src/lib/libssl/src/certs/README.RootCerts
@@ -0,0 +1,4 @@
+The OpenSSL project does not (any longer) include root CA certificates.
+
+Please check out the FAQ:
+  * How can I set up a bundle of commercial root CA certificates?
diff --git a/src/lib/libssl/src/certs/RegTP-5R.pem b/src/lib/libssl/src/certs/RegTP-5R.pem
deleted file mode 100644
index 9eb79aa17c..0000000000
--- a/src/lib/libssl/src/certs/RegTP-5R.pem
+++ /dev/null
@@ -1,19 +0,0 @@
-issuer= CN=5R-CA 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
-notBefore=Mar 22 08:55:51 2000 GMT
-notAfter=Mar 22 08:55:51 2005 GMT
-subject= CN=5R-CA 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
------BEGIN CERTIFICATE-----
-MIICaDCCAdSgAwIBAgIDDIOqMAoGBiskAwMBAgUAMG8xCzAJBgNVBAYTAkRFMT0w
-OwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0
-aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjVSLUNBIDE6UE4w
-IhgPMjAwMDAzMjIwODU1NTFaGA8yMDA1MDMyMjA4NTU1MVowbzELMAkGA1UEBhMC
-REUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11
-bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNVItQ0Eg
-MTpQTjCBoTANBgkqhkiG9w0BAQEFAAOBjwAwgYsCgYEAih5BUycfBpqKhU8RDsaS
-vV5AtzWeXQRColL9CH3t0DKnhjKAlJ8iccFtJNv+d3bh8bb9sh0maRSo647xP7hs
-HTjKgTE4zM5BYNfXvST79OtcMgAzrnDiGjQIIWv8xbfV1MqxxdtZJygrwzRMb9jG
-CAGoJEymoyzAMNG7tSdBWnUCBQDAAAABoxIwEDAOBgNVHQ8BAf8EBAMCAQYwCgYG
-KyQDAwECBQADgYEAOaK8ihVSBUcL2IdVBxZYYUKwMz5m7H3zqhN8W9w+iafWudH6
-b+aahkbENEwzg3C3v5g8nze7v7ssacQze657LHjP+e7ksUDIgcS4R1pU2eN16bjS
-P/qGPF3rhrIEHoK5nJULkjkZYTtNiOvmQ/+G70TXDi3Os/TwLlWRvu+7YLM=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/RegTP-6R.pem b/src/lib/libssl/src/certs/RegTP-6R.pem
deleted file mode 100644
index 4d79c74e5a..0000000000
--- a/src/lib/libssl/src/certs/RegTP-6R.pem
+++ /dev/null
@@ -1,19 +0,0 @@
-issuer= CN=6R-Ca 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
-notBefore=Feb  1 09:52:17 2001 GMT
-notAfter=Jun  1 09:52:17 2005 GMT
-subject= CN=6R-Ca 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
------BEGIN CERTIFICATE-----
-MIICaDCCAdSgAwIBAgIDMtGNMAoGBiskAwMBAgUAMG8xCzAJBgNVBAYTAkRFMT0w
-OwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0
-aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjZSLUNhIDE6UE4w
-IhgPMjAwMTAyMDEwOTUyMTdaGA8yMDA1MDYwMTA5NTIxN1owbzELMAkGA1UEBhMC
-REUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11
-bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNlItQ2Eg
-MTpQTjCBoTANBgkqhkiG9w0BAQEFAAOBjwAwgYsCgYEAg6KrFSTNXKqe+2GKGeW2
-wTmbVeflNkp5H/YxA9K1zmEn5XjKm0S0jH4Wfms6ipPlURVaFwTfnB1s++AnJAWf
-mayaE9BP/pdIY6WtZGgW6aZc32VDMCMKPWyBNyagsJVDmzlakIA5cXBVa7Xqqd3P
-ew8i2feMnQXcqHfDv02CW88CBQDAAAABoxIwEDAOBgNVHQ8BAf8EBAMCAQYwCgYG
-KyQDAwECBQADgYEAOkqkUwdaTCt8wcJLA2zLuOwL5ADHMWLhv6gr5zEF+VckA6qe
-IVLVf8e7fYlRmzQd+5OJcGglCQJLGT+ZplI3Mjnrd4plkoTNKV4iOzBcvJD7K4tn
-XPvs9wCFcC7QU7PLvc1FDsAlr7e4wyefZRDL+wbqNfI7QZTSF1ubLd9AzeQ=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/argena.pem b/src/lib/libssl/src/certs/argena.pem
deleted file mode 100644
index db730e38dd..0000000000
--- a/src/lib/libssl/src/certs/argena.pem
+++ /dev/null
@@ -1,39 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIG0zCCBbugAwIBAgIBADANBgkqhkiG9w0BAQUFADCBzDELMAkGA1UEBhMCQVQx
-EDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTE6MDgGA1UEChMxQVJH
-RSBEQVRFTiAtIEF1c3RyaWFuIFNvY2lldHkgZm9yIERhdGEgUHJvdGVjdGlvbjEl
-MCMGA1UECxMcQS1DRVJUIENlcnRpZmljYXRpb24gU2VydmljZTEYMBYGA1UEAxMP
-QS1DRVJUIEFEVkFOQ0VEMR0wGwYJKoZIhvcNAQkBFg5pbmZvQGEtY2VydC5hdDAe
-Fw0wNDEwMjMxNDE0MTRaFw0xMTEwMjMxNDE0MTRaMIHMMQswCQYDVQQGEwJBVDEQ
-MA4GA1UECBMHQXVzdHJpYTEPMA0GA1UEBxMGVmllbm5hMTowOAYDVQQKEzFBUkdF
-IERBVEVOIC0gQXVzdHJpYW4gU29jaWV0eSBmb3IgRGF0YSBQcm90ZWN0aW9uMSUw
-IwYDVQQLExxBLUNFUlQgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlMRgwFgYDVQQDEw9B
-LUNFUlQgQURWQU5DRUQxHTAbBgkqhkiG9w0BCQEWDmluZm9AYS1jZXJ0LmF0MIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3euXIy+mnf6BYKbK+QH5k679
-tUFqeT8jlZxMew8eNiHuw9KoxWBzL6KksK+5uK7Gatw+sbAYntEGE80P+Jg1hADM
-e+Fr5V0bc6QS3gkVtfUCW/RIvfMM39oxvmqJmOgPnJU7H6+nmLtsq61tv9kVJi/2
-4Y5wXW3odet72sF57EoG6s78w0BUVLNcMngS9bZZzmdG3/d6JbkGgoNF/8DcgCBJ
-W/t0JrcIzyppXIOVtUzzOrrU86zuUgT3Rtkl5kjG7DEHpFb9H0fTOY1v8+gRoaO6
-2gA0PCiysgVZjwgVeYe3KAg11nznyleDv198uK3Dc1oXIGYjJx2FpKWUvAuAEwID
-AQABo4ICvDCCArgwHQYDVR0OBBYEFDd/Pj6ZcWDKJNSRE3nQdCm0qCTYMIH5BgNV
-HSMEgfEwge6AFDd/Pj6ZcWDKJNSRE3nQdCm0qCTYoYHSpIHPMIHMMQswCQYDVQQG
-EwJBVDEQMA4GA1UECBMHQXVzdHJpYTEPMA0GA1UEBxMGVmllbm5hMTowOAYDVQQK
-EzFBUkdFIERBVEVOIC0gQXVzdHJpYW4gU29jaWV0eSBmb3IgRGF0YSBQcm90ZWN0
-aW9uMSUwIwYDVQQLExxBLUNFUlQgQ2VydGlmaWNhdGlvbiBTZXJ2aWNlMRgwFgYD
-VQQDEw9BLUNFUlQgQURWQU5DRUQxHTAbBgkqhkiG9w0BCQEWDmluZm9AYS1jZXJ0
-LmF0ggEAMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgHmMEcGA1UdJQRAMD4G
-CCsGAQUFBwMBBggrBgEFBQcDAgYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEFBQcD
-CAYKKwYBBAGCNwoDBDARBglghkgBhvhCAQEEBAMCAP8wUQYDVR0gBEowSDBGBggq
-KAAYAQEBAzA6MDgGCCsGAQUFBwIBFixodHRwOi8vd3d3LmEtY2VydC5hdC9jZXJ0
-aWZpY2F0ZS1wb2xpY3kuaHRtbDA7BglghkgBhvhCAQgELhYsaHR0cDovL3d3dy5h
-LWNlcnQuYXQvY2VydGlmaWNhdGUtcG9saWN5Lmh0bWwwGQYDVR0RBBIwEIEOaW5m
-b0BhLWNlcnQuYXQwLwYDVR0SBCgwJoEOaW5mb0BhLWNlcnQuYXSGFGh0dHA6Ly93
-d3cuYS1jZXJ0LmF0MEUGA1UdHwQ+MDwwOqA4oDaGNGh0dHBzOi8vc2VjdXJlLmEt
-Y2VydC5hdC9jZ2ktYmluL2EtY2VydC1hZHZhbmNlZC5jZ2kwDQYJKoZIhvcNAQEF
-BQADggEBACX1IvgfdG2rvfv35O48vSEvcVaEdlN8USFBHWz3JRAozgzvaBtwHkjK
-Zwt5l/BWOtjbvHfRjDt7ijlBEcxOOrNC1ffyMHwHrXpvff6YpQ5wnxmIYEQcURiG
-HMqruEX0WkuDNgSKwefsgXs27eeBauHgNGVcTYH1rmHu/ZyLpLxOyJQ2PCzA1DzW
-3rWkIX92ogJ7lTRdWrbxwUL1XGinxnnaQ74+/y0pI9JNEv7ic2tpkweRMpkedaLW
-msC1+orfKTebsg69aMaCx7o6jNONRmR/7TVaPf8/k6g52cHZ9YWjQvup22b5rWxG
-J5r5LZ4vCPmF4+T4lutjUYAa/lGuQTg=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/argeng.pem b/src/lib/libssl/src/certs/argeng.pem
deleted file mode 100644
index 621e30e208..0000000000
--- a/src/lib/libssl/src/certs/argeng.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDwzCCAyygAwIBAgIBADANBgkqhkiG9w0BAQQFADCBmDELMAkGA1UEBhMCQVQx
-EDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAGA1UEChM5QXJn
-ZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBmdWVyIERhdGVu
-c2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVuLmF0MB4XDTAx
-MDIxMjExMzAzMFoXDTA5MDIxMjExMzAzMFowgZgxCzAJBgNVBAYTAkFUMRAwDgYD
-VQQIEwdBdXN0cmlhMQ8wDQYDVQQHEwZWaWVubmExQjBABgNVBAoTOUFyZ2UgRGF0
-ZW4gT2VzdGVycmVpY2hpc2NoZSBHZXNlbGxzY2hhZnQgZnVlciBEYXRlbnNjaHV0
-ejEiMCAGCSqGSIb3DQEJARYTYS1jZXJ0QGFyZ2VkYXRlbi5hdDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAwgsHqoNtmmrJ86+e1I4hOVBaL4kokqKN2IPOIL+1
-XwY8vfOOUfPEdhWpaC0ldt7VYrksgDiUccgH0FROANWK2GkfKMDzjjXHysR04uEb
-Om7Kqjqn0nproOGkFG+QvBZgs+Ws+HXNFJA6V76fU4+JXq4452LSK4Lr5YcBquu3
-NJECAwEAAaOCARkwggEVMB0GA1UdDgQWBBQ0j59zH/G31zRjgK1y2P//tSAWZjCB
-xQYDVR0jBIG9MIG6gBQ0j59zH/G31zRjgK1y2P//tSAWZqGBnqSBmzCBmDELMAkG
-A1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWExDzANBgNVBAcTBlZpZW5uYTFCMEAG
-A1UEChM5QXJnZSBEYXRlbiBPZXN0ZXJyZWljaGlzY2hlIEdlc2VsbHNjaGFmdCBm
-dWVyIERhdGVuc2NodXR6MSIwIAYJKoZIhvcNAQkBFhNhLWNlcnRAYXJnZWRhdGVu
-LmF0ggEAMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMBEGCWCGSAGG+EIBAQQE
-AwICBDANBgkqhkiG9w0BAQQFAAOBgQBFuJYncqMYB6gXQS3eDOI90BEHfFTKy/dV
-AV+K7QdAYikWmqgBheRdPKddJdccPy/Zl/p3ZT7GhDyC5f3wZjcuu8AJ27BNwbCA
-x54dgxgCNcyPm79nY8MRtEdEpoRGdSsFKJemz6hpXM++MWFciyrRWIIA44XB0Gv3
-US0spjsDPQ==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/demo/nortelCA.pem b/src/lib/libssl/src/certs/demo/nortelCA.pem
deleted file mode 100644
index 207f34ab3a..0000000000
--- a/src/lib/libssl/src/certs/demo/nortelCA.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICajCCAdMCBDGA0QUwDQYJKoZIhvcNAQEEBQAwfTELMAkGA1UEBhMCQ2ExDzAN
-BgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmlsaXR5IEFjY2VwdGVkMR8w
-HQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRwwGgYDVQQDExNFbnRydXN0
-IERlbW8gV2ViIENBMB4XDTk2MDQyNjEzMzUwMVoXDTA2MDQyNjEzMzUwMVowfTEL
-MAkGA1UEBhMCQ2ExDzANBgNVBAcTBk5lcGVhbjEeMBwGA1UECxMVTm8gTGlhYmls
-aXR5IEFjY2VwdGVkMR8wHQYDVQQKExZGb3IgRGVtbyBQdXJwb3NlcyBPbmx5MRww
-GgYDVQQDExNFbnRydXN0IERlbW8gV2ViIENBMIGdMA0GCSqGSIb3DQEBAQUAA4GL
-ADCBhwKBgQCaroS7O1DA0hm4IefNYU1cx/nqOmzEnk291d1XqznDeF4wEgakbkCc
-zTKxK791yNpXG5RmngqH7cygDRTHZJ6mfCRn0wGC+AI00F2vYTGqPGRQL1N3lZT0
-YDKFC0SQeMMjFIZ1aeQigroFQnHo0VB3zWIMpNkka8PY9lxHZAmWwQIBAzANBgkq
-hkiG9w0BAQQFAAOBgQBAx0UMVA1s54lMQyXjMX5kj99FJN5itb8bK1Rk+cegPQPF
-cWO9SEWyEjjBjIkjjzAwBkaEszFsNGxemxtXvwjIm1xEUMTVlPEWTs2qnDvAUA9W
-YqhWbhH0toGT36236QAsqCZ76rbTRVSSX2BHyJwJMG2tCRv7kRJ//NIgxj3H4w==
------END CERTIFICATE-----
-
diff --git a/src/lib/libssl/src/certs/demo/timCA.pem b/src/lib/libssl/src/certs/demo/timCA.pem
deleted file mode 100644
index 9c8d5bf9c6..0000000000
--- a/src/lib/libssl/src/certs/demo/timCA.pem
+++ /dev/null
@@ -1,16 +0,0 @@
-Tims test GCI CA
-
------BEGIN CERTIFICATE-----
-MIIB8DCCAZoCAQAwDQYJKoZIhvcNAQEEBQAwgYIxCzAJBgNVBAYTAkFVMRMwEQYD
-VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
-cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2RldmVsb3BtZW50MRkwFwYDVQQDExBD
-cnlwdFNvZnQgRGV2IENBMB4XDTk3MDMyMjEzMzQwNFoXDTk4MDMyMjEzMzQwNFow
-gYIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhC
-cmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxFDASBgNVBAsTC2Rl
-dmVsb3BtZW50MRkwFwYDVQQDExBDcnlwdFNvZnQgRGV2IENBMFwwDQYJKoZIhvcN
-AQEBBQADSwAwSAJBAOAOAqogG5QwAmLhzyO4CoRnx/wVy4NZP4dxJy83O1EnL0rw
-OdsamJKvPOLHgSXo3gDu9uVyvCf/QJmZAmC5ml8CAwEAATANBgkqhkiG9w0BAQQF
-AANBADRRS/GVdd7rAqRW6SdmgLJduOU2yq3avBu99kRqbp9A/dLu6r6jU+eP4oOA
-TfdbFZtAAD2Hx9jUtY3tfdrJOb8= 
------END CERTIFICATE-----
-
diff --git a/src/lib/libssl/src/certs/demo/tjhCA.pem b/src/lib/libssl/src/certs/demo/tjhCA.pem
deleted file mode 100644
index 67bee1b200..0000000000
--- a/src/lib/libssl/src/certs/demo/tjhCA.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICVjCCAgACAQAwDQYJKoZIhvcNAQEEBQAwgbUxCzAJBgNVBAYTAkFVMRMwEQYD
-VQQIEwpRdWVlbnNsYW5kMREwDwYDVQQHEwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5
-cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsTI1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9O
-IEFVVEhPUklUSUVTMTQwMgYDVQQDEytaRVJPIFZBTFVFIENBIC0gREVNT05TVFJB
-VElPTiBQVVJQT1NFUyBPTkxZMB4XDTk3MDQwMzEzMjI1NFoXDTk4MDQwMzEzMjI1
-NFowgbUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNsYW5kMREwDwYDVQQH
-EwhCcmlzYmFuZTEaMBgGA1UEChMRQ3J5cHRTb2Z0IFB0eSBMdGQxLDAqBgNVBAsT
-I1dPUlRITEVTUyBDRVJUSUZJQ0FUSU9OIEFVVEhPUklUSUVTMTQwMgYDVQQDEyta
-RVJPIFZBTFVFIENBIC0gREVNT05TVFJBVElPTiBQVVJQT1NFUyBPTkxZMFwwDQYJ
-KoZIhvcNAQEBBQADSwAwSAJBAOZ7T7yqP/tyspcko3yPY1y0Cm2EmwNvzW4QgVXR
-Fjs3HmJ4xtSpXdo6mwcGezL3Abt/aQXaxv9PU8xt+Jr0OFUCAwEAATANBgkqhkiG
-9w0BAQQFAANBAOQpYmGgyCqCy1OljgJhCqQOu627oVlHzK1L+t9vBaMfn40AVUR4
-WzQVWO31KTgi5vTK1U+3h46fgUWqQ0h+6rU=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/demo/vsigntca.pem b/src/lib/libssl/src/certs/demo/vsigntca.pem
deleted file mode 100644
index 05acf76e66..0000000000
--- a/src/lib/libssl/src/certs/demo/vsigntca.pem
+++ /dev/null
@@ -1,18 +0,0 @@
-subject=/O=VeriSign, Inc/OU=www.verisign.com/repository/TestCPS Incorp. By Ref. Liab. LTD./OU=For VeriSign authorized testing only. No assurances (C)VS1997
-notBefore=Mar  4 00:00:00 1997 GMT
-notAfter=Mar  4 23:59:59 2025 GMT
------BEGIN CERTIFICATE-----
-MIICTTCCAfcCEEdoCqpuXxnoK27q7d58Qc4wDQYJKoZIhvcNAQEEBQAwgakxFjAU
-BgNVBAoTDVZlcmlTaWduLCBJbmMxRzBFBgNVBAsTPnd3dy52ZXJpc2lnbi5jb20v
-cmVwb3NpdG9yeS9UZXN0Q1BTIEluY29ycC4gQnkgUmVmLiBMaWFiLiBMVEQuMUYw
-RAYDVQQLEz1Gb3IgVmVyaVNpZ24gYXV0aG9yaXplZCB0ZXN0aW5nIG9ubHkuIE5v
-IGFzc3VyYW5jZXMgKEMpVlMxOTk3MB4XDTk3MDMwNDAwMDAwMFoXDTI1MDMwNDIz
-NTk1OVowgakxFjAUBgNVBAoTDVZlcmlTaWduLCBJbmMxRzBFBgNVBAsTPnd3dy52
-ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9UZXN0Q1BTIEluY29ycC4gQnkgUmVmLiBM
-aWFiLiBMVEQuMUYwRAYDVQQLEz1Gb3IgVmVyaVNpZ24gYXV0aG9yaXplZCB0ZXN0
-aW5nIG9ubHkuIE5vIGFzc3VyYW5jZXMgKEMpVlMxOTk3MFwwDQYJKoZIhvcNAQEB
-BQADSwAwSAJBAMak6xImJx44jMKcbkACy5/CyMA2fqXK4PlzTtCxRq5tFkDzne7s
-cI8oFK/J+gFZNE3bjidDxf07O3JOYG9RGx8CAwEAATANBgkqhkiG9w0BAQQFAANB
-ADT523tENOKrEheZFpsJx1UUjPrG7TwYc/C4NBHrZI4gZJcKVFIfNulftVS6UMYW
-ToLEMaUojc3DuNXHG21PDG8=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/eng1.pem b/src/lib/libssl/src/certs/eng1.pem
deleted file mode 100644
index 7ed8b1b5e6..0000000000
--- a/src/lib/libssl/src/certs/eng1.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCQ0Ex
-CzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMRgwFgYDVQQKEw9CYW5rRW5n
-aW5lIEluYy4xKTAnBgNVBAsTIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IERpdmlz
-aW9uMRMwEQYDVQQDEwpiYW5rZW5naW5lMSAwHgYJKoZIhvcNAQkBFhFjYUBiYW5r
-ZW5naW5lLmNvbTAeFw05ODAxMDEwMDAwMDBaFw0zODAxMTcwMDAwMDBaMIGoMQsw
-CQYDVQQGEwJDQTELMAkGA1UECBMCT04xEDAOBgNVBAcTB1Rvcm9udG8xGDAWBgNV
-BAoTD0JhbmtFbmdpbmUgSW5jLjEpMCcGA1UECxMgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkgRGl2aXNpb24xEzARBgNVBAMTCmJhbmtlbmdpbmUxIDAeBgkqhkiG9w0B
-CQEWEWNhQGJhbmtlbmdpbmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA14LoTUAl1/hEy+Kh1kLHiBdW2zD3V4IhM7xxTVKsYsIH56nr69ATTIxU
-P36eRzeZ137qt1AxHFjDCidk3m1Ul6l59ProPexdslLLM2npM3f2cteg+toyiYiS
-EJKjyzIu1xF1j9qzGkymSY/4DsXLZNk9FaczxMk/Ooc6Os1M3AverL4VG4rYIb6f
-eR32cIKJ9Q1fGuyKk7ipq1XQfPW8a8TgZdbHbe7U9Gk3iasGMHHvpR9Ep3mGbgdT
-uQ98SBEuIwe1BUCGg/MXpVy48MNXfAMotBgGw4pl9yqSjMni2FB+E9Q9DHFs2RgX
-MqzKuo8zcPxKx2kZ6Arj8+27dw2clQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQBauupHX9EhpC/r57d6b5kkeWvognxIP9//TO4iw3qb
-zIXEkPXmJmwVzlzoKJWqiya+aw19SP0+G6CzsFOBo/9ehmz+hZ8bhYX4MjlWzX5u
-Tnkhz172j9fOBUmrTVPkcRIs6zjCD5PQAGoBPP1/Zdy2N36lZ0U7lg07Opirj/yJ
-PSJeM2j0fwIFAroiVckvdT0BVwB6S/cPaAQGPghbbr1YGSmYrMriSv825ILJUfxz
-rJYunGR9FiY9Ob7+jwJwiZMS4CxSPktutxr/3hOvr1+ALS7IcVakhhA3PuZAJbdH
-FRclR9qMM8aBnBZmf+Uv3K3uhT+UBzzY654U9Yi1JYnA
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/eng2.pem b/src/lib/libssl/src/certs/eng2.pem
deleted file mode 100644
index 73066309b1..0000000000
--- a/src/lib/libssl/src/certs/eng2.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCQ0Ex
-CzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMRgwFgYDVQQKEw9DZXJ0RW5n
-aW5lIEluYy4xKTAnBgNVBAsTIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IERpdmlz
-aW9uMRMwEQYDVQQDEwpjZXJ0ZW5naW5lMSAwHgYJKoZIhvcNAQkBFhFjYUBjZXJ0
-ZW5naW5lLmNvbTAeFw05ODAxMDEwMDAwMDBaFw0zODAxMTcwMDAwMDBaMIGoMQsw
-CQYDVQQGEwJDQTELMAkGA1UECBMCT04xEDAOBgNVBAcTB1Rvcm9udG8xGDAWBgNV
-BAoTD0NlcnRFbmdpbmUgSW5jLjEpMCcGA1UECxMgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkgRGl2aXNpb24xEzARBgNVBAMTCmNlcnRlbmdpbmUxIDAeBgkqhkiG9w0B
-CQEWEWNhQGNlcnRlbmdpbmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA7aTXURShaeVt9u/dP3Q2dVib3jTCZvEyc6yfpGgaYWewXWuP4HOSfI4h
-GZblbpl+dzJc6RjhR+pguIRtbT5FJB8SJGjRqoujBEOQOxtVtc2fjM9Dqh0iOvMW
-WS6buxHG55GVrHAQaO5HXEScKQBa9ZyNmpSXPTEBrDMej1OAGOkc524/TZrgFPF4
-AiJLLkxCcP8NuzUKlW3WzNMSSoCtjkUKy4wjSLlAWCFM0T9Df6/+Z8ZUQTzHoKCD
-ncH5Qnynd7DlOwKQ2JwwxRhYGiGVTUN0GUq7qA11kW3+vnbFesKQXoF6o2PVx9s2
-YXviI2NXXUjZ0pVnsnFCc45Pm8XojwIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQBP/aHOKJ00Akzc9HWM1X30hlWZFBaQi4pqD4Uhk8+p
-KzzwFP5DRLBOz8TYBbtdXrS6hxVMr2sqWmhVkuyepWhHZazKGyHY/y0FbOXsewAV
-1QxxSyx7ve89pCKv4/w0rQcP916iHc8Y/TCpmz7eITa3GId+8H/XTaBi8GBp9X9O
-w8m25FmEB1NT+eJwefvfdKowjy4tSorKdW/eJspxNuTSRGmUy8G71W5dYvgpAlx6
-mdnHyzxEGvRYNNI2bS0ifXgbEFNWqSas9q34ea5KOpkJu8T/KyXfSb6rPOsBSb0t
-wMowwGtCVH2C4Lw/8zo0EjhMpTOsPaub408PrZ+NQ2bl
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/eng3.pem b/src/lib/libssl/src/certs/eng3.pem
deleted file mode 100644
index 28bcce2dfd..0000000000
--- a/src/lib/libssl/src/certs/eng3.pem
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF3TCCA8WgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCQ0Ex
-CzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMRgwFgYDVQQKEw9Gb3J0RW5n
-aW5lIEluYy4xKTAnBgNVBAsTIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IERpdmlz
-aW9uMRMwEQYDVQQDEwpmb3J0ZW5naW5lMSAwHgYJKoZIhvcNAQkBFhFjYUBmb3J0
-ZW5naW5lLmNvbTAeFw05ODAxMDEwMDAwMDBaFw0zODAxMTcwMDAwMDBaMIGoMQsw
-CQYDVQQGEwJDQTELMAkGA1UECBMCT04xEDAOBgNVBAcTB1Rvcm9udG8xGDAWBgNV
-BAoTD0ZvcnRFbmdpbmUgSW5jLjEpMCcGA1UECxMgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkgRGl2aXNpb24xEzARBgNVBAMTCmZvcnRlbmdpbmUxIDAeBgkqhkiG9w0B
-CQEWEWNhQGZvcnRlbmdpbmUuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAyr7GbpwDxx1v3EYbo0gcO+ligEhlDqG2e7u/AbWGoVAqc8+q6auUJUtz
-4i7oh0yNadu1o9kpXW+znkgO0zlrgjGskqqMO1ooppzTJdFy/P8gR6x1Iuv3kWtX
-OuzwPPEjv09LWlhyJsN+oU4ztTVf07I0Q9zYupcoDQ58XKRheI9KdDB2DYSmxywA
-WSLQwIeG0Qa7gvokeQlpkgkEC7viEecJ3752KXBJHnh7As51mxnlpmG6sDy67Eli
-HDw5tHETRqbtnscGBjskGQBqR5xt7+QnnthZrN8HJHDoa9zgGephwizhkL44lXLF
-YK9W5XhFbblw2c+mAcHkokRiwD7CPeIoyD2a/Jcw3n5hegKTlNhd4BFGVF6JR7gF
-OFk2QfHXit5uthsij9Xhl7WAgQUqLgggD9MphqPf4nY66OZUJV9ZsmB+Qfp8UizB
-0WAOegactKVyRqHtRa+KIEXQXNtZgjcmMk9CYkP0nIbKtgKXaH6+9VMHNOryCnFE
-7pSsuPUkypncFWCHGSeiFO3w4w4J4csltxBADQzxfRu5KZnlToQN7bVpI/Q31tVX
-E5bjrJcq6Oj/OTqZ3ID+OqbkUdAg0ggjRKcTgxnLHd/AbMzJ6PsclDDf7cLs0WSl
-xMxQR/z5bNST1rNtT9rsiv2TOhfvCBxO9AOjBioO8PLO032HTNECAwEAAaMQMA4w
-DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAgEAVyBpPWfT2VOyvVpslGKx
-8h0+CWP8cilygGRtZJ5dAJzc//1REAHdvK+TgZ4Foz3dqHhXI+RNN0FpzuWaYMjW
-ZTS0kAmcOQuGY1Oo4PGlPHI21pNz29oFDTJr0ZmLBJ4JKVsE2soJg55jdk9MZHA7
-K//7HH9RsmrWZOE5DZDlrxp6+naixhMwnlPKKisIy9GNZUPqGdUWABMdB/BUVVNl
-NU5TtWpIXUClMd8a+eoKcItBeYXowkHOBpinPkDX3clFDIUfWiw0Ro08s8SrrFqR
-8Szwbrj52Xv1RM56oGqCjnkvJctxihODV7NcpxoAFjIZokDom0q6zPrrTUsLFQov
-Plovc3w5hmALiDMshaTvE1nm3Psn4yQ+FlRE8epTZrQiIGypZkZC6lcz0mYawueW
-cThYWGFhVG4ktQzOjjNRsNxopW+W7cF1zQTxiWUDnxIKSj7gtdQ2jiubxEEhfVag
-r8DMtAccNVTZVURpGi56TptOOuotrTqqC+2GviW4hlxvdvmuQN0OlXlUwzz2Trxc
-FamNnuA54lZw/8arLtxsFmHrcnPw53+1spumLD0S5UkxHNu40h6LIVpZz3H+0rLz
-uFofTfiyMjcfK2AyHQTgUCbsrvgNuLDQUbyFGVchdFUkhztX3DhEVnxnnrpY4BVj
-QdTqWIvw7lGlSuDCjxEQAOc=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/eng4.pem b/src/lib/libssl/src/certs/eng4.pem
deleted file mode 100644
index 9a7b156226..0000000000
--- a/src/lib/libssl/src/certs/eng4.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBqDELMAkGA1UEBhMCQ0Ex
-CzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMRgwFgYDVQQKEw9NYWlsRW5n
-aW5lIEluYy4xKTAnBgNVBAsTIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IERpdmlz
-aW9uMRMwEQYDVQQDEwptYWlsZW5naW5lMSAwHgYJKoZIhvcNAQkBFhFjYUBtYWls
-ZW5naW5lLmNvbTAeFw05ODAxMDEwMDAwMDBaFw0zODAxMTcwMDAwMDBaMIGoMQsw
-CQYDVQQGEwJDQTELMAkGA1UECBMCT04xEDAOBgNVBAcTB1Rvcm9udG8xGDAWBgNV
-BAoTD01haWxFbmdpbmUgSW5jLjEpMCcGA1UECxMgQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkgRGl2aXNpb24xEzARBgNVBAMTCm1haWxlbmdpbmUxIDAeBgkqhkiG9w0B
-CQEWEWNhQG1haWxlbmdpbmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAqXmfsU+lx+NFmn6tN17RTOyaddHqLnr/3rzEDIyT9TN+tF9TG7jmK7lJ
-Jrj5arQ3nTFaLF8JuND2U1z/cLPw6/TX+1tE3v3CNUDSjaisyUDiUyp3TE8hMMMz
-zfZQn0JsGgNhhWxqyzjhRQGtKL4+xtn8VsF/8zGgZYke7nlmVKz/FslDFTnNoodL
-BAEGiu9JQS9qqpbSs20NdZ6LXPL2A4iTjnsNFBW3jIMVIn/JVVyaycU7ue2oFviD
-vLNpkVZcR7A+jjIdIumOc5VSF0y7y74cQC5YwkR2mLK7UBYDK6NCY3ta/C4M8NsM
-0FpmvRl0+A1ivZtVwqI98dxDtp7HeQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQAjfNn5BCzxylBDakFQGWKE/P43PRibMOEzfd7+DzbY
-WIekoz3i00DwoH3b6j4gwlDJRAOq4dF6/Pt/uBOHDo/op+ef+9ErmKPd+ehXN9h3
-7QbccTgz7DtVwA4iRlDRLru+JuXzT+OsCHuFZMOLJ+KD2JAGh3W68JjdcLkrlcpt
-AU0wc5aOHPPfEBdIah8y8QtNzXRVzoBt8zzvgCARkXxTS2u/9QaXR1hML0JtDgQS
-SdZ6Kd8SN6yzqxD+buYD5sOfJmjBF/n3lqFHNMHnnGXy2TAXZtIAWzffU3A0cGPB
-N6FZ026a86HbF1X4k+xszhbJu/ikczyuWnCJIg3fTYSD
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/eng5.pem b/src/lib/libssl/src/certs/eng5.pem
deleted file mode 100644
index 3416ccad24..0000000000
--- a/src/lib/libssl/src/certs/eng5.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID6TCCAtGgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UEBhMCQ0Ex
-CzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMRowGAYDVQQKExFUcmFkZXJF
-bmdpbmUgSW5jLjEpMCcGA1UECxMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRGl2
-aXNpb24xFTATBgNVBAMTDHRyYWRlcmVuZ2luZTEiMCAGCSqGSIb3DQEJARYTY2FA
-dHJhZGVyZW5naW5lLmNvbTAeFw05ODAxMDEwMDAwMDBaFw0zODAxMTcwMDAwMDBa
-MIGuMQswCQYDVQQGEwJDQTELMAkGA1UECBMCT04xEDAOBgNVBAcTB1Rvcm9udG8x
-GjAYBgNVBAoTEVRyYWRlckVuZ2luZSBJbmMuMSkwJwYDVQQLEyBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSBEaXZpc2lvbjEVMBMGA1UEAxMMdHJhZGVyZW5naW5lMSIw
-IAYJKoZIhvcNAQkBFhNjYUB0cmFkZXJlbmdpbmUuY29tMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAzyX5QE+5SN+zgNn1v3zp9HmP4hQOWW8WuEVItZVP
-9bt/xj5NeJd1kyPL/SqnF2qHcL3o/74r0Ga55aKHniwKYgQTlp5ELGfQ568QQeN9
-xNIHtUXeStI9zCNZyZC+4YqObdMR/ivKA/WsLfUVMl2lV5JzJJz1BOE0gKEYiEyz
-gIq5oLzkP/mOXoHRvWSZD2D0eHYIO7ovV2epVFK7g7p+dC4QoeIUEli+GF/Myg88
-dV/qmi+Sybck2RLPXa8Nh27/ETVQ7kE1Eafmx7EyCqIhG+5lwJAy3HwHUBwAYuzj
-iuZz5lD8aQmr8SKuvy3eOH9SVN5wh3YBlrNGwTStkESVLwIDAQABoxAwDjAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAWOPAUhZd3x9EQiFJcuxFTMd9q
-axgcriCzJsM6D96sYGko9xTeLhX/lr1bliVYI5AlupoLXAdMzGHJkOgaTirKjQXr
-F9nymDdUWKe3TmwGob5016nQlH7qRKvGO3hka0rOGRK2U/2JT/4Qp8iH/DFi6cyM
-uP0q8n64SAkxZXLzUuFQXqf7U/SNjzb9XJQEIAdjp7eYd3Qb4jDsDcX0FrKMF1aV
-r0dCDnS7am7WTXPYCDGdSkPgEHEtLYIYH3lZp5sKdVZ9wl4F0WNFkRWRUr7AXPjw
-50uLmUNmKCd8JZLMGA1TRNSTi7U9EcrWt0OkMWm74T2WVnAgNsDv2WrWsGfj
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/expired/ICE-CA.pem b/src/lib/libssl/src/certs/expired/ICE-CA.pem
deleted file mode 100644
index 75652366c2..0000000000
--- a/src/lib/libssl/src/certs/expired/ICE-CA.pem
+++ /dev/null
@@ -1,59 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: O=European ICE-TEL project, OU=V3-Certification Authority
-        Validity
-            Not Before: Apr  2 17:35:53 1997 GMT
-            Not After : Apr  2 17:35:53 1998 GMT
-        Subject: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt
-        Subject Public Key Info:
-            Public Key Algorithm: rsa
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:82:75:ba:f6:d1:60:b5:f9:15:b3:6a:dd:29:8f:
-                    8b:a4:6f:1a:88:e0:50:43:40:0b:79:41:d5:d3:16:
-                    44:7d:74:65:17:42:06:52:0b:e9:50:c8:10:cd:24:
-                    e2:ae:8d:22:30:73:e6:b4:b7:93:1f:e5:6e:a2:ae:
-                    49:11:a5:c9:45
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Authority Key Identifier: 
-                0.........z.."p......e..
-            X509v3 Subject Key Identifier: 
-                ..~r..:..B.44fu......3
-            X509v3 Key Usage: critical
-                ....
-            X509v3 Certificate Policies: critical
-                0.0...*...
-            X509v3 Subject Alternative Name: 
-                0!..secude-support@darmstadt.gmd.de
-            X509v3 Issuer Alternative Name: 
-                0I..ice-tel-ca@darmstadt.gmd.de.*http://www.darmstadt.gmd.de/ice-tel/euroca
-            X509v3 Basic Constraints: critical
-                0....
-            X509v3 CRL Distribution Points: 
-                0200...,.*http://www.darmstadt.gmd.de/ice-tel/euroca
-    Signature Algorithm: md5WithRSAEncryption
-        17:a2:88:b7:99:5a:05:41:e4:13:34:67:e6:1f:3e:26:ec:4b:
-        69:f9:3e:28:22:be:9d:1c:ab:41:6f:0c:00:85:fe:45:74:f6:
-        98:f0:ce:9b:65:53:4a:50:42:c7:d4:92:bd:d7:a2:a8:3d:98:
-        88:73:cd:60:28:79:a3:fc:48:7a
------BEGIN CERTIFICATE-----
-MIICzDCCAnagAwIBAgIBATANBgkqhkiG9w0BAQQFADBIMSEwHwYDVQQKExhFdXJv
-cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MB4XDTk3MDQwMjE3MzU1M1oXDTk4MDQwMjE3MzU1M1owXDEhMB8G
-A1UEChMYRXVyb3BlYW4gSUNFLVRFTCBwcm9qZWN0MSMwIQYDVQQLExpWMy1DZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTESMBAGA1UEBxMJRGFybXN0YWR0MFkwCgYEVQgB
-AQICAgADSwAwSAJBAIJ1uvbRYLX5FbNq3SmPi6RvGojgUENAC3lB1dMWRH10ZRdC
-BlIL6VDIEM0k4q6NIjBz5rS3kx/lbqKuSRGlyUUCAwEAAaOCATgwggE0MB8GA1Ud
-IwQYMBaAFIr3yNUOx3ro1yJw4AuJ1bbsZbzPMB0GA1UdDgQWBBR+cvL4OoacQog0
-NGZ1w9T80aIRMzAOBgNVHQ8BAf8EBAMCAfYwFAYDVR0gAQH/BAowCDAGBgQqAwQF
-MCoGA1UdEQQjMCGBH3NlY3VkZS1zdXBwb3J0QGRhcm1zdGFkdC5nbWQuZGUwUgYD
-VR0SBEswSYEbaWNlLXRlbC1jYUBkYXJtc3RhZHQuZ21kLmRlhipodHRwOi8vd3d3
-LmRhcm1zdGFkdC5nbWQuZGUvaWNlLXRlbC9ldXJvY2EwDwYDVR0TAQH/BAUwAwEB
-/zA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vd3d3LmRhcm1zdGFkdC5nbWQuZGUv
-aWNlLXRlbC9ldXJvY2EwDQYJKoZIhvcNAQEEBQADQQAXooi3mVoFQeQTNGfmHz4m
-7Etp+T4oIr6dHKtBbwwAhf5FdPaY8M6bZVNKUELH1JK916KoPZiIc81gKHmj/Eh6
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/expired/ICE-root.pem b/src/lib/libssl/src/certs/expired/ICE-root.pem
deleted file mode 100644
index fa991599c9..0000000000
--- a/src/lib/libssl/src/certs/expired/ICE-root.pem
+++ /dev/null
@@ -1,48 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 0 (0x0)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: O=European ICE-TEL project, OU=V3-Certification Authority
-        Validity
-            Not Before: Apr  2 17:33:36 1997 GMT
-            Not After : Apr  2 17:33:36 1998 GMT
-        Subject: O=European ICE-TEL project, OU=V3-Certification Authority
-        Subject Public Key Info:
-            Public Key Algorithm: rsa
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:80:3e:eb:ae:47:a9:fe:10:54:0b:81:8b:9c:2b:
-                    82:ab:3a:61:36:65:8b:f3:73:9f:ac:ac:7a:15:a7:
-                    13:8f:b4:c4:ba:a3:0f:bc:a5:58:8d:cc:b1:93:31:
-                    9e:81:9e:8c:19:61:86:fa:52:73:54:d1:97:76:22:
-                    e7:c7:9f:41:cd
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                ........z.."p......e..
-            X509v3 Key Usage: critical
-                ....
-            X509v3 Subject Alternative Name: 
-                0I.*http://www.darmstadt.gmd.de/ice-tel/euroca..ice-tel-ca@darmstadt.gmd.de
-            X509v3 Basic Constraints: critical
-                0....
-    Signature Algorithm: md5WithRSAEncryption
-        76:69:61:db:b7:cf:8b:06:9e:d8:8c:96:53:d2:4d:a8:23:a6:
-        03:44:e8:8f:24:a5:c0:84:a8:4b:77:d4:2d:2b:7d:37:91:67:
-        f2:2c:ce:02:31:4c:6b:cc:ce:f2:68:a6:11:11:ab:7d:88:b8:
-        7e:22:9f:25:06:60:bd:79:30:3d
------BEGIN CERTIFICATE-----
-MIICFjCCAcCgAwIBAgIBADANBgkqhkiG9w0BAQQFADBIMSEwHwYDVQQKExhFdXJv
-cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MB4XDTk3MDQwMjE3MzMzNloXDTk4MDQwMjE3MzMzNlowSDEhMB8G
-A1UEChMYRXVyb3BlYW4gSUNFLVRFTCBwcm9qZWN0MSMwIQYDVQQLExpWMy1DZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTBZMAoGBFUIAQECAgIAA0sAMEgCQQCAPuuuR6n+
-EFQLgYucK4KrOmE2ZYvzc5+srHoVpxOPtMS6ow+8pViNzLGTMZ6BnowZYYb6UnNU
-0Zd2IufHn0HNAgMBAAGjgZcwgZQwHQYDVR0OBBYEFIr3yNUOx3ro1yJw4AuJ1bbs
-ZbzPMA4GA1UdDwEB/wQEAwIB9jBSBgNVHREESzBJhipodHRwOi8vd3d3LmRhcm1z
-dGFkdC5nbWQuZGUvaWNlLXRlbC9ldXJvY2GBG2ljZS10ZWwtY2FAZGFybXN0YWR0
-LmdtZC5kZTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBAUAA0EAdmlh27fP
-iwae2IyWU9JNqCOmA0TojySlwISoS3fULSt9N5Fn8izOAjFMa8zO8mimERGrfYi4
-fiKfJQZgvXkwPQ==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/expired/ICE-user.pem b/src/lib/libssl/src/certs/expired/ICE-user.pem
deleted file mode 100644
index 28065fd37d..0000000000
--- a/src/lib/libssl/src/certs/expired/ICE-user.pem
+++ /dev/null
@@ -1,63 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt
-        Validity
-            Not Before: Apr  2 17:35:59 1997 GMT
-            Not After : Apr  2 17:35:59 1998 GMT
-        Subject: O=European ICE-TEL project, OU=V3-Certification Authority, L=Darmstadt, CN=USER
-        Subject Public Key Info:
-            Public Key Algorithm: rsa
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:a8:a8:53:63:49:1b:93:c3:c3:0b:6c:88:11:55:
-                    de:7e:6a:e2:f9:52:a0:dc:69:25:c4:c8:bf:55:e1:
-                    31:a8:ce:e4:a9:29:85:99:8a:15:9a:de:f6:2f:e1:
-                    b4:50:5f:5e:04:75:a6:f4:76:dc:3c:0e:39:dc:3a:
-                    be:3e:a4:61:8b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Authority Key Identifier: 
-                0...~r..:..B.44fu......3
-            X509v3 Subject Key Identifier: 
-                ...... .*...1.*.......
-            X509v3 Key Usage: critical
-                ....
-            X509v3 Certificate Policies: critical
-                0.0...*...0.......
-            X509v3 Subject Alternative Name: 
-                0:..user@darmstadt.gmd.de.!http://www.darmstadt.gmd.de/~user
-            X509v3 Issuer Alternative Name: 
-                0....gmdca@gmd.de..http://www.gmd.de..saturn.darmstadt.gmd.de.\1!0...U.
-..European ICE-TEL project1#0!..U....V3-Certification Authority1.0...U....Darmstadt..141.12.62.26
-            X509v3 Basic Constraints: critical
-                0.
-            X509v3 CRL Distribution Points: 
-                0.0.......gmdca@gmd.de
-    Signature Algorithm: md5WithRSAEncryption
-        69:0c:e1:b7:a7:f2:d8:fb:e8:69:c0:13:cd:37:ad:21:06:22:
-        4d:e8:c6:db:f1:04:0b:b7:e0:b3:d6:0c:81:03:ce:c3:6a:3e:
-        c7:e7:24:24:a4:92:64:c2:83:83:06:42:53:0e:6f:09:1e:84:
-        9a:f7:6f:63:9b:94:99:83:d6:a4
------BEGIN CERTIFICATE-----
-MIIDTzCCAvmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBcMSEwHwYDVQQKExhFdXJv
-cGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24g
-QXV0aG9yaXR5MRIwEAYDVQQHEwlEYXJtc3RhZHQwHhcNOTcwNDAyMTczNTU5WhcN
-OTgwNDAyMTczNTU5WjBrMSEwHwYDVQQKExhFdXJvcGVhbiBJQ0UtVEVMIHByb2pl
-Y3QxIzAhBgNVBAsTGlYzLUNlcnRpZmljYXRpb24gQXV0aG9yaXR5MRIwEAYDVQQH
-EwlEYXJtc3RhZHQxDTALBgNVBAMTBFVTRVIwWTAKBgRVCAEBAgICAANLADBIAkEA
-qKhTY0kbk8PDC2yIEVXefmri+VKg3GklxMi/VeExqM7kqSmFmYoVmt72L+G0UF9e
-BHWm9HbcPA453Dq+PqRhiwIDAQABo4IBmDCCAZQwHwYDVR0jBBgwFoAUfnLy+DqG
-nEKINDRmdcPU/NGiETMwHQYDVR0OBBYEFJfc4B8gjSoRmLUx4Sq/ucIYiMrPMA4G
-A1UdDwEB/wQEAwIB8DAcBgNVHSABAf8EEjAQMAYGBCoDBAUwBgYECQgHBjBDBgNV
-HREEPDA6gRV1c2VyQGRhcm1zdGFkdC5nbWQuZGWGIWh0dHA6Ly93d3cuZGFybXN0
-YWR0LmdtZC5kZS9+dXNlcjCBsQYDVR0SBIGpMIGmgQxnbWRjYUBnbWQuZGWGEWh0
-dHA6Ly93d3cuZ21kLmRlghdzYXR1cm4uZGFybXN0YWR0LmdtZC5kZaRcMSEwHwYD
-VQQKExhFdXJvcGVhbiBJQ0UtVEVMIHByb2plY3QxIzAhBgNVBAsTGlYzLUNlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MRIwEAYDVQQHEwlEYXJtc3RhZHSHDDE0MS4xMi42
-Mi4yNjAMBgNVHRMBAf8EAjAAMB0GA1UdHwQWMBQwEqAQoA6BDGdtZGNhQGdtZC5k
-ZTANBgkqhkiG9w0BAQQFAANBAGkM4ben8tj76GnAE803rSEGIk3oxtvxBAu34LPW
-DIEDzsNqPsfnJCSkkmTCg4MGQlMObwkehJr3b2OblJmD1qQ=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/expired/RegTP-4R.pem b/src/lib/libssl/src/certs/expired/RegTP-4R.pem
deleted file mode 100644
index 6f2c6abccd..0000000000
--- a/src/lib/libssl/src/certs/expired/RegTP-4R.pem
+++ /dev/null
@@ -1,19 +0,0 @@
-issuer= CN=4R-CA 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
-notBefore=Jan 21 16:04:53 1999 GMT
-notAfter=Jan 21 16:04:53 2004 GMT
-subject= CN=4R-CA 1:PN+0.2.262.1.10.7.20=#130131,O=Regulierungsbeh\C3\88orde f\C3\88ur Telekommunikation und Post,C=DE
------BEGIN CERTIFICATE-----
-MIICZzCCAdOgAwIBAgIEOwVn1DAKBgYrJAMDAQIFADBvMQswCQYDVQQGEwJERTE9
-MDsGA1UEChQ0UmVndWxpZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWth
-dGlvbiB1bmQgUG9zdDEhMAwGBwKCBgEKBxQTATEwEQYDVQQDFAo0Ui1DQSAxOlBO
-MCIYDzE5OTkwMTIxMTYwNDUzWhgPMjAwNDAxMjExNjA0NTNaMG8xCzAJBgNVBAYT
-AkRFMT0wOwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21t
-dW5pa2F0aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjRSLUNB
-IDE6UE4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGAjzHbq2asUlqeWbXTQHso
-aVF6YIPVH3c/B2cbuy9HJ/lnE6x0asOzM2DGDqi47xkdAxPc0LZ0fxO87rkmz7xs
-jJObnVrMXpyUSDSp5Y0wqKJdsFdr6mGFOQZteIti8AJnr8xMkwnWVyuOlEXsFe1h
-5gxwQXrOcPinE6qu1t/3PmECBMAAAAGjEjAQMA4GA1UdDwEB/wQEAwIBBjAKBgYr
-JAMDAQIFAAOBgQA+RdocBmA2VV9E5aKPBcp01tdZAvvW9Tve3docArVKR/4/yvSX
-Z+wvzzk+uu4qBp49HN3nqPYMrzbTmjBFu4ce5fkZ7dHF0W1sSBL0rox5z36Aq2re
-JjfEOEmSnNe0+opuh4FSVOssXblXTE8lEQU0FhhItgDx2ADnWZibaxLG4w==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/expired/factory.pem b/src/lib/libssl/src/certs/expired/factory.pem
deleted file mode 100644
index 8e28b391b2..0000000000
--- a/src/lib/libssl/src/certs/expired/factory.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------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-----
diff --git a/src/lib/libssl/src/certs/expired/rsa-cca.pem b/src/lib/libssl/src/certs/expired/rsa-cca.pem
deleted file mode 100644
index 69f5c1c84c..0000000000
--- a/src/lib/libssl/src/certs/expired/rsa-cca.pem
+++ /dev/null
@@ -1,19 +0,0 @@
-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-----
diff --git a/src/lib/libssl/src/certs/expired/rsa-ssca.pem b/src/lib/libssl/src/certs/expired/rsa-ssca.pem
deleted file mode 100644
index c9403212d1..0000000000
--- a/src/lib/libssl/src/certs/expired/rsa-ssca.pem
+++ /dev/null
@@ -1,19 +0,0 @@
-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-----
diff --git a/src/lib/libssl/src/certs/expired/vsign2.pem b/src/lib/libssl/src/certs/expired/vsign2.pem
deleted file mode 100644
index d8bdd8c812..0000000000
--- a/src/lib/libssl/src/certs/expired/vsign2.pem
+++ /dev/null
@@ -1,18 +0,0 @@
-subject=/C=US/O=VeriSign, Inc./OU=Class 2 Public Primary Certification Authority
-notBefore=Jan 29 00:00:00 1996 GMT
-notAfter=Jan  7 23:59:59 2004 GMT
------BEGIN CERTIFICATE-----
-MIICPTCCAaYCEQC6WslMBTuS1qe2307QU5INMA0GCSqGSIb3DQEBAgUAMF8xCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xh
-c3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05
-NjAxMjkwMDAwMDBaFw0wNDAxMDcyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYD
-VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMiBQdWJsaWMgUHJp
-bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEAtlqLow1qI4OAa885h/QhEzMGTCWi7VUSl8WngLn6g8EgoPovFQ18
-oWBrfnks+gYPOq72G2+x0v8vKFJfg31LxHq3+GYfgFT8t8KOWUoUV0bRmpO+QZED
-uxWAk1zr58wIbD8+s0r8/0tsI9VQgiZEGY4jw3HqGSRHBJ51v8imAB8CAwEAATAN
-BgkqhkiG9w0BAQIFAAOBgQC2AB+TV6QHp0DOZUA/VV7t7/pUSaUw1iF8YYfug5ML
-v7Qz8pisnwa/TqjOFIFMywROWMPPX+5815pvy0GKt3+BuP+EYcYnQ2UdDOyxAArd
-G6S7x3ggKLKi3TaVLuFUT79guXdoEZkj6OpS6KoATmdOu5C1RZtG644W78QzWzM9
-1Q==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/expired/vsign3.pem b/src/lib/libssl/src/certs/expired/vsign3.pem
deleted file mode 100644
index aa5bb4c1f3..0000000000
--- a/src/lib/libssl/src/certs/expired/vsign3.pem
+++ /dev/null
@@ -1,18 +0,0 @@
-subject=/C=US/O=VeriSign, Inc./OU=Class 3 Public Primary Certification Authority
-notBefore=Jan 29 00:00:00 1996 GMT
-notAfter=Jan  7 23:59:59 2004 GMT
------BEGIN CERTIFICATE-----
-MIICPTCCAaYCEQDknv3zOugOz6URPhmkJAIyMA0GCSqGSIb3DQEBAgUAMF8xCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xh
-c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05
-NjAxMjkwMDAwMDBaFw0wNDAxMDcyMzU5NTlaMF8xCzAJBgNVBAYTAlVTMRcwFQYD
-VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMgUHJp
-bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOB
-jQAwgYkCgYEAyVxZnvIbigEUtBDfBEDb41evakVAj4QMC9Ez2dkRz+4CWB8l9yqo
-RAWq7AMfeH+ek7maAKojfdashaJjRcdyJ8z0TMZ1cdI5709C8HXfCpDGjiBvmA/4
-rCNfcCk2pMmG57GaIMtTpYXnPb59mv4kRTPcdhXtD6JxZExlLoFoRacCAwEAATAN
-BgkqhkiG9w0BAQIFAAOBgQBhcOwvP579K+ZoVCGwZ3kIDCCWMYoNer62Jt95LCJp
-STbjl3diYaIy13pUITa6Ask05yXaRDWw0lyAXbOU+Pms7qRgdSoflUkjsUp89LNH
-ciFbfperVKxi513srpvSybIk+4Kt6WcVS7qqpvCXoPawl1cAyAw8CaCCBLpB2veZ
-pA==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/thawteCb.pem b/src/lib/libssl/src/certs/thawteCb.pem
deleted file mode 100644
index 27df192f0d..0000000000
--- a/src/lib/libssl/src/certs/thawteCb.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
-MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
-MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
-dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
-cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
-DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
-yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
-L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
-EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
-7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
-QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
-qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/thawteCp.pem b/src/lib/libssl/src/certs/thawteCp.pem
deleted file mode 100644
index 51285e33c2..0000000000
--- a/src/lib/libssl/src/certs/thawteCp.pem
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
-dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
-MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
-MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
-A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
-b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
-cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
-bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
-VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
-ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
-uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
-9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
-hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
-pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/vsign1.pem b/src/lib/libssl/src/certs/vsign1.pem
deleted file mode 100644
index 277894d1ff..0000000000
--- a/src/lib/libssl/src/certs/vsign1.pem
+++ /dev/null
@@ -1,17 +0,0 @@
-subject=/C=US/O=VeriSign, Inc./OU=Class 1 Public Primary Certification Authority
-notBefore=Jan 29 00:00:00 1996 GMT
-notAfter=Jan  7 23:59:59 2020 GMT
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEDJQM89Q0VbzXIGtZVxPyCUwDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTIwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAxIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDlGb9to1ZhLZlIcfZn3rmN67eehoAKkQ76OCWvRoiC5XOooJskXQ0f
-zGVuDLDQVoQYh5oGmxChc9+0WDlrbsH2FdWoqD+qEgaNMax/sDTXjzRniAnNFBHi
-TkVWaR94AoDa3EeRKbs2yWNcxeDXLYd7obcysHswuiovMaruo2fa2wIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBAEtEZmBoZOSYG/OwcuaViXzde7OVwB0u2NgZ0C00PcZQ
-mhCGjKo/O6gE/DdSlcPZydvN8oYGxLEb8IKIMEKOF1AcZHq4PplJdJf8rAJD+5YM
-VgQlDHx8h50kp9jwMim1pN9dokzFFjKoQvZFprY2ueC/ZTaTwtLXa9zeWdaiNfhF
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/vsign3.pem b/src/lib/libssl/src/certs/vsign3.pem
deleted file mode 100644
index 4b8c0251cb..0000000000
--- a/src/lib/libssl/src/certs/vsign3.pem
+++ /dev/null
@@ -1,17 +0,0 @@
-subject=/C=US/O=VeriSign, Inc./OU=Class 3 Public Primary Certification Authority
-notBefore=Jan 29 00:00:00 1996 GMT
-notAfter=Aug  1 23:59:59 2028 GMT
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/vsignss.pem b/src/lib/libssl/src/certs/vsignss.pem
deleted file mode 100644
index 5de48bfcf9..0000000000
--- a/src/lib/libssl/src/certs/vsignss.pem
+++ /dev/null
@@ -1,17 +0,0 @@
-subject=/C=US/O=RSA Data Security, Inc./OU=Secure Server Certification Authority
-notBefore=Nov  9 00:00:00 1994 GMT
-notAfter=Jan  7 23:59:59 2010 GMT
------BEGIN CERTIFICATE-----
-MIICNDCCAaECEAKtZn5ORf5eV288mBle3cAwDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxIDAeBgNVBAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYD
-VQQLEyVTZWN1cmUgU2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk0
-MTEwOTAwMDAwMFoXDTEwMDEwNzIzNTk1OVowXzELMAkGA1UEBhMCVVMxIDAeBgNV
-BAoTF1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2Vy
-dmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGbMA0GCSqGSIb3DQEBAQUAA4GJ
-ADCBhQJ+AJLOesGugz5aqomDV6wlAXYMra6OLDfO6zV4ZFQD5YRAUcm/jwjiioII
-0haGN1XpsSECrXZogZoFokvJSyVmIlZsiAeP94FZbYQHZXATcXY+m3dM41CJVphI
-uR2nKRoTLkoRWZweFdVJVCxzOmmCsZc5nG1wZ0jl3S3WyB57AgMBAAEwDQYJKoZI
-hvcNAQECBQADfgBl3X7hsuyw4jrg7HFGmhkRuNPHoLQDQCYCPgmc4RKz0Vr2N6W3
-YQO2WxZpO8ZECAyIUwxrl0nHPjXcbLm7qt9cuzovk2C2qUtN8iD3zV9/ZHuO3ABc
-1/p3yjkWWW8O6tO1g39NTUJWdrTJXwT4OPjr0l91X817/OWOgHz8UA==
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/certs/wellsfgo.pem b/src/lib/libssl/src/certs/wellsfgo.pem
deleted file mode 100644
index 2ba88cdda7..0000000000
--- a/src/lib/libssl/src/certs/wellsfgo.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
-VVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9v
-dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDAxMDExMTY0MTI4WhcNMjEwMTE0
-MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSww
-KgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0G
-A1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n13
-5zHCLielTWi5MbqNQ1mXx3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHE
-SxP9cMIlrCL1dQu3U+SlK93OvRw6esP3E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4O
-JgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5OEL8pahbSCOz6+MlsoCu
-ltQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4jsNtlAHCE
-AQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMB
-AAGjYTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcB
-CzAyMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRw
-b2xpY3kwDQYJKoZIhvcNAQEFBQADggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo
-7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrvm+0fazbuSCUlFLZWohDo7qd/
-0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0ROhPs7fpvcmR7
-nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
-x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ
-33ZwmVxwQ023tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
------END CERTIFICATE-----
diff --git a/src/lib/libssl/src/crypto/LPdir_nyi.c b/src/lib/libssl/src/crypto/LPdir_nyi.c
new file mode 100644
index 0000000000..6c1a50e6a8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/LPdir_nyi.c
@@ -0,0 +1,42 @@
+/* $LP: LPlib/source/LPdir_win.c,v 1.1 2004/06/14 10:07:56 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef LPDIR_H
+#include "LPdir.h"
+#endif
+
+struct LP_dir_context_st { void *dummy; };
+const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
+        {
+        errno = EINVAL;
+        return 0;
+        }
+int LP_find_file_end(LP_DIR_CTX **ctx)
+        {
+        errno = EINVAL;
+        return 0;
+        }
diff --git a/src/lib/libssl/src/crypto/LPdir_unix.c b/src/lib/libssl/src/crypto/LPdir_unix.c
new file mode 100644
index 0000000000..b004cd99e8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/LPdir_unix.c
@@ -0,0 +1,127 @@
+/* $LP: LPlib/source/LPdir_unix.c,v 1.11 2004/09/23 22:07:22 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <errno.h>
+#ifndef LPDIR_H
+#include "LPdir.h"
+#endif
+
+/* The POSIXly macro for the maximum number of characters in a file path
+   is NAME_MAX.  However, some operating systems use PATH_MAX instead.
+   Therefore, it seems natural to first check for PATH_MAX and use that,
+   and if it doesn't exist, use NAME_MAX. */
+#if defined(PATH_MAX)
+# define LP_ENTRY_SIZE PATH_MAX
+#elif defined(NAME_MAX)
+# define LP_ENTRY_SIZE NAME_MAX
+#endif
+
+/* Of course, there's the possibility that neither PATH_MAX nor NAME_MAX
+   exist.  It's also possible that NAME_MAX exists but is define to a
+   very small value (HP-UX offers 14), so we need to check if we got a
+   result, and if it meets a minimum standard, and create or change it
+   if not. */
+#if !defined(LP_ENTRY_SIZE) || LP_ENTRY_SIZE<255
+# undef LP_ENTRY_SIZE
+# define LP_ENTRY_SIZE 255
+#endif
+
+struct LP_dir_context_st
+{
+  DIR *dir;
+  char entry_name[LP_ENTRY_SIZE+1];
+};
+
+const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
+{
+  struct dirent *direntry = NULL;
+
+  if (ctx == NULL || directory == NULL)
+    {
+      errno = EINVAL;
+      return 0;
+    }
+
+  errno = 0;
+  if (*ctx == NULL)
+    {
+      *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX));
+      if (*ctx == NULL)
+        {
+          errno = ENOMEM;
+          return 0;
+        }
+      memset(*ctx, '\0', sizeof(LP_DIR_CTX));
+
+      (*ctx)->dir = opendir(directory);
+      if ((*ctx)->dir == NULL)
+        {
+          int save_errno = errno; /* Probably not needed, but I'm paranoid */
+          free(*ctx);
+          *ctx = NULL;
+          errno = save_errno;
+          return 0;
+        }
+    }
+
+  direntry = readdir((*ctx)->dir);
+  if (direntry == NULL)
+    {
+      return 0;
+    }
+
+  strncpy((*ctx)->entry_name, direntry->d_name, sizeof((*ctx)->entry_name) - 1);
+  (*ctx)->entry_name[sizeof((*ctx)->entry_name) - 1] = '\0';
+  return (*ctx)->entry_name;
+}
+
+int LP_find_file_end(LP_DIR_CTX **ctx)
+{
+  if (ctx != NULL && *ctx != NULL)
+    {
+      int ret = closedir((*ctx)->dir);
+
+      free(*ctx);
+      switch (ret)
+        {
+        case 0:
+          return 1;
+        case -1:
+          return 0;
+        default:
+          break;
+        }
+    }
+  errno = EINVAL;
+  return 0;
+}
diff --git a/src/lib/libssl/src/crypto/LPdir_vms.c b/src/lib/libssl/src/crypto/LPdir_vms.c
new file mode 100644
index 0000000000..85b427a623
--- /dev/null
+++ b/src/lib/libssl/src/crypto/LPdir_vms.c
@@ -0,0 +1,199 @@
+/* $LP: LPlib/source/LPdir_vms.c,v 1.20 2004/08/26 13:36:05 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <descrip.h>
+#include <namdef.h>
+#include <rmsdef.h>
+#include <libfildef.h>
+#include <lib$routines.h>
+#include <strdef.h>
+#include <str$routines.h>
+#include <stsdef.h>
+#ifndef LPDIR_H
+#include "LPdir.h"
+#endif
+
+/* Because some compiler options hide this macor */
+#ifndef EVMSERR
+#define EVMSERR         65535  /* error for non-translatable VMS errors */
+#endif
+
+struct LP_dir_context_st
+{
+  unsigned long VMS_context;
+#ifdef NAML$C_MAXRSS
+  char filespec[NAML$C_MAXRSS+1];
+  char result[NAML$C_MAXRSS+1];
+#else
+  char filespec[256];
+  char result[256];
+#endif
+  struct dsc$descriptor_d filespec_dsc;
+  struct dsc$descriptor_d result_dsc;
+};
+
+const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
+{
+  int status;
+  char *p, *r;
+  size_t l;
+  unsigned long flags = 0;
+#ifdef NAML$C_MAXRSS
+  flags |= LIB$M_FIL_LONG_NAMES;
+#endif
+
+  if (ctx == NULL || directory == NULL)
+    {
+      errno = EINVAL;
+      return 0;
+    }
+
+  errno = 0;
+  if (*ctx == NULL)
+    {
+      size_t filespeclen = strlen(directory);
+      char *filespec = NULL;
+
+      /* MUST be a VMS directory specification!  Let's estimate if it is. */
+      if (directory[filespeclen-1] != ']'
+          && directory[filespeclen-1] != '>'
+          && directory[filespeclen-1] != ':')
+        {
+          errno = EINVAL;
+          return 0;
+        }
+
+      filespeclen += 4;         /* "*.*;" */
+
+      if (filespeclen >
+#ifdef NAML$C_MAXRSS
+          NAML$C_MAXRSS
+#else
+          255
+#endif
+          )
+        {
+          errno = ENAMETOOLONG;
+          return 0;
+        }
+
+      *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX));
+      if (*ctx == NULL)
+        {
+          errno = ENOMEM;
+          return 0;
+        }
+      memset(*ctx, '\0', sizeof(LP_DIR_CTX));
+
+      strcpy((*ctx)->filespec,directory);
+      strcat((*ctx)->filespec,"*.*;");
+      (*ctx)->filespec_dsc.dsc$w_length = filespeclen;
+      (*ctx)->filespec_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+      (*ctx)->filespec_dsc.dsc$b_class = DSC$K_CLASS_S;
+      (*ctx)->filespec_dsc.dsc$a_pointer = (*ctx)->filespec;
+      (*ctx)->result_dsc.dsc$w_length = 0;
+      (*ctx)->result_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+      (*ctx)->result_dsc.dsc$b_class = DSC$K_CLASS_D;
+      (*ctx)->result_dsc.dsc$a_pointer = 0;
+    }
+
+  (*ctx)->result_dsc.dsc$w_length = 0;
+  (*ctx)->result_dsc.dsc$b_dtype = DSC$K_DTYPE_T;
+  (*ctx)->result_dsc.dsc$b_class = DSC$K_CLASS_D;
+  (*ctx)->result_dsc.dsc$a_pointer = 0;
+
+  status = lib$find_file(&(*ctx)->filespec_dsc, &(*ctx)->result_dsc,
+                         &(*ctx)->VMS_context, 0, 0, 0, &flags);
+
+  if (status == RMS$_NMF)
+    {
+      errno = 0;
+      vaxc$errno = status;
+      return NULL;
+    }
+
+  if(!$VMS_STATUS_SUCCESS(status))
+    {
+      errno = EVMSERR;
+      vaxc$errno = status;
+      return NULL;
+    }
+
+  /* Quick, cheap and dirty way to discard any device and directory,
+     since we only want file names */
+  l = (*ctx)->result_dsc.dsc$w_length;
+  p = (*ctx)->result_dsc.dsc$a_pointer;
+  r = p;
+  for (; *p; p++)
+    {
+      if (*p == '^' && p[1] != '\0') /* Take care of ODS-5 escapes */
+        {
+          p++;
+        }
+      else if (*p == ':' || *p == '>' || *p == ']')
+        {
+          l -= p + 1 - r;
+          r = p + 1;
+        }
+      else if (*p == ';')
+        {
+          l = p - r;
+          break;
+        }
+    }
+
+  strncpy((*ctx)->result, r, l);
+  (*ctx)->result[l] = '\0';
+  str$free1_dx(&(*ctx)->result_dsc);
+
+  return (*ctx)->result;
+}
+
+int LP_find_file_end(LP_DIR_CTX **ctx)
+{
+  if (ctx != NULL && *ctx != NULL)
+    {
+      int status = lib$find_file_end(&(*ctx)->VMS_context);
+
+      free(*ctx);
+
+      if(!$VMS_STATUS_SUCCESS(status))
+        {
+          errno = EVMSERR;
+          vaxc$errno = status;
+          return 0;
+        }
+      return 1;
+    }
+  errno = EINVAL;
+  return 0;
+}
+
diff --git a/src/lib/libssl/src/crypto/LPdir_win.c b/src/lib/libssl/src/crypto/LPdir_win.c
new file mode 100644
index 0000000000..09b475beed
--- /dev/null
+++ b/src/lib/libssl/src/crypto/LPdir_win.c
@@ -0,0 +1,155 @@
+/* $LP: LPlib/source/LPdir_win.c,v 1.10 2004/08/26 13:36:05 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <windows.h>
+#include <tchar.h>
+#ifndef LPDIR_H
+#include "LPdir.h"
+#endif
+
+/* We're most likely overcautious here, but let's reserve for
+    broken WinCE headers and explicitly opt for UNICODE call.
+    Keep in mind that our WinCE builds are compiled with -DUNICODE
+    [as well as -D_UNICODE]. */
+#if defined(LP_SYS_WINCE) && !defined(FindFirstFile)
+# define FindFirstFile FindFirstFileW
+#endif
+#if defined(LP_SYS_WINCE) && !defined(FindFirstFile)
+# define FindNextFile FindNextFileW
+#endif
+
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+
+struct LP_dir_context_st
+{
+  WIN32_FIND_DATA ctx;
+  HANDLE handle;
+  char entry_name[NAME_MAX+1];
+};
+
+const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory)
+{
+  struct dirent *direntry = NULL;
+
+  if (ctx == NULL || directory == NULL)
+    {
+      errno = EINVAL;
+      return 0;
+    }
+
+  errno = 0;
+  if (*ctx == NULL)
+    {
+      *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX));
+      if (*ctx == NULL)
+        {
+          errno = ENOMEM;
+          return 0;
+        }
+      memset(*ctx, '\0', sizeof(LP_DIR_CTX));
+
+      if (sizeof(TCHAR) != sizeof(char))
+        {
+          TCHAR *wdir = NULL;
+          /* len_0 denotes string length *with* trailing 0 */ 
+          size_t index = 0,len_0 = strlen(directory) + 1;
+
+          wdir = (TCHAR *)malloc(len_0 * sizeof(TCHAR));
+          if (wdir == NULL)
+            {
+              free(*ctx);
+              *ctx = NULL;
+              errno = ENOMEM;
+              return 0;
+            }
+
+#ifdef LP_MULTIBYTE_AVAILABLE
+          if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, (WCHAR *)wdir, len_0))
+#endif
+            for (index = 0; index < len_0; index++)
+              wdir[index] = (TCHAR)directory[index];
+
+          (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx);
+
+          free(wdir);
+        }
+      else
+        (*ctx)->handle = FindFirstFile((TCHAR *)directory, &(*ctx)->ctx);
+
+      if ((*ctx)->handle == INVALID_HANDLE_VALUE)
+        {
+          free(*ctx);
+          *ctx = NULL;
+          errno = EINVAL;
+          return 0;
+        }
+    }
+  else
+    {
+      if (FindNextFile((*ctx)->handle, &(*ctx)->ctx) == FALSE)
+        {
+          return 0;
+        }
+    }
+
+  if (sizeof(TCHAR) != sizeof(char))
+    {
+      TCHAR *wdir = (*ctx)->ctx.cFileName;
+      size_t index, len_0 = 0;
+
+      while (wdir[len_0] && len_0 < (sizeof((*ctx)->entry_name) - 1)) len_0++;
+      len_0++;
+
+#ifdef LP_MULTIBYTE_AVAILABLE
+      if (!WideCharToMultiByte(CP_ACP, 0, (WCHAR *)wdir, len_0, (*ctx)->entry_name,
+                               sizeof((*ctx)->entry_name), NULL, 0))
+#endif
+        for (index = 0; index < len_0; index++)
+          (*ctx)->entry_name[index] = (char)wdir[index];
+    }
+  else
+    strncpy((*ctx)->entry_name, (const char *)(*ctx)->ctx.cFileName,
+            sizeof((*ctx)->entry_name)-1);
+
+  (*ctx)->entry_name[sizeof((*ctx)->entry_name)-1] = '\0';
+
+  return (*ctx)->entry_name;
+}
+
+int LP_find_file_end(LP_DIR_CTX **ctx)
+{
+  if (ctx != NULL && *ctx != NULL)
+    {
+      FindClose((*ctx)->handle);
+      free(*ctx);
+      *ctx = NULL;
+      return 1;
+    }
+  errno = EINVAL;
+  return 0;
+}
diff --git a/src/lib/libssl/src/crypto/LPdir_win32.c b/src/lib/libssl/src/crypto/LPdir_win32.c
new file mode 100644
index 0000000000..e39872da52
--- /dev/null
+++ b/src/lib/libssl/src/crypto/LPdir_win32.c
@@ -0,0 +1,30 @@
+/* $LP: LPlib/source/LPdir_win32.c,v 1.3 2004/08/26 13:36:05 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define LP_SYS_WIN32
+#define LP_MULTIBYTE_AVAILABLE
+#include "LPdir_win.c"
diff --git a/src/lib/libssl/src/crypto/LPdir_wince.c b/src/lib/libssl/src/crypto/LPdir_wince.c
new file mode 100644
index 0000000000..ab0e1e6f4f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/LPdir_wince.c
@@ -0,0 +1,31 @@
+/* $LP: LPlib/source/LPdir_wince.c,v 1.3 2004/08/26 13:36:05 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define LP_SYS_WINCE
+/* We might want to define LP_MULTIBYTE_AVAILABLE here.  It's currently
+   under investigation what the exact conditions would be */
+#include "LPdir_win.c"
diff --git a/src/lib/libssl/src/crypto/aes/aes_ige.c b/src/lib/libssl/src/crypto/aes/aes_ige.c
new file mode 100644
index 0000000000..45d7096181
--- /dev/null
+++ b/src/lib/libssl/src/crypto/aes/aes_ige.c
@@ -0,0 +1,323 @@
+/* crypto/aes/aes_ige.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#include "cryptlib.h"
+
+#include <openssl/aes.h>
+#include "aes_locl.h"
+
+#define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long))
+typedef struct {
+        unsigned long data[N_WORDS];
+} aes_block_t;
+
+/* XXX: probably some better way to do this */
+#if defined(__i386__) || defined(__x86_64__)
+#define UNALIGNED_MEMOPS_ARE_FAST 1
+#else
+#define UNALIGNED_MEMOPS_ARE_FAST 0
+#endif
+
+#if UNALIGNED_MEMOPS_ARE_FAST
+#define load_block(d, s)        (d) = *(const aes_block_t *)(s)
+#define store_block(d, s)       *(aes_block_t *)(d) = (s)
+#else
+#define load_block(d, s)        memcpy((d).data, (s), AES_BLOCK_SIZE)
+#define store_block(d, s)       memcpy((d), (s).data, AES_BLOCK_SIZE)
+#endif
+
+/* N.B. The IV for this mode is _twice_ the block size */
+
+void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
+                                         const unsigned long length, const AES_KEY *key,
+                                         unsigned char *ivec, const int enc)
+        {
+        unsigned long n;
+        unsigned long len;
+
+        OPENSSL_assert(in && out && key && ivec);
+        OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
+        OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
+
+        len = length / AES_BLOCK_SIZE;
+
+        if (AES_ENCRYPT == enc)
+                {
+                if (in != out &&
+                    (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in|(size_t)out|(size_t)ivec)%sizeof(long)==0))
+                        {
+                        aes_block_t *ivp = (aes_block_t *)ivec;
+                        aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
+
+                        while (len)
+                                {
+                                aes_block_t *inp = (aes_block_t *)in;
+                                aes_block_t *outp = (aes_block_t *)out;
+
+                                for(n=0 ; n < N_WORDS; ++n)
+                                        outp->data[n] = inp->data[n] ^ ivp->data[n];
+                                AES_encrypt((unsigned char *)outp->data, (unsigned char *)outp->data, key);
+                                for(n=0 ; n < N_WORDS; ++n)
+                                        outp->data[n] ^= iv2p->data[n];
+                                ivp = outp;
+                                iv2p = inp;
+                                --len;
+                                in += AES_BLOCK_SIZE;
+                                out += AES_BLOCK_SIZE;
+                                }
+                        memcpy(ivec, ivp->data, AES_BLOCK_SIZE);
+                        memcpy(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE);
+                        }
+                else
+                        {
+                        aes_block_t tmp, tmp2;
+                        aes_block_t iv;
+                        aes_block_t iv2;
+
+                        load_block(iv, ivec);
+                        load_block(iv2, ivec + AES_BLOCK_SIZE);
+
+                        while (len)
+                                {
+                                load_block(tmp, in);
+                                for(n=0 ; n < N_WORDS; ++n)
+                                        tmp2.data[n] = tmp.data[n] ^ iv.data[n];
+                                AES_encrypt((unsigned char *)tmp2.data, (unsigned char *)tmp2.data, key);
+                                for(n=0 ; n < N_WORDS; ++n)
+                                        tmp2.data[n] ^= iv2.data[n];
+                                store_block(out, tmp2);
+                                iv = tmp2;
+                                iv2 = tmp;
+                                --len;
+                                in += AES_BLOCK_SIZE;
+                                out += AES_BLOCK_SIZE;
+                                }
+                        memcpy(ivec, iv.data, AES_BLOCK_SIZE);
+                        memcpy(ivec + AES_BLOCK_SIZE, iv2.data, AES_BLOCK_SIZE);
+                        }
+                }
+        else
+                {
+                if (in != out &&
+                    (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in|(size_t)out|(size_t)ivec)%sizeof(long)==0))
+                        {
+                        aes_block_t *ivp = (aes_block_t *)ivec;
+                        aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
+
+                        while (len)
+                                {
+                                aes_block_t tmp;
+                                aes_block_t *inp = (aes_block_t *)in;
+                                aes_block_t *outp = (aes_block_t *)out;
+
+                                for(n=0 ; n < N_WORDS; ++n)
+                                        tmp.data[n] = inp->data[n] ^ iv2p->data[n];
+                                AES_decrypt((unsigned char *)tmp.data, (unsigned char *)outp->data, key);
+                                for(n=0 ; n < N_WORDS; ++n)
+                                        outp->data[n] ^= ivp->data[n];
+                                ivp = inp;
+                                iv2p = outp;
+                                --len;
+                                in += AES_BLOCK_SIZE;
+                                out += AES_BLOCK_SIZE;
+                                }
+                        memcpy(ivec, ivp->data, AES_BLOCK_SIZE);
+                        memcpy(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE);
+                        }
+                else
+                        {
+                        aes_block_t tmp, tmp2;
+                        aes_block_t iv;
+                        aes_block_t iv2;
+
+                        load_block(iv, ivec);
+                        load_block(iv2, ivec + AES_BLOCK_SIZE);
+
+                        while (len)
+                                {
+                                load_block(tmp, in);
+                                tmp2 = tmp;
+                                for(n=0 ; n < N_WORDS; ++n)
+                                        tmp.data[n] ^= iv2.data[n];
+                                AES_decrypt((unsigned char *)tmp.data, (unsigned char *)tmp.data, key);
+                                for(n=0 ; n < N_WORDS; ++n)
+                                        tmp.data[n] ^= iv.data[n];
+                                store_block(out, tmp);
+                                iv = tmp2;
+                                iv2 = tmp;
+                                --len;
+                                in += AES_BLOCK_SIZE;
+                                out += AES_BLOCK_SIZE;
+                                }
+                        memcpy(ivec, iv.data, AES_BLOCK_SIZE);
+                        memcpy(ivec + AES_BLOCK_SIZE, iv2.data, AES_BLOCK_SIZE);
+                        }
+                }
+        }
+
+/*
+ * Note that its effectively impossible to do biIGE in anything other
+ * than a single pass, so no provision is made for chaining.
+ */
+
+/* N.B. The IV for this mode is _four times_ the block size */
+
+void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
+                                                const unsigned long length, const AES_KEY *key,
+                                                const AES_KEY *key2, const unsigned char *ivec,
+                                                const int enc)
+        {
+        unsigned long n;
+        unsigned long len = length;
+        unsigned char tmp[AES_BLOCK_SIZE];
+        unsigned char tmp2[AES_BLOCK_SIZE];
+        unsigned char tmp3[AES_BLOCK_SIZE];
+        unsigned char prev[AES_BLOCK_SIZE];
+        const unsigned char *iv;
+        const unsigned char *iv2;
+
+        OPENSSL_assert(in && out && key && ivec);
+        OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
+        OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
+
+        if (AES_ENCRYPT == enc)
+                {
+                /* XXX: Do a separate case for when in != out (strictly should
+                   check for overlap, too) */
+
+                /* First the forward pass */ 
+                iv = ivec;
+                iv2 = ivec + AES_BLOCK_SIZE;
+                while (len >= AES_BLOCK_SIZE)
+                        {
+                        for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                                out[n] = in[n] ^ iv[n];
+                        AES_encrypt(out, out, key);
+                        for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                                out[n] ^= iv2[n];
+                        iv = out;
+                        memcpy(prev, in, AES_BLOCK_SIZE);
+                        iv2 = prev;
+                        len -= AES_BLOCK_SIZE;
+                        in += AES_BLOCK_SIZE;
+                        out += AES_BLOCK_SIZE;
+                        }
+
+                /* And now backwards */
+                iv = ivec + AES_BLOCK_SIZE*2;
+                iv2 = ivec + AES_BLOCK_SIZE*3;
+                len = length;
+                while(len >= AES_BLOCK_SIZE)
+                        {
+                        out -= AES_BLOCK_SIZE;
+                        /* XXX: reduce copies by alternating between buffers */
+                        memcpy(tmp, out, AES_BLOCK_SIZE);
+                        for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                                out[n] ^= iv[n];
+                        /*                      hexdump(stdout, "out ^ iv", out, AES_BLOCK_SIZE); */
+                        AES_encrypt(out, out, key);
+                        /*                      hexdump(stdout,"enc", out, AES_BLOCK_SIZE); */
+                        /*                      hexdump(stdout,"iv2", iv2, AES_BLOCK_SIZE); */
+                        for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                                out[n] ^= iv2[n];
+                        /*                      hexdump(stdout,"out", out, AES_BLOCK_SIZE); */
+                        iv = out;
+                        memcpy(prev, tmp, AES_BLOCK_SIZE);
+                        iv2 = prev;
+                        len -= AES_BLOCK_SIZE;
+                        }
+                }
+        else
+                {
+                /* First backwards */
+                iv = ivec + AES_BLOCK_SIZE*2;
+                iv2 = ivec + AES_BLOCK_SIZE*3;
+                in += length;
+                out += length;
+                while (len >= AES_BLOCK_SIZE)
+                        {
+                        in -= AES_BLOCK_SIZE;
+                        out -= AES_BLOCK_SIZE;
+                        memcpy(tmp, in, AES_BLOCK_SIZE);
+                        memcpy(tmp2, in, AES_BLOCK_SIZE);
+                        for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                                tmp[n] ^= iv2[n];
+                        AES_decrypt(tmp, out, key);
+                        for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                                out[n] ^= iv[n];
+                        memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
+                        iv = tmp3;
+                        iv2 = out;
+                        len -= AES_BLOCK_SIZE;
+                        }
+
+                /* And now forwards */
+                iv = ivec;
+                iv2 = ivec + AES_BLOCK_SIZE;
+                len = length;
+                while (len >= AES_BLOCK_SIZE)
+                        {
+                        memcpy(tmp, out, AES_BLOCK_SIZE);
+                        memcpy(tmp2, out, AES_BLOCK_SIZE);
+                        for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                                tmp[n] ^= iv2[n];
+                        AES_decrypt(tmp, out, key);
+                        for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                                out[n] ^= iv[n];
+                        memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
+                        iv = tmp3;
+                        iv2 = out;
+                        len -= AES_BLOCK_SIZE;
+                        in += AES_BLOCK_SIZE;
+                        out += AES_BLOCK_SIZE;
+                        }
+                }
+        }
diff --git a/src/lib/libssl/src/crypto/aes/aes_wrap.c b/src/lib/libssl/src/crypto/aes/aes_wrap.c
new file mode 100644
index 0000000000..9feacd65d8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/aes/aes_wrap.c
@@ -0,0 +1,259 @@
+/* crypto/aes/aes_wrap.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include "cryptlib.h"
+#include <openssl/aes.h>
+#include <openssl/bio.h>
+
+static const unsigned char default_iv[] = {
+  0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+};
+
+int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
+                unsigned char *out,
+                const unsigned char *in, unsigned int inlen)
+        {
+        unsigned char *A, B[16], *R;
+        unsigned int i, j, t;
+        if ((inlen & 0x7) || (inlen < 8))
+                return -1;
+        A = B;
+        t = 1;
+        memcpy(out + 8, in, inlen);
+        if (!iv)
+                iv = default_iv;
+
+        memcpy(A, iv, 8);
+
+        for (j = 0; j < 6; j++)
+                {
+                R = out + 8;
+                for (i = 0; i < inlen; i += 8, t++, R += 8)
+                        {
+                        memcpy(B + 8, R, 8);
+                        AES_encrypt(B, B, key);
+                        A[7] ^= (unsigned char)(t & 0xff);
+                        if (t > 0xff)   
+                                {
+                                A[6] ^= (unsigned char)((t & 0xff) >> 8);
+                                A[5] ^= (unsigned char)((t & 0xff) >> 16);
+                                A[4] ^= (unsigned char)((t & 0xff) >> 24);
+                                }
+                        memcpy(R, B + 8, 8);
+                        }
+                }
+        memcpy(out, A, 8);
+        return inlen + 8;
+        }
+
+int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
+                unsigned char *out,
+                const unsigned char *in, unsigned int inlen)
+        {
+        unsigned char *A, B[16], *R;
+        unsigned int i, j, t;
+        inlen -= 8;
+        if (inlen & 0x7)
+                return -1;
+        if (inlen < 8)
+                return -1;
+        A = B;
+        t =  6 * (inlen >> 3);
+        memcpy(A, in, 8);
+        memcpy(out, in + 8, inlen);
+        for (j = 0; j < 6; j++)
+                {
+                R = out + inlen - 8;
+                for (i = 0; i < inlen; i += 8, t--, R -= 8)
+                        {
+                        A[7] ^= (unsigned char)(t & 0xff);
+                        if (t > 0xff)   
+                                {
+                                A[6] ^= (unsigned char)((t & 0xff) >> 8);
+                                A[5] ^= (unsigned char)((t & 0xff) >> 16);
+                                A[4] ^= (unsigned char)((t & 0xff) >> 24);
+                                }
+                        memcpy(B + 8, R, 8);
+                        AES_decrypt(B, B, key);
+                        memcpy(R, B + 8, 8);
+                        }
+                }
+        if (!iv)
+                iv = default_iv;
+        if (memcmp(A, iv, 8))
+                {
+                OPENSSL_cleanse(out, inlen);
+                return 0;
+                }
+        return inlen;
+        }
+
+#ifdef AES_WRAP_TEST
+
+int AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
+                         const unsigned char *iv,
+                         const unsigned char *eout,
+                         const unsigned char *key, int keylen)
+        {
+        unsigned char *otmp = NULL, *ptmp = NULL;
+        int r, ret = 0;
+        AES_KEY wctx;
+        otmp = OPENSSL_malloc(keylen + 8);
+        ptmp = OPENSSL_malloc(keylen);
+        if (!otmp || !ptmp)
+                return 0;
+        if (AES_set_encrypt_key(kek, keybits, &wctx))
+                goto err;
+        r = AES_wrap_key(&wctx, iv, otmp, key, keylen);
+        if (r <= 0)
+                goto err;
+
+        if (eout && memcmp(eout, otmp, keylen))
+                goto err;
+                
+        if (AES_set_decrypt_key(kek, keybits, &wctx))
+                goto err;
+        r = AES_unwrap_key(&wctx, iv, ptmp, otmp, r);
+
+        if (memcmp(key, ptmp, keylen))
+                goto err;
+
+        ret = 1;
+
+        err:
+        if (otmp)
+                OPENSSL_free(otmp);
+        if (ptmp)
+                OPENSSL_free(ptmp);
+
+        return ret;
+
+        }
+
+
+
+int main(int argc, char **argv)
+{
+
+static const unsigned char kek[] = {
+  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
+};
+
+static const unsigned char key[] = {
+  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
+  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
+};
+
+static const unsigned char e1[] = {
+  0x1f, 0xa6, 0x8b, 0x0a, 0x81, 0x12, 0xb4, 0x47,
+  0xae, 0xf3, 0x4b, 0xd8, 0xfb, 0x5a, 0x7b, 0x82,
+  0x9d, 0x3e, 0x86, 0x23, 0x71, 0xd2, 0xcf, 0xe5
+};
+
+static const unsigned char e2[] = {
+  0x96, 0x77, 0x8b, 0x25, 0xae, 0x6c, 0xa4, 0x35,
+  0xf9, 0x2b, 0x5b, 0x97, 0xc0, 0x50, 0xae, 0xd2,
+  0x46, 0x8a, 0xb8, 0xa1, 0x7a, 0xd8, 0x4e, 0x5d
+};
+
+static const unsigned char e3[] = {
+  0x64, 0xe8, 0xc3, 0xf9, 0xce, 0x0f, 0x5b, 0xa2,
+  0x63, 0xe9, 0x77, 0x79, 0x05, 0x81, 0x8a, 0x2a,
+  0x93, 0xc8, 0x19, 0x1e, 0x7d, 0x6e, 0x8a, 0xe7
+};
+
+static const unsigned char e4[] = {
+  0x03, 0x1d, 0x33, 0x26, 0x4e, 0x15, 0xd3, 0x32,
+  0x68, 0xf2, 0x4e, 0xc2, 0x60, 0x74, 0x3e, 0xdc,
+  0xe1, 0xc6, 0xc7, 0xdd, 0xee, 0x72, 0x5a, 0x93,
+  0x6b, 0xa8, 0x14, 0x91, 0x5c, 0x67, 0x62, 0xd2
+};
+
+static const unsigned char e5[] = {
+  0xa8, 0xf9, 0xbc, 0x16, 0x12, 0xc6, 0x8b, 0x3f,
+  0xf6, 0xe6, 0xf4, 0xfb, 0xe3, 0x0e, 0x71, 0xe4,
+  0x76, 0x9c, 0x8b, 0x80, 0xa3, 0x2c, 0xb8, 0x95,
+  0x8c, 0xd5, 0xd1, 0x7d, 0x6b, 0x25, 0x4d, 0xa1
+};
+
+static const unsigned char e6[] = {
+  0x28, 0xc9, 0xf4, 0x04, 0xc4, 0xb8, 0x10, 0xf4,
+  0xcb, 0xcc, 0xb3, 0x5c, 0xfb, 0x87, 0xf8, 0x26,
+  0x3f, 0x57, 0x86, 0xe2, 0xd8, 0x0e, 0xd3, 0x26,
+  0xcb, 0xc7, 0xf0, 0xe7, 0x1a, 0x99, 0xf4, 0x3b,
+  0xfb, 0x98, 0x8b, 0x9b, 0x7a, 0x02, 0xdd, 0x21
+};
+
+        AES_KEY wctx, xctx;
+        int ret;
+        ret = AES_wrap_unwrap_test(kek, 128, NULL, e1, key, 16);
+        fprintf(stderr, "Key test result %d\n", ret);
+        ret = AES_wrap_unwrap_test(kek, 192, NULL, e2, key, 16);
+        fprintf(stderr, "Key test result %d\n", ret);
+        ret = AES_wrap_unwrap_test(kek, 256, NULL, e3, key, 16);
+        fprintf(stderr, "Key test result %d\n", ret);
+        ret = AES_wrap_unwrap_test(kek, 192, NULL, e4, key, 24);
+        fprintf(stderr, "Key test result %d\n", ret);
+        ret = AES_wrap_unwrap_test(kek, 256, NULL, e5, key, 24);
+        fprintf(stderr, "Key test result %d\n", ret);
+        ret = AES_wrap_unwrap_test(kek, 256, NULL, e6, key, 32);
+        fprintf(stderr, "Key test result %d\n", ret);
+}
+        
+        
+#endif
diff --git a/src/lib/libssl/src/crypto/aes/asm/aes-586.pl b/src/lib/libssl/src/crypto/aes/asm/aes-586.pl
new file mode 100644
index 0000000000..89fa261794
--- /dev/null
+++ b/src/lib/libssl/src/crypto/aes/asm/aes-586.pl
@@ -0,0 +1,1532 @@
+#!/usr/bin/env perl
+#
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. Rights for redistribution and usage in source and binary
+# forms are granted according to the OpenSSL license.
+# ====================================================================
+#
+# Version 3.6.
+#
+# You might fail to appreciate this module performance from the first
+# try. If compared to "vanilla" linux-ia32-icc target, i.e. considered
+# to be *the* best Intel C compiler without -KPIC, performance appears
+# to be virtually identical... But try to re-configure with shared
+# library support... Aha! Intel compiler "suddenly" lags behind by 30%
+# [on P4, more on others]:-) And if compared to position-independent
+# code generated by GNU C, this code performs *more* than *twice* as
+# fast! Yes, all this buzz about PIC means that unlike other hand-
+# coded implementations, this one was explicitly designed to be safe
+# to use even in shared library context... This also means that this
+# code isn't necessarily absolutely fastest "ever," because in order
+# to achieve position independence an extra register has to be
+# off-loaded to stack, which affects the benchmark result.
+#
+# Special note about instruction choice. Do you recall RC4_INT code
+# performing poorly on P4? It might be the time to figure out why.
+# RC4_INT code implies effective address calculations in base+offset*4
+# form. Trouble is that it seems that offset scaling turned to be
+# critical path... At least eliminating scaling resulted in 2.8x RC4
+# performance improvement [as you might recall]. As AES code is hungry
+# for scaling too, I [try to] avoid the latter by favoring off-by-2
+# shifts and masking the result with 0xFF<<2 instead of "boring" 0xFF.
+#
+# As was shown by Dean Gaudet <dean@arctic.org>, the above note turned
+# void. Performance improvement with off-by-2 shifts was observed on
+# intermediate implementation, which was spilling yet another register
+# to stack... Final offset*4 code below runs just a tad faster on P4,
+# but exhibits up to 10% improvement on other cores.
+#
+# Second version is "monolithic" replacement for aes_core.c, which in
+# addition to AES_[de|en]crypt implements AES_set_[de|en]cryption_key.
+# This made it possible to implement little-endian variant of the
+# algorithm without modifying the base C code. Motivating factor for
+# the undertaken effort was that it appeared that in tight IA-32
+# register window little-endian flavor could achieve slightly higher
+# Instruction Level Parallelism, and it indeed resulted in up to 15%
+# better performance on most recent µ-archs...
+#
+# Third version adds AES_cbc_encrypt implementation, which resulted in
+# up to 40% performance imrovement of CBC benchmark results. 40% was
+# observed on P4 core, where "overall" imrovement coefficient, i.e. if
+# compared to PIC generated by GCC and in CBC mode, was observed to be
+# as large as 4x:-) CBC performance is virtually identical to ECB now
+# and on some platforms even better, e.g. 17.6 "small" cycles/byte on
+# Opteron, because certain function prologues and epilogues are
+# effectively taken out of the loop...
+#
+# Version 3.2 implements compressed tables and prefetch of these tables
+# in CBC[!] mode. Former means that 3/4 of table references are now
+# misaligned, which unfortunately has negative impact on elder IA-32
+# implementations, Pentium suffered 30% penalty, PIII - 10%.
+#
+# Version 3.3 avoids L1 cache aliasing between stack frame and
+# S-boxes, and 3.4 - L1 cache aliasing even between key schedule. The
+# latter is achieved by copying the key schedule to controlled place in
+# stack. This unfortunately has rather strong impact on small block CBC
+# performance, ~2x deterioration on 16-byte block if compared to 3.3.
+#
+# Version 3.5 checks if there is L1 cache aliasing between user-supplied
+# key schedule and S-boxes and abstains from copying the former if
+# there is no. This allows end-user to consciously retain small block
+# performance by aligning key schedule in specific manner.
+#
+# Version 3.6 compresses Td4 to 256 bytes and prefetches it in ECB.
+#
+# Current ECB performance numbers for 128-bit key in CPU cycles per
+# processed byte [measure commonly used by AES benchmarkers] are:
+#
+#               small footprint         fully unrolled
+# P4            24                      22
+# AMD K8        20                      19
+# PIII          25                      23
+# Pentium       81                      78
+
+push(@INC,"perlasm","../../perlasm");
+require "x86asm.pl";
+
+&asm_init($ARGV[0],"aes-586.pl",$ARGV[$#ARGV] eq "386");
+
+$s0="eax";
+$s1="ebx";
+$s2="ecx";
+$s3="edx";
+$key="edi";
+$acc="esi";
+
+$compromise=0;          # $compromise=128 abstains from copying key
+                        # schedule to stack when encrypting inputs
+                        # shorter than 128 bytes at the cost of
+                        # risksing aliasing with S-boxes. In return
+                        # you get way better, up to +70%, small block
+                        # performance.
+$small_footprint=1;     # $small_footprint=1 code is ~5% slower [on
+                        # recent µ-archs], but ~5 times smaller!
+                        # I favor compact code to minimize cache
+                        # contention and in hope to "collect" 5% back
+                        # in real-life applications...
+$vertical_spin=0;       # shift "verticaly" defaults to 0, because of
+                        # its proof-of-concept status...
+
+# Note that there is no decvert(), as well as last encryption round is
+# performed with "horizontal" shifts. This is because this "vertical"
+# implementation [one which groups shifts on a given $s[i] to form a
+# "column," unlike "horizontal" one, which groups shifts on different
+# $s[i] to form a "row"] is work in progress. It was observed to run
+# few percents faster on Intel cores, but not AMD. On AMD K8 core it's
+# whole 12% slower:-( So we face a trade-off... Shall it be resolved
+# some day? Till then the code is considered experimental and by
+# default remains dormant...
+
+sub encvert()
+{ my ($te,@s) = @_;
+  my $v0 = $acc, $v1 = $key;
+
+        &mov    ($v0,$s[3]);                            # copy s3
+        &mov    (&DWP(4,"esp"),$s[2]);                  # save s2
+        &mov    ($v1,$s[0]);                            # copy s0
+        &mov    (&DWP(8,"esp"),$s[1]);                  # save s1
+
+        &movz   ($s[2],&HB($s[0]));
+        &and    ($s[0],0xFF);
+        &mov    ($s[0],&DWP(0,$te,$s[0],8));            # s0>>0
+        &shr    ($v1,16);
+        &mov    ($s[3],&DWP(3,$te,$s[2],8));            # s0>>8
+        &movz   ($s[1],&HB($v1));
+        &and    ($v1,0xFF);
+        &mov    ($s[2],&DWP(2,$te,$v1,8));              # s0>>16
+         &mov   ($v1,$v0);
+        &mov    ($s[1],&DWP(1,$te,$s[1],8));            # s0>>24
+
+        &and    ($v0,0xFF);
+        &xor    ($s[3],&DWP(0,$te,$v0,8));              # s3>>0
+        &movz   ($v0,&HB($v1));
+        &shr    ($v1,16);
+        &xor    ($s[2],&DWP(3,$te,$v0,8));              # s3>>8
+        &movz   ($v0,&HB($v1));
+        &and    ($v1,0xFF);
+        &xor    ($s[1],&DWP(2,$te,$v1,8));              # s3>>16
+         &mov   ($v1,&DWP(4,"esp"));                    # restore s2
+        &xor    ($s[0],&DWP(1,$te,$v0,8));              # s3>>24
+
+        &mov    ($v0,$v1);
+        &and    ($v1,0xFF);
+        &xor    ($s[2],&DWP(0,$te,$v1,8));              # s2>>0
+        &movz   ($v1,&HB($v0));
+        &shr    ($v0,16);
+        &xor    ($s[1],&DWP(3,$te,$v1,8));              # s2>>8
+        &movz   ($v1,&HB($v0));
+        &and    ($v0,0xFF);
+        &xor    ($s[0],&DWP(2,$te,$v0,8));              # s2>>16
+         &mov   ($v0,&DWP(8,"esp"));                    # restore s1
+        &xor    ($s[3],&DWP(1,$te,$v1,8));              # s2>>24
+
+        &mov    ($v1,$v0);
+        &and    ($v0,0xFF);
+        &xor    ($s[1],&DWP(0,$te,$v0,8));              # s1>>0
+        &movz   ($v0,&HB($v1));
+        &shr    ($v1,16);
+        &xor    ($s[0],&DWP(3,$te,$v0,8));              # s1>>8
+        &movz   ($v0,&HB($v1));
+        &and    ($v1,0xFF);
+        &xor    ($s[3],&DWP(2,$te,$v1,8));              # s1>>16
+         &mov   ($key,&DWP(12,"esp"));                  # reincarnate v1 as key
+        &xor    ($s[2],&DWP(1,$te,$v0,8));              # s1>>24
+}
+
+sub encstep()
+{ my ($i,$te,@s) = @_;
+  my $tmp = $key;
+  my $out = $i==3?$s[0]:$acc;
+
+        # lines marked with #%e?x[i] denote "reordered" instructions...
+        if ($i==3)  {   &mov    ($key,&DWP(12,"esp"));          }##%edx
+        else        {   &mov    ($out,$s[0]);
+                        &and    ($out,0xFF);                    }
+        if ($i==1)  {   &shr    ($s[0],16);                     }#%ebx[1]
+        if ($i==2)  {   &shr    ($s[0],24);                     }#%ecx[2]
+                        &mov    ($out,&DWP(0,$te,$out,8));
+
+        if ($i==3)  {   $tmp=$s[1];                             }##%eax
+                        &movz   ($tmp,&HB($s[1]));
+                        &xor    ($out,&DWP(3,$te,$tmp,8));
+
+        if ($i==3)  {   $tmp=$s[2]; &mov ($s[1],&DWP(4,"esp")); }##%ebx
+        else        {   &mov    ($tmp,$s[2]);
+                        &shr    ($tmp,16);                      }
+        if ($i==2)  {   &and    ($s[1],0xFF);                   }#%edx[2]
+                        &and    ($tmp,0xFF);
+                        &xor    ($out,&DWP(2,$te,$tmp,8));
+
+        if ($i==3)  {   $tmp=$s[3]; &mov ($s[2],&DWP(8,"esp")); }##%ecx
+        elsif($i==2){   &movz   ($tmp,&HB($s[3]));              }#%ebx[2]
+        else        {   &mov    ($tmp,$s[3]); 
+                        &shr    ($tmp,24)                       }
+                        &xor    ($out,&DWP(1,$te,$tmp,8));
+        if ($i<2)   {   &mov    (&DWP(4+4*$i,"esp"),$out);      }
+        if ($i==3)  {   &mov    ($s[3],$acc);                   }
+                        &comment();
+}
+
+sub enclast()
+{ my ($i,$te,@s)=@_;
+  my $tmp = $key;
+  my $out = $i==3?$s[0]:$acc;
+
+        if ($i==3)  {   &mov    ($key,&DWP(12,"esp"));          }##%edx
+        else        {   &mov    ($out,$s[0]);                   }
+                        &and    ($out,0xFF);
+        if ($i==1)  {   &shr    ($s[0],16);                     }#%ebx[1]
+        if ($i==2)  {   &shr    ($s[0],24);                     }#%ecx[2]
+                        &mov    ($out,&DWP(2,$te,$out,8));
+                        &and    ($out,0x000000ff);
+
+        if ($i==3)  {   $tmp=$s[1];                             }##%eax
+                        &movz   ($tmp,&HB($s[1]));
+                        &mov    ($tmp,&DWP(0,$te,$tmp,8));
+                        &and    ($tmp,0x0000ff00);
+                        &xor    ($out,$tmp);
+
+        if ($i==3)  {   $tmp=$s[2]; &mov ($s[1],&DWP(4,"esp")); }##%ebx
+        else        {   mov     ($tmp,$s[2]);
+                        &shr    ($tmp,16);                      }
+        if ($i==2)  {   &and    ($s[1],0xFF);                   }#%edx[2]
+                        &and    ($tmp,0xFF);
+                        &mov    ($tmp,&DWP(0,$te,$tmp,8));
+                        &and    ($tmp,0x00ff0000);
+                        &xor    ($out,$tmp);
+
+        if ($i==3)  {   $tmp=$s[3]; &mov ($s[2],&DWP(8,"esp")); }##%ecx
+        elsif($i==2){   &movz   ($tmp,&HB($s[3]));              }#%ebx[2]
+        else        {   &mov    ($tmp,$s[3]);
+                        &shr    ($tmp,24);                      }
+                        &mov    ($tmp,&DWP(2,$te,$tmp,8));
+                        &and    ($tmp,0xff000000);
+                        &xor    ($out,$tmp);
+        if ($i<2)   {   &mov    (&DWP(4+4*$i,"esp"),$out);      }
+        if ($i==3)  {   &mov    ($s[3],$acc);                   }
+}
+
+sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } }
+
+&public_label("AES_Te");
+&function_begin_B("_x86_AES_encrypt");
+        if ($vertical_spin) {
+                # I need high parts of volatile registers to be accessible...
+                &exch   ($s1="edi",$key="ebx");
+                &mov    ($s2="esi",$acc="ecx");
+        }
+
+        # note that caller is expected to allocate stack frame for me!
+        &mov    (&DWP(12,"esp"),$key);          # save key
+
+        &xor    ($s0,&DWP(0,$key));             # xor with key
+        &xor    ($s1,&DWP(4,$key));
+        &xor    ($s2,&DWP(8,$key));
+        &xor    ($s3,&DWP(12,$key));
+
+        &mov    ($acc,&DWP(240,$key));          # load key->rounds
+
+        if ($small_footprint) {
+            &lea        ($acc,&DWP(-2,$acc,$acc));
+            &lea        ($acc,&DWP(0,$key,$acc,8));
+            &mov        (&DWP(16,"esp"),$acc);  # end of key schedule
+            &align      (4);
+            &set_label("loop");
+                if ($vertical_spin) {
+                    &encvert("ebp",$s0,$s1,$s2,$s3);
+                } else {
+                    &encstep(0,"ebp",$s0,$s1,$s2,$s3);
+                    &encstep(1,"ebp",$s1,$s2,$s3,$s0);
+                    &encstep(2,"ebp",$s2,$s3,$s0,$s1);
+                    &encstep(3,"ebp",$s3,$s0,$s1,$s2);
+                }
+                &add    ($key,16);              # advance rd_key
+                &xor    ($s0,&DWP(0,$key));
+                &xor    ($s1,&DWP(4,$key));
+                &xor    ($s2,&DWP(8,$key));
+                &xor    ($s3,&DWP(12,$key));
+            &cmp        ($key,&DWP(16,"esp"));
+            &mov        (&DWP(12,"esp"),$key);
+            &jb         (&label("loop"));
+        }
+        else {
+            &cmp        ($acc,10);
+            &jle        (&label("10rounds"));
+            &cmp        ($acc,12);
+            &jle        (&label("12rounds"));
+
+        &set_label("14rounds");
+            for ($i=1;$i<3;$i++) {
+                if ($vertical_spin) {
+                    &encvert("ebp",$s0,$s1,$s2,$s3);
+                } else {
+                    &encstep(0,"ebp",$s0,$s1,$s2,$s3);
+                    &encstep(1,"ebp",$s1,$s2,$s3,$s0);
+                    &encstep(2,"ebp",$s2,$s3,$s0,$s1);
+                    &encstep(3,"ebp",$s3,$s0,$s1,$s2);
+                }
+                &xor    ($s0,&DWP(16*$i+0,$key));
+                &xor    ($s1,&DWP(16*$i+4,$key));
+                &xor    ($s2,&DWP(16*$i+8,$key));
+                &xor    ($s3,&DWP(16*$i+12,$key));
+            }
+            &add        ($key,32);
+            &mov        (&DWP(12,"esp"),$key);  # advance rd_key
+        &set_label("12rounds");
+            for ($i=1;$i<3;$i++) {
+                if ($vertical_spin) {
+                    &encvert("ebp",$s0,$s1,$s2,$s3);
+                } else {
+                    &encstep(0,"ebp",$s0,$s1,$s2,$s3);
+                    &encstep(1,"ebp",$s1,$s2,$s3,$s0);
+                    &encstep(2,"ebp",$s2,$s3,$s0,$s1);
+                    &encstep(3,"ebp",$s3,$s0,$s1,$s2);
+                }
+                &xor    ($s0,&DWP(16*$i+0,$key));
+                &xor    ($s1,&DWP(16*$i+4,$key));
+                &xor    ($s2,&DWP(16*$i+8,$key));
+                &xor    ($s3,&DWP(16*$i+12,$key));
+            }
+            &add        ($key,32);
+            &mov        (&DWP(12,"esp"),$key);  # advance rd_key
+        &set_label("10rounds");
+            for ($i=1;$i<10;$i++) {
+                if ($vertical_spin) {
+                    &encvert("ebp",$s0,$s1,$s2,$s3);
+                } else {
+                    &encstep(0,"ebp",$s0,$s1,$s2,$s3);
+                    &encstep(1,"ebp",$s1,$s2,$s3,$s0);
+                    &encstep(2,"ebp",$s2,$s3,$s0,$s1);
+                    &encstep(3,"ebp",$s3,$s0,$s1,$s2);
+                }
+                &xor    ($s0,&DWP(16*$i+0,$key));
+                &xor    ($s1,&DWP(16*$i+4,$key));
+                &xor    ($s2,&DWP(16*$i+8,$key));
+                &xor    ($s3,&DWP(16*$i+12,$key));
+            }
+        }
+
+        if ($vertical_spin) {
+            # "reincarnate" some registers for "horizontal" spin...
+            &mov        ($s1="ebx",$key="edi");
+            &mov        ($s2="ecx",$acc="esi");
+        }
+        &enclast(0,"ebp",$s0,$s1,$s2,$s3);
+        &enclast(1,"ebp",$s1,$s2,$s3,$s0);
+        &enclast(2,"ebp",$s2,$s3,$s0,$s1);
+        &enclast(3,"ebp",$s3,$s0,$s1,$s2);
+
+        &add    ($key,$small_footprint?16:160);
+        &xor    ($s0,&DWP(0,$key));
+        &xor    ($s1,&DWP(4,$key));
+        &xor    ($s2,&DWP(8,$key));
+        &xor    ($s3,&DWP(12,$key));
+
+        &ret    ();
+
+&set_label("AES_Te",64);        # Yes! I keep it in the code segment!
+        &_data_word(0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6);
+        &_data_word(0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591);
+        &_data_word(0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56);
+        &_data_word(0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec);
+        &_data_word(0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa);
+        &_data_word(0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb);
+        &_data_word(0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45);
+        &_data_word(0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b);
+        &_data_word(0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c);
+        &_data_word(0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83);
+        &_data_word(0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9);
+        &_data_word(0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a);
+        &_data_word(0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d);
+        &_data_word(0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f);
+        &_data_word(0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df);
+        &_data_word(0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea);
+        &_data_word(0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34);
+        &_data_word(0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b);
+        &_data_word(0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d);
+        &_data_word(0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413);
+        &_data_word(0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1);
+        &_data_word(0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6);
+        &_data_word(0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972);
+        &_data_word(0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85);
+        &_data_word(0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed);
+        &_data_word(0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511);
+        &_data_word(0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe);
+        &_data_word(0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b);
+        &_data_word(0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05);
+        &_data_word(0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1);
+        &_data_word(0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142);
+        &_data_word(0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf);
+        &_data_word(0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3);
+        &_data_word(0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e);
+        &_data_word(0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a);
+        &_data_word(0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6);
+        &_data_word(0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3);
+        &_data_word(0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b);
+        &_data_word(0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428);
+        &_data_word(0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad);
+        &_data_word(0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14);
+        &_data_word(0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8);
+        &_data_word(0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4);
+        &_data_word(0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2);
+        &_data_word(0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda);
+        &_data_word(0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949);
+        &_data_word(0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf);
+        &_data_word(0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810);
+        &_data_word(0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c);
+        &_data_word(0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697);
+        &_data_word(0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e);
+        &_data_word(0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f);
+        &_data_word(0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc);
+        &_data_word(0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c);
+        &_data_word(0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969);
+        &_data_word(0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27);
+        &_data_word(0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122);
+        &_data_word(0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433);
+        &_data_word(0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9);
+        &_data_word(0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5);
+        &_data_word(0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a);
+        &_data_word(0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0);
+        &_data_word(0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e);
+        &_data_word(0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c);
+#rcon:
+        &data_word(0x00000001, 0x00000002, 0x00000004, 0x00000008);
+        &data_word(0x00000010, 0x00000020, 0x00000040, 0x00000080);
+        &data_word(0x0000001b, 0x00000036, 0, 0, 0, 0, 0, 0);
+&function_end_B("_x86_AES_encrypt");
+
+# void AES_encrypt (const void *inp,void *out,const AES_KEY *key);
+&public_label("AES_Te");
+&function_begin("AES_encrypt");
+        &mov    ($acc,&wparam(0));              # load inp
+        &mov    ($key,&wparam(2));              # load key
+
+        &mov    ($s0,"esp");
+        &sub    ("esp",24);
+        &and    ("esp",-64);
+        &add    ("esp",4);
+        &mov    (&DWP(16,"esp"),$s0);
+
+        &call   (&label("pic_point"));          # make it PIC!
+        &set_label("pic_point");
+        &blindpop("ebp");
+        &lea    ("ebp",&DWP(&label("AES_Te")."-".&label("pic_point"),"ebp"));
+
+        &mov    ($s0,&DWP(0,$acc));             # load input data
+        &mov    ($s1,&DWP(4,$acc));
+        &mov    ($s2,&DWP(8,$acc));
+        &mov    ($s3,&DWP(12,$acc));
+
+        &call   ("_x86_AES_encrypt");
+
+        &mov    ("esp",&DWP(16,"esp"));
+
+        &mov    ($acc,&wparam(1));              # load out
+        &mov    (&DWP(0,$acc),$s0);             # write output data
+        &mov    (&DWP(4,$acc),$s1);
+        &mov    (&DWP(8,$acc),$s2);
+        &mov    (&DWP(12,$acc),$s3);
+&function_end("AES_encrypt");
+
+#------------------------------------------------------------------#
+
+sub decstep()
+{ my ($i,$td,@s) = @_;
+  my $tmp = $key;
+  my $out = $i==3?$s[0]:$acc;
+
+        # no instructions are reordered, as performance appears
+        # optimal... or rather that all attempts to reorder didn't
+        # result in better performance [which by the way is not a
+        # bit lower than ecryption].
+        if($i==3)   {   &mov    ($key,&DWP(12,"esp"));          }
+        else        {   &mov    ($out,$s[0]);                   }
+                        &and    ($out,0xFF);
+                        &mov    ($out,&DWP(0,$td,$out,8));
+
+        if ($i==3)  {   $tmp=$s[1];                             }
+                        &movz   ($tmp,&HB($s[1]));
+                        &xor    ($out,&DWP(3,$td,$tmp,8));
+
+        if ($i==3)  {   $tmp=$s[2]; &mov ($s[1],$acc);          }
+        else        {   &mov    ($tmp,$s[2]);                   }
+                        &shr    ($tmp,16);
+                        &and    ($tmp,0xFF);
+                        &xor    ($out,&DWP(2,$td,$tmp,8));
+
+        if ($i==3)  {   $tmp=$s[3]; &mov ($s[2],&DWP(8,"esp")); }
+        else        {   &mov    ($tmp,$s[3]);                   }
+                        &shr    ($tmp,24);
+                        &xor    ($out,&DWP(1,$td,$tmp,8));
+        if ($i<2)   {   &mov    (&DWP(4+4*$i,"esp"),$out);      }
+        if ($i==3)  {   &mov    ($s[3],&DWP(4,"esp"));          }
+                        &comment();
+}
+
+sub declast()
+{ my ($i,$td,@s)=@_;
+  my $tmp = $key;
+  my $out = $i==3?$s[0]:$acc;
+
+        if($i==3)   {   &mov    ($key,&DWP(12,"esp"));          }
+        else        {   &mov    ($out,$s[0]);                   }
+                        &and    ($out,0xFF);
+                        &movz   ($out,&BP(2048,$td,$out,1));
+
+        if ($i==3)  {   $tmp=$s[1];                             }
+                        &movz   ($tmp,&HB($s[1]));
+                        &movz   ($tmp,&BP(2048,$td,$tmp,1));
+                        &shl    ($tmp,8);
+                        &xor    ($out,$tmp);
+
+        if ($i==3)  {   $tmp=$s[2]; &mov ($s[1],$acc);          }
+        else        {   mov     ($tmp,$s[2]);                   }
+                        &shr    ($tmp,16);
+                        &and    ($tmp,0xFF);
+                        &movz   ($tmp,&BP(2048,$td,$tmp,1));
+                        &shl    ($tmp,16);
+                        &xor    ($out,$tmp);
+
+        if ($i==3)  {   $tmp=$s[3]; &mov ($s[2],&DWP(8,"esp")); }
+        else        {   &mov    ($tmp,$s[3]);                   }
+                        &shr    ($tmp,24);
+                        &movz   ($tmp,&BP(2048,$td,$tmp,1));
+                        &shl    ($tmp,24);
+                        &xor    ($out,$tmp);
+        if ($i<2)   {   &mov    (&DWP(4+4*$i,"esp"),$out);      }
+        if ($i==3)  {   &mov    ($s[3],&DWP(4,"esp"));          }
+}
+
+&public_label("AES_Td");
+&function_begin_B("_x86_AES_decrypt");
+        # note that caller is expected to allocate stack frame for me!
+        &mov    (&DWP(12,"esp"),$key);          # save key
+
+        &xor    ($s0,&DWP(0,$key));             # xor with key
+        &xor    ($s1,&DWP(4,$key));
+        &xor    ($s2,&DWP(8,$key));
+        &xor    ($s3,&DWP(12,$key));
+
+        &mov    ($acc,&DWP(240,$key));          # load key->rounds
+
+        if ($small_footprint) {
+            &lea        ($acc,&DWP(-2,$acc,$acc));
+            &lea        ($acc,&DWP(0,$key,$acc,8));
+            &mov        (&DWP(16,"esp"),$acc);  # end of key schedule
+            &align      (4);
+            &set_label("loop");
+                &decstep(0,"ebp",$s0,$s3,$s2,$s1);
+                &decstep(1,"ebp",$s1,$s0,$s3,$s2);
+                &decstep(2,"ebp",$s2,$s1,$s0,$s3);
+                &decstep(3,"ebp",$s3,$s2,$s1,$s0);
+                &add    ($key,16);              # advance rd_key
+                &xor    ($s0,&DWP(0,$key));
+                &xor    ($s1,&DWP(4,$key));
+                &xor    ($s2,&DWP(8,$key));
+                &xor    ($s3,&DWP(12,$key));
+            &cmp        ($key,&DWP(16,"esp"));
+            &mov        (&DWP(12,"esp"),$key);
+            &jb         (&label("loop"));
+        }
+        else {
+            &cmp        ($acc,10);
+            &jle        (&label("10rounds"));
+            &cmp        ($acc,12);
+            &jle        (&label("12rounds"));
+
+        &set_label("14rounds");
+            for ($i=1;$i<3;$i++) {
+                &decstep(0,"ebp",$s0,$s3,$s2,$s1);
+                &decstep(1,"ebp",$s1,$s0,$s3,$s2);
+                &decstep(2,"ebp",$s2,$s1,$s0,$s3);
+                &decstep(3,"ebp",$s3,$s2,$s1,$s0);
+                &xor    ($s0,&DWP(16*$i+0,$key));
+                &xor    ($s1,&DWP(16*$i+4,$key));
+                &xor    ($s2,&DWP(16*$i+8,$key));
+                &xor    ($s3,&DWP(16*$i+12,$key));
+            }
+            &add        ($key,32);
+            &mov        (&DWP(12,"esp"),$key);  # advance rd_key
+        &set_label("12rounds");
+            for ($i=1;$i<3;$i++) {
+                &decstep(0,"ebp",$s0,$s3,$s2,$s1);
+                &decstep(1,"ebp",$s1,$s0,$s3,$s2);
+                &decstep(2,"ebp",$s2,$s1,$s0,$s3);
+                &decstep(3,"ebp",$s3,$s2,$s1,$s0);
+                &xor    ($s0,&DWP(16*$i+0,$key));
+                &xor    ($s1,&DWP(16*$i+4,$key));
+                &xor    ($s2,&DWP(16*$i+8,$key));
+                &xor    ($s3,&DWP(16*$i+12,$key));
+            }
+            &add        ($key,32);
+            &mov        (&DWP(12,"esp"),$key);  # advance rd_key
+        &set_label("10rounds");
+            for ($i=1;$i<10;$i++) {
+                &decstep(0,"ebp",$s0,$s3,$s2,$s1);
+                &decstep(1,"ebp",$s1,$s0,$s3,$s2);
+                &decstep(2,"ebp",$s2,$s1,$s0,$s3);
+                &decstep(3,"ebp",$s3,$s2,$s1,$s0);
+                &xor    ($s0,&DWP(16*$i+0,$key));
+                &xor    ($s1,&DWP(16*$i+4,$key));
+                &xor    ($s2,&DWP(16*$i+8,$key));
+                &xor    ($s3,&DWP(16*$i+12,$key));
+            }
+        }
+
+        &declast(0,"ebp",$s0,$s3,$s2,$s1);
+        &declast(1,"ebp",$s1,$s0,$s3,$s2);
+        &declast(2,"ebp",$s2,$s1,$s0,$s3);
+        &declast(3,"ebp",$s3,$s2,$s1,$s0);
+
+        &add    ($key,$small_footprint?16:160);
+        &xor    ($s0,&DWP(0,$key));
+        &xor    ($s1,&DWP(4,$key));
+        &xor    ($s2,&DWP(8,$key));
+        &xor    ($s3,&DWP(12,$key));
+
+        &ret    ();
+
+&set_label("AES_Td",64);        # Yes! I keep it in the code segment!
+        &_data_word(0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a);
+        &_data_word(0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b);
+        &_data_word(0x55fa3020, 0xf66d76ad, 0x9176cc88, 0x254c02f5);
+        &_data_word(0xfcd7e54f, 0xd7cb2ac5, 0x80443526, 0x8fa362b5);
+        &_data_word(0x495ab1de, 0x671bba25, 0x980eea45, 0xe1c0fe5d);
+        &_data_word(0x02752fc3, 0x12f04c81, 0xa397468d, 0xc6f9d36b);
+        &_data_word(0xe75f8f03, 0x959c9215, 0xeb7a6dbf, 0xda595295);
+        &_data_word(0x2d83bed4, 0xd3217458, 0x2969e049, 0x44c8c98e);
+        &_data_word(0x6a89c275, 0x78798ef4, 0x6b3e5899, 0xdd71b927);
+        &_data_word(0xb64fe1be, 0x17ad88f0, 0x66ac20c9, 0xb43ace7d);
+        &_data_word(0x184adf63, 0x82311ae5, 0x60335197, 0x457f5362);
+        &_data_word(0xe07764b1, 0x84ae6bbb, 0x1ca081fe, 0x942b08f9);
+        &_data_word(0x58684870, 0x19fd458f, 0x876cde94, 0xb7f87b52);
+        &_data_word(0x23d373ab, 0xe2024b72, 0x578f1fe3, 0x2aab5566);
+        &_data_word(0x0728ebb2, 0x03c2b52f, 0x9a7bc586, 0xa50837d3);
+        &_data_word(0xf2872830, 0xb2a5bf23, 0xba6a0302, 0x5c8216ed);
+        &_data_word(0x2b1ccf8a, 0x92b479a7, 0xf0f207f3, 0xa1e2694e);
+        &_data_word(0xcdf4da65, 0xd5be0506, 0x1f6234d1, 0x8afea6c4);
+        &_data_word(0x9d532e34, 0xa055f3a2, 0x32e18a05, 0x75ebf6a4);
+        &_data_word(0x39ec830b, 0xaaef6040, 0x069f715e, 0x51106ebd);
+        &_data_word(0xf98a213e, 0x3d06dd96, 0xae053edd, 0x46bde64d);
+        &_data_word(0xb58d5491, 0x055dc471, 0x6fd40604, 0xff155060);
+        &_data_word(0x24fb9819, 0x97e9bdd6, 0xcc434089, 0x779ed967);
+        &_data_word(0xbd42e8b0, 0x888b8907, 0x385b19e7, 0xdbeec879);
+        &_data_word(0x470a7ca1, 0xe90f427c, 0xc91e84f8, 0x00000000);
+        &_data_word(0x83868009, 0x48ed2b32, 0xac70111e, 0x4e725a6c);
+        &_data_word(0xfbff0efd, 0x5638850f, 0x1ed5ae3d, 0x27392d36);
+        &_data_word(0x64d90f0a, 0x21a65c68, 0xd1545b9b, 0x3a2e3624);
+        &_data_word(0xb1670a0c, 0x0fe75793, 0xd296eeb4, 0x9e919b1b);
+        &_data_word(0x4fc5c080, 0xa220dc61, 0x694b775a, 0x161a121c);
+        &_data_word(0x0aba93e2, 0xe52aa0c0, 0x43e0223c, 0x1d171b12);
+        &_data_word(0x0b0d090e, 0xadc78bf2, 0xb9a8b62d, 0xc8a91e14);
+        &_data_word(0x8519f157, 0x4c0775af, 0xbbdd99ee, 0xfd607fa3);
+        &_data_word(0x9f2601f7, 0xbcf5725c, 0xc53b6644, 0x347efb5b);
+        &_data_word(0x7629438b, 0xdcc623cb, 0x68fcedb6, 0x63f1e4b8);
+        &_data_word(0xcadc31d7, 0x10856342, 0x40229713, 0x2011c684);
+        &_data_word(0x7d244a85, 0xf83dbbd2, 0x1132f9ae, 0x6da129c7);
+        &_data_word(0x4b2f9e1d, 0xf330b2dc, 0xec52860d, 0xd0e3c177);
+        &_data_word(0x6c16b32b, 0x99b970a9, 0xfa489411, 0x2264e947);
+        &_data_word(0xc48cfca8, 0x1a3ff0a0, 0xd82c7d56, 0xef903322);
+        &_data_word(0xc74e4987, 0xc1d138d9, 0xfea2ca8c, 0x360bd498);
+        &_data_word(0xcf81f5a6, 0x28de7aa5, 0x268eb7da, 0xa4bfad3f);
+        &_data_word(0xe49d3a2c, 0x0d927850, 0x9bcc5f6a, 0x62467e54);
+        &_data_word(0xc2138df6, 0xe8b8d890, 0x5ef7392e, 0xf5afc382);
+        &_data_word(0xbe805d9f, 0x7c93d069, 0xa92dd56f, 0xb31225cf);
+        &_data_word(0x3b99acc8, 0xa77d1810, 0x6e639ce8, 0x7bbb3bdb);
+        &_data_word(0x097826cd, 0xf418596e, 0x01b79aec, 0xa89a4f83);
+        &_data_word(0x656e95e6, 0x7ee6ffaa, 0x08cfbc21, 0xe6e815ef);
+        &_data_word(0xd99be7ba, 0xce366f4a, 0xd4099fea, 0xd67cb029);
+        &_data_word(0xafb2a431, 0x31233f2a, 0x3094a5c6, 0xc066a235);
+        &_data_word(0x37bc4e74, 0xa6ca82fc, 0xb0d090e0, 0x15d8a733);
+        &_data_word(0x4a9804f1, 0xf7daec41, 0x0e50cd7f, 0x2ff69117);
+        &_data_word(0x8dd64d76, 0x4db0ef43, 0x544daacc, 0xdf0496e4);
+        &_data_word(0xe3b5d19e, 0x1b886a4c, 0xb81f2cc1, 0x7f516546);
+        &_data_word(0x04ea5e9d, 0x5d358c01, 0x737487fa, 0x2e410bfb);
+        &_data_word(0x5a1d67b3, 0x52d2db92, 0x335610e9, 0x1347d66d);
+        &_data_word(0x8c61d79a, 0x7a0ca137, 0x8e14f859, 0x893c13eb);
+        &_data_word(0xee27a9ce, 0x35c961b7, 0xede51ce1, 0x3cb1477a);
+        &_data_word(0x59dfd29c, 0x3f73f255, 0x79ce1418, 0xbf37c773);
+        &_data_word(0xeacdf753, 0x5baafd5f, 0x146f3ddf, 0x86db4478);
+        &_data_word(0x81f3afca, 0x3ec468b9, 0x2c342438, 0x5f40a3c2);
+        &_data_word(0x72c31d16, 0x0c25e2bc, 0x8b493c28, 0x41950dff);
+        &_data_word(0x7101a839, 0xdeb30c08, 0x9ce4b4d8, 0x90c15664);
+        &_data_word(0x6184cb7b, 0x70b632d5, 0x745c6c48, 0x4257b8d0);
+#Td4:
+        &data_byte(0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38);
+        &data_byte(0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb);
+        &data_byte(0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87);
+        &data_byte(0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb);
+        &data_byte(0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d);
+        &data_byte(0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e);
+        &data_byte(0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2);
+        &data_byte(0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25);
+        &data_byte(0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16);
+        &data_byte(0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92);
+        &data_byte(0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda);
+        &data_byte(0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84);
+        &data_byte(0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a);
+        &data_byte(0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06);
+        &data_byte(0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02);
+        &data_byte(0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b);
+        &data_byte(0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea);
+        &data_byte(0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73);
+        &data_byte(0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85);
+        &data_byte(0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e);
+        &data_byte(0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89);
+        &data_byte(0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b);
+        &data_byte(0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20);
+        &data_byte(0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4);
+        &data_byte(0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31);
+        &data_byte(0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f);
+        &data_byte(0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d);
+        &data_byte(0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef);
+        &data_byte(0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0);
+        &data_byte(0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61);
+        &data_byte(0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26);
+        &data_byte(0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d);
+&function_end_B("_x86_AES_decrypt");
+
+# void AES_decrypt (const void *inp,void *out,const AES_KEY *key);
+&public_label("AES_Td");
+&function_begin("AES_decrypt");
+        &mov    ($acc,&wparam(0));              # load inp
+        &mov    ($key,&wparam(2));              # load key
+
+        &mov    ($s0,"esp");
+        &sub    ("esp",24);
+        &and    ("esp",-64);
+        &add    ("esp",4);
+        &mov    (&DWP(16,"esp"),$s0);
+
+        &call   (&label("pic_point"));          # make it PIC!
+        &set_label("pic_point");
+        &blindpop("ebp");
+        &lea    ("ebp",&DWP(&label("AES_Td")."-".&label("pic_point"),"ebp"));
+
+        # prefetch Td4
+        &lea    ("ebp",&DWP(2048+128,"ebp"));
+        &mov    ($s0,&DWP(0-128,"ebp"));
+        &mov    ($s1,&DWP(32-128,"ebp"));
+        &mov    ($s2,&DWP(64-128,"ebp"));
+        &mov    ($s3,&DWP(96-128,"ebp"));
+        &mov    ($s0,&DWP(128-128,"ebp"));
+        &mov    ($s1,&DWP(160-128,"ebp"));
+        &mov    ($s2,&DWP(192-128,"ebp"));
+        &mov    ($s3,&DWP(224-128,"ebp"));
+        &lea    ("ebp",&DWP(-2048-128,"ebp"));
+
+        &mov    ($s0,&DWP(0,$acc));             # load input data
+        &mov    ($s1,&DWP(4,$acc));
+        &mov    ($s2,&DWP(8,$acc));
+        &mov    ($s3,&DWP(12,$acc));
+
+        &call   ("_x86_AES_decrypt");
+
+        &mov    ("esp",&DWP(16,"esp"));
+
+        &mov    ($acc,&wparam(1));              # load out
+        &mov    (&DWP(0,$acc),$s0);             # write output data
+        &mov    (&DWP(4,$acc),$s1);
+        &mov    (&DWP(8,$acc),$s2);
+        &mov    (&DWP(12,$acc),$s3);
+&function_end("AES_decrypt");
+
+# void AES_cbc_encrypt (const void char *inp, unsigned char *out,
+#                       size_t length, const AES_KEY *key,
+#                       unsigned char *ivp,const int enc);
+{
+# stack frame layout
+# -4(%esp)      0(%esp)         return address
+# 0(%esp)       4(%esp)         tmp1
+# 4(%esp)       8(%esp)         tmp2
+# 8(%esp)       12(%esp)        key
+# 12(%esp)      16(%esp)        end of key schedule
+my $_esp=&DWP(16,"esp");        #saved %esp
+my $_inp=&DWP(20,"esp");        #copy of wparam(0)
+my $_out=&DWP(24,"esp");        #copy of wparam(1)
+my $_len=&DWP(28,"esp");        #copy of wparam(2)
+my $_key=&DWP(32,"esp");        #copy of wparam(3)
+my $_ivp=&DWP(36,"esp");        #copy of wparam(4)
+my $_tmp=&DWP(40,"esp");        #volatile variable
+my $ivec=&DWP(44,"esp");        #ivec[16]
+my $aes_key=&DWP(60,"esp");     #copy of aes_key
+my $mark=&DWP(60+240,"esp");    #copy of aes_key->rounds
+
+&public_label("AES_Te");
+&public_label("AES_Td");
+&function_begin("AES_cbc_encrypt");
+        &mov    ($s2 eq "ecx"? $s2 : "",&wparam(2));    # load len
+        &cmp    ($s2,0);
+        &je     (&label("enc_out"));
+
+        &call   (&label("pic_point"));          # make it PIC!
+        &set_label("pic_point");
+        &blindpop("ebp");
+
+        &pushf  ();
+        &cld    ();
+
+        &cmp    (&wparam(5),0);
+        &je     (&label("DECRYPT"));
+
+        &lea    ("ebp",&DWP(&label("AES_Te")."-".&label("pic_point"),"ebp"));
+
+        # allocate aligned stack frame...
+        &lea    ($key,&DWP(-64-244,"esp"));
+        &and    ($key,-64);
+
+        # ... and make sure it doesn't alias with AES_Te modulo 4096
+        &mov    ($s0,"ebp");
+        &lea    ($s1,&DWP(2048,"ebp"));
+        &mov    ($s3,$key);
+        &and    ($s0,0xfff);            # s = %ebp&0xfff
+        &and    ($s1,0xfff);            # e = (%ebp+2048)&0xfff
+        &and    ($s3,0xfff);            # p = %esp&0xfff
+
+        &cmp    ($s3,$s1);              # if (p>=e) %esp =- (p-e);
+        &jb     (&label("te_break_out"));
+        &sub    ($s3,$s1);
+        &sub    ($key,$s3);
+        &jmp    (&label("te_ok"));
+        &set_label("te_break_out");     # else %esp -= (p-s)&0xfff + framesz;
+        &sub    ($s3,$s0);
+        &and    ($s3,0xfff);
+        &add    ($s3,64+256);
+        &sub    ($key,$s3);
+        &align  (4);
+        &set_label("te_ok");
+
+        &mov    ($s0,&wparam(0));       # load inp
+        &mov    ($s1,&wparam(1));       # load out
+        &mov    ($s3,&wparam(3));       # load key
+        &mov    ($acc,&wparam(4));      # load ivp
+
+        &exch   ("esp",$key);
+        &add    ("esp",4);              # reserve for return address!
+        &mov    ($_esp,$key);           # save %esp
+
+        &mov    ($_inp,$s0);            # save copy of inp
+        &mov    ($_out,$s1);            # save copy of out
+        &mov    ($_len,$s2);            # save copy of len
+        &mov    ($_key,$s3);            # save copy of key
+        &mov    ($_ivp,$acc);           # save copy of ivp
+
+        &mov    ($mark,0);              # copy of aes_key->rounds = 0;
+        if ($compromise) {
+                &cmp    ($s2,$compromise);
+                &jb     (&label("skip_ecopy"));
+        }
+        # do we copy key schedule to stack?
+        &mov    ($s1 eq "ebx" ? $s1 : "",$s3);
+        &mov    ($s2 eq "ecx" ? $s2 : "",244/4);
+        &sub    ($s1,"ebp");
+        &mov    ("esi",$s3);
+        &and    ($s1,0xfff);
+        &lea    ("edi",$aes_key);
+        &cmp    ($s1,2048);
+        &jb     (&label("do_ecopy"));
+        &cmp    ($s1,4096-244);
+        &jb     (&label("skip_ecopy"));
+        &align  (4);
+        &set_label("do_ecopy");
+                &mov    ($_key,"edi");
+                &data_word(0xA5F3F689); # rep movsd
+        &set_label("skip_ecopy");
+
+        &mov    ($acc,$s0);
+        &mov    ($key,16);
+        &align  (4);
+        &set_label("prefetch_te");
+                &mov    ($s0,&DWP(0,"ebp"));
+                &mov    ($s1,&DWP(32,"ebp"));
+                &mov    ($s2,&DWP(64,"ebp"));
+                &mov    ($s3,&DWP(96,"ebp"));
+                &lea    ("ebp",&DWP(128,"ebp"));
+                &dec    ($key);
+        &jnz    (&label("prefetch_te"));
+        &sub    ("ebp",2048);
+
+        &mov    ($s2,$_len);
+        &mov    ($key,$_ivp);
+        &test   ($s2,0xFFFFFFF0);
+        &jz     (&label("enc_tail"));           # short input...
+
+        &mov    ($s0,&DWP(0,$key));             # load iv
+        &mov    ($s1,&DWP(4,$key));
+
+        &align  (4);
+        &set_label("enc_loop");
+                &mov    ($s2,&DWP(8,$key));
+                &mov    ($s3,&DWP(12,$key));
+
+                &xor    ($s0,&DWP(0,$acc));     # xor input data
+                &xor    ($s1,&DWP(4,$acc));
+                &xor    ($s2,&DWP(8,$acc));
+                &xor    ($s3,&DWP(12,$acc));
+
+                &mov    ($key,$_key);           # load key
+                &call   ("_x86_AES_encrypt");
+
+                &mov    ($acc,$_inp);           # load inp
+                &mov    ($key,$_out);           # load out
+
+                &mov    (&DWP(0,$key),$s0);     # save output data
+                &mov    (&DWP(4,$key),$s1);
+                &mov    (&DWP(8,$key),$s2);
+                &mov    (&DWP(12,$key),$s3);
+
+                &mov    ($s2,$_len);            # load len
+
+                &lea    ($acc,&DWP(16,$acc));
+                &mov    ($_inp,$acc);           # save inp
+
+                &lea    ($s3,&DWP(16,$key));
+                &mov    ($_out,$s3);            # save out
+
+                &sub    ($s2,16);
+                &test   ($s2,0xFFFFFFF0);
+                &mov    ($_len,$s2);            # save len
+        &jnz    (&label("enc_loop"));
+        &test   ($s2,15);
+        &jnz    (&label("enc_tail"));
+        &mov    ($acc,$_ivp);           # load ivp
+        &mov    ($s2,&DWP(8,$key));     # restore last dwords
+        &mov    ($s3,&DWP(12,$key));
+        &mov    (&DWP(0,$acc),$s0);     # save ivec
+        &mov    (&DWP(4,$acc),$s1);
+        &mov    (&DWP(8,$acc),$s2);
+        &mov    (&DWP(12,$acc),$s3);
+
+        &cmp    ($mark,0);              # was the key schedule copied?
+        &mov    ("edi",$_key);
+        &je     (&label("skip_ezero"));
+        # zero copy of key schedule
+        &mov    ("ecx",240/4);
+        &xor    ("eax","eax");
+        &align  (4);
+        &data_word(0xABF3F689); # rep stosd
+        &set_label("skip_ezero")
+        &mov    ("esp",$_esp);
+        &popf   ();
+    &set_label("enc_out");
+        &function_end_A();
+        &pushf  ();                     # kludge, never executed
+
+    &align      (4);
+    &set_label("enc_tail");
+        &push   ($key eq "edi" ? $key : "");    # push ivp
+        &mov    ($key,$_out);                   # load out
+        &mov    ($s1,16);
+        &sub    ($s1,$s2);
+        &cmp    ($key,$acc);                    # compare with inp
+        &je     (&label("enc_in_place"));
+        &align  (4);
+        &data_word(0xA4F3F689); # rep movsb     # copy input
+        &jmp    (&label("enc_skip_in_place"));
+    &set_label("enc_in_place");
+        &lea    ($key,&DWP(0,$key,$s2));
+    &set_label("enc_skip_in_place");
+        &mov    ($s2,$s1);
+        &xor    ($s0,$s0);
+        &align  (4);
+        &data_word(0xAAF3F689); # rep stosb     # zero tail
+        &pop    ($key);                         # pop ivp
+
+        &mov    ($acc,$_out);                   # output as input
+        &mov    ($s0,&DWP(0,$key));
+        &mov    ($s1,&DWP(4,$key));
+        &mov    ($_len,16);                     # len=16
+        &jmp    (&label("enc_loop"));           # one more spin...
+
+#----------------------------- DECRYPT -----------------------------#
+&align  (4);
+&set_label("DECRYPT");
+        &lea    ("ebp",&DWP(&label("AES_Td")."-".&label("pic_point"),"ebp"));
+
+        # allocate aligned stack frame...
+        &lea    ($key,&DWP(-64-244,"esp"));
+        &and    ($key,-64);
+
+        # ... and make sure it doesn't alias with AES_Td modulo 4096
+        &mov    ($s0,"ebp");
+        &lea    ($s1,&DWP(2048+256,"ebp"));
+        &mov    ($s3,$key);
+        &and    ($s0,0xfff);            # s = %ebp&0xfff
+        &and    ($s1,0xfff);            # e = (%ebp+2048+256)&0xfff
+        &and    ($s3,0xfff);            # p = %esp&0xfff
+
+        &cmp    ($s3,$s1);              # if (p>=e) %esp =- (p-e);
+        &jb     (&label("td_break_out"));
+        &sub    ($s3,$s1);
+        &sub    ($key,$s3);
+        &jmp    (&label("td_ok"));
+        &set_label("td_break_out");     # else %esp -= (p-s)&0xfff + framesz;
+        &sub    ($s3,$s0);
+        &and    ($s3,0xfff);
+        &add    ($s3,64+256);
+        &sub    ($key,$s3);
+        &align  (4);
+        &set_label("td_ok");
+
+        &mov    ($s0,&wparam(0));       # load inp
+        &mov    ($s1,&wparam(1));       # load out
+        &mov    ($s3,&wparam(3));       # load key
+        &mov    ($acc,&wparam(4));      # load ivp
+
+        &exch   ("esp",$key);
+        &add    ("esp",4);              # reserve for return address!
+        &mov    ($_esp,$key);           # save %esp
+
+        &mov    ($_inp,$s0);            # save copy of inp
+        &mov    ($_out,$s1);            # save copy of out
+        &mov    ($_len,$s2);            # save copy of len
+        &mov    ($_key,$s3);            # save copy of key
+        &mov    ($_ivp,$acc);           # save copy of ivp
+
+        &mov    ($mark,0);              # copy of aes_key->rounds = 0;
+        if ($compromise) {
+                &cmp    ($s2,$compromise);
+                &jb     (&label("skip_dcopy"));
+        }
+        # do we copy key schedule to stack?
+        &mov    ($s1 eq "ebx" ? $s1 : "",$s3);
+        &mov    ($s2 eq "ecx" ? $s2 : "",244/4);
+        &sub    ($s1,"ebp");
+        &mov    ("esi",$s3);
+        &and    ($s1,0xfff);
+        &lea    ("edi",$aes_key);
+        &cmp    ($s1,2048+256);
+        &jb     (&label("do_dcopy"));
+        &cmp    ($s1,4096-244);
+        &jb     (&label("skip_dcopy"));
+        &align  (4);
+        &set_label("do_dcopy");
+                &mov    ($_key,"edi");
+                &data_word(0xA5F3F689); # rep movsd
+        &set_label("skip_dcopy");
+
+        &mov    ($acc,$s0);
+        &mov    ($key,18);
+        &align  (4);
+        &set_label("prefetch_td");
+                &mov    ($s0,&DWP(0,"ebp"));
+                &mov    ($s1,&DWP(32,"ebp"));
+                &mov    ($s2,&DWP(64,"ebp"));
+                &mov    ($s3,&DWP(96,"ebp"));
+                &lea    ("ebp",&DWP(128,"ebp"));
+                &dec    ($key);
+        &jnz    (&label("prefetch_td"));
+        &sub    ("ebp",2048+256);
+
+        &cmp    ($acc,$_out);
+        &je     (&label("dec_in_place"));       # in-place processing...
+
+        &mov    ($key,$_ivp);           # load ivp
+        &mov    ($_tmp,$key);
+
+        &align  (4);
+        &set_label("dec_loop");
+                &mov    ($s0,&DWP(0,$acc));     # read input
+                &mov    ($s1,&DWP(4,$acc));
+                &mov    ($s2,&DWP(8,$acc));
+                &mov    ($s3,&DWP(12,$acc));
+
+                &mov    ($key,$_key);           # load key
+                &call   ("_x86_AES_decrypt");
+
+                &mov    ($key,$_tmp);           # load ivp
+                &mov    ($acc,$_len);           # load len
+                &xor    ($s0,&DWP(0,$key));     # xor iv
+                &xor    ($s1,&DWP(4,$key));
+                &xor    ($s2,&DWP(8,$key));
+                &xor    ($s3,&DWP(12,$key));
+
+                &sub    ($acc,16);
+                &jc     (&label("dec_partial"));
+                &mov    ($_len,$acc);           # save len
+                &mov    ($acc,$_inp);           # load inp
+                &mov    ($key,$_out);           # load out
+
+                &mov    (&DWP(0,$key),$s0);     # write output
+                &mov    (&DWP(4,$key),$s1);
+                &mov    (&DWP(8,$key),$s2);
+                &mov    (&DWP(12,$key),$s3);
+
+                &mov    ($_tmp,$acc);           # save ivp
+                &lea    ($acc,&DWP(16,$acc));
+                &mov    ($_inp,$acc);           # save inp
+
+                &lea    ($key,&DWP(16,$key));
+                &mov    ($_out,$key);           # save out
+
+        &jnz    (&label("dec_loop"));
+        &mov    ($key,$_tmp);           # load temp ivp
+    &set_label("dec_end");
+        &mov    ($acc,$_ivp);           # load user ivp
+        &mov    ($s0,&DWP(0,$key));     # load iv
+        &mov    ($s1,&DWP(4,$key));
+        &mov    ($s2,&DWP(8,$key));
+        &mov    ($s3,&DWP(12,$key));
+        &mov    (&DWP(0,$acc),$s0);     # copy back to user
+        &mov    (&DWP(4,$acc),$s1);
+        &mov    (&DWP(8,$acc),$s2);
+        &mov    (&DWP(12,$acc),$s3);
+        &jmp    (&label("dec_out"));
+
+    &align      (4);
+    &set_label("dec_partial");
+        &lea    ($key,$ivec);
+        &mov    (&DWP(0,$key),$s0);     # dump output to stack
+        &mov    (&DWP(4,$key),$s1);
+        &mov    (&DWP(8,$key),$s2);
+        &mov    (&DWP(12,$key),$s3);
+        &lea    ($s2 eq "ecx" ? $s2 : "",&DWP(16,$acc));
+        &mov    ($acc eq "esi" ? $acc : "",$key);
+        &mov    ($key eq "edi" ? $key : "",$_out);      # load out
+        &data_word(0xA4F3F689); # rep movsb             # copy output
+        &mov    ($key,$_inp);                           # use inp as temp ivp
+        &jmp    (&label("dec_end"));
+
+    &align      (4);
+    &set_label("dec_in_place");
+        &set_label("dec_in_place_loop");
+                &lea    ($key,$ivec);
+                &mov    ($s0,&DWP(0,$acc));     # read input
+                &mov    ($s1,&DWP(4,$acc));
+                &mov    ($s2,&DWP(8,$acc));
+                &mov    ($s3,&DWP(12,$acc));
+
+                &mov    (&DWP(0,$key),$s0);     # copy to temp
+                &mov    (&DWP(4,$key),$s1);
+                &mov    (&DWP(8,$key),$s2);
+                &mov    (&DWP(12,$key),$s3);
+
+                &mov    ($key,$_key);           # load key
+                &call   ("_x86_AES_decrypt");
+
+                &mov    ($key,$_ivp);           # load ivp
+                &mov    ($acc,$_out);           # load out
+                &xor    ($s0,&DWP(0,$key));     # xor iv
+                &xor    ($s1,&DWP(4,$key));
+                &xor    ($s2,&DWP(8,$key));
+                &xor    ($s3,&DWP(12,$key));
+
+                &mov    (&DWP(0,$acc),$s0);     # write output
+                &mov    (&DWP(4,$acc),$s1);
+                &mov    (&DWP(8,$acc),$s2);
+                &mov    (&DWP(12,$acc),$s3);
+
+                &lea    ($acc,&DWP(16,$acc));
+                &mov    ($_out,$acc);           # save out
+
+                &lea    ($acc,$ivec);
+                &mov    ($s0,&DWP(0,$acc));     # read temp
+                &mov    ($s1,&DWP(4,$acc));
+                &mov    ($s2,&DWP(8,$acc));
+                &mov    ($s3,&DWP(12,$acc));
+
+                &mov    (&DWP(0,$key),$s0);     # copy iv
+                &mov    (&DWP(4,$key),$s1);
+                &mov    (&DWP(8,$key),$s2);
+                &mov    (&DWP(12,$key),$s3);
+
+                &mov    ($acc,$_inp);           # load inp
+
+                &lea    ($acc,&DWP(16,$acc));
+                &mov    ($_inp,$acc);           # save inp
+
+                &mov    ($s2,$_len);            # load len
+                &sub    ($s2,16);
+                &jc     (&label("dec_in_place_partial"));
+                &mov    ($_len,$s2);            # save len
+        &jnz    (&label("dec_in_place_loop"));
+        &jmp    (&label("dec_out"));
+
+    &align      (4);
+    &set_label("dec_in_place_partial");
+        # one can argue if this is actually required...
+        &mov    ($key eq "edi" ? $key : "",$_out);
+        &lea    ($acc eq "esi" ? $acc : "",$ivec);
+        &lea    ($key,&DWP(0,$key,$s2));
+        &lea    ($acc,&DWP(16,$acc,$s2));
+        &neg    ($s2 eq "ecx" ? $s2 : "");
+        &data_word(0xA4F3F689); # rep movsb     # restore tail
+
+    &align      (4);
+    &set_label("dec_out");
+    &cmp        ($mark,0);              # was the key schedule copied?
+    &mov        ("edi",$_key);
+    &je         (&label("skip_dzero"));
+    # zero copy of key schedule
+    &mov        ("ecx",240/4);
+    &xor        ("eax","eax");
+    &align      (4);
+    &data_word(0xABF3F689);     # rep stosd
+    &set_label("skip_dzero")
+    &mov        ("esp",$_esp);
+    &popf       ();
+&function_end("AES_cbc_encrypt");
+}
+
+#------------------------------------------------------------------#
+
+sub enckey()
+{
+        &movz   ("esi",&LB("edx"));             # rk[i]>>0
+        &mov    ("ebx",&DWP(2,"ebp","esi",8));
+        &movz   ("esi",&HB("edx"));             # rk[i]>>8
+        &and    ("ebx",0xFF000000);
+        &xor    ("eax","ebx");
+
+        &mov    ("ebx",&DWP(2,"ebp","esi",8));
+        &shr    ("edx",16);
+        &and    ("ebx",0x000000FF);
+        &movz   ("esi",&LB("edx"));             # rk[i]>>16
+        &xor    ("eax","ebx");
+
+        &mov    ("ebx",&DWP(0,"ebp","esi",8));
+        &movz   ("esi",&HB("edx"));             # rk[i]>>24
+        &and    ("ebx",0x0000FF00);
+        &xor    ("eax","ebx");
+
+        &mov    ("ebx",&DWP(0,"ebp","esi",8));
+        &and    ("ebx",0x00FF0000);
+        &xor    ("eax","ebx");
+
+        &xor    ("eax",&DWP(2048,"ebp","ecx",4));       # rcon
+}
+
+# int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+#                        AES_KEY *key)
+&public_label("AES_Te");
+&function_begin("AES_set_encrypt_key");
+        &mov    ("esi",&wparam(0));             # user supplied key
+        &mov    ("edi",&wparam(2));             # private key schedule
+
+        &test   ("esi",-1);
+        &jz     (&label("badpointer"));
+        &test   ("edi",-1);
+        &jz     (&label("badpointer"));
+
+        &call   (&label("pic_point"));
+        &set_label("pic_point");
+        &blindpop("ebp");
+        &lea    ("ebp",&DWP(&label("AES_Te")."-".&label("pic_point"),"ebp"));
+
+        &mov    ("ecx",&wparam(1));             # number of bits in key
+        &cmp    ("ecx",128);
+        &je     (&label("10rounds"));
+        &cmp    ("ecx",192);
+        &je     (&label("12rounds"));
+        &cmp    ("ecx",256);
+        &je     (&label("14rounds"));
+        &mov    ("eax",-2);                     # invalid number of bits
+        &jmp    (&label("exit"));
+
+    &set_label("10rounds");
+        &mov    ("eax",&DWP(0,"esi"));          # copy first 4 dwords
+        &mov    ("ebx",&DWP(4,"esi"));
+        &mov    ("ecx",&DWP(8,"esi"));
+        &mov    ("edx",&DWP(12,"esi"));
+        &mov    (&DWP(0,"edi"),"eax");
+        &mov    (&DWP(4,"edi"),"ebx");
+        &mov    (&DWP(8,"edi"),"ecx");
+        &mov    (&DWP(12,"edi"),"edx");
+
+        &xor    ("ecx","ecx");
+        &jmp    (&label("10shortcut"));
+
+        &align  (4);
+        &set_label("10loop");
+                &mov    ("eax",&DWP(0,"edi"));          # rk[0]
+                &mov    ("edx",&DWP(12,"edi"));         # rk[3]
+        &set_label("10shortcut");
+                &enckey ();
+
+                &mov    (&DWP(16,"edi"),"eax");         # rk[4]
+                &xor    ("eax",&DWP(4,"edi"));
+                &mov    (&DWP(20,"edi"),"eax");         # rk[5]
+                &xor    ("eax",&DWP(8,"edi"));
+                &mov    (&DWP(24,"edi"),"eax");         # rk[6]
+                &xor    ("eax",&DWP(12,"edi"));
+                &mov    (&DWP(28,"edi"),"eax");         # rk[7]
+                &inc    ("ecx");
+                &add    ("edi",16);
+                &cmp    ("ecx",10);
+        &jl     (&label("10loop"));
+
+        &mov    (&DWP(80,"edi"),10);            # setup number of rounds
+        &xor    ("eax","eax");
+        &jmp    (&label("exit"));
+                
+    &set_label("12rounds");
+        &mov    ("eax",&DWP(0,"esi"));          # copy first 6 dwords
+        &mov    ("ebx",&DWP(4,"esi"));
+        &mov    ("ecx",&DWP(8,"esi"));
+        &mov    ("edx",&DWP(12,"esi"));
+        &mov    (&DWP(0,"edi"),"eax");
+        &mov    (&DWP(4,"edi"),"ebx");
+        &mov    (&DWP(8,"edi"),"ecx");
+        &mov    (&DWP(12,"edi"),"edx");
+        &mov    ("ecx",&DWP(16,"esi"));
+        &mov    ("edx",&DWP(20,"esi"));
+        &mov    (&DWP(16,"edi"),"ecx");
+        &mov    (&DWP(20,"edi"),"edx");
+
+        &xor    ("ecx","ecx");
+        &jmp    (&label("12shortcut"));
+
+        &align  (4);
+        &set_label("12loop");
+                &mov    ("eax",&DWP(0,"edi"));          # rk[0]
+                &mov    ("edx",&DWP(20,"edi"));         # rk[5]
+        &set_label("12shortcut");
+                &enckey ();
+
+                &mov    (&DWP(24,"edi"),"eax");         # rk[6]
+                &xor    ("eax",&DWP(4,"edi"));
+                &mov    (&DWP(28,"edi"),"eax");         # rk[7]
+                &xor    ("eax",&DWP(8,"edi"));
+                &mov    (&DWP(32,"edi"),"eax");         # rk[8]
+                &xor    ("eax",&DWP(12,"edi"));
+                &mov    (&DWP(36,"edi"),"eax");         # rk[9]
+
+                &cmp    ("ecx",7);
+                &je     (&label("12break"));
+                &inc    ("ecx");
+
+                &xor    ("eax",&DWP(16,"edi"));
+                &mov    (&DWP(40,"edi"),"eax");         # rk[10]
+                &xor    ("eax",&DWP(20,"edi"));
+                &mov    (&DWP(44,"edi"),"eax");         # rk[11]
+
+                &add    ("edi",24);
+        &jmp    (&label("12loop"));
+
+        &set_label("12break");
+        &mov    (&DWP(72,"edi"),12);            # setup number of rounds
+        &xor    ("eax","eax");
+        &jmp    (&label("exit"));
+
+    &set_label("14rounds");
+        &mov    ("eax",&DWP(0,"esi"));          # copy first 8 dwords
+        &mov    ("ebx",&DWP(4,"esi"));
+        &mov    ("ecx",&DWP(8,"esi"));
+        &mov    ("edx",&DWP(12,"esi"));
+        &mov    (&DWP(0,"edi"),"eax");
+        &mov    (&DWP(4,"edi"),"ebx");
+        &mov    (&DWP(8,"edi"),"ecx");
+        &mov    (&DWP(12,"edi"),"edx");
+        &mov    ("eax",&DWP(16,"esi"));
+        &mov    ("ebx",&DWP(20,"esi"));
+        &mov    ("ecx",&DWP(24,"esi"));
+        &mov    ("edx",&DWP(28,"esi"));
+        &mov    (&DWP(16,"edi"),"eax");
+        &mov    (&DWP(20,"edi"),"ebx");
+        &mov    (&DWP(24,"edi"),"ecx");
+        &mov    (&DWP(28,"edi"),"edx");
+
+        &xor    ("ecx","ecx");
+        &jmp    (&label("14shortcut"));
+
+        &align  (4);
+        &set_label("14loop");
+                &mov    ("edx",&DWP(28,"edi"));         # rk[7]
+        &set_label("14shortcut");
+                &mov    ("eax",&DWP(0,"edi"));          # rk[0]
+
+                &enckey ();
+
+                &mov    (&DWP(32,"edi"),"eax");         # rk[8]
+                &xor    ("eax",&DWP(4,"edi"));
+                &mov    (&DWP(36,"edi"),"eax");         # rk[9]
+                &xor    ("eax",&DWP(8,"edi"));
+                &mov    (&DWP(40,"edi"),"eax");         # rk[10]
+                &xor    ("eax",&DWP(12,"edi"));
+                &mov    (&DWP(44,"edi"),"eax");         # rk[11]
+
+                &cmp    ("ecx",6);
+                &je     (&label("14break"));
+                &inc    ("ecx");
+
+                &mov    ("edx","eax");
+                &mov    ("eax",&DWP(16,"edi"));         # rk[4]
+                &movz   ("esi",&LB("edx"));             # rk[11]>>0
+                &mov    ("ebx",&DWP(2,"ebp","esi",8));
+                &movz   ("esi",&HB("edx"));             # rk[11]>>8
+                &and    ("ebx",0x000000FF);
+                &xor    ("eax","ebx");
+
+                &mov    ("ebx",&DWP(0,"ebp","esi",8));
+                &shr    ("edx",16);
+                &and    ("ebx",0x0000FF00);
+                &movz   ("esi",&LB("edx"));             # rk[11]>>16
+                &xor    ("eax","ebx");
+
+                &mov    ("ebx",&DWP(0,"ebp","esi",8));
+                &movz   ("esi",&HB("edx"));             # rk[11]>>24
+                &and    ("ebx",0x00FF0000);
+                &xor    ("eax","ebx");
+
+                &mov    ("ebx",&DWP(2,"ebp","esi",8));
+                &and    ("ebx",0xFF000000);
+                &xor    ("eax","ebx");
+
+                &mov    (&DWP(48,"edi"),"eax");         # rk[12]
+                &xor    ("eax",&DWP(20,"edi"));
+                &mov    (&DWP(52,"edi"),"eax");         # rk[13]
+                &xor    ("eax",&DWP(24,"edi"));
+                &mov    (&DWP(56,"edi"),"eax");         # rk[14]
+                &xor    ("eax",&DWP(28,"edi"));
+                &mov    (&DWP(60,"edi"),"eax");         # rk[15]
+
+                &add    ("edi",32);
+        &jmp    (&label("14loop"));
+
+        &set_label("14break");
+        &mov    (&DWP(48,"edi"),14);            # setup number of rounds
+        &xor    ("eax","eax");
+        &jmp    (&label("exit"));
+
+    &set_label("badpointer");
+        &mov    ("eax",-1);
+    &set_label("exit");
+&function_end("AES_set_encrypt_key");
+
+sub deckey()
+{ my ($i,$ptr,$te,$td) = @_;
+
+        &mov    ("eax",&DWP($i,$ptr));
+        &mov    ("edx","eax");
+        &movz   ("ebx",&HB("eax"));
+        &shr    ("edx",16);
+        &and    ("eax",0xFF);
+        &movz   ("eax",&BP(2,$te,"eax",8));
+        &movz   ("ebx",&BP(2,$te,"ebx",8));
+        &mov    ("eax",&DWP(0,$td,"eax",8));
+        &xor    ("eax",&DWP(3,$td,"ebx",8));
+        &movz   ("ebx",&HB("edx"));
+        &and    ("edx",0xFF);
+        &movz   ("edx",&BP(2,$te,"edx",8));
+        &movz   ("ebx",&BP(2,$te,"ebx",8));
+        &xor    ("eax",&DWP(2,$td,"edx",8));
+        &xor    ("eax",&DWP(1,$td,"ebx",8));
+        &mov    (&DWP($i,$ptr),"eax");
+}
+
+# int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+#                        AES_KEY *key)
+&public_label("AES_Td");
+&public_label("AES_Te");
+&function_begin_B("AES_set_decrypt_key");
+        &mov    ("eax",&wparam(0));
+        &mov    ("ecx",&wparam(1));
+        &mov    ("edx",&wparam(2));
+        &sub    ("esp",12);
+        &mov    (&DWP(0,"esp"),"eax");
+        &mov    (&DWP(4,"esp"),"ecx");
+        &mov    (&DWP(8,"esp"),"edx");
+        &call   ("AES_set_encrypt_key");
+        &add    ("esp",12);
+        &cmp    ("eax",0);
+        &je     (&label("proceed"));
+        &ret    ();
+
+    &set_label("proceed");
+        &push   ("ebp");
+        &push   ("ebx");
+        &push   ("esi");
+        &push   ("edi");
+
+        &mov    ("esi",&wparam(2));
+        &mov    ("ecx",&DWP(240,"esi"));        # pull number of rounds
+        &lea    ("ecx",&DWP(0,"","ecx",4));
+        &lea    ("edi",&DWP(0,"esi","ecx",4));  # pointer to last chunk
+
+        &align  (4);
+        &set_label("invert");                   # invert order of chunks
+                &mov    ("eax",&DWP(0,"esi"));
+                &mov    ("ebx",&DWP(4,"esi"));
+                &mov    ("ecx",&DWP(0,"edi"));
+                &mov    ("edx",&DWP(4,"edi"));
+                &mov    (&DWP(0,"edi"),"eax");
+                &mov    (&DWP(4,"edi"),"ebx");
+                &mov    (&DWP(0,"esi"),"ecx");
+                &mov    (&DWP(4,"esi"),"edx");
+                &mov    ("eax",&DWP(8,"esi"));
+                &mov    ("ebx",&DWP(12,"esi"));
+                &mov    ("ecx",&DWP(8,"edi"));
+                &mov    ("edx",&DWP(12,"edi"));
+                &mov    (&DWP(8,"edi"),"eax");
+                &mov    (&DWP(12,"edi"),"ebx");
+                &mov    (&DWP(8,"esi"),"ecx");
+                &mov    (&DWP(12,"esi"),"edx");
+                &add    ("esi",16);
+                &sub    ("edi",16);
+                &cmp    ("esi","edi");
+        &jne    (&label("invert"));
+
+        &call   (&label("pic_point"));
+        &set_label("pic_point");
+        blindpop("ebp");
+        &lea    ("edi",&DWP(&label("AES_Td")."-".&label("pic_point"),"ebp"));
+        &lea    ("ebp",&DWP(&label("AES_Te")."-".&label("pic_point"),"ebp"));
+
+        &mov    ("esi",&wparam(2));
+        &mov    ("ecx",&DWP(240,"esi"));        # pull number of rounds
+        &dec    ("ecx");
+        &align  (4);
+        &set_label("permute");                  # permute the key schedule
+                &add    ("esi",16);
+                &deckey (0,"esi","ebp","edi");
+                &deckey (4,"esi","ebp","edi");
+                &deckey (8,"esi","ebp","edi");
+                &deckey (12,"esi","ebp","edi");
+                &dec    ("ecx");
+        &jnz    (&label("permute"));
+
+        &xor    ("eax","eax");                  # return success
+&function_end("AES_set_decrypt_key");
+
+&asm_finish();
diff --git a/src/lib/libssl/src/crypto/aes/asm/aes-ia64.S b/src/lib/libssl/src/crypto/aes/asm/aes-ia64.S
new file mode 100644
index 0000000000..7f6c4c3662
--- /dev/null
+++ b/src/lib/libssl/src/crypto/aes/asm/aes-ia64.S
@@ -0,0 +1,1123 @@
+// ====================================================================
+// Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+// project. Rights for redistribution and usage in source and binary
+// forms are granted according to the OpenSSL license.
+// ====================================================================
+//
+// What's wrong with compiler generated code? Compiler never uses
+// variable 'shr' which is pairable with 'extr'/'dep' instructions.
+// Then it uses 'zxt' which is an I-type, but can be replaced with
+// 'and' which in turn can be assigned to M-port [there're double as
+// much M-ports as there're I-ports on Itanium 2]. By sacrificing few
+// registers for small constants (255, 24 and 16) to be used with
+// 'shr' and 'and' instructions I can achieve better ILP, Intruction
+// Level Parallelism, and performance. This code outperforms GCC 3.3
+// generated code by over factor of 2 (two), GCC 3.4 - by 70% and
+// HP C - by 40%. Measured best-case scenario, i.e. aligned
+// big-endian input, ECB timing on Itanium 2 is (18 + 13*rounds)
+// ticks per block, or 9.25 CPU cycles per byte for 128 bit key.
+
+// Version 1.2 mitigates the hazard of cache-timing attacks by
+// a) compressing S-boxes from 8KB to 2KB+256B, b) scheduling
+// references to S-boxes for L2 cache latency, c) prefetching T[ed]4
+// prior last round. As result performance dropped to (26 + 15*rounds)
+// ticks per block or 11 cycles per byte processed with 128-bit key.
+// This is ~16% deterioration. For reference Itanium 2 L1 cache has
+// 64 bytes line size and L2 - 128 bytes...
+
+.ident  "aes-ia64.S, version 1.2"
+.ident  "IA-64 ISA artwork by Andy Polyakov <appro@fy.chalmers.se>"
+.explicit
+.text
+
+rk0=r8;     rk1=r9;
+
+pfssave=r2;
+lcsave=r10;
+prsave=r3;
+maskff=r11;
+twenty4=r14;
+sixteen=r15;
+
+te00=r16;   te11=r17;   te22=r18;   te33=r19;
+te01=r20;   te12=r21;   te23=r22;   te30=r23;
+te02=r24;   te13=r25;   te20=r26;   te31=r27;
+te03=r28;   te10=r29;   te21=r30;   te32=r31;
+
+// these are rotating...
+t0=r32;     s0=r33;
+t1=r34;     s1=r35;
+t2=r36;     s2=r37;
+t3=r38;     s3=r39;
+
+te0=r40;    te1=r41;    te2=r42;    te3=r43;
+
+#if defined(_HPUX_SOURCE) && !defined(_LP64)
+# define ADDP   addp4
+#else
+# define ADDP   add
+#endif
+
+// Offsets from Te0
+#define TE0     0
+#define TE2     2
+#if defined(_HPUX_SOURCE) || defined(B_ENDIAN)
+#define TE1     3
+#define TE3     1
+#else
+#define TE1     1
+#define TE3     3
+#endif
+
+// This implies that AES_KEY comprises 32-bit key schedule elements
+// even on LP64 platforms.
+#ifndef KSZ
+# define KSZ    4
+# define LDKEY  ld4
+#endif
+
+.proc   _ia64_AES_encrypt#
+// Input:       rk0-rk1
+//              te0
+//              te3     as AES_KEY->rounds!!!
+//              s0-s3
+//              maskff,twenty4,sixteen
+// Output:      r16,r20,r24,r28 as s0-s3
+// Clobber:     r16-r31,rk0-rk1,r32-r43
+.align  32
+_ia64_AES_encrypt:
+        .prologue
+        .altrp  b6
+        .body
+{ .mmi; alloc   r16=ar.pfs,12,0,0,8
+        LDKEY   t0=[rk0],2*KSZ
+        mov     pr.rot=1<<16    }
+{ .mmi; LDKEY   t1=[rk1],2*KSZ
+        add     te1=TE1,te0
+        add     te3=-3,te3      };;
+{ .mib; LDKEY   t2=[rk0],2*KSZ
+        mov     ar.ec=2         }
+{ .mib; LDKEY   t3=[rk1],2*KSZ
+        add     te2=TE2,te0
+        brp.loop.imp    .Le_top,.Le_end-16      };;
+
+{ .mmi; xor     s0=s0,t0
+        xor     s1=s1,t1
+        mov     ar.lc=te3       }
+{ .mmi; xor     s2=s2,t2
+        xor     s3=s3,t3
+        add     te3=TE3,te0     };;
+
+.align  32
+.Le_top:
+{ .mmi; (p0)    LDKEY   t0=[rk0],2*KSZ          // 0/0:rk[0]
+        (p0)    and     te33=s3,maskff          // 0/0:s3&0xff
+        (p0)    extr.u  te22=s2,8,8     }       // 0/0:s2>>8&0xff
+{ .mmi; (p0)    LDKEY   t1=[rk1],2*KSZ          // 0/1:rk[1]
+        (p0)    and     te30=s0,maskff          // 0/1:s0&0xff
+        (p0)    shr.u   te00=s0,twenty4 };;     // 0/0:s0>>24
+{ .mmi; (p0)    LDKEY   t2=[rk0],2*KSZ          // 1/2:rk[2]
+        (p0)    shladd  te33=te33,3,te3         // 1/0:te0+s0>>24
+        (p0)    extr.u  te23=s3,8,8     }       // 1/1:s3>>8&0xff
+{ .mmi; (p0)    LDKEY   t3=[rk1],2*KSZ          // 1/3:rk[3]
+        (p0)    shladd  te30=te30,3,te3         // 1/1:te3+s0
+        (p0)    shr.u   te01=s1,twenty4 };;     // 1/1:s1>>24
+{ .mmi; (p0)    ld4     te33=[te33]             // 2/0:te3[s3&0xff]
+        (p0)    shladd  te22=te22,3,te2         // 2/0:te2+s2>>8&0xff
+        (p0)    extr.u  te20=s0,8,8     }       // 2/2:s0>>8&0xff
+{ .mmi; (p0)    ld4     te30=[te30]             // 2/1:te3[s0]
+        (p0)    shladd  te23=te23,3,te2         // 2/1:te2+s3>>8
+        (p0)    shr.u   te02=s2,twenty4 };;     // 2/2:s2>>24
+{ .mmi; (p0)    ld4     te22=[te22]             // 3/0:te2[s2>>8]
+        (p0)    shladd  te20=te20,3,te2         // 3/2:te2+s0>>8
+        (p0)    extr.u  te21=s1,8,8     }       // 3/3:s1>>8&0xff
+{ .mmi; (p0)    ld4     te23=[te23]             // 3/1:te2[s3>>8]
+        (p0)    shladd  te00=te00,3,te0         // 3/0:te0+s0>>24
+        (p0)    shr.u   te03=s3,twenty4 };;     // 3/3:s3>>24
+{ .mmi; (p0)    ld4     te20=[te20]             // 4/2:te2[s0>>8]
+        (p0)    shladd  te21=te21,3,te2         // 4/3:te3+s2
+        (p0)    extr.u  te11=s1,16,8    }       // 4/0:s1>>16&0xff
+{ .mmi; (p0)    ld4     te00=[te00]             // 4/0:te0[s0>>24]
+        (p0)    shladd  te01=te01,3,te0         // 4/1:te0+s1>>24
+        (p0)    shr.u   te13=s3,sixteen };;     // 4/2:s3>>16
+{ .mmi; (p0)    ld4     te21=[te21]             // 5/3:te2[s1>>8]
+        (p0)    shladd  te11=te11,3,te1         // 5/0:te1+s1>>16
+        (p0)    extr.u  te12=s2,16,8    }       // 5/1:s2>>16&0xff
+{ .mmi; (p0)    ld4     te01=[te01]             // 5/1:te0[s1>>24]
+        (p0)    shladd  te02=te02,3,te0         // 5/2:te0+s2>>24
+        (p0)    and     te31=s1,maskff  };;     // 5/2:s1&0xff
+{ .mmi; (p0)    ld4     te11=[te11]             // 6/0:te1[s1>>16]
+        (p0)    shladd  te12=te12,3,te1         // 6/1:te1+s2>>16
+        (p0)    extr.u  te10=s0,16,8    }       // 6/3:s0>>16&0xff
+{ .mmi; (p0)    ld4     te02=[te02]             // 6/2:te0[s2>>24]
+        (p0)    shladd  te03=te03,3,te0         // 6/3:te1+s0>>16
+        (p0)    and     te32=s2,maskff  };;     // 6/3:s2&0xff
+
+{ .mmi; (p0)    ld4     te12=[te12]             // 7/1:te1[s2>>16]
+        (p0)    shladd  te31=te31,3,te3         // 7/2:te3+s1&0xff
+        (p0)    and     te13=te13,maskff}       // 7/2:s3>>16&0xff
+{ .mmi; (p0)    ld4     te03=[te03]             // 7/3:te0[s3>>24]
+        (p0)    shladd  te32=te32,3,te3         // 7/3:te3+s2
+        (p0)    xor     t0=t0,te33      };;     // 7/0:
+{ .mmi; (p0)    ld4     te31=[te31]             // 8/2:te3[s1]
+        (p0)    shladd  te13=te13,3,te1         // 8/2:te1+s3>>16
+        (p0)    xor     t0=t0,te22      }       // 8/0:
+{ .mmi; (p0)    ld4     te32=[te32]             // 8/3:te3[s2]
+        (p0)    shladd  te10=te10,3,te1         // 8/3:te1+s0>>16
+        (p0)    xor     t1=t1,te30      };;     // 8/1:
+{ .mmi; (p0)    ld4     te13=[te13]             // 9/2:te1[s3>>16]
+        (p0)    ld4     te10=[te10]             // 9/3:te1[s0>>16]
+        (p0)    xor     t0=t0,te00      };;     // 9/0:         !L2 scheduling
+{ .mmi; (p0)    xor     t1=t1,te23              // 10[9]/1:     
+        (p0)    xor     t2=t2,te20              // 10[9]/2:
+        (p0)    xor     t3=t3,te21      };;     // 10[9]/3:
+{ .mmi; (p0)    xor     t0=t0,te11              // 11[10]/0:done!
+        (p0)    xor     t1=t1,te01              // 11[10]/1:
+        (p0)    xor     t2=t2,te02      };;     // 11[10]/2:    !L2 scheduling
+{ .mmi; (p0)    xor     t3=t3,te03              // 12[10]/3:
+        (p16)   cmp.eq  p0,p17=r0,r0    };;     // 12[10]/clear (p17)
+{ .mmi; (p0)    xor     t1=t1,te12              // 13[11]/1:done!
+        (p0)    xor     t2=t2,te31              // 13[11]/2:
+        (p0)    xor     t3=t3,te32      }       // 13[11]/3:
+{ .mmi; (p17)   add     te0=2048,te0            // 13[11]/
+        (p17)   add     te1=2048+64-TE1,te1};;  // 13[11]/
+{ .mib; (p0)    xor     t2=t2,te13              // 14[12]/2:done!
+        (p17)   add     te2=2048+128-TE2,te2}   // 14[12]/
+{ .mib; (p0)    xor     t3=t3,te10              // 14[12]/3:done!
+        (p17)   add     te3=2048+192-TE3,te3    // 14[12]/
+        br.ctop.sptk    .Le_top         };;
+.Le_end:
+
+
+{ .mmi; ld8     te12=[te0]              // prefetch Te4
+        ld8     te31=[te1]      }
+{ .mmi; ld8     te10=[te2]
+        ld8     te32=[te3]      }
+
+{ .mmi; LDKEY   t0=[rk0],2*KSZ          // 0/0:rk[0]
+        and     te33=s3,maskff          // 0/0:s3&0xff
+        extr.u  te22=s2,8,8     }       // 0/0:s2>>8&0xff
+{ .mmi; LDKEY   t1=[rk1],2*KSZ          // 0/1:rk[1]
+        and     te30=s0,maskff          // 0/1:s0&0xff
+        shr.u   te00=s0,twenty4 };;     // 0/0:s0>>24
+{ .mmi; LDKEY   t2=[rk0],2*KSZ          // 1/2:rk[2]
+        add     te33=te33,te0           // 1/0:te0+s0>>24
+        extr.u  te23=s3,8,8     }       // 1/1:s3>>8&0xff
+{ .mmi; LDKEY   t3=[rk1],2*KSZ          // 1/3:rk[3]
+        add     te30=te30,te0           // 1/1:te0+s0
+        shr.u   te01=s1,twenty4 };;     // 1/1:s1>>24
+{ .mmi; ld1     te33=[te33]             // 2/0:te0[s3&0xff]
+        add     te22=te22,te0           // 2/0:te0+s2>>8&0xff
+        extr.u  te20=s0,8,8     }       // 2/2:s0>>8&0xff
+{ .mmi; ld1     te30=[te30]             // 2/1:te0[s0]
+        add     te23=te23,te0           // 2/1:te0+s3>>8
+        shr.u   te02=s2,twenty4 };;     // 2/2:s2>>24
+{ .mmi; ld1     te22=[te22]             // 3/0:te0[s2>>8]
+        add     te20=te20,te0           // 3/2:te0+s0>>8
+        extr.u  te21=s1,8,8     }       // 3/3:s1>>8&0xff
+{ .mmi; ld1     te23=[te23]             // 3/1:te0[s3>>8]
+        add     te00=te00,te0           // 3/0:te0+s0>>24
+        shr.u   te03=s3,twenty4 };;     // 3/3:s3>>24
+{ .mmi; ld1     te20=[te20]             // 4/2:te0[s0>>8]
+        add     te21=te21,te0           // 4/3:te0+s2
+        extr.u  te11=s1,16,8    }       // 4/0:s1>>16&0xff
+{ .mmi; ld1     te00=[te00]             // 4/0:te0[s0>>24]
+        add     te01=te01,te0           // 4/1:te0+s1>>24
+        shr.u   te13=s3,sixteen };;     // 4/2:s3>>16
+{ .mmi; ld1     te21=[te21]             // 5/3:te0[s1>>8]
+        add     te11=te11,te0           // 5/0:te0+s1>>16
+        extr.u  te12=s2,16,8    }       // 5/1:s2>>16&0xff
+{ .mmi; ld1     te01=[te01]             // 5/1:te0[s1>>24]
+        add     te02=te02,te0           // 5/2:te0+s2>>24
+        and     te31=s1,maskff  };;     // 5/2:s1&0xff
+{ .mmi; ld1     te11=[te11]             // 6/0:te0[s1>>16]
+        add     te12=te12,te0           // 6/1:te0+s2>>16
+        extr.u  te10=s0,16,8    }       // 6/3:s0>>16&0xff
+{ .mmi; ld1     te02=[te02]             // 6/2:te0[s2>>24]
+        add     te03=te03,te0           // 6/3:te0+s0>>16
+        and     te32=s2,maskff  };;     // 6/3:s2&0xff
+
+{ .mmi; ld1     te12=[te12]             // 7/1:te0[s2>>16]
+        add     te31=te31,te0           // 7/2:te0+s1&0xff
+        dep     te33=te22,te33,8,8}     // 7/0:
+{ .mmi; ld1     te03=[te03]             // 7/3:te0[s3>>24]
+        add     te32=te32,te0           // 7/3:te0+s2
+        and     te13=te13,maskff};;     // 7/2:s3>>16&0xff
+{ .mmi; ld1     te31=[te31]             // 8/2:te0[s1]
+        add     te13=te13,te0           // 8/2:te0+s3>>16
+        dep     te30=te23,te30,8,8}     // 8/1:
+{ .mmi; ld1     te32=[te32]             // 8/3:te0[s2]
+        add     te10=te10,te0           // 8/3:te0+s0>>16
+        shl     te00=te00,twenty4};;    // 8/0:
+{ .mii; ld1     te13=[te13]             // 9/2:te0[s3>>16]
+        dep     te33=te11,te33,16,8     // 9/0:
+        shl     te01=te01,twenty4};;    // 9/1:
+{ .mii; ld1     te10=[te10]             // 10/3:te0[s0>>16]
+        dep     te31=te20,te31,8,8      // 10/2:
+        shl     te02=te02,twenty4};;    // 10/2:
+{ .mii; xor     t0=t0,te33              // 11/0:
+        dep     te32=te21,te32,8,8      // 11/3:
+        shl     te12=te12,sixteen};;    // 11/1:
+{ .mii; xor     r16=t0,te00             // 12/0:done!
+        dep     te31=te13,te31,16,8     // 12/2:
+        shl     te03=te03,twenty4};;    // 12/3:
+{ .mmi; xor     t1=t1,te01              // 13/1:
+        xor     t2=t2,te02              // 13/2:
+        dep     te32=te10,te32,16,8};;  // 13/3:
+{ .mmi; xor     t1=t1,te30              // 14/1:
+        xor     r24=t2,te31             // 14/2:done!
+        xor     t3=t3,te32      };;     // 14/3:
+{ .mib; xor     r20=t1,te12             // 15/1:done!
+        xor     r28=t3,te03             // 15/3:done!
+        br.ret.sptk     b6      };;
+.endp   _ia64_AES_encrypt#
+
+// void AES_encrypt (const void *in,void *out,const AES_KEY *key);
+.global AES_encrypt#
+.proc   AES_encrypt#
+.align  32
+AES_encrypt:
+        .prologue
+        .save   ar.pfs,pfssave
+{ .mmi; alloc   pfssave=ar.pfs,3,1,12,0
+        and     out0=3,in0
+        mov     r3=ip                   }
+{ .mmi; ADDP    in0=0,in0
+        mov     loc0=psr.um
+        ADDP    out11=KSZ*60,in2        };;     // &AES_KEY->rounds
+
+{ .mmi; ld4     out11=[out11]                   // AES_KEY->rounds
+        add     out8=(AES_Te#-AES_encrypt#),r3  // Te0
+        .save   pr,prsave
+        mov     prsave=pr               }
+{ .mmi; rum     1<<3                            // clear um.ac
+        .save   ar.lc,lcsave
+        mov     lcsave=ar.lc            };;
+
+        .body
+#if defined(_HPUX_SOURCE)       // HPUX is big-endian, cut 15+15 cycles...
+{ .mib; cmp.ne  p6,p0=out0,r0
+        add     out0=4,in0
+(p6)    br.dpnt.many    .Le_i_unaligned };;
+
+{ .mmi; ld4     out1=[in0],8            // s0
+        and     out9=3,in1
+        mov     twenty4=24              }
+{ .mmi; ld4     out3=[out0],8           // s1
+        ADDP    rk0=0,in2
+        mov     sixteen=16              };;
+{ .mmi; ld4     out5=[in0]              // s2
+        cmp.ne  p6,p0=out9,r0
+        mov     maskff=0xff             }
+{ .mmb; ld4     out7=[out0]             // s3
+        ADDP    rk1=KSZ,in2
+        br.call.sptk.many       b6=_ia64_AES_encrypt    };;
+
+{ .mib; ADDP    in0=4,in1
+        ADDP    in1=0,in1
+(p6)    br.spnt .Le_o_unaligned         };;
+
+{ .mii; mov     psr.um=loc0
+        mov     ar.pfs=pfssave
+        mov     ar.lc=lcsave            };;
+{ .mmi; st4     [in1]=r16,8             // s0
+        st4     [in0]=r20,8             // s1
+        mov     pr=prsave,0x1ffff       };;
+{ .mmb; st4     [in1]=r24               // s2
+        st4     [in0]=r28               // s3
+        br.ret.sptk.many        b0      };;
+#endif
+
+.align  32
+.Le_i_unaligned:
+{ .mmi; add     out0=1,in0
+        add     out2=2,in0
+        add     out4=3,in0      };;
+{ .mmi; ld1     r16=[in0],4
+        ld1     r17=[out0],4    }//;;
+{ .mmi; ld1     r18=[out2],4
+        ld1     out1=[out4],4   };;     // s0
+{ .mmi; ld1     r20=[in0],4
+        ld1     r21=[out0],4    }//;;
+{ .mmi; ld1     r22=[out2],4
+        ld1     out3=[out4],4   };;     // s1
+{ .mmi; ld1     r24=[in0],4
+        ld1     r25=[out0],4    }//;;
+{ .mmi; ld1     r26=[out2],4
+        ld1     out5=[out4],4   };;     // s2
+{ .mmi; ld1     r28=[in0]
+        ld1     r29=[out0]      }//;;
+{ .mmi; ld1     r30=[out2]
+        ld1     out7=[out4]     };;     // s3
+
+{ .mii;
+        dep     out1=r16,out1,24,8      //;;
+        dep     out3=r20,out3,24,8      }//;;
+{ .mii; ADDP    rk0=0,in2
+        dep     out5=r24,out5,24,8      //;;
+        dep     out7=r28,out7,24,8      };;
+{ .mii; ADDP    rk1=KSZ,in2
+        dep     out1=r17,out1,16,8      //;;
+        dep     out3=r21,out3,16,8      }//;;
+{ .mii; mov     twenty4=24
+        dep     out5=r25,out5,16,8      //;;
+        dep     out7=r29,out7,16,8      };;
+{ .mii; mov     sixteen=16
+        dep     out1=r18,out1,8,8       //;;
+        dep     out3=r22,out3,8,8       }//;;
+{ .mii; mov     maskff=0xff
+        dep     out5=r26,out5,8,8       //;;
+        dep     out7=r30,out7,8,8       };;
+
+{ .mib; br.call.sptk.many       b6=_ia64_AES_encrypt    };;
+
+.Le_o_unaligned:
+{ .mii; ADDP    out0=0,in1
+        extr.u  r17=r16,8,8                     // s0
+        shr.u   r19=r16,twenty4         }//;;
+{ .mii; ADDP    out1=1,in1
+        extr.u  r18=r16,16,8
+        shr.u   r23=r20,twenty4         }//;;   // s1
+{ .mii; ADDP    out2=2,in1
+        extr.u  r21=r20,8,8
+        shr.u   r22=r20,sixteen         }//;;
+{ .mii; ADDP    out3=3,in1
+        extr.u  r25=r24,8,8                     // s2
+        shr.u   r27=r24,twenty4         };;
+{ .mii; st1     [out3]=r16,4
+        extr.u  r26=r24,16,8
+        shr.u   r31=r28,twenty4         }//;;   // s3
+{ .mii; st1     [out2]=r17,4
+        extr.u  r29=r28,8,8
+        shr.u   r30=r28,sixteen         }//;;
+
+{ .mmi; st1     [out1]=r18,4
+        st1     [out0]=r19,4            };;
+{ .mmi; st1     [out3]=r20,4
+        st1     [out2]=r21,4            }//;;
+{ .mmi; st1     [out1]=r22,4
+        st1     [out0]=r23,4            };;
+{ .mmi; st1     [out3]=r24,4
+        st1     [out2]=r25,4
+        mov     pr=prsave,0x1ffff       }//;;
+{ .mmi; st1     [out1]=r26,4
+        st1     [out0]=r27,4
+        mov     ar.pfs=pfssave          };;
+{ .mmi; st1     [out3]=r28
+        st1     [out2]=r29
+        mov     ar.lc=lcsave            }//;;
+{ .mmi; st1     [out1]=r30
+        st1     [out0]=r31              }
+{ .mfb; mov     psr.um=loc0                     // restore user mask
+        br.ret.sptk.many        b0      };;
+.endp   AES_encrypt#
+
+// *AES_decrypt are autogenerated by the following script:
+#if 0
+#!/usr/bin/env perl
+print "// *AES_decrypt are autogenerated by the following script:\n#if 0\n";
+open(PROG,'<'.$0); while(<PROG>) { print; } close(PROG);
+print "#endif\n";
+while(<>) {
+        $process=1      if (/\.proc\s+_ia64_AES_encrypt/);
+        next            if (!$process);
+
+        #s/te00=s0/td00=s0/;    s/te00/td00/g;
+        s/te11=s1/td13=s3/;     s/te11/td13/g;
+        #s/te22=s2/td22=s2/;    s/te22/td22/g;
+        s/te33=s3/td31=s1/;     s/te33/td31/g;
+
+        #s/te01=s1/td01=s1/;    s/te01/td01/g;
+        s/te12=s2/td10=s0/;     s/te12/td10/g;
+        #s/te23=s3/td23=s3/;    s/te23/td23/g;
+        s/te30=s0/td32=s2/;     s/te30/td32/g;
+
+        #s/te02=s2/td02=s2/;    s/te02/td02/g;
+        s/te13=s3/td11=s1/;     s/te13/td11/g;
+        #s/te20=s0/td20=s0/;    s/te20/td20/g;
+        s/te31=s1/td33=s3/;     s/te31/td33/g;
+
+        #s/te03=s3/td03=s3/;    s/te03/td03/g;
+        s/te10=s0/td12=s2/;     s/te10/td12/g;
+        #s/te21=s1/td21=s1/;    s/te21/td21/g;
+        s/te32=s2/td30=s0/;     s/te32/td30/g;
+
+        s/td/te/g;
+
+        s/AES_encrypt/AES_decrypt/g;
+        s/\.Le_/.Ld_/g;
+        s/AES_Te#/AES_Td#/g;
+
+        print;
+
+        exit            if (/\.endp\s+AES_decrypt/);
+}
+#endif
+.proc   _ia64_AES_decrypt#
+// Input:       rk0-rk1
+//              te0
+//              te3     as AES_KEY->rounds!!!
+//              s0-s3
+//              maskff,twenty4,sixteen
+// Output:      r16,r20,r24,r28 as s0-s3
+// Clobber:     r16-r31,rk0-rk1,r32-r43
+.align  32
+_ia64_AES_decrypt:
+        .prologue
+        .altrp  b6
+        .body
+{ .mmi; alloc   r16=ar.pfs,12,0,0,8
+        LDKEY   t0=[rk0],2*KSZ
+        mov     pr.rot=1<<16    }
+{ .mmi; LDKEY   t1=[rk1],2*KSZ
+        add     te1=TE1,te0
+        add     te3=-3,te3      };;
+{ .mib; LDKEY   t2=[rk0],2*KSZ
+        mov     ar.ec=2         }
+{ .mib; LDKEY   t3=[rk1],2*KSZ
+        add     te2=TE2,te0
+        brp.loop.imp    .Ld_top,.Ld_end-16      };;
+
+{ .mmi; xor     s0=s0,t0
+        xor     s1=s1,t1
+        mov     ar.lc=te3       }
+{ .mmi; xor     s2=s2,t2
+        xor     s3=s3,t3
+        add     te3=TE3,te0     };;
+
+.align  32
+.Ld_top:
+{ .mmi; (p0)    LDKEY   t0=[rk0],2*KSZ          // 0/0:rk[0]
+        (p0)    and     te31=s1,maskff          // 0/0:s3&0xff
+        (p0)    extr.u  te22=s2,8,8     }       // 0/0:s2>>8&0xff
+{ .mmi; (p0)    LDKEY   t1=[rk1],2*KSZ          // 0/1:rk[1]
+        (p0)    and     te32=s2,maskff          // 0/1:s0&0xff
+        (p0)    shr.u   te00=s0,twenty4 };;     // 0/0:s0>>24
+{ .mmi; (p0)    LDKEY   t2=[rk0],2*KSZ          // 1/2:rk[2]
+        (p0)    shladd  te31=te31,3,te3         // 1/0:te0+s0>>24
+        (p0)    extr.u  te23=s3,8,8     }       // 1/1:s3>>8&0xff
+{ .mmi; (p0)    LDKEY   t3=[rk1],2*KSZ          // 1/3:rk[3]
+        (p0)    shladd  te32=te32,3,te3         // 1/1:te3+s0
+        (p0)    shr.u   te01=s1,twenty4 };;     // 1/1:s1>>24
+{ .mmi; (p0)    ld4     te31=[te31]             // 2/0:te3[s3&0xff]
+        (p0)    shladd  te22=te22,3,te2         // 2/0:te2+s2>>8&0xff
+        (p0)    extr.u  te20=s0,8,8     }       // 2/2:s0>>8&0xff
+{ .mmi; (p0)    ld4     te32=[te32]             // 2/1:te3[s0]
+        (p0)    shladd  te23=te23,3,te2         // 2/1:te2+s3>>8
+        (p0)    shr.u   te02=s2,twenty4 };;     // 2/2:s2>>24
+{ .mmi; (p0)    ld4     te22=[te22]             // 3/0:te2[s2>>8]
+        (p0)    shladd  te20=te20,3,te2         // 3/2:te2+s0>>8
+        (p0)    extr.u  te21=s1,8,8     }       // 3/3:s1>>8&0xff
+{ .mmi; (p0)    ld4     te23=[te23]             // 3/1:te2[s3>>8]
+        (p0)    shladd  te00=te00,3,te0         // 3/0:te0+s0>>24
+        (p0)    shr.u   te03=s3,twenty4 };;     // 3/3:s3>>24
+{ .mmi; (p0)    ld4     te20=[te20]             // 4/2:te2[s0>>8]
+        (p0)    shladd  te21=te21,3,te2         // 4/3:te3+s2
+        (p0)    extr.u  te13=s3,16,8    }       // 4/0:s1>>16&0xff
+{ .mmi; (p0)    ld4     te00=[te00]             // 4/0:te0[s0>>24]
+        (p0)    shladd  te01=te01,3,te0         // 4/1:te0+s1>>24
+        (p0)    shr.u   te11=s1,sixteen };;     // 4/2:s3>>16
+{ .mmi; (p0)    ld4     te21=[te21]             // 5/3:te2[s1>>8]
+        (p0)    shladd  te13=te13,3,te1         // 5/0:te1+s1>>16
+        (p0)    extr.u  te10=s0,16,8    }       // 5/1:s2>>16&0xff
+{ .mmi; (p0)    ld4     te01=[te01]             // 5/1:te0[s1>>24]
+        (p0)    shladd  te02=te02,3,te0         // 5/2:te0+s2>>24
+        (p0)    and     te33=s3,maskff  };;     // 5/2:s1&0xff
+{ .mmi; (p0)    ld4     te13=[te13]             // 6/0:te1[s1>>16]
+        (p0)    shladd  te10=te10,3,te1         // 6/1:te1+s2>>16
+        (p0)    extr.u  te12=s2,16,8    }       // 6/3:s0>>16&0xff
+{ .mmi; (p0)    ld4     te02=[te02]             // 6/2:te0[s2>>24]
+        (p0)    shladd  te03=te03,3,te0         // 6/3:te1+s0>>16
+        (p0)    and     te30=s0,maskff  };;     // 6/3:s2&0xff
+
+{ .mmi; (p0)    ld4     te10=[te10]             // 7/1:te1[s2>>16]
+        (p0)    shladd  te33=te33,3,te3         // 7/2:te3+s1&0xff
+        (p0)    and     te11=te11,maskff}       // 7/2:s3>>16&0xff
+{ .mmi; (p0)    ld4     te03=[te03]             // 7/3:te0[s3>>24]
+        (p0)    shladd  te30=te30,3,te3         // 7/3:te3+s2
+        (p0)    xor     t0=t0,te31      };;     // 7/0:
+{ .mmi; (p0)    ld4     te33=[te33]             // 8/2:te3[s1]
+        (p0)    shladd  te11=te11,3,te1         // 8/2:te1+s3>>16
+        (p0)    xor     t0=t0,te22      }       // 8/0:
+{ .mmi; (p0)    ld4     te30=[te30]             // 8/3:te3[s2]
+        (p0)    shladd  te12=te12,3,te1         // 8/3:te1+s0>>16
+        (p0)    xor     t1=t1,te32      };;     // 8/1:
+{ .mmi; (p0)    ld4     te11=[te11]             // 9/2:te1[s3>>16]
+        (p0)    ld4     te12=[te12]             // 9/3:te1[s0>>16]
+        (p0)    xor     t0=t0,te00      };;     // 9/0:         !L2 scheduling
+{ .mmi; (p0)    xor     t1=t1,te23              // 10[9]/1:     
+        (p0)    xor     t2=t2,te20              // 10[9]/2:
+        (p0)    xor     t3=t3,te21      };;     // 10[9]/3:
+{ .mmi; (p0)    xor     t0=t0,te13              // 11[10]/0:done!
+        (p0)    xor     t1=t1,te01              // 11[10]/1:
+        (p0)    xor     t2=t2,te02      };;     // 11[10]/2:    !L2 scheduling
+{ .mmi; (p0)    xor     t3=t3,te03              // 12[10]/3:
+        (p16)   cmp.eq  p0,p17=r0,r0    };;     // 12[10]/clear (p17)
+{ .mmi; (p0)    xor     t1=t1,te10              // 13[11]/1:done!
+        (p0)    xor     t2=t2,te33              // 13[11]/2:
+        (p0)    xor     t3=t3,te30      }       // 13[11]/3:
+{ .mmi; (p17)   add     te0=2048,te0            // 13[11]/
+        (p17)   add     te1=2048+64-TE1,te1};;  // 13[11]/
+{ .mib; (p0)    xor     t2=t2,te11              // 14[12]/2:done!
+        (p17)   add     te2=2048+128-TE2,te2}   // 14[12]/
+{ .mib; (p0)    xor     t3=t3,te12              // 14[12]/3:done!
+        (p17)   add     te3=2048+192-TE3,te3    // 14[12]/
+        br.ctop.sptk    .Ld_top         };;
+.Ld_end:
+
+
+{ .mmi; ld8     te10=[te0]              // prefetch Td4
+        ld8     te33=[te1]      }
+{ .mmi; ld8     te12=[te2]
+        ld8     te30=[te3]      }
+
+{ .mmi; LDKEY   t0=[rk0],2*KSZ          // 0/0:rk[0]
+        and     te31=s1,maskff          // 0/0:s3&0xff
+        extr.u  te22=s2,8,8     }       // 0/0:s2>>8&0xff
+{ .mmi; LDKEY   t1=[rk1],2*KSZ          // 0/1:rk[1]
+        and     te32=s2,maskff          // 0/1:s0&0xff
+        shr.u   te00=s0,twenty4 };;     // 0/0:s0>>24
+{ .mmi; LDKEY   t2=[rk0],2*KSZ          // 1/2:rk[2]
+        add     te31=te31,te0           // 1/0:te0+s0>>24
+        extr.u  te23=s3,8,8     }       // 1/1:s3>>8&0xff
+{ .mmi; LDKEY   t3=[rk1],2*KSZ          // 1/3:rk[3]
+        add     te32=te32,te0           // 1/1:te0+s0
+        shr.u   te01=s1,twenty4 };;     // 1/1:s1>>24
+{ .mmi; ld1     te31=[te31]             // 2/0:te0[s3&0xff]
+        add     te22=te22,te0           // 2/0:te0+s2>>8&0xff
+        extr.u  te20=s0,8,8     }       // 2/2:s0>>8&0xff
+{ .mmi; ld1     te32=[te32]             // 2/1:te0[s0]
+        add     te23=te23,te0           // 2/1:te0+s3>>8
+        shr.u   te02=s2,twenty4 };;     // 2/2:s2>>24
+{ .mmi; ld1     te22=[te22]             // 3/0:te0[s2>>8]
+        add     te20=te20,te0           // 3/2:te0+s0>>8
+        extr.u  te21=s1,8,8     }       // 3/3:s1>>8&0xff
+{ .mmi; ld1     te23=[te23]             // 3/1:te0[s3>>8]
+        add     te00=te00,te0           // 3/0:te0+s0>>24
+        shr.u   te03=s3,twenty4 };;     // 3/3:s3>>24
+{ .mmi; ld1     te20=[te20]             // 4/2:te0[s0>>8]
+        add     te21=te21,te0           // 4/3:te0+s2
+        extr.u  te13=s3,16,8    }       // 4/0:s1>>16&0xff
+{ .mmi; ld1     te00=[te00]             // 4/0:te0[s0>>24]
+        add     te01=te01,te0           // 4/1:te0+s1>>24
+        shr.u   te11=s1,sixteen };;     // 4/2:s3>>16
+{ .mmi; ld1     te21=[te21]             // 5/3:te0[s1>>8]
+        add     te13=te13,te0           // 5/0:te0+s1>>16
+        extr.u  te10=s0,16,8    }       // 5/1:s2>>16&0xff
+{ .mmi; ld1     te01=[te01]             // 5/1:te0[s1>>24]
+        add     te02=te02,te0           // 5/2:te0+s2>>24
+        and     te33=s3,maskff  };;     // 5/2:s1&0xff
+{ .mmi; ld1     te13=[te13]             // 6/0:te0[s1>>16]
+        add     te10=te10,te0           // 6/1:te0+s2>>16
+        extr.u  te12=s2,16,8    }       // 6/3:s0>>16&0xff
+{ .mmi; ld1     te02=[te02]             // 6/2:te0[s2>>24]
+        add     te03=te03,te0           // 6/3:te0+s0>>16
+        and     te30=s0,maskff  };;     // 6/3:s2&0xff
+
+{ .mmi; ld1     te10=[te10]             // 7/1:te0[s2>>16]
+        add     te33=te33,te0           // 7/2:te0+s1&0xff
+        dep     te31=te22,te31,8,8}     // 7/0:
+{ .mmi; ld1     te03=[te03]             // 7/3:te0[s3>>24]
+        add     te30=te30,te0           // 7/3:te0+s2
+        and     te11=te11,maskff};;     // 7/2:s3>>16&0xff
+{ .mmi; ld1     te33=[te33]             // 8/2:te0[s1]
+        add     te11=te11,te0           // 8/2:te0+s3>>16
+        dep     te32=te23,te32,8,8}     // 8/1:
+{ .mmi; ld1     te30=[te30]             // 8/3:te0[s2]
+        add     te12=te12,te0           // 8/3:te0+s0>>16
+        shl     te00=te00,twenty4};;    // 8/0:
+{ .mii; ld1     te11=[te11]             // 9/2:te0[s3>>16]
+        dep     te31=te13,te31,16,8     // 9/0:
+        shl     te01=te01,twenty4};;    // 9/1:
+{ .mii; ld1     te12=[te12]             // 10/3:te0[s0>>16]
+        dep     te33=te20,te33,8,8      // 10/2:
+        shl     te02=te02,twenty4};;    // 10/2:
+{ .mii; xor     t0=t0,te31              // 11/0:
+        dep     te30=te21,te30,8,8      // 11/3:
+        shl     te10=te10,sixteen};;    // 11/1:
+{ .mii; xor     r16=t0,te00             // 12/0:done!
+        dep     te33=te11,te33,16,8     // 12/2:
+        shl     te03=te03,twenty4};;    // 12/3:
+{ .mmi; xor     t1=t1,te01              // 13/1:
+        xor     t2=t2,te02              // 13/2:
+        dep     te30=te12,te30,16,8};;  // 13/3:
+{ .mmi; xor     t1=t1,te32              // 14/1:
+        xor     r24=t2,te33             // 14/2:done!
+        xor     t3=t3,te30      };;     // 14/3:
+{ .mib; xor     r20=t1,te10             // 15/1:done!
+        xor     r28=t3,te03             // 15/3:done!
+        br.ret.sptk     b6      };;
+.endp   _ia64_AES_decrypt#
+
+// void AES_decrypt (const void *in,void *out,const AES_KEY *key);
+.global AES_decrypt#
+.proc   AES_decrypt#
+.align  32
+AES_decrypt:
+        .prologue
+        .save   ar.pfs,pfssave
+{ .mmi; alloc   pfssave=ar.pfs,3,1,12,0
+        and     out0=3,in0
+        mov     r3=ip                   }
+{ .mmi; ADDP    in0=0,in0
+        mov     loc0=psr.um
+        ADDP    out11=KSZ*60,in2        };;     // &AES_KEY->rounds
+
+{ .mmi; ld4     out11=[out11]                   // AES_KEY->rounds
+        add     out8=(AES_Td#-AES_decrypt#),r3  // Te0
+        .save   pr,prsave
+        mov     prsave=pr               }
+{ .mmi; rum     1<<3                            // clear um.ac
+        .save   ar.lc,lcsave
+        mov     lcsave=ar.lc            };;
+
+        .body
+#if defined(_HPUX_SOURCE)       // HPUX is big-endian, cut 15+15 cycles...
+{ .mib; cmp.ne  p6,p0=out0,r0
+        add     out0=4,in0
+(p6)    br.dpnt.many    .Ld_i_unaligned };;
+
+{ .mmi; ld4     out1=[in0],8            // s0
+        and     out9=3,in1
+        mov     twenty4=24              }
+{ .mmi; ld4     out3=[out0],8           // s1
+        ADDP    rk0=0,in2
+        mov     sixteen=16              };;
+{ .mmi; ld4     out5=[in0]              // s2
+        cmp.ne  p6,p0=out9,r0
+        mov     maskff=0xff             }
+{ .mmb; ld4     out7=[out0]             // s3
+        ADDP    rk1=KSZ,in2
+        br.call.sptk.many       b6=_ia64_AES_decrypt    };;
+
+{ .mib; ADDP    in0=4,in1
+        ADDP    in1=0,in1
+(p6)    br.spnt .Ld_o_unaligned         };;
+
+{ .mii; mov     psr.um=loc0
+        mov     ar.pfs=pfssave
+        mov     ar.lc=lcsave            };;
+{ .mmi; st4     [in1]=r16,8             // s0
+        st4     [in0]=r20,8             // s1
+        mov     pr=prsave,0x1ffff       };;
+{ .mmb; st4     [in1]=r24               // s2
+        st4     [in0]=r28               // s3
+        br.ret.sptk.many        b0      };;
+#endif
+
+.align  32
+.Ld_i_unaligned:
+{ .mmi; add     out0=1,in0
+        add     out2=2,in0
+        add     out4=3,in0      };;
+{ .mmi; ld1     r16=[in0],4
+        ld1     r17=[out0],4    }//;;
+{ .mmi; ld1     r18=[out2],4
+        ld1     out1=[out4],4   };;     // s0
+{ .mmi; ld1     r20=[in0],4
+        ld1     r21=[out0],4    }//;;
+{ .mmi; ld1     r22=[out2],4
+        ld1     out3=[out4],4   };;     // s1
+{ .mmi; ld1     r24=[in0],4
+        ld1     r25=[out0],4    }//;;
+{ .mmi; ld1     r26=[out2],4
+        ld1     out5=[out4],4   };;     // s2
+{ .mmi; ld1     r28=[in0]
+        ld1     r29=[out0]      }//;;
+{ .mmi; ld1     r30=[out2]
+        ld1     out7=[out4]     };;     // s3
+
+{ .mii;
+        dep     out1=r16,out1,24,8      //;;
+        dep     out3=r20,out3,24,8      }//;;
+{ .mii; ADDP    rk0=0,in2
+        dep     out5=r24,out5,24,8      //;;
+        dep     out7=r28,out7,24,8      };;
+{ .mii; ADDP    rk1=KSZ,in2
+        dep     out1=r17,out1,16,8      //;;
+        dep     out3=r21,out3,16,8      }//;;
+{ .mii; mov     twenty4=24
+        dep     out5=r25,out5,16,8      //;;
+        dep     out7=r29,out7,16,8      };;
+{ .mii; mov     sixteen=16
+        dep     out1=r18,out1,8,8       //;;
+        dep     out3=r22,out3,8,8       }//;;
+{ .mii; mov     maskff=0xff
+        dep     out5=r26,out5,8,8       //;;
+        dep     out7=r30,out7,8,8       };;
+
+{ .mib; br.call.sptk.many       b6=_ia64_AES_decrypt    };;
+
+.Ld_o_unaligned:
+{ .mii; ADDP    out0=0,in1
+        extr.u  r17=r16,8,8                     // s0
+        shr.u   r19=r16,twenty4         }//;;
+{ .mii; ADDP    out1=1,in1
+        extr.u  r18=r16,16,8
+        shr.u   r23=r20,twenty4         }//;;   // s1
+{ .mii; ADDP    out2=2,in1
+        extr.u  r21=r20,8,8
+        shr.u   r22=r20,sixteen         }//;;
+{ .mii; ADDP    out3=3,in1
+        extr.u  r25=r24,8,8                     // s2
+        shr.u   r27=r24,twenty4         };;
+{ .mii; st1     [out3]=r16,4
+        extr.u  r26=r24,16,8
+        shr.u   r31=r28,twenty4         }//;;   // s3
+{ .mii; st1     [out2]=r17,4
+        extr.u  r29=r28,8,8
+        shr.u   r30=r28,sixteen         }//;;
+
+{ .mmi; st1     [out1]=r18,4
+        st1     [out0]=r19,4            };;
+{ .mmi; st1     [out3]=r20,4
+        st1     [out2]=r21,4            }//;;
+{ .mmi; st1     [out1]=r22,4
+        st1     [out0]=r23,4            };;
+{ .mmi; st1     [out3]=r24,4
+        st1     [out2]=r25,4
+        mov     pr=prsave,0x1ffff       }//;;
+{ .mmi; st1     [out1]=r26,4
+        st1     [out0]=r27,4
+        mov     ar.pfs=pfssave          };;
+{ .mmi; st1     [out3]=r28
+        st1     [out2]=r29
+        mov     ar.lc=lcsave            }//;;
+{ .mmi; st1     [out1]=r30
+        st1     [out0]=r31              }
+{ .mfb; mov     psr.um=loc0                     // restore user mask
+        br.ret.sptk.many        b0      };;
+.endp   AES_decrypt#
+
+// leave it in .text segment...
+.align  64
+.global AES_Te#
+.type   AES_Te#,@object
+AES_Te: data4   0xc66363a5,0xc66363a5, 0xf87c7c84,0xf87c7c84
+        data4   0xee777799,0xee777799, 0xf67b7b8d,0xf67b7b8d
+        data4   0xfff2f20d,0xfff2f20d, 0xd66b6bbd,0xd66b6bbd
+        data4   0xde6f6fb1,0xde6f6fb1, 0x91c5c554,0x91c5c554
+        data4   0x60303050,0x60303050, 0x02010103,0x02010103
+        data4   0xce6767a9,0xce6767a9, 0x562b2b7d,0x562b2b7d
+        data4   0xe7fefe19,0xe7fefe19, 0xb5d7d762,0xb5d7d762
+        data4   0x4dababe6,0x4dababe6, 0xec76769a,0xec76769a
+        data4   0x8fcaca45,0x8fcaca45, 0x1f82829d,0x1f82829d
+        data4   0x89c9c940,0x89c9c940, 0xfa7d7d87,0xfa7d7d87
+        data4   0xeffafa15,0xeffafa15, 0xb25959eb,0xb25959eb
+        data4   0x8e4747c9,0x8e4747c9, 0xfbf0f00b,0xfbf0f00b
+        data4   0x41adadec,0x41adadec, 0xb3d4d467,0xb3d4d467
+        data4   0x5fa2a2fd,0x5fa2a2fd, 0x45afafea,0x45afafea
+        data4   0x239c9cbf,0x239c9cbf, 0x53a4a4f7,0x53a4a4f7
+        data4   0xe4727296,0xe4727296, 0x9bc0c05b,0x9bc0c05b
+        data4   0x75b7b7c2,0x75b7b7c2, 0xe1fdfd1c,0xe1fdfd1c
+        data4   0x3d9393ae,0x3d9393ae, 0x4c26266a,0x4c26266a
+        data4   0x6c36365a,0x6c36365a, 0x7e3f3f41,0x7e3f3f41
+        data4   0xf5f7f702,0xf5f7f702, 0x83cccc4f,0x83cccc4f
+        data4   0x6834345c,0x6834345c, 0x51a5a5f4,0x51a5a5f4
+        data4   0xd1e5e534,0xd1e5e534, 0xf9f1f108,0xf9f1f108
+        data4   0xe2717193,0xe2717193, 0xabd8d873,0xabd8d873
+        data4   0x62313153,0x62313153, 0x2a15153f,0x2a15153f
+        data4   0x0804040c,0x0804040c, 0x95c7c752,0x95c7c752
+        data4   0x46232365,0x46232365, 0x9dc3c35e,0x9dc3c35e
+        data4   0x30181828,0x30181828, 0x379696a1,0x379696a1
+        data4   0x0a05050f,0x0a05050f, 0x2f9a9ab5,0x2f9a9ab5
+        data4   0x0e070709,0x0e070709, 0x24121236,0x24121236
+        data4   0x1b80809b,0x1b80809b, 0xdfe2e23d,0xdfe2e23d
+        data4   0xcdebeb26,0xcdebeb26, 0x4e272769,0x4e272769
+        data4   0x7fb2b2cd,0x7fb2b2cd, 0xea75759f,0xea75759f
+        data4   0x1209091b,0x1209091b, 0x1d83839e,0x1d83839e
+        data4   0x582c2c74,0x582c2c74, 0x341a1a2e,0x341a1a2e
+        data4   0x361b1b2d,0x361b1b2d, 0xdc6e6eb2,0xdc6e6eb2
+        data4   0xb45a5aee,0xb45a5aee, 0x5ba0a0fb,0x5ba0a0fb
+        data4   0xa45252f6,0xa45252f6, 0x763b3b4d,0x763b3b4d
+        data4   0xb7d6d661,0xb7d6d661, 0x7db3b3ce,0x7db3b3ce
+        data4   0x5229297b,0x5229297b, 0xdde3e33e,0xdde3e33e
+        data4   0x5e2f2f71,0x5e2f2f71, 0x13848497,0x13848497
+        data4   0xa65353f5,0xa65353f5, 0xb9d1d168,0xb9d1d168
+        data4   0x00000000,0x00000000, 0xc1eded2c,0xc1eded2c
+        data4   0x40202060,0x40202060, 0xe3fcfc1f,0xe3fcfc1f
+        data4   0x79b1b1c8,0x79b1b1c8, 0xb65b5bed,0xb65b5bed
+        data4   0xd46a6abe,0xd46a6abe, 0x8dcbcb46,0x8dcbcb46
+        data4   0x67bebed9,0x67bebed9, 0x7239394b,0x7239394b
+        data4   0x944a4ade,0x944a4ade, 0x984c4cd4,0x984c4cd4
+        data4   0xb05858e8,0xb05858e8, 0x85cfcf4a,0x85cfcf4a
+        data4   0xbbd0d06b,0xbbd0d06b, 0xc5efef2a,0xc5efef2a
+        data4   0x4faaaae5,0x4faaaae5, 0xedfbfb16,0xedfbfb16
+        data4   0x864343c5,0x864343c5, 0x9a4d4dd7,0x9a4d4dd7
+        data4   0x66333355,0x66333355, 0x11858594,0x11858594
+        data4   0x8a4545cf,0x8a4545cf, 0xe9f9f910,0xe9f9f910
+        data4   0x04020206,0x04020206, 0xfe7f7f81,0xfe7f7f81
+        data4   0xa05050f0,0xa05050f0, 0x783c3c44,0x783c3c44
+        data4   0x259f9fba,0x259f9fba, 0x4ba8a8e3,0x4ba8a8e3
+        data4   0xa25151f3,0xa25151f3, 0x5da3a3fe,0x5da3a3fe
+        data4   0x804040c0,0x804040c0, 0x058f8f8a,0x058f8f8a
+        data4   0x3f9292ad,0x3f9292ad, 0x219d9dbc,0x219d9dbc
+        data4   0x70383848,0x70383848, 0xf1f5f504,0xf1f5f504
+        data4   0x63bcbcdf,0x63bcbcdf, 0x77b6b6c1,0x77b6b6c1
+        data4   0xafdada75,0xafdada75, 0x42212163,0x42212163
+        data4   0x20101030,0x20101030, 0xe5ffff1a,0xe5ffff1a
+        data4   0xfdf3f30e,0xfdf3f30e, 0xbfd2d26d,0xbfd2d26d
+        data4   0x81cdcd4c,0x81cdcd4c, 0x180c0c14,0x180c0c14
+        data4   0x26131335,0x26131335, 0xc3ecec2f,0xc3ecec2f
+        data4   0xbe5f5fe1,0xbe5f5fe1, 0x359797a2,0x359797a2
+        data4   0x884444cc,0x884444cc, 0x2e171739,0x2e171739
+        data4   0x93c4c457,0x93c4c457, 0x55a7a7f2,0x55a7a7f2
+        data4   0xfc7e7e82,0xfc7e7e82, 0x7a3d3d47,0x7a3d3d47
+        data4   0xc86464ac,0xc86464ac, 0xba5d5de7,0xba5d5de7
+        data4   0x3219192b,0x3219192b, 0xe6737395,0xe6737395
+        data4   0xc06060a0,0xc06060a0, 0x19818198,0x19818198
+        data4   0x9e4f4fd1,0x9e4f4fd1, 0xa3dcdc7f,0xa3dcdc7f
+        data4   0x44222266,0x44222266, 0x542a2a7e,0x542a2a7e
+        data4   0x3b9090ab,0x3b9090ab, 0x0b888883,0x0b888883
+        data4   0x8c4646ca,0x8c4646ca, 0xc7eeee29,0xc7eeee29
+        data4   0x6bb8b8d3,0x6bb8b8d3, 0x2814143c,0x2814143c
+        data4   0xa7dede79,0xa7dede79, 0xbc5e5ee2,0xbc5e5ee2
+        data4   0x160b0b1d,0x160b0b1d, 0xaddbdb76,0xaddbdb76
+        data4   0xdbe0e03b,0xdbe0e03b, 0x64323256,0x64323256
+        data4   0x743a3a4e,0x743a3a4e, 0x140a0a1e,0x140a0a1e
+        data4   0x924949db,0x924949db, 0x0c06060a,0x0c06060a
+        data4   0x4824246c,0x4824246c, 0xb85c5ce4,0xb85c5ce4
+        data4   0x9fc2c25d,0x9fc2c25d, 0xbdd3d36e,0xbdd3d36e
+        data4   0x43acacef,0x43acacef, 0xc46262a6,0xc46262a6
+        data4   0x399191a8,0x399191a8, 0x319595a4,0x319595a4
+        data4   0xd3e4e437,0xd3e4e437, 0xf279798b,0xf279798b
+        data4   0xd5e7e732,0xd5e7e732, 0x8bc8c843,0x8bc8c843
+        data4   0x6e373759,0x6e373759, 0xda6d6db7,0xda6d6db7
+        data4   0x018d8d8c,0x018d8d8c, 0xb1d5d564,0xb1d5d564
+        data4   0x9c4e4ed2,0x9c4e4ed2, 0x49a9a9e0,0x49a9a9e0
+        data4   0xd86c6cb4,0xd86c6cb4, 0xac5656fa,0xac5656fa
+        data4   0xf3f4f407,0xf3f4f407, 0xcfeaea25,0xcfeaea25
+        data4   0xca6565af,0xca6565af, 0xf47a7a8e,0xf47a7a8e
+        data4   0x47aeaee9,0x47aeaee9, 0x10080818,0x10080818
+        data4   0x6fbabad5,0x6fbabad5, 0xf0787888,0xf0787888
+        data4   0x4a25256f,0x4a25256f, 0x5c2e2e72,0x5c2e2e72
+        data4   0x381c1c24,0x381c1c24, 0x57a6a6f1,0x57a6a6f1
+        data4   0x73b4b4c7,0x73b4b4c7, 0x97c6c651,0x97c6c651
+        data4   0xcbe8e823,0xcbe8e823, 0xa1dddd7c,0xa1dddd7c
+        data4   0xe874749c,0xe874749c, 0x3e1f1f21,0x3e1f1f21
+        data4   0x964b4bdd,0x964b4bdd, 0x61bdbddc,0x61bdbddc
+        data4   0x0d8b8b86,0x0d8b8b86, 0x0f8a8a85,0x0f8a8a85
+        data4   0xe0707090,0xe0707090, 0x7c3e3e42,0x7c3e3e42
+        data4   0x71b5b5c4,0x71b5b5c4, 0xcc6666aa,0xcc6666aa
+        data4   0x904848d8,0x904848d8, 0x06030305,0x06030305
+        data4   0xf7f6f601,0xf7f6f601, 0x1c0e0e12,0x1c0e0e12
+        data4   0xc26161a3,0xc26161a3, 0x6a35355f,0x6a35355f
+        data4   0xae5757f9,0xae5757f9, 0x69b9b9d0,0x69b9b9d0
+        data4   0x17868691,0x17868691, 0x99c1c158,0x99c1c158
+        data4   0x3a1d1d27,0x3a1d1d27, 0x279e9eb9,0x279e9eb9
+        data4   0xd9e1e138,0xd9e1e138, 0xebf8f813,0xebf8f813
+        data4   0x2b9898b3,0x2b9898b3, 0x22111133,0x22111133
+        data4   0xd26969bb,0xd26969bb, 0xa9d9d970,0xa9d9d970
+        data4   0x078e8e89,0x078e8e89, 0x339494a7,0x339494a7
+        data4   0x2d9b9bb6,0x2d9b9bb6, 0x3c1e1e22,0x3c1e1e22
+        data4   0x15878792,0x15878792, 0xc9e9e920,0xc9e9e920
+        data4   0x87cece49,0x87cece49, 0xaa5555ff,0xaa5555ff
+        data4   0x50282878,0x50282878, 0xa5dfdf7a,0xa5dfdf7a
+        data4   0x038c8c8f,0x038c8c8f, 0x59a1a1f8,0x59a1a1f8
+        data4   0x09898980,0x09898980, 0x1a0d0d17,0x1a0d0d17
+        data4   0x65bfbfda,0x65bfbfda, 0xd7e6e631,0xd7e6e631
+        data4   0x844242c6,0x844242c6, 0xd06868b8,0xd06868b8
+        data4   0x824141c3,0x824141c3, 0x299999b0,0x299999b0
+        data4   0x5a2d2d77,0x5a2d2d77, 0x1e0f0f11,0x1e0f0f11
+        data4   0x7bb0b0cb,0x7bb0b0cb, 0xa85454fc,0xa85454fc
+        data4   0x6dbbbbd6,0x6dbbbbd6, 0x2c16163a,0x2c16163a
+// Te4:
+        data1   0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5
+        data1   0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76
+        data1   0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0
+        data1   0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0
+        data1   0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc
+        data1   0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15
+        data1   0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a
+        data1   0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75
+        data1   0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0
+        data1   0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84
+        data1   0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b
+        data1   0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf
+        data1   0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85
+        data1   0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8
+        data1   0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5
+        data1   0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2
+        data1   0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17
+        data1   0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73
+        data1   0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88
+        data1   0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb
+        data1   0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c
+        data1   0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79
+        data1   0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9
+        data1   0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08
+        data1   0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6
+        data1   0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a
+        data1   0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e
+        data1   0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e
+        data1   0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94
+        data1   0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf
+        data1   0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68
+        data1   0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
+.size   AES_Te#,2048+256        // HP-UX assembler fails to ".-AES_Te#"
+
+.align  64
+.global AES_Td#
+.type   AES_Td#,@object
+AES_Td: data4   0x51f4a750,0x51f4a750, 0x7e416553,0x7e416553
+        data4   0x1a17a4c3,0x1a17a4c3, 0x3a275e96,0x3a275e96
+        data4   0x3bab6bcb,0x3bab6bcb, 0x1f9d45f1,0x1f9d45f1
+        data4   0xacfa58ab,0xacfa58ab, 0x4be30393,0x4be30393
+        data4   0x2030fa55,0x2030fa55, 0xad766df6,0xad766df6
+        data4   0x88cc7691,0x88cc7691, 0xf5024c25,0xf5024c25
+        data4   0x4fe5d7fc,0x4fe5d7fc, 0xc52acbd7,0xc52acbd7
+        data4   0x26354480,0x26354480, 0xb562a38f,0xb562a38f
+        data4   0xdeb15a49,0xdeb15a49, 0x25ba1b67,0x25ba1b67
+        data4   0x45ea0e98,0x45ea0e98, 0x5dfec0e1,0x5dfec0e1
+        data4   0xc32f7502,0xc32f7502, 0x814cf012,0x814cf012
+        data4   0x8d4697a3,0x8d4697a3, 0x6bd3f9c6,0x6bd3f9c6
+        data4   0x038f5fe7,0x038f5fe7, 0x15929c95,0x15929c95
+        data4   0xbf6d7aeb,0xbf6d7aeb, 0x955259da,0x955259da
+        data4   0xd4be832d,0xd4be832d, 0x587421d3,0x587421d3
+        data4   0x49e06929,0x49e06929, 0x8ec9c844,0x8ec9c844
+        data4   0x75c2896a,0x75c2896a, 0xf48e7978,0xf48e7978
+        data4   0x99583e6b,0x99583e6b, 0x27b971dd,0x27b971dd
+        data4   0xbee14fb6,0xbee14fb6, 0xf088ad17,0xf088ad17
+        data4   0xc920ac66,0xc920ac66, 0x7dce3ab4,0x7dce3ab4
+        data4   0x63df4a18,0x63df4a18, 0xe51a3182,0xe51a3182
+        data4   0x97513360,0x97513360, 0x62537f45,0x62537f45
+        data4   0xb16477e0,0xb16477e0, 0xbb6bae84,0xbb6bae84
+        data4   0xfe81a01c,0xfe81a01c, 0xf9082b94,0xf9082b94
+        data4   0x70486858,0x70486858, 0x8f45fd19,0x8f45fd19
+        data4   0x94de6c87,0x94de6c87, 0x527bf8b7,0x527bf8b7
+        data4   0xab73d323,0xab73d323, 0x724b02e2,0x724b02e2
+        data4   0xe31f8f57,0xe31f8f57, 0x6655ab2a,0x6655ab2a
+        data4   0xb2eb2807,0xb2eb2807, 0x2fb5c203,0x2fb5c203
+        data4   0x86c57b9a,0x86c57b9a, 0xd33708a5,0xd33708a5
+        data4   0x302887f2,0x302887f2, 0x23bfa5b2,0x23bfa5b2
+        data4   0x02036aba,0x02036aba, 0xed16825c,0xed16825c
+        data4   0x8acf1c2b,0x8acf1c2b, 0xa779b492,0xa779b492
+        data4   0xf307f2f0,0xf307f2f0, 0x4e69e2a1,0x4e69e2a1
+        data4   0x65daf4cd,0x65daf4cd, 0x0605bed5,0x0605bed5
+        data4   0xd134621f,0xd134621f, 0xc4a6fe8a,0xc4a6fe8a
+        data4   0x342e539d,0x342e539d, 0xa2f355a0,0xa2f355a0
+        data4   0x058ae132,0x058ae132, 0xa4f6eb75,0xa4f6eb75
+        data4   0x0b83ec39,0x0b83ec39, 0x4060efaa,0x4060efaa
+        data4   0x5e719f06,0x5e719f06, 0xbd6e1051,0xbd6e1051
+        data4   0x3e218af9,0x3e218af9, 0x96dd063d,0x96dd063d
+        data4   0xdd3e05ae,0xdd3e05ae, 0x4de6bd46,0x4de6bd46
+        data4   0x91548db5,0x91548db5, 0x71c45d05,0x71c45d05
+        data4   0x0406d46f,0x0406d46f, 0x605015ff,0x605015ff
+        data4   0x1998fb24,0x1998fb24, 0xd6bde997,0xd6bde997
+        data4   0x894043cc,0x894043cc, 0x67d99e77,0x67d99e77
+        data4   0xb0e842bd,0xb0e842bd, 0x07898b88,0x07898b88
+        data4   0xe7195b38,0xe7195b38, 0x79c8eedb,0x79c8eedb
+        data4   0xa17c0a47,0xa17c0a47, 0x7c420fe9,0x7c420fe9
+        data4   0xf8841ec9,0xf8841ec9, 0x00000000,0x00000000
+        data4   0x09808683,0x09808683, 0x322bed48,0x322bed48
+        data4   0x1e1170ac,0x1e1170ac, 0x6c5a724e,0x6c5a724e
+        data4   0xfd0efffb,0xfd0efffb, 0x0f853856,0x0f853856
+        data4   0x3daed51e,0x3daed51e, 0x362d3927,0x362d3927
+        data4   0x0a0fd964,0x0a0fd964, 0x685ca621,0x685ca621
+        data4   0x9b5b54d1,0x9b5b54d1, 0x24362e3a,0x24362e3a
+        data4   0x0c0a67b1,0x0c0a67b1, 0x9357e70f,0x9357e70f
+        data4   0xb4ee96d2,0xb4ee96d2, 0x1b9b919e,0x1b9b919e
+        data4   0x80c0c54f,0x80c0c54f, 0x61dc20a2,0x61dc20a2
+        data4   0x5a774b69,0x5a774b69, 0x1c121a16,0x1c121a16
+        data4   0xe293ba0a,0xe293ba0a, 0xc0a02ae5,0xc0a02ae5
+        data4   0x3c22e043,0x3c22e043, 0x121b171d,0x121b171d
+        data4   0x0e090d0b,0x0e090d0b, 0xf28bc7ad,0xf28bc7ad
+        data4   0x2db6a8b9,0x2db6a8b9, 0x141ea9c8,0x141ea9c8
+        data4   0x57f11985,0x57f11985, 0xaf75074c,0xaf75074c
+        data4   0xee99ddbb,0xee99ddbb, 0xa37f60fd,0xa37f60fd
+        data4   0xf701269f,0xf701269f, 0x5c72f5bc,0x5c72f5bc
+        data4   0x44663bc5,0x44663bc5, 0x5bfb7e34,0x5bfb7e34
+        data4   0x8b432976,0x8b432976, 0xcb23c6dc,0xcb23c6dc
+        data4   0xb6edfc68,0xb6edfc68, 0xb8e4f163,0xb8e4f163
+        data4   0xd731dcca,0xd731dcca, 0x42638510,0x42638510
+        data4   0x13972240,0x13972240, 0x84c61120,0x84c61120
+        data4   0x854a247d,0x854a247d, 0xd2bb3df8,0xd2bb3df8
+        data4   0xaef93211,0xaef93211, 0xc729a16d,0xc729a16d
+        data4   0x1d9e2f4b,0x1d9e2f4b, 0xdcb230f3,0xdcb230f3
+        data4   0x0d8652ec,0x0d8652ec, 0x77c1e3d0,0x77c1e3d0
+        data4   0x2bb3166c,0x2bb3166c, 0xa970b999,0xa970b999
+        data4   0x119448fa,0x119448fa, 0x47e96422,0x47e96422
+        data4   0xa8fc8cc4,0xa8fc8cc4, 0xa0f03f1a,0xa0f03f1a
+        data4   0x567d2cd8,0x567d2cd8, 0x223390ef,0x223390ef
+        data4   0x87494ec7,0x87494ec7, 0xd938d1c1,0xd938d1c1
+        data4   0x8ccaa2fe,0x8ccaa2fe, 0x98d40b36,0x98d40b36
+        data4   0xa6f581cf,0xa6f581cf, 0xa57ade28,0xa57ade28
+        data4   0xdab78e26,0xdab78e26, 0x3fadbfa4,0x3fadbfa4
+        data4   0x2c3a9de4,0x2c3a9de4, 0x5078920d,0x5078920d
+        data4   0x6a5fcc9b,0x6a5fcc9b, 0x547e4662,0x547e4662
+        data4   0xf68d13c2,0xf68d13c2, 0x90d8b8e8,0x90d8b8e8
+        data4   0x2e39f75e,0x2e39f75e, 0x82c3aff5,0x82c3aff5
+        data4   0x9f5d80be,0x9f5d80be, 0x69d0937c,0x69d0937c
+        data4   0x6fd52da9,0x6fd52da9, 0xcf2512b3,0xcf2512b3
+        data4   0xc8ac993b,0xc8ac993b, 0x10187da7,0x10187da7
+        data4   0xe89c636e,0xe89c636e, 0xdb3bbb7b,0xdb3bbb7b
+        data4   0xcd267809,0xcd267809, 0x6e5918f4,0x6e5918f4
+        data4   0xec9ab701,0xec9ab701, 0x834f9aa8,0x834f9aa8
+        data4   0xe6956e65,0xe6956e65, 0xaaffe67e,0xaaffe67e
+        data4   0x21bccf08,0x21bccf08, 0xef15e8e6,0xef15e8e6
+        data4   0xbae79bd9,0xbae79bd9, 0x4a6f36ce,0x4a6f36ce
+        data4   0xea9f09d4,0xea9f09d4, 0x29b07cd6,0x29b07cd6
+        data4   0x31a4b2af,0x31a4b2af, 0x2a3f2331,0x2a3f2331
+        data4   0xc6a59430,0xc6a59430, 0x35a266c0,0x35a266c0
+        data4   0x744ebc37,0x744ebc37, 0xfc82caa6,0xfc82caa6
+        data4   0xe090d0b0,0xe090d0b0, 0x33a7d815,0x33a7d815
+        data4   0xf104984a,0xf104984a, 0x41ecdaf7,0x41ecdaf7
+        data4   0x7fcd500e,0x7fcd500e, 0x1791f62f,0x1791f62f
+        data4   0x764dd68d,0x764dd68d, 0x43efb04d,0x43efb04d
+        data4   0xccaa4d54,0xccaa4d54, 0xe49604df,0xe49604df
+        data4   0x9ed1b5e3,0x9ed1b5e3, 0x4c6a881b,0x4c6a881b
+        data4   0xc12c1fb8,0xc12c1fb8, 0x4665517f,0x4665517f
+        data4   0x9d5eea04,0x9d5eea04, 0x018c355d,0x018c355d
+        data4   0xfa877473,0xfa877473, 0xfb0b412e,0xfb0b412e
+        data4   0xb3671d5a,0xb3671d5a, 0x92dbd252,0x92dbd252
+        data4   0xe9105633,0xe9105633, 0x6dd64713,0x6dd64713
+        data4   0x9ad7618c,0x9ad7618c, 0x37a10c7a,0x37a10c7a
+        data4   0x59f8148e,0x59f8148e, 0xeb133c89,0xeb133c89
+        data4   0xcea927ee,0xcea927ee, 0xb761c935,0xb761c935
+        data4   0xe11ce5ed,0xe11ce5ed, 0x7a47b13c,0x7a47b13c
+        data4   0x9cd2df59,0x9cd2df59, 0x55f2733f,0x55f2733f
+        data4   0x1814ce79,0x1814ce79, 0x73c737bf,0x73c737bf
+        data4   0x53f7cdea,0x53f7cdea, 0x5ffdaa5b,0x5ffdaa5b
+        data4   0xdf3d6f14,0xdf3d6f14, 0x7844db86,0x7844db86
+        data4   0xcaaff381,0xcaaff381, 0xb968c43e,0xb968c43e
+        data4   0x3824342c,0x3824342c, 0xc2a3405f,0xc2a3405f
+        data4   0x161dc372,0x161dc372, 0xbce2250c,0xbce2250c
+        data4   0x283c498b,0x283c498b, 0xff0d9541,0xff0d9541
+        data4   0x39a80171,0x39a80171, 0x080cb3de,0x080cb3de
+        data4   0xd8b4e49c,0xd8b4e49c, 0x6456c190,0x6456c190
+        data4   0x7bcb8461,0x7bcb8461, 0xd532b670,0xd532b670
+        data4   0x486c5c74,0x486c5c74, 0xd0b85742,0xd0b85742
+// Td4:
+        data1   0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38
+        data1   0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb
+        data1   0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87
+        data1   0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb
+        data1   0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d
+        data1   0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e
+        data1   0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2
+        data1   0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25
+        data1   0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16
+        data1   0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92
+        data1   0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda
+        data1   0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84
+        data1   0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a
+        data1   0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06
+        data1   0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02
+        data1   0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b
+        data1   0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea
+        data1   0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73
+        data1   0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85
+        data1   0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e
+        data1   0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89
+        data1   0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b
+        data1   0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20
+        data1   0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4
+        data1   0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31
+        data1   0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f
+        data1   0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d
+        data1   0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef
+        data1   0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0
+        data1   0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
+        data1   0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26
+        data1   0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
+.size   AES_Td#,2048+256        // HP-UX assembler fails to ".-AES_Td#"
diff --git a/src/lib/libssl/src/crypto/aes/asm/aes-x86_64.pl b/src/lib/libssl/src/crypto/aes/asm/aes-x86_64.pl
new file mode 100755
index 0000000000..44e0bf8cae
--- /dev/null
+++ b/src/lib/libssl/src/crypto/aes/asm/aes-x86_64.pl
@@ -0,0 +1,1578 @@
+#!/usr/bin/env perl
+#
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. Rights for redistribution and usage in source and binary
+# forms are granted according to the OpenSSL license.
+# ====================================================================
+#
+# Version 1.2.
+#
+# aes-*-cbc benchmarks are improved by >70% [compared to gcc 3.3.2 on
+# Opteron 240 CPU] plus all the bells-n-whistles from 32-bit version
+# [you'll notice a lot of resemblance], such as compressed S-boxes
+# in little-endian byte order, prefetch of these tables in CBC mode,
+# as well as avoiding L1 cache aliasing between stack frame and key
+# schedule and already mentioned tables, compressed Td4...
+#
+# Performance in number of cycles per processed byte for 128-bit key:
+#
+#               ECB             CBC encrypt
+# AMD64         13.7            13.0(*)
+# EM64T         20.2            18.6(*)
+#
+# (*)   CBC benchmarks are better than ECB thanks to custom ABI used
+#       by the private block encryption function.
+
+$verticalspin=1;        # unlike 32-bit version $verticalspin performs
+                        # ~15% better on both AMD and Intel cores
+$output=shift;
+open STDOUT,"| $^X ../perlasm/x86_64-xlate.pl $output";
+
+$code=".text\n";
+
+$s0="%eax";
+$s1="%ebx";
+$s2="%ecx";
+$s3="%edx";
+$acc0="%esi";
+$acc1="%edi";
+$acc2="%ebp";
+$inp="%r8";
+$out="%r9";
+$t0="%r10d";
+$t1="%r11d";
+$t2="%r12d";
+$rnds="%r13d";
+$sbox="%r14";
+$key="%r15";
+
+sub hi() { my $r=shift; $r =~ s/%[er]([a-d])x/%\1h/;    $r; }
+sub lo() { my $r=shift; $r =~ s/%[er]([a-d])x/%\1l/;
+                        $r =~ s/%[er]([sd]i)/%\1l/;
+                        $r =~ s/%(r[0-9]+)[d]?/%\1b/;   $r; }
+sub _data_word()
+{ my $i;
+    while(defined($i=shift)) { $code.=sprintf".long\t0x%08x,0x%08x\n",$i,$i; }
+}
+sub data_word()
+{ my $i;
+  my $last=pop(@_);
+    $code.=".long\t";
+    while(defined($i=shift)) { $code.=sprintf"0x%08x,",$i; }
+    $code.=sprintf"0x%08x\n",$last;
+}
+
+sub data_byte()
+{ my $i;
+  my $last=pop(@_);
+    $code.=".byte\t";
+    while(defined($i=shift)) { $code.=sprintf"0x%02x,",$i&0xff; }
+    $code.=sprintf"0x%02x\n",$last&0xff;
+}
+
+sub encvert()
+{ my $t3="%r8d";        # zaps $inp!
+
+$code.=<<___;
+        # favor 3-way issue Opteron pipeline...
+        movzb   `&lo("$s0")`,$acc0
+        movzb   `&lo("$s1")`,$acc1
+        movzb   `&lo("$s2")`,$acc2
+        mov     0($sbox,$acc0,8),$t0
+        mov     0($sbox,$acc1,8),$t1
+        mov     0($sbox,$acc2,8),$t2
+
+        movzb   `&hi("$s1")`,$acc0
+        movzb   `&hi("$s2")`,$acc1
+        movzb   `&lo("$s3")`,$acc2
+        xor     3($sbox,$acc0,8),$t0
+        xor     3($sbox,$acc1,8),$t1
+        mov     0($sbox,$acc2,8),$t3
+
+        movzb   `&hi("$s3")`,$acc0
+        shr     \$16,$s2
+        movzb   `&hi("$s0")`,$acc2
+        xor     3($sbox,$acc0,8),$t2
+        shr     \$16,$s3
+        xor     3($sbox,$acc2,8),$t3
+
+        shr     \$16,$s1
+        lea     16($key),$key
+        shr     \$16,$s0
+
+        movzb   `&lo("$s2")`,$acc0
+        movzb   `&lo("$s3")`,$acc1
+        movzb   `&lo("$s0")`,$acc2
+        xor     2($sbox,$acc0,8),$t0
+        xor     2($sbox,$acc1,8),$t1
+        xor     2($sbox,$acc2,8),$t2
+
+        movzb   `&hi("$s3")`,$acc0
+        movzb   `&hi("$s0")`,$acc1
+        movzb   `&lo("$s1")`,$acc2
+        xor     1($sbox,$acc0,8),$t0
+        xor     1($sbox,$acc1,8),$t1
+        xor     2($sbox,$acc2,8),$t3
+
+        mov     12($key),$s3
+        movzb   `&hi("$s1")`,$acc1
+        movzb   `&hi("$s2")`,$acc2
+        mov     0($key),$s0
+        xor     1($sbox,$acc1,8),$t2
+        xor     1($sbox,$acc2,8),$t3
+
+        mov     4($key),$s1
+        mov     8($key),$s2
+        xor     $t0,$s0
+        xor     $t1,$s1
+        xor     $t2,$s2
+        xor     $t3,$s3
+___
+}
+
+sub enclastvert()
+{ my $t3="%r8d";        # zaps $inp!
+
+$code.=<<___;
+        movzb   `&lo("$s0")`,$acc0
+        movzb   `&lo("$s1")`,$acc1
+        movzb   `&lo("$s2")`,$acc2
+        mov     2($sbox,$acc0,8),$t0
+        mov     2($sbox,$acc1,8),$t1
+        mov     2($sbox,$acc2,8),$t2
+
+        and     \$0x000000ff,$t0
+        and     \$0x000000ff,$t1
+        and     \$0x000000ff,$t2
+
+        movzb   `&lo("$s3")`,$acc0
+        movzb   `&hi("$s1")`,$acc1
+        movzb   `&hi("$s2")`,$acc2
+        mov     2($sbox,$acc0,8),$t3
+        mov     0($sbox,$acc1,8),$acc1  #$t0
+        mov     0($sbox,$acc2,8),$acc2  #$t1
+
+        and     \$0x000000ff,$t3
+        and     \$0x0000ff00,$acc1
+        and     \$0x0000ff00,$acc2
+
+        xor     $acc1,$t0
+        xor     $acc2,$t1
+        shr     \$16,$s2
+
+        movzb   `&hi("$s3")`,$acc0
+        movzb   `&hi("$s0")`,$acc1
+        shr     \$16,$s3
+        mov     0($sbox,$acc0,8),$acc0  #$t2
+        mov     0($sbox,$acc1,8),$acc1  #$t3
+
+        and     \$0x0000ff00,$acc0
+        and     \$0x0000ff00,$acc1
+        shr     \$16,$s1
+        xor     $acc0,$t2
+        xor     $acc1,$t3
+        shr     \$16,$s0
+
+        movzb   `&lo("$s2")`,$acc0
+        movzb   `&lo("$s3")`,$acc1
+        movzb   `&lo("$s0")`,$acc2
+        mov     0($sbox,$acc0,8),$acc0  #$t0
+        mov     0($sbox,$acc1,8),$acc1  #$t1
+        mov     0($sbox,$acc2,8),$acc2  #$t2
+
+        and     \$0x00ff0000,$acc0
+        and     \$0x00ff0000,$acc1
+        and     \$0x00ff0000,$acc2
+
+        xor     $acc0,$t0
+        xor     $acc1,$t1
+        xor     $acc2,$t2
+
+        movzb   `&lo("$s1")`,$acc0
+        movzb   `&hi("$s3")`,$acc1
+        movzb   `&hi("$s0")`,$acc2
+        mov     0($sbox,$acc0,8),$acc0  #$t3
+        mov     2($sbox,$acc1,8),$acc1  #$t0
+        mov     2($sbox,$acc2,8),$acc2  #$t1
+
+        and     \$0x00ff0000,$acc0
+        and     \$0xff000000,$acc1
+        and     \$0xff000000,$acc2
+
+        xor     $acc0,$t3
+        xor     $acc1,$t0
+        xor     $acc2,$t1
+
+        movzb   `&hi("$s1")`,$acc0
+        movzb   `&hi("$s2")`,$acc1
+        mov     16+12($key),$s3
+        mov     2($sbox,$acc0,8),$acc0  #$t2
+        mov     2($sbox,$acc1,8),$acc1  #$t3
+        mov     16+0($key),$s0
+
+        and     \$0xff000000,$acc0
+        and     \$0xff000000,$acc1
+
+        xor     $acc0,$t2
+        xor     $acc1,$t3
+
+        mov     16+4($key),$s1
+        mov     16+8($key),$s2
+        xor     $t0,$s0
+        xor     $t1,$s1
+        xor     $t2,$s2
+        xor     $t3,$s3
+___
+}
+
+sub encstep()
+{ my ($i,@s) = @_;
+  my $tmp0=$acc0;
+  my $tmp1=$acc1;
+  my $tmp2=$acc2;
+  my $out=($t0,$t1,$t2,$s[0])[$i];
+
+        if ($i==3) {
+                $tmp0=$s[1];
+                $tmp1=$s[2];
+                $tmp2=$s[3];
+        }
+        $code.="        movzb   ".&lo($s[0]).",$out\n";
+        $code.="        mov     $s[2],$tmp1\n"          if ($i!=3);
+        $code.="        lea     16($key),$key\n"        if ($i==0);
+
+        $code.="        movzb   ".&hi($s[1]).",$tmp0\n";
+        $code.="        mov     0($sbox,$out,8),$out\n";
+
+        $code.="        shr     \$16,$tmp1\n";
+        $code.="        mov     $s[3],$tmp2\n"          if ($i!=3);
+        $code.="        xor     3($sbox,$tmp0,8),$out\n";
+
+        $code.="        movzb   ".&lo($tmp1).",$tmp1\n";
+        $code.="        shr     \$24,$tmp2\n";
+        $code.="        xor     4*$i($key),$out\n";
+
+        $code.="        xor     2($sbox,$tmp1,8),$out\n";
+        $code.="        xor     1($sbox,$tmp2,8),$out\n";
+
+        $code.="        mov     $t0,$s[1]\n"            if ($i==3);
+        $code.="        mov     $t1,$s[2]\n"            if ($i==3);
+        $code.="        mov     $t2,$s[3]\n"            if ($i==3);
+        $code.="\n";
+}
+
+sub enclast()
+{ my ($i,@s)=@_;
+  my $tmp0=$acc0;
+  my $tmp1=$acc1;
+  my $tmp2=$acc2;
+  my $out=($t0,$t1,$t2,$s[0])[$i];
+
+        if ($i==3) {
+                $tmp0=$s[1];
+                $tmp1=$s[2];
+                $tmp2=$s[3];
+        }
+        $code.="        movzb   ".&lo($s[0]).",$out\n";
+        $code.="        mov     $s[2],$tmp1\n"          if ($i!=3);
+
+        $code.="        mov     2($sbox,$out,8),$out\n";
+        $code.="        shr     \$16,$tmp1\n";
+        $code.="        mov     $s[3],$tmp2\n"          if ($i!=3);
+
+        $code.="        and     \$0x000000ff,$out\n";
+        $code.="        movzb   ".&hi($s[1]).",$tmp0\n";
+        $code.="        movzb   ".&lo($tmp1).",$tmp1\n";
+        $code.="        shr     \$24,$tmp2\n";
+
+        $code.="        mov     0($sbox,$tmp0,8),$tmp0\n";
+        $code.="        mov     0($sbox,$tmp1,8),$tmp1\n";
+        $code.="        mov     2($sbox,$tmp2,8),$tmp2\n";
+
+        $code.="        and     \$0x0000ff00,$tmp0\n";
+        $code.="        and     \$0x00ff0000,$tmp1\n";
+        $code.="        and     \$0xff000000,$tmp2\n";
+
+        $code.="        xor     $tmp0,$out\n";
+        $code.="        mov     $t0,$s[1]\n"            if ($i==3);
+        $code.="        xor     $tmp1,$out\n";
+        $code.="        mov     $t1,$s[2]\n"            if ($i==3);
+        $code.="        xor     $tmp2,$out\n";
+        $code.="        mov     $t2,$s[3]\n"            if ($i==3);
+        $code.="\n";
+}
+
+$code.=<<___;
+.type   _x86_64_AES_encrypt,\@abi-omnipotent
+.align  16
+_x86_64_AES_encrypt:
+        xor     0($key),$s0                     # xor with key
+        xor     4($key),$s1
+        xor     8($key),$s2
+        xor     12($key),$s3
+
+        mov     240($key),$rnds                 # load key->rounds
+        sub     \$1,$rnds
+        jmp     .Lenc_loop
+.align  16
+.Lenc_loop:
+___
+        if ($verticalspin) { &encvert(); }
+        else {  &encstep(0,$s0,$s1,$s2,$s3);
+                &encstep(1,$s1,$s2,$s3,$s0);
+                &encstep(2,$s2,$s3,$s0,$s1);
+                &encstep(3,$s3,$s0,$s1,$s2);
+        }
+$code.=<<___;
+        sub     \$1,$rnds
+        jnz     .Lenc_loop
+___
+        if ($verticalspin) { &enclastvert(); }
+        else {  &enclast(0,$s0,$s1,$s2,$s3);
+                &enclast(1,$s1,$s2,$s3,$s0);
+                &enclast(2,$s2,$s3,$s0,$s1);
+                &enclast(3,$s3,$s0,$s1,$s2);
+                $code.=<<___;
+                xor     16+0($key),$s0          # xor with key
+                xor     16+4($key),$s1
+                xor     16+8($key),$s2
+                xor     16+12($key),$s3
+___
+        }
+$code.=<<___;
+        .byte   0xf3,0xc3                       # rep ret
+.size   _x86_64_AES_encrypt,.-_x86_64_AES_encrypt
+___
+
+# void AES_encrypt (const void *inp,void *out,const AES_KEY *key);
+$code.=<<___;
+.globl  AES_encrypt
+.type   AES_encrypt,\@function,3
+.align  16
+AES_encrypt:
+        push    %rbx
+        push    %rbp
+        push    %r12
+        push    %r13
+        push    %r14
+        push    %r15
+
+        mov     %rdx,$key
+        mov     %rdi,$inp
+        mov     %rsi,$out
+
+        .picmeup        $sbox
+        lea     AES_Te-.($sbox),$sbox
+
+        mov     0($inp),$s0
+        mov     4($inp),$s1
+        mov     8($inp),$s2
+        mov     12($inp),$s3
+
+        call    _x86_64_AES_encrypt
+
+        mov     $s0,0($out)
+        mov     $s1,4($out)
+        mov     $s2,8($out)
+        mov     $s3,12($out)
+
+        pop     %r15
+        pop     %r14
+        pop     %r13
+        pop     %r12
+        pop     %rbp
+        pop     %rbx
+        ret
+.size   AES_encrypt,.-AES_encrypt
+___
+
+#------------------------------------------------------------------#
+
+sub decvert()
+{ my $t3="%r8d";        # zaps $inp!
+
+$code.=<<___;
+        # favor 3-way issue Opteron pipeline...
+        movzb   `&lo("$s0")`,$acc0
+        movzb   `&lo("$s1")`,$acc1
+        movzb   `&lo("$s2")`,$acc2
+        mov     0($sbox,$acc0,8),$t0
+        mov     0($sbox,$acc1,8),$t1
+        mov     0($sbox,$acc2,8),$t2
+
+        movzb   `&hi("$s3")`,$acc0
+        movzb   `&hi("$s0")`,$acc1
+        movzb   `&lo("$s3")`,$acc2
+        xor     3($sbox,$acc0,8),$t0
+        xor     3($sbox,$acc1,8),$t1
+        mov     0($sbox,$acc2,8),$t3
+
+        movzb   `&hi("$s1")`,$acc0
+        shr     \$16,$s0
+        movzb   `&hi("$s2")`,$acc2
+        xor     3($sbox,$acc0,8),$t2
+        shr     \$16,$s3
+        xor     3($sbox,$acc2,8),$t3
+
+        shr     \$16,$s1
+        lea     16($key),$key
+        shr     \$16,$s2
+
+        movzb   `&lo("$s2")`,$acc0
+        movzb   `&lo("$s3")`,$acc1
+        movzb   `&lo("$s0")`,$acc2
+        xor     2($sbox,$acc0,8),$t0
+        xor     2($sbox,$acc1,8),$t1
+        xor     2($sbox,$acc2,8),$t2
+
+        movzb   `&hi("$s1")`,$acc0
+        movzb   `&hi("$s2")`,$acc1
+        movzb   `&lo("$s1")`,$acc2
+        xor     1($sbox,$acc0,8),$t0
+        xor     1($sbox,$acc1,8),$t1
+        xor     2($sbox,$acc2,8),$t3
+
+        movzb   `&hi("$s3")`,$acc0
+        mov     12($key),$s3
+        movzb   `&hi("$s0")`,$acc2
+        xor     1($sbox,$acc0,8),$t2
+        mov     0($key),$s0
+        xor     1($sbox,$acc2,8),$t3
+
+        xor     $t0,$s0
+        mov     4($key),$s1
+        mov     8($key),$s2
+        xor     $t2,$s2
+        xor     $t1,$s1
+        xor     $t3,$s3
+___
+}
+
+sub declastvert()
+{ my $t3="%r8d";        # zaps $inp!
+
+$code.=<<___;
+        movzb   `&lo("$s0")`,$acc0
+        movzb   `&lo("$s1")`,$acc1
+        movzb   `&lo("$s2")`,$acc2
+        movzb   2048($sbox,$acc0,1),$t0
+        movzb   2048($sbox,$acc1,1),$t1
+        movzb   2048($sbox,$acc2,1),$t2
+
+        movzb   `&lo("$s3")`,$acc0
+        movzb   `&hi("$s3")`,$acc1
+        movzb   `&hi("$s0")`,$acc2
+        movzb   2048($sbox,$acc0,1),$t3
+        movzb   2048($sbox,$acc1,1),$acc1       #$t0
+        movzb   2048($sbox,$acc2,1),$acc2       #$t1
+
+        shl     \$8,$acc1
+        shl     \$8,$acc2
+
+        xor     $acc1,$t0
+        xor     $acc2,$t1
+        shr     \$16,$s3
+
+        movzb   `&hi("$s1")`,$acc0
+        movzb   `&hi("$s2")`,$acc1
+        shr     \$16,$s0
+        movzb   2048($sbox,$acc0,1),$acc0       #$t2
+        movzb   2048($sbox,$acc1,1),$acc1       #$t3
+
+        shl     \$8,$acc0
+        shl     \$8,$acc1
+        shr     \$16,$s1
+        xor     $acc0,$t2
+        xor     $acc1,$t3
+        shr     \$16,$s2
+
+        movzb   `&lo("$s2")`,$acc0
+        movzb   `&lo("$s3")`,$acc1
+        movzb   `&lo("$s0")`,$acc2
+        movzb   2048($sbox,$acc0,1),$acc0       #$t0
+        movzb   2048($sbox,$acc1,1),$acc1       #$t1
+        movzb   2048($sbox,$acc2,1),$acc2       #$t2
+
+        shl     \$16,$acc0
+        shl     \$16,$acc1
+        shl     \$16,$acc2
+
+        xor     $acc0,$t0
+        xor     $acc1,$t1
+        xor     $acc2,$t2
+
+        movzb   `&lo("$s1")`,$acc0
+        movzb   `&hi("$s1")`,$acc1
+        movzb   `&hi("$s2")`,$acc2
+        movzb   2048($sbox,$acc0,1),$acc0       #$t3
+        movzb   2048($sbox,$acc1,1),$acc1       #$t0
+        movzb   2048($sbox,$acc2,1),$acc2       #$t1
+
+        shl     \$16,$acc0
+        shl     \$24,$acc1
+        shl     \$24,$acc2
+
+        xor     $acc0,$t3
+        xor     $acc1,$t0
+        xor     $acc2,$t1
+
+        movzb   `&hi("$s3")`,$acc0
+        movzb   `&hi("$s0")`,$acc1
+        mov     16+12($key),$s3
+        movzb   2048($sbox,$acc0,1),$acc0       #$t2
+        movzb   2048($sbox,$acc1,1),$acc1       #$t3
+        mov     16+0($key),$s0
+
+        shl     \$24,$acc0
+        shl     \$24,$acc1
+
+        xor     $acc0,$t2
+        xor     $acc1,$t3
+
+        mov     16+4($key),$s1
+        mov     16+8($key),$s2
+        xor     $t0,$s0
+        xor     $t1,$s1
+        xor     $t2,$s2
+        xor     $t3,$s3
+___
+}
+
+sub decstep()
+{ my ($i,@s) = @_;
+  my $tmp0=$acc0;
+  my $tmp1=$acc1;
+  my $tmp2=$acc2;
+  my $out=($t0,$t1,$t2,$s[0])[$i];
+
+        $code.="        mov     $s[0],$out\n"           if ($i!=3);
+                        $tmp1=$s[2]                     if ($i==3);
+        $code.="        mov     $s[2],$tmp1\n"          if ($i!=3);
+        $code.="        and     \$0xFF,$out\n";
+
+        $code.="        mov     0($sbox,$out,8),$out\n";
+        $code.="        shr     \$16,$tmp1\n";
+                        $tmp2=$s[3]                     if ($i==3);
+        $code.="        mov     $s[3],$tmp2\n"          if ($i!=3);
+
+                        $tmp0=$s[1]                     if ($i==3);
+        $code.="        movzb   ".&hi($s[1]).",$tmp0\n";
+        $code.="        and     \$0xFF,$tmp1\n";
+        $code.="        shr     \$24,$tmp2\n";
+
+        $code.="        xor     3($sbox,$tmp0,8),$out\n";
+        $code.="        xor     2($sbox,$tmp1,8),$out\n";
+        $code.="        xor     1($sbox,$tmp2,8),$out\n";
+
+        $code.="        mov     $t2,$s[1]\n"            if ($i==3);
+        $code.="        mov     $t1,$s[2]\n"            if ($i==3);
+        $code.="        mov     $t0,$s[3]\n"            if ($i==3);
+        $code.="\n";
+}
+
+sub declast()
+{ my ($i,@s)=@_;
+  my $tmp0=$acc0;
+  my $tmp1=$acc1;
+  my $tmp2=$acc2;
+  my $out=($t0,$t1,$t2,$s[0])[$i];
+
+        $code.="        mov     $s[0],$out\n"           if ($i!=3);
+                        $tmp1=$s[2]                     if ($i==3);
+        $code.="        mov     $s[2],$tmp1\n"          if ($i!=3);
+        $code.="        and     \$0xFF,$out\n";
+
+        $code.="        movzb   2048($sbox,$out,1),$out\n";
+        $code.="        shr     \$16,$tmp1\n";
+                        $tmp2=$s[3]                     if ($i==3);
+        $code.="        mov     $s[3],$tmp2\n"          if ($i!=3);
+
+                        $tmp0=$s[1]                     if ($i==3);
+        $code.="        movzb   ".&hi($s[1]).",$tmp0\n";
+        $code.="        and     \$0xFF,$tmp1\n";
+        $code.="        shr     \$24,$tmp2\n";
+
+        $code.="        movzb   2048($sbox,$tmp0,1),$tmp0\n";
+        $code.="        movzb   2048($sbox,$tmp1,1),$tmp1\n";
+        $code.="        movzb   2048($sbox,$tmp2,1),$tmp2\n";
+
+        $code.="        shl     \$8,$tmp0\n";
+        $code.="        shl     \$16,$tmp1\n";
+        $code.="        shl     \$24,$tmp2\n";
+
+        $code.="        xor     $tmp0,$out\n";
+        $code.="        mov     $t2,$s[1]\n"            if ($i==3);
+        $code.="        xor     $tmp1,$out\n";
+        $code.="        mov     $t1,$s[2]\n"            if ($i==3);
+        $code.="        xor     $tmp2,$out\n";
+        $code.="        mov     $t0,$s[3]\n"            if ($i==3);
+        $code.="\n";
+}
+
+$code.=<<___;
+.type   _x86_64_AES_decrypt,\@abi-omnipotent
+.align  16
+_x86_64_AES_decrypt:
+        xor     0($key),$s0                     # xor with key
+        xor     4($key),$s1
+        xor     8($key),$s2
+        xor     12($key),$s3
+
+        mov     240($key),$rnds                 # load key->rounds
+        sub     \$1,$rnds
+        jmp     .Ldec_loop
+.align  16
+.Ldec_loop:
+___
+        if ($verticalspin) { &decvert(); }
+        else {  &decstep(0,$s0,$s3,$s2,$s1);
+                &decstep(1,$s1,$s0,$s3,$s2);
+                &decstep(2,$s2,$s1,$s0,$s3);
+                &decstep(3,$s3,$s2,$s1,$s0);
+                $code.=<<___;
+                lea     16($key),$key
+                xor     0($key),$s0                     # xor with key
+                xor     4($key),$s1
+                xor     8($key),$s2
+                xor     12($key),$s3
+___
+        }
+$code.=<<___;
+        sub     \$1,$rnds
+        jnz     .Ldec_loop
+___
+        if ($verticalspin) { &declastvert(); }
+        else {  &declast(0,$s0,$s3,$s2,$s1);
+                &declast(1,$s1,$s0,$s3,$s2);
+                &declast(2,$s2,$s1,$s0,$s3);
+                &declast(3,$s3,$s2,$s1,$s0);
+                $code.=<<___;
+                xor     16+0($key),$s0                  # xor with key
+                xor     16+4($key),$s1
+                xor     16+8($key),$s2
+                xor     16+12($key),$s3
+___
+        }
+$code.=<<___;
+        .byte   0xf3,0xc3                       # rep ret
+.size   _x86_64_AES_decrypt,.-_x86_64_AES_decrypt
+___
+
+# void AES_decrypt (const void *inp,void *out,const AES_KEY *key);
+$code.=<<___;
+.globl  AES_decrypt
+.type   AES_decrypt,\@function,3
+.align  16
+AES_decrypt:
+        push    %rbx
+        push    %rbp
+        push    %r12
+        push    %r13
+        push    %r14
+        push    %r15
+
+        mov     %rdx,$key
+        mov     %rdi,$inp
+        mov     %rsi,$out
+
+        .picmeup        $sbox
+        lea     AES_Td-.($sbox),$sbox
+
+        # prefetch Td4
+        lea     2048+128($sbox),$sbox;
+        mov     0-128($sbox),$s0
+        mov     32-128($sbox),$s1
+        mov     64-128($sbox),$s2
+        mov     96-128($sbox),$s3
+        mov     128-128($sbox),$s0
+        mov     160-128($sbox),$s1
+        mov     192-128($sbox),$s2
+        mov     224-128($sbox),$s3
+        lea     -2048-128($sbox),$sbox;
+
+        mov     0($inp),$s0
+        mov     4($inp),$s1
+        mov     8($inp),$s2
+        mov     12($inp),$s3
+
+        call    _x86_64_AES_decrypt
+
+        mov     $s0,0($out)
+        mov     $s1,4($out)
+        mov     $s2,8($out)
+        mov     $s3,12($out)
+
+        pop     %r15
+        pop     %r14
+        pop     %r13
+        pop     %r12
+        pop     %rbp
+        pop     %rbx
+        ret
+.size   AES_decrypt,.-AES_decrypt
+___
+#------------------------------------------------------------------#
+
+sub enckey()
+{
+$code.=<<___;
+        movz    %dl,%esi                # rk[i]>>0
+        mov     2(%rbp,%rsi,8),%ebx
+        movz    %dh,%esi                # rk[i]>>8
+        and     \$0xFF000000,%ebx
+        xor     %ebx,%eax
+
+        mov     2(%rbp,%rsi,8),%ebx
+        shr     \$16,%edx
+        and     \$0x000000FF,%ebx
+        movz    %dl,%esi                # rk[i]>>16
+        xor     %ebx,%eax
+
+        mov     0(%rbp,%rsi,8),%ebx
+        movz    %dh,%esi                # rk[i]>>24
+        and     \$0x0000FF00,%ebx
+        xor     %ebx,%eax
+
+        mov     0(%rbp,%rsi,8),%ebx
+        and     \$0x00FF0000,%ebx
+        xor     %ebx,%eax
+
+        xor     2048(%rbp,%rcx,4),%eax          # rcon
+___
+}
+
+# int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+#                        AES_KEY *key)
+$code.=<<___;
+.globl  AES_set_encrypt_key
+.type   AES_set_encrypt_key,\@function,3
+.align  16
+AES_set_encrypt_key:
+        push    %rbx
+        push    %rbp
+
+        mov     %esi,%ecx                       # %ecx=bits
+        mov     %rdi,%rsi                       # %rsi=userKey
+        mov     %rdx,%rdi                       # %rdi=key
+
+        test    \$-1,%rsi
+        jz      .Lbadpointer
+        test    \$-1,%rdi
+        jz      .Lbadpointer
+
+        .picmeup %rbp
+        lea     AES_Te-.(%rbp),%rbp
+
+        cmp     \$128,%ecx
+        je      .L10rounds
+        cmp     \$192,%ecx
+        je      .L12rounds
+        cmp     \$256,%ecx
+        je      .L14rounds
+        mov     \$-2,%rax                       # invalid number of bits
+        jmp     .Lexit
+
+.L10rounds:
+        mov     0(%rsi),%eax                    # copy first 4 dwords
+        mov     4(%rsi),%ebx
+        mov     8(%rsi),%ecx
+        mov     12(%rsi),%edx
+        mov     %eax,0(%rdi)
+        mov     %ebx,4(%rdi)
+        mov     %ecx,8(%rdi)
+        mov     %edx,12(%rdi)
+
+        xor     %ecx,%ecx
+        jmp     .L10shortcut
+.align  4
+.L10loop:
+                mov     0(%rdi),%eax                    # rk[0]
+                mov     12(%rdi),%edx                   # rk[3]
+.L10shortcut:
+___
+                &enckey ();
+$code.=<<___;
+                mov     %eax,16(%rdi)                   # rk[4]
+                xor     4(%rdi),%eax
+                mov     %eax,20(%rdi)                   # rk[5]
+                xor     8(%rdi),%eax
+                mov     %eax,24(%rdi)                   # rk[6]
+                xor     12(%rdi),%eax
+                mov     %eax,28(%rdi)                   # rk[7]
+                add     \$1,%ecx
+                lea     16(%rdi),%rdi
+                cmp     \$10,%ecx
+        jl      .L10loop
+
+        movl    \$10,80(%rdi)                   # setup number of rounds
+        xor     %rax,%rax
+        jmp     .Lexit
+
+.L12rounds:
+        mov     0(%rsi),%eax                    # copy first 6 dwords
+        mov     4(%rsi),%ebx
+        mov     8(%rsi),%ecx
+        mov     12(%rsi),%edx
+        mov     %eax,0(%rdi)
+        mov     %ebx,4(%rdi)
+        mov     %ecx,8(%rdi)
+        mov     %edx,12(%rdi)
+        mov     16(%rsi),%ecx
+        mov     20(%rsi),%edx
+        mov     %ecx,16(%rdi)
+        mov     %edx,20(%rdi)
+
+        xor     %ecx,%ecx
+        jmp     .L12shortcut
+.align  4
+.L12loop:
+                mov     0(%rdi),%eax                    # rk[0]
+                mov     20(%rdi),%edx                   # rk[5]
+.L12shortcut:
+___
+                &enckey ();
+$code.=<<___;
+                mov     %eax,24(%rdi)                   # rk[6]
+                xor     4(%rdi),%eax
+                mov     %eax,28(%rdi)                   # rk[7]
+                xor     8(%rdi),%eax
+                mov     %eax,32(%rdi)                   # rk[8]
+                xor     12(%rdi),%eax
+                mov     %eax,36(%rdi)                   # rk[9]
+
+                cmp     \$7,%ecx
+                je      .L12break
+                add     \$1,%ecx
+
+                xor     16(%rdi),%eax
+                mov     %eax,40(%rdi)                   # rk[10]
+                xor     20(%rdi),%eax
+                mov     %eax,44(%rdi)                   # rk[11]
+
+                lea     24(%rdi),%rdi
+        jmp     .L12loop
+.L12break:
+        movl    \$12,72(%rdi)           # setup number of rounds
+        xor     %rax,%rax
+        jmp     .Lexit
+
+.L14rounds:             
+        mov     0(%rsi),%eax                    # copy first 8 dwords
+        mov     4(%rsi),%ebx
+        mov     8(%rsi),%ecx
+        mov     12(%rsi),%edx
+        mov     %eax,0(%rdi)
+        mov     %ebx,4(%rdi)
+        mov     %ecx,8(%rdi)
+        mov     %edx,12(%rdi)
+        mov     16(%rsi),%eax
+        mov     20(%rsi),%ebx
+        mov     24(%rsi),%ecx
+        mov     28(%rsi),%edx
+        mov     %eax,16(%rdi)
+        mov     %ebx,20(%rdi)
+        mov     %ecx,24(%rdi)
+        mov     %edx,28(%rdi)
+
+        xor     %ecx,%ecx
+        jmp     .L14shortcut
+.align  4
+.L14loop:
+                mov     28(%rdi),%edx                   # rk[4]
+.L14shortcut:
+                mov     0(%rdi),%eax                    # rk[0]
+___
+                &enckey ();
+$code.=<<___;
+                mov     %eax,32(%rdi)                   # rk[8]
+                xor     4(%rdi),%eax
+                mov     %eax,36(%rdi)                   # rk[9]
+                xor     8(%rdi),%eax
+                mov     %eax,40(%rdi)                   # rk[10]
+                xor     12(%rdi),%eax
+                mov     %eax,44(%rdi)                   # rk[11]
+
+                cmp     \$6,%ecx
+                je      .L14break
+                add     \$1,%ecx
+
+                mov     %eax,%edx
+                mov     16(%rdi),%eax                   # rk[4]
+                movz    %dl,%esi                        # rk[11]>>0
+                mov     2(%rbp,%rsi,8),%ebx
+                movz    %dh,%esi                        # rk[11]>>8
+                and     \$0x000000FF,%ebx
+                xor     %ebx,%eax
+
+                mov     0(%rbp,%rsi,8),%ebx
+                shr     \$16,%edx
+                and     \$0x0000FF00,%ebx
+                movz    %dl,%esi                        # rk[11]>>16
+                xor     %ebx,%eax
+
+                mov     0(%rbp,%rsi,8),%ebx
+                movz    %dh,%esi                        # rk[11]>>24
+                and     \$0x00FF0000,%ebx
+                xor     %ebx,%eax
+
+                mov     2(%rbp,%rsi,8),%ebx
+                and     \$0xFF000000,%ebx
+                xor     %ebx,%eax
+
+                mov     %eax,48(%rdi)                   # rk[12]
+                xor     20(%rdi),%eax
+                mov     %eax,52(%rdi)                   # rk[13]
+                xor     24(%rdi),%eax
+                mov     %eax,56(%rdi)                   # rk[14]
+                xor     28(%rdi),%eax
+                mov     %eax,60(%rdi)                   # rk[15]
+
+                lea     32(%rdi),%rdi
+        jmp     .L14loop
+.L14break:
+        movl    \$14,48(%rdi)           # setup number of rounds
+        xor     %rax,%rax
+        jmp     .Lexit
+
+.Lbadpointer:
+        mov     \$-1,%rax
+.Lexit:
+        pop     %rbp
+        pop     %rbx
+        ret
+.size   AES_set_encrypt_key,.-AES_set_encrypt_key
+___
+
+sub deckey()
+{ my ($i,$ptr,$te,$td) = @_;
+$code.=<<___;
+        mov     $i($ptr),%eax
+        mov     %eax,%edx
+        movz    %ah,%ebx
+        shr     \$16,%edx
+        and     \$0xFF,%eax
+        movzb   2($te,%rax,8),%rax
+        movzb   2($te,%rbx,8),%rbx
+        mov     0($td,%rax,8),%eax
+        xor     3($td,%rbx,8),%eax
+        movzb   %dh,%ebx
+        and     \$0xFF,%edx
+        movzb   2($te,%rdx,8),%rdx
+        movzb   2($te,%rbx,8),%rbx
+        xor     2($td,%rdx,8),%eax
+        xor     1($td,%rbx,8),%eax
+        mov     %eax,$i($ptr)
+___
+}
+
+# int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+#                        AES_KEY *key)
+$code.=<<___;
+.globl  AES_set_decrypt_key
+.type   AES_set_decrypt_key,\@function,3
+.align  16
+AES_set_decrypt_key:
+        push    %rdx
+        call    AES_set_encrypt_key
+        cmp     \$0,%eax
+        je      .Lproceed
+        lea     24(%rsp),%rsp
+        ret
+.Lproceed:
+        mov     (%rsp),%r8              # restore key schedule
+        mov     %rbx,(%rsp)
+
+        mov     240(%r8),%ecx           # pull number of rounds
+        xor     %rdi,%rdi
+        lea     (%rdi,%rcx,4),%rcx
+        mov     %r8,%rsi
+        lea     (%r8,%rcx,4),%rdi       # pointer to last chunk
+.align  4
+.Linvert:
+                mov     0(%rsi),%rax
+                mov     8(%rsi),%rbx
+                mov     0(%rdi),%rcx
+                mov     8(%rdi),%rdx
+                mov     %rax,0(%rdi)
+                mov     %rbx,8(%rdi)
+                mov     %rcx,0(%rsi)
+                mov     %rdx,8(%rsi)
+                lea     16(%rsi),%rsi
+                lea     -16(%rdi),%rdi
+                cmp     %rsi,%rdi
+        jne     .Linvert
+
+        .picmeup %r9
+        lea     AES_Td-.(%r9),%rdi
+        lea     AES_Te-AES_Td(%rdi),%r9
+
+        mov     %r8,%rsi
+        mov     240(%r8),%ecx           # pull number of rounds
+        sub     \$1,%ecx
+.align  4
+.Lpermute:
+                lea     16(%rsi),%rsi
+___
+                &deckey (0,"%rsi","%r9","%rdi");
+                &deckey (4,"%rsi","%r9","%rdi");
+                &deckey (8,"%rsi","%r9","%rdi");
+                &deckey (12,"%rsi","%r9","%rdi");
+$code.=<<___;
+                sub     \$1,%ecx
+        jnz     .Lpermute
+
+        xor     %rax,%rax
+        pop     %rbx
+        ret
+.size   AES_set_decrypt_key,.-AES_set_decrypt_key
+___
+
+# void AES_cbc_encrypt (const void char *inp, unsigned char *out,
+#                       size_t length, const AES_KEY *key,
+#                       unsigned char *ivp,const int enc);
+{
+# stack frame layout
+# -8(%rsp)              return address
+my $_rsp="0(%rsp)";             # saved %rsp
+my $_len="8(%rsp)";             # copy of 3rd parameter, length
+my $_key="16(%rsp)";            # copy of 4th parameter, key
+my $_ivp="24(%rsp)";            # copy of 5th parameter, ivp
+my $keyp="32(%rsp)";            # one to pass as $key
+my $ivec="40(%rsp)";            # ivec[16]
+my $aes_key="56(%rsp)";         # copy of aes_key
+my $mark="56+240(%rsp)";        # copy of aes_key->rounds
+
+$code.=<<___;
+.globl  AES_cbc_encrypt
+.type   AES_cbc_encrypt,\@function,6
+.align  16
+AES_cbc_encrypt:
+        cmp     \$0,%rdx        # check length
+        je      .Lcbc_just_ret
+        push    %rbx
+        push    %rbp
+        push    %r12
+        push    %r13
+        push    %r14
+        push    %r15
+        pushfq
+        cld
+        mov     %r9d,%r9d       # clear upper half of enc
+
+        .picmeup $sbox
+.Lcbc_pic_point:
+
+        cmp     \$0,%r9
+        je      .LDECRYPT
+
+        lea     AES_Te-.Lcbc_pic_point($sbox),$sbox
+
+        # allocate aligned stack frame...
+        lea     -64-248(%rsp),$key
+        and     \$-64,$key
+
+        # ... and make it doesn't alias with AES_Te modulo 4096
+        mov     $sbox,%r10
+        lea     2048($sbox),%r11
+        mov     $key,%r12
+        and     \$0xFFF,%r10    # s = $sbox&0xfff
+        and     \$0xFFF,%r11    # e = ($sbox+2048)&0xfff
+        and     \$0xFFF,%r12    # p = %rsp&0xfff
+
+        cmp     %r11,%r12       # if (p=>e) %rsp =- (p-e);
+        jb      .Lcbc_te_break_out
+        sub     %r11,%r12
+        sub     %r12,$key
+        jmp     .Lcbc_te_ok
+.Lcbc_te_break_out:             # else %rsp -= (p-s)&0xfff + framesz
+        sub     %r10,%r12
+        and     \$0xFFF,%r12
+        add     \$320,%r12
+        sub     %r12,$key
+.align  4
+.Lcbc_te_ok:
+
+        xchg    %rsp,$key
+        add     \$8,%rsp        # reserve for return address!
+        mov     $key,$_rsp      # save %rsp
+        mov     %rdx,$_len      # save copy of len
+        mov     %rcx,$_key      # save copy of key
+        mov     %r8,$_ivp       # save copy of ivp
+        movl    \$0,$mark       # copy of aes_key->rounds = 0;
+        mov     %r8,%rbp        # rearrange input arguments
+        mov     %rsi,$out
+        mov     %rdi,$inp
+        mov     %rcx,$key
+
+        # do we copy key schedule to stack?
+        mov     $key,%r10
+        sub     $sbox,%r10
+        and     \$0xfff,%r10
+        cmp     \$2048,%r10
+        jb      .Lcbc_do_ecopy
+        cmp     \$4096-248,%r10
+        jb      .Lcbc_skip_ecopy
+.align  4
+.Lcbc_do_ecopy:
+                mov     $key,%rsi
+                lea     $aes_key,%rdi
+                lea     $aes_key,$key
+                mov     \$240/8,%ecx
+                .long   0x90A548F3      # rep movsq
+                mov     (%rsi),%eax     # copy aes_key->rounds
+                mov     %eax,(%rdi)
+.Lcbc_skip_ecopy:
+        mov     $key,$keyp      # save key pointer
+
+        mov     \$16,%ecx
+.align  4
+.Lcbc_prefetch_te:
+                mov     0($sbox),%r10
+                mov     32($sbox),%r11
+                mov     64($sbox),%r12
+                mov     96($sbox),%r13
+                lea     128($sbox),$sbox
+                sub     \$1,%ecx
+        jnz     .Lcbc_prefetch_te
+        sub     \$2048,$sbox
+
+        test    \$-16,%rdx              # check upon length
+        mov     %rdx,%r10
+        mov     0(%rbp),$s0             # load iv
+        mov     4(%rbp),$s1
+        mov     8(%rbp),$s2
+        mov     12(%rbp),$s3
+        jz      .Lcbc_enc_tail          # short input...
+
+.align  4
+.Lcbc_enc_loop:
+                xor     0($inp),$s0
+                xor     4($inp),$s1
+                xor     8($inp),$s2
+                xor     12($inp),$s3
+                mov     $inp,$ivec      # if ($verticalspin) save inp
+
+                mov     $keyp,$key      # restore key
+                call    _x86_64_AES_encrypt
+
+                mov     $ivec,$inp      # if ($verticalspin) restore inp
+                mov     $s0,0($out)
+                mov     $s1,4($out)
+                mov     $s2,8($out)
+                mov     $s3,12($out)
+
+                mov     $_len,%r10
+                lea     16($inp),$inp
+                lea     16($out),$out
+                sub     \$16,%r10
+                test    \$-16,%r10
+                mov     %r10,$_len
+        jnz     .Lcbc_enc_loop
+        test    \$15,%r10
+        jnz     .Lcbc_enc_tail
+        mov     $_ivp,%rbp      # restore ivp
+        mov     $s0,0(%rbp)     # save ivec
+        mov     $s1,4(%rbp)
+        mov     $s2,8(%rbp)
+        mov     $s3,12(%rbp)
+
+.align  4
+.Lcbc_cleanup:
+        cmpl    \$0,$mark       # was the key schedule copied?
+        lea     $aes_key,%rdi
+        mov     $_rsp,%rsp
+        je      .Lcbc_exit
+                mov     \$240/8,%ecx
+                xor     %rax,%rax
+                .long   0x90AB48F3      # rep stosq
+.Lcbc_exit:
+        popfq
+        pop     %r15
+        pop     %r14
+        pop     %r13
+        pop     %r12
+        pop     %rbp
+        pop     %rbx
+.Lcbc_just_ret:
+        ret
+.align  4
+.Lcbc_enc_tail:
+        cmp     $inp,$out
+        je      .Lcbc_enc_in_place
+        mov     %r10,%rcx
+        mov     $inp,%rsi
+        mov     $out,%rdi
+        .long   0xF689A4F3              # rep movsb
+.Lcbc_enc_in_place:
+        mov     \$16,%rcx               # zero tail
+        sub     %r10,%rcx
+        xor     %rax,%rax
+        .long   0xF689AAF3              # rep stosb
+        mov     $out,$inp               # this is not a mistake!
+        movq    \$16,$_len              # len=16
+        jmp     .Lcbc_enc_loop          # one more spin...
+#----------------------------- DECRYPT -----------------------------#
+.align  16
+.LDECRYPT:
+        lea     AES_Td-.Lcbc_pic_point($sbox),$sbox
+
+        # allocate aligned stack frame...
+        lea     -64-248(%rsp),$key
+        and     \$-64,$key
+
+        # ... and make it doesn't alias with AES_Td modulo 4096
+        mov     $sbox,%r10
+        lea     2304($sbox),%r11
+        mov     $key,%r12
+        and     \$0xFFF,%r10    # s = $sbox&0xfff
+        and     \$0xFFF,%r11    # e = ($sbox+2048+256)&0xfff
+        and     \$0xFFF,%r12    # p = %rsp&0xfff
+
+        cmp     %r11,%r12       # if (p=>e) %rsp =- (p-e);
+        jb      .Lcbc_td_break_out
+        sub     %r11,%r12
+        sub     %r12,$key
+        jmp     .Lcbc_td_ok
+.Lcbc_td_break_out:             # else %rsp -= (p-s)&0xfff + framesz
+        sub     %r10,%r12
+        and     \$0xFFF,%r12
+        add     \$320,%r12
+        sub     %r12,$key
+.align  4
+.Lcbc_td_ok:
+
+        xchg    %rsp,$key
+        add     \$8,%rsp        # reserve for return address!
+        mov     $key,$_rsp      # save %rsp
+        mov     %rdx,$_len      # save copy of len
+        mov     %rcx,$_key      # save copy of key
+        mov     %r8,$_ivp       # save copy of ivp
+        movl    \$0,$mark       # copy of aes_key->rounds = 0;
+        mov     %r8,%rbp        # rearrange input arguments
+        mov     %rsi,$out
+        mov     %rdi,$inp
+        mov     %rcx,$key
+
+        # do we copy key schedule to stack?
+        mov     $key,%r10
+        sub     $sbox,%r10
+        and     \$0xfff,%r10
+        cmp     \$2304,%r10
+        jb      .Lcbc_do_dcopy
+        cmp     \$4096-248,%r10
+        jb      .Lcbc_skip_dcopy
+.align  4
+.Lcbc_do_dcopy:
+                mov     $key,%rsi
+                lea     $aes_key,%rdi
+                lea     $aes_key,$key
+                mov     \$240/8,%ecx
+                .long   0x90A548F3      # rep movsq
+                mov     (%rsi),%eax     # copy aes_key->rounds
+                mov     %eax,(%rdi)
+.Lcbc_skip_dcopy:
+        mov     $key,$keyp      # save key pointer
+
+        mov     \$18,%ecx
+.align  4
+.Lcbc_prefetch_td:
+                mov     0($sbox),%r10
+                mov     32($sbox),%r11
+                mov     64($sbox),%r12
+                mov     96($sbox),%r13
+                lea     128($sbox),$sbox
+                sub     \$1,%ecx
+        jnz     .Lcbc_prefetch_td
+        sub     \$2304,$sbox
+
+        cmp     $inp,$out
+        je      .Lcbc_dec_in_place
+
+        mov     %rbp,$ivec
+.align  4
+.Lcbc_dec_loop:
+                mov     0($inp),$s0             # read input
+                mov     4($inp),$s1
+                mov     8($inp),$s2
+                mov     12($inp),$s3
+                mov     $inp,8+$ivec    # if ($verticalspin) save inp
+
+                mov     $keyp,$key      # restore key
+                call    _x86_64_AES_decrypt
+
+                mov     $ivec,%rbp      # load ivp
+                mov     8+$ivec,$inp    # if ($verticalspin) restore inp
+                xor     0(%rbp),$s0     # xor iv
+                xor     4(%rbp),$s1
+                xor     8(%rbp),$s2
+                xor     12(%rbp),$s3
+                mov     $inp,%rbp       # current input, next iv
+
+                mov     $_len,%r10      # load len
+                sub     \$16,%r10
+                jc      .Lcbc_dec_partial
+                mov     %r10,$_len      # update len
+                mov     %rbp,$ivec      # update ivp
+
+                mov     $s0,0($out)     # write output
+                mov     $s1,4($out)
+                mov     $s2,8($out)
+                mov     $s3,12($out)
+
+                lea     16($inp),$inp
+                lea     16($out),$out
+        jnz     .Lcbc_dec_loop
+.Lcbc_dec_end:
+        mov     $_ivp,%r12              # load user ivp
+        mov     0(%rbp),%r10            # load iv
+        mov     8(%rbp),%r11
+        mov     %r10,0(%r12)            # copy back to user
+        mov     %r11,8(%r12)
+        jmp     .Lcbc_cleanup
+
+.align  4
+.Lcbc_dec_partial:
+        mov     $s0,0+$ivec             # dump output to stack
+        mov     $s1,4+$ivec
+        mov     $s2,8+$ivec
+        mov     $s3,12+$ivec
+        mov     $out,%rdi
+        lea     $ivec,%rsi
+        mov     \$16,%rcx
+        add     %r10,%rcx               # number of bytes to copy
+        .long   0xF689A4F3              # rep movsb
+        jmp     .Lcbc_dec_end
+
+.align  16
+.Lcbc_dec_in_place:
+                mov     0($inp),$s0     # load input
+                mov     4($inp),$s1
+                mov     8($inp),$s2
+                mov     12($inp),$s3
+
+                mov     $inp,$ivec      # if ($verticalspin) save inp
+                mov     $keyp,$key
+                call    _x86_64_AES_decrypt
+
+                mov     $ivec,$inp      # if ($verticalspin) restore inp
+                mov     $_ivp,%rbp
+                xor     0(%rbp),$s0
+                xor     4(%rbp),$s1
+                xor     8(%rbp),$s2
+                xor     12(%rbp),$s3
+
+                mov     0($inp),%r10    # copy input to iv
+                mov     8($inp),%r11
+                mov     %r10,0(%rbp)
+                mov     %r11,8(%rbp)
+
+                mov     $s0,0($out)     # save output [zaps input]
+                mov     $s1,4($out)
+                mov     $s2,8($out)
+                mov     $s3,12($out)
+
+                mov     $_len,%rcx
+                lea     16($inp),$inp
+                lea     16($out),$out
+                sub     \$16,%rcx
+                jc      .Lcbc_dec_in_place_partial
+                mov     %rcx,$_len
+        jnz     .Lcbc_dec_in_place
+        jmp     .Lcbc_cleanup
+
+.align  4
+.Lcbc_dec_in_place_partial:
+        # one can argue if this is actually required
+        lea     ($out,%rcx),%rdi
+        lea     (%rbp,%rcx),%rsi
+        neg     %rcx
+        .long   0xF689A4F3      # rep movsb     # restore tail
+        jmp     .Lcbc_cleanup
+.size   AES_cbc_encrypt,.-AES_cbc_encrypt
+___
+}
+
+$code.=<<___;
+.globl  AES_Te
+.align  64
+AES_Te:
+___
+        &_data_word(0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6);
+        &_data_word(0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591);
+        &_data_word(0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56);
+        &_data_word(0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec);
+        &_data_word(0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa);
+        &_data_word(0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb);
+        &_data_word(0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45);
+        &_data_word(0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b);
+        &_data_word(0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c);
+        &_data_word(0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83);
+        &_data_word(0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9);
+        &_data_word(0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a);
+        &_data_word(0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d);
+        &_data_word(0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f);
+        &_data_word(0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df);
+        &_data_word(0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea);
+        &_data_word(0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34);
+        &_data_word(0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b);
+        &_data_word(0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d);
+        &_data_word(0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413);
+        &_data_word(0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1);
+        &_data_word(0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6);
+        &_data_word(0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972);
+        &_data_word(0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85);
+        &_data_word(0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed);
+        &_data_word(0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511);
+        &_data_word(0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe);
+        &_data_word(0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b);
+        &_data_word(0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05);
+        &_data_word(0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1);
+        &_data_word(0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142);
+        &_data_word(0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf);
+        &_data_word(0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3);
+        &_data_word(0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e);
+        &_data_word(0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a);
+        &_data_word(0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6);
+        &_data_word(0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3);
+        &_data_word(0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b);
+        &_data_word(0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428);
+        &_data_word(0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad);
+        &_data_word(0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14);
+        &_data_word(0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8);
+        &_data_word(0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4);
+        &_data_word(0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2);
+        &_data_word(0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda);
+        &_data_word(0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949);
+        &_data_word(0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf);
+        &_data_word(0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810);
+        &_data_word(0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c);
+        &_data_word(0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697);
+        &_data_word(0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e);
+        &_data_word(0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f);
+        &_data_word(0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc);
+        &_data_word(0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c);
+        &_data_word(0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969);
+        &_data_word(0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27);
+        &_data_word(0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122);
+        &_data_word(0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433);
+        &_data_word(0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9);
+        &_data_word(0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5);
+        &_data_word(0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a);
+        &_data_word(0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0);
+        &_data_word(0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e);
+        &_data_word(0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c);
+#rcon:
+$code.=<<___;
+        .long   0x00000001, 0x00000002, 0x00000004, 0x00000008
+        .long   0x00000010, 0x00000020, 0x00000040, 0x00000080
+        .long   0x0000001b, 0x00000036, 0, 0, 0, 0, 0, 0
+___
+$code.=<<___;
+.globl  AES_Td
+.align  64
+AES_Td:
+___
+        &_data_word(0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a);
+        &_data_word(0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b);
+        &_data_word(0x55fa3020, 0xf66d76ad, 0x9176cc88, 0x254c02f5);
+        &_data_word(0xfcd7e54f, 0xd7cb2ac5, 0x80443526, 0x8fa362b5);
+        &_data_word(0x495ab1de, 0x671bba25, 0x980eea45, 0xe1c0fe5d);
+        &_data_word(0x02752fc3, 0x12f04c81, 0xa397468d, 0xc6f9d36b);
+        &_data_word(0xe75f8f03, 0x959c9215, 0xeb7a6dbf, 0xda595295);
+        &_data_word(0x2d83bed4, 0xd3217458, 0x2969e049, 0x44c8c98e);
+        &_data_word(0x6a89c275, 0x78798ef4, 0x6b3e5899, 0xdd71b927);
+        &_data_word(0xb64fe1be, 0x17ad88f0, 0x66ac20c9, 0xb43ace7d);
+        &_data_word(0x184adf63, 0x82311ae5, 0x60335197, 0x457f5362);
+        &_data_word(0xe07764b1, 0x84ae6bbb, 0x1ca081fe, 0x942b08f9);
+        &_data_word(0x58684870, 0x19fd458f, 0x876cde94, 0xb7f87b52);
+        &_data_word(0x23d373ab, 0xe2024b72, 0x578f1fe3, 0x2aab5566);
+        &_data_word(0x0728ebb2, 0x03c2b52f, 0x9a7bc586, 0xa50837d3);
+        &_data_word(0xf2872830, 0xb2a5bf23, 0xba6a0302, 0x5c8216ed);
+        &_data_word(0x2b1ccf8a, 0x92b479a7, 0xf0f207f3, 0xa1e2694e);
+        &_data_word(0xcdf4da65, 0xd5be0506, 0x1f6234d1, 0x8afea6c4);
+        &_data_word(0x9d532e34, 0xa055f3a2, 0x32e18a05, 0x75ebf6a4);
+        &_data_word(0x39ec830b, 0xaaef6040, 0x069f715e, 0x51106ebd);
+        &_data_word(0xf98a213e, 0x3d06dd96, 0xae053edd, 0x46bde64d);
+        &_data_word(0xb58d5491, 0x055dc471, 0x6fd40604, 0xff155060);
+        &_data_word(0x24fb9819, 0x97e9bdd6, 0xcc434089, 0x779ed967);
+        &_data_word(0xbd42e8b0, 0x888b8907, 0x385b19e7, 0xdbeec879);
+        &_data_word(0x470a7ca1, 0xe90f427c, 0xc91e84f8, 0x00000000);
+        &_data_word(0x83868009, 0x48ed2b32, 0xac70111e, 0x4e725a6c);
+        &_data_word(0xfbff0efd, 0x5638850f, 0x1ed5ae3d, 0x27392d36);
+        &_data_word(0x64d90f0a, 0x21a65c68, 0xd1545b9b, 0x3a2e3624);
+        &_data_word(0xb1670a0c, 0x0fe75793, 0xd296eeb4, 0x9e919b1b);
+        &_data_word(0x4fc5c080, 0xa220dc61, 0x694b775a, 0x161a121c);
+        &_data_word(0x0aba93e2, 0xe52aa0c0, 0x43e0223c, 0x1d171b12);
+        &_data_word(0x0b0d090e, 0xadc78bf2, 0xb9a8b62d, 0xc8a91e14);
+        &_data_word(0x8519f157, 0x4c0775af, 0xbbdd99ee, 0xfd607fa3);
+        &_data_word(0x9f2601f7, 0xbcf5725c, 0xc53b6644, 0x347efb5b);
+        &_data_word(0x7629438b, 0xdcc623cb, 0x68fcedb6, 0x63f1e4b8);
+        &_data_word(0xcadc31d7, 0x10856342, 0x40229713, 0x2011c684);
+        &_data_word(0x7d244a85, 0xf83dbbd2, 0x1132f9ae, 0x6da129c7);
+        &_data_word(0x4b2f9e1d, 0xf330b2dc, 0xec52860d, 0xd0e3c177);
+        &_data_word(0x6c16b32b, 0x99b970a9, 0xfa489411, 0x2264e947);
+        &_data_word(0xc48cfca8, 0x1a3ff0a0, 0xd82c7d56, 0xef903322);
+        &_data_word(0xc74e4987, 0xc1d138d9, 0xfea2ca8c, 0x360bd498);
+        &_data_word(0xcf81f5a6, 0x28de7aa5, 0x268eb7da, 0xa4bfad3f);
+        &_data_word(0xe49d3a2c, 0x0d927850, 0x9bcc5f6a, 0x62467e54);
+        &_data_word(0xc2138df6, 0xe8b8d890, 0x5ef7392e, 0xf5afc382);
+        &_data_word(0xbe805d9f, 0x7c93d069, 0xa92dd56f, 0xb31225cf);
+        &_data_word(0x3b99acc8, 0xa77d1810, 0x6e639ce8, 0x7bbb3bdb);
+        &_data_word(0x097826cd, 0xf418596e, 0x01b79aec, 0xa89a4f83);
+        &_data_word(0x656e95e6, 0x7ee6ffaa, 0x08cfbc21, 0xe6e815ef);
+        &_data_word(0xd99be7ba, 0xce366f4a, 0xd4099fea, 0xd67cb029);
+        &_data_word(0xafb2a431, 0x31233f2a, 0x3094a5c6, 0xc066a235);
+        &_data_word(0x37bc4e74, 0xa6ca82fc, 0xb0d090e0, 0x15d8a733);
+        &_data_word(0x4a9804f1, 0xf7daec41, 0x0e50cd7f, 0x2ff69117);
+        &_data_word(0x8dd64d76, 0x4db0ef43, 0x544daacc, 0xdf0496e4);
+        &_data_word(0xe3b5d19e, 0x1b886a4c, 0xb81f2cc1, 0x7f516546);
+        &_data_word(0x04ea5e9d, 0x5d358c01, 0x737487fa, 0x2e410bfb);
+        &_data_word(0x5a1d67b3, 0x52d2db92, 0x335610e9, 0x1347d66d);
+        &_data_word(0x8c61d79a, 0x7a0ca137, 0x8e14f859, 0x893c13eb);
+        &_data_word(0xee27a9ce, 0x35c961b7, 0xede51ce1, 0x3cb1477a);
+        &_data_word(0x59dfd29c, 0x3f73f255, 0x79ce1418, 0xbf37c773);
+        &_data_word(0xeacdf753, 0x5baafd5f, 0x146f3ddf, 0x86db4478);
+        &_data_word(0x81f3afca, 0x3ec468b9, 0x2c342438, 0x5f40a3c2);
+        &_data_word(0x72c31d16, 0x0c25e2bc, 0x8b493c28, 0x41950dff);
+        &_data_word(0x7101a839, 0xdeb30c08, 0x9ce4b4d8, 0x90c15664);
+        &_data_word(0x6184cb7b, 0x70b632d5, 0x745c6c48, 0x4257b8d0);
+#Td4:
+        &data_byte(0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38);
+        &data_byte(0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb);
+        &data_byte(0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87);
+        &data_byte(0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb);
+        &data_byte(0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d);
+        &data_byte(0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e);
+        &data_byte(0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2);
+        &data_byte(0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25);
+        &data_byte(0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16);
+        &data_byte(0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92);
+        &data_byte(0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda);
+        &data_byte(0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84);
+        &data_byte(0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a);
+        &data_byte(0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06);
+        &data_byte(0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02);
+        &data_byte(0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b);
+        &data_byte(0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea);
+        &data_byte(0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73);
+        &data_byte(0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85);
+        &data_byte(0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e);
+        &data_byte(0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89);
+        &data_byte(0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b);
+        &data_byte(0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20);
+        &data_byte(0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4);
+        &data_byte(0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31);
+        &data_byte(0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f);
+        &data_byte(0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d);
+        &data_byte(0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef);
+        &data_byte(0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0);
+        &data_byte(0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61);
+        &data_byte(0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26);
+        &data_byte(0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d);
+
+$code =~ s/\`([^\`]*)\`/eval($1)/gem;
+
+print $code;
+
+close STDOUT;
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_gen.c b/src/lib/libssl/src/crypto/asn1/asn1_gen.c
new file mode 100644
index 0000000000..26c832781e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/asn1/asn1_gen.c
@@ -0,0 +1,848 @@
+/* asn1_gen.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2002.
+ */
+/* ====================================================================
+ * Copyright (c) 2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+#include <openssl/asn1.h>
+#include <openssl/x509v3.h>
+
+#define ASN1_GEN_FLAG           0x10000
+#define ASN1_GEN_FLAG_IMP       (ASN1_GEN_FLAG|1)
+#define ASN1_GEN_FLAG_EXP       (ASN1_GEN_FLAG|2)
+#define ASN1_GEN_FLAG_TAG       (ASN1_GEN_FLAG|3)
+#define ASN1_GEN_FLAG_BITWRAP   (ASN1_GEN_FLAG|4)
+#define ASN1_GEN_FLAG_OCTWRAP   (ASN1_GEN_FLAG|5)
+#define ASN1_GEN_FLAG_SEQWRAP   (ASN1_GEN_FLAG|6)
+#define ASN1_GEN_FLAG_SETWRAP   (ASN1_GEN_FLAG|7)
+#define ASN1_GEN_FLAG_FORMAT    (ASN1_GEN_FLAG|8)
+
+#define ASN1_GEN_STR(str,val)   {str, sizeof(str) - 1, val}
+
+#define ASN1_FLAG_EXP_MAX       20
+
+/* Input formats */
+
+/* ASCII: default */
+#define ASN1_GEN_FORMAT_ASCII   1
+/* UTF8 */
+#define ASN1_GEN_FORMAT_UTF8    2
+/* Hex */
+#define ASN1_GEN_FORMAT_HEX     3
+/* List of bits */
+#define ASN1_GEN_FORMAT_BITLIST 4
+
+
+struct tag_name_st
+        {
+        const char *strnam;
+        int len;
+        int tag;
+        };
+
+typedef struct
+        {
+        int exp_tag;
+        int exp_class;
+        int exp_constructed;
+        int exp_pad;
+        long exp_len;
+        } tag_exp_type;
+
+typedef struct
+        {
+        int imp_tag;
+        int imp_class;
+        int utype;
+        int format;
+        const char *str;
+        tag_exp_type exp_list[ASN1_FLAG_EXP_MAX];
+        int exp_count;
+        } tag_exp_arg;
+
+static int bitstr_cb(const char *elem, int len, void *bitstr);
+static int asn1_cb(const char *elem, int len, void *bitstr);
+static int append_exp(tag_exp_arg *arg, int exp_tag, int exp_class, int exp_constructed, int exp_pad, int imp_ok);
+static int parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass);
+static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf);
+static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype);
+static int asn1_str2tag(const char *tagstr, int len);
+
+ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf)
+        {
+        X509V3_CTX cnf;
+
+        if (!nconf)
+                return ASN1_generate_v3(str, NULL);
+
+        X509V3_set_nconf(&cnf, nconf);
+        return ASN1_generate_v3(str, &cnf);
+        }
+
+ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf)
+        {
+        ASN1_TYPE *ret;
+        tag_exp_arg asn1_tags;
+        tag_exp_type *etmp;
+
+        int i, len;
+
+        unsigned char *orig_der = NULL, *new_der = NULL;
+        const unsigned char *cpy_start;
+        unsigned char *p;
+        const unsigned char *cp;
+        int cpy_len;
+        long hdr_len;
+        int hdr_constructed = 0, hdr_tag, hdr_class;
+        int r;
+
+        asn1_tags.imp_tag = -1;
+        asn1_tags.imp_class = -1;
+        asn1_tags.format = ASN1_GEN_FORMAT_ASCII;
+        asn1_tags.exp_count = 0;
+        if (CONF_parse_list(str, ',', 1, asn1_cb, &asn1_tags) != 0)
+                return NULL;
+
+        if ((asn1_tags.utype == V_ASN1_SEQUENCE) || (asn1_tags.utype == V_ASN1_SET))
+                {
+                if (!cnf)
+                        {
+                        ASN1err(ASN1_F_ASN1_GENERATE_V3, ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG);
+                        return NULL;
+                        }
+                ret = asn1_multi(asn1_tags.utype, asn1_tags.str, cnf);
+                }
+        else
+                ret = asn1_str2type(asn1_tags.str, asn1_tags.format, asn1_tags.utype);
+
+        if (!ret)
+                return NULL;
+
+        /* If no tagging return base type */
+        if ((asn1_tags.imp_tag == -1) && (asn1_tags.exp_count == 0))
+                return ret;
+
+        /* Generate the encoding */
+        cpy_len = i2d_ASN1_TYPE(ret, &orig_der);
+        ASN1_TYPE_free(ret);
+        ret = NULL;
+        /* Set point to start copying for modified encoding */
+        cpy_start = orig_der;
+
+        /* Do we need IMPLICIT tagging? */
+        if (asn1_tags.imp_tag != -1)
+                {
+                /* If IMPLICIT we will replace the underlying tag */
+                /* Skip existing tag+len */
+                r = ASN1_get_object(&cpy_start, &hdr_len, &hdr_tag, &hdr_class, cpy_len);
+                if (r & 0x80)
+                        goto err;
+                /* Update copy length */
+                cpy_len -= cpy_start - orig_der;
+                /* For IMPLICIT tagging the length should match the
+                 * original length and constructed flag should be
+                 * consistent.
+                 */
+                if (r & 0x1)
+                        {
+                        /* Indefinite length constructed */
+                        hdr_constructed = 2;
+                        hdr_len = 0;
+                        }
+                else
+                        /* Just retain constructed flag */
+                        hdr_constructed = r & V_ASN1_CONSTRUCTED;
+                /* Work out new length with IMPLICIT tag: ignore constructed
+                 * because it will mess up if indefinite length
+                 */
+                len = ASN1_object_size(0, hdr_len, asn1_tags.imp_tag);
+                }
+        else
+                len = cpy_len;
+
+        /* Work out length in any EXPLICIT, starting from end */
+
+        for(i = 0, etmp = asn1_tags.exp_list + asn1_tags.exp_count - 1; i < asn1_tags.exp_count; i++, etmp--)
+                {
+                /* Content length: number of content octets + any padding */
+                len += etmp->exp_pad;
+                etmp->exp_len = len;
+                /* Total object length: length including new header */
+                len = ASN1_object_size(0, len, etmp->exp_tag);
+                }
+
+        /* Allocate buffer for new encoding */
+
+        new_der = OPENSSL_malloc(len);
+
+        /* Generate tagged encoding */
+
+        p = new_der;
+
+        /* Output explicit tags first */
+
+        for (i = 0, etmp = asn1_tags.exp_list; i < asn1_tags.exp_count; i++, etmp++)
+                {
+                ASN1_put_object(&p, etmp->exp_constructed, etmp->exp_len,
+                                        etmp->exp_tag, etmp->exp_class);
+                if (etmp->exp_pad)
+                        *p++ = 0;
+                }
+
+        /* If IMPLICIT, output tag */
+
+        if (asn1_tags.imp_tag != -1)
+                ASN1_put_object(&p, hdr_constructed, hdr_len,
+                                        asn1_tags.imp_tag, asn1_tags.imp_class);
+
+        /* Copy across original encoding */
+        memcpy(p, cpy_start, cpy_len);
+
+        cp = new_der;
+
+        /* Obtain new ASN1_TYPE structure */
+        ret = d2i_ASN1_TYPE(NULL, &cp, len);
+
+        err:
+        if (orig_der)
+                OPENSSL_free(orig_der);
+        if (new_der)
+                OPENSSL_free(new_der);
+
+        return ret;
+
+        }
+
+static int asn1_cb(const char *elem, int len, void *bitstr)
+        {
+        tag_exp_arg *arg = bitstr;
+        int i;
+        int utype;
+        int vlen = 0;
+        const char *p, *vstart = NULL;
+
+        int tmp_tag, tmp_class;
+
+        for(i = 0, p = elem; i < len; p++, i++)
+                {
+                /* Look for the ':' in name value pairs */
+                if (*p == ':')
+                        {
+                        vstart = p + 1;
+                        vlen = len - (vstart - elem);
+                        len = p - elem;
+                        break;
+                        }
+                }
+
+        utype = asn1_str2tag(elem, len);
+
+        if (utype == -1)
+                {
+                ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_TAG);
+                ERR_add_error_data(2, "tag=", elem);
+                return -1;
+                }
+
+        /* If this is not a modifier mark end of string and exit */
+        if (!(utype & ASN1_GEN_FLAG))
+                {
+                arg->utype = utype;
+                arg->str = vstart;
+                /* If no value and not end of string, error */
+                if (!vstart && elem[len])
+                        {
+                        ASN1err(ASN1_F_ASN1_CB, ASN1_R_MISSING_VALUE);
+                        return -1;
+                        }
+                return 0;
+                }
+
+        switch(utype)
+                {
+
+                case ASN1_GEN_FLAG_IMP:
+                /* Check for illegal multiple IMPLICIT tagging */
+                if (arg->imp_tag != -1)
+                        {
+                        ASN1err(ASN1_F_ASN1_CB, ASN1_R_ILLEGAL_NESTED_TAGGING);
+                        return -1;
+                        }
+                if (!parse_tagging(vstart, vlen, &arg->imp_tag, &arg->imp_class))
+                        return -1;
+                break;
+
+                case ASN1_GEN_FLAG_EXP:
+
+                if (!parse_tagging(vstart, vlen, &tmp_tag, &tmp_class))
+                        return -1;
+                if (!append_exp(arg, tmp_tag, tmp_class, 1, 0, 0))
+                        return -1;
+                break;
+
+                case ASN1_GEN_FLAG_SEQWRAP:
+                if (!append_exp(arg, V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL, 1, 0, 1))
+                        return -1;
+                break;
+
+                case ASN1_GEN_FLAG_SETWRAP:
+                if (!append_exp(arg, V_ASN1_SET, V_ASN1_UNIVERSAL, 1, 0, 1))
+                        return -1;
+                break;
+
+                case ASN1_GEN_FLAG_BITWRAP:
+                if (!append_exp(arg, V_ASN1_BIT_STRING, V_ASN1_UNIVERSAL, 0, 1, 1))
+                        return -1;
+                break;
+
+                case ASN1_GEN_FLAG_OCTWRAP:
+                if (!append_exp(arg, V_ASN1_OCTET_STRING, V_ASN1_UNIVERSAL, 0, 0, 1))
+                        return -1;
+                break;
+
+                case ASN1_GEN_FLAG_FORMAT:
+                if (!strncmp(vstart, "ASCII", 5))
+                        arg->format = ASN1_GEN_FORMAT_ASCII;
+                else if (!strncmp(vstart, "UTF8", 4))
+                        arg->format = ASN1_GEN_FORMAT_UTF8;
+                else if (!strncmp(vstart, "HEX", 3))
+                        arg->format = ASN1_GEN_FORMAT_HEX;
+                else if (!strncmp(vstart, "BITLIST", 3))
+                        arg->format = ASN1_GEN_FORMAT_BITLIST;
+                else
+                        {
+                        ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKOWN_FORMAT);
+                        return -1;
+                        }
+                break;
+
+                }
+
+        return 1;
+
+        }
+
+static int parse_tagging(const char *vstart, int vlen, int *ptag, int *pclass)
+        {
+        char erch[2];
+        long tag_num;
+        char *eptr;
+        if (!vstart)
+                return 0;
+        tag_num = strtoul(vstart, &eptr, 10);
+        /* Check we haven't gone past max length: should be impossible */
+        if (eptr && *eptr && (eptr > vstart + vlen))
+                return 0;
+        if (tag_num < 0)
+                {
+                ASN1err(ASN1_F_PARSE_TAGGING, ASN1_R_INVALID_NUMBER);
+                return 0;
+                }
+        *ptag = tag_num;
+        /* If we have non numeric characters, parse them */
+        if (eptr)
+                vlen -= eptr - vstart;
+        else 
+                vlen = 0;
+        if (vlen)
+                {
+                switch (*eptr)
+                        {
+
+                        case 'U':
+                        *pclass = V_ASN1_UNIVERSAL;
+                        break;
+
+                        case 'A':
+                        *pclass = V_ASN1_APPLICATION;
+                        break;
+
+                        case 'P':
+                        *pclass = V_ASN1_PRIVATE;
+                        break;
+
+                        case 'C':
+                        *pclass = V_ASN1_CONTEXT_SPECIFIC;
+                        break;
+
+                        default:
+                        erch[0] = *eptr;
+                        erch[1] = 0;
+                        ASN1err(ASN1_F_PARSE_TAGGING, ASN1_R_INVALID_MODIFIER);
+                        ERR_add_error_data(2, "Char=", erch);
+                        return 0;
+                        break;
+
+                        }
+                }
+        else
+                *pclass = V_ASN1_CONTEXT_SPECIFIC;
+
+        return 1;
+
+        }
+
+/* Handle multiple types: SET and SEQUENCE */
+
+static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf)
+        {
+        ASN1_TYPE *ret = NULL, *typ = NULL;
+        STACK_OF(ASN1_TYPE) *sk = NULL;
+        STACK_OF(CONF_VALUE) *sect = NULL;
+        unsigned char *der = NULL, *p;
+        int derlen;
+        int i, is_set;
+        sk = sk_ASN1_TYPE_new_null();
+        if (section)
+                {
+                if (!cnf)
+                        goto bad;
+                sect = X509V3_get_section(cnf, (char *)section);
+                if (!sect)
+                        goto bad;
+                for (i = 0; i < sk_CONF_VALUE_num(sect); i++)
+                        {
+                        typ = ASN1_generate_v3(sk_CONF_VALUE_value(sect, i)->value, cnf);
+                        if (!typ)
+                                goto bad;
+                        sk_ASN1_TYPE_push(sk, typ);
+                        typ = NULL;
+                        }
+                }
+
+        /* Now we has a STACK of the components, convert to the correct form */
+
+        if (utype == V_ASN1_SET)
+                is_set = 1;
+        else
+                is_set = 0;
+
+
+        derlen = i2d_ASN1_SET_OF_ASN1_TYPE(sk, NULL, i2d_ASN1_TYPE, utype,
+                                           V_ASN1_UNIVERSAL, is_set);
+        der = OPENSSL_malloc(derlen);
+        p = der;
+        i2d_ASN1_SET_OF_ASN1_TYPE(sk, &p, i2d_ASN1_TYPE, utype,
+                                  V_ASN1_UNIVERSAL, is_set);
+
+        if (!(ret = ASN1_TYPE_new()))
+                goto bad;
+
+        if (!(ret->value.asn1_string = ASN1_STRING_type_new(utype)))
+                goto bad;
+
+        ret->type = utype;
+
+        ret->value.asn1_string->data = der;
+        ret->value.asn1_string->length = derlen;
+
+        der = NULL;
+
+        bad:
+
+        if (der)
+                OPENSSL_free(der);
+
+        if (sk)
+                sk_ASN1_TYPE_pop_free(sk, ASN1_TYPE_free);
+        if (typ)
+                ASN1_TYPE_free(typ);
+        if (sect)
+                X509V3_section_free(cnf, sect);
+
+        return ret;
+        }
+
+static int append_exp(tag_exp_arg *arg, int exp_tag, int exp_class, int exp_constructed, int exp_pad, int imp_ok)
+        {
+        tag_exp_type *exp_tmp;
+        /* Can only have IMPLICIT if permitted */
+        if ((arg->imp_tag != -1) && !imp_ok)
+                {
+                ASN1err(ASN1_F_APPEND_EXP, ASN1_R_ILLEGAL_IMPLICIT_TAG);
+                return 0;
+                }
+
+        if (arg->exp_count == ASN1_FLAG_EXP_MAX)
+                {
+                ASN1err(ASN1_F_APPEND_EXP, ASN1_R_DEPTH_EXCEEDED);
+                return 0;
+                }
+
+        exp_tmp = &arg->exp_list[arg->exp_count++];
+
+        /* If IMPLICIT set tag to implicit value then
+         * reset implicit tag since it has been used.
+         */
+        if (arg->imp_tag != -1)
+                {
+                exp_tmp->exp_tag = arg->imp_tag;
+                exp_tmp->exp_class = arg->imp_class;
+                arg->imp_tag = -1;
+                arg->imp_class = -1;
+                }
+        else
+                {
+                exp_tmp->exp_tag = exp_tag;
+                exp_tmp->exp_class = exp_class;
+                }
+        exp_tmp->exp_constructed = exp_constructed;
+        exp_tmp->exp_pad = exp_pad;
+
+        return 1;
+        }
+
+
+static int asn1_str2tag(const char *tagstr, int len)
+        {
+        unsigned int i;
+        static struct tag_name_st *tntmp, tnst [] = {
+                ASN1_GEN_STR("BOOL", V_ASN1_BOOLEAN),
+                ASN1_GEN_STR("BOOLEAN", V_ASN1_BOOLEAN),
+                ASN1_GEN_STR("NULL", V_ASN1_NULL),
+                ASN1_GEN_STR("INT", V_ASN1_INTEGER),
+                ASN1_GEN_STR("INTEGER", V_ASN1_INTEGER),
+                ASN1_GEN_STR("ENUM", V_ASN1_ENUMERATED),
+                ASN1_GEN_STR("ENUMERATED", V_ASN1_ENUMERATED),
+                ASN1_GEN_STR("OID", V_ASN1_OBJECT),
+                ASN1_GEN_STR("OBJECT", V_ASN1_OBJECT),
+                ASN1_GEN_STR("UTCTIME", V_ASN1_UTCTIME),
+                ASN1_GEN_STR("UTC", V_ASN1_UTCTIME),
+                ASN1_GEN_STR("GENERALIZEDTIME", V_ASN1_GENERALIZEDTIME),
+                ASN1_GEN_STR("GENTIME", V_ASN1_GENERALIZEDTIME),
+                ASN1_GEN_STR("OCT", V_ASN1_OCTET_STRING),
+                ASN1_GEN_STR("OCTETSTRING", V_ASN1_OCTET_STRING),
+                ASN1_GEN_STR("BITSTR", V_ASN1_BIT_STRING),
+                ASN1_GEN_STR("BITSTRING", V_ASN1_BIT_STRING),
+                ASN1_GEN_STR("UNIVERSALSTRING", V_ASN1_UNIVERSALSTRING),
+                ASN1_GEN_STR("UNIV", V_ASN1_UNIVERSALSTRING),
+                ASN1_GEN_STR("IA5", V_ASN1_IA5STRING),
+                ASN1_GEN_STR("IA5STRING", V_ASN1_IA5STRING),
+                ASN1_GEN_STR("UTF8", V_ASN1_UTF8STRING),
+                ASN1_GEN_STR("UTF8String", V_ASN1_UTF8STRING),
+                ASN1_GEN_STR("BMP", V_ASN1_BMPSTRING),
+                ASN1_GEN_STR("BMPSTRING", V_ASN1_BMPSTRING),
+                ASN1_GEN_STR("VISIBLESTRING", V_ASN1_VISIBLESTRING),
+                ASN1_GEN_STR("VISIBLE", V_ASN1_VISIBLESTRING),
+                ASN1_GEN_STR("PRINTABLESTRING", V_ASN1_PRINTABLESTRING),
+                ASN1_GEN_STR("PRINTABLE", V_ASN1_PRINTABLESTRING),
+                ASN1_GEN_STR("T61", V_ASN1_T61STRING),
+                ASN1_GEN_STR("T61STRING", V_ASN1_T61STRING),
+                ASN1_GEN_STR("TELETEXSTRING", V_ASN1_T61STRING),
+                ASN1_GEN_STR("GeneralString", V_ASN1_GENERALSTRING),
+                ASN1_GEN_STR("GENSTR", V_ASN1_GENERALSTRING),
+
+                /* Special cases */
+                ASN1_GEN_STR("SEQUENCE", V_ASN1_SEQUENCE),
+                ASN1_GEN_STR("SEQ", V_ASN1_SEQUENCE),
+                ASN1_GEN_STR("SET", V_ASN1_SET),
+                /* type modifiers */
+                /* Explicit tag */
+                ASN1_GEN_STR("EXP", ASN1_GEN_FLAG_EXP),
+                ASN1_GEN_STR("EXPLICIT", ASN1_GEN_FLAG_EXP),
+                /* Implicit tag */
+                ASN1_GEN_STR("IMP", ASN1_GEN_FLAG_IMP),
+                ASN1_GEN_STR("IMPLICIT", ASN1_GEN_FLAG_IMP),
+                /* OCTET STRING wrapper */
+                ASN1_GEN_STR("OCTWRAP", ASN1_GEN_FLAG_OCTWRAP),
+                /* SEQUENCE wrapper */
+                ASN1_GEN_STR("SEQWRAP", ASN1_GEN_FLAG_SEQWRAP),
+                /* SET wrapper */
+                ASN1_GEN_STR("SETWRAP", ASN1_GEN_FLAG_SETWRAP),
+                /* BIT STRING wrapper */
+                ASN1_GEN_STR("BITWRAP", ASN1_GEN_FLAG_BITWRAP),
+                ASN1_GEN_STR("FORM", ASN1_GEN_FLAG_FORMAT),
+                ASN1_GEN_STR("FORMAT", ASN1_GEN_FLAG_FORMAT),
+        };
+
+        if (len == -1)
+                len = strlen(tagstr);
+        
+        tntmp = tnst;   
+        for (i = 0; i < sizeof(tnst) / sizeof(struct tag_name_st); i++, tntmp++)
+                {
+                if ((len == tntmp->len) && !strncmp(tntmp->strnam, tagstr, len))
+                        return tntmp->tag;
+                }
+        
+        return -1;
+        }
+
+static ASN1_TYPE *asn1_str2type(const char *str, int format, int utype)
+        {
+        ASN1_TYPE *atmp = NULL;
+
+        CONF_VALUE vtmp;
+
+        unsigned char *rdata;
+        long rdlen;
+
+        int no_unused = 1;
+
+        if (!(atmp = ASN1_TYPE_new()))
+                {
+                ASN1err(ASN1_F_ASN1_STR2TYPE, ERR_R_MALLOC_FAILURE);
+                return NULL;
+                }
+
+        if (!str)
+                str = "";
+
+        switch(utype)
+                {
+
+                case V_ASN1_NULL:
+                if (str && *str)
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_NULL_VALUE);
+                        goto bad_form;
+                        }
+                break;
+                
+                case V_ASN1_BOOLEAN:
+                if (format != ASN1_GEN_FORMAT_ASCII)
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_NOT_ASCII_FORMAT);
+                        goto bad_form;
+                        }
+                vtmp.name = NULL;
+                vtmp.section = NULL;
+                vtmp.value = (char *)str;
+                if (!X509V3_get_value_bool(&vtmp, &atmp->value.boolean))
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_BOOLEAN);
+                        goto bad_str;
+                        }
+                break;
+
+                case V_ASN1_INTEGER:
+                case V_ASN1_ENUMERATED:
+                if (format != ASN1_GEN_FORMAT_ASCII)
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_INTEGER_NOT_ASCII_FORMAT);
+                        goto bad_form;
+                        }
+                if (!(atmp->value.integer = s2i_ASN1_INTEGER(NULL, (char *)str)))
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_INTEGER);
+                        goto bad_str;
+                        }
+                break;
+
+                case V_ASN1_OBJECT:
+                if (format != ASN1_GEN_FORMAT_ASCII)
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_OBJECT_NOT_ASCII_FORMAT);
+                        goto bad_form;
+                        }
+                if (!(atmp->value.object = OBJ_txt2obj(str, 0)))
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_OBJECT);
+                        goto bad_str;
+                        }
+                break;
+
+                case V_ASN1_UTCTIME:
+                case V_ASN1_GENERALIZEDTIME:
+                if (format != ASN1_GEN_FORMAT_ASCII)
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_TIME_NOT_ASCII_FORMAT);
+                        goto bad_form;
+                        }
+                if (!(atmp->value.asn1_string = ASN1_STRING_new()))
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ERR_R_MALLOC_FAILURE);
+                        goto bad_str;
+                        }
+                if (!ASN1_STRING_set(atmp->value.asn1_string, str, -1))
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ERR_R_MALLOC_FAILURE);
+                        goto bad_str;
+                        }
+                atmp->value.asn1_string->type = utype;
+                if (!ASN1_TIME_check(atmp->value.asn1_string))
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_TIME_VALUE);
+                        goto bad_str;
+                        }
+
+                break;
+
+                case V_ASN1_BMPSTRING:
+                case V_ASN1_PRINTABLESTRING:
+                case V_ASN1_IA5STRING:
+                case V_ASN1_T61STRING:
+                case V_ASN1_UTF8STRING:
+                case V_ASN1_VISIBLESTRING:
+                case V_ASN1_UNIVERSALSTRING:
+                case V_ASN1_GENERALSTRING:
+
+                if (format == ASN1_GEN_FORMAT_ASCII)
+                        format = MBSTRING_ASC;
+                else if (format == ASN1_GEN_FORMAT_UTF8)
+                        format = MBSTRING_UTF8;
+                else
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_FORMAT);
+                        goto bad_form;
+                        }
+
+
+                if (ASN1_mbstring_copy(&atmp->value.asn1_string, (unsigned char *)str,
+                                                -1, format, ASN1_tag2bit(utype)) <= 0)
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ERR_R_MALLOC_FAILURE);
+                        goto bad_str;
+                        }
+                
+
+                break;
+
+                case V_ASN1_BIT_STRING:
+
+                case V_ASN1_OCTET_STRING:
+
+                if (!(atmp->value.asn1_string = ASN1_STRING_new()))
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ERR_R_MALLOC_FAILURE);
+                        goto bad_form;
+                        }
+
+                if (format == ASN1_GEN_FORMAT_HEX)
+                        {
+
+                        if (!(rdata = string_to_hex((char *)str, &rdlen)))
+                                {
+                                ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_HEX);
+                                goto bad_str;
+                                }
+
+                        atmp->value.asn1_string->data = rdata;
+                        atmp->value.asn1_string->length = rdlen;
+                        atmp->value.asn1_string->type = utype;
+
+                        }
+                else if (format == ASN1_GEN_FORMAT_ASCII)
+                        ASN1_STRING_set(atmp->value.asn1_string, str, -1);
+                else if ((format == ASN1_GEN_FORMAT_BITLIST) && (utype == V_ASN1_BIT_STRING))
+                        {
+                        if (!CONF_parse_list(str, ',', 1, bitstr_cb, atmp->value.bit_string))
+                                {
+                                ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_LIST_ERROR);
+                                goto bad_str;
+                                }
+                        no_unused = 0;
+                        
+                        }
+                else 
+                        {
+                        ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_ILLEGAL_BITSTRING_FORMAT);
+                        goto bad_form;
+                        }
+
+                if ((utype == V_ASN1_BIT_STRING) && no_unused)
+                        {
+                        atmp->value.asn1_string->flags
+                                &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
+                        atmp->value.asn1_string->flags
+                                |= ASN1_STRING_FLAG_BITS_LEFT;
+                        }
+
+
+                break;
+
+                default:
+                ASN1err(ASN1_F_ASN1_STR2TYPE, ASN1_R_UNSUPPORTED_TYPE);
+                goto bad_str;
+                break;
+                }
+
+
+        atmp->type = utype;
+        return atmp;
+
+
+        bad_str:
+        ERR_add_error_data(2, "string=", str);
+        bad_form:
+
+        ASN1_TYPE_free(atmp);
+        return NULL;
+
+        }
+
+static int bitstr_cb(const char *elem, int len, void *bitstr)
+        {
+        long bitnum;
+        char *eptr;
+        if (!elem)
+                return 0;
+        bitnum = strtoul(elem, &eptr, 10);
+        if (eptr && *eptr && (eptr != elem + len))
+                return 0;
+        if (bitnum < 0)
+                {
+                ASN1err(ASN1_F_BITSTR_CB, ASN1_R_INVALID_NUMBER);
+                return 0;
+                }
+        if (!ASN1_BIT_STRING_set_bit(bitstr, bitnum, 1))
+                {
+                ASN1err(ASN1_F_BITSTR_CB, ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        return 1;
+        }
+
diff --git a/src/lib/libssl/src/crypto/asn1/asn_mime.c b/src/lib/libssl/src/crypto/asn1/asn_mime.c
new file mode 100644
index 0000000000..fe7c4ec7ab
--- /dev/null
+++ b/src/lib/libssl/src/crypto/asn1/asn_mime.c
@@ -0,0 +1,874 @@
+/* asn_mime.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#include <stdio.h>
+#include <ctype.h>
+#include "cryptlib.h"
+#include <openssl/rand.h>
+#include <openssl/x509.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
+
+/* Generalised MIME like utilities for streaming ASN1. Although many
+ * have a PKCS7/CMS like flavour others are more general purpose.
+ */
+
+/* MIME format structures
+ * Note that all are translated to lower case apart from
+ * parameter values. Quotes are stripped off
+ */
+
+typedef struct {
+char *param_name;                       /* Param name e.g. "micalg" */
+char *param_value;                      /* Param value e.g. "sha1" */
+} MIME_PARAM;
+
+DECLARE_STACK_OF(MIME_PARAM)
+IMPLEMENT_STACK_OF(MIME_PARAM)
+
+typedef struct {
+char *name;                             /* Name of line e.g. "content-type" */
+char *value;                            /* Value of line e.g. "text/plain" */
+STACK_OF(MIME_PARAM) *params;           /* Zero or more parameters */
+} MIME_HEADER;
+
+DECLARE_STACK_OF(MIME_HEADER)
+IMPLEMENT_STACK_OF(MIME_HEADER)
+
+static char * strip_ends(char *name);
+static char * strip_start(char *name);
+static char * strip_end(char *name);
+static MIME_HEADER *mime_hdr_new(char *name, char *value);
+static int mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value);
+static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio);
+static int mime_hdr_cmp(const MIME_HEADER * const *a,
+                        const MIME_HEADER * const *b);
+static int mime_param_cmp(const MIME_PARAM * const *a,
+                        const MIME_PARAM * const *b);
+static void mime_param_free(MIME_PARAM *param);
+static int mime_bound_check(char *line, int linelen, char *bound, int blen);
+static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret);
+static int strip_eol(char *linebuf, int *plen);
+static MIME_HEADER *mime_hdr_find(STACK_OF(MIME_HEADER) *hdrs, char *name);
+static MIME_PARAM *mime_param_find(MIME_HEADER *hdr, char *name);
+static void mime_hdr_free(MIME_HEADER *hdr);
+
+#define MAX_SMLEN 1024
+#define mime_debug(x) /* x */
+
+/* Base 64 read and write of ASN1 structure */
+
+static int B64_write_ASN1(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
+                                const ASN1_ITEM *it)
+        {
+        BIO *b64;
+        int r;
+        b64 = BIO_new(BIO_f_base64());
+        if(!b64)
+                {
+                ASN1err(ASN1_F_B64_WRITE_ASN1,ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        /* prepend the b64 BIO so all data is base64 encoded.
+         */
+        out = BIO_push(b64, out);
+        r = ASN1_item_i2d_bio(it, out, val);
+        (void)BIO_flush(out);
+        BIO_pop(out);
+        BIO_free(b64);
+        return r;
+        }
+
+static ASN1_VALUE *b64_read_asn1(BIO *bio, const ASN1_ITEM *it)
+{
+        BIO *b64;
+        ASN1_VALUE *val;
+        if(!(b64 = BIO_new(BIO_f_base64()))) {
+                ASN1err(ASN1_F_B64_READ_ASN1,ERR_R_MALLOC_FAILURE);
+                return 0;
+        }
+        bio = BIO_push(b64, bio);
+        val = ASN1_item_d2i_bio(it, bio, NULL);
+        if(!val)
+                ASN1err(ASN1_F_B64_READ_ASN1,ASN1_R_DECODE_ERROR);
+        (void)BIO_flush(bio);
+        bio = BIO_pop(bio);
+        BIO_free(b64);
+        return val;
+}
+
+/* Generate the MIME "micalg" parameter from RFC3851, RFC4490 */
+
+static int asn1_write_micalg(BIO *out, STACK_OF(X509_ALGOR) *mdalgs)
+        {
+        const EVP_MD *md;
+        int i, have_unknown = 0, write_comma, md_nid;
+        have_unknown = 0;
+        write_comma = 0;
+        for (i = 0; i < sk_X509_ALGOR_num(mdalgs); i++)
+                {
+                if (write_comma)
+                        BIO_write(out, ",", 1);
+                write_comma = 1;
+                md_nid = OBJ_obj2nid(sk_X509_ALGOR_value(mdalgs, i)->algorithm);
+                md = EVP_get_digestbynid(md_nid);
+                switch(md_nid)
+                        {
+                        case NID_sha1:
+                        BIO_puts(out, "sha1");
+                        break;
+
+                        case NID_md5:
+                        BIO_puts(out, "md5");
+                        break;
+
+                        case NID_sha256:
+                        BIO_puts(out, "sha-256");
+                        break;
+
+                        case NID_sha384:
+                        BIO_puts(out, "sha-384");
+                        break;
+
+                        case NID_sha512:
+                        BIO_puts(out, "sha-512");
+                        break;
+
+                        default:
+                        if (have_unknown)
+                                write_comma = 0;
+                        else
+                                {
+                                BIO_puts(out, "unknown");
+                                have_unknown = 1;
+                                }
+                        break;
+
+                        }
+                }
+
+        return 1;
+
+        }
+
+/* SMIME sender */
+
+int int_smime_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
+                                int ctype_nid, int econt_nid,
+                                STACK_OF(X509_ALGOR) *mdalgs,
+                                asn1_output_data_fn *data_fn,
+                                const ASN1_ITEM *it)
+{
+        char bound[33], c;
+        int i;
+        const char *mime_prefix, *mime_eol, *cname = "smime.p7m";
+        const char *msg_type=NULL;
+        if (flags & SMIME_OLDMIME)
+                mime_prefix = "application/x-pkcs7-";
+        else
+                mime_prefix = "application/pkcs7-";
+
+        if (flags & SMIME_CRLFEOL)
+                mime_eol = "\r\n";
+        else
+                mime_eol = "\n";
+        if((flags & SMIME_DETACHED) && data) {
+        /* We want multipart/signed */
+                /* Generate a random boundary */
+                RAND_pseudo_bytes((unsigned char *)bound, 32);
+                for(i = 0; i < 32; i++) {
+                        c = bound[i] & 0xf;
+                        if(c < 10) c += '0';
+                        else c += 'A' - 10;
+                        bound[i] = c;
+                }
+                bound[32] = 0;
+                BIO_printf(bio, "MIME-Version: 1.0%s", mime_eol);
+                BIO_printf(bio, "Content-Type: multipart/signed;");
+                BIO_printf(bio, " protocol=\"%ssignature\";", mime_prefix);
+                BIO_puts(bio, " micalg=\"");
+                asn1_write_micalg(bio, mdalgs);
+                BIO_printf(bio, "\"; boundary=\"----%s\"%s%s",
+                                                bound, mime_eol, mime_eol);
+                BIO_printf(bio, "This is an S/MIME signed message%s%s",
+                                                mime_eol, mime_eol);
+                /* Now write out the first part */
+                BIO_printf(bio, "------%s%s", bound, mime_eol);
+                if (!data_fn(bio, data, val, flags, it))
+                        return 0;
+                BIO_printf(bio, "%s------%s%s", mime_eol, bound, mime_eol);
+
+                /* Headers for signature */
+
+                BIO_printf(bio, "Content-Type: %ssignature;", mime_prefix); 
+                BIO_printf(bio, " name=\"smime.p7s\"%s", mime_eol);
+                BIO_printf(bio, "Content-Transfer-Encoding: base64%s",
+                                                                mime_eol);
+                BIO_printf(bio, "Content-Disposition: attachment;");
+                BIO_printf(bio, " filename=\"smime.p7s\"%s%s",
+                                                        mime_eol, mime_eol);
+                B64_write_ASN1(bio, val, NULL, 0, it);
+                BIO_printf(bio,"%s------%s--%s%s", mime_eol, bound,
+                                                        mime_eol, mime_eol);
+                return 1;
+        }
+
+        /* Determine smime-type header */
+
+        if (ctype_nid == NID_pkcs7_enveloped)
+                msg_type = "enveloped-data";
+        else if (ctype_nid == NID_pkcs7_signed)
+                {
+                if (econt_nid == NID_id_smime_ct_receipt)
+                        msg_type = "signed-receipt";
+                else if (sk_X509_ALGOR_num(mdalgs) >= 0)
+                        msg_type = "signed-data";
+                else
+                        msg_type = "certs-only";
+                }
+        else if (ctype_nid == NID_id_smime_ct_compressedData)
+                {
+                msg_type = "compressed-data";
+                cname = "smime.p7z";
+                }
+        /* MIME headers */
+        BIO_printf(bio, "MIME-Version: 1.0%s", mime_eol);
+        BIO_printf(bio, "Content-Disposition: attachment;");
+        BIO_printf(bio, " filename=\"%s\"%s", cname, mime_eol);
+        BIO_printf(bio, "Content-Type: %smime;", mime_prefix);
+        if (msg_type)
+                BIO_printf(bio, " smime-type=%s;", msg_type);
+        BIO_printf(bio, " name=\"%s\"%s", cname, mime_eol);
+        BIO_printf(bio, "Content-Transfer-Encoding: base64%s%s",
+                                                mime_eol, mime_eol);
+        if (!B64_write_ASN1(bio, val, data, flags, it))
+                return 0;
+        BIO_printf(bio, "%s", mime_eol);
+        return 1;
+}
+
+#if 0
+
+/* Handle output of ASN1 data */
+
+
+static int asn1_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
+                                        const ASN1_ITEM *it)
+        {
+        BIO *tmpbio;
+        const ASN1_AUX *aux = it->funcs;
+        ASN1_STREAM_ARG sarg;
+
+        if (!(flags & SMIME_DETACHED))
+                {
+                SMIME_crlf_copy(data, out, flags);
+                return 1;
+                }
+
+        if (!aux || !aux->asn1_cb)
+                {
+                ASN1err(ASN1_F_ASN1_OUTPUT_DATA,
+                                        ASN1_R_STREAMING_NOT_SUPPORTED);
+                return 0;
+                }
+
+        sarg.out = out;
+        sarg.ndef_bio = NULL;
+        sarg.boundary = NULL;
+
+        /* Let ASN1 code prepend any needed BIOs */
+
+        if (aux->asn1_cb(ASN1_OP_DETACHED_PRE, &val, it, &sarg) <= 0)
+                return 0;
+
+        /* Copy data across, passing through filter BIOs for processing */
+        SMIME_crlf_copy(data, sarg.ndef_bio, flags);
+
+        /* Finalize structure */
+        if (aux->asn1_cb(ASN1_OP_DETACHED_POST, &val, it, &sarg) <= 0)
+                return 0;
+
+        /* Now remove any digests prepended to the BIO */
+
+        while (sarg.ndef_bio != out)
+                {
+                tmpbio = BIO_pop(sarg.ndef_bio);
+                BIO_free(sarg.ndef_bio);
+                sarg.ndef_bio = tmpbio;
+                }
+
+        return 1;
+
+        }
+
+#endif
+
+/* SMIME reader: handle multipart/signed and opaque signing.
+ * in multipart case the content is placed in a memory BIO
+ * pointed to by "bcont". In opaque this is set to NULL
+ */
+
+ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it)
+{
+        BIO *asnin;
+        STACK_OF(MIME_HEADER) *headers = NULL;
+        STACK_OF(BIO) *parts = NULL;
+        MIME_HEADER *hdr;
+        MIME_PARAM *prm;
+        ASN1_VALUE *val;
+        int ret;
+
+        if(bcont) *bcont = NULL;
+
+        if (!(headers = mime_parse_hdr(bio))) {
+                ASN1err(ASN1_F_SMIME_READ_ASN1,ASN1_R_MIME_PARSE_ERROR);
+                return NULL;
+        }
+
+        if(!(hdr = mime_hdr_find(headers, "content-type")) || !hdr->value) {
+                sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                ASN1err(ASN1_F_SMIME_READ_ASN1, ASN1_R_NO_CONTENT_TYPE);
+                return NULL;
+        }
+
+        /* Handle multipart/signed */
+
+        if(!strcmp(hdr->value, "multipart/signed")) {
+                /* Split into two parts */
+                prm = mime_param_find(hdr, "boundary");
+                if(!prm || !prm->param_value) {
+                        sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                        ASN1err(ASN1_F_SMIME_READ_ASN1, ASN1_R_NO_MULTIPART_BOUNDARY);
+                        return NULL;
+                }
+                ret = multi_split(bio, prm->param_value, &parts);
+                sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                if(!ret || (sk_BIO_num(parts) != 2) ) {
+                        ASN1err(ASN1_F_SMIME_READ_ASN1, ASN1_R_NO_MULTIPART_BODY_FAILURE);
+                        sk_BIO_pop_free(parts, BIO_vfree);
+                        return NULL;
+                }
+
+                /* Parse the signature piece */
+                asnin = sk_BIO_value(parts, 1);
+
+                if (!(headers = mime_parse_hdr(asnin))) {
+                        ASN1err(ASN1_F_SMIME_READ_ASN1,ASN1_R_MIME_SIG_PARSE_ERROR);
+                        sk_BIO_pop_free(parts, BIO_vfree);
+                        return NULL;
+                }
+
+                /* Get content type */
+
+                if(!(hdr = mime_hdr_find(headers, "content-type")) ||
+                                                                 !hdr->value) {
+                        sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                        ASN1err(ASN1_F_SMIME_READ_ASN1, ASN1_R_NO_SIG_CONTENT_TYPE);
+                        return NULL;
+                }
+
+                if(strcmp(hdr->value, "application/x-pkcs7-signature") &&
+                        strcmp(hdr->value, "application/pkcs7-signature")) {
+                        sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                        ASN1err(ASN1_F_SMIME_READ_ASN1,ASN1_R_SIG_INVALID_MIME_TYPE);
+                        ERR_add_error_data(2, "type: ", hdr->value);
+                        sk_BIO_pop_free(parts, BIO_vfree);
+                        return NULL;
+                }
+                sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                /* Read in ASN1 */
+                if(!(val = b64_read_asn1(asnin, it))) {
+                        ASN1err(ASN1_F_SMIME_READ_ASN1,ASN1_R_ASN1_SIG_PARSE_ERROR);
+                        sk_BIO_pop_free(parts, BIO_vfree);
+                        return NULL;
+                }
+
+                if(bcont) {
+                        *bcont = sk_BIO_value(parts, 0);
+                        BIO_free(asnin);
+                        sk_BIO_free(parts);
+                } else sk_BIO_pop_free(parts, BIO_vfree);
+                return val;
+        }
+                
+        /* OK, if not multipart/signed try opaque signature */
+
+        if (strcmp (hdr->value, "application/x-pkcs7-mime") &&
+            strcmp (hdr->value, "application/pkcs7-mime")) {
+                ASN1err(ASN1_F_SMIME_READ_ASN1,ASN1_R_INVALID_MIME_TYPE);
+                ERR_add_error_data(2, "type: ", hdr->value);
+                sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                return NULL;
+        }
+
+        sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+        
+        if(!(val = b64_read_asn1(bio, it))) {
+                ASN1err(ASN1_F_SMIME_READ_ASN1, ASN1_R_ASN1_PARSE_ERROR);
+                return NULL;
+        }
+        return val;
+
+}
+
+/* Copy text from one BIO to another making the output CRLF at EOL */
+int SMIME_crlf_copy(BIO *in, BIO *out, int flags)
+{
+        BIO *bf;
+        char eol;
+        int len;
+        char linebuf[MAX_SMLEN];
+        /* Buffer output so we don't write one line at a time. This is
+         * useful when streaming as we don't end up with one OCTET STRING
+         * per line.
+         */
+        bf = BIO_new(BIO_f_buffer());
+        if (!bf)
+                return 0;
+        out = BIO_push(bf, out);
+        if(flags & SMIME_BINARY)
+                {
+                while((len = BIO_read(in, linebuf, MAX_SMLEN)) > 0)
+                                                BIO_write(out, linebuf, len);
+                }
+        else
+                {
+                if(flags & SMIME_TEXT)
+                        BIO_printf(out, "Content-Type: text/plain\r\n\r\n");
+                while ((len = BIO_gets(in, linebuf, MAX_SMLEN)) > 0)
+                        {
+                        eol = strip_eol(linebuf, &len);
+                        if (len)
+                                BIO_write(out, linebuf, len);
+                        if(eol) BIO_write(out, "\r\n", 2);
+                        }
+                }
+        (void)BIO_flush(out);
+        BIO_pop(out);
+        BIO_free(bf);
+        return 1;
+}
+
+/* Strip off headers if they are text/plain */
+int SMIME_text(BIO *in, BIO *out)
+{
+        char iobuf[4096];
+        int len;
+        STACK_OF(MIME_HEADER) *headers;
+        MIME_HEADER *hdr;
+
+        if (!(headers = mime_parse_hdr(in))) {
+                ASN1err(ASN1_F_SMIME_TEXT,ASN1_R_MIME_PARSE_ERROR);
+                return 0;
+        }
+        if(!(hdr = mime_hdr_find(headers, "content-type")) || !hdr->value) {
+                ASN1err(ASN1_F_SMIME_TEXT,ASN1_R_MIME_NO_CONTENT_TYPE);
+                sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                return 0;
+        }
+        if (strcmp (hdr->value, "text/plain")) {
+                ASN1err(ASN1_F_SMIME_TEXT,ASN1_R_INVALID_MIME_TYPE);
+                ERR_add_error_data(2, "type: ", hdr->value);
+                sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+                return 0;
+        }
+        sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
+        while ((len = BIO_read(in, iobuf, sizeof(iobuf))) > 0)
+                                                BIO_write(out, iobuf, len);
+        return 1;
+}
+
+/* Split a multipart/XXX message body into component parts: result is
+ * canonical parts in a STACK of bios
+ */
+
+static int multi_split(BIO *bio, char *bound, STACK_OF(BIO) **ret)
+{
+        char linebuf[MAX_SMLEN];
+        int len, blen;
+        int eol = 0, next_eol = 0;
+        BIO *bpart = NULL;
+        STACK_OF(BIO) *parts;
+        char state, part, first;
+
+        blen = strlen(bound);
+        part = 0;
+        state = 0;
+        first = 1;
+        parts = sk_BIO_new_null();
+        *ret = parts;
+        while ((len = BIO_gets(bio, linebuf, MAX_SMLEN)) > 0) {
+                state = mime_bound_check(linebuf, len, bound, blen);
+                if(state == 1) {
+                        first = 1;
+                        part++;
+                } else if(state == 2) {
+                        sk_BIO_push(parts, bpart);
+                        return 1;
+                } else if(part) {
+                        /* Strip CR+LF from linebuf */
+                        next_eol = strip_eol(linebuf, &len);
+                        if(first) {
+                                first = 0;
+                                if(bpart) sk_BIO_push(parts, bpart);
+                                bpart = BIO_new(BIO_s_mem());
+                                BIO_set_mem_eof_return(bpart, 0);
+                        } else if (eol)
+                                BIO_write(bpart, "\r\n", 2);
+                        eol = next_eol;
+                        if (len)
+                                BIO_write(bpart, linebuf, len);
+                }
+        }
+        return 0;
+}
+
+/* This is the big one: parse MIME header lines up to message body */
+
+#define MIME_INVALID    0
+#define MIME_START      1
+#define MIME_TYPE       2
+#define MIME_NAME       3
+#define MIME_VALUE      4
+#define MIME_QUOTE      5
+#define MIME_COMMENT    6
+
+
+static STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
+{
+        char *p, *q, c;
+        char *ntmp;
+        char linebuf[MAX_SMLEN];
+        MIME_HEADER *mhdr = NULL;
+        STACK_OF(MIME_HEADER) *headers;
+        int len, state, save_state = 0;
+
+        headers = sk_MIME_HEADER_new(mime_hdr_cmp);
+        while ((len = BIO_gets(bio, linebuf, MAX_SMLEN)) > 0) {
+        /* If whitespace at line start then continuation line */
+        if(mhdr && isspace((unsigned char)linebuf[0])) state = MIME_NAME;
+        else state = MIME_START;
+        ntmp = NULL;
+        /* Go through all characters */
+        for(p = linebuf, q = linebuf; (c = *p) && (c!='\r') && (c!='\n'); p++) {
+
+        /* State machine to handle MIME headers
+         * if this looks horrible that's because it *is*
+         */
+
+                switch(state) {
+                        case MIME_START:
+                        if(c == ':') {
+                                state = MIME_TYPE;
+                                *p = 0;
+                                ntmp = strip_ends(q);
+                                q = p + 1;
+                        }
+                        break;
+
+                        case MIME_TYPE:
+                        if(c == ';') {
+                                mime_debug("Found End Value\n");
+                                *p = 0;
+                                mhdr = mime_hdr_new(ntmp, strip_ends(q));
+                                sk_MIME_HEADER_push(headers, mhdr);
+                                ntmp = NULL;
+                                q = p + 1;
+                                state = MIME_NAME;
+                        } else if(c == '(') {
+                                save_state = state;
+                                state = MIME_COMMENT;
+                        }
+                        break;
+
+                        case MIME_COMMENT:
+                        if(c == ')') {
+                                state = save_state;
+                        }
+                        break;
+
+                        case MIME_NAME:
+                        if(c == '=') {
+                                state = MIME_VALUE;
+                                *p = 0;
+                                ntmp = strip_ends(q);
+                                q = p + 1;
+                        }
+                        break ;
+
+                        case MIME_VALUE:
+                        if(c == ';') {
+                                state = MIME_NAME;
+                                *p = 0;
+                                mime_hdr_addparam(mhdr, ntmp, strip_ends(q));
+                                ntmp = NULL;
+                                q = p + 1;
+                        } else if (c == '"') {
+                                mime_debug("Found Quote\n");
+                                state = MIME_QUOTE;
+                        } else if(c == '(') {
+                                save_state = state;
+                                state = MIME_COMMENT;
+                        }
+                        break;
+
+                        case MIME_QUOTE:
+                        if(c == '"') {
+                                mime_debug("Found Match Quote\n");
+                                state = MIME_VALUE;
+                        }
+                        break;
+                }
+        }
+
+        if(state == MIME_TYPE) {
+                mhdr = mime_hdr_new(ntmp, strip_ends(q));
+                sk_MIME_HEADER_push(headers, mhdr);
+        } else if(state == MIME_VALUE)
+                         mime_hdr_addparam(mhdr, ntmp, strip_ends(q));
+        if(p == linebuf) break; /* Blank line means end of headers */
+}
+
+return headers;
+
+}
+
+static char *strip_ends(char *name)
+{
+        return strip_end(strip_start(name));
+}
+
+/* Strip a parameter of whitespace from start of param */
+static char *strip_start(char *name)
+{
+        char *p, c;
+        /* Look for first non white space or quote */
+        for(p = name; (c = *p) ;p++) {
+                if(c == '"') {
+                        /* Next char is start of string if non null */
+                        if(p[1]) return p + 1;
+                        /* Else null string */
+                        return NULL;
+                }
+                if(!isspace((unsigned char)c)) return p;
+        }
+        return NULL;
+}
+
+/* As above but strip from end of string : maybe should handle brackets? */
+static char *strip_end(char *name)
+{
+        char *p, c;
+        if(!name) return NULL;
+        /* Look for first non white space or quote */
+        for(p = name + strlen(name) - 1; p >= name ;p--) {
+                c = *p;
+                if(c == '"') {
+                        if(p - 1 == name) return NULL;
+                        *p = 0;
+                        return name;
+                }
+                if(isspace((unsigned char)c)) *p = 0;   
+                else return name;
+        }
+        return NULL;
+}
+
+static MIME_HEADER *mime_hdr_new(char *name, char *value)
+{
+        MIME_HEADER *mhdr;
+        char *tmpname, *tmpval, *p;
+        int c;
+        if(name) {
+                if(!(tmpname = BUF_strdup(name))) return NULL;
+                for(p = tmpname ; *p; p++) {
+                        c = *p;
+                        if(isupper(c)) {
+                                c = tolower(c);
+                                *p = c;
+                        }
+                }
+        } else tmpname = NULL;
+        if(value) {
+                if(!(tmpval = BUF_strdup(value))) return NULL;
+                for(p = tmpval ; *p; p++) {
+                        c = *p;
+                        if(isupper(c)) {
+                                c = tolower(c);
+                                *p = c;
+                        }
+                }
+        } else tmpval = NULL;
+        mhdr = (MIME_HEADER *) OPENSSL_malloc(sizeof(MIME_HEADER));
+        if(!mhdr) return NULL;
+        mhdr->name = tmpname;
+        mhdr->value = tmpval;
+        if(!(mhdr->params = sk_MIME_PARAM_new(mime_param_cmp))) return NULL;
+        return mhdr;
+}
+                
+static int mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value)
+{
+        char *tmpname, *tmpval, *p;
+        int c;
+        MIME_PARAM *mparam;
+        if(name) {
+                tmpname = BUF_strdup(name);
+                if(!tmpname) return 0;
+                for(p = tmpname ; *p; p++) {
+                        c = *p;
+                        if(isupper(c)) {
+                                c = tolower(c);
+                                *p = c;
+                        }
+                }
+        } else tmpname = NULL;
+        if(value) {
+                tmpval = BUF_strdup(value);
+                if(!tmpval) return 0;
+        } else tmpval = NULL;
+        /* Parameter values are case sensitive so leave as is */
+        mparam = (MIME_PARAM *) OPENSSL_malloc(sizeof(MIME_PARAM));
+        if(!mparam) return 0;
+        mparam->param_name = tmpname;
+        mparam->param_value = tmpval;
+        sk_MIME_PARAM_push(mhdr->params, mparam);
+        return 1;
+}
+
+static int mime_hdr_cmp(const MIME_HEADER * const *a,
+                        const MIME_HEADER * const *b)
+{
+        return(strcmp((*a)->name, (*b)->name));
+}
+
+static int mime_param_cmp(const MIME_PARAM * const *a,
+                        const MIME_PARAM * const *b)
+{
+        return(strcmp((*a)->param_name, (*b)->param_name));
+}
+
+/* Find a header with a given name (if possible) */
+
+static MIME_HEADER *mime_hdr_find(STACK_OF(MIME_HEADER) *hdrs, char *name)
+{
+        MIME_HEADER htmp;
+        int idx;
+        htmp.name = name;
+        idx = sk_MIME_HEADER_find(hdrs, &htmp);
+        if(idx < 0) return NULL;
+        return sk_MIME_HEADER_value(hdrs, idx);
+}
+
+static MIME_PARAM *mime_param_find(MIME_HEADER *hdr, char *name)
+{
+        MIME_PARAM param;
+        int idx;
+        param.param_name = name;
+        idx = sk_MIME_PARAM_find(hdr->params, &param);
+        if(idx < 0) return NULL;
+        return sk_MIME_PARAM_value(hdr->params, idx);
+}
+
+static void mime_hdr_free(MIME_HEADER *hdr)
+{
+        if(hdr->name) OPENSSL_free(hdr->name);
+        if(hdr->value) OPENSSL_free(hdr->value);
+        if(hdr->params) sk_MIME_PARAM_pop_free(hdr->params, mime_param_free);
+        OPENSSL_free(hdr);
+}
+
+static void mime_param_free(MIME_PARAM *param)
+{
+        if(param->param_name) OPENSSL_free(param->param_name);
+        if(param->param_value) OPENSSL_free(param->param_value);
+        OPENSSL_free(param);
+}
+
+/* Check for a multipart boundary. Returns:
+ * 0 : no boundary
+ * 1 : part boundary
+ * 2 : final boundary
+ */
+static int mime_bound_check(char *line, int linelen, char *bound, int blen)
+{
+        if(linelen == -1) linelen = strlen(line);
+        if(blen == -1) blen = strlen(bound);
+        /* Quickly eliminate if line length too short */
+        if(blen + 2 > linelen) return 0;
+        /* Check for part boundary */
+        if(!strncmp(line, "--", 2) && !strncmp(line + 2, bound, blen)) {
+                if(!strncmp(line + blen + 2, "--", 2)) return 2;
+                else return 1;
+        }
+        return 0;
+}
+
+static int strip_eol(char *linebuf, int *plen)
+        {
+        int len = *plen;
+        char *p, c;
+        int is_eol = 0;
+        p = linebuf + len - 1;
+        for (p = linebuf + len - 1; len > 0; len--, p--)
+                {
+                c = *p;
+                if (c == '\n')
+                        is_eol = 1;
+                else if (c != '\r')
+                        break;
+                }
+        *plen = len;
+        return is_eol;
+        }
diff --git a/src/lib/libssl/src/crypto/bio/bio_lcl.h b/src/lib/libssl/src/crypto/bio/bio_lcl.h
new file mode 100644
index 0000000000..dba2919d43
--- /dev/null
+++ b/src/lib/libssl/src/crypto/bio/bio_lcl.h
@@ -0,0 +1,28 @@
+#include <openssl/bio.h>
+
+#if BIO_FLAGS_UPLINK==0
+/* Shortcut UPLINK calls on most platforms... */
+#define UP_stdin        stdin
+#define UP_stdout       stdout
+#define UP_stderr       stderr
+#define UP_fprintf      fprintf
+#define UP_fgets        fgets
+#define UP_fread        fread
+#define UP_fwrite       fwrite
+#undef  UP_fsetmod
+#define UP_feof         feof
+#define UP_fclose       fclose
+
+#define UP_fopen        fopen
+#define UP_fseek        fseek
+#define UP_ftell        ftell
+#define UP_fflush       fflush
+#define UP_ferror       ferror
+#define UP_fileno       fileno
+
+#define UP_open         open
+#define UP_read         read
+#define UP_write        write
+#define UP_lseek        lseek
+#define UP_close        close
+#endif
diff --git a/src/lib/libssl/src/crypto/bio/bss_dgram.c b/src/lib/libssl/src/crypto/bio/bss_dgram.c
new file mode 100644
index 0000000000..ea2c3fff63
--- /dev/null
+++ b/src/lib/libssl/src/crypto/bio/bss_dgram.c
@@ -0,0 +1,488 @@
+/* crypto/bio/bio_dgram.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef OPENSSL_NO_DGRAM
+
+#include <stdio.h>
+#include <errno.h>
+#define USE_SOCKETS
+#include "cryptlib.h"
+
+#include <openssl/bio.h>
+
+#define IP_MTU      14 /* linux is lame */
+
+#ifdef WATT32
+#define sock_write SockWrite  /* Watt-32 uses same names */
+#define sock_read  SockRead
+#define sock_puts  SockPuts
+#endif
+
+static int dgram_write(BIO *h, const char *buf, int num);
+static int dgram_read(BIO *h, char *buf, int size);
+static int dgram_puts(BIO *h, const char *str);
+static long dgram_ctrl(BIO *h, int cmd, long arg1, void *arg2);
+static int dgram_new(BIO *h);
+static int dgram_free(BIO *data);
+static int dgram_clear(BIO *bio);
+
+int BIO_dgram_should_retry(int s);
+
+static BIO_METHOD methods_dgramp=
+        {
+        BIO_TYPE_DGRAM,
+        "datagram socket",
+        dgram_write,
+        dgram_read,
+        dgram_puts,
+        NULL, /* dgram_gets, */
+        dgram_ctrl,
+        dgram_new,
+        dgram_free,
+        NULL,
+        };
+
+typedef struct bio_dgram_data_st
+        {
+        struct sockaddr peer;
+        unsigned int connected;
+        unsigned int _errno;
+        unsigned int mtu;
+        } bio_dgram_data;
+
+BIO_METHOD *BIO_s_datagram(void)
+        {
+        return(&methods_dgramp);
+        }
+
+BIO *BIO_new_dgram(int fd, int close_flag)
+        {
+        BIO *ret;
+
+        ret=BIO_new(BIO_s_datagram());
+        if (ret == NULL) return(NULL);
+        BIO_set_fd(ret,fd,close_flag);
+        return(ret);
+        }
+
+static int dgram_new(BIO *bi)
+        {
+        bio_dgram_data *data = NULL;
+
+        bi->init=0;
+        bi->num=0;
+        data = OPENSSL_malloc(sizeof(bio_dgram_data));
+        if (data == NULL)
+                return 0;
+        memset(data, 0x00, sizeof(bio_dgram_data));
+    bi->ptr = data;
+
+        bi->flags=0;
+        return(1);
+        }
+
+static int dgram_free(BIO *a)
+        {
+        bio_dgram_data *data;
+
+        if (a == NULL) return(0);
+        if ( ! dgram_clear(a))
+                return 0;
+
+        data = (bio_dgram_data *)a->ptr;
+        if(data != NULL) OPENSSL_free(data);
+
+        return(1);
+        }
+
+static int dgram_clear(BIO *a)
+        {
+        if (a == NULL) return(0);
+        if (a->shutdown)
+                {
+                if (a->init)
+                        {
+                        SHUTDOWN2(a->num);
+                        }
+                a->init=0;
+                a->flags=0;
+                }
+        return(1);
+        }
+        
+static int dgram_read(BIO *b, char *out, int outl)
+        {
+        int ret=0;
+        bio_dgram_data *data = (bio_dgram_data *)b->ptr;
+
+        struct sockaddr peer;
+        int peerlen = sizeof(peer);
+
+        if (out != NULL)
+                {
+                clear_socket_error();
+                memset(&peer, 0x00, peerlen);
+                /* Last arg in recvfrom is signed on some platforms and
+                 * unsigned on others. It is of type socklen_t on some
+                 * but this is not universal. Cast to (void *) to avoid
+                 * compiler warnings.
+                 */
+                ret=recvfrom(b->num,out,outl,0,&peer,(void *)&peerlen);
+
+                if ( ! data->connected  && ret > 0)
+                        BIO_ctrl(b, BIO_CTRL_DGRAM_CONNECT, 0, &peer);
+
+                BIO_clear_retry_flags(b);
+                if (ret <= 0)
+                        {
+                        if (BIO_dgram_should_retry(ret))
+                                {
+                                BIO_set_retry_read(b);
+                                data->_errno = get_last_socket_error();
+                                }
+                        }
+                }
+        return(ret);
+        }
+
+static int dgram_write(BIO *b, const char *in, int inl)
+        {
+        int ret;
+        bio_dgram_data *data = (bio_dgram_data *)b->ptr;
+        clear_socket_error();
+
+    if ( data->connected )
+        ret=writesocket(b->num,in,inl);
+    else
+#if defined(NETWARE_CLIB) && defined(NETWARE_BSDSOCK)
+        ret=sendto(b->num, (char *)in, inl, 0, &data->peer, sizeof(data->peer));
+#else
+        ret=sendto(b->num, in, inl, 0, &data->peer, sizeof(data->peer));
+#endif
+
+        BIO_clear_retry_flags(b);
+        if (ret <= 0)
+                {
+                if (BIO_sock_should_retry(ret))
+                        {
+                        BIO_set_retry_write(b);  
+                        data->_errno = get_last_socket_error();
+
+#if 0 /* higher layers are responsible for querying MTU, if necessary */
+                        if ( data->_errno == EMSGSIZE)
+                                /* retrieve the new MTU */
+                                BIO_ctrl(b, BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
+#endif
+                        }
+                }
+        return(ret);
+        }
+
+static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
+        {
+        long ret=1;
+        int *ip;
+        struct sockaddr *to = NULL;
+        bio_dgram_data *data = NULL;
+        long sockopt_val = 0;
+        unsigned int sockopt_len = 0;
+
+        data = (bio_dgram_data *)b->ptr;
+
+        switch (cmd)
+                {
+        case BIO_CTRL_RESET:
+                num=0;
+        case BIO_C_FILE_SEEK:
+                ret=0;
+                break;
+        case BIO_C_FILE_TELL:
+        case BIO_CTRL_INFO:
+                ret=0;
+                break;
+        case BIO_C_SET_FD:
+                dgram_clear(b);
+                b->num= *((int *)ptr);
+                b->shutdown=(int)num;
+                b->init=1;
+                break;
+        case BIO_C_GET_FD:
+                if (b->init)
+                        {
+                        ip=(int *)ptr;
+                        if (ip != NULL) *ip=b->num;
+                        ret=b->num;
+                        }
+                else
+                        ret= -1;
+                break;
+        case BIO_CTRL_GET_CLOSE:
+                ret=b->shutdown;
+                break;
+        case BIO_CTRL_SET_CLOSE:
+                b->shutdown=(int)num;
+                break;
+        case BIO_CTRL_PENDING:
+        case BIO_CTRL_WPENDING:
+                ret=0;
+                break;
+        case BIO_CTRL_DUP:
+        case BIO_CTRL_FLUSH:
+                ret=1;
+                break;
+        case BIO_CTRL_DGRAM_CONNECT:
+                to = (struct sockaddr *)ptr;
+#if 0
+                if (connect(b->num, to, sizeof(struct sockaddr)) < 0)
+                        { perror("connect"); ret = 0; }
+                else
+                        {
+#endif
+                        memcpy(&(data->peer),to, sizeof(struct sockaddr));
+#if 0
+                        }
+#endif
+                break;
+                /* (Linux)kernel sets DF bit on outgoing IP packets */
+#ifdef IP_MTU_DISCOVER
+        case BIO_CTRL_DGRAM_MTU_DISCOVER:
+                sockopt_val = IP_PMTUDISC_DO;
+                if ((ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,
+                        &sockopt_val, sizeof(sockopt_val))) < 0)
+                        perror("setsockopt");
+                break;
+#endif
+        case BIO_CTRL_DGRAM_QUERY_MTU:
+         sockopt_len = sizeof(sockopt_val);
+                if ((ret = getsockopt(b->num, IPPROTO_IP, IP_MTU, (void *)&sockopt_val,
+                        &sockopt_len)) < 0 || sockopt_val < 0)
+                        { ret = 0; }
+                else
+                        {
+                        data->mtu = sockopt_val;
+                        ret = data->mtu;
+                        }
+                break;
+        case BIO_CTRL_DGRAM_GET_MTU:
+                return data->mtu;
+                break;
+        case BIO_CTRL_DGRAM_SET_MTU:
+                data->mtu = num;
+                ret = num;
+                break;
+        case BIO_CTRL_DGRAM_SET_CONNECTED:
+                to = (struct sockaddr *)ptr;
+
+                if ( to != NULL)
+                        {
+                        data->connected = 1;
+                        memcpy(&(data->peer),to, sizeof(struct sockaddr));
+                        }
+                else
+                        {
+                        data->connected = 0;
+                        memset(&(data->peer), 0x00, sizeof(struct sockaddr));
+                        }
+                break;
+    case BIO_CTRL_DGRAM_SET_PEER:
+        to = (struct sockaddr *) ptr;
+
+        memcpy(&(data->peer), to, sizeof(struct sockaddr));
+        break;
+        case BIO_CTRL_DGRAM_SET_RECV_TIMEOUT:
+                if ( setsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, ptr,
+                        sizeof(struct timeval)) < 0)
+                        { perror("setsockopt"); ret = -1; }
+                break;
+        case BIO_CTRL_DGRAM_GET_RECV_TIMEOUT:
+                if ( getsockopt(b->num, SOL_SOCKET, SO_RCVTIMEO, 
+                        ptr, (void *)&ret) < 0)
+                        { perror("getsockopt"); ret = -1; }
+                break;
+        case BIO_CTRL_DGRAM_SET_SEND_TIMEOUT:
+                if ( setsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO, ptr,
+                        sizeof(struct timeval)) < 0)
+                        { perror("setsockopt"); ret = -1; }
+                break;
+        case BIO_CTRL_DGRAM_GET_SEND_TIMEOUT:
+                if ( getsockopt(b->num, SOL_SOCKET, SO_SNDTIMEO, 
+                        ptr, (void *)&ret) < 0)
+                        { perror("getsockopt"); ret = -1; }
+                break;
+        case BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP:
+                /* fall-through */
+        case BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP:
+                if ( data->_errno == EAGAIN)
+                        {
+                        ret = 1;
+                        data->_errno = 0;
+                        }
+                else
+                        ret = 0;
+                break;
+#ifdef EMSGSIZE
+        case BIO_CTRL_DGRAM_MTU_EXCEEDED:
+                if ( data->_errno == EMSGSIZE)
+                        {
+                        ret = 1;
+                        data->_errno = 0;
+                        }
+                else
+                        ret = 0;
+                break;
+#endif
+        default:
+                ret=0;
+                break;
+                }
+        return(ret);
+        }
+
+static int dgram_puts(BIO *bp, const char *str)
+        {
+        int n,ret;
+
+        n=strlen(str);
+        ret=dgram_write(bp,str,n);
+        return(ret);
+        }
+
+int BIO_dgram_should_retry(int i)
+        {
+        int err;
+
+        if ((i == 0) || (i == -1))
+                {
+                err=get_last_socket_error();
+
+#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
+                if ((i == -1) && (err == 0))
+                        return(1);
+#endif
+
+                return(BIO_dgram_non_fatal_error(err));
+                }
+        return(0);
+        }
+
+int BIO_dgram_non_fatal_error(int err)
+        {
+        switch (err)
+                {
+#if defined(OPENSSL_SYS_WINDOWS)
+# if defined(WSAEWOULDBLOCK)
+        case WSAEWOULDBLOCK:
+# endif
+
+# if 0 /* This appears to always be an error */
+#  if defined(WSAENOTCONN)
+        case WSAENOTCONN:
+#  endif
+# endif
+#endif
+
+#ifdef EWOULDBLOCK
+# ifdef WSAEWOULDBLOCK
+#  if WSAEWOULDBLOCK != EWOULDBLOCK
+        case EWOULDBLOCK:
+#  endif
+# else
+        case EWOULDBLOCK:
+# endif
+#endif
+
+#if defined(ENOTCONN)
+        case ENOTCONN:
+#endif
+
+#ifdef EINTR
+        case EINTR:
+#endif
+
+#ifdef EAGAIN
+#if EWOULDBLOCK != EAGAIN
+        case EAGAIN:
+# endif
+#endif
+
+#ifdef EPROTO
+        case EPROTO:
+#endif
+
+#ifdef EINPROGRESS
+        case EINPROGRESS:
+#endif
+
+#ifdef EALREADY
+        case EALREADY:
+#endif
+
+/* DF bit set, and packet larger than MTU */
+#ifdef EMSGSIZE
+        case EMSGSIZE:
+#endif
+
+                return(1);
+                /* break; */
+        default:
+                break;
+                }
+        return(0);
+        }
+#endif
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.s b/src/lib/libssl/src/crypto/bn/asm/alpha.s
deleted file mode 100644
index 555ff0b92d..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.s
+++ /dev/null
@@ -1,3199 +0,0 @@
- # DEC Alpha assember
- # The bn_div_words is actually gcc output but the other parts are hand done.
- # Thanks to tzeruch@ceddec.com for sending me the gcc output for
- # bn_div_words.
- # I've gone back and re-done most of routines.
- # The key thing to remeber for the 164 CPU is that while a
- # multiply operation takes 8 cycles, another one can only be issued
- # after 4 cycles have elapsed.  I've done modification to help
- # improve this.  Also, normally, a ld instruction will not be available
- # for about 3 cycles.
-        .file   1 "bn_asm.c"
-        .set noat
-gcc2_compiled.:
-__gnu_compiled_c:
-        .text
-        .align 3
-        .globl bn_mul_add_words
-        .ent bn_mul_add_words
-bn_mul_add_words:
-bn_mul_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$0
-        blt     $18,$43         # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        ldq     $1,0($16)       # 1 1
-        .align 3
-$42:
-        mulq    $20,$19,$5      # 1 2 1 ######
-        ldq     $21,8($17)      # 2 1
-        ldq     $2,8($16)       # 2 1
-        umulh   $20,$19,$20     # 1 2   ######
-        ldq     $27,16($17)     # 3 1
-        ldq     $3,16($16)      # 3 1
-        mulq    $21,$19,$6      # 2 2 1 ######
-         ldq    $28,24($17)     # 4 1
-        addq    $1,$5,$1        # 1 2 2
-         ldq    $4,24($16)      # 4 1
-        umulh   $21,$19,$21     # 2 2   ######
-         cmpult $1,$5,$22       # 1 2 3 1
-        addq    $20,$22,$20     # 1 3 1
-         addq   $1,$0,$1        # 1 2 3 1
-        mulq    $27,$19,$7      # 3 2 1 ######
-         cmpult $1,$0,$0        # 1 2 3 2
-        addq    $2,$6,$2        # 2 2 2
-         addq   $20,$0,$0       # 1 3 2 
-        cmpult  $2,$6,$23       # 2 2 3 1
-         addq   $21,$23,$21     # 2 3 1
-        umulh   $27,$19,$27     # 3 2   ######
-         addq   $2,$0,$2        # 2 2 3 1
-        cmpult  $2,$0,$0        # 2 2 3 2
-         subq   $18,4,$18
-        mulq    $28,$19,$8      # 4 2 1 ######
-         addq   $21,$0,$0       # 2 3 2 
-        addq    $3,$7,$3        # 3 2 2
-         addq   $16,32,$16
-        cmpult  $3,$7,$24       # 3 2 3 1
-         stq    $1,-32($16)     # 1 2 4
-        umulh   $28,$19,$28     # 4 2   ######
-         addq   $27,$24,$27     # 3 3 1
-        addq    $3,$0,$3        # 3 2 3 1
-         stq    $2,-24($16)     # 2 2 4
-        cmpult  $3,$0,$0        # 3 2 3 2
-         stq    $3,-16($16)     # 3 2 4
-        addq    $4,$8,$4        # 4 2 2
-         addq   $27,$0,$0       # 3 3 2 
-        cmpult  $4,$8,$25       # 4 2 3 1
-         addq   $17,32,$17
-        addq    $28,$25,$28     # 4 3 1
-         addq   $4,$0,$4        # 4 2 3 1
-        cmpult  $4,$0,$0        # 4 2 3 2
-         stq    $4,-8($16)      # 4 2 4
-        addq    $28,$0,$0       # 4 3 2 
-         blt    $18,$43
-
-        ldq     $20,0($17)      # 1 1
-        ldq     $1,0($16)       # 1 1
-
-        br      $42
-
-        .align 4
-$45:
-        ldq     $20,0($17)      # 4 1
-        ldq     $1,0($16)       # 4 1
-        mulq    $20,$19,$5      # 4 2 1
-        subq    $18,1,$18
-        addq    $16,8,$16
-        addq    $17,8,$17
-        umulh   $20,$19,$20     # 4 2
-        addq    $1,$5,$1        # 4 2 2
-        cmpult  $1,$5,$22       # 4 2 3 1
-        addq    $20,$22,$20     # 4 3 1
-        addq    $1,$0,$1        # 4 2 3 1
-        cmpult  $1,$0,$0        # 4 2 3 2
-        addq    $20,$0,$0       # 4 3 2 
-        stq     $1,-8($16)      # 4 2 4
-        bgt     $18,$45
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$43:
-        addq    $18,4,$18
-        bgt     $18,$45         # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_add_words
-        .align 3
-        .globl bn_mul_words
-        .ent bn_mul_words
-bn_mul_words:
-bn_mul_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$0
-        blt     $18,$143        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        .align 3
-$142:
-
-        mulq    $20,$19,$5      # 1 2 1 #####
-         ldq    $21,8($17)      # 2 1
-         ldq    $27,16($17)     # 3 1
-        umulh   $20,$19,$20     # 1 2   #####
-         ldq    $28,24($17)     # 4 1
-        mulq    $21,$19,$6      # 2 2 1 #####
-         addq   $5,$0,$5        # 1 2 3 1
-        subq    $18,4,$18
-         cmpult $5,$0,$0        # 1 2 3 2
-        umulh   $21,$19,$21     # 2 2   #####
-         addq   $20,$0,$0       # 1 3 2 
-        addq    $17,32,$17
-         addq   $6,$0,$6        # 2 2 3 1
-        mulq    $27,$19,$7      # 3 2 1 #####
-         cmpult $6,$0,$0        # 2 2 3 2
-        addq    $21,$0,$0       # 2 3 2 
-         addq   $16,32,$16
-        umulh   $27,$19,$27     # 3 2   #####
-         stq    $5,-32($16)     # 1 2 4
-        mulq    $28,$19,$8      # 4 2 1 #####
-         addq   $7,$0,$7        # 3 2 3 1
-        stq     $6,-24($16)     # 2 2 4
-         cmpult $7,$0,$0        # 3 2 3 2
-        umulh   $28,$19,$28     # 4 2   #####
-         addq   $27,$0,$0       # 3 3 2 
-        stq     $7,-16($16)     # 3 2 4
-         addq   $8,$0,$8        # 4 2 3 1
-        cmpult  $8,$0,$0        # 4 2 3 2
-
-        addq    $28,$0,$0       # 4 3 2 
-
-        stq     $8,-8($16)      # 4 2 4
-
-        blt     $18,$143
-
-        ldq     $20,0($17)      # 1 1
-
-        br      $142
-
-        .align 4
-$145:
-        ldq     $20,0($17)      # 4 1
-        mulq    $20,$19,$5      # 4 2 1
-        subq    $18,1,$18
-        umulh   $20,$19,$20     # 4 2
-        addq    $5,$0,$5        # 4 2 3 1
-         addq   $16,8,$16
-        cmpult  $5,$0,$0        # 4 2 3 2
-         addq   $17,8,$17
-        addq    $20,$0,$0       # 4 3 2 
-        stq     $5,-8($16)      # 4 2 4
-
-        bgt     $18,$145
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$143:
-        addq    $18,4,$18
-        bgt     $18,$145        # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_words
-        .align 3
-        .globl bn_sqr_words
-        .ent bn_sqr_words
-bn_sqr_words:
-bn_sqr_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $18,4,$18
-        blt     $18,$543        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        .align 3
-$542:
-        mulq    $20,$20,$5              ######
-         ldq    $21,8($17)      # 1 1
-        subq    $18,4
-        umulh   $20,$20,$1              ######
-        ldq     $27,16($17)     # 1 1
-        mulq    $21,$21,$6              ######
-        ldq     $28,24($17)     # 1 1
-        stq     $5,0($16)       # r[0]
-        umulh   $21,$21,$2              ######
-        stq     $1,8($16)       # r[1]
-        mulq    $27,$27,$7              ######
-        stq     $6,16($16)      # r[0]
-        umulh   $27,$27,$3              ######
-        stq     $2,24($16)      # r[1]
-        mulq    $28,$28,$8              ######
-        stq     $7,32($16)      # r[0]
-        umulh   $28,$28,$4              ######
-        stq     $3,40($16)      # r[1]
-
-        addq    $16,64,$16
-        addq    $17,32,$17
-        stq     $8,-16($16)     # r[0]
-        stq     $4,-8($16)      # r[1]
-
-        blt     $18,$543
-        ldq     $20,0($17)      # 1 1
-        br      $542
-
-$442:
-        ldq     $20,0($17)   # a[0]
-        mulq    $20,$20,$5  # a[0]*w low part       r2
-        addq    $16,16,$16
-        addq    $17,8,$17
-        subq    $18,1,$18
-        umulh   $20,$20,$1  # a[0]*w high part       r3
-        stq     $5,-16($16)   # r[0]
-        stq     $1,-8($16)   # r[1]
-
-        bgt     $18,$442
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$543:
-        addq    $18,4,$18
-        bgt     $18,$442        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_sqr_words
-
-        .align 3
-        .globl bn_add_words
-        .ent bn_add_words
-bn_add_words:
-bn_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,4,$19
-        bis     $31,$31,$0      # carry = 0
-        blt     $19,$900
-        ldq     $5,0($17)       # a[0]
-        ldq     $1,0($18)       # b[1]
-        .align 3
-$901:
-        addq    $1,$5,$1        # r=a+b;
-         ldq    $6,8($17)       # a[1]
-        cmpult  $1,$5,$22       # did we overflow?
-         ldq    $2,8($18)       # b[1]
-        addq    $1,$0,$1        # c+= overflow
-         ldq    $7,16($17)      # a[2]
-        cmpult  $1,$0,$0        # overflow?
-         ldq    $3,16($18)      # b[2]
-        addq    $0,$22,$0
-         ldq    $8,24($17)      # a[3]
-        addq    $2,$6,$2        # r=a+b;
-         ldq    $4,24($18)      # b[3]
-        cmpult  $2,$6,$23       # did we overflow?
-         addq   $3,$7,$3        # r=a+b;
-        addq    $2,$0,$2        # c+= overflow
-         cmpult $3,$7,$24       # did we overflow?
-        cmpult  $2,$0,$0        # overflow?
-         addq   $4,$8,$4        # r=a+b;
-        addq    $0,$23,$0
-         cmpult $4,$8,$25       # did we overflow?
-        addq    $3,$0,$3        # c+= overflow
-         stq    $1,0($16)       # r[0]=c
-        cmpult  $3,$0,$0        # overflow?
-         stq    $2,8($16)       # r[1]=c
-        addq    $0,$24,$0
-         stq    $3,16($16)      # r[2]=c
-        addq    $4,$0,$4        # c+= overflow
-         subq   $19,4,$19       # loop--
-        cmpult  $4,$0,$0        # overflow?
-         addq   $17,32,$17      # a++
-        addq    $0,$25,$0
-         stq    $4,24($16)      # r[3]=c
-        addq    $18,32,$18      # b++
-         addq   $16,32,$16      # r++
-
-        blt     $19,$900
-         ldq    $5,0($17)       # a[0]
-        ldq     $1,0($18)       # b[1]
-         br     $901
-        .align 4
-$945:
-        ldq     $5,0($17)       # a[0]
-         ldq    $1,0($18)       # b[1]
-        addq    $1,$5,$1        # r=a+b;
-         subq   $19,1,$19       # loop--
-        addq    $1,$0,$1        # c+= overflow
-         addq   $17,8,$17       # a++
-        cmpult  $1,$5,$22       # did we overflow?
-         cmpult $1,$0,$0        # overflow?
-        addq    $18,8,$18       # b++
-         stq    $1,0($16)       # r[0]=c
-        addq    $0,$22,$0
-         addq   $16,8,$16       # r++
-
-        bgt     $19,$945
-        ret     $31,($26),1     # else exit
-
-$900:
-        addq    $19,4,$19
-        bgt     $19,$945        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_add_words
-
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .align 3
-        .globl bn_div_words
-        .ent bn_div_words
-bn_div_words:
-        ldgp $29,0($27)
-bn_div_words..ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$119
-        lda $0,-1
-        br $31,$136
-        .align 4
-$119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$126
-        zapnot $7,15,$27
-        br $31,$127
-        .align 4
-$126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$127:
-        srl $10,32,$4
-        .align 5
-$128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$129
-        subq $27,1,$27
-        br $31,$128
-        .align 4
-$129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$134
-        addq $9,$11,$9
-        subq $27,1,$27
-$134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$123
-        .align 4
-$124:
-        bis $13,$27,$0
-$136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div_words
-
-        .set noat
-        .text
-        .align 3
-        .globl bn_sub_words
-        .ent bn_sub_words
-bn_sub_words:
-bn_sub_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,    4,      $19
-        bis     $31,    $31,    $0
-        blt     $19,    $100
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-$101:
-        ldq     $3,     8($17)
-        cmpult  $1,     $2,     $4
-        ldq     $5,     8($18)
-        subq    $1,     $2,     $1
-        ldq     $6,     16($17)
-        cmpult  $1,     $0,     $2
-        ldq     $7,     16($18)
-        subq    $1,     $0,     $23
-        ldq     $8,     24($17)
-        addq    $2,     $4,     $0
-        cmpult  $3,     $5,     $24
-        subq    $3,     $5,     $3
-        ldq     $22,    24($18)
-        cmpult  $3,     $0,     $5
-        subq    $3,     $0,     $25
-        addq    $5,     $24,    $0
-        cmpult  $6,     $7,     $27
-        subq    $6,     $7,     $6
-        stq     $23,    0($16)
-        cmpult  $6,     $0,     $7
-        subq    $6,     $0,     $28
-        addq    $7,     $27,    $0
-        cmpult  $8,     $22,    $21
-        subq    $8,     $22,    $8
-        stq     $25,    8($16)
-        cmpult  $8,     $0,     $22
-        subq    $8,     $0,     $20
-        addq    $22,    $21,    $0
-        stq     $28,    16($16)
-        subq    $19,    4,      $19
-        stq     $20,    24($16)
-        addq    $17,    32,     $17
-        addq    $18,    32,     $18
-        addq    $16,    32,     $16
-        blt     $19,    $100
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        br      $101
-$102:
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        cmpult  $1,     $2,     $27
-        subq    $1,     $2,     $1
-        cmpult  $1,     $0,     $2
-        subq    $1,     $0,     $1
-        stq     $1,     0($16)
-        addq    $2,     $27,    $0
-        addq    $17,    8,      $17
-        addq    $18,    8,      $18
-        addq    $16,    8,      $16
-        subq    $19,    1,      $19
-        bgt     $19,    $102
-        ret     $31,($26),1
-$100:
-        addq    $19,    4,      $19
-        bgt     $19,    $102
-$103:
-        ret     $31,($26),1
-        .end bn_sub_words
-        .text
-        .align 3
-        .globl bn_mul_comba4
-        .ent bn_mul_comba4
-bn_mul_comba4:
-bn_mul_comba4..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        ldq     $0,     0($17)
-        ldq     $1,     0($18)
-        ldq     $2,     8($17)
-        ldq     $3,     8($18)
-        ldq     $4,     16($17)
-        ldq     $5,     16($18)
-        ldq     $6,     24($17)
-        ldq     $7,     24($18)
-        bis     $31,    $31,    $23
-        mulq    $0,     $1,     $8
-        umulh   $0,     $1,     $22
-        stq     $8,     0($16)
-        bis     $31,    $31,    $8
-        mulq    $0,     $3,     $24
-        umulh   $0,     $3,     $25
-        addq    $22,    $24,    $22
-        cmpult  $22,    $24,    $27
-        addq    $27,    $25,    $25
-        addq    $23,    $25,    $23
-        cmpult  $23,    $25,    $28
-        addq    $8,     $28,    $8
-        mulq    $2,     $1,     $21
-        umulh   $2,     $1,     $20
-        addq    $22,    $21,    $22
-        cmpult  $22,    $21,    $19
-        addq    $19,    $20,    $20
-        addq    $23,    $20,    $23
-        cmpult  $23,    $20,    $17
-        addq    $8,     $17,    $8
-        stq     $22,    8($16)
-        bis     $31,    $31,    $22
-        mulq    $2,     $3,     $18
-        umulh   $2,     $3,     $24
-        addq    $23,    $18,    $23
-        cmpult  $23,    $18,    $27
-        addq    $27,    $24,    $24
-        addq    $8,     $24,    $8
-        cmpult  $8,     $24,    $25
-        addq    $22,    $25,    $22
-        mulq    $0,     $5,     $28
-        umulh   $0,     $5,     $21
-        addq    $23,    $28,    $23
-        cmpult  $23,    $28,    $19
-        addq    $19,    $21,    $21
-        addq    $8,     $21,    $8
-        cmpult  $8,     $21,    $20
-        addq    $22,    $20,    $22
-        mulq    $4,     $1,     $17
-        umulh   $4,     $1,     $18
-        addq    $23,    $17,    $23
-        cmpult  $23,    $17,    $27
-        addq    $27,    $18,    $18
-        addq    $8,     $18,    $8
-        cmpult  $8,     $18,    $24
-        addq    $22,    $24,    $22
-        stq     $23,    16($16)
-        bis     $31,    $31,    $23
-        mulq    $0,     $7,     $25
-        umulh   $0,     $7,     $28
-        addq    $8,     $25,    $8
-        cmpult  $8,     $25,    $19
-        addq    $19,    $28,    $28
-        addq    $22,    $28,    $22
-        cmpult  $22,    $28,    $21
-        addq    $23,    $21,    $23
-        mulq    $2,     $5,     $20
-        umulh   $2,     $5,     $17
-        addq    $8,     $20,    $8
-        cmpult  $8,     $20,    $27
-        addq    $27,    $17,    $17
-        addq    $22,    $17,    $22
-        cmpult  $22,    $17,    $18
-        addq    $23,    $18,    $23
-        mulq    $4,     $3,     $24
-        umulh   $4,     $3,     $25
-        addq    $8,     $24,    $8
-        cmpult  $8,     $24,    $19
-        addq    $19,    $25,    $25
-        addq    $22,    $25,    $22
-        cmpult  $22,    $25,    $28
-        addq    $23,    $28,    $23
-        mulq    $6,     $1,     $21
-        umulh   $6,     $1,     $0
-        addq    $8,     $21,    $8
-        cmpult  $8,     $21,    $20
-        addq    $20,    $0,     $0
-        addq    $22,    $0,     $22
-        cmpult  $22,    $0,     $27
-        addq    $23,    $27,    $23
-        stq     $8,     24($16)
-        bis     $31,    $31,    $8
-        mulq    $2,     $7,     $17
-        umulh   $2,     $7,     $18
-        addq    $22,    $17,    $22
-        cmpult  $22,    $17,    $24
-        addq    $24,    $18,    $18
-        addq    $23,    $18,    $23
-        cmpult  $23,    $18,    $19
-        addq    $8,     $19,    $8
-        mulq    $4,     $5,     $25
-        umulh   $4,     $5,     $28
-        addq    $22,    $25,    $22
-        cmpult  $22,    $25,    $21
-        addq    $21,    $28,    $28
-        addq    $23,    $28,    $23
-        cmpult  $23,    $28,    $20
-        addq    $8,     $20,    $8
-        mulq    $6,     $3,     $0
-        umulh   $6,     $3,     $27
-        addq    $22,    $0,     $22
-        cmpult  $22,    $0,     $1
-        addq    $1,     $27,    $27
-        addq    $23,    $27,    $23
-        cmpult  $23,    $27,    $17
-        addq    $8,     $17,    $8
-        stq     $22,    32($16)
-        bis     $31,    $31,    $22
-        mulq    $4,     $7,     $24
-        umulh   $4,     $7,     $18
-        addq    $23,    $24,    $23
-        cmpult  $23,    $24,    $19
-        addq    $19,    $18,    $18
-        addq    $8,     $18,    $8
-        cmpult  $8,     $18,    $2
-        addq    $22,    $2,     $22
-        mulq    $6,     $5,     $25
-        umulh   $6,     $5,     $21
-        addq    $23,    $25,    $23
-        cmpult  $23,    $25,    $28
-        addq    $28,    $21,    $21
-        addq    $8,     $21,    $8
-        cmpult  $8,     $21,    $20
-        addq    $22,    $20,    $22
-        stq     $23,    40($16)
-        bis     $31,    $31,    $23
-        mulq    $6,     $7,     $0
-        umulh   $6,     $7,     $1
-        addq    $8,     $0,     $8
-        cmpult  $8,     $0,     $27
-        addq    $27,    $1,     $1
-        addq    $22,    $1,     $22
-        cmpult  $22,    $1,     $17
-        addq    $23,    $17,    $23
-        stq     $8,     48($16)
-        stq     $22,    56($16)
-        ret     $31,($26),1
-        .end bn_mul_comba4
-        .text
-        .align 3
-        .globl bn_mul_comba8
-        .ent bn_mul_comba8
-bn_mul_comba8:
-bn_mul_comba8..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        zapnot  $1,     15,     $7
-        srl     $2,     32,     $8
-        mulq    $8,     $7,     $22
-        srl     $1,     32,     $6
-        zapnot  $2,     15,     $5
-        mulq    $5,     $6,     $4
-        mulq    $7,     $5,     $24
-        addq    $22,    $4,     $22
-        cmpult  $22,    $4,     $1
-        mulq    $6,     $8,     $3
-        beq     $1,     $173
-        bis     $31,    1,      $1
-        sll     $1,     32,     $1
-        addq    $3,     $1,     $3
-$173:
-        sll     $22,    32,     $4
-        addq    $24,    $4,     $24
-        stq     $24,    0($16)
-        ldq     $2,     0($17)
-        ldq     $1,     8($18)
-        zapnot  $2,     15,     $7
-        srl     $1,     32,     $8
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $2,     32,     $6
-        mulq    $5,     $6,     $23
-        mulq    $6,     $8,     $6
-        srl     $22,    32,     $1
-        cmpult  $24,    $4,     $2
-        addq    $3,     $1,     $3
-        addq    $2,     $3,     $22
-        addq    $25,    $23,    $25
-        cmpult  $25,    $23,    $1
-        bis     $31,    1,      $2
-        beq     $1,     $177
-        sll     $2,     32,     $1
-        addq    $6,     $1,     $6
-$177:
-        sll     $25,    32,     $23
-        ldq     $1,     0($18)
-        addq    $0,     $23,    $0
-        bis     $0,     $0,     $7
-        ldq     $3,     8($17)
-        addq    $22,    $7,     $22
-        srl     $1,     32,     $8
-        cmpult  $22,    $7,     $4
-        zapnot  $3,     15,     $7
-        mulq    $8,     $7,     $28
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $25,    32,     $1
-        cmpult  $0,     $23,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $4,     $6,     $24
-        srl     $3,     32,     $6
-        mulq    $5,     $6,     $2
-        mulq    $6,     $8,     $6
-        addq    $28,    $2,     $28
-        cmpult  $28,    $2,     $1
-        bis     $31,    1,      $2
-        beq     $1,     $181
-        sll     $2,     32,     $1
-        addq    $6,     $1,     $6
-$181:
-        sll     $28,    32,     $2
-        addq    $21,    $2,     $21
-        bis     $21,    $21,    $7
-        addq    $22,    $7,     $22
-        stq     $22,    8($16)
-        ldq     $3,     16($17)
-        ldq     $1,     0($18)
-        cmpult  $22,    $7,     $4
-        zapnot  $3,     15,     $7
-        srl     $1,     32,     $8
-        mulq    $8,     $7,     $22
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $20
-        srl     $28,    32,     $1
-        cmpult  $21,    $2,     $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $4,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $3,     32,     $6
-        mulq    $5,     $6,     $2
-        mulq    $6,     $8,     $6
-        addq    $22,    $2,     $22
-        cmpult  $22,    $2,     $1
-        bis     $31,    1,      $2
-        beq     $1,     $185
-        sll     $2,     32,     $1
-        addq    $6,     $1,     $6
-$185:
-        sll     $22,    32,     $2
-        ldq     $1,     8($18)
-        addq    $20,    $2,     $20
-        bis     $20,    $20,    $7
-        ldq     $4,     8($17)
-        addq    $24,    $7,     $24
-        srl     $1,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $22,    32,     $1
-        cmpult  $20,    $2,     $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $22
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $189
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$189:
-        sll     $25,    32,     $5
-        ldq     $2,     16($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     0($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $193
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$193:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        stq     $24,    16($16)
-        ldq     $4,     0($17)
-        ldq     $5,     24($18)
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $24
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $0,     $24,    $0
-        cmpult  $0,     $24,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $197
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$197:
-        sll     $0,     32,     $24
-        ldq     $1,     16($18)
-        addq    $2,     $24,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     8($17)
-        addq    $23,    $7,     $23
-        srl     $1,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $24,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $24
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $201
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$201:
-        sll     $25,    32,     $5
-        ldq     $2,     8($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     16($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $205
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$205:
-        sll     $28,    32,     $25
-        ldq     $2,     0($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $209
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$209:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $23,    $7,     $23
-        stq     $23,    24($16)
-        ldq     $4,     32($17)
-        ldq     $5,     0($18)
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $23
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $28,    $23,    $28
-        cmpult  $28,    $23,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $213
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$213:
-        sll     $28,    32,     $23
-        ldq     $1,     8($18)
-        addq    $2,     $23,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     24($17)
-        addq    $22,    $7,     $22
-        srl     $1,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $23,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $217
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$217:
-        sll     $25,    32,     $5
-        ldq     $2,     16($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     16($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $221
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$221:
-        sll     $28,    32,     $25
-        ldq     $2,     24($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     8($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $225
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$225:
-        sll     $0,     32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     0($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $229
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$229:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $22,    $7,     $22
-        stq     $22,    32($16)
-        ldq     $4,     0($17)
-        ldq     $5,     40($18)
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $22
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $0,     $22,    $0
-        cmpult  $0,     $22,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $233
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$233:
-        sll     $0,     32,     $22
-        ldq     $1,     32($18)
-        addq    $2,     $22,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     8($17)
-        addq    $24,    $7,     $24
-        srl     $1,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $22,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $22
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $237
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$237:
-        sll     $25,    32,     $5
-        ldq     $2,     24($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     16($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $241
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$241:
-        sll     $28,    32,     $25
-        ldq     $2,     16($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $245
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$245:
-        sll     $0,     32,     $25
-        ldq     $2,     8($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     32($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $249
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$249:
-        sll     $28,    32,     $25
-        ldq     $2,     0($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     40($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $253
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$253:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        stq     $24,    40($16)
-        ldq     $4,     48($17)
-        ldq     $5,     0($18)
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $24
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $28,    $24,    $28
-        cmpult  $28,    $24,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $257
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$257:
-        sll     $28,    32,     $24
-        ldq     $1,     8($18)
-        addq    $2,     $24,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     40($17)
-        addq    $23,    $7,     $23
-        srl     $1,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $24,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $24
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $261
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$261:
-        sll     $25,    32,     $5
-        ldq     $2,     16($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     32($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $265
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$265:
-        sll     $28,    32,     $25
-        ldq     $2,     24($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $269
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$269:
-        sll     $0,     32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     16($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $273
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$273:
-        sll     $28,    32,     $25
-        ldq     $2,     40($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     8($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $277
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$277:
-        sll     $0,     32,     $25
-        ldq     $2,     48($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     0($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $281
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$281:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $23,    $7,     $23
-        stq     $23,    48($16)
-        ldq     $4,     0($17)
-        ldq     $5,     56($18)
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $23
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $0,     $23,    $0
-        cmpult  $0,     $23,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $285
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$285:
-        sll     $0,     32,     $23
-        ldq     $1,     48($18)
-        addq    $2,     $23,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     8($17)
-        addq    $22,    $7,     $22
-        srl     $1,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $23,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $289
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$289:
-        sll     $25,    32,     $5
-        ldq     $2,     40($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     16($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $293
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$293:
-        sll     $28,    32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $297
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$297:
-        sll     $0,     32,     $25
-        ldq     $2,     24($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     32($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $301
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$301:
-        sll     $28,    32,     $25
-        ldq     $2,     16($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     40($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $305
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$305:
-        sll     $0,     32,     $25
-        ldq     $2,     8($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     48($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $309
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$309:
-        sll     $28,    32,     $25
-        ldq     $2,     0($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     56($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $313
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$313:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $22,    $7,     $22
-        stq     $22,    56($16)
-        ldq     $4,     56($17)
-        ldq     $5,     8($18)
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $22
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $28,    $22,    $28
-        cmpult  $28,    $22,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $317
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$317:
-        sll     $28,    32,     $22
-        ldq     $1,     16($18)
-        addq    $2,     $22,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     48($17)
-        addq    $24,    $7,     $24
-        srl     $1,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $22,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $22
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $321
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$321:
-        sll     $25,    32,     $5
-        ldq     $2,     24($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     40($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $325
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$325:
-        sll     $28,    32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     32($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $329
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$329:
-        sll     $0,     32,     $25
-        ldq     $2,     40($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $333
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$333:
-        sll     $28,    32,     $25
-        ldq     $2,     48($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     16($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $337
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$337:
-        sll     $0,     32,     $25
-        ldq     $2,     56($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     8($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $341
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$341:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        stq     $24,    64($16)
-        ldq     $4,     16($17)
-        ldq     $5,     56($18)
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $24
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $0,     $24,    $0
-        cmpult  $0,     $24,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $345
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$345:
-        sll     $0,     32,     $24
-        ldq     $1,     48($18)
-        addq    $2,     $24,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     24($17)
-        addq    $23,    $7,     $23
-        srl     $1,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $24,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $24
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $349
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$349:
-        sll     $25,    32,     $5
-        ldq     $2,     40($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     32($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $353
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$353:
-        sll     $28,    32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     40($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $357
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$357:
-        sll     $0,     32,     $25
-        ldq     $2,     24($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     48($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $361
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$361:
-        sll     $28,    32,     $25
-        ldq     $2,     16($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     56($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $365
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$365:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $23,    $7,     $23
-        stq     $23,    72($16)
-        ldq     $4,     56($17)
-        ldq     $5,     24($18)
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $23
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $28,    $23,    $28
-        cmpult  $28,    $23,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $369
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$369:
-        sll     $28,    32,     $23
-        ldq     $1,     32($18)
-        addq    $2,     $23,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     48($17)
-        addq    $22,    $7,     $22
-        srl     $1,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $23,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $21
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $373
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$373:
-        sll     $25,    32,     $5
-        ldq     $2,     40($18)
-        addq    $0,     $5,     $0
-        bis     $0,     $0,     $7
-        ldq     $4,     40($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $0,     $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $377
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$377:
-        sll     $28,    32,     $25
-        ldq     $2,     48($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     32($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $23,    $23
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $381
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$381:
-        sll     $0,     32,     $25
-        ldq     $2,     56($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     24($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $385
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$385:
-        sll     $28,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $22,    $7,     $22
-        stq     $22,    80($16)
-        ldq     $4,     32($17)
-        ldq     $5,     56($18)
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $22
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $0,     $22,    $0
-        cmpult  $0,     $22,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $389
-        sll     $21,    32,     $1
-        addq    $6,     $1,     $6
-$389:
-        sll     $0,     32,     $22
-        ldq     $1,     48($18)
-        addq    $2,     $22,    $2
-        bis     $2,     $2,     $7
-        ldq     $4,     40($17)
-        addq    $24,    $7,     $24
-        srl     $1,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $25
-        zapnot  $1,     15,     $5
-        mulq    $7,     $5,     $21
-        srl     $0,     32,     $1
-        cmpult  $2,     $22,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $22
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $5
-        bis     $31,    1,      $20
-        addq    $25,    $5,     $25
-        cmpult  $25,    $5,     $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $393
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$393:
-        sll     $25,    32,     $5
-        ldq     $2,     40($18)
-        addq    $21,    $5,     $21
-        bis     $21,    $21,    $7
-        ldq     $4,     48($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $25,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $21,    $5,     $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $397
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$397:
-        sll     $28,    32,     $25
-        ldq     $2,     32($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     56($17)
-        addq    $24,    $7,     $24
-        srl     $2,     32,     $8
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $21
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $22,    $22
-        addq    $21,    $25,    $21
-        cmpult  $21,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $401
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$401:
-        sll     $21,    32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        stq     $24,    88($16)
-        ldq     $4,     56($17)
-        ldq     $5,     40($18)
-        cmpult  $24,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $0
-        srl     $21,    32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $23,    $6,     $23
-        cmpult  $23,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $24
-        mulq    $7,     $5,     $5
-        addq    $1,     $22,    $22
-        addq    $0,     $24,    $0
-        cmpult  $0,     $24,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $405
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$405:
-        sll     $0,     32,     $24
-        ldq     $2,     48($18)
-        addq    $5,     $24,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     48($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $24,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $24
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $5
-        addq    $28,    $25,    $28
-        cmpult  $28,    $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $409
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$409:
-        sll     $28,    32,     $25
-        ldq     $2,     56($18)
-        addq    $5,     $25,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     40($17)
-        addq    $23,    $7,     $23
-        srl     $2,     32,     $8
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $25,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $1,     $24,    $24
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $413
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$413:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $23,    $7,     $23
-        stq     $23,    96($16)
-        ldq     $4,     48($17)
-        ldq     $5,     56($18)
-        cmpult  $23,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $22,    $6,     $22
-        cmpult  $22,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $23
-        mulq    $7,     $5,     $5
-        addq    $1,     $24,    $24
-        addq    $28,    $23,    $28
-        cmpult  $28,    $23,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $417
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$417:
-        sll     $28,    32,     $23
-        ldq     $2,     48($18)
-        addq    $5,     $23,    $5
-        bis     $5,     $5,     $7
-        ldq     $4,     56($17)
-        addq    $22,    $7,     $22
-        srl     $2,     32,     $8
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        mulq    $8,     $7,     $0
-        srl     $28,    32,     $1
-        addq    $6,     $1,     $6
-        cmpult  $5,     $23,    $1
-        zapnot  $2,     15,     $5
-        addq    $1,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $23
-        srl     $4,     32,     $6
-        mulq    $5,     $6,     $25
-        mulq    $7,     $5,     $2
-        addq    $0,     $25,    $0
-        cmpult  $0,     $25,    $1
-        mulq    $6,     $8,     $6
-        beq     $1,     $421
-        sll     $20,    32,     $1
-        addq    $6,     $1,     $6
-$421:
-        sll     $0,     32,     $25
-        addq    $2,     $25,    $2
-        bis     $2,     $2,     $7
-        addq    $22,    $7,     $22
-        stq     $22,    104($16)
-        ldq     $4,     56($17)
-        ldq     $5,     56($18)
-        cmpult  $22,    $7,     $3
-        zapnot  $4,     15,     $7
-        srl     $5,     32,     $8
-        mulq    $8,     $7,     $28
-        srl     $0,     32,     $1
-        cmpult  $2,     $25,    $2
-        addq    $6,     $1,     $6
-        addq    $2,     $6,     $6
-        addq    $3,     $6,     $6
-        addq    $24,    $6,     $24
-        cmpult  $24,    $6,     $1
-        srl     $4,     32,     $6
-        zapnot  $5,     15,     $5
-        mulq    $5,     $6,     $22
-        mulq    $7,     $5,     $2
-        addq    $1,     $23,    $23
-        addq    $28,    $22,    $28
-        cmpult  $28,    $22,    $1
-        mulq    $6,     $8,     $3
-        beq     $1,     $425
-        sll     $20,    32,     $1
-        addq    $3,     $1,     $3
-$425:
-        sll     $28,    32,     $22
-        srl     $28,    32,     $1
-        addq    $2,     $22,    $2
-        addq    $3,     $1,     $3
-        bis     $2,     $2,     $7
-        addq    $24,    $7,     $24
-        cmpult  $7,     $22,    $1
-        cmpult  $24,    $7,     $2
-        addq    $1,     $3,     $6
-        addq    $2,     $6,     $6
-        stq     $24,    112($16)
-        addq    $23,    $6,     $23
-        stq     $23,    120($16)
-        ret     $31,    ($26),  1
-        .end bn_mul_comba8
-        .text
-        .align 3
-        .globl bn_sqr_comba4
-        .ent bn_sqr_comba4
-bn_sqr_comba4:
-bn_sqr_comba4..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        ldq     $0,     0($17)
-        ldq     $1,     8($17)
-        ldq     $2,     16($17)
-        ldq     $3,     24($17)
-        bis     $31,    $31,    $6
-        mulq    $0,     $0,     $4
-        umulh   $0,     $0,     $5
-        stq     $4,     0($16)
-        bis     $31,    $31,    $4
-        mulq    $0,     $1,     $7
-        umulh   $0,     $1,     $8
-        cmplt   $7,     $31,    $22
-        cmplt   $8,     $31,    $23
-        addq    $7,     $7,     $7
-        addq    $8,     $8,     $8
-        addq    $8,     $22,    $8
-        addq    $4,     $23,    $4
-        addq    $5,     $7,     $5
-        addq    $6,     $8,     $6
-        cmpult  $5,     $7,     $24
-        cmpult  $6,     $8,     $25
-        addq    $6,     $24,    $6
-        addq    $4,     $25,    $4
-        stq     $5,     8($16)
-        bis     $31,    $31,    $5
-        mulq    $1,     $1,     $27
-        umulh   $1,     $1,     $28
-        addq    $6,     $27,    $6
-        addq    $4,     $28,    $4
-        cmpult  $6,     $27,    $21
-        cmpult  $4,     $28,    $20
-        addq    $4,     $21,    $4
-        addq    $5,     $20,    $5
-        mulq    $2,     $0,     $19
-        umulh   $2,     $0,     $18
-        cmplt   $19,    $31,    $17
-        cmplt   $18,    $31,    $22
-        addq    $19,    $19,    $19
-        addq    $18,    $18,    $18
-        addq    $18,    $17,    $18
-        addq    $5,     $22,    $5
-        addq    $6,     $19,    $6
-        addq    $4,     $18,    $4
-        cmpult  $6,     $19,    $23
-        cmpult  $4,     $18,    $7
-        addq    $4,     $23,    $4
-        addq    $5,     $7,     $5
-        stq     $6,     16($16)
-        bis     $31,    $31,    $6
-        mulq    $3,     $0,     $8
-        umulh   $3,     $0,     $24
-        cmplt   $8,     $31,    $25
-        cmplt   $24,    $31,    $27
-        addq    $8,     $8,     $8
-        addq    $24,    $24,    $24
-        addq    $24,    $25,    $24
-        addq    $6,     $27,    $6
-        addq    $4,     $8,     $4
-        addq    $5,     $24,    $5
-        cmpult  $4,     $8,     $28
-        cmpult  $5,     $24,    $21
-        addq    $5,     $28,    $5
-        addq    $6,     $21,    $6
-        mulq    $2,     $1,     $20
-        umulh   $2,     $1,     $17
-        cmplt   $20,    $31,    $22
-        cmplt   $17,    $31,    $19
-        addq    $20,    $20,    $20
-        addq    $17,    $17,    $17
-        addq    $17,    $22,    $17
-        addq    $6,     $19,    $6
-        addq    $4,     $20,    $4
-        addq    $5,     $17,    $5
-        cmpult  $4,     $20,    $18
-        cmpult  $5,     $17,    $23
-        addq    $5,     $18,    $5
-        addq    $6,     $23,    $6
-        stq     $4,     24($16)
-        bis     $31,    $31,    $4
-        mulq    $2,     $2,     $7
-        umulh   $2,     $2,     $25
-        addq    $5,     $7,     $5
-        addq    $6,     $25,    $6
-        cmpult  $5,     $7,     $27
-        cmpult  $6,     $25,    $8
-        addq    $6,     $27,    $6
-        addq    $4,     $8,     $4
-        mulq    $3,     $1,     $24
-        umulh   $3,     $1,     $28
-        cmplt   $24,    $31,    $21
-        cmplt   $28,    $31,    $22
-        addq    $24,    $24,    $24
-        addq    $28,    $28,    $28
-        addq    $28,    $21,    $28
-        addq    $4,     $22,    $4
-        addq    $5,     $24,    $5
-        addq    $6,     $28,    $6
-        cmpult  $5,     $24,    $19
-        cmpult  $6,     $28,    $20
-        addq    $6,     $19,    $6
-        addq    $4,     $20,    $4
-        stq     $5,     32($16)
-        bis     $31,    $31,    $5
-        mulq    $3,     $2,     $17
-        umulh   $3,     $2,     $18
-        cmplt   $17,    $31,    $23
-        cmplt   $18,    $31,    $7
-        addq    $17,    $17,    $17
-        addq    $18,    $18,    $18
-        addq    $18,    $23,    $18
-        addq    $5,     $7,     $5
-        addq    $6,     $17,    $6
-        addq    $4,     $18,    $4
-        cmpult  $6,     $17,    $25
-        cmpult  $4,     $18,    $27
-        addq    $4,     $25,    $4
-        addq    $5,     $27,    $5
-        stq     $6,     40($16)
-        bis     $31,    $31,    $6
-        mulq    $3,     $3,     $8
-        umulh   $3,     $3,     $21
-        addq    $4,     $8,     $4
-        addq    $5,     $21,    $5
-        cmpult  $4,     $8,     $22
-        cmpult  $5,     $21,    $24
-        addq    $5,     $22,    $5
-        addq    $6,     $24,    $6
-        stq     $4,     48($16)
-        stq     $5,     56($16)
-        ret     $31,($26),1
-        .end bn_sqr_comba4
-        .text
-        .align 3
-        .globl bn_sqr_comba8
-        .ent bn_sqr_comba8
-bn_sqr_comba8:
-bn_sqr_comba8..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        ldq     $0,     0($17)
-        ldq     $1,     8($17)
-        ldq     $2,     16($17)
-        ldq     $3,     24($17)
-        ldq     $4,     32($17)
-        ldq     $5,     40($17)
-        ldq     $6,     48($17)
-        ldq     $7,     56($17)
-        bis     $31,    $31,    $23
-        mulq    $0,     $0,     $8
-        umulh   $0,     $0,     $22
-        stq     $8,     0($16)
-        bis     $31,    $31,    $8
-        mulq    $1,     $0,     $24
-        umulh   $1,     $0,     $25
-        cmplt   $24,    $31,    $27
-        cmplt   $25,    $31,    $28
-        addq    $24,    $24,    $24
-        addq    $25,    $25,    $25
-        addq    $25,    $27,    $25
-        addq    $8,     $28,    $8
-        addq    $22,    $24,    $22
-        addq    $23,    $25,    $23
-        cmpult  $22,    $24,    $21
-        cmpult  $23,    $25,    $20
-        addq    $23,    $21,    $23
-        addq    $8,     $20,    $8
-        stq     $22,    8($16)
-        bis     $31,    $31,    $22
-        mulq    $1,     $1,     $19
-        umulh   $1,     $1,     $18
-        addq    $23,    $19,    $23
-        addq    $8,     $18,    $8
-        cmpult  $23,    $19,    $17
-        cmpult  $8,     $18,    $27
-        addq    $8,     $17,    $8
-        addq    $22,    $27,    $22
-        mulq    $2,     $0,     $28
-        umulh   $2,     $0,     $24
-        cmplt   $28,    $31,    $25
-        cmplt   $24,    $31,    $21
-        addq    $28,    $28,    $28
-        addq    $24,    $24,    $24
-        addq    $24,    $25,    $24
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        addq    $8,     $24,    $8
-        cmpult  $23,    $28,    $20
-        cmpult  $8,     $24,    $19
-        addq    $8,     $20,    $8
-        addq    $22,    $19,    $22
-        stq     $23,    16($16)
-        bis     $31,    $31,    $23
-        mulq    $2,     $1,     $18
-        umulh   $2,     $1,     $17
-        cmplt   $18,    $31,    $27
-        cmplt   $17,    $31,    $25
-        addq    $18,    $18,    $18
-        addq    $17,    $17,    $17
-        addq    $17,    $27,    $17
-        addq    $23,    $25,    $23
-        addq    $8,     $18,    $8
-        addq    $22,    $17,    $22
-        cmpult  $8,     $18,    $21
-        cmpult  $22,    $17,    $28
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        mulq    $3,     $0,     $24
-        umulh   $3,     $0,     $20
-        cmplt   $24,    $31,    $19
-        cmplt   $20,    $31,    $27
-        addq    $24,    $24,    $24
-        addq    $20,    $20,    $20
-        addq    $20,    $19,    $20
-        addq    $23,    $27,    $23
-        addq    $8,     $24,    $8
-        addq    $22,    $20,    $22
-        cmpult  $8,     $24,    $25
-        cmpult  $22,    $20,    $18
-        addq    $22,    $25,    $22
-        addq    $23,    $18,    $23
-        stq     $8,     24($16)
-        bis     $31,    $31,    $8
-        mulq    $2,     $2,     $17
-        umulh   $2,     $2,     $21
-        addq    $22,    $17,    $22
-        addq    $23,    $21,    $23
-        cmpult  $22,    $17,    $28
-        cmpult  $23,    $21,    $19
-        addq    $23,    $28,    $23
-        addq    $8,     $19,    $8
-        mulq    $3,     $1,     $27
-        umulh   $3,     $1,     $24
-        cmplt   $27,    $31,    $20
-        cmplt   $24,    $31,    $25
-        addq    $27,    $27,    $27
-        addq    $24,    $24,    $24
-        addq    $24,    $20,    $24
-        addq    $8,     $25,    $8
-        addq    $22,    $27,    $22
-        addq    $23,    $24,    $23
-        cmpult  $22,    $27,    $18
-        cmpult  $23,    $24,    $17
-        addq    $23,    $18,    $23
-        addq    $8,     $17,    $8
-        mulq    $4,     $0,     $21
-        umulh   $4,     $0,     $28
-        cmplt   $21,    $31,    $19
-        cmplt   $28,    $31,    $20
-        addq    $21,    $21,    $21
-        addq    $28,    $28,    $28
-        addq    $28,    $19,    $28
-        addq    $8,     $20,    $8
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        cmpult  $22,    $21,    $25
-        cmpult  $23,    $28,    $27
-        addq    $23,    $25,    $23
-        addq    $8,     $27,    $8
-        stq     $22,    32($16)
-        bis     $31,    $31,    $22
-        mulq    $3,     $2,     $24
-        umulh   $3,     $2,     $18
-        cmplt   $24,    $31,    $17
-        cmplt   $18,    $31,    $19
-        addq    $24,    $24,    $24
-        addq    $18,    $18,    $18
-        addq    $18,    $17,    $18
-        addq    $22,    $19,    $22
-        addq    $23,    $24,    $23
-        addq    $8,     $18,    $8
-        cmpult  $23,    $24,    $20
-        cmpult  $8,     $18,    $21
-        addq    $8,     $20,    $8
-        addq    $22,    $21,    $22
-        mulq    $4,     $1,     $28
-        umulh   $4,     $1,     $25
-        cmplt   $28,    $31,    $27
-        cmplt   $25,    $31,    $17
-        addq    $28,    $28,    $28
-        addq    $25,    $25,    $25
-        addq    $25,    $27,    $25
-        addq    $22,    $17,    $22
-        addq    $23,    $28,    $23
-        addq    $8,     $25,    $8
-        cmpult  $23,    $28,    $19
-        cmpult  $8,     $25,    $24
-        addq    $8,     $19,    $8
-        addq    $22,    $24,    $22
-        mulq    $5,     $0,     $18
-        umulh   $5,     $0,     $20
-        cmplt   $18,    $31,    $21
-        cmplt   $20,    $31,    $27
-        addq    $18,    $18,    $18
-        addq    $20,    $20,    $20
-        addq    $20,    $21,    $20
-        addq    $22,    $27,    $22
-        addq    $23,    $18,    $23
-        addq    $8,     $20,    $8
-        cmpult  $23,    $18,    $17
-        cmpult  $8,     $20,    $28
-        addq    $8,     $17,    $8
-        addq    $22,    $28,    $22
-        stq     $23,    40($16)
-        bis     $31,    $31,    $23
-        mulq    $3,     $3,     $25
-        umulh   $3,     $3,     $19
-        addq    $8,     $25,    $8
-        addq    $22,    $19,    $22
-        cmpult  $8,     $25,    $24
-        cmpult  $22,    $19,    $21
-        addq    $22,    $24,    $22
-        addq    $23,    $21,    $23
-        mulq    $4,     $2,     $27
-        umulh   $4,     $2,     $18
-        cmplt   $27,    $31,    $20
-        cmplt   $18,    $31,    $17
-        addq    $27,    $27,    $27
-        addq    $18,    $18,    $18
-        addq    $18,    $20,    $18
-        addq    $23,    $17,    $23
-        addq    $8,     $27,    $8
-        addq    $22,    $18,    $22
-        cmpult  $8,     $27,    $28
-        cmpult  $22,    $18,    $25
-        addq    $22,    $28,    $22
-        addq    $23,    $25,    $23
-        mulq    $5,     $1,     $19
-        umulh   $5,     $1,     $24
-        cmplt   $19,    $31,    $21
-        cmplt   $24,    $31,    $20
-        addq    $19,    $19,    $19
-        addq    $24,    $24,    $24
-        addq    $24,    $21,    $24
-        addq    $23,    $20,    $23
-        addq    $8,     $19,    $8
-        addq    $22,    $24,    $22
-        cmpult  $8,     $19,    $17
-        cmpult  $22,    $24,    $27
-        addq    $22,    $17,    $22
-        addq    $23,    $27,    $23
-        mulq    $6,     $0,     $18
-        umulh   $6,     $0,     $28
-        cmplt   $18,    $31,    $25
-        cmplt   $28,    $31,    $21
-        addq    $18,    $18,    $18
-        addq    $28,    $28,    $28
-        addq    $28,    $25,    $28
-        addq    $23,    $21,    $23
-        addq    $8,     $18,    $8
-        addq    $22,    $28,    $22
-        cmpult  $8,     $18,    $20
-        cmpult  $22,    $28,    $19
-        addq    $22,    $20,    $22
-        addq    $23,    $19,    $23
-        stq     $8,     48($16)
-        bis     $31,    $31,    $8
-        mulq    $4,     $3,     $24
-        umulh   $4,     $3,     $17
-        cmplt   $24,    $31,    $27
-        cmplt   $17,    $31,    $25
-        addq    $24,    $24,    $24
-        addq    $17,    $17,    $17
-        addq    $17,    $27,    $17
-        addq    $8,     $25,    $8
-        addq    $22,    $24,    $22
-        addq    $23,    $17,    $23
-        cmpult  $22,    $24,    $21
-        cmpult  $23,    $17,    $18
-        addq    $23,    $21,    $23
-        addq    $8,     $18,    $8
-        mulq    $5,     $2,     $28
-        umulh   $5,     $2,     $20
-        cmplt   $28,    $31,    $19
-        cmplt   $20,    $31,    $27
-        addq    $28,    $28,    $28
-        addq    $20,    $20,    $20
-        addq    $20,    $19,    $20
-        addq    $8,     $27,    $8
-        addq    $22,    $28,    $22
-        addq    $23,    $20,    $23
-        cmpult  $22,    $28,    $25
-        cmpult  $23,    $20,    $24
-        addq    $23,    $25,    $23
-        addq    $8,     $24,    $8
-        mulq    $6,     $1,     $17
-        umulh   $6,     $1,     $21
-        cmplt   $17,    $31,    $18
-        cmplt   $21,    $31,    $19
-        addq    $17,    $17,    $17
-        addq    $21,    $21,    $21
-        addq    $21,    $18,    $21
-        addq    $8,     $19,    $8
-        addq    $22,    $17,    $22
-        addq    $23,    $21,    $23
-        cmpult  $22,    $17,    $27
-        cmpult  $23,    $21,    $28
-        addq    $23,    $27,    $23
-        addq    $8,     $28,    $8
-        mulq    $7,     $0,     $20
-        umulh   $7,     $0,     $25
-        cmplt   $20,    $31,    $24
-        cmplt   $25,    $31,    $18
-        addq    $20,    $20,    $20
-        addq    $25,    $25,    $25
-        addq    $25,    $24,    $25
-        addq    $8,     $18,    $8
-        addq    $22,    $20,    $22
-        addq    $23,    $25,    $23
-        cmpult  $22,    $20,    $19
-        cmpult  $23,    $25,    $17
-        addq    $23,    $19,    $23
-        addq    $8,     $17,    $8
-        stq     $22,    56($16)
-        bis     $31,    $31,    $22
-        mulq    $4,     $4,     $21
-        umulh   $4,     $4,     $27
-        addq    $23,    $21,    $23
-        addq    $8,     $27,    $8
-        cmpult  $23,    $21,    $28
-        cmpult  $8,     $27,    $24
-        addq    $8,     $28,    $8
-        addq    $22,    $24,    $22
-        mulq    $5,     $3,     $18
-        umulh   $5,     $3,     $20
-        cmplt   $18,    $31,    $25
-        cmplt   $20,    $31,    $19
-        addq    $18,    $18,    $18
-        addq    $20,    $20,    $20
-        addq    $20,    $25,    $20
-        addq    $22,    $19,    $22
-        addq    $23,    $18,    $23
-        addq    $8,     $20,    $8
-        cmpult  $23,    $18,    $17
-        cmpult  $8,     $20,    $21
-        addq    $8,     $17,    $8
-        addq    $22,    $21,    $22
-        mulq    $6,     $2,     $27
-        umulh   $6,     $2,     $28
-        cmplt   $27,    $31,    $24
-        cmplt   $28,    $31,    $25
-        addq    $27,    $27,    $27
-        addq    $28,    $28,    $28
-        addq    $28,    $24,    $28
-        addq    $22,    $25,    $22
-        addq    $23,    $27,    $23
-        addq    $8,     $28,    $8
-        cmpult  $23,    $27,    $19
-        cmpult  $8,     $28,    $18
-        addq    $8,     $19,    $8
-        addq    $22,    $18,    $22
-        mulq    $7,     $1,     $20
-        umulh   $7,     $1,     $17
-        cmplt   $20,    $31,    $21
-        cmplt   $17,    $31,    $24
-        addq    $20,    $20,    $20
-        addq    $17,    $17,    $17
-        addq    $17,    $21,    $17
-        addq    $22,    $24,    $22
-        addq    $23,    $20,    $23
-        addq    $8,     $17,    $8
-        cmpult  $23,    $20,    $25
-        cmpult  $8,     $17,    $27
-        addq    $8,     $25,    $8
-        addq    $22,    $27,    $22
-        stq     $23,    64($16)
-        bis     $31,    $31,    $23
-        mulq    $5,     $4,     $28
-        umulh   $5,     $4,     $19
-        cmplt   $28,    $31,    $18
-        cmplt   $19,    $31,    $21
-        addq    $28,    $28,    $28
-        addq    $19,    $19,    $19
-        addq    $19,    $18,    $19
-        addq    $23,    $21,    $23
-        addq    $8,     $28,    $8
-        addq    $22,    $19,    $22
-        cmpult  $8,     $28,    $24
-        cmpult  $22,    $19,    $20
-        addq    $22,    $24,    $22
-        addq    $23,    $20,    $23
-        mulq    $6,     $3,     $17
-        umulh   $6,     $3,     $25
-        cmplt   $17,    $31,    $27
-        cmplt   $25,    $31,    $18
-        addq    $17,    $17,    $17
-        addq    $25,    $25,    $25
-        addq    $25,    $27,    $25
-        addq    $23,    $18,    $23
-        addq    $8,     $17,    $8
-        addq    $22,    $25,    $22
-        cmpult  $8,     $17,    $21
-        cmpult  $22,    $25,    $28
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        mulq    $7,     $2,     $19
-        umulh   $7,     $2,     $24
-        cmplt   $19,    $31,    $20
-        cmplt   $24,    $31,    $27
-        addq    $19,    $19,    $19
-        addq    $24,    $24,    $24
-        addq    $24,    $20,    $24
-        addq    $23,    $27,    $23
-        addq    $8,     $19,    $8
-        addq    $22,    $24,    $22
-        cmpult  $8,     $19,    $18
-        cmpult  $22,    $24,    $17
-        addq    $22,    $18,    $22
-        addq    $23,    $17,    $23
-        stq     $8,     72($16)
-        bis     $31,    $31,    $8
-        mulq    $5,     $5,     $25
-        umulh   $5,     $5,     $21
-        addq    $22,    $25,    $22
-        addq    $23,    $21,    $23
-        cmpult  $22,    $25,    $28
-        cmpult  $23,    $21,    $20
-        addq    $23,    $28,    $23
-        addq    $8,     $20,    $8
-        mulq    $6,     $4,     $27
-        umulh   $6,     $4,     $19
-        cmplt   $27,    $31,    $24
-        cmplt   $19,    $31,    $18
-        addq    $27,    $27,    $27
-        addq    $19,    $19,    $19
-        addq    $19,    $24,    $19
-        addq    $8,     $18,    $8
-        addq    $22,    $27,    $22
-        addq    $23,    $19,    $23
-        cmpult  $22,    $27,    $17
-        cmpult  $23,    $19,    $25
-        addq    $23,    $17,    $23
-        addq    $8,     $25,    $8
-        mulq    $7,     $3,     $21
-        umulh   $7,     $3,     $28
-        cmplt   $21,    $31,    $20
-        cmplt   $28,    $31,    $24
-        addq    $21,    $21,    $21
-        addq    $28,    $28,    $28
-        addq    $28,    $20,    $28
-        addq    $8,     $24,    $8
-        addq    $22,    $21,    $22
-        addq    $23,    $28,    $23
-        cmpult  $22,    $21,    $18
-        cmpult  $23,    $28,    $27
-        addq    $23,    $18,    $23
-        addq    $8,     $27,    $8
-        stq     $22,    80($16)
-        bis     $31,    $31,    $22
-        mulq    $6,     $5,     $19
-        umulh   $6,     $5,     $17
-        cmplt   $19,    $31,    $25
-        cmplt   $17,    $31,    $20
-        addq    $19,    $19,    $19
-        addq    $17,    $17,    $17
-        addq    $17,    $25,    $17
-        addq    $22,    $20,    $22
-        addq    $23,    $19,    $23
-        addq    $8,     $17,    $8
-        cmpult  $23,    $19,    $24
-        cmpult  $8,     $17,    $21
-        addq    $8,     $24,    $8
-        addq    $22,    $21,    $22
-        mulq    $7,     $4,     $28
-        umulh   $7,     $4,     $18
-        cmplt   $28,    $31,    $27
-        cmplt   $18,    $31,    $25
-        addq    $28,    $28,    $28
-        addq    $18,    $18,    $18
-        addq    $18,    $27,    $18
-        addq    $22,    $25,    $22
-        addq    $23,    $28,    $23
-        addq    $8,     $18,    $8
-        cmpult  $23,    $28,    $20
-        cmpult  $8,     $18,    $19
-        addq    $8,     $20,    $8
-        addq    $22,    $19,    $22
-        stq     $23,    88($16)
-        bis     $31,    $31,    $23
-        mulq    $6,     $6,     $17
-        umulh   $6,     $6,     $24
-        addq    $8,     $17,    $8
-        addq    $22,    $24,    $22
-        cmpult  $8,     $17,    $21
-        cmpult  $22,    $24,    $27
-        addq    $22,    $21,    $22
-        addq    $23,    $27,    $23
-        mulq    $7,     $5,     $25
-        umulh   $7,     $5,     $28
-        cmplt   $25,    $31,    $18
-        cmplt   $28,    $31,    $20
-        addq    $25,    $25,    $25
-        addq    $28,    $28,    $28
-        addq    $28,    $18,    $28
-        addq    $23,    $20,    $23
-        addq    $8,     $25,    $8
-        addq    $22,    $28,    $22
-        cmpult  $8,     $25,    $19
-        cmpult  $22,    $28,    $17
-        addq    $22,    $19,    $22
-        addq    $23,    $17,    $23
-        stq     $8,     96($16)
-        bis     $31,    $31,    $8
-        mulq    $7,     $6,     $24
-        umulh   $7,     $6,     $21
-        cmplt   $24,    $31,    $27
-        cmplt   $21,    $31,    $18
-        addq    $24,    $24,    $24
-        addq    $21,    $21,    $21
-        addq    $21,    $27,    $21
-        addq    $8,     $18,    $8
-        addq    $22,    $24,    $22
-        addq    $23,    $21,    $23
-        cmpult  $22,    $24,    $20
-        cmpult  $23,    $21,    $25
-        addq    $23,    $20,    $23
-        addq    $8,     $25,    $8
-        stq     $22,    104($16)
-        bis     $31,    $31,    $22
-        mulq    $7,     $7,     $28
-        umulh   $7,     $7,     $19
-        addq    $23,    $28,    $23
-        addq    $8,     $19,    $8
-        cmpult  $23,    $28,    $17
-        cmpult  $8,     $19,    $27
-        addq    $8,     $17,    $8
-        addq    $22,    $27,    $22
-        stq     $23,    112($16)
-        stq     $8,     120($16)
-        ret     $31,($26),1
-        .end bn_sqr_comba8
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.s.works b/src/lib/libssl/src/crypto/bn/asm/alpha.s.works
deleted file mode 100644
index ee6c587809..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.s.works
+++ /dev/null
@@ -1,533 +0,0 @@
-
- # DEC Alpha assember
- # The bn_div64 is actually gcc output but the other parts are hand done.
- # Thanks to tzeruch@ceddec.com for sending me the gcc output for
- # bn_div64.
- # I've gone back and re-done most of routines.
- # The key thing to remeber for the 164 CPU is that while a
- # multiply operation takes 8 cycles, another one can only be issued
- # after 4 cycles have elapsed.  I've done modification to help
- # improve this.  Also, normally, a ld instruction will not be available
- # for about 3 cycles.
-        .file   1 "bn_asm.c"
-        .set noat
-gcc2_compiled.:
-__gnu_compiled_c:
-        .text
-        .align 3
-        .globl bn_mul_add_words
-        .ent bn_mul_add_words
-bn_mul_add_words:
-bn_mul_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$0
-        blt     $18,$43         # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        ldq     $1,0($16)       # 1 1
-        .align 3
-$42:
-        mulq    $20,$19,$5      # 1 2 1 ######
-        ldq     $21,8($17)      # 2 1
-        ldq     $2,8($16)       # 2 1
-        umulh   $20,$19,$20     # 1 2   ######
-        ldq     $27,16($17)     # 3 1
-        ldq     $3,16($16)      # 3 1
-        mulq    $21,$19,$6      # 2 2 1 ######
-         ldq    $28,24($17)     # 4 1
-        addq    $1,$5,$1        # 1 2 2
-         ldq    $4,24($16)      # 4 1
-        umulh   $21,$19,$21     # 2 2   ######
-         cmpult $1,$5,$22       # 1 2 3 1
-        addq    $20,$22,$20     # 1 3 1
-         addq   $1,$0,$1        # 1 2 3 1
-        mulq    $27,$19,$7      # 3 2 1 ######
-         cmpult $1,$0,$0        # 1 2 3 2
-        addq    $2,$6,$2        # 2 2 2
-         addq   $20,$0,$0       # 1 3 2 
-        cmpult  $2,$6,$23       # 2 2 3 1
-         addq   $21,$23,$21     # 2 3 1
-        umulh   $27,$19,$27     # 3 2   ######
-         addq   $2,$0,$2        # 2 2 3 1
-        cmpult  $2,$0,$0        # 2 2 3 2
-         subq   $18,4,$18
-        mulq    $28,$19,$8      # 4 2 1 ######
-         addq   $21,$0,$0       # 2 3 2 
-        addq    $3,$7,$3        # 3 2 2
-         addq   $16,32,$16
-        cmpult  $3,$7,$24       # 3 2 3 1
-         stq    $1,-32($16)     # 1 2 4
-        umulh   $28,$19,$28     # 4 2   ######
-         addq   $27,$24,$27     # 3 3 1
-        addq    $3,$0,$3        # 3 2 3 1
-         stq    $2,-24($16)     # 2 2 4
-        cmpult  $3,$0,$0        # 3 2 3 2
-         stq    $3,-16($16)     # 3 2 4
-        addq    $4,$8,$4        # 4 2 2
-         addq   $27,$0,$0       # 3 3 2 
-        cmpult  $4,$8,$25       # 4 2 3 1
-         addq   $17,32,$17
-        addq    $28,$25,$28     # 4 3 1
-         addq   $4,$0,$4        # 4 2 3 1
-        cmpult  $4,$0,$0        # 4 2 3 2
-         stq    $4,-8($16)      # 4 2 4
-        addq    $28,$0,$0       # 4 3 2 
-         blt    $18,$43
-
-        ldq     $20,0($17)      # 1 1
-        ldq     $1,0($16)       # 1 1
-
-        br      $42
-
-        .align 4
-$45:
-        ldq     $20,0($17)      # 4 1
-        ldq     $1,0($16)       # 4 1
-        mulq    $20,$19,$5      # 4 2 1
-        subq    $18,1,$18
-        addq    $16,8,$16
-        addq    $17,8,$17
-        umulh   $20,$19,$20     # 4 2
-        addq    $1,$5,$1        # 4 2 2
-        cmpult  $1,$5,$22       # 4 2 3 1
-        addq    $20,$22,$20     # 4 3 1
-        addq    $1,$0,$1        # 4 2 3 1
-        cmpult  $1,$0,$0        # 4 2 3 2
-        addq    $20,$0,$0       # 4 3 2 
-        stq     $1,-8($16)      # 4 2 4
-        bgt     $18,$45
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$43:
-        addq    $18,4,$18
-        bgt     $18,$45         # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_add_words
-        .align 3
-        .globl bn_mul_words
-        .ent bn_mul_words
-bn_mul_words:
-bn_mul_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$0
-        blt     $18,$143        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        .align 3
-$142:
-
-        mulq    $20,$19,$5      # 1 2 1 #####
-         ldq    $21,8($17)      # 2 1
-         ldq    $27,16($17)     # 3 1
-        umulh   $20,$19,$20     # 1 2   #####
-         ldq    $28,24($17)     # 4 1
-        mulq    $21,$19,$6      # 2 2 1 #####
-         addq   $5,$0,$5        # 1 2 3 1
-        subq    $18,4,$18
-         cmpult $5,$0,$0        # 1 2 3 2
-        umulh   $21,$19,$21     # 2 2   #####
-         addq   $20,$0,$0       # 1 3 2 
-        addq    $17,32,$17
-         addq   $6,$0,$6        # 2 2 3 1
-        mulq    $27,$19,$7      # 3 2 1 #####
-         cmpult $6,$0,$0        # 2 2 3 2
-        addq    $21,$0,$0       # 2 3 2 
-         addq   $16,32,$16
-        umulh   $27,$19,$27     # 3 2   #####
-         stq    $5,-32($16)     # 1 2 4
-        mulq    $28,$19,$8      # 4 2 1 #####
-         addq   $7,$0,$7        # 3 2 3 1
-        stq     $6,-24($16)     # 2 2 4
-         cmpult $7,$0,$0        # 3 2 3 2
-        umulh   $28,$19,$28     # 4 2   #####
-         addq   $27,$0,$0       # 3 3 2 
-        stq     $7,-16($16)     # 3 2 4
-         addq   $8,$0,$8        # 4 2 3 1
-        cmpult  $8,$0,$0        # 4 2 3 2
-
-        addq    $28,$0,$0       # 4 3 2 
-
-        stq     $8,-8($16)      # 4 2 4
-
-        blt     $18,$143
-
-        ldq     $20,0($17)      # 1 1
-
-        br      $142
-
-        .align 4
-$145:
-        ldq     $20,0($17)      # 4 1
-        mulq    $20,$19,$5      # 4 2 1
-        subq    $18,1,$18
-        umulh   $20,$19,$20     # 4 2
-        addq    $5,$0,$5        # 4 2 3 1
-         addq   $16,8,$16
-        cmpult  $5,$0,$0        # 4 2 3 2
-         addq   $17,8,$17
-        addq    $20,$0,$0       # 4 3 2 
-        stq     $5,-8($16)      # 4 2 4
-
-        bgt     $18,$145
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$143:
-        addq    $18,4,$18
-        bgt     $18,$145        # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_words
-        .align 3
-        .globl bn_sqr_words
-        .ent bn_sqr_words
-bn_sqr_words:
-bn_sqr_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $18,4,$18
-        blt     $18,$543        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $20,0($17)      # 1 1
-        .align 3
-$542:
-        mulq    $20,$20,$5              ######
-         ldq    $21,8($17)      # 1 1
-        subq    $18,4
-        umulh   $20,$20,$1              ######
-        ldq     $27,16($17)     # 1 1
-        mulq    $21,$21,$6              ######
-        ldq     $28,24($17)     # 1 1
-        stq     $5,0($16)       # r[0]
-        umulh   $21,$21,$2              ######
-        stq     $1,8($16)       # r[1]
-        mulq    $27,$27,$7              ######
-        stq     $6,16($16)      # r[0]
-        umulh   $27,$27,$3              ######
-        stq     $2,24($16)      # r[1]
-        mulq    $28,$28,$8              ######
-        stq     $7,32($16)      # r[0]
-        umulh   $28,$28,$4              ######
-        stq     $3,40($16)      # r[1]
-
-        addq    $16,64,$16
-        addq    $17,32,$17
-        stq     $8,-16($16)     # r[0]
-        stq     $4,-8($16)      # r[1]
-
-        blt     $18,$543
-        ldq     $20,0($17)      # 1 1
-        br      $542
-
-$442:
-        ldq     $20,0($17)   # a[0]
-        mulq    $20,$20,$5  # a[0]*w low part       r2
-        addq    $16,16,$16
-        addq    $17,8,$17
-        subq    $18,1,$18
-        umulh   $20,$20,$1  # a[0]*w high part       r3
-        stq     $5,-16($16)   # r[0]
-        stq     $1,-8($16)   # r[1]
-
-        bgt     $18,$442
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$543:
-        addq    $18,4,$18
-        bgt     $18,$442        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_sqr_words
-
-        .align 3
-        .globl bn_add_words
-        .ent bn_add_words
-bn_add_words:
-bn_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,4,$19
-        bis     $31,$31,$0      # carry = 0
-        blt     $19,$900
-        ldq     $5,0($17)       # a[0]
-        ldq     $1,0($18)       # b[1]
-        .align 3
-$901:
-        addq    $1,$5,$1        # r=a+b;
-         ldq    $6,8($17)       # a[1]
-        cmpult  $1,$5,$22       # did we overflow?
-         ldq    $2,8($18)       # b[1]
-        addq    $1,$0,$1        # c+= overflow
-         ldq    $7,16($17)      # a[2]
-        cmpult  $1,$0,$0        # overflow?
-         ldq    $3,16($18)      # b[2]
-        addq    $0,$22,$0
-         ldq    $8,24($17)      # a[3]
-        addq    $2,$6,$2        # r=a+b;
-         ldq    $4,24($18)      # b[3]
-        cmpult  $2,$6,$23       # did we overflow?
-         addq   $3,$7,$3        # r=a+b;
-        addq    $2,$0,$2        # c+= overflow
-         cmpult $3,$7,$24       # did we overflow?
-        cmpult  $2,$0,$0        # overflow?
-         addq   $4,$8,$4        # r=a+b;
-        addq    $0,$23,$0
-         cmpult $4,$8,$25       # did we overflow?
-        addq    $3,$0,$3        # c+= overflow
-         stq    $1,0($16)       # r[0]=c
-        cmpult  $3,$0,$0        # overflow?
-         stq    $2,8($16)       # r[1]=c
-        addq    $0,$24,$0
-         stq    $3,16($16)      # r[2]=c
-        addq    $4,$0,$4        # c+= overflow
-         subq   $19,4,$19       # loop--
-        cmpult  $4,$0,$0        # overflow?
-         addq   $17,32,$17      # a++
-        addq    $0,$25,$0
-         stq    $4,24($16)      # r[3]=c
-        addq    $18,32,$18      # b++
-         addq   $16,32,$16      # r++
-
-        blt     $19,$900
-         ldq    $5,0($17)       # a[0]
-        ldq     $1,0($18)       # b[1]
-         br     $901
-        .align 4
-$945:
-        ldq     $5,0($17)       # a[0]
-         ldq    $1,0($18)       # b[1]
-        addq    $1,$5,$1        # r=a+b;
-         subq   $19,1,$19       # loop--
-        addq    $1,$0,$1        # c+= overflow
-         addq   $17,8,$17       # a++
-        cmpult  $1,$5,$22       # did we overflow?
-         cmpult $1,$0,$0        # overflow?
-        addq    $18,8,$18       # b++
-         stq    $1,0($16)       # r[0]=c
-        addq    $0,$22,$0
-         addq   $16,8,$16       # r++
-
-        bgt     $19,$945
-        ret     $31,($26),1     # else exit
-
-$900:
-        addq    $19,4,$19
-        bgt     $19,$945        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_add_words
-
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .align 3
-        .globl bn_div64
-        .ent bn_div64
-bn_div64:
-        ldgp $29,0($27)
-bn_div64..ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$119
-        lda $0,-1
-        br $31,$136
-        .align 4
-$119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$126
-        zapnot $7,15,$27
-        br $31,$127
-        .align 4
-$126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$127:
-        srl $10,32,$4
-        .align 5
-$128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$129
-        subq $27,1,$27
-        br $31,$128
-        .align 4
-$129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$134
-        addq $9,$11,$9
-        subq $27,1,$27
-$134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$123
-        .align 4
-$124:
-        bis $13,$27,$0
-$136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div64
-
-        .set noat
-        .text
-        .align 3
-        .globl bn_sub_words
-        .ent bn_sub_words
-bn_sub_words:
-bn_sub_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,    4,      $19
-        bis     $31,    $31,    $0
-        blt     $19,    $100
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-$101:
-        ldq     $3,     8($17)
-        cmpult  $1,     $2,     $4
-        ldq     $5,     8($18)
-        subq    $1,     $2,     $1
-        ldq     $6,     16($17)
-        cmpult  $1,     $0,     $2
-        ldq     $7,     16($18)
-        subq    $1,     $0,     $23
-        ldq     $8,     24($17)
-        addq    $2,     $4,     $0
-        cmpult  $3,     $5,     $24
-        subq    $3,     $5,     $3
-        ldq     $22,    24($18)
-        cmpult  $3,     $0,     $5
-        subq    $3,     $0,     $25
-        addq    $5,     $24,    $0
-        cmpult  $6,     $7,     $27
-        subq    $6,     $7,     $6
-        stq     $23,    0($16)
-        cmpult  $6,     $0,     $7
-        subq    $6,     $0,     $28
-        addq    $7,     $27,    $0
-        cmpult  $8,     $22,    $21
-        subq    $8,     $22,    $8
-        stq     $25,    8($16)
-        cmpult  $8,     $0,     $22
-        subq    $8,     $0,     $20
-        addq    $22,    $21,    $0
-        stq     $28,    16($16)
-        subq    $19,    4,      $19
-        stq     $20,    24($16)
-        addq    $17,    32,     $17
-        addq    $18,    32,     $18
-        addq    $16,    32,     $16
-        blt     $19,    $100
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        br      $101
-$102:
-        ldq     $1,     0($17)
-        ldq     $2,     0($18)
-        cmpult  $1,     $2,     $27
-        subq    $1,     $2,     $1
-        cmpult  $1,     $0,     $2
-        subq    $1,     $0,     $1
-        stq     $1,     0($16)
-        addq    $2,     $27,    $0
-        addq    $17,    8,      $17
-        addq    $18,    8,      $18
-        addq    $16,    8,      $16
-        subq    $19,    1,      $19
-        bgt     $19,    $102
-        ret     $31,($26),1
-$100:
-        addq    $19,    4,      $19
-        bgt     $19,    $102
-$103:
-        ret     $31,($26),1
-        .end bn_sub_words
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/add.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/add.pl
deleted file mode 100644
index 4dc76e6b69..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/add.pl
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_add_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$b0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($b0,&QWPw(0,$bp));
-
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-##################################################
-        # Do the last 0..3 words
-
-        ($t0,$o0)=&NR(2);
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-        &ld($b0,&QWPw(0,$bp));  # get b
-
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);   # will we borrow?
-        &add($o0,$cc,$o0);      # will we borrow?
-        &cmpult($o0,$cc,$cc);   # will we borrow?
-        &add($cc,$t0,$cc);      # add the borrows
-        &st($o0,&QWPw(0,$rp));  # save
-
-        &add($ap,$QWS,$ap);
-        &add($bp,$QWS,$bp);
-        &add($rp,$QWS,$rp);
-        &sub($count,1,$count);
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &FR($o0,$t0,$a0,$b0);
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/div.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/div.pl
deleted file mode 100644
index 7ec144377f..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/div.pl
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/local/bin/perl
-
-sub bn_div64
-        {
-        local($data)=<<'EOF';
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .set noreorder
-        .set volatile
-        .align 3
-        .globl bn_div64
-        .ent bn_div64
-bn_div64:
-        ldgp $29,0($27)
-bn_div64..ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$9119
-        lda $0,-1
-        br $31,$9136
-        .align 4
-$9119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$9120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$9120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$9120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$9122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$9122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$9123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$9126
-        zapnot $7,15,$27
-        br $31,$9127
-        .align 4
-$9126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$9127:
-        srl $10,32,$4
-        .align 5
-$9128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$9129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$9129
-        subq $27,1,$27
-        br $31,$9128
-        .align 4
-$9129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$9134
-        addq $9,$11,$9
-        subq $27,1,$27
-$9134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$9124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$9123
-        .align 4
-$9124:
-        bis $13,$27,$0
-$9136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div64
-EOF
-        &asm_add($data);
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul.pl
deleted file mode 100644
index b182bae452..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-        $word=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$r0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($r0,&QWPw(0,$rp));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-        &mul($a0,$word,($l0)=&NR(1));
-         &add($ap,$QWS,$ap);
-        &muh($a0,$word,($h0)=&NR(1));   &FR($a0);
-        &add($l0,$cc,$l0);
-         &add($rp,$QWS,$rp);
-         &sub($count,1,$count);
-        &cmpult($l0,$cc,$cc);
-        &st($l0,&QWPw(-1,$rp));         &FR($l0);
-        &add($h0,$cc,$cc);              &FR($h0);
-
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_add.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_add.pl
deleted file mode 100644
index e37f6315fb..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_add.pl
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_add_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-        $word=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$r0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($r0,&QWPw(0,$rp));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-        &ld(($r0)=&NR(1),&QWPw(0,$rp)); # get b
-        &mul($a0,$word,($l0)=&NR(1));
-         &sub($count,1,$count);
-         &add($ap,$QWS,$ap);
-        &muh($a0,$word,($h0)=&NR(1));   &FR($a0);
-        &add($r0,$l0,$r0);
-         &add($rp,$QWS,$rp);
-        &cmpult($r0,$l0,($t0)=&NR(1));  &FR($l0);
-         &add($r0,$cc,$r0);
-        &add($h0,$t0,$h0);              &FR($t0);
-         &cmpult($r0,$cc,$cc);
-        &st($r0,&QWPw(-1,$rp));         &FR($r0);
-         &add($h0,$cc,$cc);             &FR($h0);
-
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c4.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c4.pl
deleted file mode 100644
index 5efd201281..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c4.pl
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub mul_add_c
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &add($t1,$h1,$h1);              &FR($t1);
-        &add($c1,$h1,$c1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub bn_mul_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &mul($a[0],$b[0],($r00)=&NR(1));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &muh($a[0],$b[0],($r01)=&NR(1));
-        &FR($ap); &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &FR($bp); &ld(($b[3])=&NR(1),&QWPw(3,$bp));
-        &mul($a[0],$b[1],($r02)=&NR(1));
-
-        ($R,$H1,$H2)=&NR(3);
-
-        &st($r00,&QWPw(0,$rp)); &FR($r00);
-
-        &mov("zero",$R);
-        &mul($a[1],$b[0],($r03)=&NR(1));
-
-        &mov("zero",$H1);
-        &mov("zero",$H0);
-         &add($R,$r01,$R);
-        &muh($a[0],$b[1],($r04)=&NR(1));
-         &cmpult($R,$r01,($t01)=&NR(1));        &FR($r01);
-         &add($R,$r02,$R);
-         &add($H1,$t01,$H1)                     &FR($t01);
-        &muh($a[1],$b[0],($r05)=&NR(1));
-         &cmpult($R,$r02,($t02)=&NR(1));        &FR($r02);
-         &add($R,$r03,$R);
-         &add($H2,$t02,$H2)                     &FR($t02);
-        &mul($a[0],$b[2],($r06)=&NR(1));
-         &cmpult($R,$r03,($t03)=&NR(1));        &FR($r03);
-         &add($H1,$t03,$H1)                     &FR($t03);
-        &st($R,&QWPw(1,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r04,$R);
-        &mov("zero",$H2);
-        &mul($a[1],$b[1],($r07)=&NR(1));
-         &cmpult($R,$r04,($t04)=&NR(1));        &FR($r04);
-         &add($R,$r05,$R);
-         &add($H1,$t04,$H1)                     &FR($t04);
-        &mul($a[2],$b[0],($r08)=&NR(1));
-         &cmpult($R,$r05,($t05)=&NR(1));        &FR($r05);
-         &add($R,$r01,$R);
-         &add($H2,$t05,$H2)                     &FR($t05);
-        &muh($a[0],$b[2],($r09)=&NR(1));
-         &cmpult($R,$r06,($t06)=&NR(1));        &FR($r06);
-         &add($R,$r07,$R);
-         &add($H1,$t06,$H1)                     &FR($t06);
-        &muh($a[1],$b[1],($r10)=&NR(1));
-         &cmpult($R,$r07,($t07)=&NR(1));        &FR($r07);
-         &add($R,$r08,$R);
-         &add($H2,$t07,$H2)                     &FR($t07);
-        &muh($a[2],$b[0],($r11)=&NR(1));
-         &cmpult($R,$r08,($t08)=&NR(1));        &FR($r08);
-         &add($H1,$t08,$H1)                     &FR($t08);
-        &st($R,&QWPw(2,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r09,$R);
-        &mov("zero",$H2);
-        &mul($a[0],$b[3],($r12)=&NR(1));
-         &cmpult($R,$r09,($t09)=&NR(1));        &FR($r09);
-         &add($R,$r10,$R);
-         &add($H1,$t09,$H1)                     &FR($t09);
-        &mul($a[1],$b[2],($r13)=&NR(1));
-         &cmpult($R,$r10,($t10)=&NR(1));        &FR($r10);
-         &add($R,$r11,$R);
-         &add($H1,$t10,$H1)                     &FR($t10);
-        &mul($a[2],$b[1],($r14)=&NR(1));
-         &cmpult($R,$r11,($t11)=&NR(1));        &FR($r11);
-         &add($R,$r12,$R);
-         &add($H1,$t11,$H1)                     &FR($t11);
-        &mul($a[3],$b[0],($r15)=&NR(1));
-         &cmpult($R,$r12,($t12)=&NR(1));        &FR($r12);
-         &add($R,$r13,$R);
-         &add($H1,$t12,$H1)                     &FR($t12);
-        &muh($a[0],$b[3],($r16)=&NR(1));
-         &cmpult($R,$r13,($t13)=&NR(1));        &FR($r13);
-         &add($R,$r14,$R);
-         &add($H1,$t13,$H1)                     &FR($t13);
-        &muh($a[1],$b[2],($r17)=&NR(1));
-         &cmpult($R,$r14,($t14)=&NR(1));        &FR($r14);
-         &add($R,$r15,$R);
-         &add($H1,$t14,$H1)                     &FR($t14);
-        &muh($a[2],$b[1],($r18)=&NR(1));
-         &cmpult($R,$r15,($t15)=&NR(1));        &FR($r15);
-         &add($H1,$t15,$H1)                     &FR($t15);
-        &st($R,&QWPw(3,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r16,$R);
-        &mov("zero",$H2);
-        &muh($a[3],$b[0],($r19)=&NR(1));
-         &cmpult($R,$r16,($t16)=&NR(1));        &FR($r16);
-         &add($R,$r17,$R);
-         &add($H1,$t16,$H1)                     &FR($t16);
-        &mul($a[1],$b[3],($r20)=&NR(1));
-         &cmpult($R,$r17,($t17)=&NR(1));        &FR($r17);
-         &add($R,$r18,$R);
-         &add($H1,$t17,$H1)                     &FR($t17);
-        &mul($a[2],$b[2],($r21)=&NR(1));
-         &cmpult($R,$r18,($t18)=&NR(1));        &FR($r18);
-         &add($R,$r19,$R);
-         &add($H1,$t18,$H1)                     &FR($t18);
-        &mul($a[3],$b[1],($r22)=&NR(1));
-         &cmpult($R,$r19,($t19)=&NR(1));        &FR($r19);
-         &add($R,$r20,$R);
-         &add($H1,$t19,$H1)                     &FR($t19);
-        &muh($a[1],$b[3],($r23)=&NR(1));
-         &cmpult($R,$r20,($t20)=&NR(1));        &FR($r20);
-         &add($R,$r21,$R);
-         &add($H1,$t20,$H1)                     &FR($t20);
-        &muh($a[2],$b[2],($r24)=&NR(1));
-         &cmpult($R,$r21,($t21)=&NR(1));        &FR($r21);
-         &add($R,$r22,$R);
-         &add($H1,$t21,$H1)                     &FR($t21);
-        &muh($a[3],$b[1],($r25)=&NR(1));
-         &cmpult($R,$r22,($t22)=&NR(1));        &FR($r22);
-         &add($H1,$t22,$H1)                     &FR($t22);
-        &st($R,&QWPw(4,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r23,$R);
-        &mov("zero",$H2);
-        &mul($a[2],$b[3],($r26)=&NR(1));
-         &cmpult($R,$r23,($t23)=&NR(1));        &FR($r23);
-         &add($R,$r24,$R);
-         &add($H1,$t23,$H1)                     &FR($t23);
-        &mul($a[3],$b[2],($r27)=&NR(1));
-         &cmpult($R,$r24,($t24)=&NR(1));        &FR($r24);
-         &add($R,$r25,$R);
-         &add($H1,$t24,$H1)                     &FR($t24);
-        &muh($a[2],$b[3],($r28)=&NR(1));
-         &cmpult($R,$r25,($t25)=&NR(1));        &FR($r25);
-         &add($R,$r26,$R);
-         &add($H1,$t25,$H1)                     &FR($t25);
-        &muh($a[3],$b[2],($r29)=&NR(1));
-         &cmpult($R,$r26,($t26)=&NR(1));        &FR($r26);
-         &add($R,$r27,$R);
-         &add($H1,$t26,$H1)                     &FR($t26);
-        &mul($a[3],$b[3],($r30)=&NR(1));
-         &cmpult($R,$r27,($t27)=&NR(1));        &FR($r27);
-         &add($H1,$t27,$H1)                     &FR($t27);
-        &st($R,&QWPw(5,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r28,$R);
-        &mov("zero",$H2);
-        &muh($a[3],$b[3],($r31)=&NR(1));
-         &cmpult($R,$r28,($t28)=&NR(1));        &FR($r28);
-         &add($R,$r29,$R);
-         &add($H1,$t28,$H1)                     &FR($t28);
-        ############
-         &cmpult($R,$r29,($t29)=&NR(1));        &FR($r29);
-         &add($R,$r30,$R);
-         &add($H1,$t29,$H1)                     &FR($t29);
-        ############
-         &cmpult($R,$r30,($t30)=&NR(1));        &FR($r30);
-         &add($H1,$t30,$H1)                     &FR($t30);
-        &st($R,&QWPw(6,$rp));
-        &add($H1,$H2,$R);
-
-         &add($R,$r31,$R);                      &FR($r31);
-        &st($R,&QWPw(7,$rp));
-
-        &FR($R,$H1,$H2);
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c4.works.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c4.works.pl
deleted file mode 100644
index 79d86dd25c..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c4.works.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub mul_add_c
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-print STDERR "count=$cnt\n"; $cnt++;
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &add($t1,$h1,$h1);              &FR($t1);
-        &add($c1,$h1,$c1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub bn_mul_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));       &FR($ap);
-        &ld(($b[3])=&NR(1),&QWPw(3,$bp));       &FR($bp);
-
-        ($c0,$c1,$c2)=&NR(3);
-        &mov("zero",$c2);
-        &mul($a[0],$b[0],$c0);
-        &muh($a[0],$b[0],$c1);
-        &st($c0,&QWPw(0,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[0],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[3],$c0,$c1,$c2);    &FR($a[0]);
-        &mul_add_c($a[1],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[0],$c0,$c1,$c2);    &FR($b[0]);
-        &st($c0,&QWPw(3,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[3],$c0,$c1,$c2);    &FR($a[1]);
-        &mul_add_c($a[2],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[1],$c0,$c1,$c2);    &FR($b[1]);
-        &st($c0,&QWPw(4,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[2],$b[3],$c0,$c1,$c2);    &FR($a[2]);
-        &mul_add_c($a[3],$b[2],$c0,$c1,$c2);    &FR($b[2]);
-        &st($c0,&QWPw(5,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[3],$b[3],$c0,$c1,$c2);    &FR($a[3],$b[3]);
-        &st($c0,&QWPw(6,$rp));
-        &st($c1,&QWPw(7,$rp));
-
-        &FR($c0,$c1,$c2);
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c8.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c8.pl
deleted file mode 100644
index 525ca7494b..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/mul_c8.pl
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_comba8
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &stack_push(2);
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &st($reg_s0,&swtmp(0)); &FR($reg_s0);
-        &st($reg_s1,&swtmp(1)); &FR($reg_s1);
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &ld(($b[3])=&NR(1),&QWPw(3,$bp));
-        &ld(($a[4])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[4])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[5])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[5])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[6])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[6])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[7])=&NR(1),&QWPw(1,$ap));       &FR($ap);
-        &ld(($b[7])=&NR(1),&QWPw(1,$bp));       &FR($bp);
-
-        ($c0,$c1,$c2)=&NR(3);
-        &mov("zero",$c2);
-        &mul($a[0],$b[0],$c0);
-        &muh($a[0],$b[0],$c1);
-        &st($c0,&QWPw(0,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[7],$c0,$c1,$c2);    &FR($a[0]);
-        &mul_add_c($a[1],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[0],$c0,$c1,$c2);    &FR($b[0]);
-        &st($c0,&QWPw(7,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[7],$c0,$c1,$c2);    &FR($a[1]);
-        &mul_add_c($a[2],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[1],$c0,$c1,$c2);    &FR($b[1]);
-        &st($c0,&QWPw(8,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[2],$b[7],$c0,$c1,$c2);    &FR($a[2]);
-        &mul_add_c($a[3],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[2],$c0,$c1,$c2);    &FR($b[2]);
-        &st($c0,&QWPw(9,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[3],$b[7],$c0,$c1,$c2);    &FR($a[3]);
-        &mul_add_c($a[4],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[3],$c0,$c1,$c2);    &FR($b[3]);
-        &st($c0,&QWPw(10,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[4],$b[7],$c0,$c1,$c2);    &FR($a[4]);
-        &mul_add_c($a[5],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[4],$c0,$c1,$c2);    &FR($b[4]);
-        &st($c0,&QWPw(11,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[5],$b[7],$c0,$c1,$c2);    &FR($a[5]);
-        &mul_add_c($a[6],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[5],$c0,$c1,$c2);    &FR($b[5]);
-        &st($c0,&QWPw(12,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[6],$b[7],$c0,$c1,$c2);    &FR($a[6]);
-        &mul_add_c($a[7],$b[6],$c0,$c1,$c2);    &FR($b[6]);
-        &st($c0,&QWPw(13,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[7],$b[7],$c0,$c1,$c2);    &FR($a[7],$b[7]);
-        &st($c0,&QWPw(14,$rp));
-        &st($c1,&QWPw(15,$rp));
-
-        &FR($c0,$c1,$c2);
-
-        &ld($reg_s0,&swtmp(0));
-        &ld($reg_s1,&swtmp(1));
-        &stack_pop(2);
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr.pl
deleted file mode 100644
index a55b696906..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr.pl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_sqr_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(3);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$r0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($r0,&QWPw(0,$rp));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-        &mul($a0,$a0,($l0)=&NR(1));
-         &add($ap,$QWS,$ap);
-         &add($rp,2*$QWS,$rp);
-         &sub($count,1,$count);
-        &muh($a0,$a0,($h0)=&NR(1));     &FR($a0);
-        &st($l0,&QWPw(-2,$rp));         &FR($l0);
-        &st($h0,&QWPw(-1,$rp));         &FR($h0);
-
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr_c4.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr_c4.pl
deleted file mode 100644
index bf33f5b503..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr_c4.pl
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub sqr_add_c
-        {
-        local($a,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$a,($l1)=&NR(1));
-        &muh($a,$a,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &add($c1,$h1,$c1);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c1,$t1,$c1);              &FR($t1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub sqr_add_c2
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &cmplt($l1,"zero",($lc1)=&NR(1));
-        &cmplt($h1,"zero",($hc1)=&NR(1));
-        &add($l1,$l1,$l1);
-        &add($h1,$h1,$h1);
-        &add($h1,$lc1,$h1);             &FR($lc1);
-        &add($c2,$hc1,$c2);             &FR($hc1);
-
-        &add($c0,$l1,$c0);
-        &add($c1,$h1,$c1);
-        &cmpult($c0,$l1,($lc1)=&NR(1)); &FR($l1);
-        &cmpult($c1,$h1,($hc1)=&NR(1)); &FR($h1);
-
-        &add($c1,$lc1,$c1);             &FR($lc1);
-        &add($c2,$hc1,$c2);             &FR($hc1);
-        }
-
-
-sub bn_sqr_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(2);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap)); &FR($ap);
-
-        ($c0,$c1,$c2)=&NR(3);
-
-        &mov("zero",$c2);
-        &mul($a[0],$a[0],$c0);
-        &muh($a[0],$a[0],$c1);
-        &st($c0,&QWPw(0,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[0],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[0],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[2],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[3],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));
-        &st($c1,&QWPw(7,$rp));
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr_c8.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr_c8.pl
deleted file mode 100644
index b4afe085f1..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/sqr_c8.pl
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_sqr_comba8
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(2);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &ld(($a[4])=&NR(1),&QWPw(4,$ap));
-        &ld(($a[5])=&NR(1),&QWPw(5,$ap));
-        &ld(($a[6])=&NR(1),&QWPw(6,$ap));
-        &ld(($a[7])=&NR(1),&QWPw(7,$ap)); &FR($ap);
-
-        ($c0,$c1,$c2)=&NR(3);
-
-        &mov("zero",$c2);
-        &mul($a[0],$a[0],$c0);
-        &muh($a[0],$a[0],$c1);
-        &st($c0,&QWPw(0,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[1],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[2],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[4],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(7,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(8,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[5],$a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[2],$c0,$c1,$c2);
-        &st($c0,&QWPw(9,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[5],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[3],$c0,$c1,$c2);
-        &st($c0,&QWPw(10,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[6],$a[5],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[4],$c0,$c1,$c2);
-        &st($c0,&QWPw(11,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[6],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[5],$c0,$c1,$c2);
-        &st($c0,&QWPw(12,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[7],$a[6],$c0,$c1,$c2);
-        &st($c0,&QWPw(13,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[7],$c0,$c1,$c2);
-        &st($c0,&QWPw(14,$rp));
-        &st($c1,&QWPw(15,$rp));
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha.works/sub.pl b/src/lib/libssl/src/crypto/bn/asm/alpha.works/sub.pl
deleted file mode 100644
index d998da5c21..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha.works/sub.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember
-
-sub bn_sub_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &blt($count,&label("finish"));
-
-        ($a0,$b0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($b0,&QWPw(0,$bp));
-
-##########################################################
-        &set_label("loop");
-
-        ($a1,$tmp,$b1,$a2,$b2,$a3,$b3,$o0)=&NR(8);
-        &ld($a1,&QWPw(1,$ap));
-         &cmpult($a0,$b0,$tmp); # will we borrow?
-        &ld($b1,&QWPw(1,$bp));
-         &sub($a0,$b0,$a0);             # do the subtract
-        &ld($a2,&QWPw(2,$ap));
-         &cmpult($a0,$cc,$b0);  # will we borrow?
-        &ld($b2,&QWPw(2,$bp));
-         &sub($a0,$cc,$o0);     # will we borrow?
-        &ld($a3,&QWPw(3,$ap));
-         &add($b0,$tmp,$cc); ($t1,$o1)=&NR(2); &FR($tmp);
-
-        &cmpult($a1,$b1,$t1);   # will we borrow?
-         &sub($a1,$b1,$a1);     # do the subtract
-        &ld($b3,&QWPw(3,$bp));
-         &cmpult($a1,$cc,$b1);  # will we borrow?
-        &sub($a1,$cc,$o1);      # will we borrow?
-         &add($b1,$t1,$cc); ($tmp,$o2)=&NR(2); &FR($t1,$a1,$b1);
-        
-        &cmpult($a2,$b2,$tmp);  # will we borrow?
-         &sub($a2,$b2,$a2);             # do the subtract
-        &st($o0,&QWPw(0,$rp));  &FR($o0); # save
-         &cmpult($a2,$cc,$b2);  # will we borrow?
-        &sub($a2,$cc,$o2);      # will we borrow?
-         &add($b2,$tmp,$cc); ($t3,$o3)=&NR(2); &FR($tmp,$a2,$b2);
-
-        &cmpult($a3,$b3,$t3);   # will we borrow?
-         &sub($a3,$b3,$a3);     # do the subtract
-        &st($o1,&QWPw(1,$rp)); &FR($o1);
-         &cmpult($a3,$cc,$b3);  # will we borrow?
-        &sub($a3,$cc,$o3);      # will we borrow?
-         &add($b3,$t3,$cc); &FR($t3,$a3,$b3);
-
-        &st($o2,&QWPw(2,$rp));  &FR($o2);
-         &sub($count,4,$count); # count-=4
-        &st($o3,&QWPw(3,$rp));  &FR($o3);
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-         &ld($b0,&QWPw(0,$bp)); # get b
-        &cmpult($a0,$b0,$tmp);  # will we borrow?
-        &sub($a0,$b0,$a0);      # do the subtract
-        &cmpult($a0,$cc,$b0);   # will we borrow?
-        &sub($a0,$cc,$a0);      # will we borrow?
-        &st($a0,&QWPw(0,$rp));  # save
-        &add($b0,$tmp,$cc);     # add the borrows
-
-        &add($ap,$QWS,$ap);
-        &add($bp,$QWS,$bp);
-        &add($rp,$QWS,$rp);
-        &sub($count,1,$count);
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &FR($a0,$b0);
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/add.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/add.pl
deleted file mode 100644
index 13bf516428..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/add.pl
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_add_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-         &mov("zero",$cc);
-        &blt($count,&label("finish"));
-
-        ($a0,$b0)=&NR(2);
-
-##########################################################
-        &set_label("loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap));
-         &ld(($b0)=&NR(1),&QWPw(0,$bp));
-        &ld(($a1)=&NR(1),&QWPw(1,$ap));
-         &ld(($b1)=&NR(1),&QWPw(1,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-         &ld(($a2)=&NR(1),&QWPw(2,$ap));
-        &cmpult($o0,$b0,$t0);
-         &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-         &ld(($b2)=&NR(1),&QWPw(2,$bp));
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-         &add($a1,$b1,$o1);     &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-         &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-         &ld(($a3)=&NR(1),&QWPw(3,$ap));
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-         &add($a2,$b2,$o2);     &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-         &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-         &ld(($b3)=&NR(1),&QWPw(3,$bp));
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-         &add($cc,$t2,$cc);     &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-         &add($a3,$b3,$o3);     &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-         &add($o3,$cc,$o3);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-         &cmpult($o3,$cc,$cc);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-         &add($cc,$t3,$cc);     &FR($t3);
-
-
-        &sub($count,4,$count);  # count-=4
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-
-        ###
-         &bge($count,&label("loop"));
-        ###
-        &br(&label("finish"));
-##################################################
-        # Do the last 0..3 words
-
-        ($t0,$o0)=&NR(2);
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-         &ld($b0,&QWPw(0,$bp)); # get b
-        &add($ap,$QWS,$ap);
-         &add($bp,$QWS,$bp);
-        &add($a0,$b0,$o0); 
-         &sub($count,1,$count);
-        &cmpult($o0,$b0,$t0);   # will we borrow?
-         &add($o0,$cc,$o0);     # will we borrow?
-        &cmpult($o0,$cc,$cc);   # will we borrow?
-         &add($rp,$QWS,$rp);
-        &st($o0,&QWPw(-1,$rp)); # save
-         &add($cc,$t0,$cc);     # add the borrows
-
-        ###
-         &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-         &bgt($count,&label("last_loop"));
-
-        &FR($o0,$t0,$a0,$b0);
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/div.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/div.pl
deleted file mode 100644
index e9e680897a..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/div.pl
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/usr/local/bin/perl
-
-sub bn_div_words
-        {
-        local($data)=<<'EOF';
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .set noreorder
-        .set volatile
-        .align 3
-        .globl bn_div_words
-        .ent bn_div_words
-bn_div_words
-        ldgp $29,0($27)
-bn_div_words.ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$9119
-        lda $0,-1
-        br $31,$9136
-        .align 4
-$9119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$9120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$9120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$9120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$9122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$9122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$9123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$9126
-        zapnot $7,15,$27
-        br $31,$9127
-        .align 4
-$9126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$9127:
-        srl $10,32,$4
-        .align 5
-$9128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$9129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$9129
-        subq $27,1,$27
-        br $31,$9128
-        .align 4
-$9129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$9134
-        addq $9,$11,$9
-        subq $27,1,$27
-$9134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$9124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$9123
-        .align 4
-$9124:
-        bis $13,$27,$0
-$9136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div_words
-EOF
-        &asm_add($data);
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/mul.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/mul.pl
deleted file mode 100644
index 76c926566c..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/mul.pl
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-        $word=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-         &mov("zero",$cc);
-        ###
-         &blt($count,&label("finish"));
-
-        ($a0)=&NR(1); &ld($a0,&QWPw(0,$ap));
-
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-         ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-
-        &muh($a0,$word,($h0)=&NR(1));   &FR($a0);
-         ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-                                                        ### wait 8
-        &mul($a0,$word,($l0)=&NR(1));   &FR($a0);
-                                                        ### wait 8
-        &muh($a1,$word,($h1)=&NR(1));   &FR($a1);
-         &add($l0,$cc,$l0);                             ### wait 8
-        &mul($a1,$word,($l1)=&NR(1));   &FR($a1);
-         &cmpult($l0,$cc,$cc);                          ### wait 8
-        &muh($a2,$word,($h2)=&NR(1));   &FR($a2);
-         &add($h0,$cc,$cc);     &FR($h0);               ### wait 8
-        &mul($a2,$word,($l2)=&NR(1));   &FR($a2);
-         &add($l1,$cc,$l1);                             ### wait 8
-        &st($l0,&QWPw(0,$rp));          &FR($l0);
-         &cmpult($l1,$cc,$cc);                          ### wait 8
-        &muh($a3,$word,($h3)=&NR(1));   &FR($a3);
-         &add($h1,$cc,$cc);             &FR($h1);
-        &mul($a3,$word,($l3)=&NR(1));   &FR($a3);
-         &add($l2,$cc,$l2);
-        &st($l1,&QWPw(1,$rp));          &FR($l1);
-         &cmpult($l2,$cc,$cc);
-        &add($h2,$cc,$cc);              &FR($h2);
-         &sub($count,4,$count); # count-=4
-        &st($l2,&QWPw(2,$rp));          &FR($l2);
-         &add($l3,$cc,$l3);
-        &cmpult($l3,$cc,$cc);
-         &add($bp,4*$QWS,$bp);  # count+=4
-        &add($h3,$cc,$cc);              &FR($h3);
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &st($l3,&QWPw(3,$rp));          &FR($l3);
-         &add($rp,4*$QWS,$rp);  # count+=4
-        ###
-         &blt($count,&label("finish"));
-         ($a0)=&NR(1); &ld($a0,&QWPw(0,$ap));
-        &br(&label("finish"));
-##################################################
-
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-         ###
-        ###
-         ###
-        &muh($a0,$word,($h0)=&NR(1));
-         ### Wait 8 for next mul issue
-        &mul($a0,$word,($l0)=&NR(1)); &FR($a0)
-         &add($ap,$QWS,$ap);
-        ### Loose 12 until result is available
-        &add($rp,$QWS,$rp);
-         &sub($count,1,$count);
-        &add($l0,$cc,$l0);
-         ###
-        &st($l0,&QWPw(-1,$rp));         &FR($l0);
-         &cmpult($l0,$cc,$cc);
-        &add($h0,$cc,$cc);              &FR($h0);
-         &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/mul_add.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/mul_add.pl
deleted file mode 100644
index 0d6df69bc4..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/mul_add.pl
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_add_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-        $word=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-         &mov("zero",$cc);
-        ###
-         &blt($count,&label("finish"));
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        &ld(($r0)=&NR(1),&QWPw(0,$rp));
-         &ld(($a1)=&NR(1),&QWPw(1,$ap));
-        &muh($a0,$word,($h0)=&NR(1));
-         &ld(($r1)=&NR(1),&QWPw(1,$rp));
-        &ld(($a2)=&NR(1),&QWPw(2,$ap));
-         ###
-        &mul($a0,$word,($l0)=&NR(1));   &FR($a0);
-         &ld(($r2)=&NR(1),&QWPw(2,$rp));
-        &muh($a1,$word,($h1)=&NR(1));
-         &ld(($a3)=&NR(1),&QWPw(3,$ap));
-        &mul($a1,$word,($l1)=&NR(1));   &FR($a1);
-         &ld(($r3)=&NR(1),&QWPw(3,$rp));
-        &add($r0,$l0,$r0);
-         &add($r1,$l1,$r1);
-        &cmpult($r0,$l0,($t0)=&NR(1));  &FR($l0);
-         &cmpult($r1,$l1,($t1)=&NR(1)); &FR($l1);
-        &muh($a2,$word,($h2)=&NR(1));
-         &add($r0,$cc,$r0);
-        &add($h0,$t0,$h0);              &FR($t0);
-         &cmpult($r0,$cc,$cc);
-        &add($h1,$t1,$h1);              &FR($t1);
-         &add($h0,$cc,$cc);             &FR($h0);
-        &mul($a2,$word,($l2)=&NR(1));   &FR($a2);
-         &add($r1,$cc,$r1);
-        &cmpult($r1,$cc,$cc);
-         &add($r2,$l2,$r2);
-        &add($h1,$cc,$cc);              &FR($h1);
-         &cmpult($r2,$l2,($t2)=&NR(1)); &FR($l2);
-        &muh($a3,$word,($h3)=&NR(1));
-         &add($r2,$cc,$r2);
-        &st($r0,&QWPw(0,$rp)); &FR($r0);
-         &add($h2,$t2,$h2);             &FR($t2);
-        &st($r1,&QWPw(1,$rp)); &FR($r1);
-         &cmpult($r2,$cc,$cc);
-        &mul($a3,$word,($l3)=&NR(1));   &FR($a3);
-         &add($h2,$cc,$cc);             &FR($h2);
-        &st($r2,&QWPw(2,$rp)); &FR($r2);
-         &sub($count,4,$count); # count-=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-        &add($r3,$l3,$r3);
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &cmpult($r3,$l3,($t3)=&NR(1));  &FR($l3);
-         &add($r3,$cc,$r3);
-        &add($h3,$t3,$h3);              &FR($t3);
-         &cmpult($r3,$cc,$cc);
-        &st($r3,&QWPw(-1,$rp)); &FR($r3);
-         &add($h3,$cc,$cc);             &FR($h3);
-
-        ###
-         &blt($count,&label("finish"));
-        &ld(($a0)=&NR(1),&QWPw(0,$ap));
-         &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-         &ld(($r0)=&NR(1),&QWPw(0,$rp));        # get b
-        ###
-         ###
-        &muh($a0,$word,($h0)=&NR(1));   &FR($a0);
-         ### wait 8
-        &mul($a0,$word,($l0)=&NR(1));   &FR($a0);
-         &add($rp,$QWS,$rp);
-        &add($ap,$QWS,$ap);
-         &sub($count,1,$count);
-        ### wait 3 until l0 is available
-        &add($r0,$l0,$r0);
-         ###
-        &cmpult($r0,$l0,($t0)=&NR(1));  &FR($l0);
-         &add($r0,$cc,$r0);
-        &add($h0,$t0,$h0);              &FR($t0);
-         &cmpult($r0,$cc,$cc);
-        &add($h0,$cc,$cc);              &FR($h0);
-
-        &st($r0,&QWPw(-1,$rp));         &FR($r0);
-         &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-         &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c4.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c4.pl
deleted file mode 100644
index 9cc876ded4..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c4.pl
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-# upto
-
-sub mul_add_c
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &add($t1,$h1,$h1);              &FR($t1);
-        &add($c1,$h1,$c1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub bn_mul_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &mul($a[0],$b[0],($r00)=&NR(1));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &muh($a[0],$b[0],($r01)=&NR(1));
-        &FR($ap); &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &FR($bp); &ld(($b[3])=&NR(1),&QWPw(3,$bp));
-        &mul($a[0],$b[1],($r02)=&NR(1));
-
-        ($R,$H1,$H2)=&NR(3);
-
-        &st($r00,&QWPw(0,$rp)); &FR($r00);
-
-        &mov("zero",$R);
-        &mul($a[1],$b[0],($r03)=&NR(1));
-
-        &mov("zero",$H1);
-        &mov("zero",$H0);
-         &add($R,$r01,$R);
-        &muh($a[0],$b[1],($r04)=&NR(1));
-         &cmpult($R,$r01,($t01)=&NR(1));        &FR($r01);
-         &add($R,$r02,$R);
-         &add($H1,$t01,$H1)                     &FR($t01);
-        &muh($a[1],$b[0],($r05)=&NR(1));
-         &cmpult($R,$r02,($t02)=&NR(1));        &FR($r02);
-         &add($R,$r03,$R);
-         &add($H2,$t02,$H2)                     &FR($t02);
-        &mul($a[0],$b[2],($r06)=&NR(1));
-         &cmpult($R,$r03,($t03)=&NR(1));        &FR($r03);
-         &add($H1,$t03,$H1)                     &FR($t03);
-        &st($R,&QWPw(1,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r04,$R);
-        &mov("zero",$H2);
-        &mul($a[1],$b[1],($r07)=&NR(1));
-         &cmpult($R,$r04,($t04)=&NR(1));        &FR($r04);
-         &add($R,$r05,$R);
-         &add($H1,$t04,$H1)                     &FR($t04);
-        &mul($a[2],$b[0],($r08)=&NR(1));
-         &cmpult($R,$r05,($t05)=&NR(1));        &FR($r05);
-         &add($R,$r01,$R);
-         &add($H2,$t05,$H2)                     &FR($t05);
-        &muh($a[0],$b[2],($r09)=&NR(1));
-         &cmpult($R,$r06,($t06)=&NR(1));        &FR($r06);
-         &add($R,$r07,$R);
-         &add($H1,$t06,$H1)                     &FR($t06);
-        &muh($a[1],$b[1],($r10)=&NR(1));
-         &cmpult($R,$r07,($t07)=&NR(1));        &FR($r07);
-         &add($R,$r08,$R);
-         &add($H2,$t07,$H2)                     &FR($t07);
-        &muh($a[2],$b[0],($r11)=&NR(1));
-         &cmpult($R,$r08,($t08)=&NR(1));        &FR($r08);
-         &add($H1,$t08,$H1)                     &FR($t08);
-        &st($R,&QWPw(2,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r09,$R);
-        &mov("zero",$H2);
-        &mul($a[0],$b[3],($r12)=&NR(1));
-         &cmpult($R,$r09,($t09)=&NR(1));        &FR($r09);
-         &add($R,$r10,$R);
-         &add($H1,$t09,$H1)                     &FR($t09);
-        &mul($a[1],$b[2],($r13)=&NR(1));
-         &cmpult($R,$r10,($t10)=&NR(1));        &FR($r10);
-         &add($R,$r11,$R);
-         &add($H1,$t10,$H1)                     &FR($t10);
-        &mul($a[2],$b[1],($r14)=&NR(1));
-         &cmpult($R,$r11,($t11)=&NR(1));        &FR($r11);
-         &add($R,$r12,$R);
-         &add($H1,$t11,$H1)                     &FR($t11);
-        &mul($a[3],$b[0],($r15)=&NR(1));
-         &cmpult($R,$r12,($t12)=&NR(1));        &FR($r12);
-         &add($R,$r13,$R);
-         &add($H1,$t12,$H1)                     &FR($t12);
-        &muh($a[0],$b[3],($r16)=&NR(1));
-         &cmpult($R,$r13,($t13)=&NR(1));        &FR($r13);
-         &add($R,$r14,$R);
-         &add($H1,$t13,$H1)                     &FR($t13);
-        &muh($a[1],$b[2],($r17)=&NR(1));
-         &cmpult($R,$r14,($t14)=&NR(1));        &FR($r14);
-         &add($R,$r15,$R);
-         &add($H1,$t14,$H1)                     &FR($t14);
-        &muh($a[2],$b[1],($r18)=&NR(1));
-         &cmpult($R,$r15,($t15)=&NR(1));        &FR($r15);
-         &add($H1,$t15,$H1)                     &FR($t15);
-        &st($R,&QWPw(3,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r16,$R);
-        &mov("zero",$H2);
-        &muh($a[3],$b[0],($r19)=&NR(1));
-         &cmpult($R,$r16,($t16)=&NR(1));        &FR($r16);
-         &add($R,$r17,$R);
-         &add($H1,$t16,$H1)                     &FR($t16);
-        &mul($a[1],$b[3],($r20)=&NR(1));
-         &cmpult($R,$r17,($t17)=&NR(1));        &FR($r17);
-         &add($R,$r18,$R);
-         &add($H1,$t17,$H1)                     &FR($t17);
-        &mul($a[2],$b[2],($r21)=&NR(1));
-         &cmpult($R,$r18,($t18)=&NR(1));        &FR($r18);
-         &add($R,$r19,$R);
-         &add($H1,$t18,$H1)                     &FR($t18);
-        &mul($a[3],$b[1],($r22)=&NR(1));
-         &cmpult($R,$r19,($t19)=&NR(1));        &FR($r19);
-         &add($R,$r20,$R);
-         &add($H1,$t19,$H1)                     &FR($t19);
-        &muh($a[1],$b[3],($r23)=&NR(1));
-         &cmpult($R,$r20,($t20)=&NR(1));        &FR($r20);
-         &add($R,$r21,$R);
-         &add($H1,$t20,$H1)                     &FR($t20);
-        &muh($a[2],$b[2],($r24)=&NR(1));
-         &cmpult($R,$r21,($t21)=&NR(1));        &FR($r21);
-         &add($R,$r22,$R);
-         &add($H1,$t21,$H1)                     &FR($t21);
-        &muh($a[3],$b[1],($r25)=&NR(1));
-         &cmpult($R,$r22,($t22)=&NR(1));        &FR($r22);
-         &add($H1,$t22,$H1)                     &FR($t22);
-        &st($R,&QWPw(4,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r23,$R);
-        &mov("zero",$H2);
-        &mul($a[2],$b[3],($r26)=&NR(1));
-         &cmpult($R,$r23,($t23)=&NR(1));        &FR($r23);
-         &add($R,$r24,$R);
-         &add($H1,$t23,$H1)                     &FR($t23);
-        &mul($a[3],$b[2],($r27)=&NR(1));
-         &cmpult($R,$r24,($t24)=&NR(1));        &FR($r24);
-         &add($R,$r25,$R);
-         &add($H1,$t24,$H1)                     &FR($t24);
-        &muh($a[2],$b[3],($r28)=&NR(1));
-         &cmpult($R,$r25,($t25)=&NR(1));        &FR($r25);
-         &add($R,$r26,$R);
-         &add($H1,$t25,$H1)                     &FR($t25);
-        &muh($a[3],$b[2],($r29)=&NR(1));
-         &cmpult($R,$r26,($t26)=&NR(1));        &FR($r26);
-         &add($R,$r27,$R);
-         &add($H1,$t26,$H1)                     &FR($t26);
-        &mul($a[3],$b[3],($r30)=&NR(1));
-         &cmpult($R,$r27,($t27)=&NR(1));        &FR($r27);
-         &add($H1,$t27,$H1)                     &FR($t27);
-        &st($R,&QWPw(5,$rp));
-        &add($H1,$H2,$R);
-
-        &mov("zero",$H1);
-         &add($R,$r28,$R);
-        &mov("zero",$H2);
-        &muh($a[3],$b[3],($r31)=&NR(1));
-         &cmpult($R,$r28,($t28)=&NR(1));        &FR($r28);
-         &add($R,$r29,$R);
-         &add($H1,$t28,$H1)                     &FR($t28);
-        ############
-         &cmpult($R,$r29,($t29)=&NR(1));        &FR($r29);
-         &add($R,$r30,$R);
-         &add($H1,$t29,$H1)                     &FR($t29);
-        ############
-         &cmpult($R,$r30,($t30)=&NR(1));        &FR($r30);
-         &add($H1,$t30,$H1)                     &FR($t30);
-        &st($R,&QWPw(6,$rp));
-        &add($H1,$H2,$R);
-
-         &add($R,$r31,$R);                      &FR($r31);
-        &st($R,&QWPw(7,$rp));
-
-        &FR($R,$H1,$H2);
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c4.works.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c4.works.pl
deleted file mode 100644
index 79d86dd25c..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c4.works.pl
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub mul_add_c
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-print STDERR "count=$cnt\n"; $cnt++;
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &add($t1,$h1,$h1);              &FR($t1);
-        &add($c1,$h1,$c1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub bn_mul_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));       &FR($ap);
-        &ld(($b[3])=&NR(1),&QWPw(3,$bp));       &FR($bp);
-
-        ($c0,$c1,$c2)=&NR(3);
-        &mov("zero",$c2);
-        &mul($a[0],$b[0],$c0);
-        &muh($a[0],$b[0],$c1);
-        &st($c0,&QWPw(0,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[0],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[3],$c0,$c1,$c2);    &FR($a[0]);
-        &mul_add_c($a[1],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[0],$c0,$c1,$c2);    &FR($b[0]);
-        &st($c0,&QWPw(3,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[3],$c0,$c1,$c2);    &FR($a[1]);
-        &mul_add_c($a[2],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[1],$c0,$c1,$c2);    &FR($b[1]);
-        &st($c0,&QWPw(4,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[2],$b[3],$c0,$c1,$c2);    &FR($a[2]);
-        &mul_add_c($a[3],$b[2],$c0,$c1,$c2);    &FR($b[2]);
-        &st($c0,&QWPw(5,$rp));                  &FR($c0); ($c0)=&NR($c0);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[3],$b[3],$c0,$c1,$c2);    &FR($a[3],$b[3]);
-        &st($c0,&QWPw(6,$rp));
-        &st($c1,&QWPw(7,$rp));
-
-        &FR($c0,$c1,$c2);
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c8.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c8.pl
deleted file mode 100644
index 525ca7494b..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/mul_c8.pl
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_mul_comba8
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(3);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &stack_push(2);
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($b[0])=&NR(1),&QWPw(0,$bp));
-        &st($reg_s0,&swtmp(0)); &FR($reg_s0);
-        &st($reg_s1,&swtmp(1)); &FR($reg_s1);
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[1])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($b[2])=&NR(1),&QWPw(2,$bp));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &ld(($b[3])=&NR(1),&QWPw(3,$bp));
-        &ld(($a[4])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[4])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[5])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[5])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[6])=&NR(1),&QWPw(1,$ap));
-        &ld(($b[6])=&NR(1),&QWPw(1,$bp));
-        &ld(($a[7])=&NR(1),&QWPw(1,$ap));       &FR($ap);
-        &ld(($b[7])=&NR(1),&QWPw(1,$bp));       &FR($bp);
-
-        ($c0,$c1,$c2)=&NR(3);
-        &mov("zero",$c2);
-        &mul($a[0],$b[0],$c0);
-        &muh($a[0],$b[0],$c1);
-        &st($c0,&QWPw(0,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[1],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[0],$b[7],$c0,$c1,$c2);    &FR($a[0]);
-        &mul_add_c($a[1],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[2],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[1],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[0],$c0,$c1,$c2);    &FR($b[0]);
-        &st($c0,&QWPw(7,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[1],$b[7],$c0,$c1,$c2);    &FR($a[1]);
-        &mul_add_c($a[2],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[3],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[2],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[1],$c0,$c1,$c2);    &FR($b[1]);
-        &st($c0,&QWPw(8,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[2],$b[7],$c0,$c1,$c2);    &FR($a[2]);
-        &mul_add_c($a[3],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[4],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[3],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[2],$c0,$c1,$c2);    &FR($b[2]);
-        &st($c0,&QWPw(9,$rp));                  &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[3],$b[7],$c0,$c1,$c2);    &FR($a[3]);
-        &mul_add_c($a[4],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[5],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[4],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[3],$c0,$c1,$c2);    &FR($b[3]);
-        &st($c0,&QWPw(10,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[4],$b[7],$c0,$c1,$c2);    &FR($a[4]);
-        &mul_add_c($a[5],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[6],$b[5],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[4],$c0,$c1,$c2);    &FR($b[4]);
-        &st($c0,&QWPw(11,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[5],$b[7],$c0,$c1,$c2);    &FR($a[5]);
-        &mul_add_c($a[6],$b[6],$c0,$c1,$c2);
-        &mul_add_c($a[7],$b[5],$c0,$c1,$c2);    &FR($b[5]);
-        &st($c0,&QWPw(12,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[6],$b[7],$c0,$c1,$c2);    &FR($a[6]);
-        &mul_add_c($a[7],$b[6],$c0,$c1,$c2);    &FR($b[6]);
-        &st($c0,&QWPw(13,$rp));                 &FR($c0); ($c0)=&NR(1);
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &mul_add_c($a[7],$b[7],$c0,$c1,$c2);    &FR($a[7],$b[7]);
-        &st($c0,&QWPw(14,$rp));
-        &st($c1,&QWPw(15,$rp));
-
-        &FR($c0,$c1,$c2);
-
-        &ld($reg_s0,&swtmp(0));
-        &ld($reg_s1,&swtmp(1));
-        &stack_pop(2);
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/sqr.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/sqr.pl
deleted file mode 100644
index a55b696906..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/sqr.pl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_sqr_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r,$couny);
-
-        &init_pool(3);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $count=&wparam(2);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &br(&label("finish"));
-        &blt($count,&label("finish"));
-
-        ($a0,$r0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($r0,&QWPw(0,$rp));
-
-$a=<<'EOF';
-##########################################################
-        &set_label("loop");
-
-        ($a1)=&NR(1); &ld($a1,&QWPw(1,$ap));
-        ($b1)=&NR(1); &ld($b1,&QWPw(1,$bp));
-        ($a2)=&NR(1); &ld($a2,&QWPw(2,$ap));
-        ($b2)=&NR(1); &ld($b2,&QWPw(2,$bp));
-        ($a3)=&NR(1); &ld($a3,&QWPw(3,$ap));
-        ($b3)=&NR(1); &ld($b3,&QWPw(3,$bp));
-
-        ($o0,$t0)=&NR(2);
-        &add($a0,$b0,$o0); 
-        &cmpult($o0,$b0,$t0);
-        &add($o0,$cc,$o0);
-        &cmpult($o0,$cc,$cc);
-        &add($cc,$t0,$cc);      &FR($t0);
-
-        ($t1,$o1)=&NR(2);
-
-        &add($a1,$b1,$o1);      &FR($a1);
-        &cmpult($o1,$b1,$t1);   &FR($b1);
-        &add($o1,$cc,$o1);
-        &cmpult($o1,$cc,$cc);
-        &add($cc,$t1,$cc);      &FR($t1);
-
-        ($t2,$o2)=&NR(2);
-
-        &add($a2,$b2,$o2);      &FR($a2);
-        &cmpult($o2,$b2,$t2);   &FR($b2);
-        &add($o2,$cc,$o2);
-        &cmpult($o2,$cc,$cc);
-        &add($cc,$t2,$cc);      &FR($t2);
-
-        ($t3,$o3)=&NR(2);
-
-        &add($a3,$b3,$o3);      &FR($a3);
-        &cmpult($o3,$b3,$t3);   &FR($b3);
-        &add($o3,$cc,$o3);
-        &cmpult($o3,$cc,$cc);
-        &add($cc,$t3,$cc);      &FR($t3);
-
-        &st($o0,&QWPw(0,$rp)); &FR($o0);
-        &st($o1,&QWPw(0,$rp)); &FR($o1);
-        &st($o2,&QWPw(0,$rp)); &FR($o2);
-        &st($o3,&QWPw(0,$rp)); &FR($o3);
-
-        &sub($count,4,$count);  # count-=4
-        &add($ap,4*$QWS,$ap);   # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-        &add($rp,4*$QWS,$rp);   # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-EOF
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld(($a0)=&NR(1),&QWPw(0,$ap)); # get a
-        &mul($a0,$a0,($l0)=&NR(1));
-         &add($ap,$QWS,$ap);
-         &add($rp,2*$QWS,$rp);
-         &sub($count,1,$count);
-        &muh($a0,$a0,($h0)=&NR(1));     &FR($a0);
-        &st($l0,&QWPw(-2,$rp));         &FR($l0);
-        &st($h0,&QWPw(-1,$rp));         &FR($h0);
-
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/sqr_c4.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/sqr_c4.pl
deleted file mode 100644
index bf33f5b503..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/sqr_c4.pl
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub sqr_add_c
-        {
-        local($a,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$a,($l1)=&NR(1));
-        &muh($a,$a,($h1)=&NR(1));
-        &add($c0,$l1,$c0);
-        &add($c1,$h1,$c1);
-        &cmpult($c0,$l1,($t1)=&NR(1));  &FR($l1);
-        &cmpult($c1,$h1,($t2)=&NR(1));  &FR($h1);
-        &add($c1,$t1,$c1);              &FR($t1);
-        &add($c2,$t2,$c2);              &FR($t2);
-        }
-
-sub sqr_add_c2
-        {
-        local($a,$b,$c0,$c1,$c2)=@_;
-        local($l1,$h1,$t1,$t2);
-
-        &mul($a,$b,($l1)=&NR(1));
-        &muh($a,$b,($h1)=&NR(1));
-        &cmplt($l1,"zero",($lc1)=&NR(1));
-        &cmplt($h1,"zero",($hc1)=&NR(1));
-        &add($l1,$l1,$l1);
-        &add($h1,$h1,$h1);
-        &add($h1,$lc1,$h1);             &FR($lc1);
-        &add($c2,$hc1,$c2);             &FR($hc1);
-
-        &add($c0,$l1,$c0);
-        &add($c1,$h1,$c1);
-        &cmpult($c0,$l1,($lc1)=&NR(1)); &FR($l1);
-        &cmpult($c1,$h1,($hc1)=&NR(1)); &FR($h1);
-
-        &add($c1,$lc1,$c1);             &FR($lc1);
-        &add($c2,$hc1,$c2);             &FR($hc1);
-        }
-
-
-sub bn_sqr_comba4
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(2);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap)); &FR($ap);
-
-        ($c0,$c1,$c2)=&NR(3);
-
-        &mov("zero",$c2);
-        &mul($a[0],$a[0],$c0);
-        &muh($a[0],$a[0],$c1);
-        &st($c0,&QWPw(0,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[0],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[0],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[2],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[3],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));
-        &st($c1,&QWPw(7,$rp));
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/sqr_c8.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/sqr_c8.pl
deleted file mode 100644
index b4afe085f1..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/sqr_c8.pl
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember 
-
-sub bn_sqr_comba8
-        {
-        local($name)=@_;
-        local(@a,@b,$r,$c0,$c1,$c2);
-
-        $cnt=1;
-        &init_pool(2);
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-
-        &function_begin($name,"");
-
-        &comment("");
-
-        &ld(($a[0])=&NR(1),&QWPw(0,$ap));
-        &ld(($a[1])=&NR(1),&QWPw(1,$ap));
-        &ld(($a[2])=&NR(1),&QWPw(2,$ap));
-        &ld(($a[3])=&NR(1),&QWPw(3,$ap));
-        &ld(($a[4])=&NR(1),&QWPw(4,$ap));
-        &ld(($a[5])=&NR(1),&QWPw(5,$ap));
-        &ld(($a[6])=&NR(1),&QWPw(6,$ap));
-        &ld(($a[7])=&NR(1),&QWPw(7,$ap)); &FR($ap);
-
-        ($c0,$c1,$c2)=&NR(3);
-
-        &mov("zero",$c2);
-        &mul($a[0],$a[0],$c0);
-        &muh($a[0],$a[0],$c1);
-        &st($c0,&QWPw(0,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[1],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(1,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[2],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(2,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[2],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(3,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[3],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(4,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[3],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(5,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[4],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(6,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[4],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[1],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[0],$c0,$c1,$c2);
-        &st($c0,&QWPw(7,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[5],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[2],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[1],$c0,$c1,$c2);
-        &st($c0,&QWPw(8,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[5],$a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[3],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[2],$c0,$c1,$c2);
-        &st($c0,&QWPw(9,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[5],$c0,$c1,$c2);
-        &sqr_add_c2($a[6],$a[4],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[3],$c0,$c1,$c2);
-        &st($c0,&QWPw(10,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[6],$a[5],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[4],$c0,$c1,$c2);
-        &st($c0,&QWPw(11,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[6],$c0,$c1,$c2);
-        &sqr_add_c2($a[7],$a[5],$c0,$c1,$c2);
-        &st($c0,&QWPw(12,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c2($a[7],$a[6],$c0,$c1,$c2);
-        &st($c0,&QWPw(13,$rp));
-        ($c0,$c1,$c2)=($c1,$c2,$c0);
-        &mov("zero",$c2);
-
-        &sqr_add_c($a[7],$c0,$c1,$c2);
-        &st($c0,&QWPw(14,$rp));
-        &st($c1,&QWPw(15,$rp));
-
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/alpha/sub.pl b/src/lib/libssl/src/crypto/bn/asm/alpha/sub.pl
deleted file mode 100644
index d998da5c21..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/alpha/sub.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/local/bin/perl
-# alpha assember
-
-sub bn_sub_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        &init_pool(4);
-        ($cc)=GR("r0");
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &blt($count,&label("finish"));
-
-        ($a0,$b0)=&NR(2);
-        &ld($a0,&QWPw(0,$ap));
-        &ld($b0,&QWPw(0,$bp));
-
-##########################################################
-        &set_label("loop");
-
-        ($a1,$tmp,$b1,$a2,$b2,$a3,$b3,$o0)=&NR(8);
-        &ld($a1,&QWPw(1,$ap));
-         &cmpult($a0,$b0,$tmp); # will we borrow?
-        &ld($b1,&QWPw(1,$bp));
-         &sub($a0,$b0,$a0);             # do the subtract
-        &ld($a2,&QWPw(2,$ap));
-         &cmpult($a0,$cc,$b0);  # will we borrow?
-        &ld($b2,&QWPw(2,$bp));
-         &sub($a0,$cc,$o0);     # will we borrow?
-        &ld($a3,&QWPw(3,$ap));
-         &add($b0,$tmp,$cc); ($t1,$o1)=&NR(2); &FR($tmp);
-
-        &cmpult($a1,$b1,$t1);   # will we borrow?
-         &sub($a1,$b1,$a1);     # do the subtract
-        &ld($b3,&QWPw(3,$bp));
-         &cmpult($a1,$cc,$b1);  # will we borrow?
-        &sub($a1,$cc,$o1);      # will we borrow?
-         &add($b1,$t1,$cc); ($tmp,$o2)=&NR(2); &FR($t1,$a1,$b1);
-        
-        &cmpult($a2,$b2,$tmp);  # will we borrow?
-         &sub($a2,$b2,$a2);             # do the subtract
-        &st($o0,&QWPw(0,$rp));  &FR($o0); # save
-         &cmpult($a2,$cc,$b2);  # will we borrow?
-        &sub($a2,$cc,$o2);      # will we borrow?
-         &add($b2,$tmp,$cc); ($t3,$o3)=&NR(2); &FR($tmp,$a2,$b2);
-
-        &cmpult($a3,$b3,$t3);   # will we borrow?
-         &sub($a3,$b3,$a3);     # do the subtract
-        &st($o1,&QWPw(1,$rp)); &FR($o1);
-         &cmpult($a3,$cc,$b3);  # will we borrow?
-        &sub($a3,$cc,$o3);      # will we borrow?
-         &add($b3,$t3,$cc); &FR($t3,$a3,$b3);
-
-        &st($o2,&QWPw(2,$rp));  &FR($o2);
-         &sub($count,4,$count); # count-=4
-        &st($o3,&QWPw(3,$rp));  &FR($o3);
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-         &ld($b0,&QWPw(0,$bp)); # get b
-        &cmpult($a0,$b0,$tmp);  # will we borrow?
-        &sub($a0,$b0,$a0);      # do the subtract
-        &cmpult($a0,$cc,$b0);   # will we borrow?
-        &sub($a0,$cc,$a0);      # will we borrow?
-        &st($a0,&QWPw(0,$rp));  # save
-        &add($b0,$tmp,$cc);     # add the borrows
-
-        &add($ap,$QWS,$ap);
-        &add($bp,$QWS,$bp);
-        &add($rp,$QWS,$rp);
-        &sub($count,1,$count);
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &FR($a0,$b0);
-        &set_label("end");
-        &function_end($name);
-
-        &fin_pool;
-        }
-
-1;
diff --git a/src/lib/libssl/src/crypto/bn/asm/bn-alpha.pl b/src/lib/libssl/src/crypto/bn/asm/bn-alpha.pl
deleted file mode 100644
index 302edf2376..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/bn-alpha.pl
+++ /dev/null
@@ -1,571 +0,0 @@
-#!/usr/local/bin/perl
-# I have this in perl so I can use more usefull register names and then convert
-# them into alpha registers.
-#
-
-$d=&data();
-$d =~ s/CC/0/g;
-$d =~ s/R1/1/g;
-$d =~ s/R2/2/g;
-$d =~ s/R3/3/g;
-$d =~ s/R4/4/g;
-$d =~ s/L1/5/g;
-$d =~ s/L2/6/g;
-$d =~ s/L3/7/g;
-$d =~ s/L4/8/g;
-$d =~ s/O1/22/g;
-$d =~ s/O2/23/g;
-$d =~ s/O3/24/g;
-$d =~ s/O4/25/g;
-$d =~ s/A1/20/g;
-$d =~ s/A2/21/g;
-$d =~ s/A3/27/g;
-$d =~ s/A4/28/g;
-if (0){
-}
-
-print $d;
-
-sub data
-        {
-        local($data)=<<'EOF';
-
- # DEC Alpha assember
- # The bn_div_words is actually gcc output but the other parts are hand done.
- # Thanks to tzeruch@ceddec.com for sending me the gcc output for
- # bn_div_words.
- # I've gone back and re-done most of routines.
- # The key thing to remeber for the 164 CPU is that while a
- # multiply operation takes 8 cycles, another one can only be issued
- # after 4 cycles have elapsed.  I've done modification to help
- # improve this.  Also, normally, a ld instruction will not be available
- # for about 3 cycles.
-        .file   1 "bn_asm.c"
-        .set noat
-gcc2_compiled.:
-__gnu_compiled_c:
-        .text
-        .align 3
-        .globl bn_mul_add_words
-        .ent bn_mul_add_words
-bn_mul_add_words:
-bn_mul_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$CC
-        blt     $18,$43         # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $A1,0($17)      # 1 1
-        ldq     $R1,0($16)      # 1 1
-        .align 3
-$42:
-        mulq    $A1,$19,$L1     # 1 2 1 ######
-        ldq     $A2,8($17)      # 2 1
-        ldq     $R2,8($16)      # 2 1
-        umulh   $A1,$19,$A1     # 1 2   ######
-        ldq     $A3,16($17)     # 3 1
-        ldq     $R3,16($16)     # 3 1
-        mulq    $A2,$19,$L2     # 2 2 1 ######
-         ldq    $A4,24($17)     # 4 1
-        addq    $R1,$L1,$R1     # 1 2 2
-         ldq    $R4,24($16)     # 4 1
-        umulh   $A2,$19,$A2     # 2 2   ######
-         cmpult $R1,$L1,$O1     # 1 2 3 1
-        addq    $A1,$O1,$A1     # 1 3 1
-         addq   $R1,$CC,$R1     # 1 2 3 1
-        mulq    $A3,$19,$L3     # 3 2 1 ######
-         cmpult $R1,$CC,$CC     # 1 2 3 2
-        addq    $R2,$L2,$R2     # 2 2 2
-         addq   $A1,$CC,$CC     # 1 3 2 
-        cmpult  $R2,$L2,$O2     # 2 2 3 1
-         addq   $A2,$O2,$A2     # 2 3 1
-        umulh   $A3,$19,$A3     # 3 2   ######
-         addq   $R2,$CC,$R2     # 2 2 3 1
-        cmpult  $R2,$CC,$CC     # 2 2 3 2
-         subq   $18,4,$18
-        mulq    $A4,$19,$L4     # 4 2 1 ######
-         addq   $A2,$CC,$CC     # 2 3 2 
-        addq    $R3,$L3,$R3     # 3 2 2
-         addq   $16,32,$16
-        cmpult  $R3,$L3,$O3     # 3 2 3 1
-         stq    $R1,-32($16)    # 1 2 4
-        umulh   $A4,$19,$A4     # 4 2   ######
-         addq   $A3,$O3,$A3     # 3 3 1
-        addq    $R3,$CC,$R3     # 3 2 3 1
-         stq    $R2,-24($16)    # 2 2 4
-        cmpult  $R3,$CC,$CC     # 3 2 3 2
-         stq    $R3,-16($16)    # 3 2 4
-        addq    $R4,$L4,$R4     # 4 2 2
-         addq   $A3,$CC,$CC     # 3 3 2 
-        cmpult  $R4,$L4,$O4     # 4 2 3 1
-         addq   $17,32,$17
-        addq    $A4,$O4,$A4     # 4 3 1
-         addq   $R4,$CC,$R4     # 4 2 3 1
-        cmpult  $R4,$CC,$CC     # 4 2 3 2
-         stq    $R4,-8($16)     # 4 2 4
-        addq    $A4,$CC,$CC     # 4 3 2 
-         blt    $18,$43
-
-        ldq     $A1,0($17)      # 1 1
-        ldq     $R1,0($16)      # 1 1
-
-        br      $42
-
-        .align 4
-$45:
-        ldq     $A1,0($17)      # 4 1
-        ldq     $R1,0($16)      # 4 1
-        mulq    $A1,$19,$L1     # 4 2 1
-        subq    $18,1,$18
-        addq    $16,8,$16
-        addq    $17,8,$17
-        umulh   $A1,$19,$A1     # 4 2
-        addq    $R1,$L1,$R1     # 4 2 2
-        cmpult  $R1,$L1,$O1     # 4 2 3 1
-        addq    $A1,$O1,$A1     # 4 3 1
-        addq    $R1,$CC,$R1     # 4 2 3 1
-        cmpult  $R1,$CC,$CC     # 4 2 3 2
-        addq    $A1,$CC,$CC     # 4 3 2 
-        stq     $R1,-8($16)     # 4 2 4
-        bgt     $18,$45
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$43:
-        addq    $18,4,$18
-        bgt     $18,$45         # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_add_words
-        .align 3
-        .globl bn_mul_words
-        .ent bn_mul_words
-bn_mul_words:
-bn_mul_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-        .align 5
-        subq    $18,4,$18
-        bis     $31,$31,$CC
-        blt     $18,$143        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $A1,0($17)      # 1 1
-        .align 3
-$142:
-
-        mulq    $A1,$19,$L1     # 1 2 1 #####
-         ldq    $A2,8($17)      # 2 1
-         ldq    $A3,16($17)     # 3 1
-        umulh   $A1,$19,$A1     # 1 2   #####
-         ldq    $A4,24($17)     # 4 1
-        mulq    $A2,$19,$L2     # 2 2 1 #####
-         addq   $L1,$CC,$L1     # 1 2 3 1
-        subq    $18,4,$18
-         cmpult $L1,$CC,$CC     # 1 2 3 2
-        umulh   $A2,$19,$A2     # 2 2   #####
-         addq   $A1,$CC,$CC     # 1 3 2 
-        addq    $17,32,$17
-         addq   $L2,$CC,$L2     # 2 2 3 1
-        mulq    $A3,$19,$L3     # 3 2 1 #####
-         cmpult $L2,$CC,$CC     # 2 2 3 2
-        addq    $A2,$CC,$CC     # 2 3 2 
-         addq   $16,32,$16
-        umulh   $A3,$19,$A3     # 3 2   #####
-         stq    $L1,-32($16)    # 1 2 4
-        mulq    $A4,$19,$L4     # 4 2 1 #####
-         addq   $L3,$CC,$L3     # 3 2 3 1
-        stq     $L2,-24($16)    # 2 2 4
-         cmpult $L3,$CC,$CC     # 3 2 3 2
-        umulh   $A4,$19,$A4     # 4 2   #####
-         addq   $A3,$CC,$CC     # 3 3 2 
-        stq     $L3,-16($16)    # 3 2 4
-         addq   $L4,$CC,$L4     # 4 2 3 1
-        cmpult  $L4,$CC,$CC     # 4 2 3 2
-
-        addq    $A4,$CC,$CC     # 4 3 2 
-
-        stq     $L4,-8($16)     # 4 2 4
-
-        blt     $18,$143
-
-        ldq     $A1,0($17)      # 1 1
-
-        br      $142
-
-        .align 4
-$145:
-        ldq     $A1,0($17)      # 4 1
-        mulq    $A1,$19,$L1     # 4 2 1
-        subq    $18,1,$18
-        umulh   $A1,$19,$A1     # 4 2
-        addq    $L1,$CC,$L1     # 4 2 3 1
-         addq   $16,8,$16
-        cmpult  $L1,$CC,$CC     # 4 2 3 2
-         addq   $17,8,$17
-        addq    $A1,$CC,$CC     # 4 3 2 
-        stq     $L1,-8($16)     # 4 2 4
-
-        bgt     $18,$145
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$143:
-        addq    $18,4,$18
-        bgt     $18,$145        # goto tail code
-        ret     $31,($26),1     # else exit
-
-        .end bn_mul_words
-        .align 3
-        .globl bn_sqr_words
-        .ent bn_sqr_words
-bn_sqr_words:
-bn_sqr_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $18,4,$18
-        blt     $18,$543        # if we are -1, -2, -3 or -4 goto tail code
-        ldq     $A1,0($17)      # 1 1
-        .align 3
-$542:
-        mulq    $A1,$A1,$L1             ######
-         ldq    $A2,8($17)      # 1 1
-        subq    $18,4
-        umulh   $A1,$A1,$R1             ######
-        ldq     $A3,16($17)     # 1 1
-        mulq    $A2,$A2,$L2             ######
-        ldq     $A4,24($17)     # 1 1
-        stq     $L1,0($16)      # r[0]
-        umulh   $A2,$A2,$R2             ######
-        stq     $R1,8($16)      # r[1]
-        mulq    $A3,$A3,$L3             ######
-        stq     $L2,16($16)     # r[0]
-        umulh   $A3,$A3,$R3             ######
-        stq     $R2,24($16)     # r[1]
-        mulq    $A4,$A4,$L4             ######
-        stq     $L3,32($16)     # r[0]
-        umulh   $A4,$A4,$R4             ######
-        stq     $R3,40($16)     # r[1]
-
-        addq    $16,64,$16
-        addq    $17,32,$17
-        stq     $L4,-16($16)    # r[0]
-        stq     $R4,-8($16)     # r[1]
-
-        blt     $18,$543
-        ldq     $A1,0($17)      # 1 1
-        br      $542
-
-$442:
-        ldq     $A1,0($17)   # a[0]
-        mulq    $A1,$A1,$L1  # a[0]*w low part       r2
-        addq    $16,16,$16
-        addq    $17,8,$17
-        subq    $18,1,$18
-        umulh   $A1,$A1,$R1  # a[0]*w high part       r3
-        stq     $L1,-16($16)   # r[0]
-        stq     $R1,-8($16)   # r[1]
-
-        bgt     $18,$442
-        ret     $31,($26),1     # else exit
-
-        .align 4
-$543:
-        addq    $18,4,$18
-        bgt     $18,$442        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_sqr_words
-
-        .align 3
-        .globl bn_add_words
-        .ent bn_add_words
-bn_add_words:
-bn_add_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,4,$19
-        bis     $31,$31,$CC     # carry = 0
-        blt     $19,$900
-        ldq     $L1,0($17)      # a[0]
-        ldq     $R1,0($18)      # b[1]
-        .align 3
-$901:
-        addq    $R1,$L1,$R1     # r=a+b;
-         ldq    $L2,8($17)      # a[1]
-        cmpult  $R1,$L1,$O1     # did we overflow?
-         ldq    $R2,8($18)      # b[1]
-        addq    $R1,$CC,$R1     # c+= overflow
-         ldq    $L3,16($17)     # a[2]
-        cmpult  $R1,$CC,$CC     # overflow?
-         ldq    $R3,16($18)     # b[2]
-        addq    $CC,$O1,$CC
-         ldq    $L4,24($17)     # a[3]
-        addq    $R2,$L2,$R2     # r=a+b;
-         ldq    $R4,24($18)     # b[3]
-        cmpult  $R2,$L2,$O2     # did we overflow?
-         addq   $R3,$L3,$R3     # r=a+b;
-        addq    $R2,$CC,$R2     # c+= overflow
-         cmpult $R3,$L3,$O3     # did we overflow?
-        cmpult  $R2,$CC,$CC     # overflow?
-         addq   $R4,$L4,$R4     # r=a+b;
-        addq    $CC,$O2,$CC
-         cmpult $R4,$L4,$O4     # did we overflow?
-        addq    $R3,$CC,$R3     # c+= overflow
-         stq    $R1,0($16)      # r[0]=c
-        cmpult  $R3,$CC,$CC     # overflow?
-         stq    $R2,8($16)      # r[1]=c
-        addq    $CC,$O3,$CC
-         stq    $R3,16($16)     # r[2]=c
-        addq    $R4,$CC,$R4     # c+= overflow
-         subq   $19,4,$19       # loop--
-        cmpult  $R4,$CC,$CC     # overflow?
-         addq   $17,32,$17      # a++
-        addq    $CC,$O4,$CC
-         stq    $R4,24($16)     # r[3]=c
-        addq    $18,32,$18      # b++
-         addq   $16,32,$16      # r++
-
-        blt     $19,$900
-         ldq    $L1,0($17)      # a[0]
-        ldq     $R1,0($18)      # b[1]
-         br     $901
-        .align 4
-$945:
-        ldq     $L1,0($17)      # a[0]
-         ldq    $R1,0($18)      # b[1]
-        addq    $R1,$L1,$R1     # r=a+b;
-         subq   $19,1,$19       # loop--
-        addq    $R1,$CC,$R1     # c+= overflow
-         addq   $17,8,$17       # a++
-        cmpult  $R1,$L1,$O1     # did we overflow?
-         cmpult $R1,$CC,$CC     # overflow?
-        addq    $18,8,$18       # b++
-         stq    $R1,0($16)      # r[0]=c
-        addq    $CC,$O1,$CC
-         addq   $16,8,$16       # r++
-
-        bgt     $19,$945
-        ret     $31,($26),1     # else exit
-
-$900:
-        addq    $19,4,$19
-        bgt     $19,$945        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_add_words
-
-        .align 3
-        .globl bn_sub_words
-        .ent bn_sub_words
-bn_sub_words:
-bn_sub_words..ng:
-        .frame $30,0,$26,0
-        .prologue 0
-
-        subq    $19,4,$19
-        bis     $31,$31,$CC     # carry = 0
- br     $800
-        blt     $19,$800
-        ldq     $L1,0($17)      # a[0]
-        ldq     $R1,0($18)      # b[1]
-        .align 3
-$801:
-        addq    $R1,$L1,$R1     # r=a+b;
-         ldq    $L2,8($17)      # a[1]
-        cmpult  $R1,$L1,$O1     # did we overflow?
-         ldq    $R2,8($18)      # b[1]
-        addq    $R1,$CC,$R1     # c+= overflow
-         ldq    $L3,16($17)     # a[2]
-        cmpult  $R1,$CC,$CC     # overflow?
-         ldq    $R3,16($18)     # b[2]
-        addq    $CC,$O1,$CC
-         ldq    $L4,24($17)     # a[3]
-        addq    $R2,$L2,$R2     # r=a+b;
-         ldq    $R4,24($18)     # b[3]
-        cmpult  $R2,$L2,$O2     # did we overflow?
-         addq   $R3,$L3,$R3     # r=a+b;
-        addq    $R2,$CC,$R2     # c+= overflow
-         cmpult $R3,$L3,$O3     # did we overflow?
-        cmpult  $R2,$CC,$CC     # overflow?
-         addq   $R4,$L4,$R4     # r=a+b;
-        addq    $CC,$O2,$CC
-         cmpult $R4,$L4,$O4     # did we overflow?
-        addq    $R3,$CC,$R3     # c+= overflow
-         stq    $R1,0($16)      # r[0]=c
-        cmpult  $R3,$CC,$CC     # overflow?
-         stq    $R2,8($16)      # r[1]=c
-        addq    $CC,$O3,$CC
-         stq    $R3,16($16)     # r[2]=c
-        addq    $R4,$CC,$R4     # c+= overflow
-         subq   $19,4,$19       # loop--
-        cmpult  $R4,$CC,$CC     # overflow?
-         addq   $17,32,$17      # a++
-        addq    $CC,$O4,$CC
-         stq    $R4,24($16)     # r[3]=c
-        addq    $18,32,$18      # b++
-         addq   $16,32,$16      # r++
-
-        blt     $19,$800
-         ldq    $L1,0($17)      # a[0]
-        ldq     $R1,0($18)      # b[1]
-         br     $801
-        .align 4
-$845:
-        ldq     $L1,0($17)      # a[0]
-         ldq    $R1,0($18)      # b[1]
-        cmpult  $L1,$R1,$O1     # will we borrow?
-         subq   $L1,$R1,$R1     # r=a-b;
-        subq    $19,1,$19       # loop--
-         cmpult  $R1,$CC,$O2    # will we borrow?
-        subq    $R1,$CC,$R1     # c+= overflow
-         addq   $17,8,$17       # a++
-        addq    $18,8,$18       # b++
-         stq    $R1,0($16)      # r[0]=c
-        addq    $O2,$O1,$CC
-         addq   $16,8,$16       # r++
-
-        bgt     $19,$845
-        ret     $31,($26),1     # else exit
-
-$800:
-        addq    $19,4,$19
-        bgt     $19,$845        # goto tail code
-        ret     $31,($26),1     # else exit
-        .end bn_sub_words
-
- #
- # What follows was taken directly from the C compiler with a few
- # hacks to redo the lables.
- #
-.text
-        .align 3
-        .globl bn_div_words
-        .ent bn_div_words
-bn_div_words:
-        ldgp $29,0($27)
-bn_div_words..ng:
-        lda $30,-48($30)
-        .frame $30,48,$26,0
-        stq $26,0($30)
-        stq $9,8($30)
-        stq $10,16($30)
-        stq $11,24($30)
-        stq $12,32($30)
-        stq $13,40($30)
-        .mask 0x4003e00,-48
-        .prologue 1
-        bis $16,$16,$9
-        bis $17,$17,$10
-        bis $18,$18,$11
-        bis $31,$31,$13
-        bis $31,2,$12
-        bne $11,$119
-        lda $0,-1
-        br $31,$136
-        .align 4
-$119:
-        bis $11,$11,$16
-        jsr $26,BN_num_bits_word
-        ldgp $29,0($26)
-        subq $0,64,$1
-        beq $1,$120
-        bis $31,1,$1
-        sll $1,$0,$1
-        cmpule $9,$1,$1
-        bne $1,$120
- #      lda $16,_IO_stderr_
- #      lda $17,$C32
- #      bis $0,$0,$18
- #      jsr $26,fprintf
- #      ldgp $29,0($26)
-        jsr $26,abort
-        ldgp $29,0($26)
-        .align 4
-$120:
-        bis $31,64,$3
-        cmpult $9,$11,$2
-        subq $3,$0,$1
-        addl $1,$31,$0
-        subq $9,$11,$1
-        cmoveq $2,$1,$9
-        beq $0,$122
-        zapnot $0,15,$2
-        subq $3,$0,$1
-        sll $11,$2,$11
-        sll $9,$2,$3
-        srl $10,$1,$1
-        sll $10,$2,$10
-        bis $3,$1,$9
-$122:
-        srl $11,32,$5
-        zapnot $11,15,$6
-        lda $7,-1
-        .align 5
-$123:
-        srl $9,32,$1
-        subq $1,$5,$1
-        bne $1,$126
-        zapnot $7,15,$27
-        br $31,$127
-        .align 4
-$126:
-        bis $9,$9,$24
-        bis $5,$5,$25
-        divqu $24,$25,$27
-$127:
-        srl $10,32,$4
-        .align 5
-$128:
-        mulq $27,$5,$1
-        subq $9,$1,$3
-        zapnot $3,240,$1
-        bne $1,$129
-        mulq $6,$27,$2
-        sll $3,32,$1
-        addq $1,$4,$1
-        cmpule $2,$1,$2
-        bne $2,$129
-        subq $27,1,$27
-        br $31,$128
-        .align 4
-$129:
-        mulq $27,$6,$1
-        mulq $27,$5,$4
-        srl $1,32,$3
-        sll $1,32,$1
-        addq $4,$3,$4
-        cmpult $10,$1,$2
-        subq $10,$1,$10
-        addq $2,$4,$2
-        cmpult $9,$2,$1
-        bis $2,$2,$4
-        beq $1,$134
-        addq $9,$11,$9
-        subq $27,1,$27
-$134:
-        subl $12,1,$12
-        subq $9,$4,$9
-        beq $12,$124
-        sll $27,32,$13
-        sll $9,32,$2
-        srl $10,32,$1
-        sll $10,32,$10
-        bis $2,$1,$9
-        br $31,$123
-        .align 4
-$124:
-        bis $13,$27,$0
-$136:
-        ldq $26,0($30)
-        ldq $9,8($30)
-        ldq $10,16($30)
-        ldq $11,24($30)
-        ldq $12,32($30)
-        ldq $13,40($30)
-        addq $30,48,$30
-        ret $31,($26),1
-        .end bn_div_words
-EOF
-        return($data);
-        }
-
diff --git a/src/lib/libssl/src/crypto/bn/asm/ca.pl b/src/lib/libssl/src/crypto/bn/asm/ca.pl
deleted file mode 100644
index c1ce67a6b4..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/ca.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/local/bin/perl
-# I have this in perl so I can use more usefull register names and then convert
-# them into alpha registers.
-#
-
-push(@INC,"perlasm","../../perlasm");
-require "alpha.pl";
-require "alpha/mul_add.pl";
-require "alpha/mul.pl";
-require "alpha/sqr.pl";
-require "alpha/add.pl";
-require "alpha/sub.pl";
-require "alpha/mul_c8.pl";
-require "alpha/mul_c4.pl";
-require "alpha/sqr_c4.pl";
-require "alpha/sqr_c8.pl";
-require "alpha/div.pl";
-
-&asm_init($ARGV[0],$0);
-
-&bn_mul_words("bn_mul_words");
-&bn_sqr_words("bn_sqr_words");
-&bn_mul_add_words("bn_mul_add_words");
-&bn_add_words("bn_add_words");
-&bn_sub_words("bn_sub_words");
-&bn_div_words("bn_div_words");
-&bn_mul_comba8("bn_mul_comba8");
-&bn_mul_comba4("bn_mul_comba4");
-&bn_sqr_comba4("bn_sqr_comba4");
-&bn_sqr_comba8("bn_sqr_comba8");
-
-&asm_finish();
-
diff --git a/src/lib/libssl/src/crypto/bn/asm/co-alpha.pl b/src/lib/libssl/src/crypto/bn/asm/co-alpha.pl
deleted file mode 100644
index 67dad3e3d5..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/co-alpha.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/local/bin/perl
-# I have this in perl so I can use more usefull register names and then convert
-# them into alpha registers.
-#
-
-push(@INC,"perlasm","../../perlasm");
-require "alpha.pl";
-
-&asm_init($ARGV[0],$0);
-
-print &bn_sub_words("bn_sub_words");
-
-&asm_finish();
-
-sub bn_sub_words
-        {
-        local($name)=@_;
-        local($cc,$a,$b,$r);
-
-        $cc="r0";
-        $a0="r1"; $b0="r5"; $r0="r9";  $tmp="r13";
-        $a1="r2"; $b1="r6"; $r1="r10"; $t1="r14";
-        $a2="r3"; $b2="r7"; $r2="r11";
-        $a3="r4"; $b3="r8"; $r3="r12"; $t3="r15";
-
-        $rp=&wparam(0);
-        $ap=&wparam(1);
-        $bp=&wparam(2);
-        $count=&wparam(3);
-
-        &function_begin($name,"");
-
-        &comment("");
-        &sub($count,4,$count);
-        &mov("zero",$cc);
-        &blt($count,&label("finish"));
-
-        &ld($a0,&QWPw(0,$ap));
-        &ld($b0,&QWPw(0,$bp));
-
-##########################################################
-        &set_label("loop");
-
-        &ld($a1,&QWPw(1,$ap));
-         &cmpult($a0,$b0,$tmp); # will we borrow?
-        &ld($b1,&QWPw(1,$bp));
-         &sub($a0,$b0,$a0);             # do the subtract
-        &ld($a2,&QWPw(2,$ap));
-         &cmpult($a0,$cc,$b0);  # will we borrow?
-        &ld($b2,&QWPw(2,$bp));
-         &sub($a0,$cc,$a0);     # will we borrow?
-        &ld($a3,&QWPw(3,$ap));
-         &add($b0,$tmp,$cc);    # add the borrows
-
-        &cmpult($a1,$b1,$t1);   # will we borrow?
-         &sub($a1,$b1,$a1);     # do the subtract
-        &ld($b3,&QWPw(3,$bp));
-         &cmpult($a1,$cc,$b1);  # will we borrow?
-        &sub($a1,$cc,$a1);      # will we borrow?
-         &add($b1,$t1,$cc);     # add the borrows
-
-        &cmpult($a2,$b2,$tmp);  # will we borrow?
-         &sub($a2,$b2,$a2);             # do the subtract
-        &st($a0,&QWPw(0,$rp));  # save
-         &cmpult($a2,$cc,$b2);  # will we borrow?
-        &sub($a2,$cc,$a2);      # will we borrow?
-         &add($b2,$tmp,$cc);    # add the borrows
-
-        &cmpult($a3,$b3,$t3);   # will we borrow?
-         &sub($a3,$b3,$a3);             # do the subtract
-        &st($a1,&QWPw(1,$rp));  # save
-         &cmpult($a3,$cc,$b3);  # will we borrow?
-        &sub($a3,$cc,$a3);      # will we borrow?
-         &add($b3,$t3,$cc);     # add the borrows
-
-        &st($a2,&QWPw(2,$rp));  # save
-         &sub($count,4,$count); # count-=4
-        &st($a3,&QWPw(3,$rp));  # save
-         &add($ap,4*$QWS,$ap);  # count+=4
-        &add($bp,4*$QWS,$bp);   # count+=4
-         &add($rp,4*$QWS,$rp);  # count+=4
-
-        &blt($count,&label("finish"));
-        &ld($a0,&QWPw(0,$ap));
-         &ld($b0,&QWPw(0,$bp));
-        &br(&label("loop"));
-##################################################
-        # Do the last 0..3 words
-
-        &set_label("last_loop");
-
-        &ld($a0,&QWPw(0,$ap));  # get a
-         &ld($b0,&QWPw(0,$bp)); # get b
-        &cmpult($a0,$b0,$tmp);  # will we borrow?
-        &sub($a0,$b0,$a0);      # do the subtract
-        &cmpult($a0,$cc,$b0);   # will we borrow?
-        &sub($a0,$cc,$a0);      # will we borrow?
-        &st($a0,&QWPw(0,$rp));  # save
-        &add($b0,$tmp,$cc);     # add the borrows
-
-        &add($ap,$QWS,$ap);
-        &add($bp,$QWS,$bp);
-        &add($rp,$QWS,$rp);
-        &sub($count,1,$count);
-        &bgt($count,&label("last_loop"));
-        &function_end_A($name);
-
-######################################################
-        &set_label("finish");
-        &add($count,4,$count);
-        &bgt($count,&label("last_loop"));
-
-        &set_label("end");
-        &function_end($name);
-        }
-
diff --git a/src/lib/libssl/src/crypto/bn/asm/mips1.s b/src/lib/libssl/src/crypto/bn/asm/mips1.s
deleted file mode 100644
index 44fa1254c7..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/mips1.s
+++ /dev/null
@@ -1,539 +0,0 @@
-/* This assember is for R2000/R3000 machines, or higher ones that do
- * no want to do any 64 bit arithmatic.
- * Make sure that the SSLeay bignum library is compiled with 
- * THIRTY_TWO_BIT set.
- * This must either be compiled with the system CC, or, if you use GNU gas,
- * cc -E mips1.s|gas -o mips1.o
- */
-        .set    reorder
-        .set    noat
-
-#define R1      $1
-#define CC      $2
-#define R2      $3
-#define R3      $8
-#define R4      $9
-#define L1      $10
-#define L2      $11
-#define L3      $12
-#define L4      $13
-#define H1      $14
-#define H2      $15
-#define H3      $24
-#define H4      $25
-
-#define P1      $4
-#define P2      $5
-#define P3      $6
-#define P4      $7
-
-        .align  2
-        .ent    bn_mul_add_words
-        .globl  bn_mul_add_words
-.text
-bn_mul_add_words:
-        .frame  $sp,0,$31
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-
-        #blt    P3,4,$lab34
-        
-        subu    R1,P3,4
-        move    CC,$0
-        bltz    R1,$lab34
-$lab2:  
-        lw      R1,0(P1)
-         lw     L1,0(P2)
-        lw      R2,4(P1)
-         lw     L2,4(P2)
-        lw      R3,8(P1)
-         lw     L3,8(P2)
-        lw      R4,12(P1)
-         lw     L4,12(P2)
-        multu   L1,P4
-         addu   R1,R1,CC
-        mflo    L1
-         sltu   CC,R1,CC
-        addu    R1,R1,L1
-         mfhi   H1
-        sltu    L1,R1,L1
-         sw     R1,0(P1)
-        addu    CC,CC,L1
-         multu  L2,P4
-        addu    CC,H1,CC
-        mflo    L2
-         addu   R2,R2,CC
-        sltu    CC,R2,CC
-         mfhi   H2
-        addu    R2,R2,L2
-         addu   P2,P2,16
-        sltu    L2,R2,L2
-         sw     R2,4(P1)
-        addu    CC,CC,L2
-         multu  L3,P4
-        addu    CC,H2,CC
-        mflo    L3
-         addu   R3,R3,CC
-        sltu    CC,R3,CC
-         mfhi   H3
-        addu    R3,R3,L3
-         addu   P1,P1,16
-        sltu    L3,R3,L3
-         sw     R3,-8(P1)
-        addu    CC,CC,L3
-         multu  L4,P4
-        addu    CC,H3,CC
-        mflo    L4
-         addu   R4,R4,CC
-        sltu    CC,R4,CC
-         mfhi   H4
-        addu    R4,R4,L4
-         subu   P3,P3,4
-        sltu    L4,R4,L4
-        addu    CC,CC,L4
-        addu    CC,H4,CC
-
-        subu    R1,P3,4
-        sw      R4,-4(P1)       # delay slot
-        bgez    R1,$lab2
-
-        bleu    P3,0,$lab3
-        .align  2
-$lab33: 
-        lw      L1,0(P2)
-         lw     R1,0(P1)
-        multu   L1,P4
-         addu   R1,R1,CC
-        sltu    CC,R1,CC
-         addu   P1,P1,4
-        mflo    L1
-         mfhi   H1
-        addu    R1,R1,L1
-         addu   P2,P2,4
-        sltu    L1,R1,L1
-         subu   P3,P3,1
-        addu    CC,CC,L1
-         sw     R1,-4(P1)
-        addu    CC,H1,CC
-         bgtz   P3,$lab33
-        j       $31
-        .align  2
-$lab3:
-        j       $31
-        .align  2
-$lab34:
-        bgt     P3,0,$lab33
-        j       $31
-        .end    bn_mul_add_words
-
-        .align  2
-        # Program Unit: bn_mul_words
-        .ent    bn_mul_words
-        .globl  bn_mul_words
-.text
-bn_mul_words:
-        .frame  $sp,0,$31
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        
-        subu    P3,P3,4
-        move    CC,$0
-        bltz    P3,$lab45
-$lab44: 
-        lw      L1,0(P2)
-         lw     L2,4(P2)
-        lw      L3,8(P2)
-         lw     L4,12(P2)
-        multu   L1,P4
-         subu   P3,P3,4
-        mflo    L1
-         mfhi   H1
-        addu    L1,L1,CC
-         multu  L2,P4
-        sltu    CC,L1,CC
-         sw     L1,0(P1)
-        addu    CC,H1,CC
-         mflo   L2
-        mfhi    H2
-         addu   L2,L2,CC
-        multu   L3,P4
-         sltu   CC,L2,CC
-        sw      L2,4(P1)
-         addu   CC,H2,CC
-        mflo    L3
-         mfhi   H3
-        addu    L3,L3,CC
-         multu  L4,P4
-        sltu    CC,L3,CC
-         sw     L3,8(P1)
-        addu    CC,H3,CC
-         mflo   L4
-        mfhi    H4
-         addu   L4,L4,CC
-        addu    P1,P1,16
-         sltu   CC,L4,CC
-        addu    P2,P2,16
-         addu   CC,H4,CC
-        sw      L4,-4(P1)
-
-        bgez    P3,$lab44
-        b       $lab45
-$lab46:
-        lw      L1,0(P2)
-         addu   P1,P1,4
-        multu   L1,P4
-         addu   P2,P2,4
-        mflo    L1
-         mfhi   H1
-        addu    L1,L1,CC
-         subu   P3,P3,1
-        sltu    CC,L1,CC
-         sw     L1,-4(P1)
-        addu    CC,H1,CC
-         bgtz   P3,$lab46
-        j       $31
-$lab45:
-        addu    P3,P3,4
-        bgtz    P3,$lab46
-        j       $31
-        .align  2
-        .end    bn_mul_words
-
-        # Program Unit: bn_sqr_words
-        .ent    bn_sqr_words
-        .globl  bn_sqr_words
-.text
-bn_sqr_words:
-        .frame  $sp,0,$31
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        
-        subu    P3,P3,4
-        bltz    P3,$lab55
-$lab54:
-        lw      L1,0(P2)
-         lw     L2,4(P2)
-        lw      L3,8(P2)
-         lw     L4,12(P2)
-
-        multu   L1,L1
-         subu   P3,P3,4
-        mflo    L1
-         mfhi   H1
-        sw      L1,0(P1)
-         sw     H1,4(P1)
-
-        multu   L2,L2
-         addu   P1,P1,32
-        mflo    L2
-         mfhi   H2
-        sw      L2,-24(P1)
-         sw     H2,-20(P1)
-
-        multu   L3,L3
-         addu   P2,P2,16
-        mflo    L3
-         mfhi   H3
-        sw      L3,-16(P1)
-         sw     H3,-12(P1)
-
-        multu   L4,L4
-
-        mflo    L4
-         mfhi   H4
-        sw      L4,-8(P1)
-         sw     H4,-4(P1)
-
-        bgtz    P3,$lab54
-        b       $lab55
-$lab56: 
-        lw      L1,0(P2)
-        addu    P1,P1,8
-        multu   L1,L1
-        addu    P2,P2,4
-        subu    P3,P3,1
-        mflo    L1
-        mfhi    H1
-        sw      L1,-8(P1)
-        sw      H1,-4(P1)
-
-        bgtz    P3,$lab56
-        j       $31
-$lab55:
-        addu    P3,P3,4
-        bgtz    P3,$lab56
-        j       $31
-        .align  2
-        .end    bn_sqr_words
-
-        # Program Unit: bn_add_words
-        .ent    bn_add_words
-        .globl  bn_add_words
-.text
-bn_add_words:    # 0x590
-        .frame  $sp,0,$31
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        
-        subu    P4,P4,4
-        move    CC,$0
-        bltz    P4,$lab65
-$lab64: 
-        lw      L1,0(P2)
-        lw      R1,0(P3)
-        lw      L2,4(P2)
-        lw      R2,4(P3)
-
-        addu    L1,L1,CC
-         lw     L3,8(P2)
-        sltu    CC,L1,CC
-         addu   L1,L1,R1
-        sltu    R1,L1,R1
-         lw     R3,8(P3)
-        addu    CC,CC,R1
-         lw     L4,12(P2)
-
-        addu    L2,L2,CC
-         lw     R4,12(P3)
-        sltu    CC,L2,CC
-         addu   L2,L2,R2
-        sltu    R2,L2,R2
-         sw     L1,0(P1)
-        addu    CC,CC,R2
-         addu   P1,P1,16
-        addu    L3,L3,CC
-         sw     L2,-12(P1)
- 
-        sltu    CC,L3,CC
-         addu   L3,L3,R3
-        sltu    R3,L3,R3
-         addu   P2,P2,16
-        addu    CC,CC,R3
-
-        addu    L4,L4,CC
-         addu   P3,P3,16
-        sltu    CC,L4,CC
-         addu   L4,L4,R4
-        subu    P4,P4,4
-         sltu   R4,L4,R4
-        sw      L3,-8(P1)
-         addu   CC,CC,R4
-        sw      L4,-4(P1)
-
-        bgtz    P4,$lab64
-        b       $lab65
-$lab66:
-        lw      L1,0(P2)
-         lw     R1,0(P3)
-        addu    L1,L1,CC
-         addu   P1,P1,4
-        sltu    CC,L1,CC
-         addu   P2,P2,4
-        addu    P3,P3,4
-         addu   L1,L1,R1
-        subu    P4,P4,1
-         sltu   R1,L1,R1
-        sw      L1,-4(P1)
-         addu   CC,CC,R1
-
-        bgtz    P4,$lab66
-        j       $31
-$lab65:
-        addu    P4,P4,4
-        bgtz    P4,$lab66
-        j       $31
-        .end    bn_add_words
-
-        # Program Unit: bn_div64
-        .set    at
-        .set    reorder
-        .text   
-        .align  2
-        .globl  bn_div64
- # 321          {
-        .ent    bn_div64 2
-bn_div64:
-        subu    $sp, 64
-        sw      $31, 56($sp)
-        sw      $16, 48($sp)
-        .mask   0x80010000, -56
-        .frame  $sp, 64, $31
-        move    $9, $4
-        move    $12, $5
-        move    $16, $6
- # 322          BN_ULONG dh,dl,q,ret=0,th,tl,t;
-        move    $31, $0
- # 323          int i,count=2;
-        li      $13, 2
- # 324  
- # 325          if (d == 0) return(BN_MASK2);
-        bne     $16, 0, $80
-        li      $2, -1
-        b       $93
-$80:
- # 326  
- # 327          i=BN_num_bits_word(d);
-        move    $4, $16
-        sw      $31, 16($sp)
-        sw      $9, 24($sp)
-        sw      $12, 32($sp)
-        sw      $13, 40($sp)
-        .livereg        0x800ff0e,0xfff
-        jal     BN_num_bits_word
-        li      $4, 32
-        lw      $31, 16($sp)
-        lw      $9, 24($sp)
-        lw      $12, 32($sp)
-        lw      $13, 40($sp)
-        move    $3, $2
- # 328          if ((i != BN_BITS2) && (h > (BN_ULONG)1<<i))
-        beq     $2, $4, $81
-        li      $14, 1
-        sll     $15, $14, $2
-        bleu    $9, $15, $81
- # 329                  {
- # 330  #if !defined(NO_STDIO) && !defined(WIN16)
- # 331                  fprintf(stderr,"Division would overflow (%d)\n",i);
- # 332  #endif
- # 333                  abort();
-        sw      $3, 8($sp)
-        sw      $9, 24($sp)
-        sw      $12, 32($sp)
-        sw      $13, 40($sp)
-        sw      $31, 26($sp)
-        .livereg        0xff0e,0xfff
-        jal     abort
-        lw      $3, 8($sp)
-        li      $4, 32
-        lw      $9, 24($sp)
-        lw      $12, 32($sp)
-        lw      $13, 40($sp)
-        lw      $31, 26($sp)
- # 334                  }
-$81:
- # 335          i=BN_BITS2-i;
-        subu    $3, $4, $3
- # 336          if (h >= d) h-=d;
-        bltu    $9, $16, $82
-        subu    $9, $9, $16
-$82:
- # 337  
- # 338          if (i)
-        beq     $3, 0, $83
- # 339                  {
- # 340                  d<<=i;
-        sll     $16, $16, $3
- # 341                  h=(h<<i)|(l>>(BN_BITS2-i));
-        sll     $24, $9, $3
-        subu    $25, $4, $3
-        srl     $14, $12, $25
-        or      $9, $24, $14
- # 342                  l<<=i;
-        sll     $12, $12, $3
- # 343                  }
-$83:
- # 344          dh=(d&BN_MASK2h)>>BN_BITS4;
- # 345          dl=(d&BN_MASK2l);
-        and     $8, $16, -65536
-        srl     $8, $8, 16
-        and     $10, $16, 65535
-        li      $6, -65536
-$84:
- # 346          for (;;)
- # 347                  {
- # 348                  if ((h>>BN_BITS4) == dh)
-        srl     $15, $9, 16
-        bne     $8, $15, $85
- # 349                          q=BN_MASK2l;
-        li      $5, 65535
-        b       $86
-$85:
- # 350                  else
- # 351                          q=h/dh;
-        divu    $5, $9, $8
-$86:
- # 352  
- # 353                  for (;;)
- # 354                          {
- # 355                          t=(h-q*dh);
-        mul     $4, $5, $8
-        subu    $2, $9, $4
-        move    $3, $2
- # 356                          if ((t&BN_MASK2h) ||
- # 357                                  ((dl*q) <= (
- # 358                                          (t<<BN_BITS4)+
- # 359                                          ((l&BN_MASK2h)>>BN_BITS4))))
-        and     $25, $2, $6
-        bne     $25, $0, $87
-        mul     $24, $10, $5
-        sll     $14, $3, 16
-        and     $15, $12, $6
-        srl     $25, $15, 16
-        addu    $15, $14, $25
-        bgtu    $24, $15, $88
-$87:
- # 360                                  break;
-        mul     $3, $10, $5
-        b       $89
-$88:
- # 361                          q--;
-        addu    $5, $5, -1
- # 362                          }
-        b       $86
-$89:
- # 363                  th=q*dh;
- # 364                  tl=q*dl;
- # 365                  t=(tl>>BN_BITS4);
- # 366                  tl=(tl<<BN_BITS4)&BN_MASK2h;
-        sll     $14, $3, 16
-        and     $2, $14, $6
-        move    $11, $2
- # 367                  th+=t;
-        srl     $25, $3, 16
-        addu    $7, $4, $25
- # 368  
- # 369                  if (l < tl) th++;
-        bgeu    $12, $2, $90
-        addu    $7, $7, 1
-$90:
- # 370                  l-=tl;
-        subu    $12, $12, $11
- # 371                  if (h < th)
-        bgeu    $9, $7, $91
- # 372                          {
- # 373                          h+=d;
-        addu    $9, $9, $16
- # 374                          q--;
-        addu    $5, $5, -1
- # 375                          }
-$91:
- # 376                  h-=th;
-        subu    $9, $9, $7
- # 377  
- # 378                  if (--count == 0) break;
-        addu    $13, $13, -1
-        beq     $13, 0, $92
- # 379  
- # 380                  ret=q<<BN_BITS4;
-        sll     $31, $5, 16
- # 381                  h=((h<<BN_BITS4)|(l>>BN_BITS4))&BN_MASK2;
-        sll     $24, $9, 16
-        srl     $15, $12, 16
-        or      $9, $24, $15
- # 382                  l=(l&BN_MASK2l)<<BN_BITS4;
-        and     $12, $12, 65535
-        sll     $12, $12, 16
- # 383                  }
-        b       $84
-$92:
- # 384          ret|=q;
-        or      $31, $31, $5
- # 385          return(ret);
-        move    $2, $31
-$93:
-        lw      $16, 48($sp)
-        lw      $31, 56($sp)
-        addu    $sp, 64
-        j       $31
-        .end    bn_div64
-
diff --git a/src/lib/libssl/src/crypto/bn/asm/pa-risc.s b/src/lib/libssl/src/crypto/bn/asm/pa-risc.s
deleted file mode 100644
index 775130a191..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/pa-risc.s
+++ /dev/null
@@ -1,710 +0,0 @@
-        .SPACE $PRIVATE$
-        .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
-        .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82
-        .SPACE $TEXT$
-        .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44
-        .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY
-        .IMPORT $global$,DATA
-        .IMPORT $$dyncall,MILLICODE
-; gcc_compiled.:
-        .SPACE $TEXT$
-        .SUBSPA $CODE$
-
-        .align 4
-        .EXPORT bn_mul_add_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR
-bn_mul_add_words
-        .PROC
-        .CALLINFO FRAME=0,CALLS,SAVE_RP
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        ldi 0,%r28
-        extru %r23,31,16,%r2
-        stw %r2,-16(0,%r30)
-        extru %r23,15,16,%r23
-        ldil L'65536,%r31
-        fldws -16(0,%r30),%fr11R
-        stw %r23,-16(0,%r30)
-        ldo 12(%r25),%r29
-        ldo 12(%r26),%r23
-        fldws -16(0,%r30),%fr11L
-L$0002
-        ldw 0(0,%r25),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0005
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi 1,%r19,%r19
-        ldw 0(0,%r26),%r28
-        addl %r20,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0003
-        stw %r20,0(0,%r26)
-        ldw -8(0,%r29),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0010
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi 1,%r19,%r19
-        ldw -8(0,%r23),%r28
-        addl %r20,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0003
-        stw %r20,-8(0,%r23)
-        ldw -4(0,%r29),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0015
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi 1,%r19,%r19
-        ldw -4(0,%r23),%r28
-        addl %r20,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0003
-        stw %r20,-4(0,%r23)
-        ldw 0(0,%r29),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0020
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi 1,%r19,%r19
-        ldw 0(0,%r23),%r28
-        addl %r20,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0003
-        stw %r20,0(0,%r23)
-        ldo 16(%r29),%r29
-        ldo 16(%r25),%r25
-        ldo 16(%r23),%r23
-        bl L$0002,0
-        ldo 16(%r26),%r26
-L$0003
-        ldw -20(0,%r30),%r2
-        bv,n 0(%r2)
-        .EXIT
-        .PROCEND
-        .align 4
-        .EXPORT bn_mul_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR,RTNVAL=GR
-bn_mul_words
-        .PROC
-        .CALLINFO FRAME=0,CALLS,SAVE_RP
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        ldi 0,%r28
-        extru %r23,31,16,%r2
-        stw %r2,-16(0,%r30)
-        extru %r23,15,16,%r23
-        ldil L'65536,%r31
-        fldws -16(0,%r30),%fr11R
-        stw %r23,-16(0,%r30)
-        ldo 12(%r26),%r29
-        ldo 12(%r25),%r23
-        fldws -16(0,%r30),%fr11L
-L$0026
-        ldw 0(0,%r25),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0029
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0027
-        stw %r20,0(0,%r26)
-        ldw -8(0,%r23),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0033
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0027
-        stw %r20,-8(0,%r29)
-        ldw -4(0,%r23),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0037
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0027
-        stw %r20,-4(0,%r29)
-        ldw 0(0,%r23),%r19
-        extru %r19,31,16,%r20
-        stw %r20,-16(0,%r30)
-        extru %r19,15,16,%r19
-        fldws -16(0,%r30),%fr22L
-        stw %r19,-16(0,%r30)
-        xmpyu %fr22L,%fr11R,%fr8
-        fldws -16(0,%r30),%fr22L
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr11R,%fr22L,%fr10
-        ldw -16(0,%r30),%r2
-        stw %r20,-16(0,%r30)
-        xmpyu %fr22L,%fr11L,%fr9
-        fldws -16(0,%r30),%fr22L
-        fstws %fr10R,-16(0,%r30)
-        copy %r2,%r22
-        ldw -16(0,%r30),%r2
-        fstws %fr9R,-16(0,%r30)
-        xmpyu %fr11L,%fr22L,%fr8
-        copy %r2,%r19
-        ldw -16(0,%r30),%r2
-        fstws %fr8R,-16(0,%r30)
-        copy %r2,%r20
-        ldw -16(0,%r30),%r2
-        addl %r2,%r19,%r21
-        comclr,<<= %r19,%r21,0
-        addl %r20,%r31,%r20
-L$0041
-        extru %r21,15,16,%r19
-        addl %r20,%r19,%r20
-        zdep %r21,15,16,%r19
-        addl %r22,%r19,%r22
-        comclr,<<= %r19,%r22,0
-        addi,tr 1,%r20,%r19
-        copy %r20,%r19
-        addl %r22,%r28,%r20
-        comclr,<<= %r28,%r20,0
-        addi,tr 1,%r19,%r28
-        copy %r19,%r28
-        addib,= -1,%r24,L$0027
-        stw %r20,0(0,%r29)
-        ldo 16(%r23),%r23
-        ldo 16(%r25),%r25
-        ldo 16(%r29),%r29
-        bl L$0026,0
-        ldo 16(%r26),%r26
-L$0027
-        ldw -20(0,%r30),%r2
-        bv,n 0(%r2)
-        .EXIT
-        .PROCEND
-        .align 4
-        .EXPORT bn_sqr_words,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR
-bn_sqr_words
-        .PROC
-        .CALLINFO FRAME=0,NO_CALLS
-        .ENTRY
-        ldo 28(%r26),%r23
-        ldo 12(%r25),%r28
-L$0046
-        ldw 0(0,%r25),%r21
-        extru %r21,31,16,%r22
-        stw %r22,-16(0,%r30)
-        extru %r21,15,16,%r21
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        stw %r22,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r21,-16(0,%r30)
-        copy %r29,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,16,17,%r20
-        zdep %r19,14,15,%r19
-        ldw -16(0,%r30),%r29
-        xmpyu %fr10L,%fr10R,%fr9
-        addl %r29,%r19,%r22
-        stw %r22,0(0,%r26)
-        fstws %fr9R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        addl %r29,%r20,%r21
-        comclr,<<= %r19,%r22,0
-        addi 1,%r21,%r21
-        addib,= -1,%r24,L$0057
-        stw %r21,-24(0,%r23)
-        ldw -8(0,%r28),%r21
-        extru %r21,31,16,%r22
-        stw %r22,-16(0,%r30)
-        extru %r21,15,16,%r21
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        stw %r22,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r21,-16(0,%r30)
-        copy %r29,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,16,17,%r20
-        zdep %r19,14,15,%r19
-        ldw -16(0,%r30),%r29
-        xmpyu %fr10L,%fr10R,%fr9
-        addl %r29,%r19,%r22
-        stw %r22,-20(0,%r23)
-        fstws %fr9R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        addl %r29,%r20,%r21
-        comclr,<<= %r19,%r22,0
-        addi 1,%r21,%r21
-        addib,= -1,%r24,L$0057
-        stw %r21,-16(0,%r23)
-        ldw -4(0,%r28),%r21
-        extru %r21,31,16,%r22
-        stw %r22,-16(0,%r30)
-        extru %r21,15,16,%r21
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        stw %r22,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r21,-16(0,%r30)
-        copy %r29,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,16,17,%r20
-        zdep %r19,14,15,%r19
-        ldw -16(0,%r30),%r29
-        xmpyu %fr10L,%fr10R,%fr9
-        addl %r29,%r19,%r22
-        stw %r22,-12(0,%r23)
-        fstws %fr9R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        addl %r29,%r20,%r21
-        comclr,<<= %r19,%r22,0
-        addi 1,%r21,%r21
-        addib,= -1,%r24,L$0057
-        stw %r21,-8(0,%r23)
-        ldw 0(0,%r28),%r21
-        extru %r21,31,16,%r22
-        stw %r22,-16(0,%r30)
-        extru %r21,15,16,%r21
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        stw %r22,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r21,-16(0,%r30)
-        copy %r29,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10L
-        stw %r21,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,16,17,%r20
-        zdep %r19,14,15,%r19
-        ldw -16(0,%r30),%r29
-        xmpyu %fr10L,%fr10R,%fr9
-        addl %r29,%r19,%r22
-        stw %r22,-4(0,%r23)
-        fstws %fr9R,-16(0,%r30)
-        ldw -16(0,%r30),%r29
-        addl %r29,%r20,%r21
-        comclr,<<= %r19,%r22,0
-        addi 1,%r21,%r21
-        addib,= -1,%r24,L$0057
-        stw %r21,0(0,%r23)
-        ldo 16(%r28),%r28
-        ldo 16(%r25),%r25
-        ldo 32(%r23),%r23
-        bl L$0046,0
-        ldo 32(%r26),%r26
-L$0057
-        bv,n 0(%r2)
-        .EXIT
-        .PROCEND
-        .IMPORT BN_num_bits_word,CODE
-        .IMPORT fprintf,CODE
-        .IMPORT __iob,DATA
-        .SPACE $TEXT$
-        .SUBSPA $LIT$
-
-        .align 4
-L$C0000
-        .STRING "Division would overflow\x0a\x00"
-        .IMPORT abort,CODE
-        .SPACE $TEXT$
-        .SUBSPA $CODE$
-
-        .align 4
-        .EXPORT bn_div64,ENTRY,PRIV_LEV=3,ARGW0=GR,ARGW1=GR,ARGW2=GR,RTNVAL=GR
-bn_div64
-        .PROC
-        .CALLINFO FRAME=128,CALLS,SAVE_RP,ENTRY_GR=8
-        .ENTRY
-        stw %r2,-20(0,%r30)
-        stwm %r8,128(0,%r30)
-        stw %r7,-124(0,%r30)
-        stw %r4,-112(0,%r30)
-        stw %r3,-108(0,%r30)
-        copy %r26,%r3
-        copy %r25,%r4
-        stw %r6,-120(0,%r30)
-        ldi 0,%r7
-        stw %r5,-116(0,%r30)
-        movb,<> %r24,%r5,L$0059
-        ldi 2,%r6
-        bl L$0076,0
-        ldi -1,%r28
-L$0059
-        .CALL ARGW0=GR
-        bl BN_num_bits_word,%r2
-        copy %r5,%r26
-        ldi 32,%r19
-        comb,= %r19,%r28,L$0060
-        subi 31,%r28,%r19
-        mtsar %r19
-        zvdepi 1,32,%r19
-        comb,>>= %r19,%r3,L$0060
-        addil LR'__iob-$global$+32,%r27
-        ldo RR'__iob-$global$+32(%r1),%r26
-        ldil LR'L$C0000,%r25
-        .CALL ARGW0=GR,ARGW1=GR
-        bl fprintf,%r2
-        ldo RR'L$C0000(%r25),%r25
-        .CALL 
-        bl abort,%r2
-        nop
-L$0060
-        comb,>> %r5,%r3,L$0061
-        subi 32,%r28,%r28
-        sub %r3,%r5,%r3
-L$0061
-        comib,= 0,%r28,L$0062
-        subi 31,%r28,%r19
-        mtsar %r19
-        zvdep %r5,32,%r5
-        zvdep %r3,32,%r21
-        subi 32,%r28,%r20
-        mtsar %r20
-        vshd 0,%r4,%r20
-        or %r21,%r20,%r3
-        mtsar %r19
-        zvdep %r4,32,%r4
-L$0062
-        extru %r5,15,16,%r23
-        extru %r5,31,16,%r28
-L$0063
-        extru %r3,15,16,%r19
-        comb,<> %r23,%r19,L$0066
-        copy %r3,%r26
-        bl L$0067,0
-        zdepi -1,31,16,%r29
-L$0066
-        .IMPORT $$divU,MILLICODE
-        bl $$divU,%r31
-        copy %r23,%r25
-L$0067
-        stw %r29,-16(0,%r30)
-        fldws -16(0,%r30),%fr10L
-        stw %r28,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        stw %r23,-16(0,%r30)
-        xmpyu %fr10L,%fr10R,%fr8
-        fldws -16(0,%r30),%fr10R
-        fstws %fr8R,-16(0,%r30)
-        xmpyu %fr10L,%fr10R,%fr9
-        ldw -16(0,%r30),%r8
-        fstws %fr9R,-16(0,%r30)
-        copy %r8,%r22
-        ldw -16(0,%r30),%r8
-        extru %r4,15,16,%r24
-        copy %r8,%r21
-L$0068
-        sub %r3,%r21,%r20
-        copy %r20,%r19
-        depi 0,31,16,%r19
-        comib,<> 0,%r19,L$0069
-        zdep %r20,15,16,%r19
-        addl %r19,%r24,%r19
-        comb,>>= %r19,%r22,L$0069
-        sub %r22,%r28,%r22
-        sub %r21,%r23,%r21
-        bl L$0068,0
-        ldo -1(%r29),%r29
-L$0069
-        stw %r29,-16(0,%r30)
-        fldws -16(0,%r30),%fr10L
-        stw %r28,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        ldw -16(0,%r30),%r8
-        stw %r23,-16(0,%r30)
-        fldws -16(0,%r30),%fr10R
-        copy %r8,%r19
-        xmpyu %fr10L,%fr10R,%fr8
-        fstws %fr8R,-16(0,%r30)
-        extru %r19,15,16,%r20
-        ldw -16(0,%r30),%r8
-        zdep %r19,15,16,%r19
-        addl %r8,%r20,%r20
-        comclr,<<= %r19,%r4,0
-        addi 1,%r20,%r20
-        comb,<<= %r20,%r3,L$0074
-        sub %r4,%r19,%r4
-        addl %r3,%r5,%r3
-        ldo -1(%r29),%r29
-L$0074
-        addib,= -1,%r6,L$0064
-        sub %r3,%r20,%r3
-        zdep %r29,15,16,%r7
-        shd %r3,%r4,16,%r3
-        bl L$0063,0
-        zdep %r4,15,16,%r4
-L$0064
-        or %r7,%r29,%r28
-L$0076
-        ldw -148(0,%r30),%r2
-        ldw -124(0,%r30),%r7
-        ldw -120(0,%r30),%r6
-        ldw -116(0,%r30),%r5
-        ldw -112(0,%r30),%r4
-        ldw -108(0,%r30),%r3
-        bv 0(%r2)
-        ldwm -128(0,%r30),%r8
-        .EXIT
-        .PROCEND
diff --git a/src/lib/libssl/src/crypto/bn/asm/r3000.s b/src/lib/libssl/src/crypto/bn/asm/r3000.s
deleted file mode 100644
index e95269afa3..0000000000
--- a/src/lib/libssl/src/crypto/bn/asm/r3000.s
+++ /dev/null
@@ -1,646 +0,0 @@
-        .file   1 "../bn_mulw.c"
-        .set    nobopt
-        .option pic2
-
- # GNU C 2.6.3 [AL 1.1, MM 40] SGI running IRIX 5.0 compiled by GNU C
-
- # Cc1 defaults:
- # -mabicalls
-
- # Cc1 arguments (-G value = 0, Cpu = 3000, ISA = 1):
- # -quiet -dumpbase -O2 -o
-
-gcc2_compiled.:
-__gnu_compiled_c:
-        .rdata
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x34,0x39,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x33,0x34,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x35,0x20,0x24
-        .byte   0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x38,0x20,0x24
-        .byte   0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x32,0x33,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x37,0x38,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x33,0x2e,0x37,0x30,0x20
-        .byte   0x24,0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x32,0x20,0x24
-        .byte   0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x34,0x20,0x24
-        .byte   0x0
-
-        .byte   0x24,0x52,0x65,0x76,0x69,0x73,0x69,0x6f
-        .byte   0x6e,0x3a,0x20,0x31,0x2e,0x38,0x20,0x24
-        .byte   0x0
-        .text
-        .align  2
-        .globl  bn_mul_add_words
-        .ent    bn_mul_add_words
-bn_mul_add_words:
-        .frame  $sp,0,$31               # vars= 0, regs= 0/0, args= 0, extra= 0
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        .set    noreorder
-        .cpload $25
-        .set    reorder
-        move    $12,$4
-        move    $14,$5
-        move    $9,$6
-        move    $13,$7
-        move    $8,$0
-        addu    $10,$12,12
-        addu    $11,$14,12
-$L2:
-        lw      $6,0($14)
-        #nop
-        multu   $13,$6
-        mfhi    $6
-        mflo    $7
-        #nop
-        move    $5,$8
-        move    $4,$0
-        lw      $3,0($12)
-        addu    $9,$9,-1
-        move    $2,$0
-        addu    $7,$7,$3
-        sltu    $8,$7,$3
-        addu    $6,$6,$2
-        addu    $6,$6,$8
-        addu    $7,$7,$5
-        sltu    $2,$7,$5
-        addu    $6,$6,$4
-        addu    $6,$6,$2
-        srl     $3,$6,0
-        move    $2,$0
-        move    $8,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $9,$0,$L3
-        sw      $7,0($12)
-        .set    macro
-        .set    reorder
-
-        lw      $6,-8($11)
-        #nop
-        multu   $13,$6
-        mfhi    $6
-        mflo    $7
-        #nop
-        move    $5,$8
-        move    $4,$0
-        lw      $3,-8($10)
-        addu    $9,$9,-1
-        move    $2,$0
-        addu    $7,$7,$3
-        sltu    $8,$7,$3
-        addu    $6,$6,$2
-        addu    $6,$6,$8
-        addu    $7,$7,$5
-        sltu    $2,$7,$5
-        addu    $6,$6,$4
-        addu    $6,$6,$2
-        srl     $3,$6,0
-        move    $2,$0
-        move    $8,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $9,$0,$L3
-        sw      $7,-8($10)
-        .set    macro
-        .set    reorder
-
-        lw      $6,-4($11)
-        #nop
-        multu   $13,$6
-        mfhi    $6
-        mflo    $7
-        #nop
-        move    $5,$8
-        move    $4,$0
-        lw      $3,-4($10)
-        addu    $9,$9,-1
-        move    $2,$0
-        addu    $7,$7,$3
-        sltu    $8,$7,$3
-        addu    $6,$6,$2
-        addu    $6,$6,$8
-        addu    $7,$7,$5
-        sltu    $2,$7,$5
-        addu    $6,$6,$4
-        addu    $6,$6,$2
-        srl     $3,$6,0
-        move    $2,$0
-        move    $8,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $9,$0,$L3
-        sw      $7,-4($10)
-        .set    macro
-        .set    reorder
-
-        lw      $6,0($11)
-        #nop
-        multu   $13,$6
-        mfhi    $6
-        mflo    $7
-        #nop
-        move    $5,$8
-        move    $4,$0
-        lw      $3,0($10)
-        addu    $9,$9,-1
-        move    $2,$0
-        addu    $7,$7,$3
-        sltu    $8,$7,$3
-        addu    $6,$6,$2
-        addu    $6,$6,$8
-        addu    $7,$7,$5
-        sltu    $2,$7,$5
-        addu    $6,$6,$4
-        addu    $6,$6,$2
-        srl     $3,$6,0
-        move    $2,$0
-        move    $8,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $9,$0,$L3
-        sw      $7,0($10)
-        .set    macro
-        .set    reorder
-
-        addu    $11,$11,16
-        addu    $14,$14,16
-        addu    $10,$10,16
-        .set    noreorder
-        .set    nomacro
-        j       $L2
-        addu    $12,$12,16
-        .set    macro
-        .set    reorder
-
-$L3:
-        .set    noreorder
-        .set    nomacro
-        j       $31
-        move    $2,$8
-        .set    macro
-        .set    reorder
-
-        .end    bn_mul_add_words
-        .align  2
-        .globl  bn_mul_words
-        .ent    bn_mul_words
-bn_mul_words:
-        .frame  $sp,0,$31               # vars= 0, regs= 0/0, args= 0, extra= 0
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        .set    noreorder
-        .cpload $25
-        .set    reorder
-        move    $11,$4
-        move    $12,$5
-        move    $8,$6
-        move    $6,$0
-        addu    $10,$11,12
-        addu    $9,$12,12
-$L10:
-        lw      $4,0($12)
-        #nop
-        multu   $7,$4
-        mfhi    $4
-        mflo    $5
-        #nop
-        move    $3,$6
-        move    $2,$0
-        addu    $8,$8,-1
-        addu    $5,$5,$3
-        sltu    $6,$5,$3
-        addu    $4,$4,$2
-        addu    $4,$4,$6
-        srl     $3,$4,0
-        move    $2,$0
-        move    $6,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $8,$0,$L11
-        sw      $5,0($11)
-        .set    macro
-        .set    reorder
-
-        lw      $4,-8($9)
-        #nop
-        multu   $7,$4
-        mfhi    $4
-        mflo    $5
-        #nop
-        move    $3,$6
-        move    $2,$0
-        addu    $8,$8,-1
-        addu    $5,$5,$3
-        sltu    $6,$5,$3
-        addu    $4,$4,$2
-        addu    $4,$4,$6
-        srl     $3,$4,0
-        move    $2,$0
-        move    $6,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $8,$0,$L11
-        sw      $5,-8($10)
-        .set    macro
-        .set    reorder
-
-        lw      $4,-4($9)
-        #nop
-        multu   $7,$4
-        mfhi    $4
-        mflo    $5
-        #nop
-        move    $3,$6
-        move    $2,$0
-        addu    $8,$8,-1
-        addu    $5,$5,$3
-        sltu    $6,$5,$3
-        addu    $4,$4,$2
-        addu    $4,$4,$6
-        srl     $3,$4,0
-        move    $2,$0
-        move    $6,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $8,$0,$L11
-        sw      $5,-4($10)
-        .set    macro
-        .set    reorder
-
-        lw      $4,0($9)
-        #nop
-        multu   $7,$4
-        mfhi    $4
-        mflo    $5
-        #nop
-        move    $3,$6
-        move    $2,$0
-        addu    $8,$8,-1
-        addu    $5,$5,$3
-        sltu    $6,$5,$3
-        addu    $4,$4,$2
-        addu    $4,$4,$6
-        srl     $3,$4,0
-        move    $2,$0
-        move    $6,$3
-        .set    noreorder
-        .set    nomacro
-        beq     $8,$0,$L11
-        sw      $5,0($10)
-        .set    macro
-        .set    reorder
-
-        addu    $9,$9,16
-        addu    $12,$12,16
-        addu    $10,$10,16
-        .set    noreorder
-        .set    nomacro
-        j       $L10
-        addu    $11,$11,16
-        .set    macro
-        .set    reorder
-
-$L11:
-        .set    noreorder
-        .set    nomacro
-        j       $31
-        move    $2,$6
-        .set    macro
-        .set    reorder
-
-        .end    bn_mul_words
-        .align  2
-        .globl  bn_sqr_words
-        .ent    bn_sqr_words
-bn_sqr_words:
-        .frame  $sp,0,$31               # vars= 0, regs= 0/0, args= 0, extra= 0
-        .mask   0x00000000,0
-        .fmask  0x00000000,0
-        .set    noreorder
-        .cpload $25
-        .set    reorder
-        move    $9,$4
-        addu    $7,$9,28
-        addu    $8,$5,12
-$L18:
-        lw      $2,0($5)
-        #nop
-        multu   $2,$2
-        mfhi    $2
-        mflo    $3
-        #nop
-        addu    $6,$6,-1
-        sw      $3,0($9)
-        srl     $3,$2,0
-        move    $2,$0
-        .set    noreorder
-        .set    nomacro
-        beq     $6,$0,$L19
-        sw      $3,-24($7)
-        .set    macro
-        .set    reorder
-
-        lw      $2,-8($8)
-        #nop
-        multu   $2,$2
-        mfhi    $2
-        mflo    $3
-        #nop
-        addu    $6,$6,-1
-        sw      $3,-20($7)
-        srl     $3,$2,0
-        move    $2,$0
-        .set    noreorder
-        .set    nomacro
-        beq     $6,$0,$L19
-        sw      $3,-16($7)
-        .set    macro
-        .set    reorder
-
-        lw      $2,-4($8)
-        #nop
-        multu   $2,$2
-        mfhi    $2
-        mflo    $3
-        #nop
-        addu    $6,$6,-1
-        sw      $3,-12($7)
-        srl     $3,$2,0
-        move    $2,$0
-        .set    noreorder
-        .set    nomacro
-        beq     $6,$0,$L19
-        sw      $3,-8($7)
-        .set    macro
-        .set    reorder
-
-        lw      $2,0($8)
-        #nop
-        multu   $2,$2
-        mfhi    $2
-        mflo    $3
-        #nop
-        addu    $6,$6,-1
-        sw      $3,-4($7)
-        srl     $3,$2,0
-        move    $2,$0
-        .set    noreorder
-        .set    nomacro
-        beq     $6,$0,$L19
-        sw      $3,0($7)
-        .set    macro
-        .set    reorder
-
-        addu    $8,$8,16
-        addu    $5,$5,16
-        addu    $7,$7,32
-        .set    noreorder
-        .set    nomacro
-        j       $L18
-        addu    $9,$9,32
-        .set    macro
-        .set    reorder
-
-$L19:
-        j       $31
-        .end    bn_sqr_words
-        .rdata
-        .align  2
-$LC0:
-
-        .byte   0x44,0x69,0x76,0x69,0x73,0x69,0x6f,0x6e
-        .byte   0x20,0x77,0x6f,0x75,0x6c,0x64,0x20,0x6f
-        .byte   0x76,0x65,0x72,0x66,0x6c,0x6f,0x77,0xa
-        .byte   0x0
-        .text
-        .align  2
-        .globl  bn_div64
-        .ent    bn_div64
-bn_div64:
-        .frame  $sp,56,$31              # vars= 0, regs= 7/0, args= 16, extra= 8
-        .mask   0x901f0000,-8
-        .fmask  0x00000000,0
-        .set    noreorder
-        .cpload $25
-        .set    reorder
-        subu    $sp,$sp,56
-        .cprestore 16
-        sw      $16,24($sp)
-        move    $16,$4
-        sw      $17,28($sp)
-        move    $17,$5
-        sw      $18,32($sp)
-        move    $18,$6
-        sw      $20,40($sp)
-        move    $20,$0
-        sw      $19,36($sp)
-        li      $19,0x00000002          # 2
-        sw      $31,48($sp)
-        .set    noreorder
-        .set    nomacro
-        bne     $18,$0,$L26
-        sw      $28,44($sp)
-        .set    macro
-        .set    reorder
-
-        .set    noreorder
-        .set    nomacro
-        j       $L43
-        li      $2,-1                   # 0xffffffff
-        .set    macro
-        .set    reorder
-
-$L26:
-        move    $4,$18
-        jal     BN_num_bits_word
-        move    $4,$2
-        li      $2,0x00000020           # 32
-        .set    noreorder
-        .set    nomacro
-        beq     $4,$2,$L27
-        li      $2,0x00000001           # 1
-        .set    macro
-        .set    reorder
-
-        sll     $2,$2,$4
-        sltu    $2,$2,$16
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$0,$L44
-        li      $5,0x00000020           # 32
-        .set    macro
-        .set    reorder
-
-        la      $4,__iob+32
-        la      $5,$LC0
-        jal     fprintf
-        jal     abort
-$L27:
-        li      $5,0x00000020           # 32
-$L44:
-        sltu    $2,$16,$18
-        .set    noreorder
-        .set    nomacro
-        bne     $2,$0,$L28
-        subu    $4,$5,$4
-        .set    macro
-        .set    reorder
-
-        subu    $16,$16,$18
-$L28:
-        .set    noreorder
-        .set    nomacro
-        beq     $4,$0,$L29
-        li      $10,-65536                      # 0xffff0000
-        .set    macro
-        .set    reorder
-
-        sll     $18,$18,$4
-        sll     $3,$16,$4
-        subu    $2,$5,$4
-        srl     $2,$17,$2
-        or      $16,$3,$2
-        sll     $17,$17,$4
-$L29:
-        srl     $7,$18,16
-        andi    $9,$18,0xffff
-$L30:
-        srl     $2,$16,16
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$7,$L34
-        li      $6,0x0000ffff           # 65535
-        .set    macro
-        .set    reorder
-
-        divu    $6,$16,$7
-$L34:
-        mult    $6,$9
-        mflo    $5
-        #nop
-        #nop
-        mult    $6,$7
-        and     $2,$17,$10
-        srl     $8,$2,16
-        mflo    $4
-$L35:
-        subu    $3,$16,$4
-        and     $2,$3,$10
-        .set    noreorder
-        .set    nomacro
-        bne     $2,$0,$L36
-        sll     $2,$3,16
-        .set    macro
-        .set    reorder
-
-        addu    $2,$2,$8
-        sltu    $2,$2,$5
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$0,$L36
-        subu    $5,$5,$9
-        .set    macro
-        .set    reorder
-
-        subu    $4,$4,$7
-        .set    noreorder
-        .set    nomacro
-        j       $L35
-        addu    $6,$6,-1
-        .set    macro
-        .set    reorder
-
-$L36:
-        mult    $6,$7
-        mflo    $5
-        #nop
-        #nop
-        mult    $6,$9
-        mflo    $4
-        #nop
-        #nop
-        srl     $3,$4,16
-        sll     $2,$4,16
-        and     $4,$2,$10
-        sltu    $2,$17,$4
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$0,$L40
-        addu    $5,$5,$3
-        .set    macro
-        .set    reorder
-
-        addu    $5,$5,1
-$L40:
-        sltu    $2,$16,$5
-        .set    noreorder
-        .set    nomacro
-        beq     $2,$0,$L41
-        subu    $17,$17,$4
-        .set    macro
-        .set    reorder
-
-        addu    $16,$16,$18
-        addu    $6,$6,-1
-$L41:
-        addu    $19,$19,-1
-        .set    noreorder
-        .set    nomacro
-        beq     $19,$0,$L31
-        subu    $16,$16,$5
-        .set    macro
-        .set    reorder
-
-        sll     $20,$6,16
-        sll     $3,$16,16
-        srl     $2,$17,16
-        or      $16,$3,$2
-        .set    noreorder
-        .set    nomacro
-        j       $L30
-        sll     $17,$17,16
-        .set    macro
-        .set    reorder
-
-$L31:
-        or      $2,$20,$6
-$L43:
-        lw      $31,48($sp)
-        lw      $20,40($sp)
-        lw      $19,36($sp)
-        lw      $18,32($sp)
-        lw      $17,28($sp)
-        lw      $16,24($sp)
-        addu    $sp,$sp,56
-        j       $31
-        .end    bn_div64
-
-        .globl abort .text
-        .globl fprintf .text
-        .globl BN_num_bits_word .text
diff --git a/src/lib/libssl/src/crypto/bn/asm/x86_64-mont.pl b/src/lib/libssl/src/crypto/bn/asm/x86_64-mont.pl
new file mode 100755
index 0000000000..c43b69592a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/bn/asm/x86_64-mont.pl
@@ -0,0 +1,214 @@
+#!/usr/bin/env perl
+
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. The module is, however, dual licensed under OpenSSL and
+# CRYPTOGAMS licenses depending on where you obtain it. For further
+# details see http://www.openssl.org/~appro/cryptogams/.
+# ====================================================================
+
+# October 2005.
+#
+# Montgomery multiplication routine for x86_64. While it gives modest
+# 9% improvement of rsa4096 sign on Opteron, rsa512 sign runs more
+# than twice, >2x, as fast. Most common rsa1024 sign is improved by
+# respectful 50%. It remains to be seen if loop unrolling and
+# dedicated squaring routine can provide further improvement...
+
+$output=shift;
+
+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
+( $xlate="${dir}x86_64-xlate.pl" and -f $xlate ) or
+( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
+die "can't locate x86_64-xlate.pl";
+
+open STDOUT,"| $^X $xlate $output";
+
+# int bn_mul_mont(
+$rp="%rdi";     # BN_ULONG *rp,
+$ap="%rsi";     # const BN_ULONG *ap,
+$bp="%rdx";     # const BN_ULONG *bp,
+$np="%rcx";     # const BN_ULONG *np,
+$n0="%r8";      # const BN_ULONG *n0,
+$num="%r9";     # int num);
+$lo0="%r10";
+$hi0="%r11";
+$bp="%r12";     # reassign $bp
+$hi1="%r13";
+$i="%r14";
+$j="%r15";
+$m0="%rbx";
+$m1="%rbp";
+
+$code=<<___;
+.text
+
+.globl  bn_mul_mont
+.type   bn_mul_mont,\@function,6
+.align  16
+bn_mul_mont:
+        push    %rbx
+        push    %rbp
+        push    %r12
+        push    %r13
+        push    %r14
+        push    %r15
+
+        mov     ${num}d,${num}d
+        lea     2($num),%rax
+        mov     %rsp,%rbp
+        neg     %rax
+        lea     (%rsp,%rax,8),%rsp      # tp=alloca(8*(num+2))
+        and     \$-1024,%rsp            # minimize TLB usage
+
+        mov     %rbp,8(%rsp,$num,8)     # tp[num+1]=%rsp
+        mov     %rdx,$bp                # $bp reassigned, remember?
+
+        mov     ($n0),$n0               # pull n0[0] value
+
+        xor     $i,$i                   # i=0
+        xor     $j,$j                   # j=0
+
+        mov     ($bp),$m0               # m0=bp[0]
+        mov     ($ap),%rax
+        mulq    $m0                     # ap[0]*bp[0]
+        mov     %rax,$lo0
+        mov     %rdx,$hi0
+
+        imulq   $n0,%rax                # "tp[0]"*n0
+        mov     %rax,$m1
+
+        mulq    ($np)                   # np[0]*m1
+        add     $lo0,%rax               # discarded
+        adc     \$0,%rdx
+        mov     %rdx,$hi1
+
+        lea     1($j),$j                # j++
+.L1st:
+        mov     ($ap,$j,8),%rax
+        mulq    $m0                     # ap[j]*bp[0]
+        add     $hi0,%rax
+        adc     \$0,%rdx
+        mov     %rax,$lo0
+        mov     ($np,$j,8),%rax
+        mov     %rdx,$hi0
+
+        mulq    $m1                     # np[j]*m1
+        add     $hi1,%rax
+        lea     1($j),$j                # j++
+        adc     \$0,%rdx
+        add     $lo0,%rax               # np[j]*m1+ap[j]*bp[0]
+        adc     \$0,%rdx
+        mov     %rax,-16(%rsp,$j,8)     # tp[j-1]
+        cmp     $num,$j
+        mov     %rdx,$hi1
+        jl      .L1st
+
+        xor     %rdx,%rdx
+        add     $hi0,$hi1
+        adc     \$0,%rdx
+        mov     $hi1,-8(%rsp,$num,8)
+        mov     %rdx,(%rsp,$num,8)      # store upmost overflow bit
+
+        lea     1($i),$i                # i++
+.align  4
+.Louter:
+        xor     $j,$j                   # j=0
+
+        mov     ($bp,$i,8),$m0          # m0=bp[i]
+        mov     ($ap),%rax              # ap[0]
+        mulq    $m0                     # ap[0]*bp[i]
+        add     (%rsp),%rax             # ap[0]*bp[i]+tp[0]
+        adc     \$0,%rdx
+        mov     %rax,$lo0
+        mov     %rdx,$hi0
+
+        imulq   $n0,%rax                # tp[0]*n0
+        mov     %rax,$m1
+
+        mulq    ($np,$j,8)              # np[0]*m1
+        add     $lo0,%rax               # discarded
+        mov     8(%rsp),$lo0            # tp[1]
+        adc     \$0,%rdx
+        mov     %rdx,$hi1
+
+        lea     1($j),$j                # j++
+.align  4
+.Linner:
+        mov     ($ap,$j,8),%rax
+        mulq    $m0                     # ap[j]*bp[i]
+        add     $hi0,%rax
+        adc     \$0,%rdx
+        add     %rax,$lo0               # ap[j]*bp[i]+tp[j]
+        mov     ($np,$j,8),%rax
+        adc     \$0,%rdx
+        mov     %rdx,$hi0
+
+        mulq    $m1                     # np[j]*m1
+        add     $hi1,%rax
+        lea     1($j),$j                # j++
+        adc     \$0,%rdx
+        add     $lo0,%rax               # np[j]*m1+ap[j]*bp[i]+tp[j]
+        adc     \$0,%rdx
+        mov     (%rsp,$j,8),$lo0
+        cmp     $num,$j
+        mov     %rax,-16(%rsp,$j,8)     # tp[j-1]
+        mov     %rdx,$hi1
+        jl      .Linner
+
+        xor     %rdx,%rdx
+        add     $hi0,$hi1
+        adc     \$0,%rdx
+        add     $lo0,$hi1               # pull upmost overflow bit
+        adc     \$0,%rdx
+        mov     $hi1,-8(%rsp,$num,8)
+        mov     %rdx,(%rsp,$num,8)      # store upmost overflow bit
+
+        lea     1($i),$i                # i++
+        cmp     $num,$i
+        jl      .Louter
+
+        lea     (%rsp),$ap              # borrow ap for tp
+        lea     -1($num),$j             # j=num-1
+
+        mov     ($ap),%rax              # tp[0]
+        xor     $i,$i                   # i=0 and clear CF!
+        jmp     .Lsub
+.align  16
+.Lsub:  sbb     ($np,$i,8),%rax
+        mov     %rax,($rp,$i,8)         # rp[i]=tp[i]-np[i]
+        dec     $j                      # doesn't affect CF!
+        mov     8($ap,$i,8),%rax        # tp[i+1]
+        lea     1($i),$i                # i++
+        jge     .Lsub
+
+        sbb     \$0,%rax                # handle upmost overflow bit
+        and     %rax,$ap
+        not     %rax
+        mov     $rp,$np
+        and     %rax,$np
+        lea     -1($num),$j
+        or      $np,$ap                 # ap=borrow?tp:rp
+.align  16
+.Lcopy:                                 # copy or in-place refresh
+        mov     ($ap,$j,8),%rax
+        mov     %rax,($rp,$j,8)         # rp[i]=tp[i]
+        mov     $i,(%rsp,$j,8)          # zap temporary vector
+        dec     $j
+        jge     .Lcopy
+
+        mov     8(%rsp,$num,8),%rsp     # restore %rsp
+        mov     \$1,%rax
+        pop     %r15
+        pop     %r14
+        pop     %r13
+        pop     %r12
+        pop     %rbp
+        pop     %rbx
+        ret
+.size   bn_mul_mont,.-bn_mul_mont
+.asciz  "Montgomery Multiplication for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
+___
+
+print $code;
+close STDOUT;
diff --git a/src/lib/libssl/src/crypto/bn/bn_const.c b/src/lib/libssl/src/crypto/bn/bn_const.c
new file mode 100644
index 0000000000..eb60a25b3c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/bn/bn_const.c
@@ -0,0 +1,402 @@
+/* crypto/bn/knownprimes.c */
+/* Insert boilerplate */
+
+#include "bn.h"
+
+/* "First Oakley Default Group" from RFC2409, section 6.1.
+ *
+ * The prime is: 2^768 - 2 ^704 - 1 + 2^64 * { [2^638 pi] + 149686 }
+ *
+ * RFC2409 specifies a generator of 2.
+ * RFC2412 specifies a generator of of 22.
+ */
+
+BIGNUM *get_rfc2409_prime_768(BIGNUM *bn)
+        {
+        static const unsigned char RFC2409_PRIME_768[]={
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2,
+                0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,
+                0x29,0x02,0x4E,0x08,0x8A,0x67,0xCC,0x74,0x02,0x0B,0xBE,0xA6,
+                0x3B,0x13,0x9B,0x22,0x51,0x4A,0x08,0x79,0x8E,0x34,0x04,0xDD,
+                0xEF,0x95,0x19,0xB3,0xCD,0x3A,0x43,0x1B,0x30,0x2B,0x0A,0x6D,
+                0xF2,0x5F,0x14,0x37,0x4F,0xE1,0x35,0x6D,0x6D,0x51,0xC2,0x45,
+                0xE4,0x85,0xB5,0x76,0x62,0x5E,0x7E,0xC6,0xF4,0x4C,0x42,0xE9,
+                0xA6,0x3A,0x36,0x20,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+                };
+        return BN_bin2bn(RFC2409_PRIME_768,sizeof(RFC2409_PRIME_768),bn);
+        }
+
+/* "Second Oakley Default Group" from RFC2409, section 6.2.
+ *
+ * The prime is: 2^1024 - 2^960 - 1 + 2^64 * { [2^894 pi] + 129093 }.
+ *
+ * RFC2409 specifies a generator of 2.
+ * RFC2412 specifies a generator of 22.
+ */
+
+BIGNUM *get_rfc2409_prime_1024(BIGNUM *bn)
+        {
+        static const unsigned char RFC2409_PRIME_1024[]={
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2,
+                0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,
+                0x29,0x02,0x4E,0x08,0x8A,0x67,0xCC,0x74,0x02,0x0B,0xBE,0xA6,
+                0x3B,0x13,0x9B,0x22,0x51,0x4A,0x08,0x79,0x8E,0x34,0x04,0xDD,
+                0xEF,0x95,0x19,0xB3,0xCD,0x3A,0x43,0x1B,0x30,0x2B,0x0A,0x6D,
+                0xF2,0x5F,0x14,0x37,0x4F,0xE1,0x35,0x6D,0x6D,0x51,0xC2,0x45,
+                0xE4,0x85,0xB5,0x76,0x62,0x5E,0x7E,0xC6,0xF4,0x4C,0x42,0xE9,
+                0xA6,0x37,0xED,0x6B,0x0B,0xFF,0x5C,0xB6,0xF4,0x06,0xB7,0xED,
+                0xEE,0x38,0x6B,0xFB,0x5A,0x89,0x9F,0xA5,0xAE,0x9F,0x24,0x11,
+                0x7C,0x4B,0x1F,0xE6,0x49,0x28,0x66,0x51,0xEC,0xE6,0x53,0x81,
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+                };
+        return BN_bin2bn(RFC2409_PRIME_1024,sizeof(RFC2409_PRIME_1024),bn);
+        }
+
+/* "1536-bit MODP Group" from RFC3526, Section 2.
+ *
+ * The prime is: 2^1536 - 2^1472 - 1 + 2^64 * { [2^1406 pi] + 741804 }
+ *
+ * RFC3526 specifies a generator of 2.
+ * RFC2312 specifies a generator of 22.
+ */
+
+BIGNUM *get_rfc3526_prime_1536(BIGNUM *bn)
+        {
+        static const unsigned char RFC3526_PRIME_1536[]={
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2,
+                0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,
+                0x29,0x02,0x4E,0x08,0x8A,0x67,0xCC,0x74,0x02,0x0B,0xBE,0xA6,
+                0x3B,0x13,0x9B,0x22,0x51,0x4A,0x08,0x79,0x8E,0x34,0x04,0xDD,
+                0xEF,0x95,0x19,0xB3,0xCD,0x3A,0x43,0x1B,0x30,0x2B,0x0A,0x6D,
+                0xF2,0x5F,0x14,0x37,0x4F,0xE1,0x35,0x6D,0x6D,0x51,0xC2,0x45,
+                0xE4,0x85,0xB5,0x76,0x62,0x5E,0x7E,0xC6,0xF4,0x4C,0x42,0xE9,
+                0xA6,0x37,0xED,0x6B,0x0B,0xFF,0x5C,0xB6,0xF4,0x06,0xB7,0xED,
+                0xEE,0x38,0x6B,0xFB,0x5A,0x89,0x9F,0xA5,0xAE,0x9F,0x24,0x11,
+                0x7C,0x4B,0x1F,0xE6,0x49,0x28,0x66,0x51,0xEC,0xE4,0x5B,0x3D,
+                0xC2,0x00,0x7C,0xB8,0xA1,0x63,0xBF,0x05,0x98,0xDA,0x48,0x36,
+                0x1C,0x55,0xD3,0x9A,0x69,0x16,0x3F,0xA8,0xFD,0x24,0xCF,0x5F,
+                0x83,0x65,0x5D,0x23,0xDC,0xA3,0xAD,0x96,0x1C,0x62,0xF3,0x56,
+                0x20,0x85,0x52,0xBB,0x9E,0xD5,0x29,0x07,0x70,0x96,0x96,0x6D,
+                0x67,0x0C,0x35,0x4E,0x4A,0xBC,0x98,0x04,0xF1,0x74,0x6C,0x08,
+                0xCA,0x23,0x73,0x27,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+                };
+        return BN_bin2bn(RFC3526_PRIME_1536,sizeof(RFC3526_PRIME_1536),bn);
+        }
+
+/* "2048-bit MODP Group" from RFC3526, Section 3.
+ *
+ * The prime is: 2^2048 - 2^1984 - 1 + 2^64 * { [2^1918 pi] + 124476 }
+ *
+ * RFC3526 specifies a generator of 2.
+ */
+
+BIGNUM *get_rfc3526_prime_2048(BIGNUM *bn)
+        {
+        static const unsigned char RFC3526_PRIME_2048[]={
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2,
+                0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,
+                0x29,0x02,0x4E,0x08,0x8A,0x67,0xCC,0x74,0x02,0x0B,0xBE,0xA6,
+                0x3B,0x13,0x9B,0x22,0x51,0x4A,0x08,0x79,0x8E,0x34,0x04,0xDD,
+                0xEF,0x95,0x19,0xB3,0xCD,0x3A,0x43,0x1B,0x30,0x2B,0x0A,0x6D,
+                0xF2,0x5F,0x14,0x37,0x4F,0xE1,0x35,0x6D,0x6D,0x51,0xC2,0x45,
+                0xE4,0x85,0xB5,0x76,0x62,0x5E,0x7E,0xC6,0xF4,0x4C,0x42,0xE9,
+                0xA6,0x37,0xED,0x6B,0x0B,0xFF,0x5C,0xB6,0xF4,0x06,0xB7,0xED,
+                0xEE,0x38,0x6B,0xFB,0x5A,0x89,0x9F,0xA5,0xAE,0x9F,0x24,0x11,
+                0x7C,0x4B,0x1F,0xE6,0x49,0x28,0x66,0x51,0xEC,0xE4,0x5B,0x3D,
+                0xC2,0x00,0x7C,0xB8,0xA1,0x63,0xBF,0x05,0x98,0xDA,0x48,0x36,
+                0x1C,0x55,0xD3,0x9A,0x69,0x16,0x3F,0xA8,0xFD,0x24,0xCF,0x5F,
+                0x83,0x65,0x5D,0x23,0xDC,0xA3,0xAD,0x96,0x1C,0x62,0xF3,0x56,
+                0x20,0x85,0x52,0xBB,0x9E,0xD5,0x29,0x07,0x70,0x96,0x96,0x6D,
+                0x67,0x0C,0x35,0x4E,0x4A,0xBC,0x98,0x04,0xF1,0x74,0x6C,0x08,
+                0xCA,0x18,0x21,0x7C,0x32,0x90,0x5E,0x46,0x2E,0x36,0xCE,0x3B,
+                0xE3,0x9E,0x77,0x2C,0x18,0x0E,0x86,0x03,0x9B,0x27,0x83,0xA2,
+                0xEC,0x07,0xA2,0x8F,0xB5,0xC5,0x5D,0xF0,0x6F,0x4C,0x52,0xC9,
+                0xDE,0x2B,0xCB,0xF6,0x95,0x58,0x17,0x18,0x39,0x95,0x49,0x7C,
+                0xEA,0x95,0x6A,0xE5,0x15,0xD2,0x26,0x18,0x98,0xFA,0x05,0x10,
+                0x15,0x72,0x8E,0x5A,0x8A,0xAC,0xAA,0x68,0xFF,0xFF,0xFF,0xFF,
+                0xFF,0xFF,0xFF,0xFF,
+                };
+        return BN_bin2bn(RFC3526_PRIME_2048,sizeof(RFC3526_PRIME_2048),bn);
+        }
+
+/* "3072-bit MODP Group" from RFC3526, Section 4.
+ *
+ * The prime is: 2^3072 - 2^3008 - 1 + 2^64 * { [2^2942 pi] + 1690314 }
+ *
+ * RFC3526 specifies a generator of 2.
+ */
+
+BIGNUM *get_rfc3526_prime_3072(BIGNUM *bn)
+        {
+        static const unsigned char RFC3526_PRIME_3072[]={
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2,
+                0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,
+                0x29,0x02,0x4E,0x08,0x8A,0x67,0xCC,0x74,0x02,0x0B,0xBE,0xA6,
+                0x3B,0x13,0x9B,0x22,0x51,0x4A,0x08,0x79,0x8E,0x34,0x04,0xDD,
+                0xEF,0x95,0x19,0xB3,0xCD,0x3A,0x43,0x1B,0x30,0x2B,0x0A,0x6D,
+                0xF2,0x5F,0x14,0x37,0x4F,0xE1,0x35,0x6D,0x6D,0x51,0xC2,0x45,
+                0xE4,0x85,0xB5,0x76,0x62,0x5E,0x7E,0xC6,0xF4,0x4C,0x42,0xE9,
+                0xA6,0x37,0xED,0x6B,0x0B,0xFF,0x5C,0xB6,0xF4,0x06,0xB7,0xED,
+                0xEE,0x38,0x6B,0xFB,0x5A,0x89,0x9F,0xA5,0xAE,0x9F,0x24,0x11,
+                0x7C,0x4B,0x1F,0xE6,0x49,0x28,0x66,0x51,0xEC,0xE4,0x5B,0x3D,
+                0xC2,0x00,0x7C,0xB8,0xA1,0x63,0xBF,0x05,0x98,0xDA,0x48,0x36,
+                0x1C,0x55,0xD3,0x9A,0x69,0x16,0x3F,0xA8,0xFD,0x24,0xCF,0x5F,
+                0x83,0x65,0x5D,0x23,0xDC,0xA3,0xAD,0x96,0x1C,0x62,0xF3,0x56,
+                0x20,0x85,0x52,0xBB,0x9E,0xD5,0x29,0x07,0x70,0x96,0x96,0x6D,
+                0x67,0x0C,0x35,0x4E,0x4A,0xBC,0x98,0x04,0xF1,0x74,0x6C,0x08,
+                0xCA,0x18,0x21,0x7C,0x32,0x90,0x5E,0x46,0x2E,0x36,0xCE,0x3B,
+                0xE3,0x9E,0x77,0x2C,0x18,0x0E,0x86,0x03,0x9B,0x27,0x83,0xA2,
+                0xEC,0x07,0xA2,0x8F,0xB5,0xC5,0x5D,0xF0,0x6F,0x4C,0x52,0xC9,
+                0xDE,0x2B,0xCB,0xF6,0x95,0x58,0x17,0x18,0x39,0x95,0x49,0x7C,
+                0xEA,0x95,0x6A,0xE5,0x15,0xD2,0x26,0x18,0x98,0xFA,0x05,0x10,
+                0x15,0x72,0x8E,0x5A,0x8A,0xAA,0xC4,0x2D,0xAD,0x33,0x17,0x0D,
+                0x04,0x50,0x7A,0x33,0xA8,0x55,0x21,0xAB,0xDF,0x1C,0xBA,0x64,
+                0xEC,0xFB,0x85,0x04,0x58,0xDB,0xEF,0x0A,0x8A,0xEA,0x71,0x57,
+                0x5D,0x06,0x0C,0x7D,0xB3,0x97,0x0F,0x85,0xA6,0xE1,0xE4,0xC7,
+                0xAB,0xF5,0xAE,0x8C,0xDB,0x09,0x33,0xD7,0x1E,0x8C,0x94,0xE0,
+                0x4A,0x25,0x61,0x9D,0xCE,0xE3,0xD2,0x26,0x1A,0xD2,0xEE,0x6B,
+                0xF1,0x2F,0xFA,0x06,0xD9,0x8A,0x08,0x64,0xD8,0x76,0x02,0x73,
+                0x3E,0xC8,0x6A,0x64,0x52,0x1F,0x2B,0x18,0x17,0x7B,0x20,0x0C,
+                0xBB,0xE1,0x17,0x57,0x7A,0x61,0x5D,0x6C,0x77,0x09,0x88,0xC0,
+                0xBA,0xD9,0x46,0xE2,0x08,0xE2,0x4F,0xA0,0x74,0xE5,0xAB,0x31,
+                0x43,0xDB,0x5B,0xFC,0xE0,0xFD,0x10,0x8E,0x4B,0x82,0xD1,0x20,
+                0xA9,0x3A,0xD2,0xCA,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+                };
+        return BN_bin2bn(RFC3526_PRIME_3072,sizeof(RFC3526_PRIME_3072),bn);
+        }
+
+/* "4096-bit MODP Group" from RFC3526, Section 5.
+ *
+ * The prime is: 2^4096 - 2^4032 - 1 + 2^64 * { [2^3966 pi] + 240904 }
+ *
+ * RFC3526 specifies a generator of 2.
+ */
+
+BIGNUM *get_rfc3526_prime_4096(BIGNUM *bn)
+        {
+        static const unsigned char RFC3526_PRIME_4096[]={
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2,
+                0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,
+                0x29,0x02,0x4E,0x08,0x8A,0x67,0xCC,0x74,0x02,0x0B,0xBE,0xA6,
+                0x3B,0x13,0x9B,0x22,0x51,0x4A,0x08,0x79,0x8E,0x34,0x04,0xDD,
+                0xEF,0x95,0x19,0xB3,0xCD,0x3A,0x43,0x1B,0x30,0x2B,0x0A,0x6D,
+                0xF2,0x5F,0x14,0x37,0x4F,0xE1,0x35,0x6D,0x6D,0x51,0xC2,0x45,
+                0xE4,0x85,0xB5,0x76,0x62,0x5E,0x7E,0xC6,0xF4,0x4C,0x42,0xE9,
+                0xA6,0x37,0xED,0x6B,0x0B,0xFF,0x5C,0xB6,0xF4,0x06,0xB7,0xED,
+                0xEE,0x38,0x6B,0xFB,0x5A,0x89,0x9F,0xA5,0xAE,0x9F,0x24,0x11,
+                0x7C,0x4B,0x1F,0xE6,0x49,0x28,0x66,0x51,0xEC,0xE4,0x5B,0x3D,
+                0xC2,0x00,0x7C,0xB8,0xA1,0x63,0xBF,0x05,0x98,0xDA,0x48,0x36,
+                0x1C,0x55,0xD3,0x9A,0x69,0x16,0x3F,0xA8,0xFD,0x24,0xCF,0x5F,
+                0x83,0x65,0x5D,0x23,0xDC,0xA3,0xAD,0x96,0x1C,0x62,0xF3,0x56,
+                0x20,0x85,0x52,0xBB,0x9E,0xD5,0x29,0x07,0x70,0x96,0x96,0x6D,
+                0x67,0x0C,0x35,0x4E,0x4A,0xBC,0x98,0x04,0xF1,0x74,0x6C,0x08,
+                0xCA,0x18,0x21,0x7C,0x32,0x90,0x5E,0x46,0x2E,0x36,0xCE,0x3B,
+                0xE3,0x9E,0x77,0x2C,0x18,0x0E,0x86,0x03,0x9B,0x27,0x83,0xA2,
+                0xEC,0x07,0xA2,0x8F,0xB5,0xC5,0x5D,0xF0,0x6F,0x4C,0x52,0xC9,
+                0xDE,0x2B,0xCB,0xF6,0x95,0x58,0x17,0x18,0x39,0x95,0x49,0x7C,
+                0xEA,0x95,0x6A,0xE5,0x15,0xD2,0x26,0x18,0x98,0xFA,0x05,0x10,
+                0x15,0x72,0x8E,0x5A,0x8A,0xAA,0xC4,0x2D,0xAD,0x33,0x17,0x0D,
+                0x04,0x50,0x7A,0x33,0xA8,0x55,0x21,0xAB,0xDF,0x1C,0xBA,0x64,
+                0xEC,0xFB,0x85,0x04,0x58,0xDB,0xEF,0x0A,0x8A,0xEA,0x71,0x57,
+                0x5D,0x06,0x0C,0x7D,0xB3,0x97,0x0F,0x85,0xA6,0xE1,0xE4,0xC7,
+                0xAB,0xF5,0xAE,0x8C,0xDB,0x09,0x33,0xD7,0x1E,0x8C,0x94,0xE0,
+                0x4A,0x25,0x61,0x9D,0xCE,0xE3,0xD2,0x26,0x1A,0xD2,0xEE,0x6B,
+                0xF1,0x2F,0xFA,0x06,0xD9,0x8A,0x08,0x64,0xD8,0x76,0x02,0x73,
+                0x3E,0xC8,0x6A,0x64,0x52,0x1F,0x2B,0x18,0x17,0x7B,0x20,0x0C,
+                0xBB,0xE1,0x17,0x57,0x7A,0x61,0x5D,0x6C,0x77,0x09,0x88,0xC0,
+                0xBA,0xD9,0x46,0xE2,0x08,0xE2,0x4F,0xA0,0x74,0xE5,0xAB,0x31,
+                0x43,0xDB,0x5B,0xFC,0xE0,0xFD,0x10,0x8E,0x4B,0x82,0xD1,0x20,
+                0xA9,0x21,0x08,0x01,0x1A,0x72,0x3C,0x12,0xA7,0x87,0xE6,0xD7,
+                0x88,0x71,0x9A,0x10,0xBD,0xBA,0x5B,0x26,0x99,0xC3,0x27,0x18,
+                0x6A,0xF4,0xE2,0x3C,0x1A,0x94,0x68,0x34,0xB6,0x15,0x0B,0xDA,
+                0x25,0x83,0xE9,0xCA,0x2A,0xD4,0x4C,0xE8,0xDB,0xBB,0xC2,0xDB,
+                0x04,0xDE,0x8E,0xF9,0x2E,0x8E,0xFC,0x14,0x1F,0xBE,0xCA,0xA6,
+                0x28,0x7C,0x59,0x47,0x4E,0x6B,0xC0,0x5D,0x99,0xB2,0x96,0x4F,
+                0xA0,0x90,0xC3,0xA2,0x23,0x3B,0xA1,0x86,0x51,0x5B,0xE7,0xED,
+                0x1F,0x61,0x29,0x70,0xCE,0xE2,0xD7,0xAF,0xB8,0x1B,0xDD,0x76,
+                0x21,0x70,0x48,0x1C,0xD0,0x06,0x91,0x27,0xD5,0xB0,0x5A,0xA9,
+                0x93,0xB4,0xEA,0x98,0x8D,0x8F,0xDD,0xC1,0x86,0xFF,0xB7,0xDC,
+                0x90,0xA6,0xC0,0x8F,0x4D,0xF4,0x35,0xC9,0x34,0x06,0x31,0x99,
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+                };
+        return BN_bin2bn(RFC3526_PRIME_4096,sizeof(RFC3526_PRIME_4096),bn);
+        }
+
+/* "6144-bit MODP Group" from RFC3526, Section 6.
+ *
+ * The prime is: 2^6144 - 2^6080 - 1 + 2^64 * { [2^6014 pi] + 929484 }
+ *
+ * RFC3526 specifies a generator of 2.
+ */
+
+BIGNUM *get_rfc3526_prime_6144(BIGNUM *bn)
+        {
+        static const unsigned char RFC3526_PRIME_6144[]={
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2,
+                0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,
+                0x29,0x02,0x4E,0x08,0x8A,0x67,0xCC,0x74,0x02,0x0B,0xBE,0xA6,
+                0x3B,0x13,0x9B,0x22,0x51,0x4A,0x08,0x79,0x8E,0x34,0x04,0xDD,
+                0xEF,0x95,0x19,0xB3,0xCD,0x3A,0x43,0x1B,0x30,0x2B,0x0A,0x6D,
+                0xF2,0x5F,0x14,0x37,0x4F,0xE1,0x35,0x6D,0x6D,0x51,0xC2,0x45,
+                0xE4,0x85,0xB5,0x76,0x62,0x5E,0x7E,0xC6,0xF4,0x4C,0x42,0xE9,
+                0xA6,0x37,0xED,0x6B,0x0B,0xFF,0x5C,0xB6,0xF4,0x06,0xB7,0xED,
+                0xEE,0x38,0x6B,0xFB,0x5A,0x89,0x9F,0xA5,0xAE,0x9F,0x24,0x11,
+                0x7C,0x4B,0x1F,0xE6,0x49,0x28,0x66,0x51,0xEC,0xE4,0x5B,0x3D,
+                0xC2,0x00,0x7C,0xB8,0xA1,0x63,0xBF,0x05,0x98,0xDA,0x48,0x36,
+                0x1C,0x55,0xD3,0x9A,0x69,0x16,0x3F,0xA8,0xFD,0x24,0xCF,0x5F,
+                0x83,0x65,0x5D,0x23,0xDC,0xA3,0xAD,0x96,0x1C,0x62,0xF3,0x56,
+                0x20,0x85,0x52,0xBB,0x9E,0xD5,0x29,0x07,0x70,0x96,0x96,0x6D,
+                0x67,0x0C,0x35,0x4E,0x4A,0xBC,0x98,0x04,0xF1,0x74,0x6C,0x08,
+                0xCA,0x18,0x21,0x7C,0x32,0x90,0x5E,0x46,0x2E,0x36,0xCE,0x3B,
+                0xE3,0x9E,0x77,0x2C,0x18,0x0E,0x86,0x03,0x9B,0x27,0x83,0xA2,
+                0xEC,0x07,0xA2,0x8F,0xB5,0xC5,0x5D,0xF0,0x6F,0x4C,0x52,0xC9,
+                0xDE,0x2B,0xCB,0xF6,0x95,0x58,0x17,0x18,0x39,0x95,0x49,0x7C,
+                0xEA,0x95,0x6A,0xE5,0x15,0xD2,0x26,0x18,0x98,0xFA,0x05,0x10,
+                0x15,0x72,0x8E,0x5A,0x8A,0xAA,0xC4,0x2D,0xAD,0x33,0x17,0x0D,
+                0x04,0x50,0x7A,0x33,0xA8,0x55,0x21,0xAB,0xDF,0x1C,0xBA,0x64,
+                0xEC,0xFB,0x85,0x04,0x58,0xDB,0xEF,0x0A,0x8A,0xEA,0x71,0x57,
+                0x5D,0x06,0x0C,0x7D,0xB3,0x97,0x0F,0x85,0xA6,0xE1,0xE4,0xC7,
+                0xAB,0xF5,0xAE,0x8C,0xDB,0x09,0x33,0xD7,0x1E,0x8C,0x94,0xE0,
+                0x4A,0x25,0x61,0x9D,0xCE,0xE3,0xD2,0x26,0x1A,0xD2,0xEE,0x6B,
+                0xF1,0x2F,0xFA,0x06,0xD9,0x8A,0x08,0x64,0xD8,0x76,0x02,0x73,
+                0x3E,0xC8,0x6A,0x64,0x52,0x1F,0x2B,0x18,0x17,0x7B,0x20,0x0C,
+                0xBB,0xE1,0x17,0x57,0x7A,0x61,0x5D,0x6C,0x77,0x09,0x88,0xC0,
+                0xBA,0xD9,0x46,0xE2,0x08,0xE2,0x4F,0xA0,0x74,0xE5,0xAB,0x31,
+                0x43,0xDB,0x5B,0xFC,0xE0,0xFD,0x10,0x8E,0x4B,0x82,0xD1,0x20,
+                0xA9,0x21,0x08,0x01,0x1A,0x72,0x3C,0x12,0xA7,0x87,0xE6,0xD7,
+                0x88,0x71,0x9A,0x10,0xBD,0xBA,0x5B,0x26,0x99,0xC3,0x27,0x18,
+                0x6A,0xF4,0xE2,0x3C,0x1A,0x94,0x68,0x34,0xB6,0x15,0x0B,0xDA,
+                0x25,0x83,0xE9,0xCA,0x2A,0xD4,0x4C,0xE8,0xDB,0xBB,0xC2,0xDB,
+                0x04,0xDE,0x8E,0xF9,0x2E,0x8E,0xFC,0x14,0x1F,0xBE,0xCA,0xA6,
+                0x28,0x7C,0x59,0x47,0x4E,0x6B,0xC0,0x5D,0x99,0xB2,0x96,0x4F,
+                0xA0,0x90,0xC3,0xA2,0x23,0x3B,0xA1,0x86,0x51,0x5B,0xE7,0xED,
+                0x1F,0x61,0x29,0x70,0xCE,0xE2,0xD7,0xAF,0xB8,0x1B,0xDD,0x76,
+                0x21,0x70,0x48,0x1C,0xD0,0x06,0x91,0x27,0xD5,0xB0,0x5A,0xA9,
+                0x93,0xB4,0xEA,0x98,0x8D,0x8F,0xDD,0xC1,0x86,0xFF,0xB7,0xDC,
+                0x90,0xA6,0xC0,0x8F,0x4D,0xF4,0x35,0xC9,0x34,0x02,0x84,0x92,
+                0x36,0xC3,0xFA,0xB4,0xD2,0x7C,0x70,0x26,0xC1,0xD4,0xDC,0xB2,
+                0x60,0x26,0x46,0xDE,0xC9,0x75,0x1E,0x76,0x3D,0xBA,0x37,0xBD,
+                0xF8,0xFF,0x94,0x06,0xAD,0x9E,0x53,0x0E,0xE5,0xDB,0x38,0x2F,
+                0x41,0x30,0x01,0xAE,0xB0,0x6A,0x53,0xED,0x90,0x27,0xD8,0x31,
+                0x17,0x97,0x27,0xB0,0x86,0x5A,0x89,0x18,0xDA,0x3E,0xDB,0xEB,
+                0xCF,0x9B,0x14,0xED,0x44,0xCE,0x6C,0xBA,0xCE,0xD4,0xBB,0x1B,
+                0xDB,0x7F,0x14,0x47,0xE6,0xCC,0x25,0x4B,0x33,0x20,0x51,0x51,
+                0x2B,0xD7,0xAF,0x42,0x6F,0xB8,0xF4,0x01,0x37,0x8C,0xD2,0xBF,
+                0x59,0x83,0xCA,0x01,0xC6,0x4B,0x92,0xEC,0xF0,0x32,0xEA,0x15,
+                0xD1,0x72,0x1D,0x03,0xF4,0x82,0xD7,0xCE,0x6E,0x74,0xFE,0xF6,
+                0xD5,0x5E,0x70,0x2F,0x46,0x98,0x0C,0x82,0xB5,0xA8,0x40,0x31,
+                0x90,0x0B,0x1C,0x9E,0x59,0xE7,0xC9,0x7F,0xBE,0xC7,0xE8,0xF3,
+                0x23,0xA9,0x7A,0x7E,0x36,0xCC,0x88,0xBE,0x0F,0x1D,0x45,0xB7,
+                0xFF,0x58,0x5A,0xC5,0x4B,0xD4,0x07,0xB2,0x2B,0x41,0x54,0xAA,
+                0xCC,0x8F,0x6D,0x7E,0xBF,0x48,0xE1,0xD8,0x14,0xCC,0x5E,0xD2,
+                0x0F,0x80,0x37,0xE0,0xA7,0x97,0x15,0xEE,0xF2,0x9B,0xE3,0x28,
+                0x06,0xA1,0xD5,0x8B,0xB7,0xC5,0xDA,0x76,0xF5,0x50,0xAA,0x3D,
+                0x8A,0x1F,0xBF,0xF0,0xEB,0x19,0xCC,0xB1,0xA3,0x13,0xD5,0x5C,
+                0xDA,0x56,0xC9,0xEC,0x2E,0xF2,0x96,0x32,0x38,0x7F,0xE8,0xD7,
+                0x6E,0x3C,0x04,0x68,0x04,0x3E,0x8F,0x66,0x3F,0x48,0x60,0xEE,
+                0x12,0xBF,0x2D,0x5B,0x0B,0x74,0x74,0xD6,0xE6,0x94,0xF9,0x1E,
+                0x6D,0xCC,0x40,0x24,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+                };
+        return BN_bin2bn(RFC3526_PRIME_6144,sizeof(RFC3526_PRIME_6144),bn);
+        }
+
+/* "8192-bit MODP Group" from RFC3526, Section 7.
+ *
+ * The prime is: 2^8192 - 2^8128 - 1 + 2^64 * { [2^8062 pi] + 4743158 }
+ *
+ * RFC3526 specifies a generator of 2.
+ */
+
+BIGNUM *get_rfc3526_prime_8192(BIGNUM *bn)
+        {
+        static const unsigned char RFC3526_PRIME_8192[]={
+                0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xC9,0x0F,0xDA,0xA2,
+                0x21,0x68,0xC2,0x34,0xC4,0xC6,0x62,0x8B,0x80,0xDC,0x1C,0xD1,
+                0x29,0x02,0x4E,0x08,0x8A,0x67,0xCC,0x74,0x02,0x0B,0xBE,0xA6,
+                0x3B,0x13,0x9B,0x22,0x51,0x4A,0x08,0x79,0x8E,0x34,0x04,0xDD,
+                0xEF,0x95,0x19,0xB3,0xCD,0x3A,0x43,0x1B,0x30,0x2B,0x0A,0x6D,
+                0xF2,0x5F,0x14,0x37,0x4F,0xE1,0x35,0x6D,0x6D,0x51,0xC2,0x45,
+                0xE4,0x85,0xB5,0x76,0x62,0x5E,0x7E,0xC6,0xF4,0x4C,0x42,0xE9,
+                0xA6,0x37,0xED,0x6B,0x0B,0xFF,0x5C,0xB6,0xF4,0x06,0xB7,0xED,
+                0xEE,0x38,0x6B,0xFB,0x5A,0x89,0x9F,0xA5,0xAE,0x9F,0x24,0x11,
+                0x7C,0x4B,0x1F,0xE6,0x49,0x28,0x66,0x51,0xEC,0xE4,0x5B,0x3D,
+                0xC2,0x00,0x7C,0xB8,0xA1,0x63,0xBF,0x05,0x98,0xDA,0x48,0x36,
+                0x1C,0x55,0xD3,0x9A,0x69,0x16,0x3F,0xA8,0xFD,0x24,0xCF,0x5F,
+                0x83,0x65,0x5D,0x23,0xDC,0xA3,0xAD,0x96,0x1C,0x62,0xF3,0x56,
+                0x20,0x85,0x52,0xBB,0x9E,0xD5,0x29,0x07,0x70,0x96,0x96,0x6D,
+                0x67,0x0C,0x35,0x4E,0x4A,0xBC,0x98,0x04,0xF1,0x74,0x6C,0x08,
+                0xCA,0x18,0x21,0x7C,0x32,0x90,0x5E,0x46,0x2E,0x36,0xCE,0x3B,
+                0xE3,0x9E,0x77,0x2C,0x18,0x0E,0x86,0x03,0x9B,0x27,0x83,0xA2,
+                0xEC,0x07,0xA2,0x8F,0xB5,0xC5,0x5D,0xF0,0x6F,0x4C,0x52,0xC9,
+                0xDE,0x2B,0xCB,0xF6,0x95,0x58,0x17,0x18,0x39,0x95,0x49,0x7C,
+                0xEA,0x95,0x6A,0xE5,0x15,0xD2,0x26,0x18,0x98,0xFA,0x05,0x10,
+                0x15,0x72,0x8E,0x5A,0x8A,0xAA,0xC4,0x2D,0xAD,0x33,0x17,0x0D,
+                0x04,0x50,0x7A,0x33,0xA8,0x55,0x21,0xAB,0xDF,0x1C,0xBA,0x64,
+                0xEC,0xFB,0x85,0x04,0x58,0xDB,0xEF,0x0A,0x8A,0xEA,0x71,0x57,
+                0x5D,0x06,0x0C,0x7D,0xB3,0x97,0x0F,0x85,0xA6,0xE1,0xE4,0xC7,
+                0xAB,0xF5,0xAE,0x8C,0xDB,0x09,0x33,0xD7,0x1E,0x8C,0x94,0xE0,
+                0x4A,0x25,0x61,0x9D,0xCE,0xE3,0xD2,0x26,0x1A,0xD2,0xEE,0x6B,
+                0xF1,0x2F,0xFA,0x06,0xD9,0x8A,0x08,0x64,0xD8,0x76,0x02,0x73,
+                0x3E,0xC8,0x6A,0x64,0x52,0x1F,0x2B,0x18,0x17,0x7B,0x20,0x0C,
+                0xBB,0xE1,0x17,0x57,0x7A,0x61,0x5D,0x6C,0x77,0x09,0x88,0xC0,
+                0xBA,0xD9,0x46,0xE2,0x08,0xE2,0x4F,0xA0,0x74,0xE5,0xAB,0x31,
+                0x43,0xDB,0x5B,0xFC,0xE0,0xFD,0x10,0x8E,0x4B,0x82,0xD1,0x20,
+                0xA9,0x21,0x08,0x01,0x1A,0x72,0x3C,0x12,0xA7,0x87,0xE6,0xD7,
+                0x88,0x71,0x9A,0x10,0xBD,0xBA,0x5B,0x26,0x99,0xC3,0x27,0x18,
+                0x6A,0xF4,0xE2,0x3C,0x1A,0x94,0x68,0x34,0xB6,0x15,0x0B,0xDA,
+                0x25,0x83,0xE9,0xCA,0x2A,0xD4,0x4C,0xE8,0xDB,0xBB,0xC2,0xDB,
+                0x04,0xDE,0x8E,0xF9,0x2E,0x8E,0xFC,0x14,0x1F,0xBE,0xCA,0xA6,
+                0x28,0x7C,0x59,0x47,0x4E,0x6B,0xC0,0x5D,0x99,0xB2,0x96,0x4F,
+                0xA0,0x90,0xC3,0xA2,0x23,0x3B,0xA1,0x86,0x51,0x5B,0xE7,0xED,
+                0x1F,0x61,0x29,0x70,0xCE,0xE2,0xD7,0xAF,0xB8,0x1B,0xDD,0x76,
+                0x21,0x70,0x48,0x1C,0xD0,0x06,0x91,0x27,0xD5,0xB0,0x5A,0xA9,
+                0x93,0xB4,0xEA,0x98,0x8D,0x8F,0xDD,0xC1,0x86,0xFF,0xB7,0xDC,
+                0x90,0xA6,0xC0,0x8F,0x4D,0xF4,0x35,0xC9,0x34,0x02,0x84,0x92,
+                0x36,0xC3,0xFA,0xB4,0xD2,0x7C,0x70,0x26,0xC1,0xD4,0xDC,0xB2,
+                0x60,0x26,0x46,0xDE,0xC9,0x75,0x1E,0x76,0x3D,0xBA,0x37,0xBD,
+                0xF8,0xFF,0x94,0x06,0xAD,0x9E,0x53,0x0E,0xE5,0xDB,0x38,0x2F,
+                0x41,0x30,0x01,0xAE,0xB0,0x6A,0x53,0xED,0x90,0x27,0xD8,0x31,
+                0x17,0x97,0x27,0xB0,0x86,0x5A,0x89,0x18,0xDA,0x3E,0xDB,0xEB,
+                0xCF,0x9B,0x14,0xED,0x44,0xCE,0x6C,0xBA,0xCE,0xD4,0xBB,0x1B,
+                0xDB,0x7F,0x14,0x47,0xE6,0xCC,0x25,0x4B,0x33,0x20,0x51,0x51,
+                0x2B,0xD7,0xAF,0x42,0x6F,0xB8,0xF4,0x01,0x37,0x8C,0xD2,0xBF,
+                0x59,0x83,0xCA,0x01,0xC6,0x4B,0x92,0xEC,0xF0,0x32,0xEA,0x15,
+                0xD1,0x72,0x1D,0x03,0xF4,0x82,0xD7,0xCE,0x6E,0x74,0xFE,0xF6,
+                0xD5,0x5E,0x70,0x2F,0x46,0x98,0x0C,0x82,0xB5,0xA8,0x40,0x31,
+                0x90,0x0B,0x1C,0x9E,0x59,0xE7,0xC9,0x7F,0xBE,0xC7,0xE8,0xF3,
+                0x23,0xA9,0x7A,0x7E,0x36,0xCC,0x88,0xBE,0x0F,0x1D,0x45,0xB7,
+                0xFF,0x58,0x5A,0xC5,0x4B,0xD4,0x07,0xB2,0x2B,0x41,0x54,0xAA,
+                0xCC,0x8F,0x6D,0x7E,0xBF,0x48,0xE1,0xD8,0x14,0xCC,0x5E,0xD2,
+                0x0F,0x80,0x37,0xE0,0xA7,0x97,0x15,0xEE,0xF2,0x9B,0xE3,0x28,
+                0x06,0xA1,0xD5,0x8B,0xB7,0xC5,0xDA,0x76,0xF5,0x50,0xAA,0x3D,
+                0x8A,0x1F,0xBF,0xF0,0xEB,0x19,0xCC,0xB1,0xA3,0x13,0xD5,0x5C,
+                0xDA,0x56,0xC9,0xEC,0x2E,0xF2,0x96,0x32,0x38,0x7F,0xE8,0xD7,
+                0x6E,0x3C,0x04,0x68,0x04,0x3E,0x8F,0x66,0x3F,0x48,0x60,0xEE,
+                0x12,0xBF,0x2D,0x5B,0x0B,0x74,0x74,0xD6,0xE6,0x94,0xF9,0x1E,
+                0x6D,0xBE,0x11,0x59,0x74,0xA3,0x92,0x6F,0x12,0xFE,0xE5,0xE4,
+                0x38,0x77,0x7C,0xB6,0xA9,0x32,0xDF,0x8C,0xD8,0xBE,0xC4,0xD0,
+                0x73,0xB9,0x31,0xBA,0x3B,0xC8,0x32,0xB6,0x8D,0x9D,0xD3,0x00,
+                0x74,0x1F,0xA7,0xBF,0x8A,0xFC,0x47,0xED,0x25,0x76,0xF6,0x93,
+                0x6B,0xA4,0x24,0x66,0x3A,0xAB,0x63,0x9C,0x5A,0xE4,0xF5,0x68,
+                0x34,0x23,0xB4,0x74,0x2B,0xF1,0xC9,0x78,0x23,0x8F,0x16,0xCB,
+                0xE3,0x9D,0x65,0x2D,0xE3,0xFD,0xB8,0xBE,0xFC,0x84,0x8A,0xD9,
+                0x22,0x22,0x2E,0x04,0xA4,0x03,0x7C,0x07,0x13,0xEB,0x57,0xA8,
+                0x1A,0x23,0xF0,0xC7,0x34,0x73,0xFC,0x64,0x6C,0xEA,0x30,0x6B,
+                0x4B,0xCB,0xC8,0x86,0x2F,0x83,0x85,0xDD,0xFA,0x9D,0x4B,0x7F,
+                0xA2,0xC0,0x87,0xE8,0x79,0x68,0x33,0x03,0xED,0x5B,0xDD,0x3A,
+                0x06,0x2B,0x3C,0xF5,0xB3,0xA2,0x78,0xA6,0x6D,0x2A,0x13,0xF8,
+                0x3F,0x44,0xF8,0x2D,0xDF,0x31,0x0E,0xE0,0x74,0xAB,0x6A,0x36,
+                0x45,0x97,0xE8,0x99,0xA0,0x25,0x5D,0xC1,0x64,0xF3,0x1C,0xC5,
+                0x08,0x46,0x85,0x1D,0xF9,0xAB,0x48,0x19,0x5D,0xED,0x7E,0xA1,
+                0xB1,0xD5,0x10,0xBD,0x7E,0xE7,0x4D,0x73,0xFA,0xF3,0x6B,0xC3,
+                0x1E,0xCF,0xA2,0x68,0x35,0x90,0x46,0xF4,0xEB,0x87,0x9F,0x92,
+                0x40,0x09,0x43,0x8B,0x48,0x1C,0x6C,0xD7,0x88,0x9A,0x00,0x2E,
+                0xD5,0xEE,0x38,0x2B,0xC9,0x19,0x0D,0xA6,0xFC,0x02,0x6E,0x47,
+                0x95,0x58,0xE4,0x47,0x56,0x77,0xE9,0xAA,0x9E,0x30,0x50,0xE2,
+                0x76,0x56,0x94,0xDF,0xC8,0x1F,0x56,0xE8,0x80,0xB9,0x6E,0x71,
+                0x60,0xC9,0x80,0xDD,0x98,0xED,0xD3,0xDF,0xFF,0xFF,0xFF,0xFF,
+                0xFF,0xFF,0xFF,0xFF,
+                };
+        return BN_bin2bn(RFC3526_PRIME_8192,sizeof(RFC3526_PRIME_8192),bn);
+        }
+
diff --git a/src/lib/libssl/src/crypto/bn/bn_depr.c b/src/lib/libssl/src/crypto/bn/bn_depr.c
new file mode 100644
index 0000000000..27535e4fca
--- /dev/null
+++ b/src/lib/libssl/src/crypto/bn/bn_depr.c
@@ -0,0 +1,112 @@
+/* crypto/bn/bn_depr.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* Support for deprecated functions goes here - static linkage will only slurp
+ * this code if applications are using them directly. */
+
+#include <stdio.h>
+#include <time.h>
+#include "cryptlib.h"
+#include "bn_lcl.h"
+#include <openssl/rand.h>
+
+static void *dummy=&dummy;
+
+#ifndef OPENSSL_NO_DEPRECATED
+BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
+        const BIGNUM *add, const BIGNUM *rem,
+        void (*callback)(int,int,void *), void *cb_arg)
+        {
+        BN_GENCB cb;
+        BIGNUM *rnd=NULL;
+        int found = 0;
+
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+
+        if (ret == NULL)
+                {
+                if ((rnd=BN_new()) == NULL) goto err;
+                }
+        else
+                rnd=ret;
+        if(!BN_generate_prime_ex(rnd, bits, safe, add, rem, &cb))
+                goto err;
+
+        /* we have a prime :-) */
+        found = 1;
+err:
+        if (!found && (ret == NULL) && (rnd != NULL)) BN_free(rnd);
+        return(found ? rnd : NULL);
+        }
+
+int BN_is_prime(const BIGNUM *a, int checks, void (*callback)(int,int,void *),
+        BN_CTX *ctx_passed, void *cb_arg)
+        {
+        BN_GENCB cb;
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+        return BN_is_prime_ex(a, checks, ctx_passed, &cb);
+        }
+
+int BN_is_prime_fasttest(const BIGNUM *a, int checks,
+                void (*callback)(int,int,void *),
+                BN_CTX *ctx_passed, void *cb_arg,
+                int do_trial_division)
+        {
+        BN_GENCB cb;
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+        return BN_is_prime_fasttest_ex(a, checks, ctx_passed,
+                                do_trial_division, &cb);
+        }
+#endif
diff --git a/src/lib/libssl/src/crypto/bn/bn_gf2m.c b/src/lib/libssl/src/crypto/bn/bn_gf2m.c
new file mode 100644
index 0000000000..6a793857e1
--- /dev/null
+++ b/src/lib/libssl/src/crypto/bn/bn_gf2m.c
@@ -0,0 +1,1091 @@
+/* crypto/bn/bn_gf2m.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * In addition, Sun covenants to all licensees who provide a reciprocal
+ * covenant with respect to their own patents if any, not to sue under
+ * current and future patent claims necessarily infringed by the making,
+ * using, practicing, selling, offering for sale and/or otherwise
+ * disposing of the ECC Code as delivered hereunder (or portions thereof),
+ * provided that such covenant shall not apply:
+ *  1) for code that a licensee deletes from the ECC Code;
+ *  2) separates from the ECC Code; or
+ *  3) for infringements caused by:
+ *       i) the modification of the ECC Code or
+ *      ii) the combination of the ECC Code with other software or
+ *          devices where such combination causes the infringement.
+ *
+ * The software is originally written by Sheueling Chang Shantz and
+ * Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+
+/* NOTE: This file is licensed pursuant to the OpenSSL license below
+ * and may be modified; but after modifications, the above covenant
+ * may no longer apply!  In such cases, the corresponding paragraph
+ * ["In addition, Sun covenants ... causes the infringement."] and
+ * this note can be edited out; but please keep the Sun copyright
+ * notice and attribution. */
+
+/* ====================================================================
+ * Copyright (c) 1998-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <assert.h>
+#include <limits.h>
+#include <stdio.h>
+#include "cryptlib.h"
+#include "bn_lcl.h"
+
+/* Maximum number of iterations before BN_GF2m_mod_solve_quad_arr should fail. */
+#define MAX_ITERATIONS 50
+
+static const BN_ULONG SQR_tb[16] =
+  {     0,     1,     4,     5,    16,    17,    20,    21,
+       64,    65,    68,    69,    80,    81,    84,    85 };
+/* Platform-specific macros to accelerate squaring. */
+#if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
+#define SQR1(w) \
+    SQR_tb[(w) >> 60 & 0xF] << 56 | SQR_tb[(w) >> 56 & 0xF] << 48 | \
+    SQR_tb[(w) >> 52 & 0xF] << 40 | SQR_tb[(w) >> 48 & 0xF] << 32 | \
+    SQR_tb[(w) >> 44 & 0xF] << 24 | SQR_tb[(w) >> 40 & 0xF] << 16 | \
+    SQR_tb[(w) >> 36 & 0xF] <<  8 | SQR_tb[(w) >> 32 & 0xF]
+#define SQR0(w) \
+    SQR_tb[(w) >> 28 & 0xF] << 56 | SQR_tb[(w) >> 24 & 0xF] << 48 | \
+    SQR_tb[(w) >> 20 & 0xF] << 40 | SQR_tb[(w) >> 16 & 0xF] << 32 | \
+    SQR_tb[(w) >> 12 & 0xF] << 24 | SQR_tb[(w) >>  8 & 0xF] << 16 | \
+    SQR_tb[(w) >>  4 & 0xF] <<  8 | SQR_tb[(w)       & 0xF]
+#endif
+#ifdef THIRTY_TWO_BIT
+#define SQR1(w) \
+    SQR_tb[(w) >> 28 & 0xF] << 24 | SQR_tb[(w) >> 24 & 0xF] << 16 | \
+    SQR_tb[(w) >> 20 & 0xF] <<  8 | SQR_tb[(w) >> 16 & 0xF]
+#define SQR0(w) \
+    SQR_tb[(w) >> 12 & 0xF] << 24 | SQR_tb[(w) >>  8 & 0xF] << 16 | \
+    SQR_tb[(w) >>  4 & 0xF] <<  8 | SQR_tb[(w)       & 0xF]
+#endif
+#ifdef SIXTEEN_BIT
+#define SQR1(w) \
+    SQR_tb[(w) >> 12 & 0xF] <<  8 | SQR_tb[(w) >>  8 & 0xF]
+#define SQR0(w) \
+    SQR_tb[(w) >>  4 & 0xF] <<  8 | SQR_tb[(w)       & 0xF]
+#endif
+#ifdef EIGHT_BIT
+#define SQR1(w) \
+    SQR_tb[(w) >>  4 & 0xF]
+#define SQR0(w) \
+    SQR_tb[(w)       & 15]
+#endif
+
+/* Product of two polynomials a, b each with degree < BN_BITS2 - 1,
+ * result is a polynomial r with degree < 2 * BN_BITS - 1
+ * The caller MUST ensure that the variables have the right amount
+ * of space allocated.
+ */
+#ifdef EIGHT_BIT
+static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a, const BN_ULONG b)
+        {
+        register BN_ULONG h, l, s;
+        BN_ULONG tab[4], top1b = a >> 7;
+        register BN_ULONG a1, a2;
+
+        a1 = a & (0x7F); a2 = a1 << 1;
+
+        tab[0] = 0; tab[1] = a1; tab[2] = a2; tab[3] = a1^a2;
+
+        s = tab[b      & 0x3]; l  = s;
+        s = tab[b >> 2 & 0x3]; l ^= s << 2; h  = s >> 6;
+        s = tab[b >> 4 & 0x3]; l ^= s << 4; h ^= s >> 4;
+        s = tab[b >> 6      ]; l ^= s << 6; h ^= s >> 2;
+        
+        /* compensate for the top bit of a */
+
+        if (top1b & 01) { l ^= b << 7; h ^= b >> 1; } 
+
+        *r1 = h; *r0 = l;
+        } 
+#endif
+#ifdef SIXTEEN_BIT
+static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a, const BN_ULONG b)
+        {
+        register BN_ULONG h, l, s;
+        BN_ULONG tab[4], top1b = a >> 15; 
+        register BN_ULONG a1, a2;
+
+        a1 = a & (0x7FFF); a2 = a1 << 1;
+
+        tab[0] = 0; tab[1] = a1; tab[2] = a2; tab[3] = a1^a2;
+
+        s = tab[b      & 0x3]; l  = s;
+        s = tab[b >> 2 & 0x3]; l ^= s <<  2; h  = s >> 14;
+        s = tab[b >> 4 & 0x3]; l ^= s <<  4; h ^= s >> 12;
+        s = tab[b >> 6 & 0x3]; l ^= s <<  6; h ^= s >> 10;
+        s = tab[b >> 8 & 0x3]; l ^= s <<  8; h ^= s >>  8;
+        s = tab[b >>10 & 0x3]; l ^= s << 10; h ^= s >>  6;
+        s = tab[b >>12 & 0x3]; l ^= s << 12; h ^= s >>  4;
+        s = tab[b >>14      ]; l ^= s << 14; h ^= s >>  2;
+
+        /* compensate for the top bit of a */
+
+        if (top1b & 01) { l ^= b << 15; h ^= b >> 1; } 
+
+        *r1 = h; *r0 = l;
+        } 
+#endif
+#ifdef THIRTY_TWO_BIT
+static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a, const BN_ULONG b)
+        {
+        register BN_ULONG h, l, s;
+        BN_ULONG tab[8], top2b = a >> 30; 
+        register BN_ULONG a1, a2, a4;
+
+        a1 = a & (0x3FFFFFFF); a2 = a1 << 1; a4 = a2 << 1;
+
+        tab[0] =  0; tab[1] = a1;    tab[2] = a2;    tab[3] = a1^a2;
+        tab[4] = a4; tab[5] = a1^a4; tab[6] = a2^a4; tab[7] = a1^a2^a4;
+
+        s = tab[b       & 0x7]; l  = s;
+        s = tab[b >>  3 & 0x7]; l ^= s <<  3; h  = s >> 29;
+        s = tab[b >>  6 & 0x7]; l ^= s <<  6; h ^= s >> 26;
+        s = tab[b >>  9 & 0x7]; l ^= s <<  9; h ^= s >> 23;
+        s = tab[b >> 12 & 0x7]; l ^= s << 12; h ^= s >> 20;
+        s = tab[b >> 15 & 0x7]; l ^= s << 15; h ^= s >> 17;
+        s = tab[b >> 18 & 0x7]; l ^= s << 18; h ^= s >> 14;
+        s = tab[b >> 21 & 0x7]; l ^= s << 21; h ^= s >> 11;
+        s = tab[b >> 24 & 0x7]; l ^= s << 24; h ^= s >>  8;
+        s = tab[b >> 27 & 0x7]; l ^= s << 27; h ^= s >>  5;
+        s = tab[b >> 30      ]; l ^= s << 30; h ^= s >>  2;
+
+        /* compensate for the top two bits of a */
+
+        if (top2b & 01) { l ^= b << 30; h ^= b >> 2; } 
+        if (top2b & 02) { l ^= b << 31; h ^= b >> 1; } 
+
+        *r1 = h; *r0 = l;
+        } 
+#endif
+#if defined(SIXTY_FOUR_BIT) || defined(SIXTY_FOUR_BIT_LONG)
+static void bn_GF2m_mul_1x1(BN_ULONG *r1, BN_ULONG *r0, const BN_ULONG a, const BN_ULONG b)
+        {
+        register BN_ULONG h, l, s;
+        BN_ULONG tab[16], top3b = a >> 61;
+        register BN_ULONG a1, a2, a4, a8;
+
+        a1 = a & (0x1FFFFFFFFFFFFFFFULL); a2 = a1 << 1; a4 = a2 << 1; a8 = a4 << 1;
+
+        tab[ 0] = 0;     tab[ 1] = a1;       tab[ 2] = a2;       tab[ 3] = a1^a2;
+        tab[ 4] = a4;    tab[ 5] = a1^a4;    tab[ 6] = a2^a4;    tab[ 7] = a1^a2^a4;
+        tab[ 8] = a8;    tab[ 9] = a1^a8;    tab[10] = a2^a8;    tab[11] = a1^a2^a8;
+        tab[12] = a4^a8; tab[13] = a1^a4^a8; tab[14] = a2^a4^a8; tab[15] = a1^a2^a4^a8;
+
+        s = tab[b       & 0xF]; l  = s;
+        s = tab[b >>  4 & 0xF]; l ^= s <<  4; h  = s >> 60;
+        s = tab[b >>  8 & 0xF]; l ^= s <<  8; h ^= s >> 56;
+        s = tab[b >> 12 & 0xF]; l ^= s << 12; h ^= s >> 52;
+        s = tab[b >> 16 & 0xF]; l ^= s << 16; h ^= s >> 48;
+        s = tab[b >> 20 & 0xF]; l ^= s << 20; h ^= s >> 44;
+        s = tab[b >> 24 & 0xF]; l ^= s << 24; h ^= s >> 40;
+        s = tab[b >> 28 & 0xF]; l ^= s << 28; h ^= s >> 36;
+        s = tab[b >> 32 & 0xF]; l ^= s << 32; h ^= s >> 32;
+        s = tab[b >> 36 & 0xF]; l ^= s << 36; h ^= s >> 28;
+        s = tab[b >> 40 & 0xF]; l ^= s << 40; h ^= s >> 24;
+        s = tab[b >> 44 & 0xF]; l ^= s << 44; h ^= s >> 20;
+        s = tab[b >> 48 & 0xF]; l ^= s << 48; h ^= s >> 16;
+        s = tab[b >> 52 & 0xF]; l ^= s << 52; h ^= s >> 12;
+        s = tab[b >> 56 & 0xF]; l ^= s << 56; h ^= s >>  8;
+        s = tab[b >> 60      ]; l ^= s << 60; h ^= s >>  4;
+
+        /* compensate for the top three bits of a */
+
+        if (top3b & 01) { l ^= b << 61; h ^= b >> 3; } 
+        if (top3b & 02) { l ^= b << 62; h ^= b >> 2; } 
+        if (top3b & 04) { l ^= b << 63; h ^= b >> 1; } 
+
+        *r1 = h; *r0 = l;
+        } 
+#endif
+
+/* Product of two polynomials a, b each with degree < 2 * BN_BITS2 - 1,
+ * result is a polynomial r with degree < 4 * BN_BITS2 - 1
+ * The caller MUST ensure that the variables have the right amount
+ * of space allocated.
+ */
+static void bn_GF2m_mul_2x2(BN_ULONG *r, const BN_ULONG a1, const BN_ULONG a0, const BN_ULONG b1, const BN_ULONG b0)
+        {
+        BN_ULONG m1, m0;
+        /* r[3] = h1, r[2] = h0; r[1] = l1; r[0] = l0 */
+        bn_GF2m_mul_1x1(r+3, r+2, a1, b1);
+        bn_GF2m_mul_1x1(r+1, r, a0, b0);
+        bn_GF2m_mul_1x1(&m1, &m0, a0 ^ a1, b0 ^ b1);
+        /* Correction on m1 ^= l1 ^ h1; m0 ^= l0 ^ h0; */
+        r[2] ^= m1 ^ r[1] ^ r[3];  /* h0 ^= m1 ^ l1 ^ h1; */
+        r[1] = r[3] ^ r[2] ^ r[0] ^ m1 ^ m0;  /* l1 ^= l0 ^ h0 ^ m0; */
+        }
+
+
+/* Add polynomials a and b and store result in r; r could be a or b, a and b 
+ * could be equal; r is the bitwise XOR of a and b.
+ */
+int     BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b)
+        {
+        int i;
+        const BIGNUM *at, *bt;
+
+        bn_check_top(a);
+        bn_check_top(b);
+
+        if (a->top < b->top) { at = b; bt = a; }
+        else { at = a; bt = b; }
+
+        bn_wexpand(r, at->top);
+
+        for (i = 0; i < bt->top; i++)
+                {
+                r->d[i] = at->d[i] ^ bt->d[i];
+                }
+        for (; i < at->top; i++)
+                {
+                r->d[i] = at->d[i];
+                }
+        
+        r->top = at->top;
+        bn_correct_top(r);
+        
+        return 1;
+        }
+
+
+/* Some functions allow for representation of the irreducible polynomials
+ * as an int[], say p.  The irreducible f(t) is then of the form:
+ *     t^p[0] + t^p[1] + ... + t^p[k]
+ * where m = p[0] > p[1] > ... > p[k] = 0.
+ */
+
+
+/* Performs modular reduction of a and store result in r.  r could be a. */
+int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[])
+        {
+        int j, k;
+        int n, dN, d0, d1;
+        BN_ULONG zz, *z;
+
+        bn_check_top(a);
+
+        if (!p[0])
+                {
+                /* reduction mod 1 => return 0 */
+                BN_zero(r);
+                return 1;
+                }
+
+        /* Since the algorithm does reduction in the r value, if a != r, copy
+         * the contents of a into r so we can do reduction in r. 
+         */
+        if (a != r)
+                {
+                if (!bn_wexpand(r, a->top)) return 0;
+                for (j = 0; j < a->top; j++)
+                        {
+                        r->d[j] = a->d[j];
+                        }
+                r->top = a->top;
+                }
+        z = r->d;
+
+        /* start reduction */
+        dN = p[0] / BN_BITS2;  
+        for (j = r->top - 1; j > dN;)
+                {
+                zz = z[j];
+                if (z[j] == 0) { j--; continue; }
+                z[j] = 0;
+
+                for (k = 1; p[k] != 0; k++)
+                        {
+                        /* reducing component t^p[k] */
+                        n = p[0] - p[k];
+                        d0 = n % BN_BITS2;  d1 = BN_BITS2 - d0;
+                        n /= BN_BITS2; 
+                        z[j-n] ^= (zz>>d0);
+                        if (d0) z[j-n-1] ^= (zz<<d1);
+                        }
+
+                /* reducing component t^0 */
+                n = dN;  
+                d0 = p[0] % BN_BITS2;
+                d1 = BN_BITS2 - d0;
+                z[j-n] ^= (zz >> d0);
+                if (d0) z[j-n-1] ^= (zz << d1);
+                }
+
+        /* final round of reduction */
+        while (j == dN)
+                {
+
+                d0 = p[0] % BN_BITS2;
+                zz = z[dN] >> d0;
+                if (zz == 0) break;
+                d1 = BN_BITS2 - d0;
+                
+                if (d0) z[dN] = (z[dN] << d1) >> d1; /* clear up the top d1 bits */
+                z[0] ^= zz; /* reduction t^0 component */
+
+                for (k = 1; p[k] != 0; k++)
+                        {
+                        BN_ULONG tmp_ulong;
+
+                        /* reducing component t^p[k]*/
+                        n = p[k] / BN_BITS2;   
+                        d0 = p[k] % BN_BITS2;
+                        d1 = BN_BITS2 - d0;
+                        z[n] ^= (zz << d0);
+                        tmp_ulong = zz >> d1;
+                        if (d0 && tmp_ulong)
+                                z[n+1] ^= tmp_ulong;
+                        }
+
+                
+                }
+
+        bn_correct_top(r);
+        return 1;
+        }
+
+/* Performs modular reduction of a by p and store result in r.  r could be a.
+ *
+ * This function calls down to the BN_GF2m_mod_arr implementation; this wrapper
+ * function is only provided for convenience; for best performance, use the 
+ * BN_GF2m_mod_arr function.
+ */
+int     BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p)
+        {
+        int ret = 0;
+        const int max = BN_num_bits(p);
+        unsigned int *arr=NULL;
+        bn_check_top(a);
+        bn_check_top(p);
+        if ((arr = (unsigned int *)OPENSSL_malloc(sizeof(unsigned int) * max)) == NULL) goto err;
+        ret = BN_GF2m_poly2arr(p, arr, max);
+        if (!ret || ret > max)
+                {
+                BNerr(BN_F_BN_GF2M_MOD,BN_R_INVALID_LENGTH);
+                goto err;
+                }
+        ret = BN_GF2m_mod_arr(r, a, arr);
+        bn_check_top(r);
+err:
+        if (arr) OPENSSL_free(arr);
+        return ret;
+        }
+
+
+/* Compute the product of two polynomials a and b, reduce modulo p, and store
+ * the result in r.  r could be a or b; a could be b.
+ */
+int     BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const unsigned int p[], BN_CTX *ctx)
+        {
+        int zlen, i, j, k, ret = 0;
+        BIGNUM *s;
+        BN_ULONG x1, x0, y1, y0, zz[4];
+
+        bn_check_top(a);
+        bn_check_top(b);
+
+        if (a == b)
+                {
+                return BN_GF2m_mod_sqr_arr(r, a, p, ctx);
+                }
+
+        BN_CTX_start(ctx);
+        if ((s = BN_CTX_get(ctx)) == NULL) goto err;
+        
+        zlen = a->top + b->top + 4;
+        if (!bn_wexpand(s, zlen)) goto err;
+        s->top = zlen;
+
+        for (i = 0; i < zlen; i++) s->d[i] = 0;
+
+        for (j = 0; j < b->top; j += 2)
+                {
+                y0 = b->d[j];
+                y1 = ((j+1) == b->top) ? 0 : b->d[j+1];
+                for (i = 0; i < a->top; i += 2)
+                        {
+                        x0 = a->d[i];
+                        x1 = ((i+1) == a->top) ? 0 : a->d[i+1];
+                        bn_GF2m_mul_2x2(zz, x1, x0, y1, y0);
+                        for (k = 0; k < 4; k++) s->d[i+j+k] ^= zz[k];
+                        }
+                }
+
+        bn_correct_top(s);
+        if (BN_GF2m_mod_arr(r, s, p))
+                ret = 1;
+        bn_check_top(r);
+
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Compute the product of two polynomials a and b, reduce modulo p, and store
+ * the result in r.  r could be a or b; a could equal b.
+ *
+ * This function calls down to the BN_GF2m_mod_mul_arr implementation; this wrapper
+ * function is only provided for convenience; for best performance, use the 
+ * BN_GF2m_mod_mul_arr function.
+ */
+int     BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx)
+        {
+        int ret = 0;
+        const int max = BN_num_bits(p);
+        unsigned int *arr=NULL;
+        bn_check_top(a);
+        bn_check_top(b);
+        bn_check_top(p);
+        if ((arr = (unsigned int *)OPENSSL_malloc(sizeof(unsigned int) * max)) == NULL) goto err;
+        ret = BN_GF2m_poly2arr(p, arr, max);
+        if (!ret || ret > max)
+                {
+                BNerr(BN_F_BN_GF2M_MOD_MUL,BN_R_INVALID_LENGTH);
+                goto err;
+                }
+        ret = BN_GF2m_mod_mul_arr(r, a, b, arr, ctx);
+        bn_check_top(r);
+err:
+        if (arr) OPENSSL_free(arr);
+        return ret;
+        }
+
+
+/* Square a, reduce the result mod p, and store it in a.  r could be a. */
+int     BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[], BN_CTX *ctx)
+        {
+        int i, ret = 0;
+        BIGNUM *s;
+
+        bn_check_top(a);
+        BN_CTX_start(ctx);
+        if ((s = BN_CTX_get(ctx)) == NULL) return 0;
+        if (!bn_wexpand(s, 2 * a->top)) goto err;
+
+        for (i = a->top - 1; i >= 0; i--)
+                {
+                s->d[2*i+1] = SQR1(a->d[i]);
+                s->d[2*i  ] = SQR0(a->d[i]);
+                }
+
+        s->top = 2 * a->top;
+        bn_correct_top(s);
+        if (!BN_GF2m_mod_arr(r, s, p)) goto err;
+        bn_check_top(r);
+        ret = 1;
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Square a, reduce the result mod p, and store it in a.  r could be a.
+ *
+ * This function calls down to the BN_GF2m_mod_sqr_arr implementation; this wrapper
+ * function is only provided for convenience; for best performance, use the 
+ * BN_GF2m_mod_sqr_arr function.
+ */
+int     BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
+        {
+        int ret = 0;
+        const int max = BN_num_bits(p);
+        unsigned int *arr=NULL;
+
+        bn_check_top(a);
+        bn_check_top(p);
+        if ((arr = (unsigned int *)OPENSSL_malloc(sizeof(unsigned int) * max)) == NULL) goto err;
+        ret = BN_GF2m_poly2arr(p, arr, max);
+        if (!ret || ret > max)
+                {
+                BNerr(BN_F_BN_GF2M_MOD_SQR,BN_R_INVALID_LENGTH);
+                goto err;
+                }
+        ret = BN_GF2m_mod_sqr_arr(r, a, arr, ctx);
+        bn_check_top(r);
+err:
+        if (arr) OPENSSL_free(arr);
+        return ret;
+        }
+
+
+/* Invert a, reduce modulo p, and store the result in r. r could be a. 
+ * Uses Modified Almost Inverse Algorithm (Algorithm 10) from
+ *     Hankerson, D., Hernandez, J.L., and Menezes, A.  "Software Implementation
+ *     of Elliptic Curve Cryptography Over Binary Fields".
+ */
+int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
+        {
+        BIGNUM *b, *c, *u, *v, *tmp;
+        int ret = 0;
+
+        bn_check_top(a);
+        bn_check_top(p);
+
+        BN_CTX_start(ctx);
+        
+        b = BN_CTX_get(ctx);
+        c = BN_CTX_get(ctx);
+        u = BN_CTX_get(ctx);
+        v = BN_CTX_get(ctx);
+        if (v == NULL) goto err;
+
+        if (!BN_one(b)) goto err;
+        if (!BN_GF2m_mod(u, a, p)) goto err;
+        if (!BN_copy(v, p)) goto err;
+
+        if (BN_is_zero(u)) goto err;
+
+        while (1)
+                {
+                while (!BN_is_odd(u))
+                        {
+                        if (!BN_rshift1(u, u)) goto err;
+                        if (BN_is_odd(b))
+                                {
+                                if (!BN_GF2m_add(b, b, p)) goto err;
+                                }
+                        if (!BN_rshift1(b, b)) goto err;
+                        }
+
+                if (BN_abs_is_word(u, 1)) break;
+
+                if (BN_num_bits(u) < BN_num_bits(v))
+                        {
+                        tmp = u; u = v; v = tmp;
+                        tmp = b; b = c; c = tmp;
+                        }
+                
+                if (!BN_GF2m_add(u, u, v)) goto err;
+                if (!BN_GF2m_add(b, b, c)) goto err;
+                }
+
+
+        if (!BN_copy(r, b)) goto err;
+        bn_check_top(r);
+        ret = 1;
+
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Invert xx, reduce modulo p, and store the result in r. r could be xx. 
+ *
+ * This function calls down to the BN_GF2m_mod_inv implementation; this wrapper
+ * function is only provided for convenience; for best performance, use the 
+ * BN_GF2m_mod_inv function.
+ */
+int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *xx, const unsigned int p[], BN_CTX *ctx)
+        {
+        BIGNUM *field;
+        int ret = 0;
+
+        bn_check_top(xx);
+        BN_CTX_start(ctx);
+        if ((field = BN_CTX_get(ctx)) == NULL) goto err;
+        if (!BN_GF2m_arr2poly(p, field)) goto err;
+        
+        ret = BN_GF2m_mod_inv(r, xx, field, ctx);
+        bn_check_top(r);
+
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+
+#ifndef OPENSSL_SUN_GF2M_DIV
+/* Divide y by x, reduce modulo p, and store the result in r. r could be x 
+ * or y, x could equal y.
+ */
+int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x, const BIGNUM *p, BN_CTX *ctx)
+        {
+        BIGNUM *xinv = NULL;
+        int ret = 0;
+
+        bn_check_top(y);
+        bn_check_top(x);
+        bn_check_top(p);
+
+        BN_CTX_start(ctx);
+        xinv = BN_CTX_get(ctx);
+        if (xinv == NULL) goto err;
+        
+        if (!BN_GF2m_mod_inv(xinv, x, p, ctx)) goto err;
+        if (!BN_GF2m_mod_mul(r, y, xinv, p, ctx)) goto err;
+        bn_check_top(r);
+        ret = 1;
+
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+#else
+/* Divide y by x, reduce modulo p, and store the result in r. r could be x 
+ * or y, x could equal y.
+ * Uses algorithm Modular_Division_GF(2^m) from 
+ *     Chang-Shantz, S.  "From Euclid's GCD to Montgomery Multiplication to 
+ *     the Great Divide".
+ */
+int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *y, const BIGNUM *x, const BIGNUM *p, BN_CTX *ctx)
+        {
+        BIGNUM *a, *b, *u, *v;
+        int ret = 0;
+
+        bn_check_top(y);
+        bn_check_top(x);
+        bn_check_top(p);
+
+        BN_CTX_start(ctx);
+        
+        a = BN_CTX_get(ctx);
+        b = BN_CTX_get(ctx);
+        u = BN_CTX_get(ctx);
+        v = BN_CTX_get(ctx);
+        if (v == NULL) goto err;
+
+        /* reduce x and y mod p */
+        if (!BN_GF2m_mod(u, y, p)) goto err;
+        if (!BN_GF2m_mod(a, x, p)) goto err;
+        if (!BN_copy(b, p)) goto err;
+        
+        while (!BN_is_odd(a))
+                {
+                if (!BN_rshift1(a, a)) goto err;
+                if (BN_is_odd(u)) if (!BN_GF2m_add(u, u, p)) goto err;
+                if (!BN_rshift1(u, u)) goto err;
+                }
+
+        do
+                {
+                if (BN_GF2m_cmp(b, a) > 0)
+                        {
+                        if (!BN_GF2m_add(b, b, a)) goto err;
+                        if (!BN_GF2m_add(v, v, u)) goto err;
+                        do
+                                {
+                                if (!BN_rshift1(b, b)) goto err;
+                                if (BN_is_odd(v)) if (!BN_GF2m_add(v, v, p)) goto err;
+                                if (!BN_rshift1(v, v)) goto err;
+                                } while (!BN_is_odd(b));
+                        }
+                else if (BN_abs_is_word(a, 1))
+                        break;
+                else
+                        {
+                        if (!BN_GF2m_add(a, a, b)) goto err;
+                        if (!BN_GF2m_add(u, u, v)) goto err;
+                        do
+                                {
+                                if (!BN_rshift1(a, a)) goto err;
+                                if (BN_is_odd(u)) if (!BN_GF2m_add(u, u, p)) goto err;
+                                if (!BN_rshift1(u, u)) goto err;
+                                } while (!BN_is_odd(a));
+                        }
+                } while (1);
+
+        if (!BN_copy(r, u)) goto err;
+        bn_check_top(r);
+        ret = 1;
+
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+#endif
+
+/* Divide yy by xx, reduce modulo p, and store the result in r. r could be xx 
+ * or yy, xx could equal yy.
+ *
+ * This function calls down to the BN_GF2m_mod_div implementation; this wrapper
+ * function is only provided for convenience; for best performance, use the 
+ * BN_GF2m_mod_div function.
+ */
+int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *yy, const BIGNUM *xx, const unsigned int p[], BN_CTX *ctx)
+        {
+        BIGNUM *field;
+        int ret = 0;
+
+        bn_check_top(yy);
+        bn_check_top(xx);
+
+        BN_CTX_start(ctx);
+        if ((field = BN_CTX_get(ctx)) == NULL) goto err;
+        if (!BN_GF2m_arr2poly(p, field)) goto err;
+        
+        ret = BN_GF2m_mod_div(r, yy, xx, field, ctx);
+        bn_check_top(r);
+
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+
+/* Compute the bth power of a, reduce modulo p, and store
+ * the result in r.  r could be a.
+ * Uses simple square-and-multiply algorithm A.5.1 from IEEE P1363.
+ */
+int     BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const unsigned int p[], BN_CTX *ctx)
+        {
+        int ret = 0, i, n;
+        BIGNUM *u;
+
+        bn_check_top(a);
+        bn_check_top(b);
+
+        if (BN_is_zero(b))
+                return(BN_one(r));
+
+        if (BN_abs_is_word(b, 1))
+                return (BN_copy(r, a) != NULL);
+
+        BN_CTX_start(ctx);
+        if ((u = BN_CTX_get(ctx)) == NULL) goto err;
+        
+        if (!BN_GF2m_mod_arr(u, a, p)) goto err;
+        
+        n = BN_num_bits(b) - 1;
+        for (i = n - 1; i >= 0; i--)
+                {
+                if (!BN_GF2m_mod_sqr_arr(u, u, p, ctx)) goto err;
+                if (BN_is_bit_set(b, i))
+                        {
+                        if (!BN_GF2m_mod_mul_arr(u, u, a, p, ctx)) goto err;
+                        }
+                }
+        if (!BN_copy(r, u)) goto err;
+        bn_check_top(r);
+        ret = 1;
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Compute the bth power of a, reduce modulo p, and store
+ * the result in r.  r could be a.
+ *
+ * This function calls down to the BN_GF2m_mod_exp_arr implementation; this wrapper
+ * function is only provided for convenience; for best performance, use the 
+ * BN_GF2m_mod_exp_arr function.
+ */
+int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx)
+        {
+        int ret = 0;
+        const int max = BN_num_bits(p);
+        unsigned int *arr=NULL;
+        bn_check_top(a);
+        bn_check_top(b);
+        bn_check_top(p);
+        if ((arr = (unsigned int *)OPENSSL_malloc(sizeof(unsigned int) * max)) == NULL) goto err;
+        ret = BN_GF2m_poly2arr(p, arr, max);
+        if (!ret || ret > max)
+                {
+                BNerr(BN_F_BN_GF2M_MOD_EXP,BN_R_INVALID_LENGTH);
+                goto err;
+                }
+        ret = BN_GF2m_mod_exp_arr(r, a, b, arr, ctx);
+        bn_check_top(r);
+err:
+        if (arr) OPENSSL_free(arr);
+        return ret;
+        }
+
+/* Compute the square root of a, reduce modulo p, and store
+ * the result in r.  r could be a.
+ * Uses exponentiation as in algorithm A.4.1 from IEEE P1363.
+ */
+int     BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[], BN_CTX *ctx)
+        {
+        int ret = 0;
+        BIGNUM *u;
+
+        bn_check_top(a);
+
+        if (!p[0])
+                {
+                /* reduction mod 1 => return 0 */
+                BN_zero(r);
+                return 1;
+                }
+
+        BN_CTX_start(ctx);
+        if ((u = BN_CTX_get(ctx)) == NULL) goto err;
+        
+        if (!BN_set_bit(u, p[0] - 1)) goto err;
+        ret = BN_GF2m_mod_exp_arr(r, a, u, p, ctx);
+        bn_check_top(r);
+
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Compute the square root of a, reduce modulo p, and store
+ * the result in r.  r could be a.
+ *
+ * This function calls down to the BN_GF2m_mod_sqrt_arr implementation; this wrapper
+ * function is only provided for convenience; for best performance, use the 
+ * BN_GF2m_mod_sqrt_arr function.
+ */
+int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
+        {
+        int ret = 0;
+        const int max = BN_num_bits(p);
+        unsigned int *arr=NULL;
+        bn_check_top(a);
+        bn_check_top(p);
+        if ((arr = (unsigned int *)OPENSSL_malloc(sizeof(unsigned int) * max)) == NULL) goto err;
+        ret = BN_GF2m_poly2arr(p, arr, max);
+        if (!ret || ret > max)
+                {
+                BNerr(BN_F_BN_GF2M_MOD_SQRT,BN_R_INVALID_LENGTH);
+                goto err;
+                }
+        ret = BN_GF2m_mod_sqrt_arr(r, a, arr, ctx);
+        bn_check_top(r);
+err:
+        if (arr) OPENSSL_free(arr);
+        return ret;
+        }
+
+/* Find r such that r^2 + r = a mod p.  r could be a. If no r exists returns 0.
+ * Uses algorithms A.4.7 and A.4.6 from IEEE P1363.
+ */
+int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a_, const unsigned int p[], BN_CTX *ctx)
+        {
+        int ret = 0, count = 0;
+        unsigned int j;
+        BIGNUM *a, *z, *rho, *w, *w2, *tmp;
+
+        bn_check_top(a_);
+
+        if (!p[0])
+                {
+                /* reduction mod 1 => return 0 */
+                BN_zero(r);
+                return 1;
+                }
+
+        BN_CTX_start(ctx);
+        a = BN_CTX_get(ctx);
+        z = BN_CTX_get(ctx);
+        w = BN_CTX_get(ctx);
+        if (w == NULL) goto err;
+
+        if (!BN_GF2m_mod_arr(a, a_, p)) goto err;
+        
+        if (BN_is_zero(a))
+                {
+                BN_zero(r);
+                ret = 1;
+                goto err;
+                }
+
+        if (p[0] & 0x1) /* m is odd */
+                {
+                /* compute half-trace of a */
+                if (!BN_copy(z, a)) goto err;
+                for (j = 1; j <= (p[0] - 1) / 2; j++)
+                        {
+                        if (!BN_GF2m_mod_sqr_arr(z, z, p, ctx)) goto err;
+                        if (!BN_GF2m_mod_sqr_arr(z, z, p, ctx)) goto err;
+                        if (!BN_GF2m_add(z, z, a)) goto err;
+                        }
+                
+                }
+        else /* m is even */
+                {
+                rho = BN_CTX_get(ctx);
+                w2 = BN_CTX_get(ctx);
+                tmp = BN_CTX_get(ctx);
+                if (tmp == NULL) goto err;
+                do
+                        {
+                        if (!BN_rand(rho, p[0], 0, 0)) goto err;
+                        if (!BN_GF2m_mod_arr(rho, rho, p)) goto err;
+                        BN_zero(z);
+                        if (!BN_copy(w, rho)) goto err;
+                        for (j = 1; j <= p[0] - 1; j++)
+                                {
+                                if (!BN_GF2m_mod_sqr_arr(z, z, p, ctx)) goto err;
+                                if (!BN_GF2m_mod_sqr_arr(w2, w, p, ctx)) goto err;
+                                if (!BN_GF2m_mod_mul_arr(tmp, w2, a, p, ctx)) goto err;
+                                if (!BN_GF2m_add(z, z, tmp)) goto err;
+                                if (!BN_GF2m_add(w, w2, rho)) goto err;
+                                }
+                        count++;
+                        } while (BN_is_zero(w) && (count < MAX_ITERATIONS));
+                if (BN_is_zero(w))
+                        {
+                        BNerr(BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR,BN_R_TOO_MANY_ITERATIONS);
+                        goto err;
+                        }
+                }
+        
+        if (!BN_GF2m_mod_sqr_arr(w, z, p, ctx)) goto err;
+        if (!BN_GF2m_add(w, z, w)) goto err;
+        if (BN_GF2m_cmp(w, a))
+                {
+                BNerr(BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR, BN_R_NO_SOLUTION);
+                goto err;
+                }
+
+        if (!BN_copy(r, z)) goto err;
+        bn_check_top(r);
+
+        ret = 1;
+
+err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Find r such that r^2 + r = a mod p.  r could be a. If no r exists returns 0.
+ *
+ * This function calls down to the BN_GF2m_mod_solve_quad_arr implementation; this wrapper
+ * function is only provided for convenience; for best performance, use the 
+ * BN_GF2m_mod_solve_quad_arr function.
+ */
+int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
+        {
+        int ret = 0;
+        const int max = BN_num_bits(p);
+        unsigned int *arr=NULL;
+        bn_check_top(a);
+        bn_check_top(p);
+        if ((arr = (unsigned int *)OPENSSL_malloc(sizeof(unsigned int) *
+                                                max)) == NULL) goto err;
+        ret = BN_GF2m_poly2arr(p, arr, max);
+        if (!ret || ret > max)
+                {
+                BNerr(BN_F_BN_GF2M_MOD_SOLVE_QUAD,BN_R_INVALID_LENGTH);
+                goto err;
+                }
+        ret = BN_GF2m_mod_solve_quad_arr(r, a, arr, ctx);
+        bn_check_top(r);
+err:
+        if (arr) OPENSSL_free(arr);
+        return ret;
+        }
+
+/* Convert the bit-string representation of a polynomial
+ * ( \sum_{i=0}^n a_i * x^i , where a_0 is *not* zero) into an array
+ * of integers corresponding to the bits with non-zero coefficient.
+ * Up to max elements of the array will be filled.  Return value is total
+ * number of coefficients that would be extracted if array was large enough.
+ */
+int BN_GF2m_poly2arr(const BIGNUM *a, unsigned int p[], int max)
+        {
+        int i, j, k = 0;
+        BN_ULONG mask;
+
+        if (BN_is_zero(a) || !BN_is_bit_set(a, 0))
+                /* a_0 == 0 => return error (the unsigned int array
+                 * must be terminated by 0)
+                 */
+                return 0;
+
+        for (i = a->top - 1; i >= 0; i--)
+                {
+                if (!a->d[i])
+                        /* skip word if a->d[i] == 0 */
+                        continue;
+                mask = BN_TBIT;
+                for (j = BN_BITS2 - 1; j >= 0; j--)
+                        {
+                        if (a->d[i] & mask) 
+                                {
+                                if (k < max) p[k] = BN_BITS2 * i + j;
+                                k++;
+                                }
+                        mask >>= 1;
+                        }
+                }
+
+        return k;
+        }
+
+/* Convert the coefficient array representation of a polynomial to a 
+ * bit-string.  The array must be terminated by 0.
+ */
+int BN_GF2m_arr2poly(const unsigned int p[], BIGNUM *a)
+        {
+        int i;
+
+        bn_check_top(a);
+        BN_zero(a);
+        for (i = 0; p[i] != 0; i++)
+                {
+                if (BN_set_bit(a, p[i]) == 0)
+                        return 0;
+                }
+        BN_set_bit(a, 0);
+        bn_check_top(a);
+
+        return 1;
+        }
+
diff --git a/src/lib/libssl/src/crypto/bn/bn_nist.c b/src/lib/libssl/src/crypto/bn/bn_nist.c
new file mode 100644
index 0000000000..e14232fdbb
--- /dev/null
+++ b/src/lib/libssl/src/crypto/bn/bn_nist.c
@@ -0,0 +1,692 @@
+/* crypto/bn/bn_nist.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "bn_lcl.h"
+#include "cryptlib.h"
+
+#define BN_NIST_192_TOP (192+BN_BITS2-1)/BN_BITS2
+#define BN_NIST_224_TOP (224+BN_BITS2-1)/BN_BITS2
+#define BN_NIST_256_TOP (256+BN_BITS2-1)/BN_BITS2
+#define BN_NIST_384_TOP (384+BN_BITS2-1)/BN_BITS2
+#define BN_NIST_521_TOP (521+BN_BITS2-1)/BN_BITS2
+
+#if BN_BITS2 == 64
+static const BN_ULONG _nist_p_192[] =
+        {0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFEULL,
+        0xFFFFFFFFFFFFFFFFULL};
+static const BN_ULONG _nist_p_224[] =
+        {0x0000000000000001ULL,0xFFFFFFFF00000000ULL,
+        0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL};
+static const BN_ULONG _nist_p_256[] =
+        {0xFFFFFFFFFFFFFFFFULL,0x00000000FFFFFFFFULL,
+        0x0000000000000000ULL,0xFFFFFFFF00000001ULL};
+static const BN_ULONG _nist_p_384[] =
+        {0x00000000FFFFFFFFULL,0xFFFFFFFF00000000ULL,
+        0xFFFFFFFFFFFFFFFEULL,0xFFFFFFFFFFFFFFFFULL,
+        0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL};
+static const BN_ULONG _nist_p_521[] =
+        {0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
+        0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
+        0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
+        0xFFFFFFFFFFFFFFFFULL,0xFFFFFFFFFFFFFFFFULL,
+        0x00000000000001FFULL};
+#elif BN_BITS2 == 32
+static const BN_ULONG _nist_p_192[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFE,
+        0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};
+static const BN_ULONG _nist_p_224[] = {0x00000001,0x00000000,0x00000000,
+        0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};
+static const BN_ULONG _nist_p_256[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
+        0x00000000,0x00000000,0x00000000,0x00000001,0xFFFFFFFF};
+static const BN_ULONG _nist_p_384[] = {0xFFFFFFFF,0x00000000,0x00000000,
+        0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
+        0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};
+static const BN_ULONG _nist_p_521[] = {0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
+        0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
+        0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,
+        0xFFFFFFFF,0x000001FF};
+#endif
+
+const BIGNUM *BN_get0_nist_prime_192(void)
+        {
+        static BIGNUM const_nist_192 = { (BN_ULONG *)_nist_p_192,
+                BN_NIST_192_TOP, BN_NIST_192_TOP, 0, BN_FLG_STATIC_DATA };
+        return &const_nist_192;
+        }
+
+const BIGNUM *BN_get0_nist_prime_224(void)
+        {
+        static BIGNUM const_nist_224 = { (BN_ULONG *)_nist_p_224,
+                BN_NIST_224_TOP, BN_NIST_224_TOP, 0, BN_FLG_STATIC_DATA };
+        return &const_nist_224;
+        }
+
+const BIGNUM *BN_get0_nist_prime_256(void)
+        {
+        static BIGNUM const_nist_256 = { (BN_ULONG *)_nist_p_256,
+                BN_NIST_256_TOP, BN_NIST_256_TOP, 0, BN_FLG_STATIC_DATA };
+        return &const_nist_256;
+        }
+
+const BIGNUM *BN_get0_nist_prime_384(void)
+        {
+        static BIGNUM const_nist_384 = { (BN_ULONG *)_nist_p_384,
+                BN_NIST_384_TOP, BN_NIST_384_TOP, 0, BN_FLG_STATIC_DATA };
+        return &const_nist_384;
+        }
+
+const BIGNUM *BN_get0_nist_prime_521(void)
+        {
+        static BIGNUM const_nist_521 = { (BN_ULONG *)_nist_p_521,
+                BN_NIST_521_TOP, BN_NIST_521_TOP, 0, BN_FLG_STATIC_DATA };
+        return &const_nist_521;
+        }
+
+#define BN_NIST_ADD_ONE(a)      while (!(*(a)=(*(a)+1)&BN_MASK2)) ++(a);
+
+static void nist_cp_bn_0(BN_ULONG *buf, BN_ULONG *a, int top, int max)
+        {
+        int i;
+        BN_ULONG *_tmp1 = (buf), *_tmp2 = (a);
+        for (i = (top); i != 0; i--)
+                *_tmp1++ = *_tmp2++;
+        for (i = (max) - (top); i != 0; i--)
+                *_tmp1++ = (BN_ULONG) 0;
+        }
+
+static void nist_cp_bn(BN_ULONG *buf, BN_ULONG *a, int top)
+        { 
+        int i;
+        BN_ULONG *_tmp1 = (buf), *_tmp2 = (a);
+        for (i = (top); i != 0; i--)
+                *_tmp1++ = *_tmp2++;
+        }
+
+#if BN_BITS2 == 64
+#define bn_cp_64(to, n, from, m)        (to)[n] = (m>=0)?((from)[m]):0;
+#define bn_64_set_0(to, n)              (to)[n] = (BN_ULONG)0;
+/* TBD */
+#define bn_cp_32(to, n, from, m)        (to)[n] = (m>=0)?((from)[m]):0;
+#define bn_32_set_0(to, n)              (to)[n] = (BN_ULONG)0;
+#else
+#define bn_cp_64(to, n, from, m) \
+        { \
+        bn_cp_32(to, (n)*2, from, (m)*2); \
+        bn_cp_32(to, (n)*2+1, from, (m)*2+1); \
+        }
+#define bn_64_set_0(to, n) \
+        { \
+        bn_32_set_0(to, (n)*2); \
+        bn_32_set_0(to, (n)*2+1); \
+        }
+#if BN_BITS2 == 32
+#define bn_cp_32(to, n, from, m)        (to)[n] = (m>=0)?((from)[m]):0;
+#define bn_32_set_0(to, n)              (to)[n] = (BN_ULONG)0;
+#endif
+#endif /* BN_BITS2 != 64 */
+
+
+#define nist_set_192(to, from, a1, a2, a3) \
+        { \
+        if (a3 != 0) bn_cp_64(to, 0, from, (a3) - 3) else bn_64_set_0(to, 0)\
+        bn_cp_64(to, 1, from, (a2) - 3) \
+        if (a1 != 0) bn_cp_64(to, 2, from, (a1) - 3) else bn_64_set_0(to, 2)\
+        }
+
+int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
+        BN_CTX *ctx)
+        {
+        int      top = a->top, i;
+        int      carry;
+        register BN_ULONG *r_d, *a_d = a->d;
+        BN_ULONG t_d[BN_NIST_192_TOP],
+                 buf[BN_NIST_192_TOP],
+                 c_d[BN_NIST_192_TOP],
+                *res;
+        size_t   mask;
+
+        i = BN_ucmp(field, a);
+        if (i == 0)
+                {
+                BN_zero(r);
+                return 1;
+                }
+        else if (i > 0)
+                return (r == a) ? 1 : (BN_copy(r ,a) != NULL);
+
+        if (top == BN_NIST_192_TOP)
+                return BN_usub(r, a, field);
+
+        if (r != a)
+                {
+                if (!bn_wexpand(r, BN_NIST_192_TOP))
+                        return 0;
+                r_d = r->d;
+                nist_cp_bn(r_d, a_d, BN_NIST_192_TOP);
+                }
+        else
+                r_d = a_d;
+
+        nist_cp_bn_0(buf, a_d + BN_NIST_192_TOP, top - BN_NIST_192_TOP, BN_NIST_192_TOP);
+
+        nist_set_192(t_d, buf, 0, 3, 3);
+        carry = bn_add_words(r_d, r_d, t_d, BN_NIST_192_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_192,BN_NIST_192_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+        
+        nist_set_192(t_d, buf, 4, 4, 0);
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_192_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_192,BN_NIST_192_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        nist_set_192(t_d, buf, 5, 5, 5)
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_192_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_192,BN_NIST_192_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        nist_cp_bn(r_d, res, BN_NIST_192_TOP);
+        r->top = BN_NIST_192_TOP;
+        bn_correct_top(r);
+
+        return 1;
+        }
+
+#define nist_set_224(to, from, a1, a2, a3, a4, a5, a6, a7) \
+        { \
+        if (a7 != 0) bn_cp_32(to, 0, from, (a7) - 7) else bn_32_set_0(to, 0)\
+        if (a6 != 0) bn_cp_32(to, 1, from, (a6) - 7) else bn_32_set_0(to, 1)\
+        if (a5 != 0) bn_cp_32(to, 2, from, (a5) - 7) else bn_32_set_0(to, 2)\
+        if (a4 != 0) bn_cp_32(to, 3, from, (a4) - 7) else bn_32_set_0(to, 3)\
+        if (a3 != 0) bn_cp_32(to, 4, from, (a3) - 7) else bn_32_set_0(to, 4)\
+        if (a2 != 0) bn_cp_32(to, 5, from, (a2) - 7) else bn_32_set_0(to, 5)\
+        if (a1 != 0) bn_cp_32(to, 6, from, (a1) - 7) else bn_32_set_0(to, 6)\
+        }
+
+int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
+        BN_CTX *ctx)
+        {
+#if BN_BITS2 == 32
+        int     top = a->top, i;
+        int     carry;
+        BN_ULONG *r_d, *a_d = a->d;
+        BN_ULONG t_d[BN_NIST_224_TOP],
+                 buf[BN_NIST_224_TOP],
+                 c_d[BN_NIST_224_TOP],
+                *res;
+        size_t   mask;
+
+        i = BN_ucmp(field, a);
+        if (i == 0)
+                {
+                BN_zero(r);
+                return 1;
+                }
+        else if (i > 0)
+                return (r == a)? 1 : (BN_copy(r ,a) != NULL);
+
+        if (top == BN_NIST_224_TOP)
+                return BN_usub(r, a, field);
+
+        if (r != a)
+                {
+                if (!bn_wexpand(r, BN_NIST_224_TOP))
+                        return 0;
+                r_d = r->d;
+                nist_cp_bn(r_d, a_d, BN_NIST_224_TOP);
+                }
+        else
+                r_d = a_d;
+
+        nist_cp_bn_0(buf, a_d + BN_NIST_224_TOP, top - BN_NIST_224_TOP, BN_NIST_224_TOP);
+
+        nist_set_224(t_d, buf, 10, 9, 8, 7, 0, 0, 0);
+        carry = bn_add_words(r_d, r_d, t_d, BN_NIST_224_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_224,BN_NIST_224_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+        
+        nist_set_224(t_d, buf, 0, 13, 12, 11, 0, 0, 0);
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_224_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_224,BN_NIST_224_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        nist_set_224(t_d, buf, 13, 12, 11, 10, 9, 8, 7);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_224_TOP);
+        bn_add_words(c_d,r_d,_nist_p_224,BN_NIST_224_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+#else
+        if (bn_sub_words(r_d, res, t_d, BN_NIST_224_TOP))
+                bn_add_words(r_d,r_d,_nist_p_224,BN_NIST_224_TOP);
+#endif
+        nist_set_224(t_d, buf, 0, 0, 0, 0, 13, 12, 11);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_224_TOP);
+        bn_add_words(c_d,r_d,_nist_p_224,BN_NIST_224_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        nist_cp_bn(r_d, res, BN_NIST_224_TOP);
+#else
+        if (bn_sub_words(r_d, r_d, t_d, BN_NIST_224_TOP))
+                bn_add_words(r_d,r_d,_nist_p_224,BN_NIST_224_TOP);
+#endif
+        r->top = BN_NIST_224_TOP;
+        bn_correct_top(r);
+
+        return 1;
+#else   /* BN_BITS!=32 */
+        return 0;
+#endif
+        }
+
+#define nist_set_256(to, from, a1, a2, a3, a4, a5, a6, a7, a8) \
+        { \
+        if (a8 != 0) bn_cp_32(to, 0, from, (a8) - 8) else bn_32_set_0(to, 0)\
+        if (a7 != 0) bn_cp_32(to, 1, from, (a7) - 8) else bn_32_set_0(to, 1)\
+        if (a6 != 0) bn_cp_32(to, 2, from, (a6) - 8) else bn_32_set_0(to, 2)\
+        if (a5 != 0) bn_cp_32(to, 3, from, (a5) - 8) else bn_32_set_0(to, 3)\
+        if (a4 != 0) bn_cp_32(to, 4, from, (a4) - 8) else bn_32_set_0(to, 4)\
+        if (a3 != 0) bn_cp_32(to, 5, from, (a3) - 8) else bn_32_set_0(to, 5)\
+        if (a2 != 0) bn_cp_32(to, 6, from, (a2) - 8) else bn_32_set_0(to, 6)\
+        if (a1 != 0) bn_cp_32(to, 7, from, (a1) - 8) else bn_32_set_0(to, 7)\
+        }
+
+int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
+        BN_CTX *ctx)
+        {
+#if BN_BITS2 == 32
+        int     i, top = a->top;
+        int     carry = 0;
+        register BN_ULONG *a_d = a->d, *r_d;
+        BN_ULONG t_d[BN_NIST_256_TOP],
+                 buf[BN_NIST_256_TOP],
+                 c_d[BN_NIST_256_TOP],
+                *res;
+        size_t   mask;
+
+        i = BN_ucmp(field, a);
+        if (i == 0)
+                {
+                BN_zero(r);
+                return 1;
+                }
+        else if (i > 0)
+                return (r == a)? 1 : (BN_copy(r ,a) != NULL);
+
+        if (top == BN_NIST_256_TOP)
+                return BN_usub(r, a, field);
+
+        if (r != a)
+                {
+                if (!bn_wexpand(r, BN_NIST_256_TOP))
+                        return 0;
+                r_d = r->d;
+                nist_cp_bn(r_d, a_d, BN_NIST_256_TOP);
+                }
+        else
+                r_d = a_d;
+
+        nist_cp_bn_0(buf, a_d + BN_NIST_256_TOP, top - BN_NIST_256_TOP, BN_NIST_256_TOP);
+
+        /*S1*/
+        nist_set_256(t_d, buf, 15, 14, 13, 12, 11, 0, 0, 0);
+        /*S2*/
+        nist_set_256(c_d,buf, 0, 15, 14, 13, 12, 0, 0, 0);
+        carry = bn_add_words(t_d, t_d, c_d, BN_NIST_256_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,t_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)t_d&~mask));
+
+        carry = bn_add_words(t_d, res, res, BN_NIST_256_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,t_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)t_d&~mask));
+
+        carry = bn_add_words(r_d, r_d, res, BN_NIST_256_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*S3*/
+        nist_set_256(t_d, buf, 15, 14, 0, 0, 0, 10, 9, 8);
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_256_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*S4*/
+        nist_set_256(t_d, buf, 8, 13, 15, 14, 13, 11, 10, 9);
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_256_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*D1*/
+        nist_set_256(t_d, buf, 10, 8, 0, 0, 0, 13, 12, 11);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_256_TOP);
+        bn_add_words(c_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));   
+#else
+        if (bn_sub_words(r_d, res, t_d, BN_NIST_256_TOP))
+                bn_add_words(r_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+#endif
+        /*D2*/
+        nist_set_256(t_d, buf, 11, 9, 0, 0, 15, 14, 13, 12);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_256_TOP);
+        bn_add_words(c_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));   
+#else
+        if (bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP))
+                bn_add_words(r_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+#endif
+        /*D3*/
+        nist_set_256(t_d, buf, 12, 0, 10, 9, 8, 15, 14, 13);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_256_TOP);
+        bn_add_words(c_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));   
+#else
+        if (bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP))
+                bn_add_words(r_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+#endif
+        /*D4*/
+        nist_set_256(t_d, buf, 13, 0, 11, 10, 9, 0, 15, 14);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_256_TOP);
+        bn_add_words(c_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));   
+
+        nist_cp_bn(r_d, res, BN_NIST_384_TOP);
+#else
+        if (bn_sub_words(r_d, r_d, t_d, BN_NIST_256_TOP))
+                bn_add_words(r_d,r_d,_nist_p_256,BN_NIST_256_TOP);
+#endif
+        r->top = BN_NIST_256_TOP;
+        bn_correct_top(r);
+
+        return 1;
+#else   /* BN_BITS!=32 */
+        return 0;
+#endif
+        }
+
+#define nist_set_384(to,from,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12) \
+        { \
+        if (a12 != 0) bn_cp_32(to, 0, from,  (a12) - 12) else bn_32_set_0(to, 0)\
+        if (a11 != 0) bn_cp_32(to, 1, from,  (a11) - 12) else bn_32_set_0(to, 1)\
+        if (a10 != 0) bn_cp_32(to, 2, from,  (a10) - 12) else bn_32_set_0(to, 2)\
+        if (a9 != 0)  bn_cp_32(to, 3, from,  (a9) - 12)  else bn_32_set_0(to, 3)\
+        if (a8 != 0)  bn_cp_32(to, 4, from,  (a8) - 12)  else bn_32_set_0(to, 4)\
+        if (a7 != 0)  bn_cp_32(to, 5, from,  (a7) - 12)  else bn_32_set_0(to, 5)\
+        if (a6 != 0)  bn_cp_32(to, 6, from,  (a6) - 12)  else bn_32_set_0(to, 6)\
+        if (a5 != 0)  bn_cp_32(to, 7, from,  (a5) - 12)  else bn_32_set_0(to, 7)\
+        if (a4 != 0)  bn_cp_32(to, 8, from,  (a4) - 12)  else bn_32_set_0(to, 8)\
+        if (a3 != 0)  bn_cp_32(to, 9, from,  (a3) - 12)  else bn_32_set_0(to, 9)\
+        if (a2 != 0)  bn_cp_32(to, 10, from, (a2) - 12)  else bn_32_set_0(to, 10)\
+        if (a1 != 0)  bn_cp_32(to, 11, from, (a1) - 12)  else bn_32_set_0(to, 11)\
+        }
+
+int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
+        BN_CTX *ctx)
+        {
+#if BN_BITS2 == 32
+        int     i, top = a->top;
+        int     carry = 0;
+        register BN_ULONG *r_d, *a_d = a->d;
+        BN_ULONG t_d[BN_NIST_384_TOP],
+                 buf[BN_NIST_384_TOP],
+                 c_d[BN_NIST_384_TOP],
+                *res;
+        size_t   mask;
+
+        i = BN_ucmp(field, a);
+        if (i == 0)
+                {
+                BN_zero(r);
+                return 1;
+                }
+        else if (i > 0)
+                return (r == a)? 1 : (BN_copy(r ,a) != NULL);
+
+        if (top == BN_NIST_384_TOP)
+                return BN_usub(r, a, field);
+
+        if (r != a)
+                {
+                if (!bn_wexpand(r, BN_NIST_384_TOP))
+                        return 0;
+                r_d = r->d;
+                nist_cp_bn(r_d, a_d, BN_NIST_384_TOP);
+                }
+        else
+                r_d = a_d;
+
+        nist_cp_bn_0(buf, a_d + BN_NIST_384_TOP, top - BN_NIST_384_TOP, BN_NIST_384_TOP);
+
+        /*S1*/
+        nist_set_256(t_d, buf, 0, 0, 0, 0, 0, 23-4, 22-4, 21-4);
+                /* left shift */
+                {
+                register BN_ULONG *ap,t,c;
+                ap = t_d;
+                c=0;
+                for (i = 3; i != 0; --i)
+                        {
+                        t= *ap;
+                        *(ap++)=((t<<1)|c)&BN_MASK2;
+                        c=(t & BN_TBIT)?1:0;
+                        }
+                *ap=c;
+                }
+        carry = bn_add_words(r_d+(128/BN_BITS2), r_d+(128/BN_BITS2), 
+                t_d, BN_NIST_256_TOP);
+        /*
+         * we need if (result>=modulus) subtract(result,modulus);
+         * in n-bit space this can be expressed as
+         * if (carry || result>=modulus) subtract(result,modulus);
+         * the catch is that comparison implies subtraction and
+         * therefore one can write tmp=subtract(result,modulus);
+         * and then if(carry || !borrow) result=tmp; this's what
+         * happens below, but without explicit if:-) a.
+         */
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*S2 */
+        carry = bn_add_words(r_d, res, buf, BN_NIST_384_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*S3*/
+        nist_set_384(t_d,buf,20,19,18,17,16,15,14,13,12,23,22,21);
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_384_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*S4*/
+        nist_set_384(t_d,buf,19,18,17,16,15,14,13,12,20,0,23,0);
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_384_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*S5*/
+        nist_set_384(t_d, buf,0,0,0,0,23,22,21,20,0,0,0,0);
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_384_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*S6*/
+        nist_set_384(t_d,buf,0,0,0,0,0,0,23,22,21,0,0,20);
+        carry = bn_add_words(r_d, res, t_d, BN_NIST_384_TOP);
+        mask = 0-(size_t)bn_sub_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = ~mask | (0-(size_t)carry);
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        /*D1*/
+        nist_set_384(t_d,buf,22,21,20,19,18,17,16,15,14,13,12,23);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_384_TOP);
+        bn_add_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+#else
+        if (bn_sub_words(r_d, res, t_d, BN_NIST_384_TOP))
+                bn_add_words(r_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+#endif
+        /*D2*/
+        nist_set_384(t_d,buf,0,0,0,0,0,0,0,23,22,21,20,0);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_384_TOP);
+        bn_add_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+#else
+        if (bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP))
+                bn_add_words(r_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+#endif
+        /*D3*/
+        nist_set_384(t_d,buf,0,0,0,0,0,0,0,23,23,0,0,0);
+#if BRANCH_FREE
+        carry = bn_sub_words(r_d, res, t_d, BN_NIST_384_TOP);
+        bn_add_words(c_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+        mask = 0-(size_t)carry;
+        res = (BN_ULONG *)(((size_t)c_d&mask) | ((size_t)r_d&~mask));
+
+        nist_cp_bn(r_d, res, BN_NIST_384_TOP);
+#else
+        if (bn_sub_words(r_d, r_d, t_d, BN_NIST_384_TOP))
+                bn_add_words(r_d,r_d,_nist_p_384,BN_NIST_384_TOP);
+#endif
+        r->top = BN_NIST_384_TOP;
+        bn_correct_top(r);
+
+        return 1;
+#else   /* BN_BITS!=32 */
+        return 0;
+#endif
+        }
+
+int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field,
+        BN_CTX *ctx)
+        {
+#if BN_BITS2 == 64
+#define BN_NIST_521_TOP_MASK    (BN_ULONG)0x1FF
+#elif BN_BITS2 == 32
+#define BN_NIST_521_TOP_MASK    (BN_ULONG)0x1FF
+#endif
+        int     top, ret = 0;
+        BN_ULONG *r_d;
+        BIGNUM  *tmp;
+
+        /* check whether a reduction is necessary */
+        top = a->top;
+        if (top < BN_NIST_521_TOP  || ( top == BN_NIST_521_TOP &&
+           (!(a->d[BN_NIST_521_TOP-1] & ~(BN_NIST_521_TOP_MASK)))))
+                return (r == a)? 1 : (BN_copy(r ,a) != NULL);
+
+        BN_CTX_start(ctx);
+        tmp = BN_CTX_get(ctx);
+        if (!tmp)
+                goto err;
+
+        if (!bn_wexpand(tmp, BN_NIST_521_TOP))
+                goto err;
+        nist_cp_bn(tmp->d, a->d, BN_NIST_521_TOP);
+
+        tmp->top = BN_NIST_521_TOP;
+        tmp->d[BN_NIST_521_TOP-1]  &= BN_NIST_521_TOP_MASK;
+        bn_correct_top(tmp);
+
+        if (!BN_rshift(r, a, 521))
+                goto err;
+
+        if (!BN_uadd(r, tmp, r))
+                goto err;
+        top = r->top;
+        r_d = r->d;
+        if (top == BN_NIST_521_TOP  && 
+           (r_d[BN_NIST_521_TOP-1] & ~(BN_NIST_521_TOP_MASK)))
+                {
+                BN_NIST_ADD_ONE(r_d)
+                r->d[BN_NIST_521_TOP-1] &= BN_NIST_521_TOP_MASK; 
+                }
+        bn_correct_top(r);
+
+        ret = 1;
+err:
+        BN_CTX_end(ctx);
+
+        bn_check_top(r);
+        return ret;
+        }
diff --git a/src/lib/libssl/src/crypto/camellia/Makefile b/src/lib/libssl/src/crypto/camellia/Makefile
new file mode 100644
index 0000000000..1579de5ce5
--- /dev/null
+++ b/src/lib/libssl/src/crypto/camellia/Makefile
@@ -0,0 +1,103 @@
+#
+# crypto/camellia/Makefile
+#
+
+DIR= camellia
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CAMELLIA_ASM_OBJ=
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+ASFLAGS= $(INCLUDES) $(ASFLAG)
+AFLAGS= $(ASFLAGS)
+
+GENERAL=Makefile
+#TEST=camelliatest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \
+           cmll_cfb.c cmll_ctr.c 
+
+LIBOBJ= camellia.o cmll_misc.o cmll_ecb.o cmll_cbc.o cmll_ofb.o \
+                cmll_cfb.o cmll_ctr.o $(CAMELLIA_ASM_OBJ)
+
+SRC= $(LIBSRC)
+
+EXHEADER= camellia.h
+HEADER= cmll_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+$(LIBOBJ): $(LIBSRC)
+
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+camellia.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+camellia.o: camellia.c camellia.h cmll_locl.h
+cmll_cbc.o: ../../include/openssl/camellia.h ../../include/openssl/e_os2.h
+cmll_cbc.o: ../../include/openssl/opensslconf.h cmll_cbc.c cmll_locl.h
+cmll_cfb.o: ../../e_os.h ../../include/openssl/camellia.h
+cmll_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+cmll_cfb.o: cmll_cfb.c cmll_locl.h
+cmll_ctr.o: ../../include/openssl/camellia.h ../../include/openssl/e_os2.h
+cmll_ctr.o: ../../include/openssl/opensslconf.h cmll_ctr.c cmll_locl.h
+cmll_ecb.o: ../../include/openssl/camellia.h ../../include/openssl/e_os2.h
+cmll_ecb.o: ../../include/openssl/opensslconf.h cmll_ecb.c cmll_locl.h
+cmll_misc.o: ../../include/openssl/camellia.h ../../include/openssl/e_os2.h
+cmll_misc.o: ../../include/openssl/opensslconf.h
+cmll_misc.o: ../../include/openssl/opensslv.h cmll_locl.h cmll_misc.c
+cmll_ofb.o: ../../include/openssl/camellia.h ../../include/openssl/e_os2.h
+cmll_ofb.o: ../../include/openssl/opensslconf.h cmll_locl.h cmll_ofb.c
diff --git a/src/lib/libssl/src/crypto/camellia/camellia.c b/src/lib/libssl/src/crypto/camellia/camellia.c
new file mode 100644
index 0000000000..491c26b39e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/camellia/camellia.c
@@ -0,0 +1,1624 @@
+/* crypto/camellia/camellia.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . 
+ * ALL RIGHTS RESERVED.
+ *
+ * Intellectual Property information for Camellia:
+ *     http://info.isl.ntt.co.jp/crypt/eng/info/chiteki.html
+ *
+ * News Release for Announcement of Camellia open source:
+ *     http://www.ntt.co.jp/news/news06e/0604/060413a.html
+ *
+ * The Camellia Code included herein is developed by
+ * NTT (Nippon Telegraph and Telephone Corporation), and is contributed
+ * to the OpenSSL project.
+ *
+ * The Camellia Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+/* Algorithm Specification 
+   http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
+*/
+
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "camellia.h"
+#include "cmll_locl.h"
+
+/* key constants */
+#define CAMELLIA_SIGMA1L (0xA09E667FL)
+#define CAMELLIA_SIGMA1R (0x3BCC908BL)
+#define CAMELLIA_SIGMA2L (0xB67AE858L)
+#define CAMELLIA_SIGMA2R (0x4CAA73B2L)
+#define CAMELLIA_SIGMA3L (0xC6EF372FL)
+#define CAMELLIA_SIGMA3R (0xE94F82BEL)
+#define CAMELLIA_SIGMA4L (0x54FF53A5L)
+#define CAMELLIA_SIGMA4R (0xF1D36F1CL)
+#define CAMELLIA_SIGMA5L (0x10E527FAL)
+#define CAMELLIA_SIGMA5R (0xDE682D1DL)
+#define CAMELLIA_SIGMA6L (0xB05688C2L)
+#define CAMELLIA_SIGMA6R (0xB3E6C1FDL)
+
+/*
+ *  macros
+ */
+
+/* e is pointer of subkey */
+#define CamelliaSubkeyL(INDEX) (subkey[(INDEX)*2])
+#define CamelliaSubkeyR(INDEX) (subkey[(INDEX)*2 + 1])
+
+/* rotation right shift 1byte */
+#define CAMELLIA_RR8(x) (((x) >> 8) + ((x) << 24))
+/* rotation left shift 1bit */
+#define CAMELLIA_RL1(x) (((x) << 1) + ((x) >> 31))
+/* rotation left shift 1byte */
+#define CAMELLIA_RL8(x) (((x) << 8) + ((x) >> 24))
+
+#define CAMELLIA_ROLDQ(ll, lr, rl, rr, w0, w1, bits)    \
+do                                                      \
+        {                                               \
+        w0 = ll;                                        \
+        ll = (ll << bits) + (lr >> (32 - bits));        \
+        lr = (lr << bits) + (rl >> (32 - bits));        \
+        rl = (rl << bits) + (rr >> (32 - bits));        \
+        rr = (rr << bits) + (w0 >> (32 - bits));        \
+        } while(0)
+
+#define CAMELLIA_ROLDQo32(ll, lr, rl, rr, w0, w1, bits) \
+do                                                      \
+        {                                               \
+        w0 = ll;                                        \
+        w1 = lr;                                        \
+        ll = (lr << (bits - 32)) + (rl >> (64 - bits)); \
+        lr = (rl << (bits - 32)) + (rr >> (64 - bits)); \
+        rl = (rr << (bits - 32)) + (w0 >> (64 - bits)); \
+        rr = (w0 << (bits - 32)) + (w1 >> (64 - bits)); \
+        } while(0)
+
+#define CAMELLIA_SP1110(INDEX) (camellia_sp1110[(INDEX)])
+#define CAMELLIA_SP0222(INDEX) (camellia_sp0222[(INDEX)])
+#define CAMELLIA_SP3033(INDEX) (camellia_sp3033[(INDEX)])
+#define CAMELLIA_SP4404(INDEX) (camellia_sp4404[(INDEX)])
+
+#define CAMELLIA_F(xl, xr, kl, kr, yl, yr, il, ir, t0, t1)              \
+do                                                                      \
+        {                                                               \
+        il = xl ^ kl;                                                   \
+        ir = xr ^ kr;                                                   \
+        t0 = il >> 16;                                                  \
+        t1 = ir >> 16;                                                  \
+        yl = CAMELLIA_SP1110(ir & 0xff)                                 \
+                ^ CAMELLIA_SP0222((t1 >> 8) & 0xff)                     \
+                ^ CAMELLIA_SP3033(t1 & 0xff)                            \
+                ^ CAMELLIA_SP4404((ir >> 8) & 0xff);                    \
+        yr = CAMELLIA_SP1110((t0 >> 8) & 0xff)                          \
+                ^ CAMELLIA_SP0222(t0 & 0xff)                            \
+                ^ CAMELLIA_SP3033((il >> 8) & 0xff)                     \
+                ^ CAMELLIA_SP4404(il & 0xff);                           \
+        yl ^= yr;                                                       \
+        yr = CAMELLIA_RR8(yr);                                          \
+        yr ^= yl;                                                       \
+        } while(0)
+
+
+/*
+ * for speed up
+ *
+ */
+#define CAMELLIA_FLS(ll, lr, rl, rr, kll, klr, krl, krr, t0, t1, t2, t3) \
+do                                                                      \
+        {                                                               \
+        t0 = kll;                                                       \
+        t0 &= ll;                                                       \
+        lr ^= CAMELLIA_RL1(t0);                                         \
+        t1 = klr;                                                       \
+        t1 |= lr;                                                       \
+        ll ^= t1;                                                       \
+                                                                        \
+        t2 = krr;                                                       \
+        t2 |= rr;                                                       \
+        rl ^= t2;                                                       \
+        t3 = krl;                                                       \
+        t3 &= rl;                                                       \
+        rr ^= CAMELLIA_RL1(t3);                                         \
+        } while(0)
+
+#define CAMELLIA_ROUNDSM(xl, xr, kl, kr, yl, yr, il, ir, t0, t1)        \
+do                                                                      \
+        {                                                               \
+        il = xl;                                                        \
+        ir = xr;                                                        \
+        t0 = il >> 16;                                                  \
+        t1 = ir >> 16;                                                  \
+        ir = CAMELLIA_SP1110(ir & 0xff)                                 \
+                ^ CAMELLIA_SP0222((t1 >> 8) & 0xff)                     \
+                ^ CAMELLIA_SP3033(t1 & 0xff)                            \
+                ^ CAMELLIA_SP4404((ir >> 8) & 0xff);                    \
+        il = CAMELLIA_SP1110((t0 >> 8) & 0xff)                          \
+                ^ CAMELLIA_SP0222(t0 & 0xff)                            \
+                ^ CAMELLIA_SP3033((il >> 8) & 0xff)                     \
+                ^ CAMELLIA_SP4404(il & 0xff);                           \
+        il ^= kl;                                                       \
+        ir ^= kr;                                                       \
+        ir ^= il;                                                       \
+        il = CAMELLIA_RR8(il);                                          \
+        il ^= ir;                                                       \
+        yl ^= ir;                                                       \
+        yr ^= il;                                                       \
+        } while(0)
+
+static const u32 camellia_sp1110[256] =
+        {
+        0x70707000,0x82828200,0x2c2c2c00,0xececec00,
+        0xb3b3b300,0x27272700,0xc0c0c000,0xe5e5e500,
+        0xe4e4e400,0x85858500,0x57575700,0x35353500,
+        0xeaeaea00,0x0c0c0c00,0xaeaeae00,0x41414100,
+        0x23232300,0xefefef00,0x6b6b6b00,0x93939300,
+        0x45454500,0x19191900,0xa5a5a500,0x21212100,
+        0xededed00,0x0e0e0e00,0x4f4f4f00,0x4e4e4e00,
+        0x1d1d1d00,0x65656500,0x92929200,0xbdbdbd00,
+        0x86868600,0xb8b8b800,0xafafaf00,0x8f8f8f00,
+        0x7c7c7c00,0xebebeb00,0x1f1f1f00,0xcecece00,
+        0x3e3e3e00,0x30303000,0xdcdcdc00,0x5f5f5f00,
+        0x5e5e5e00,0xc5c5c500,0x0b0b0b00,0x1a1a1a00,
+        0xa6a6a600,0xe1e1e100,0x39393900,0xcacaca00,
+        0xd5d5d500,0x47474700,0x5d5d5d00,0x3d3d3d00,
+        0xd9d9d900,0x01010100,0x5a5a5a00,0xd6d6d600,
+        0x51515100,0x56565600,0x6c6c6c00,0x4d4d4d00,
+        0x8b8b8b00,0x0d0d0d00,0x9a9a9a00,0x66666600,
+        0xfbfbfb00,0xcccccc00,0xb0b0b000,0x2d2d2d00,
+        0x74747400,0x12121200,0x2b2b2b00,0x20202000,
+        0xf0f0f000,0xb1b1b100,0x84848400,0x99999900,
+        0xdfdfdf00,0x4c4c4c00,0xcbcbcb00,0xc2c2c200,
+        0x34343400,0x7e7e7e00,0x76767600,0x05050500,
+        0x6d6d6d00,0xb7b7b700,0xa9a9a900,0x31313100,
+        0xd1d1d100,0x17171700,0x04040400,0xd7d7d700,
+        0x14141400,0x58585800,0x3a3a3a00,0x61616100,
+        0xdedede00,0x1b1b1b00,0x11111100,0x1c1c1c00,
+        0x32323200,0x0f0f0f00,0x9c9c9c00,0x16161600,
+        0x53535300,0x18181800,0xf2f2f200,0x22222200,
+        0xfefefe00,0x44444400,0xcfcfcf00,0xb2b2b200,
+        0xc3c3c300,0xb5b5b500,0x7a7a7a00,0x91919100,
+        0x24242400,0x08080800,0xe8e8e800,0xa8a8a800,
+        0x60606000,0xfcfcfc00,0x69696900,0x50505000,
+        0xaaaaaa00,0xd0d0d000,0xa0a0a000,0x7d7d7d00,
+        0xa1a1a100,0x89898900,0x62626200,0x97979700,
+        0x54545400,0x5b5b5b00,0x1e1e1e00,0x95959500,
+        0xe0e0e000,0xffffff00,0x64646400,0xd2d2d200,
+        0x10101000,0xc4c4c400,0x00000000,0x48484800,
+        0xa3a3a300,0xf7f7f700,0x75757500,0xdbdbdb00,
+        0x8a8a8a00,0x03030300,0xe6e6e600,0xdadada00,
+        0x09090900,0x3f3f3f00,0xdddddd00,0x94949400,
+        0x87878700,0x5c5c5c00,0x83838300,0x02020200,
+        0xcdcdcd00,0x4a4a4a00,0x90909000,0x33333300,
+        0x73737300,0x67676700,0xf6f6f600,0xf3f3f300,
+        0x9d9d9d00,0x7f7f7f00,0xbfbfbf00,0xe2e2e200,
+        0x52525200,0x9b9b9b00,0xd8d8d800,0x26262600,
+        0xc8c8c800,0x37373700,0xc6c6c600,0x3b3b3b00,
+        0x81818100,0x96969600,0x6f6f6f00,0x4b4b4b00,
+        0x13131300,0xbebebe00,0x63636300,0x2e2e2e00,
+        0xe9e9e900,0x79797900,0xa7a7a700,0x8c8c8c00,
+        0x9f9f9f00,0x6e6e6e00,0xbcbcbc00,0x8e8e8e00,
+        0x29292900,0xf5f5f500,0xf9f9f900,0xb6b6b600,
+        0x2f2f2f00,0xfdfdfd00,0xb4b4b400,0x59595900,
+        0x78787800,0x98989800,0x06060600,0x6a6a6a00,
+        0xe7e7e700,0x46464600,0x71717100,0xbababa00,
+        0xd4d4d400,0x25252500,0xababab00,0x42424200,
+        0x88888800,0xa2a2a200,0x8d8d8d00,0xfafafa00,
+        0x72727200,0x07070700,0xb9b9b900,0x55555500,
+        0xf8f8f800,0xeeeeee00,0xacacac00,0x0a0a0a00,
+        0x36363600,0x49494900,0x2a2a2a00,0x68686800,
+        0x3c3c3c00,0x38383800,0xf1f1f100,0xa4a4a400,
+        0x40404000,0x28282800,0xd3d3d300,0x7b7b7b00,
+        0xbbbbbb00,0xc9c9c900,0x43434300,0xc1c1c100,
+        0x15151500,0xe3e3e300,0xadadad00,0xf4f4f400,
+        0x77777700,0xc7c7c700,0x80808000,0x9e9e9e00,
+        };
+
+static const u32 camellia_sp0222[256] =
+        {
+        0x00e0e0e0,0x00050505,0x00585858,0x00d9d9d9,
+        0x00676767,0x004e4e4e,0x00818181,0x00cbcbcb,
+        0x00c9c9c9,0x000b0b0b,0x00aeaeae,0x006a6a6a,
+        0x00d5d5d5,0x00181818,0x005d5d5d,0x00828282,
+        0x00464646,0x00dfdfdf,0x00d6d6d6,0x00272727,
+        0x008a8a8a,0x00323232,0x004b4b4b,0x00424242,
+        0x00dbdbdb,0x001c1c1c,0x009e9e9e,0x009c9c9c,
+        0x003a3a3a,0x00cacaca,0x00252525,0x007b7b7b,
+        0x000d0d0d,0x00717171,0x005f5f5f,0x001f1f1f,
+        0x00f8f8f8,0x00d7d7d7,0x003e3e3e,0x009d9d9d,
+        0x007c7c7c,0x00606060,0x00b9b9b9,0x00bebebe,
+        0x00bcbcbc,0x008b8b8b,0x00161616,0x00343434,
+        0x004d4d4d,0x00c3c3c3,0x00727272,0x00959595,
+        0x00ababab,0x008e8e8e,0x00bababa,0x007a7a7a,
+        0x00b3b3b3,0x00020202,0x00b4b4b4,0x00adadad,
+        0x00a2a2a2,0x00acacac,0x00d8d8d8,0x009a9a9a,
+        0x00171717,0x001a1a1a,0x00353535,0x00cccccc,
+        0x00f7f7f7,0x00999999,0x00616161,0x005a5a5a,
+        0x00e8e8e8,0x00242424,0x00565656,0x00404040,
+        0x00e1e1e1,0x00636363,0x00090909,0x00333333,
+        0x00bfbfbf,0x00989898,0x00979797,0x00858585,
+        0x00686868,0x00fcfcfc,0x00ececec,0x000a0a0a,
+        0x00dadada,0x006f6f6f,0x00535353,0x00626262,
+        0x00a3a3a3,0x002e2e2e,0x00080808,0x00afafaf,
+        0x00282828,0x00b0b0b0,0x00747474,0x00c2c2c2,
+        0x00bdbdbd,0x00363636,0x00222222,0x00383838,
+        0x00646464,0x001e1e1e,0x00393939,0x002c2c2c,
+        0x00a6a6a6,0x00303030,0x00e5e5e5,0x00444444,
+        0x00fdfdfd,0x00888888,0x009f9f9f,0x00656565,
+        0x00878787,0x006b6b6b,0x00f4f4f4,0x00232323,
+        0x00484848,0x00101010,0x00d1d1d1,0x00515151,
+        0x00c0c0c0,0x00f9f9f9,0x00d2d2d2,0x00a0a0a0,
+        0x00555555,0x00a1a1a1,0x00414141,0x00fafafa,
+        0x00434343,0x00131313,0x00c4c4c4,0x002f2f2f,
+        0x00a8a8a8,0x00b6b6b6,0x003c3c3c,0x002b2b2b,
+        0x00c1c1c1,0x00ffffff,0x00c8c8c8,0x00a5a5a5,
+        0x00202020,0x00898989,0x00000000,0x00909090,
+        0x00474747,0x00efefef,0x00eaeaea,0x00b7b7b7,
+        0x00151515,0x00060606,0x00cdcdcd,0x00b5b5b5,
+        0x00121212,0x007e7e7e,0x00bbbbbb,0x00292929,
+        0x000f0f0f,0x00b8b8b8,0x00070707,0x00040404,
+        0x009b9b9b,0x00949494,0x00212121,0x00666666,
+        0x00e6e6e6,0x00cecece,0x00ededed,0x00e7e7e7,
+        0x003b3b3b,0x00fefefe,0x007f7f7f,0x00c5c5c5,
+        0x00a4a4a4,0x00373737,0x00b1b1b1,0x004c4c4c,
+        0x00919191,0x006e6e6e,0x008d8d8d,0x00767676,
+        0x00030303,0x002d2d2d,0x00dedede,0x00969696,
+        0x00262626,0x007d7d7d,0x00c6c6c6,0x005c5c5c,
+        0x00d3d3d3,0x00f2f2f2,0x004f4f4f,0x00191919,
+        0x003f3f3f,0x00dcdcdc,0x00797979,0x001d1d1d,
+        0x00525252,0x00ebebeb,0x00f3f3f3,0x006d6d6d,
+        0x005e5e5e,0x00fbfbfb,0x00696969,0x00b2b2b2,
+        0x00f0f0f0,0x00313131,0x000c0c0c,0x00d4d4d4,
+        0x00cfcfcf,0x008c8c8c,0x00e2e2e2,0x00757575,
+        0x00a9a9a9,0x004a4a4a,0x00575757,0x00848484,
+        0x00111111,0x00454545,0x001b1b1b,0x00f5f5f5,
+        0x00e4e4e4,0x000e0e0e,0x00737373,0x00aaaaaa,
+        0x00f1f1f1,0x00dddddd,0x00595959,0x00141414,
+        0x006c6c6c,0x00929292,0x00545454,0x00d0d0d0,
+        0x00787878,0x00707070,0x00e3e3e3,0x00494949,
+        0x00808080,0x00505050,0x00a7a7a7,0x00f6f6f6,
+        0x00777777,0x00939393,0x00868686,0x00838383,
+        0x002a2a2a,0x00c7c7c7,0x005b5b5b,0x00e9e9e9,
+        0x00eeeeee,0x008f8f8f,0x00010101,0x003d3d3d,
+        };
+
+static const u32 camellia_sp3033[256] =
+        {
+        0x38003838,0x41004141,0x16001616,0x76007676,
+        0xd900d9d9,0x93009393,0x60006060,0xf200f2f2,
+        0x72007272,0xc200c2c2,0xab00abab,0x9a009a9a,
+        0x75007575,0x06000606,0x57005757,0xa000a0a0,
+        0x91009191,0xf700f7f7,0xb500b5b5,0xc900c9c9,
+        0xa200a2a2,0x8c008c8c,0xd200d2d2,0x90009090,
+        0xf600f6f6,0x07000707,0xa700a7a7,0x27002727,
+        0x8e008e8e,0xb200b2b2,0x49004949,0xde00dede,
+        0x43004343,0x5c005c5c,0xd700d7d7,0xc700c7c7,
+        0x3e003e3e,0xf500f5f5,0x8f008f8f,0x67006767,
+        0x1f001f1f,0x18001818,0x6e006e6e,0xaf00afaf,
+        0x2f002f2f,0xe200e2e2,0x85008585,0x0d000d0d,
+        0x53005353,0xf000f0f0,0x9c009c9c,0x65006565,
+        0xea00eaea,0xa300a3a3,0xae00aeae,0x9e009e9e,
+        0xec00ecec,0x80008080,0x2d002d2d,0x6b006b6b,
+        0xa800a8a8,0x2b002b2b,0x36003636,0xa600a6a6,
+        0xc500c5c5,0x86008686,0x4d004d4d,0x33003333,
+        0xfd00fdfd,0x66006666,0x58005858,0x96009696,
+        0x3a003a3a,0x09000909,0x95009595,0x10001010,
+        0x78007878,0xd800d8d8,0x42004242,0xcc00cccc,
+        0xef00efef,0x26002626,0xe500e5e5,0x61006161,
+        0x1a001a1a,0x3f003f3f,0x3b003b3b,0x82008282,
+        0xb600b6b6,0xdb00dbdb,0xd400d4d4,0x98009898,
+        0xe800e8e8,0x8b008b8b,0x02000202,0xeb00ebeb,
+        0x0a000a0a,0x2c002c2c,0x1d001d1d,0xb000b0b0,
+        0x6f006f6f,0x8d008d8d,0x88008888,0x0e000e0e,
+        0x19001919,0x87008787,0x4e004e4e,0x0b000b0b,
+        0xa900a9a9,0x0c000c0c,0x79007979,0x11001111,
+        0x7f007f7f,0x22002222,0xe700e7e7,0x59005959,
+        0xe100e1e1,0xda00dada,0x3d003d3d,0xc800c8c8,
+        0x12001212,0x04000404,0x74007474,0x54005454,
+        0x30003030,0x7e007e7e,0xb400b4b4,0x28002828,
+        0x55005555,0x68006868,0x50005050,0xbe00bebe,
+        0xd000d0d0,0xc400c4c4,0x31003131,0xcb00cbcb,
+        0x2a002a2a,0xad00adad,0x0f000f0f,0xca00caca,
+        0x70007070,0xff00ffff,0x32003232,0x69006969,
+        0x08000808,0x62006262,0x00000000,0x24002424,
+        0xd100d1d1,0xfb00fbfb,0xba00baba,0xed00eded,
+        0x45004545,0x81008181,0x73007373,0x6d006d6d,
+        0x84008484,0x9f009f9f,0xee00eeee,0x4a004a4a,
+        0xc300c3c3,0x2e002e2e,0xc100c1c1,0x01000101,
+        0xe600e6e6,0x25002525,0x48004848,0x99009999,
+        0xb900b9b9,0xb300b3b3,0x7b007b7b,0xf900f9f9,
+        0xce00cece,0xbf00bfbf,0xdf00dfdf,0x71007171,
+        0x29002929,0xcd00cdcd,0x6c006c6c,0x13001313,
+        0x64006464,0x9b009b9b,0x63006363,0x9d009d9d,
+        0xc000c0c0,0x4b004b4b,0xb700b7b7,0xa500a5a5,
+        0x89008989,0x5f005f5f,0xb100b1b1,0x17001717,
+        0xf400f4f4,0xbc00bcbc,0xd300d3d3,0x46004646,
+        0xcf00cfcf,0x37003737,0x5e005e5e,0x47004747,
+        0x94009494,0xfa00fafa,0xfc00fcfc,0x5b005b5b,
+        0x97009797,0xfe00fefe,0x5a005a5a,0xac00acac,
+        0x3c003c3c,0x4c004c4c,0x03000303,0x35003535,
+        0xf300f3f3,0x23002323,0xb800b8b8,0x5d005d5d,
+        0x6a006a6a,0x92009292,0xd500d5d5,0x21002121,
+        0x44004444,0x51005151,0xc600c6c6,0x7d007d7d,
+        0x39003939,0x83008383,0xdc00dcdc,0xaa00aaaa,
+        0x7c007c7c,0x77007777,0x56005656,0x05000505,
+        0x1b001b1b,0xa400a4a4,0x15001515,0x34003434,
+        0x1e001e1e,0x1c001c1c,0xf800f8f8,0x52005252,
+        0x20002020,0x14001414,0xe900e9e9,0xbd00bdbd,
+        0xdd00dddd,0xe400e4e4,0xa100a1a1,0xe000e0e0,
+        0x8a008a8a,0xf100f1f1,0xd600d6d6,0x7a007a7a,
+        0xbb00bbbb,0xe300e3e3,0x40004040,0x4f004f4f,
+        };
+
+static const u32 camellia_sp4404[256] =
+        {
+        0x70700070,0x2c2c002c,0xb3b300b3,0xc0c000c0,
+        0xe4e400e4,0x57570057,0xeaea00ea,0xaeae00ae,
+        0x23230023,0x6b6b006b,0x45450045,0xa5a500a5,
+        0xeded00ed,0x4f4f004f,0x1d1d001d,0x92920092,
+        0x86860086,0xafaf00af,0x7c7c007c,0x1f1f001f,
+        0x3e3e003e,0xdcdc00dc,0x5e5e005e,0x0b0b000b,
+        0xa6a600a6,0x39390039,0xd5d500d5,0x5d5d005d,
+        0xd9d900d9,0x5a5a005a,0x51510051,0x6c6c006c,
+        0x8b8b008b,0x9a9a009a,0xfbfb00fb,0xb0b000b0,
+        0x74740074,0x2b2b002b,0xf0f000f0,0x84840084,
+        0xdfdf00df,0xcbcb00cb,0x34340034,0x76760076,
+        0x6d6d006d,0xa9a900a9,0xd1d100d1,0x04040004,
+        0x14140014,0x3a3a003a,0xdede00de,0x11110011,
+        0x32320032,0x9c9c009c,0x53530053,0xf2f200f2,
+        0xfefe00fe,0xcfcf00cf,0xc3c300c3,0x7a7a007a,
+        0x24240024,0xe8e800e8,0x60600060,0x69690069,
+        0xaaaa00aa,0xa0a000a0,0xa1a100a1,0x62620062,
+        0x54540054,0x1e1e001e,0xe0e000e0,0x64640064,
+        0x10100010,0x00000000,0xa3a300a3,0x75750075,
+        0x8a8a008a,0xe6e600e6,0x09090009,0xdddd00dd,
+        0x87870087,0x83830083,0xcdcd00cd,0x90900090,
+        0x73730073,0xf6f600f6,0x9d9d009d,0xbfbf00bf,
+        0x52520052,0xd8d800d8,0xc8c800c8,0xc6c600c6,
+        0x81810081,0x6f6f006f,0x13130013,0x63630063,
+        0xe9e900e9,0xa7a700a7,0x9f9f009f,0xbcbc00bc,
+        0x29290029,0xf9f900f9,0x2f2f002f,0xb4b400b4,
+        0x78780078,0x06060006,0xe7e700e7,0x71710071,
+        0xd4d400d4,0xabab00ab,0x88880088,0x8d8d008d,
+        0x72720072,0xb9b900b9,0xf8f800f8,0xacac00ac,
+        0x36360036,0x2a2a002a,0x3c3c003c,0xf1f100f1,
+        0x40400040,0xd3d300d3,0xbbbb00bb,0x43430043,
+        0x15150015,0xadad00ad,0x77770077,0x80800080,
+        0x82820082,0xecec00ec,0x27270027,0xe5e500e5,
+        0x85850085,0x35350035,0x0c0c000c,0x41410041,
+        0xefef00ef,0x93930093,0x19190019,0x21210021,
+        0x0e0e000e,0x4e4e004e,0x65650065,0xbdbd00bd,
+        0xb8b800b8,0x8f8f008f,0xebeb00eb,0xcece00ce,
+        0x30300030,0x5f5f005f,0xc5c500c5,0x1a1a001a,
+        0xe1e100e1,0xcaca00ca,0x47470047,0x3d3d003d,
+        0x01010001,0xd6d600d6,0x56560056,0x4d4d004d,
+        0x0d0d000d,0x66660066,0xcccc00cc,0x2d2d002d,
+        0x12120012,0x20200020,0xb1b100b1,0x99990099,
+        0x4c4c004c,0xc2c200c2,0x7e7e007e,0x05050005,
+        0xb7b700b7,0x31310031,0x17170017,0xd7d700d7,
+        0x58580058,0x61610061,0x1b1b001b,0x1c1c001c,
+        0x0f0f000f,0x16160016,0x18180018,0x22220022,
+        0x44440044,0xb2b200b2,0xb5b500b5,0x91910091,
+        0x08080008,0xa8a800a8,0xfcfc00fc,0x50500050,
+        0xd0d000d0,0x7d7d007d,0x89890089,0x97970097,
+        0x5b5b005b,0x95950095,0xffff00ff,0xd2d200d2,
+        0xc4c400c4,0x48480048,0xf7f700f7,0xdbdb00db,
+        0x03030003,0xdada00da,0x3f3f003f,0x94940094,
+        0x5c5c005c,0x02020002,0x4a4a004a,0x33330033,
+        0x67670067,0xf3f300f3,0x7f7f007f,0xe2e200e2,
+        0x9b9b009b,0x26260026,0x37370037,0x3b3b003b,
+        0x96960096,0x4b4b004b,0xbebe00be,0x2e2e002e,
+        0x79790079,0x8c8c008c,0x6e6e006e,0x8e8e008e,
+        0xf5f500f5,0xb6b600b6,0xfdfd00fd,0x59590059,
+        0x98980098,0x6a6a006a,0x46460046,0xbaba00ba,
+        0x25250025,0x42420042,0xa2a200a2,0xfafa00fa,
+        0x07070007,0x55550055,0xeeee00ee,0x0a0a000a,
+        0x49490049,0x68680068,0x38380038,0xa4a400a4,
+        0x28280028,0x7b7b007b,0xc9c900c9,0xc1c100c1,
+        0xe3e300e3,0xf4f400f4,0xc7c700c7,0x9e9e009e,
+        };
+
+/**
+ * Stuff related to the Camellia key schedule
+ */
+#define subl(x) subL[(x)]
+#define subr(x) subR[(x)]
+
+void camellia_setup128(const u8 *key, u32 *subkey)
+        {
+        u32 kll, klr, krl, krr;
+        u32 il, ir, t0, t1, w0, w1;
+        u32 kw4l, kw4r, dw, tl, tr;
+        u32 subL[26];
+        u32 subR[26];
+
+        /**
+         *  k == kll || klr || krl || krr (|| is concatination)
+         */
+        kll = GETU32(key     );
+        klr = GETU32(key +  4);
+        krl = GETU32(key +  8);
+        krr = GETU32(key + 12);
+        /**
+         * generate KL dependent subkeys
+         */
+        /* kw1 */
+        subl(0) = kll; subr(0) = klr;
+        /* kw2 */
+        subl(1) = krl; subr(1) = krr;
+        /* rotation left shift 15bit */
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+        /* k3 */
+        subl(4) = kll; subr(4) = klr;
+        /* k4 */
+        subl(5) = krl; subr(5) = krr;
+        /* rotation left shift 15+30bit */
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 30);
+        /* k7 */
+        subl(10) = kll; subr(10) = klr;
+        /* k8 */
+        subl(11) = krl; subr(11) = krr;
+        /* rotation left shift 15+30+15bit */
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+        /* k10 */
+        subl(13) = krl; subr(13) = krr;
+        /* rotation left shift 15+30+15+17 bit */
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+        /* kl3 */
+        subl(16) = kll; subr(16) = klr;
+        /* kl4 */
+        subl(17) = krl; subr(17) = krr;
+        /* rotation left shift 15+30+15+17+17 bit */
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+        /* k13 */
+        subl(18) = kll; subr(18) = klr;
+        /* k14 */
+        subl(19) = krl; subr(19) = krr;
+        /* rotation left shift 15+30+15+17+17+17 bit */
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+        /* k17 */
+        subl(22) = kll; subr(22) = klr;
+        /* k18 */
+        subl(23) = krl; subr(23) = krr;
+
+        /* generate KA */
+        kll = subl(0); klr = subr(0);
+        krl = subl(1); krr = subr(1);
+        CAMELLIA_F(kll, klr,
+                CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R,
+                w0, w1, il, ir, t0, t1);
+        krl ^= w0; krr ^= w1;
+        CAMELLIA_F(krl, krr,
+                CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R,
+                kll, klr, il, ir, t0, t1);
+        /* current status == (kll, klr, w0, w1) */
+        CAMELLIA_F(kll, klr,
+                CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R,
+                krl, krr, il, ir, t0, t1);
+        krl ^= w0; krr ^= w1;
+        CAMELLIA_F(krl, krr,
+                CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R,
+                w0, w1, il, ir, t0, t1);
+        kll ^= w0; klr ^= w1;
+
+        /* generate KA dependent subkeys */
+        /* k1, k2 */
+        subl(2) = kll; subr(2) = klr;
+        subl(3) = krl; subr(3) = krr;
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+        /* k5,k6 */
+        subl(6) = kll; subr(6) = klr;
+        subl(7) = krl; subr(7) = krr;
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+        /* kl1, kl2 */
+        subl(8) = kll; subr(8) = klr;
+        subl(9) = krl; subr(9) = krr;
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+        /* k9 */
+        subl(12) = kll; subr(12) = klr;
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+        /* k11, k12 */
+        subl(14) = kll; subr(14) = klr;
+        subl(15) = krl; subr(15) = krr;
+        CAMELLIA_ROLDQo32(kll, klr, krl, krr, w0, w1, 34);
+        /* k15, k16 */
+        subl(20) = kll; subr(20) = klr;
+        subl(21) = krl; subr(21) = krr;
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+        /* kw3, kw4 */
+        subl(24) = kll; subr(24) = klr;
+        subl(25) = krl; subr(25) = krr;
+
+
+        /* absorb kw2 to other subkeys */
+/* round 2 */
+        subl(3) ^= subl(1); subr(3) ^= subr(1);
+/* round 4 */
+        subl(5) ^= subl(1); subr(5) ^= subr(1);
+/* round 6 */
+        subl(7) ^= subl(1); subr(7) ^= subr(1);
+        subl(1) ^= subr(1) & ~subr(9);
+        dw = subl(1) & subl(9),
+                subr(1) ^= CAMELLIA_RL1(dw); /* modified for FLinv(kl2) */
+/* round 8 */
+        subl(11) ^= subl(1); subr(11) ^= subr(1);
+/* round 10 */
+        subl(13) ^= subl(1); subr(13) ^= subr(1);
+/* round 12 */
+        subl(15) ^= subl(1); subr(15) ^= subr(1);
+        subl(1) ^= subr(1) & ~subr(17);
+        dw = subl(1) & subl(17),
+                subr(1) ^= CAMELLIA_RL1(dw); /* modified for FLinv(kl4) */
+/* round 14 */
+        subl(19) ^= subl(1); subr(19) ^= subr(1);
+/* round 16 */
+        subl(21) ^= subl(1); subr(21) ^= subr(1);
+/* round 18 */
+        subl(23) ^= subl(1); subr(23) ^= subr(1);
+/* kw3 */
+        subl(24) ^= subl(1); subr(24) ^= subr(1);
+
+        /* absorb kw4 to other subkeys */
+        kw4l = subl(25); kw4r = subr(25);
+/* round 17 */
+        subl(22) ^= kw4l; subr(22) ^= kw4r;
+/* round 15 */
+        subl(20) ^= kw4l; subr(20) ^= kw4r;
+/* round 13 */
+        subl(18) ^= kw4l; subr(18) ^= kw4r;
+        kw4l ^= kw4r & ~subr(16);
+        dw = kw4l & subl(16),
+                kw4r ^= CAMELLIA_RL1(dw); /* modified for FL(kl3) */
+/* round 11 */
+        subl(14) ^= kw4l; subr(14) ^= kw4r;
+/* round 9 */
+        subl(12) ^= kw4l; subr(12) ^= kw4r;
+/* round 7 */
+        subl(10) ^= kw4l; subr(10) ^= kw4r;
+        kw4l ^= kw4r & ~subr(8);
+        dw = kw4l & subl(8),
+                kw4r ^= CAMELLIA_RL1(dw); /* modified for FL(kl1) */
+/* round 5 */
+        subl(6) ^= kw4l; subr(6) ^= kw4r;
+/* round 3 */
+        subl(4) ^= kw4l; subr(4) ^= kw4r;
+/* round 1 */
+        subl(2) ^= kw4l; subr(2) ^= kw4r;
+/* kw1 */
+        subl(0) ^= kw4l; subr(0) ^= kw4r;
+
+
+        /* key XOR is end of F-function */
+        CamelliaSubkeyL(0) = subl(0) ^ subl(2);/* kw1 */
+        CamelliaSubkeyR(0) = subr(0) ^ subr(2);
+        CamelliaSubkeyL(2) = subl(3);       /* round 1 */
+        CamelliaSubkeyR(2) = subr(3);
+        CamelliaSubkeyL(3) = subl(2) ^ subl(4); /* round 2 */
+        CamelliaSubkeyR(3) = subr(2) ^ subr(4);
+        CamelliaSubkeyL(4) = subl(3) ^ subl(5); /* round 3 */
+        CamelliaSubkeyR(4) = subr(3) ^ subr(5);
+        CamelliaSubkeyL(5) = subl(4) ^ subl(6); /* round 4 */
+        CamelliaSubkeyR(5) = subr(4) ^ subr(6);
+        CamelliaSubkeyL(6) = subl(5) ^ subl(7); /* round 5 */
+        CamelliaSubkeyR(6) = subr(5) ^ subr(7);
+        tl = subl(10) ^ (subr(10) & ~subr(8));
+        dw = tl & subl(8),  /* FL(kl1) */
+                tr = subr(10) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(7) = subl(6) ^ tl; /* round 6 */
+        CamelliaSubkeyR(7) = subr(6) ^ tr;
+        CamelliaSubkeyL(8) = subl(8);       /* FL(kl1) */
+        CamelliaSubkeyR(8) = subr(8);
+        CamelliaSubkeyL(9) = subl(9);       /* FLinv(kl2) */
+        CamelliaSubkeyR(9) = subr(9);
+        tl = subl(7) ^ (subr(7) & ~subr(9));
+        dw = tl & subl(9),  /* FLinv(kl2) */
+                tr = subr(7) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(10) = tl ^ subl(11); /* round 7 */
+        CamelliaSubkeyR(10) = tr ^ subr(11);
+        CamelliaSubkeyL(11) = subl(10) ^ subl(12); /* round 8 */
+        CamelliaSubkeyR(11) = subr(10) ^ subr(12);
+        CamelliaSubkeyL(12) = subl(11) ^ subl(13); /* round 9 */
+        CamelliaSubkeyR(12) = subr(11) ^ subr(13);
+        CamelliaSubkeyL(13) = subl(12) ^ subl(14); /* round 10 */
+        CamelliaSubkeyR(13) = subr(12) ^ subr(14);
+        CamelliaSubkeyL(14) = subl(13) ^ subl(15); /* round 11 */
+        CamelliaSubkeyR(14) = subr(13) ^ subr(15);
+        tl = subl(18) ^ (subr(18) & ~subr(16));
+        dw = tl & subl(16), /* FL(kl3) */
+                tr = subr(18) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(15) = subl(14) ^ tl; /* round 12 */
+        CamelliaSubkeyR(15) = subr(14) ^ tr;
+        CamelliaSubkeyL(16) = subl(16);     /* FL(kl3) */
+        CamelliaSubkeyR(16) = subr(16);
+        CamelliaSubkeyL(17) = subl(17);     /* FLinv(kl4) */
+        CamelliaSubkeyR(17) = subr(17);
+        tl = subl(15) ^ (subr(15) & ~subr(17));
+        dw = tl & subl(17), /* FLinv(kl4) */
+                tr = subr(15) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(18) = tl ^ subl(19); /* round 13 */
+        CamelliaSubkeyR(18) = tr ^ subr(19);
+        CamelliaSubkeyL(19) = subl(18) ^ subl(20); /* round 14 */
+        CamelliaSubkeyR(19) = subr(18) ^ subr(20);
+        CamelliaSubkeyL(20) = subl(19) ^ subl(21); /* round 15 */
+        CamelliaSubkeyR(20) = subr(19) ^ subr(21);
+        CamelliaSubkeyL(21) = subl(20) ^ subl(22); /* round 16 */
+        CamelliaSubkeyR(21) = subr(20) ^ subr(22);
+        CamelliaSubkeyL(22) = subl(21) ^ subl(23); /* round 17 */
+        CamelliaSubkeyR(22) = subr(21) ^ subr(23);
+        CamelliaSubkeyL(23) = subl(22);     /* round 18 */
+        CamelliaSubkeyR(23) = subr(22);
+        CamelliaSubkeyL(24) = subl(24) ^ subl(23); /* kw3 */
+        CamelliaSubkeyR(24) = subr(24) ^ subr(23);
+
+        /* apply the inverse of the last half of P-function */
+        dw = CamelliaSubkeyL(2) ^ CamelliaSubkeyR(2),
+                dw = CAMELLIA_RL8(dw);/* round 1 */
+        CamelliaSubkeyR(2) = CamelliaSubkeyL(2) ^ dw,
+                CamelliaSubkeyL(2) = dw;
+        dw = CamelliaSubkeyL(3) ^ CamelliaSubkeyR(3),
+                dw = CAMELLIA_RL8(dw);/* round 2 */
+        CamelliaSubkeyR(3) = CamelliaSubkeyL(3) ^ dw,
+                CamelliaSubkeyL(3) = dw;
+        dw = CamelliaSubkeyL(4) ^ CamelliaSubkeyR(4),
+                dw = CAMELLIA_RL8(dw);/* round 3 */
+        CamelliaSubkeyR(4) = CamelliaSubkeyL(4) ^ dw,
+                CamelliaSubkeyL(4) = dw;
+        dw = CamelliaSubkeyL(5) ^ CamelliaSubkeyR(5),
+                dw = CAMELLIA_RL8(dw);/* round 4 */
+        CamelliaSubkeyR(5) = CamelliaSubkeyL(5) ^ dw,
+                CamelliaSubkeyL(5) = dw;
+        dw = CamelliaSubkeyL(6) ^ CamelliaSubkeyR(6),
+                dw = CAMELLIA_RL8(dw);/* round 5 */
+        CamelliaSubkeyR(6) = CamelliaSubkeyL(6) ^ dw,
+                CamelliaSubkeyL(6) = dw;
+        dw = CamelliaSubkeyL(7) ^ CamelliaSubkeyR(7),
+                dw = CAMELLIA_RL8(dw);/* round 6 */
+        CamelliaSubkeyR(7) = CamelliaSubkeyL(7) ^ dw,
+                CamelliaSubkeyL(7) = dw;
+        dw = CamelliaSubkeyL(10) ^ CamelliaSubkeyR(10),
+                dw = CAMELLIA_RL8(dw);/* round 7 */
+        CamelliaSubkeyR(10) = CamelliaSubkeyL(10) ^ dw,
+                CamelliaSubkeyL(10) = dw;
+        dw = CamelliaSubkeyL(11) ^ CamelliaSubkeyR(11),
+                dw = CAMELLIA_RL8(dw);/* round 8 */
+        CamelliaSubkeyR(11) = CamelliaSubkeyL(11) ^ dw,
+                CamelliaSubkeyL(11) = dw;
+        dw = CamelliaSubkeyL(12) ^ CamelliaSubkeyR(12),
+                dw = CAMELLIA_RL8(dw);/* round 9 */
+        CamelliaSubkeyR(12) = CamelliaSubkeyL(12) ^ dw,
+                CamelliaSubkeyL(12) = dw;
+        dw = CamelliaSubkeyL(13) ^ CamelliaSubkeyR(13),
+                dw = CAMELLIA_RL8(dw);/* round 10 */
+        CamelliaSubkeyR(13) = CamelliaSubkeyL(13) ^ dw,
+                CamelliaSubkeyL(13) = dw;
+        dw = CamelliaSubkeyL(14) ^ CamelliaSubkeyR(14),
+                dw = CAMELLIA_RL8(dw);/* round 11 */
+        CamelliaSubkeyR(14) = CamelliaSubkeyL(14) ^ dw,
+                CamelliaSubkeyL(14) = dw;
+        dw = CamelliaSubkeyL(15) ^ CamelliaSubkeyR(15),
+                dw = CAMELLIA_RL8(dw);/* round 12 */
+        CamelliaSubkeyR(15) = CamelliaSubkeyL(15) ^ dw,
+                CamelliaSubkeyL(15) = dw;
+        dw = CamelliaSubkeyL(18) ^ CamelliaSubkeyR(18),
+                dw = CAMELLIA_RL8(dw);/* round 13 */
+        CamelliaSubkeyR(18) = CamelliaSubkeyL(18) ^ dw,
+                CamelliaSubkeyL(18) = dw;
+        dw = CamelliaSubkeyL(19) ^ CamelliaSubkeyR(19),
+                dw = CAMELLIA_RL8(dw);/* round 14 */
+        CamelliaSubkeyR(19) = CamelliaSubkeyL(19) ^ dw,
+                CamelliaSubkeyL(19) = dw;
+        dw = CamelliaSubkeyL(20) ^ CamelliaSubkeyR(20),
+                dw = CAMELLIA_RL8(dw);/* round 15 */
+        CamelliaSubkeyR(20) = CamelliaSubkeyL(20) ^ dw,
+                CamelliaSubkeyL(20) = dw;
+        dw = CamelliaSubkeyL(21) ^ CamelliaSubkeyR(21),
+                dw = CAMELLIA_RL8(dw);/* round 16 */
+        CamelliaSubkeyR(21) = CamelliaSubkeyL(21) ^ dw,
+                CamelliaSubkeyL(21) = dw;
+        dw = CamelliaSubkeyL(22) ^ CamelliaSubkeyR(22),
+                dw = CAMELLIA_RL8(dw);/* round 17 */
+        CamelliaSubkeyR(22) = CamelliaSubkeyL(22) ^ dw,
+                CamelliaSubkeyL(22) = dw;
+        dw = CamelliaSubkeyL(23) ^ CamelliaSubkeyR(23),
+                dw = CAMELLIA_RL8(dw);/* round 18 */
+        CamelliaSubkeyR(23) = CamelliaSubkeyL(23) ^ dw,
+                CamelliaSubkeyL(23) = dw;
+
+        return;
+        }
+
+void camellia_setup256(const u8 *key, u32 *subkey)
+        {
+        u32 kll,klr,krl,krr;           /* left half of key */
+        u32 krll,krlr,krrl,krrr;       /* right half of key */
+        u32 il, ir, t0, t1, w0, w1;    /* temporary variables */
+        u32 kw4l, kw4r, dw, tl, tr;
+        u32 subL[34];
+        u32 subR[34];
+
+        /**
+         *  key = (kll || klr || krl || krr || krll || krlr || krrl || krrr)
+         *  (|| is concatination)
+         */
+
+        kll  = GETU32(key     );
+        klr  = GETU32(key +  4);
+        krl  = GETU32(key +  8);
+        krr  = GETU32(key + 12);
+        krll = GETU32(key + 16);
+        krlr = GETU32(key + 20);
+        krrl = GETU32(key + 24);
+        krrr = GETU32(key + 28);
+
+        /* generate KL dependent subkeys */
+        /* kw1 */
+        subl(0) = kll; subr(0) = klr;
+        /* kw2 */
+        subl(1) = krl; subr(1) = krr;
+        CAMELLIA_ROLDQo32(kll, klr, krl, krr, w0, w1, 45);
+        /* k9 */
+        subl(12) = kll; subr(12) = klr;
+        /* k10 */
+        subl(13) = krl; subr(13) = krr;
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+        /* kl3 */
+        subl(16) = kll; subr(16) = klr;
+        /* kl4 */
+        subl(17) = krl; subr(17) = krr;
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+        /* k17 */
+        subl(22) = kll; subr(22) = klr;
+        /* k18 */
+        subl(23) = krl; subr(23) = krr;
+        CAMELLIA_ROLDQo32(kll, klr, krl, krr, w0, w1, 34);
+        /* k23 */
+        subl(30) = kll; subr(30) = klr;
+        /* k24 */
+        subl(31) = krl; subr(31) = krr;
+
+        /* generate KR dependent subkeys */
+        CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 15);
+        /* k3 */
+        subl(4) = krll; subr(4) = krlr;
+        /* k4 */
+        subl(5) = krrl; subr(5) = krrr;
+        CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 15);
+        /* kl1 */
+        subl(8) = krll; subr(8) = krlr;
+        /* kl2 */
+        subl(9) = krrl; subr(9) = krrr;
+        CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
+        /* k13 */
+        subl(18) = krll; subr(18) = krlr;
+        /* k14 */
+        subl(19) = krrl; subr(19) = krrr;
+        CAMELLIA_ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 34);
+        /* k19 */
+        subl(26) = krll; subr(26) = krlr;
+        /* k20 */
+        subl(27) = krrl; subr(27) = krrr;
+        CAMELLIA_ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 34);
+
+        /* generate KA */
+        kll = subl(0) ^ krll; klr = subr(0) ^ krlr;
+        krl = subl(1) ^ krrl; krr = subr(1) ^ krrr;
+        CAMELLIA_F(kll, klr,
+                CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R,
+                w0, w1, il, ir, t0, t1);
+        krl ^= w0; krr ^= w1;
+        CAMELLIA_F(krl, krr,
+                CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R,
+                kll, klr, il, ir, t0, t1);
+        kll ^= krll; klr ^= krlr;
+        CAMELLIA_F(kll, klr,
+                CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R,
+                krl, krr, il, ir, t0, t1);
+        krl ^= w0 ^ krrl; krr ^= w1 ^ krrr;
+        CAMELLIA_F(krl, krr,
+                CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R,
+                w0, w1, il, ir, t0, t1);
+        kll ^= w0; klr ^= w1;
+
+        /* generate KB */
+        krll ^= kll; krlr ^= klr;
+        krrl ^= krl; krrr ^= krr;
+        CAMELLIA_F(krll, krlr,
+                CAMELLIA_SIGMA5L, CAMELLIA_SIGMA5R,
+                w0, w1, il, ir, t0, t1);
+        krrl ^= w0; krrr ^= w1;
+        CAMELLIA_F(krrl, krrr,
+                CAMELLIA_SIGMA6L, CAMELLIA_SIGMA6R,
+                w0, w1, il, ir, t0, t1);
+        krll ^= w0; krlr ^= w1;
+
+        /* generate KA dependent subkeys */
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+        /* k5 */
+        subl(6) = kll; subr(6) = klr;
+        /* k6 */
+        subl(7) = krl; subr(7) = krr;
+        CAMELLIA_ROLDQ(kll, klr, krl, krr, w0, w1, 30);
+        /* k11 */
+        subl(14) = kll; subr(14) = klr;
+        /* k12 */
+        subl(15) = krl; subr(15) = krr;
+        /* rotation left shift 32bit */
+        /* kl5 */
+        subl(24) = klr; subr(24) = krl;
+        /* kl6 */
+        subl(25) = krr; subr(25) = kll;
+        /* rotation left shift 49 from k11,k12 -> k21,k22 */
+        CAMELLIA_ROLDQo32(kll, klr, krl, krr, w0, w1, 49);
+        /* k21 */
+        subl(28) = kll; subr(28) = klr;
+        /* k22 */
+        subl(29) = krl; subr(29) = krr;
+
+        /* generate KB dependent subkeys */
+        /* k1 */
+        subl(2) = krll; subr(2) = krlr;
+        /* k2 */
+        subl(3) = krrl; subr(3) = krrr;
+        CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
+        /* k7 */
+        subl(10) = krll; subr(10) = krlr;
+        /* k8 */
+        subl(11) = krrl; subr(11) = krrr;
+        CAMELLIA_ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
+        /* k15 */
+        subl(20) = krll; subr(20) = krlr;
+        /* k16 */
+        subl(21) = krrl; subr(21) = krrr;
+        CAMELLIA_ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 51);
+        /* kw3 */
+        subl(32) = krll; subr(32) = krlr;
+        /* kw4 */
+        subl(33) = krrl; subr(33) = krrr;
+
+        /* absorb kw2 to other subkeys */
+/* round 2 */
+        subl(3) ^= subl(1); subr(3) ^= subr(1);
+/* round 4 */
+        subl(5) ^= subl(1); subr(5) ^= subr(1);
+/* round 6 */
+        subl(7) ^= subl(1); subr(7) ^= subr(1);
+        subl(1) ^= subr(1) & ~subr(9);
+        dw = subl(1) & subl(9),
+                subr(1) ^= CAMELLIA_RL1(dw); /* modified for FLinv(kl2) */
+/* round 8 */
+        subl(11) ^= subl(1); subr(11) ^= subr(1);
+/* round 10 */
+        subl(13) ^= subl(1); subr(13) ^= subr(1);
+/* round 12 */
+        subl(15) ^= subl(1); subr(15) ^= subr(1);
+        subl(1) ^= subr(1) & ~subr(17);
+        dw = subl(1) & subl(17),
+                subr(1) ^= CAMELLIA_RL1(dw); /* modified for FLinv(kl4) */
+/* round 14 */
+        subl(19) ^= subl(1); subr(19) ^= subr(1);
+/* round 16 */
+        subl(21) ^= subl(1); subr(21) ^= subr(1);
+/* round 18 */
+        subl(23) ^= subl(1); subr(23) ^= subr(1);
+        subl(1) ^= subr(1) & ~subr(25);
+        dw = subl(1) & subl(25),
+                subr(1) ^= CAMELLIA_RL1(dw); /* modified for FLinv(kl6) */
+/* round 20 */
+        subl(27) ^= subl(1); subr(27) ^= subr(1);
+/* round 22 */
+        subl(29) ^= subl(1); subr(29) ^= subr(1);
+/* round 24 */
+        subl(31) ^= subl(1); subr(31) ^= subr(1);
+/* kw3 */
+        subl(32) ^= subl(1); subr(32) ^= subr(1);
+
+
+        /* absorb kw4 to other subkeys */
+        kw4l = subl(33); kw4r = subr(33);
+/* round 23 */
+        subl(30) ^= kw4l; subr(30) ^= kw4r;
+/* round 21 */
+        subl(28) ^= kw4l; subr(28) ^= kw4r;
+/* round 19 */
+        subl(26) ^= kw4l; subr(26) ^= kw4r;
+        kw4l ^= kw4r & ~subr(24);
+        dw = kw4l & subl(24),
+                kw4r ^= CAMELLIA_RL1(dw); /* modified for FL(kl5) */
+/* round 17 */
+        subl(22) ^= kw4l; subr(22) ^= kw4r;
+/* round 15 */
+        subl(20) ^= kw4l; subr(20) ^= kw4r;
+/* round 13 */
+        subl(18) ^= kw4l; subr(18) ^= kw4r;
+        kw4l ^= kw4r & ~subr(16);
+        dw = kw4l & subl(16),
+                kw4r ^= CAMELLIA_RL1(dw); /* modified for FL(kl3) */
+/* round 11 */
+        subl(14) ^= kw4l; subr(14) ^= kw4r;
+/* round 9 */
+        subl(12) ^= kw4l; subr(12) ^= kw4r;
+/* round 7 */
+        subl(10) ^= kw4l; subr(10) ^= kw4r;
+        kw4l ^= kw4r & ~subr(8);
+        dw = kw4l & subl(8),
+                kw4r ^= CAMELLIA_RL1(dw); /* modified for FL(kl1) */
+/* round 5 */
+        subl(6) ^= kw4l; subr(6) ^= kw4r;
+/* round 3 */
+        subl(4) ^= kw4l; subr(4) ^= kw4r;
+/* round 1 */
+        subl(2) ^= kw4l; subr(2) ^= kw4r;
+/* kw1 */
+        subl(0) ^= kw4l; subr(0) ^= kw4r;
+
+        /* key XOR is end of F-function */
+        CamelliaSubkeyL(0) = subl(0) ^ subl(2);/* kw1 */
+        CamelliaSubkeyR(0) = subr(0) ^ subr(2);
+        CamelliaSubkeyL(2) = subl(3);       /* round 1 */
+        CamelliaSubkeyR(2) = subr(3);
+        CamelliaSubkeyL(3) = subl(2) ^ subl(4); /* round 2 */
+        CamelliaSubkeyR(3) = subr(2) ^ subr(4);
+        CamelliaSubkeyL(4) = subl(3) ^ subl(5); /* round 3 */
+        CamelliaSubkeyR(4) = subr(3) ^ subr(5);
+        CamelliaSubkeyL(5) = subl(4) ^ subl(6); /* round 4 */
+        CamelliaSubkeyR(5) = subr(4) ^ subr(6);
+        CamelliaSubkeyL(6) = subl(5) ^ subl(7); /* round 5 */
+        CamelliaSubkeyR(6) = subr(5) ^ subr(7);
+        tl = subl(10) ^ (subr(10) & ~subr(8));
+        dw = tl & subl(8),  /* FL(kl1) */
+                tr = subr(10) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(7) = subl(6) ^ tl; /* round 6 */
+        CamelliaSubkeyR(7) = subr(6) ^ tr;
+        CamelliaSubkeyL(8) = subl(8);       /* FL(kl1) */
+        CamelliaSubkeyR(8) = subr(8);
+        CamelliaSubkeyL(9) = subl(9);       /* FLinv(kl2) */
+        CamelliaSubkeyR(9) = subr(9);
+        tl = subl(7) ^ (subr(7) & ~subr(9));
+        dw = tl & subl(9),  /* FLinv(kl2) */
+                tr = subr(7) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(10) = tl ^ subl(11); /* round 7 */
+        CamelliaSubkeyR(10) = tr ^ subr(11);
+        CamelliaSubkeyL(11) = subl(10) ^ subl(12); /* round 8 */
+        CamelliaSubkeyR(11) = subr(10) ^ subr(12);
+        CamelliaSubkeyL(12) = subl(11) ^ subl(13); /* round 9 */
+        CamelliaSubkeyR(12) = subr(11) ^ subr(13);
+        CamelliaSubkeyL(13) = subl(12) ^ subl(14); /* round 10 */
+        CamelliaSubkeyR(13) = subr(12) ^ subr(14);
+        CamelliaSubkeyL(14) = subl(13) ^ subl(15); /* round 11 */
+        CamelliaSubkeyR(14) = subr(13) ^ subr(15);
+        tl = subl(18) ^ (subr(18) & ~subr(16));
+        dw = tl & subl(16), /* FL(kl3) */
+                tr = subr(18) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(15) = subl(14) ^ tl; /* round 12 */
+        CamelliaSubkeyR(15) = subr(14) ^ tr;
+        CamelliaSubkeyL(16) = subl(16);     /* FL(kl3) */
+        CamelliaSubkeyR(16) = subr(16);
+        CamelliaSubkeyL(17) = subl(17);     /* FLinv(kl4) */
+        CamelliaSubkeyR(17) = subr(17);
+        tl = subl(15) ^ (subr(15) & ~subr(17));
+        dw = tl & subl(17), /* FLinv(kl4) */
+                tr = subr(15) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(18) = tl ^ subl(19); /* round 13 */
+        CamelliaSubkeyR(18) = tr ^ subr(19);
+        CamelliaSubkeyL(19) = subl(18) ^ subl(20); /* round 14 */
+        CamelliaSubkeyR(19) = subr(18) ^ subr(20);
+        CamelliaSubkeyL(20) = subl(19) ^ subl(21); /* round 15 */
+        CamelliaSubkeyR(20) = subr(19) ^ subr(21);
+        CamelliaSubkeyL(21) = subl(20) ^ subl(22); /* round 16 */
+        CamelliaSubkeyR(21) = subr(20) ^ subr(22);
+        CamelliaSubkeyL(22) = subl(21) ^ subl(23); /* round 17 */
+        CamelliaSubkeyR(22) = subr(21) ^ subr(23);
+        tl = subl(26) ^ (subr(26)
+                & ~subr(24));
+        dw = tl & subl(24), /* FL(kl5) */
+                tr = subr(26) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(23) = subl(22) ^ tl; /* round 18 */
+        CamelliaSubkeyR(23) = subr(22) ^ tr;
+        CamelliaSubkeyL(24) = subl(24);     /* FL(kl5) */
+        CamelliaSubkeyR(24) = subr(24);
+        CamelliaSubkeyL(25) = subl(25);     /* FLinv(kl6) */
+        CamelliaSubkeyR(25) = subr(25);
+        tl = subl(23) ^ (subr(23) &
+                ~subr(25));
+        dw = tl & subl(25), /* FLinv(kl6) */
+                tr = subr(23) ^ CAMELLIA_RL1(dw);
+        CamelliaSubkeyL(26) = tl ^ subl(27); /* round 19 */
+        CamelliaSubkeyR(26) = tr ^ subr(27);
+        CamelliaSubkeyL(27) = subl(26) ^ subl(28); /* round 20 */
+        CamelliaSubkeyR(27) = subr(26) ^ subr(28);
+        CamelliaSubkeyL(28) = subl(27) ^ subl(29); /* round 21 */
+        CamelliaSubkeyR(28) = subr(27) ^ subr(29);
+        CamelliaSubkeyL(29) = subl(28) ^ subl(30); /* round 22 */
+        CamelliaSubkeyR(29) = subr(28) ^ subr(30);
+        CamelliaSubkeyL(30) = subl(29) ^ subl(31); /* round 23 */
+        CamelliaSubkeyR(30) = subr(29) ^ subr(31);
+        CamelliaSubkeyL(31) = subl(30);     /* round 24 */
+        CamelliaSubkeyR(31) = subr(30);
+        CamelliaSubkeyL(32) = subl(32) ^ subl(31); /* kw3 */
+        CamelliaSubkeyR(32) = subr(32) ^ subr(31);
+
+        /* apply the inverse of the last half of P-function */
+        dw = CamelliaSubkeyL(2) ^ CamelliaSubkeyR(2),
+                dw = CAMELLIA_RL8(dw);/* round 1 */
+        CamelliaSubkeyR(2) = CamelliaSubkeyL(2) ^ dw,
+                CamelliaSubkeyL(2) = dw;
+        dw = CamelliaSubkeyL(3) ^ CamelliaSubkeyR(3),
+                dw = CAMELLIA_RL8(dw);/* round 2 */
+        CamelliaSubkeyR(3) = CamelliaSubkeyL(3) ^ dw,
+                CamelliaSubkeyL(3) = dw;
+        dw = CamelliaSubkeyL(4) ^ CamelliaSubkeyR(4),
+                dw = CAMELLIA_RL8(dw);/* round 3 */
+        CamelliaSubkeyR(4) = CamelliaSubkeyL(4) ^ dw,
+                CamelliaSubkeyL(4) = dw;
+        dw = CamelliaSubkeyL(5) ^ CamelliaSubkeyR(5),
+                dw = CAMELLIA_RL8(dw);/* round 4 */
+        CamelliaSubkeyR(5) = CamelliaSubkeyL(5) ^ dw,
+                CamelliaSubkeyL(5) = dw;
+        dw = CamelliaSubkeyL(6) ^ CamelliaSubkeyR(6),
+                dw = CAMELLIA_RL8(dw);/* round 5 */
+        CamelliaSubkeyR(6) = CamelliaSubkeyL(6) ^ dw,
+                CamelliaSubkeyL(6) = dw;
+        dw = CamelliaSubkeyL(7) ^ CamelliaSubkeyR(7),
+                dw = CAMELLIA_RL8(dw);/* round 6 */
+        CamelliaSubkeyR(7) = CamelliaSubkeyL(7) ^ dw,
+                CamelliaSubkeyL(7) = dw;
+        dw = CamelliaSubkeyL(10) ^ CamelliaSubkeyR(10),
+                dw = CAMELLIA_RL8(dw);/* round 7 */
+        CamelliaSubkeyR(10) = CamelliaSubkeyL(10) ^ dw,
+                CamelliaSubkeyL(10) = dw;
+        dw = CamelliaSubkeyL(11) ^ CamelliaSubkeyR(11),
+                dw = CAMELLIA_RL8(dw);/* round 8 */
+        CamelliaSubkeyR(11) = CamelliaSubkeyL(11) ^ dw,
+                CamelliaSubkeyL(11) = dw;
+        dw = CamelliaSubkeyL(12) ^ CamelliaSubkeyR(12),
+                dw = CAMELLIA_RL8(dw);/* round 9 */
+        CamelliaSubkeyR(12) = CamelliaSubkeyL(12) ^ dw,
+                CamelliaSubkeyL(12) = dw;
+        dw = CamelliaSubkeyL(13) ^ CamelliaSubkeyR(13),
+                dw = CAMELLIA_RL8(dw);/* round 10 */
+        CamelliaSubkeyR(13) = CamelliaSubkeyL(13) ^ dw,
+                CamelliaSubkeyL(13) = dw;
+        dw = CamelliaSubkeyL(14) ^ CamelliaSubkeyR(14),
+                dw = CAMELLIA_RL8(dw);/* round 11 */
+        CamelliaSubkeyR(14) = CamelliaSubkeyL(14) ^ dw,
+                CamelliaSubkeyL(14) = dw;
+        dw = CamelliaSubkeyL(15) ^ CamelliaSubkeyR(15),
+                dw = CAMELLIA_RL8(dw);/* round 12 */
+        CamelliaSubkeyR(15) = CamelliaSubkeyL(15) ^ dw,
+                CamelliaSubkeyL(15) = dw;
+        dw = CamelliaSubkeyL(18) ^ CamelliaSubkeyR(18),
+                dw = CAMELLIA_RL8(dw);/* round 13 */
+        CamelliaSubkeyR(18) = CamelliaSubkeyL(18) ^ dw,
+                CamelliaSubkeyL(18) = dw;
+        dw = CamelliaSubkeyL(19) ^ CamelliaSubkeyR(19),
+                dw = CAMELLIA_RL8(dw);/* round 14 */
+        CamelliaSubkeyR(19) = CamelliaSubkeyL(19) ^ dw,
+                CamelliaSubkeyL(19) = dw;
+        dw = CamelliaSubkeyL(20) ^ CamelliaSubkeyR(20),
+                dw = CAMELLIA_RL8(dw);/* round 15 */
+        CamelliaSubkeyR(20) = CamelliaSubkeyL(20) ^ dw,
+                CamelliaSubkeyL(20) = dw;
+        dw = CamelliaSubkeyL(21) ^ CamelliaSubkeyR(21),
+                dw = CAMELLIA_RL8(dw);/* round 16 */
+        CamelliaSubkeyR(21) = CamelliaSubkeyL(21) ^ dw,
+                CamelliaSubkeyL(21) = dw;
+        dw = CamelliaSubkeyL(22) ^ CamelliaSubkeyR(22),
+                dw = CAMELLIA_RL8(dw);/* round 17 */
+        CamelliaSubkeyR(22) = CamelliaSubkeyL(22) ^ dw,
+                CamelliaSubkeyL(22) = dw;
+        dw = CamelliaSubkeyL(23) ^ CamelliaSubkeyR(23),
+                dw = CAMELLIA_RL8(dw);/* round 18 */
+        CamelliaSubkeyR(23) = CamelliaSubkeyL(23) ^ dw,
+                CamelliaSubkeyL(23) = dw;
+        dw = CamelliaSubkeyL(26) ^ CamelliaSubkeyR(26),
+                dw = CAMELLIA_RL8(dw);/* round 19 */
+        CamelliaSubkeyR(26) = CamelliaSubkeyL(26) ^ dw,
+                CamelliaSubkeyL(26) = dw;
+        dw = CamelliaSubkeyL(27) ^ CamelliaSubkeyR(27),
+                dw = CAMELLIA_RL8(dw);/* round 20 */
+        CamelliaSubkeyR(27) = CamelliaSubkeyL(27) ^ dw,
+                CamelliaSubkeyL(27) = dw;
+        dw = CamelliaSubkeyL(28) ^ CamelliaSubkeyR(28),
+                dw = CAMELLIA_RL8(dw);/* round 21 */
+        CamelliaSubkeyR(28) = CamelliaSubkeyL(28) ^ dw,
+                CamelliaSubkeyL(28) = dw;
+        dw = CamelliaSubkeyL(29) ^ CamelliaSubkeyR(29),
+                dw = CAMELLIA_RL8(dw);/* round 22 */
+        CamelliaSubkeyR(29) = CamelliaSubkeyL(29) ^ dw,
+                CamelliaSubkeyL(29) = dw;
+        dw = CamelliaSubkeyL(30) ^ CamelliaSubkeyR(30),
+                dw = CAMELLIA_RL8(dw);/* round 23 */
+        CamelliaSubkeyR(30) = CamelliaSubkeyL(30) ^ dw,
+                CamelliaSubkeyL(30) = dw;
+        dw = CamelliaSubkeyL(31) ^ CamelliaSubkeyR(31),
+                dw = CAMELLIA_RL8(dw);/* round 24 */
+        CamelliaSubkeyR(31) = CamelliaSubkeyL(31) ^ dw,
+                CamelliaSubkeyL(31) = dw;
+
+    
+        return;
+        }
+
+void camellia_setup192(const u8 *key, u32 *subkey)
+        {
+        u8 kk[32];
+        u32 krll, krlr, krrl,krrr;
+
+        memcpy(kk, key, 24);
+        memcpy((u8 *)&krll, key+16,4);
+        memcpy((u8 *)&krlr, key+20,4);
+        krrl = ~krll;
+        krrr = ~krlr;
+        memcpy(kk+24, (u8 *)&krrl, 4);
+        memcpy(kk+28, (u8 *)&krrr, 4);
+        camellia_setup256(kk, subkey);
+        return;
+        }
+
+
+/**
+ * Stuff related to camellia encryption/decryption
+ */
+void camellia_encrypt128(const u32 *subkey, u32 *io)
+        {
+        u32 il, ir, t0, t1;
+
+        /* pre whitening but absorb kw2*/
+        io[0] ^= CamelliaSubkeyL(0);
+        io[1] ^= CamelliaSubkeyR(0);
+        /* main iteration */
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(2),CamelliaSubkeyR(2),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(3),CamelliaSubkeyR(3),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(4),CamelliaSubkeyR(4),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(5),CamelliaSubkeyR(5),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(6),CamelliaSubkeyR(6),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(7),CamelliaSubkeyR(7),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(8),CamelliaSubkeyR(8),
+                CamelliaSubkeyL(9),CamelliaSubkeyR(9),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(10),CamelliaSubkeyR(10),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(11),CamelliaSubkeyR(11),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(12),CamelliaSubkeyR(12),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(13),CamelliaSubkeyR(13),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(14),CamelliaSubkeyR(14),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(15),CamelliaSubkeyR(15),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(16),CamelliaSubkeyR(16),
+                CamelliaSubkeyL(17),CamelliaSubkeyR(17),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(18),CamelliaSubkeyR(18),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(19),CamelliaSubkeyR(19),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(20),CamelliaSubkeyR(20),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(21),CamelliaSubkeyR(21),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(22),CamelliaSubkeyR(22),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(23),CamelliaSubkeyR(23),
+                io[0],io[1],il,ir,t0,t1);
+
+        /* post whitening but kw4 */
+        io[2] ^= CamelliaSubkeyL(24);
+        io[3] ^= CamelliaSubkeyR(24);
+
+        t0 = io[0];
+        t1 = io[1];
+        io[0] = io[2];
+        io[1] = io[3];
+        io[2] = t0;
+        io[3] = t1;
+
+        return;
+        }
+
+void camellia_decrypt128(const u32 *subkey, u32 *io)
+        {
+        u32 il,ir,t0,t1;               /* temporary valiables */
+
+        /* pre whitening but absorb kw2*/
+        io[0] ^= CamelliaSubkeyL(24);
+        io[1] ^= CamelliaSubkeyR(24);
+
+        /* main iteration */
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(23),CamelliaSubkeyR(23),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(22),CamelliaSubkeyR(22),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(21),CamelliaSubkeyR(21),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(20),CamelliaSubkeyR(20),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(19),CamelliaSubkeyR(19),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(18),CamelliaSubkeyR(18),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(17),CamelliaSubkeyR(17),
+                CamelliaSubkeyL(16),CamelliaSubkeyR(16),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(15),CamelliaSubkeyR(15),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(14),CamelliaSubkeyR(14),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(13),CamelliaSubkeyR(13),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(12),CamelliaSubkeyR(12),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(11),CamelliaSubkeyR(11),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(10),CamelliaSubkeyR(10),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(9),CamelliaSubkeyR(9),
+                CamelliaSubkeyL(8),CamelliaSubkeyR(8),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(7),CamelliaSubkeyR(7),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(6),CamelliaSubkeyR(6),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(5),CamelliaSubkeyR(5),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(4),CamelliaSubkeyR(4),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(3),CamelliaSubkeyR(3),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(2),CamelliaSubkeyR(2),
+                io[0],io[1],il,ir,t0,t1);
+
+        /* post whitening but kw4 */
+        io[2] ^= CamelliaSubkeyL(0);
+        io[3] ^= CamelliaSubkeyR(0);
+
+        t0 = io[0];
+        t1 = io[1];
+        io[0] = io[2];
+        io[1] = io[3];
+        io[2] = t0;
+        io[3] = t1;
+
+        return;
+        }
+
+/**
+ * stuff for 192 and 256bit encryption/decryption
+ */
+void camellia_encrypt256(const u32 *subkey, u32 *io)
+        {
+        u32 il,ir,t0,t1;           /* temporary valiables */
+
+        /* pre whitening but absorb kw2*/
+        io[0] ^= CamelliaSubkeyL(0);
+        io[1] ^= CamelliaSubkeyR(0);
+
+        /* main iteration */
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(2),CamelliaSubkeyR(2),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(3),CamelliaSubkeyR(3),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(4),CamelliaSubkeyR(4),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(5),CamelliaSubkeyR(5),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(6),CamelliaSubkeyR(6),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(7),CamelliaSubkeyR(7),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(8),CamelliaSubkeyR(8),
+                CamelliaSubkeyL(9),CamelliaSubkeyR(9),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(10),CamelliaSubkeyR(10),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(11),CamelliaSubkeyR(11),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(12),CamelliaSubkeyR(12),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(13),CamelliaSubkeyR(13),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(14),CamelliaSubkeyR(14),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(15),CamelliaSubkeyR(15),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(16),CamelliaSubkeyR(16),
+                CamelliaSubkeyL(17),CamelliaSubkeyR(17),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(18),CamelliaSubkeyR(18),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(19),CamelliaSubkeyR(19),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(20),CamelliaSubkeyR(20),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(21),CamelliaSubkeyR(21),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(22),CamelliaSubkeyR(22),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(23),CamelliaSubkeyR(23),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(24),CamelliaSubkeyR(24),
+                CamelliaSubkeyL(25),CamelliaSubkeyR(25),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(26),CamelliaSubkeyR(26),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(27),CamelliaSubkeyR(27),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(28),CamelliaSubkeyR(28),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(29),CamelliaSubkeyR(29),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(30),CamelliaSubkeyR(30),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(31),CamelliaSubkeyR(31),
+                io[0],io[1],il,ir,t0,t1);
+
+        /* post whitening but kw4 */
+        io[2] ^= CamelliaSubkeyL(32);
+        io[3] ^= CamelliaSubkeyR(32);
+
+        t0 = io[0];
+        t1 = io[1];
+        io[0] = io[2];
+        io[1] = io[3];
+        io[2] = t0;
+        io[3] = t1;
+
+        return;
+        }
+
+void camellia_decrypt256(const u32 *subkey, u32 *io)
+        {
+        u32 il,ir,t0,t1;           /* temporary valiables */
+
+        /* pre whitening but absorb kw2*/
+        io[0] ^= CamelliaSubkeyL(32);
+        io[1] ^= CamelliaSubkeyR(32);
+        
+        /* main iteration */
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(31),CamelliaSubkeyR(31),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(30),CamelliaSubkeyR(30),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(29),CamelliaSubkeyR(29),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(28),CamelliaSubkeyR(28),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(27),CamelliaSubkeyR(27),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(26),CamelliaSubkeyR(26),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(25),CamelliaSubkeyR(25),
+                CamelliaSubkeyL(24),CamelliaSubkeyR(24),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(23),CamelliaSubkeyR(23),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(22),CamelliaSubkeyR(22),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(21),CamelliaSubkeyR(21),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(20),CamelliaSubkeyR(20),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(19),CamelliaSubkeyR(19),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(18),CamelliaSubkeyR(18),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(17),CamelliaSubkeyR(17),
+                CamelliaSubkeyL(16),CamelliaSubkeyR(16),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(15),CamelliaSubkeyR(15),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(14),CamelliaSubkeyR(14),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(13),CamelliaSubkeyR(13),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(12),CamelliaSubkeyR(12),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(11),CamelliaSubkeyR(11),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(10),CamelliaSubkeyR(10),
+                io[0],io[1],il,ir,t0,t1);
+
+        CAMELLIA_FLS(io[0],io[1],io[2],io[3],
+                CamelliaSubkeyL(9),CamelliaSubkeyR(9),
+                CamelliaSubkeyL(8),CamelliaSubkeyR(8),
+                t0,t1,il,ir);
+
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(7),CamelliaSubkeyR(7),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(6),CamelliaSubkeyR(6),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(5),CamelliaSubkeyR(5),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(4),CamelliaSubkeyR(4),
+                io[0],io[1],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[0],io[1],
+                CamelliaSubkeyL(3),CamelliaSubkeyR(3),
+                io[2],io[3],il,ir,t0,t1);
+        CAMELLIA_ROUNDSM(io[2],io[3],
+                CamelliaSubkeyL(2),CamelliaSubkeyR(2),
+                io[0],io[1],il,ir,t0,t1);
+
+        /* post whitening but kw4 */
+        io[2] ^= CamelliaSubkeyL(0);
+        io[3] ^= CamelliaSubkeyR(0);
+
+        t0 = io[0];
+        t1 = io[1];
+        io[0] = io[2];
+        io[1] = io[3];
+        io[2] = t0;
+        io[3] = t1;
+
+        return;
+        }
+
diff --git a/src/lib/libssl/src/crypto/camellia/camellia.h b/src/lib/libssl/src/crypto/camellia/camellia.h
new file mode 100644
index 0000000000..3c8a359543
--- /dev/null
+++ b/src/lib/libssl/src/crypto/camellia/camellia.h
@@ -0,0 +1,129 @@
+/* crypto/camellia/camellia.h -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#ifndef HEADER_CAMELLIA_H
+#define HEADER_CAMELLIA_H
+
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_CAMELLIA
+#error CAMELLIA is disabled.
+#endif
+
+#define CAMELLIA_ENCRYPT        1
+#define CAMELLIA_DECRYPT        0
+
+/* Because array size can't be a const in C, the following two are macros.
+   Both sizes are in bytes. */
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* This should be a hidden type, but EVP requires that the size be known */
+
+#define CAMELLIA_BLOCK_SIZE 16
+#define CAMELLIA_TABLE_BYTE_LEN 272
+#define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
+
+ /* to match with WORD */
+typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN];
+
+struct camellia_key_st 
+        {
+        KEY_TABLE_TYPE rd_key;
+        int bitLength;
+        void (*enc)(const unsigned int *subkey, unsigned int *io);
+        void (*dec)(const unsigned int *subkey, unsigned int *io);
+        };
+
+typedef struct camellia_key_st CAMELLIA_KEY;
+
+int Camellia_set_key(const unsigned char *userKey, const int bits,
+        CAMELLIA_KEY *key);
+
+void Camellia_encrypt(const unsigned char *in, unsigned char *out,
+        const CAMELLIA_KEY *key);
+void Camellia_decrypt(const unsigned char *in, unsigned char *out,
+        const CAMELLIA_KEY *key);
+
+void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
+        const CAMELLIA_KEY *key, const int enc);
+void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, const int enc);
+void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, int *num, const int enc);
+void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, int *num, const int enc);
+void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, int *num, const int enc);
+void Camellia_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
+        const int nbits,const CAMELLIA_KEY *key,
+        unsigned char *ivec,const int enc);
+void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, int *num);
+void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char ivec[CAMELLIA_BLOCK_SIZE],
+        unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
+        unsigned int *num);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* !HEADER_Camellia_H */
+
diff --git a/src/lib/libssl/src/crypto/camellia/cmll_cbc.c b/src/lib/libssl/src/crypto/camellia/cmll_cbc.c
new file mode 100644
index 0000000000..4141a7b59b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/camellia/cmll_cbc.c
@@ -0,0 +1,273 @@
+/* crypto/camellia/camellia_cbc.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#ifndef CAMELLIA_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <openssl/camellia.h>
+#include "cmll_locl.h"
+
+void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                     const unsigned long length, const CAMELLIA_KEY *key,
+                     unsigned char *ivec, const int enc) {
+
+        unsigned long n;
+        unsigned long len = length;
+        const unsigned char *iv = ivec;
+        union { u32 t32[CAMELLIA_BLOCK_SIZE/sizeof(u32)];
+                u8  t8 [CAMELLIA_BLOCK_SIZE]; } tmp;
+        const union { long one; char little; } camellia_endian = {1};
+
+
+        assert(in && out && key && ivec);
+        assert((CAMELLIA_ENCRYPT == enc)||(CAMELLIA_DECRYPT == enc));
+
+        if(((size_t)in|(size_t)out|(size_t)ivec) % sizeof(u32) == 0)
+                {
+                if (CAMELLIA_ENCRYPT == enc)
+                        {
+                        while (len >= CAMELLIA_BLOCK_SIZE)
+                                {
+                                XOR4WORD2((u32 *)out,
+                                        (u32 *)in, (u32 *)iv);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                key->enc(key->rd_key, (u32 *)out);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                iv = out;
+                                len -= CAMELLIA_BLOCK_SIZE;
+                                in += CAMELLIA_BLOCK_SIZE;
+                                out += CAMELLIA_BLOCK_SIZE;
+                                }
+                        if (len)
+                                {
+                                for(n=0; n < len; ++n)
+                                        out[n] = in[n] ^ iv[n];
+                                for(n=len; n < CAMELLIA_BLOCK_SIZE; ++n)
+                                        out[n] = iv[n];
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                key->enc(key->rd_key, (u32 *)out);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                iv = out;
+                                }
+                        memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
+                        }
+                else if (in != out)
+                        {
+                        while (len >= CAMELLIA_BLOCK_SIZE)
+                                {
+                                memcpy(out,in,CAMELLIA_BLOCK_SIZE);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                key->dec(key->rd_key,(u32 *)out);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                XOR4WORD((u32 *)out, (u32 *)iv);
+                                iv = in;
+                                len -= CAMELLIA_BLOCK_SIZE;
+                                in  += CAMELLIA_BLOCK_SIZE;
+                                out += CAMELLIA_BLOCK_SIZE;
+                                }
+                        if (len)
+                                {
+                                memcpy(tmp.t8, in, CAMELLIA_BLOCK_SIZE);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                key->dec(key->rd_key, tmp.t32);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                for(n=0; n < len; ++n)
+                                        out[n] = tmp.t8[n] ^ iv[n];
+                                iv = in;
+                                }
+                        memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
+                        }
+                else /* in == out */
+                        {
+                        while (len >= CAMELLIA_BLOCK_SIZE)
+                                {
+                                memcpy(tmp.t8, in, CAMELLIA_BLOCK_SIZE);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                key->dec(key->rd_key, (u32 *)out);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                XOR4WORD((u32 *)out, (u32 *)ivec);
+                                memcpy(ivec, tmp.t8, CAMELLIA_BLOCK_SIZE);
+                                len -= CAMELLIA_BLOCK_SIZE;
+                                in += CAMELLIA_BLOCK_SIZE;
+                                out += CAMELLIA_BLOCK_SIZE;
+                                }
+                        if (len)
+                                {
+                                memcpy(tmp.t8, in, CAMELLIA_BLOCK_SIZE);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                key->dec(key->rd_key,(u32 *)out);
+                                if (camellia_endian.little)
+                                        SWAP4WORD((u32 *)out);
+                                for(n=0; n < len; ++n)
+                                        out[n] ^= ivec[n];
+                                for(n=len; n < CAMELLIA_BLOCK_SIZE; ++n)
+                                        out[n] = tmp.t8[n];
+                                memcpy(ivec, tmp.t8, CAMELLIA_BLOCK_SIZE);
+                                }
+                        }
+                }
+        else /* no aligned */
+                {
+                if (CAMELLIA_ENCRYPT == enc)
+                        {
+                        while (len >= CAMELLIA_BLOCK_SIZE)
+                                {
+                                for(n=0; n < CAMELLIA_BLOCK_SIZE; ++n)
+                                        tmp.t8[n] = in[n] ^ iv[n];
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                key->enc(key->rd_key, tmp.t32);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                memcpy(out, tmp.t8, CAMELLIA_BLOCK_SIZE);
+                                iv = out;
+                                len -= CAMELLIA_BLOCK_SIZE;
+                                in += CAMELLIA_BLOCK_SIZE;
+                                out += CAMELLIA_BLOCK_SIZE;
+                                }
+                        if (len)
+                                {
+                                for(n=0; n < len; ++n)
+                                        tmp.t8[n] = in[n] ^ iv[n];
+                                for(n=len; n < CAMELLIA_BLOCK_SIZE; ++n)
+                                        tmp.t8[n] = iv[n];
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                key->enc(key->rd_key, tmp.t32);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                memcpy(out, tmp.t8, CAMELLIA_BLOCK_SIZE);
+                                iv = out;
+                                }
+                        memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
+                        }
+                else if (in != out)
+                        {
+                        while (len >= CAMELLIA_BLOCK_SIZE)
+                                {
+                                memcpy(tmp.t8,in,CAMELLIA_BLOCK_SIZE);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                key->dec(key->rd_key,tmp.t32);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                for(n=0; n < CAMELLIA_BLOCK_SIZE; ++n)
+                                        out[n] = tmp.t8[n] ^ iv[n];
+                                iv = in;
+                                len -= CAMELLIA_BLOCK_SIZE;
+                                in  += CAMELLIA_BLOCK_SIZE;
+                                out += CAMELLIA_BLOCK_SIZE;
+                                }
+                        if (len)
+                                {
+                                memcpy(tmp.t8, in, CAMELLIA_BLOCK_SIZE);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                key->dec(key->rd_key, tmp.t32);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                for(n=0; n < len; ++n)
+                                        out[n] = tmp.t8[n] ^ iv[n];
+                                iv = in;
+                                }
+                        memcpy(ivec,iv,CAMELLIA_BLOCK_SIZE);
+                        }
+                else
+                        {
+                        while (len >= CAMELLIA_BLOCK_SIZE)
+                                {
+                                memcpy(tmp.t8, in, CAMELLIA_BLOCK_SIZE);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                key->dec(key->rd_key, tmp.t32);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                for(n=0; n < CAMELLIA_BLOCK_SIZE; ++n)
+                                        tmp.t8[n] ^= ivec[n];
+                                memcpy(ivec, in, CAMELLIA_BLOCK_SIZE);
+                                memcpy(out, tmp.t8, CAMELLIA_BLOCK_SIZE);
+                                len -= CAMELLIA_BLOCK_SIZE;
+                                in += CAMELLIA_BLOCK_SIZE;
+                                out += CAMELLIA_BLOCK_SIZE;
+                                }
+                        if (len)
+                                {
+                                memcpy(tmp.t8, in, CAMELLIA_BLOCK_SIZE);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                key->dec(key->rd_key,tmp.t32);
+                                if (camellia_endian.little)
+                                        SWAP4WORD(tmp.t32);
+                                for(n=0; n < len; ++n)
+                                        tmp.t8[n] ^= ivec[n];
+                                memcpy(ivec, in, CAMELLIA_BLOCK_SIZE);
+                                memcpy(out,tmp.t8,len);
+                                }
+                        }
+                }
+}
diff --git a/src/lib/libssl/src/fips-1.0/rand/fips_randtest.c b/src/lib/libssl/src/crypto/camellia/cmll_cfb.c
index 6165944e56..af0f9f49ad 100644
--- a/src/lib/libssl/src/fips-1.0/rand/fips_randtest.c
+++ b/src/lib/libssl/src/crypto/camellia/cmll_cfb.c
@@ -1,3 +1,53 @@
+/* crypto/camellia/camellia_cfb.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,316 +104,132 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <openssl/rand.h>
-#include <openssl/fips_rand.h>
-#include <openssl/err.h>
+#ifndef CAMELLIA_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+#include <assert.h>
+#include <string.h>
 
+#include <openssl/camellia.h>
+#include "cmll_locl.h"
 #include "e_os.h"
 
-#ifndef OPENSSL_FIPS
-int main(int argc, char *argv[])
-{
-    printf("No FIPS RAND support\n");
-    return(0);
-}
-
-#else
-
-/* some FIPS 140-1 random number test */
-/* some simple tests */
-
-static DES_cblock prng_key1={0x21,0x58,0x47,0xb7,0xc2,0x97,0x5a,0x8e};
-static DES_cblock prng_key2={0x61,0x23,0x05,0x96,0x18,0x91,0x86,0xac};
-static unsigned char prng_seed[8]={0x6b,0xa3,0x4f,0x07,0xe4,0x2a,0xb0,0xc};
 
-typedef struct
-    {
-    DES_cblock keys[2];
-    const unsigned char time[8];
-    const unsigned char seed[8];
-    const unsigned char block1[8];
-    const unsigned char block100[8];
-    } PRNGtest;
-
-/* FIXME: these test vectors are made up! */
-static PRNGtest t1=
-    {
-    { { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07 },
-      { 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },
-    },
-    { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-    { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-    { 0x33,0xc3,0xdf,0xfe,0x60,0x60,0x49,0x9e },
-    { 0xcd,0x2b,0x41,0xaf,0x80,0x51,0x37,0xd8 }
-    };
-static PRNGtest t2=
-    {
-    { { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
-      { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff } },
-    { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
-    { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
-    { 0x65,0xf1,0xa4,0x07,0x42,0x38,0xd5,0x25 },
-    { 0xbb,0x75,0x84,0x20,0x7a,0x44,0xf0,0xa0 }
-    };
-
-static void dump(const unsigned char *b,int n)
-    {
-    while(n-- > 0)
-        {
-        printf(" %02x",*b++);
-        }
-    }
-
-static void compare(const unsigned char *result,const unsigned char *expected,
-                    int n)
-    {
-    int i;
-
-    for(i=0 ; i < n ; ++i)
-        if(result[i] != expected[i])
-            {
-            puts("Random test failed, got:");
-            dump(result,8);
-            puts("\n               expected:");
-            dump(expected,8);
-            putchar('\n');
-            EXIT(1);
-            }
-    }
-
-static void run_test(const PRNGtest *t)
-    {
-    unsigned char buf[8];
-    int n;
-
-    FIPS_set_prng_key(t->keys[0],t->keys[1]);
-    FIPS_test_mode(1,t->time);
-    RAND_seed(t->seed,sizeof t->seed);
-
-    if(RAND_bytes(buf,8) <= 0)
-        {
-        ERR_print_errors_fp(stderr);
-        EXIT(2);
-        }
-    compare(buf,t->block1,8);
-    for(n=0 ; n < 99 ; ++n)
-        if(RAND_bytes(buf,8) <= 0)
-            {
-            ERR_print_errors_fp(stderr);
-            EXIT(2);
-            }
-    compare(buf,t->block100,8);
-    FIPS_test_mode(0,NULL);
-    }
+/* The input and output encrypted as though 128bit cfb mode is being
+ * used.  The extra state information to record how much of the
+ * 128bit block we have used is contained in *num;
+ */
 
-int main()
+void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, int *num, const int enc)
         {
-        unsigned char buf[2500];
-        int i,j,k,s,sign,nsign,err=0;
-        unsigned long n1;
-        unsigned long n2[16];
-        unsigned long runs[2][34];
-        /*double d; */
-        long d;
 
-        ERR_load_crypto_strings();
-        RAND_set_rand_method(FIPS_rand_method());
+        unsigned int n;
+        unsigned long l = length;
+        unsigned char c;
 
-        run_test(&t1);
-        run_test(&t2);
+        assert(in && out && key && ivec && num);
 
-        FIPS_set_prng_key(prng_key1,prng_key2);
-        RAND_seed(prng_seed,sizeof prng_seed);
+        n = *num;
 
-        i = RAND_pseudo_bytes(buf,2500);
-        if (i <= 0)
+        if (enc) 
                 {
-                printf ("init failed, the rand method is not properly installed\n");
-                err++;
-                goto err;
-                }
-
-        n1=0;
-        for (i=0; i<16; i++) n2[i]=0;
-        for (i=0; i<34; i++) runs[0][i]=runs[1][i]=0;
-
-        /* test 1 and 2 */
-        sign=0;
-        nsign=0;
-        for (i=0; i<2500; i++)
+                while (l--) 
+                        {
+                        if (n == 0) 
+                                {
+                                Camellia_encrypt(ivec, ivec, key);
+                                }
+                        ivec[n] = *(out++) = *(in++) ^ ivec[n];
+                        n = (n+1) % CAMELLIA_BLOCK_SIZE;
+                        }
+                } 
+        else 
                 {
-                j=buf[i];
-
-                n2[j&0x0f]++;
-                n2[(j>>4)&0x0f]++;
-
-                for (k=0; k<8; k++)
+                while (l--) 
                         {
-                        s=(j&0x01);
-                        if (s == sign)
-                                nsign++;
-                        else
+                        if (n == 0) 
                                 {
-                                if (nsign > 34) nsign=34;
-                                if (nsign != 0)
-                                        {
-                                        runs[sign][nsign-1]++;
-                                        if (nsign > 6)
-                                                runs[sign][5]++;
-                                        }
-                                sign=s;
-                                nsign=1;
+                                Camellia_encrypt(ivec, ivec, key);
                                 }
-
-                        if (s) n1++;
-                        j>>=1;
+                        c = *(in);
+                        *(out++) = *(in++) ^ ivec[n];
+                        ivec[n] = c;
+                        n = (n+1) % CAMELLIA_BLOCK_SIZE;
                         }
                 }
-                if (nsign > 34) nsign=34;
-                if (nsign != 0) runs[sign][nsign-1]++;
 
-        /* test 1 */
-        if (!((9654 < n1) && (n1 < 10346)))
-                {
-                printf("test 1 failed, X=%lu\n",n1);
-                err++;
-                }
-        printf("test 1 done\n");
+        *num=n;
+        }
 
-        /* test 2 */
-#ifdef undef
-        d=0;
-        for (i=0; i<16; i++)
-                d+=n2[i]*n2[i];
-        d=d*16.0/5000.0-5000.0;
-        if (!((1.03 < d) && (d < 57.4)))
-                {
-                printf("test 2 failed, X=%.2f\n",d);
-                err++;
-                }
-#endif
-        d=0;
-        for (i=0; i<16; i++)
-                d+=n2[i]*n2[i];
-        d=(d*8)/25-500000;
-        if (!((103 < d) && (d < 5740)))
-                {
-                printf("test 2 failed, X=%ld.%02ld\n",d/100L,d%100L);
-                err++;
-                }
-        printf("test 2 done\n");
+/* This expects a single block of size nbits for both in and out. Note that
+   it corrupts any extra bits in the last byte of out */
+void Camellia_cfbr_encrypt_block(const unsigned char *in,unsigned char *out,
+        const int nbits,const CAMELLIA_KEY *key,
+        unsigned char *ivec,const int enc)
+        {
+        int n,rem,num;
+        unsigned char ovec[CAMELLIA_BLOCK_SIZE*2];
+
+        if (nbits<=0 || nbits>128) return;
+
+        /* fill in the first half of the new IV with the current IV */
+        memcpy(ovec,ivec,CAMELLIA_BLOCK_SIZE);
+        /* construct the new IV */
+        Camellia_encrypt(ivec,ivec,key);
+        num = (nbits+7)/8;
+        if (enc)        /* encrypt the input */
+                for(n=0 ; n < num ; ++n)
+                        out[n] = (ovec[CAMELLIA_BLOCK_SIZE+n] = in[n] ^ ivec[n]);
+        else            /* decrypt the input */
+                for(n=0 ; n < num ; ++n)
+                        out[n] = (ovec[CAMELLIA_BLOCK_SIZE+n] = in[n]) ^ ivec[n];
+        /* shift ovec left... */
+        rem = nbits%8;
+        num = nbits/8;
+        if(rem==0)
+                memcpy(ivec,ovec+num,CAMELLIA_BLOCK_SIZE);
+        else
+                for(n=0 ; n < CAMELLIA_BLOCK_SIZE ; ++n)
+                        ivec[n] = ovec[n+num]<<rem | ovec[n+num+1]>>(8-rem);
+
+        /* it is not necessary to cleanse ovec, since the IV is not secret */
+        }
 
-        /* test 3 */
-        for (i=0; i<2; i++)
-                {
-                if (!((2267 < runs[i][0]) && (runs[i][0] < 2733)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,1,runs[i][0]);
-                        err++;
-                        }
-                if (!((1079 < runs[i][1]) && (runs[i][1] < 1421)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,2,runs[i][1]);
-                        err++;
-                        }
-                if (!(( 502 < runs[i][2]) && (runs[i][2] <  748)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,3,runs[i][2]);
-                        err++;
-                        }
-                if (!(( 223 < runs[i][3]) && (runs[i][3] <  402)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,4,runs[i][3]);
-                        err++;
-                        }
-                if (!((  90 < runs[i][4]) && (runs[i][4] <  223)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,5,runs[i][4]);
-                        err++;
-                        }
-                if (!((  90 < runs[i][5]) && (runs[i][5] <  223)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,6,runs[i][5]);
-                        err++;
-                        }
-                }
-        printf("test 3 done\n");
-        
-        /* test 4 */
-        if (runs[0][33] != 0)
-                {
-                printf("test 4 failed, bit=%d run=%d num=%lu\n",
-                        0,34,runs[0][33]);
-                err++;
-                }
-        if (runs[1][33] != 0)
+/* N.B. This expects the input to be packed, MS bit first */
+void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, int *num, const int enc)
+        {
+        unsigned int n;
+        unsigned char c[1],d[1];
+
+        assert(in && out && key && ivec && num);
+        assert(*num == 0);
+
+        memset(out,0,(length+7)/8);
+        for(n=0 ; n < length ; ++n)
                 {
-                printf("test 4 failed, bit=%d run=%d num=%lu\n",
-                        1,34,runs[1][33]);
-                err++;
+                c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0;
+                Camellia_cfbr_encrypt_block(c,d,1,key,ivec,enc);
+                out[n/8]=(out[n/8]&~(1 << (7-n%8)))|((d[0]&0x80) >> (n%8));
                 }
-        printf("test 4 done\n");
- err:
-        err=((err)?1:0);
-        EXIT(err);
-        return(err);
         }
 
-#endif
+void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, int *num, const int enc)
+        {
+        unsigned int n;
+
+        assert(in && out && key && ivec && num);
+        assert(*num == 0);
+
+        for(n=0 ; n < length ; ++n)
+                Camellia_cfbr_encrypt_block(&in[n],&out[n],8,key,ivec,enc);
+        }
+
diff --git a/src/lib/libssl/src/crypto/camellia/cmll_ctr.c b/src/lib/libssl/src/crypto/camellia/cmll_ctr.c
new file mode 100644
index 0000000000..cc21b70890
--- /dev/null
+++ b/src/lib/libssl/src/crypto/camellia/cmll_ctr.c
@@ -0,0 +1,143 @@
+/* crypto/camellia/camellia_ctr.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#ifndef CAMELLIA_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+#include <assert.h>
+
+#include <openssl/camellia.h>
+#include "cmll_locl.h"
+
+/* NOTE: the IV/counter CTR mode is big-endian.  The rest of the Camellia code
+ * is endian-neutral. */
+/* increment counter (128-bit int) by 1 */
+static void Camellia_ctr128_inc(unsigned char *counter) 
+        {
+        unsigned long c;
+
+        /* Grab bottom dword of counter and increment */
+        c = GETU32(counter + 12);
+        c++;    c &= 0xFFFFFFFF;
+        PUTU32(counter + 12, c);
+
+        /* if no overflow, we're done */
+        if (c)
+                return;
+
+        /* Grab 1st dword of counter and increment */
+        c = GETU32(counter +  8);
+        c++;    c &= 0xFFFFFFFF;
+        PUTU32(counter +  8, c);
+
+        /* if no overflow, we're done */
+        if (c)
+                return;
+
+        /* Grab 2nd dword of counter and increment */
+        c = GETU32(counter +  4);
+        c++;    c &= 0xFFFFFFFF;
+        PUTU32(counter +  4, c);
+
+        /* if no overflow, we're done */
+        if (c)
+                return;
+
+        /* Grab top dword of counter and increment */
+        c = GETU32(counter +  0);
+        c++;    c &= 0xFFFFFFFF;
+        PUTU32(counter +  0, c);
+        }
+
+/* The input encrypted as though 128bit counter mode is being
+ * used.  The extra state information to record how much of the
+ * 128bit block we have used is contained in *num, and the
+ * encrypted counter is kept in ecount_buf.  Both *num and
+ * ecount_buf must be initialised with zeros before the first
+ * call to Camellia_ctr128_encrypt().
+ *
+ * This algorithm assumes that the counter is in the x lower bits
+ * of the IV (ivec), and that the application has full control over
+ * overflow and the rest of the IV.  This implementation takes NO
+ * responsability for checking that the counter doesn't overflow
+ * into the rest of the IV when incremented.
+ */
+void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char ivec[CAMELLIA_BLOCK_SIZE],
+        unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
+        unsigned int *num) 
+        {
+
+        unsigned int n;
+        unsigned long l=length;
+
+        assert(in && out && key && counter && num);
+        assert(*num < CAMELLIA_BLOCK_SIZE);
+
+        n = *num;
+
+        while (l--) 
+                {
+                if (n == 0) 
+                        {
+                        Camellia_encrypt(ivec, ecount_buf, key);
+                        Camellia_ctr128_inc(ivec);
+                        }
+                *(out++) = *(in++) ^ ecount_buf[n];
+                n = (n+1) % CAMELLIA_BLOCK_SIZE;
+                }
+
+        *num=n;
+        }
+
diff --git a/src/lib/libssl/src/fips-1.0/rand/fips_rand.h b/src/lib/libssl/src/crypto/camellia/cmll_ecb.c
index 093727240e..70dc0e5632 100644
--- a/src/lib/libssl/src/fips-1.0/rand/fips_rand.h
+++ b/src/lib/libssl/src/crypto/camellia/cmll_ecb.c
@@ -1,5 +1,6 @@
+/* crypto/camellia/camellia_ecb.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2006 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
@@ -44,30 +45,30 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
  *
  */
 
-#ifndef HEADER_FIPS_RAND_H
-#define HEADER_FIPS_RAND_H
-
-#include "des.h"
+#ifndef CAMELLIA_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+#include <assert.h>
 
-#ifdef OPENSSL_FIPS
+#include <openssl/camellia.h>
+#include "cmll_locl.h"
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
+void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
+        const CAMELLIA_KEY *key, const int enc) 
+        {
 
-void FIPS_set_prng_key(const unsigned char k1[8],const unsigned char k2[8]);
-void FIPS_test_mode(int test,const unsigned char faketime[8]);
-void FIPS_rand_seed(const void *buf, FIPS_RAND_SIZE_T num);
-/* NB: this returns true if _partially_ seeded */
-int FIPS_rand_seeded(void);
+        assert(in && out && key);
+        assert((CAMELLIA_ENCRYPT == enc)||(CAMELLIA_DECRYPT == enc));
 
-const RAND_METHOD *FIPS_rand_method(void);
+        if (CAMELLIA_ENCRYPT == enc)
+                Camellia_encrypt(in, out, key);
+        else
+                Camellia_decrypt(in, out, key);
+        }
 
-#ifdef  __cplusplus
-}
-#endif
-#endif
-#endif
diff --git a/src/lib/libssl/src/crypto/camellia/cmll_locl.h b/src/lib/libssl/src/crypto/camellia/cmll_locl.h
new file mode 100644
index 0000000000..2ac2e95435
--- /dev/null
+++ b/src/lib/libssl/src/crypto/camellia/cmll_locl.h
@@ -0,0 +1,165 @@
+/* crypto/camellia/camellia_locl.h -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright 2006 NTT (Nippon Telegraph and Telephone Corporation) . 
+ * ALL RIGHTS RESERVED.
+ *
+ * Intellectual Property information for Camellia:
+ *     http://info.isl.ntt.co.jp/crypt/eng/info/chiteki.html
+ *
+ * News Release for Announcement of Camellia open source:
+ *     http://www.ntt.co.jp/news/news06e/0604/060413a.html
+ *
+ * The Camellia Code included herein is developed by
+ * NTT (Nippon Telegraph and Telephone Corporation), and is contributed
+ * to the OpenSSL project.
+ *
+ * The Camellia Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#ifndef HEADER_CAMELLIA_LOCL_H
+#define HEADER_CAMELLIA_LOCL_H
+
+#include "openssl/e_os2.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef unsigned char u8;
+typedef unsigned int u32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
+# define SWAP(x) ( _lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00 )
+# define GETU32(p) SWAP(*((u32 *)(p)))
+# define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }
+# define CAMELLIA_SWAP4(x) (x = ( _lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00) )
+
+#else /* not windows */
+# define GETU32(pt) (((u32)(pt)[0] << 24) \
+        ^ ((u32)(pt)[1] << 16) \
+        ^ ((u32)(pt)[2] <<  8) \
+        ^ ((u32)(pt)[3]))
+
+# define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); \
+        (ct)[1] = (u8)((st) >> 16); \
+        (ct)[2] = (u8)((st) >>  8); \
+        (ct)[3] = (u8)(st); }
+
+#if (defined (__GNUC__) && (defined(__x86_64__) || defined(__x86_64)))
+#define CAMELLIA_SWAP4(x) \
+  do{\
+    asm("bswap %1" : "+r" (x));\
+  }while(0)
+#else
+#define CAMELLIA_SWAP4(x) \
+   do{\
+     x = ((u32)x << 16) + ((u32)x >> 16);\
+     x = (((u32)x & 0xff00ff) << 8) + (((u32)x >> 8) & 0xff00ff);\
+   } while(0)
+#endif
+#endif
+
+#define COPY4WORD(dst, src)      \
+             do                  \
+                     {           \
+                     (dst)[0]=(src)[0];         \
+                     (dst)[1]=(src)[1];         \
+                     (dst)[2]=(src)[2];         \
+                     (dst)[3]=(src)[3];         \
+                     }while(0)
+
+#define SWAP4WORD(word)                         \
+   do                                           \
+           {                                    \
+           CAMELLIA_SWAP4((word)[0]);                   \
+           CAMELLIA_SWAP4((word)[1]);                   \
+           CAMELLIA_SWAP4((word)[2]);                   \
+           CAMELLIA_SWAP4((word)[3]);                   \
+           }while(0)
+
+#define XOR4WORD(a, b)/* a = a ^ b */           \
+   do                                           \
+        {                                       \
+        (a)[0]^=(b)[0];                         \
+        (a)[1]^=(b)[1];                         \
+        (a)[2]^=(b)[2];                         \
+        (a)[3]^=(b)[3];                         \
+        }while(0)
+
+#define XOR4WORD2(a, b, c)/* a = b ^ c */       \
+   do                                           \
+        {                                       \
+        (a)[0]=(b)[0]^(c)[0];                   \
+        (a)[1]=(b)[1]^(c)[1];                           \
+        (a)[2]=(b)[2]^(c)[2];                           \
+        (a)[3]=(b)[3]^(c)[3];                           \
+        }while(0)
+
+
+void camellia_setup128(const u8 *key, u32 *subkey);
+void camellia_setup192(const u8 *key, u32 *subkey);
+void camellia_setup256(const u8 *key, u32 *subkey);
+
+void camellia_encrypt128(const u32 *subkey, u32 *io);
+void camellia_decrypt128(const u32 *subkey, u32 *io);
+void camellia_encrypt256(const u32 *subkey, u32 *io);
+void camellia_decrypt256(const u32 *subkey, u32 *io);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* #ifndef HEADER_CAMELLIA_LOCL_H */
+
diff --git a/src/lib/libssl/src/crypto/camellia/cmll_misc.c b/src/lib/libssl/src/crypto/camellia/cmll_misc.c
new file mode 100644
index 0000000000..f1047b54e0
--- /dev/null
+++ b/src/lib/libssl/src/crypto/camellia/cmll_misc.c
@@ -0,0 +1,116 @@
+/* crypto/camellia/camellia_misc.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+ 
+#include <openssl/opensslv.h>
+#include <openssl/camellia.h>
+#include "cmll_locl.h"
+
+const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;
+
+int Camellia_set_key(const unsigned char *userKey, const int bits,
+        CAMELLIA_KEY *key)
+        {
+        if (!userKey || !key)
+                {
+                return -1;
+                }
+        
+        switch(bits)
+                {
+        case 128:
+                camellia_setup128(userKey, (unsigned int *)key->rd_key);
+                key->enc = camellia_encrypt128;
+                key->dec = camellia_decrypt128;
+                break;
+        case 192:
+                camellia_setup192(userKey, (unsigned int *)key->rd_key);
+                key->enc = camellia_encrypt256;
+                key->dec = camellia_decrypt256;
+                break;
+        case 256:
+                camellia_setup256(userKey, (unsigned int *)key->rd_key);
+                key->enc = camellia_encrypt256;
+                key->dec = camellia_decrypt256;
+                break;
+        default:
+                return -2;
+                }
+        
+        key->bitLength = bits;
+        return 0;
+        }
+
+void Camellia_encrypt(const unsigned char *in, unsigned char *out,
+        const CAMELLIA_KEY *key)
+        {
+        u32 tmp[CAMELLIA_BLOCK_SIZE/sizeof(u32)];
+        const union { long one; char little; } camellia_endian = {1};
+
+        memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
+        if (camellia_endian.little) SWAP4WORD(tmp);
+        key->enc(key->rd_key, tmp);
+        if (camellia_endian.little) SWAP4WORD(tmp);
+        memcpy(out, tmp, CAMELLIA_BLOCK_SIZE);
+        }
+
+void Camellia_decrypt(const unsigned char *in, unsigned char *out,
+        const CAMELLIA_KEY *key)
+        {
+        u32 tmp[CAMELLIA_BLOCK_SIZE/sizeof(u32)];
+        const union { long one; char little; } camellia_endian = {1};
+
+        memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
+        if (camellia_endian.little) SWAP4WORD(tmp);
+        key->dec(key->rd_key, tmp);
+        if (camellia_endian.little) SWAP4WORD(tmp);
+        memcpy(out, tmp, CAMELLIA_BLOCK_SIZE);
+        }
+
diff --git a/src/lib/libssl/src/crypto/camellia/cmll_ofb.c b/src/lib/libssl/src/crypto/camellia/cmll_ofb.c
new file mode 100644
index 0000000000..d89cf9f3b3
--- /dev/null
+++ b/src/lib/libssl/src/crypto/camellia/cmll_ofb.c
@@ -0,0 +1,141 @@
+/* crypto/camellia/camellia_ofb.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#ifndef CAMELLIA_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+#include <assert.h>
+#include <openssl/camellia.h>
+#include "cmll_locl.h"
+
+/* The input and output encrypted as though 128bit ofb mode is being
+ * used.  The extra state information to record how much of the
+ * 128bit block we have used is contained in *num;
+ */
+void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
+        const unsigned long length, const CAMELLIA_KEY *key,
+        unsigned char *ivec, int *num) {
+
+        unsigned int n;
+        unsigned long l=length;
+
+        assert(in && out && key && ivec && num);
+
+        n = *num;
+
+        while (l--) {
+                if (n == 0) {
+                        Camellia_encrypt(ivec, ivec, key);
+                }
+                *(out++) = *(in++) ^ ivec[n];
+                n = (n+1) % CAMELLIA_BLOCK_SIZE;
+        }
+
+        *num=n;
+}
diff --git a/src/lib/libssl/src/crypto/cms/Makefile b/src/lib/libssl/src/crypto/cms/Makefile
new file mode 100644
index 0000000000..e39c310b6c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/Makefile
@@ -0,0 +1,183 @@
+#
+# OpenSSL/crypto/cms/Makefile
+#
+
+DIR=    cms
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= cms_lib.c cms_asn1.c cms_att.c cms_io.c cms_smime.c cms_err.c \
+        cms_sd.c cms_dd.c cms_cd.c cms_env.c cms_enc.c cms_ess.c
+LIBOBJ= cms_lib.o cms_asn1.o cms_att.o cms_io.o cms_smime.o cms_err.o \
+        cms_sd.o cms_dd.o cms_cd.o cms_env.o cms_enc.o cms_ess.o
+
+SRC= $(LIBSRC)
+
+EXHEADER=  cms.h
+HEADER= cms_lcl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+test:
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+cms_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_asn1.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_asn1.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_asn1.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_asn1.o: ../../include/openssl/opensslconf.h
+cms_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_asn1.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_asn1.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_asn1.o: cms.h cms_asn1.c cms_lcl.h
+cms_att.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_att.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_att.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_att.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_att.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_att.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_att.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_att.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+cms_att.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_att.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_att.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_att.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_att.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_att.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_att.o: cms.h cms_att.c cms_lcl.h
+cms_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+cms_err.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+cms_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+cms_err.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+cms_err.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_err.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+cms_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
+cms_err.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_err.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+cms_err.o: cms_err.c
+cms_io.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_io.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_io.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+cms_io.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+cms_io.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+cms_io.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_io.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_io.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+cms_io.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+cms_io.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+cms_io.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_io.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_io.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h
+cms_io.o: cms_io.c cms_lcl.h
+cms_lib.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+cms_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+cms_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+cms_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+cms_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+cms_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+cms_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+cms_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+cms_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pem.h
+cms_lib.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs7.h
+cms_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+cms_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+cms_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h cms.h
+cms_lib.o: cms_lcl.h cms_lib.c
+cms_sd.o: ../../e_os.h ../../include/openssl/asn1.h
+cms_sd.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+cms_sd.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_sd.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_sd.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_sd.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_sd.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_sd.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_sd.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+cms_sd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_sd.o: ../../include/openssl/pem.h ../../include/openssl/pem2.h
+cms_sd.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_sd.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_sd.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_sd.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_sd.o: ../cryptlib.h cms_lcl.h cms_sd.c
+cms_smime.o: ../../e_os.h ../../include/openssl/asn1.h
+cms_smime.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h
+cms_smime.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h
+cms_smime.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h
+cms_smime.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+cms_smime.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
+cms_smime.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+cms_smime.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+cms_smime.o: ../../include/openssl/objects.h
+cms_smime.o: ../../include/openssl/opensslconf.h
+cms_smime.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+cms_smime.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+cms_smime.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+cms_smime.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
+cms_smime.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
+cms_smime.o: ../cryptlib.h cms_lcl.h cms_smime.c
diff --git a/src/lib/libssl/src/crypto/cms/cms.h b/src/lib/libssl/src/crypto/cms/cms.h
new file mode 100644
index 0000000000..25f88745f2
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms.h
@@ -0,0 +1,473 @@
+/* crypto/cms/cms.h */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+
+#ifndef HEADER_CMS_H
+#define HEADER_CMS_H
+
+#include <openssl/x509.h>
+
+#ifdef OPENSSL_NO_CMS
+#error CMS is disabled.
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+typedef struct CMS_ContentInfo_st CMS_ContentInfo;
+typedef struct CMS_SignerInfo_st CMS_SignerInfo;
+typedef struct CMS_CertificateChoices CMS_CertificateChoices;
+typedef struct CMS_RevocationInfoChoice_st CMS_RevocationInfoChoice;
+typedef struct CMS_RecipientInfo_st CMS_RecipientInfo;
+typedef struct CMS_ReceiptRequest_st CMS_ReceiptRequest;
+typedef struct CMS_Receipt_st CMS_Receipt;
+
+DECLARE_STACK_OF(CMS_SignerInfo)
+DECLARE_STACK_OF(GENERAL_NAMES)
+DECLARE_ASN1_FUNCTIONS_const(CMS_ContentInfo)
+DECLARE_ASN1_FUNCTIONS_const(CMS_ReceiptRequest)
+
+#define CMS_SIGNERINFO_ISSUER_SERIAL    0
+#define CMS_SIGNERINFO_KEYIDENTIFIER    1
+
+#define CMS_RECIPINFO_TRANS             0
+#define CMS_RECIPINFO_AGREE             1
+#define CMS_RECIPINFO_KEK               2
+#define CMS_RECIPINFO_PASS              3
+#define CMS_RECIPINFO_OTHER             4
+
+/* S/MIME related flags */
+
+#define CMS_TEXT                        0x1
+#define CMS_NOCERTS                     0x2
+#define CMS_NO_CONTENT_VERIFY           0x4
+#define CMS_NO_ATTR_VERIFY              0x8
+#define CMS_NOSIGS                      \
+                        (CMS_NO_CONTENT_VERIFY|CMS_NO_ATTR_VERIFY)
+#define CMS_NOINTERN                    0x10
+#define CMS_NO_SIGNER_CERT_VERIFY       0x20
+#define CMS_NOVERIFY                    0x20
+#define CMS_DETACHED                    0x40
+#define CMS_BINARY                      0x80
+#define CMS_NOATTR                      0x100
+#define CMS_NOSMIMECAP                  0x200
+#define CMS_NOOLDMIMETYPE               0x400
+#define CMS_CRLFEOL                     0x800
+#define CMS_STREAM                      0x1000
+#define CMS_NOCRL                       0x2000
+#define CMS_PARTIAL                     0x4000
+#define CMS_REUSE_DIGEST                0x8000
+#define CMS_USE_KEYID                   0x10000
+
+const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);
+
+BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont);
+int CMS_dataFinal(CMS_ContentInfo *cms, BIO *bio);
+
+ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
+int CMS_is_detached(CMS_ContentInfo *cms);
+int CMS_set_detached(CMS_ContentInfo *cms, int detached);
+
+#ifdef HEADER_PEM_H
+DECLARE_PEM_rw_const(CMS, CMS_ContentInfo)
+#endif
+
+CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms);
+int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);
+
+CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont);
+int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags);
+
+int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags);
+
+CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
+                                                BIO *data, unsigned int flags);
+
+CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
+                                        X509 *signcert, EVP_PKEY *pkey,
+                                        STACK_OF(X509) *certs,
+                                        unsigned int flags);
+
+int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags);
+CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags);
+
+int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
+                                                        unsigned int flags);
+CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
+                                                        unsigned int flags);
+
+int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
+                                const unsigned char *key, size_t keylen,
+                                BIO *dcont, BIO *out, unsigned int flags);
+
+CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,
+                                        const unsigned char *key, size_t keylen,
+                                        unsigned int flags);
+
+int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
+                                const unsigned char *key, size_t keylen);
+
+int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
+                 X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);
+
+int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
+                        STACK_OF(X509) *certs,
+                        X509_STORE *store, unsigned int flags);
+
+STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms);
+
+CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *in,
+                                const EVP_CIPHER *cipher, unsigned int flags);
+
+int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pkey, X509 *cert,
+                                BIO *dcont, BIO *out,
+                                unsigned int flags);
+        
+int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert);
+int CMS_decrypt_set1_key(CMS_ContentInfo *cms, 
+                                unsigned char *key, size_t keylen,
+                                unsigned char *id, size_t idlen);
+
+STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);
+int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);
+CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher);
+CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
+                                        X509 *recip, unsigned int flags);
+int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey);
+int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert);
+int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
+                                        EVP_PKEY **pk, X509 **recip,
+                                        X509_ALGOR **palg);
+int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
+                                        ASN1_OCTET_STRING **keyid,
+                                        X509_NAME **issuer, ASN1_INTEGER **sno);
+
+CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
+                                        unsigned char *key, size_t keylen,
+                                        unsigned char *id, size_t idlen,
+                                        ASN1_GENERALIZEDTIME *date,
+                                        ASN1_OBJECT *otherTypeId,
+                                        ASN1_TYPE *otherType);
+
+int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
+                                        X509_ALGOR **palg,
+                                        ASN1_OCTET_STRING **pid,
+                                        ASN1_GENERALIZEDTIME **pdate,
+                                        ASN1_OBJECT **potherid,
+                                        ASN1_TYPE **pothertype);
+
+int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri, 
+                                unsigned char *key, size_t keylen);
+
+int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri, 
+                                        const unsigned char *id, size_t idlen);
+
+int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
+        
+int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
+                                                        unsigned int flags);
+CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
+
+int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
+const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms);
+
+CMS_CertificateChoices *CMS_add0_CertificateChoices(CMS_ContentInfo *cms);
+int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert);
+int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert);
+STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms);
+
+CMS_RevocationInfoChoice *CMS_add0_RevocationInfoChoice(CMS_ContentInfo *cms);
+int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl);
+STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);
+
+int CMS_SignedData_init(CMS_ContentInfo *cms);
+CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
+                        X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
+                        unsigned int flags);
+STACK_OF(CMS_SignerInfo) *CMS_get0_SignerInfos(CMS_ContentInfo *cms);
+
+void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer);
+int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,
+                                        ASN1_OCTET_STRING **keyid,
+                                        X509_NAME **issuer, ASN1_INTEGER **sno);
+int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert);
+int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
+                                        unsigned int flags);
+void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk, X509 **signer,
+                                        X509_ALGOR **pdig, X509_ALGOR **psig);
+int CMS_SignerInfo_sign(CMS_SignerInfo *si);
+int CMS_SignerInfo_verify(CMS_SignerInfo *si);
+int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain);
+
+int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs);
+int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
+                                int algnid, int keysize);
+int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap);
+
+int CMS_signed_get_attr_count(const CMS_SignerInfo *si);
+int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
+                          int lastpos);
+int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
+                          int lastpos);
+X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc);
+X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc);
+int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
+int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
+                        const ASN1_OBJECT *obj, int type,
+                        const void *bytes, int len);
+int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
+                        int nid, int type,
+                        const void *bytes, int len);
+int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
+                        const char *attrname, int type,
+                        const void *bytes, int len);
+void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
+                                        int lastpos, int type);
+
+int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si);
+int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
+                          int lastpos);
+int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
+                          int lastpos);
+X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc);
+X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc);
+int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
+int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
+                        const ASN1_OBJECT *obj, int type,
+                        const void *bytes, int len);
+int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
+                        int nid, int type,
+                        const void *bytes, int len);
+int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
+                        const char *attrname, int type,
+                        const void *bytes, int len);
+void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
+                                        int lastpos, int type);
+
+#ifdef HEADER_X509V3_H
+
+int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
+CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
+                                int allorfirst,
+                                STACK_OF(GENERAL_NAMES) *receiptList,
+                                STACK_OF(GENERAL_NAMES) *receiptsTo);
+int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr);
+void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
+                                        ASN1_STRING **pcid,
+                                        int *pallorfirst,
+                                        STACK_OF(GENERAL_NAMES) **plist,
+                                        STACK_OF(GENERAL_NAMES) **prto);
+
+#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.
+ */
+void ERR_load_CMS_strings(void);
+
+/* Error codes for the CMS functions. */
+
+/* Function codes. */
+#define CMS_F_CHECK_CONTENT                              99
+#define CMS_F_CMS_ADD0_CERT                              164
+#define CMS_F_CMS_ADD0_RECIPIENT_KEY                     100
+#define CMS_F_CMS_ADD1_RECEIPTREQUEST                    158
+#define CMS_F_CMS_ADD1_RECIPIENT_CERT                    101
+#define CMS_F_CMS_ADD1_SIGNER                            102
+#define CMS_F_CMS_ADD1_SIGNINGTIME                       103
+#define CMS_F_CMS_COMPRESS                               104
+#define CMS_F_CMS_COMPRESSEDDATA_CREATE                  105
+#define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO                106
+#define CMS_F_CMS_COPY_CONTENT                           107
+#define CMS_F_CMS_COPY_MESSAGEDIGEST                     108
+#define CMS_F_CMS_DATA                                   109
+#define CMS_F_CMS_DATAFINAL                              110
+#define CMS_F_CMS_DATAINIT                               111
+#define CMS_F_CMS_DECRYPT                                112
+#define CMS_F_CMS_DECRYPT_SET1_KEY                       113
+#define CMS_F_CMS_DECRYPT_SET1_PKEY                      114
+#define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX               115
+#define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO               116
+#define CMS_F_CMS_DIGESTEDDATA_DO_FINAL                  117
+#define CMS_F_CMS_DIGEST_VERIFY                          118
+#define CMS_F_CMS_ENCODE_RECEIPT                         161
+#define CMS_F_CMS_ENCRYPT                                119
+#define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO              120
+#define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT                  121
+#define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT                  122
+#define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY                 123
+#define CMS_F_CMS_ENVELOPEDDATA_CREATE                   124
+#define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO                 125
+#define CMS_F_CMS_ENVELOPED_DATA_INIT                    126
+#define CMS_F_CMS_FINAL                                  127
+#define CMS_F_CMS_GET0_CERTIFICATE_CHOICES               128
+#define CMS_F_CMS_GET0_CONTENT                           129
+#define CMS_F_CMS_GET0_ECONTENT_TYPE                     130
+#define CMS_F_CMS_GET0_ENVELOPED                         131
+#define CMS_F_CMS_GET0_REVOCATION_CHOICES                132
+#define CMS_F_CMS_GET0_SIGNED                            133
+#define CMS_F_CMS_MSGSIGDIGEST_ADD1                      162
+#define CMS_F_CMS_RECEIPTREQUEST_CREATE0                 159
+#define CMS_F_CMS_RECEIPT_VERIFY                         160
+#define CMS_F_CMS_RECIPIENTINFO_DECRYPT                  134
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT            135
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT            136
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID            137
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP             138
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP            139
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT             140
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT             141
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS           142
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID      143
+#define CMS_F_CMS_RECIPIENTINFO_SET0_KEY                 144
+#define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY                145
+#define CMS_F_CMS_SET1_SIGNERIDENTIFIER                  146
+#define CMS_F_CMS_SET_DETACHED                           147
+#define CMS_F_CMS_SIGN                                   148
+#define CMS_F_CMS_SIGNED_DATA_INIT                       149
+#define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN                150
+#define CMS_F_CMS_SIGNERINFO_SIGN                        151
+#define CMS_F_CMS_SIGNERINFO_VERIFY                      152
+#define CMS_F_CMS_SIGNERINFO_VERIFY_CERT                 153
+#define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT              154
+#define CMS_F_CMS_SIGN_RECEIPT                           163
+#define CMS_F_CMS_STREAM                                 155
+#define CMS_F_CMS_UNCOMPRESS                             156
+#define CMS_F_CMS_VERIFY                                 157
+
+/* Reason codes. */
+#define CMS_R_ADD_SIGNER_ERROR                           99
+#define CMS_R_CERTIFICATE_ALREADY_PRESENT                175
+#define CMS_R_CERTIFICATE_HAS_NO_KEYID                   160
+#define CMS_R_CERTIFICATE_VERIFY_ERROR                   100
+#define CMS_R_CIPHER_INITIALISATION_ERROR                101
+#define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR      102
+#define CMS_R_CMS_DATAFINAL_ERROR                        103
+#define CMS_R_CMS_LIB                                    104
+#define CMS_R_CONTENTIDENTIFIER_MISMATCH                 170
+#define CMS_R_CONTENT_NOT_FOUND                          105
+#define CMS_R_CONTENT_TYPE_MISMATCH                      171
+#define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA           106
+#define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA            107
+#define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA               108
+#define CMS_R_CONTENT_VERIFY_ERROR                       109
+#define CMS_R_CTRL_ERROR                                 110
+#define CMS_R_CTRL_FAILURE                               111
+#define CMS_R_DECRYPT_ERROR                              112
+#define CMS_R_DIGEST_ERROR                               161
+#define CMS_R_ERROR_GETTING_PUBLIC_KEY                   113
+#define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE      114
+#define CMS_R_ERROR_SETTING_KEY                          115
+#define CMS_R_ERROR_SETTING_RECIPIENTINFO                116
+#define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH               117
+#define CMS_R_INVALID_KEY_LENGTH                         118
+#define CMS_R_MD_BIO_INIT_ERROR                          119
+#define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH       120
+#define CMS_R_MESSAGEDIGEST_WRONG_LENGTH                 121
+#define CMS_R_MSGSIGDIGEST_ERROR                         172
+#define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE          162
+#define CMS_R_MSGSIGDIGEST_WRONG_LENGTH                  163
+#define CMS_R_NEED_ONE_SIGNER                            164
+#define CMS_R_NOT_A_SIGNED_RECEIPT                       165
+#define CMS_R_NOT_ENCRYPTED_DATA                         122
+#define CMS_R_NOT_KEK                                    123
+#define CMS_R_NOT_KEY_TRANSPORT                          124
+#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE            125
+#define CMS_R_NO_CIPHER                                  126
+#define CMS_R_NO_CONTENT                                 127
+#define CMS_R_NO_CONTENT_TYPE                            173
+#define CMS_R_NO_DEFAULT_DIGEST                          128
+#define CMS_R_NO_DIGEST_SET                              129
+#define CMS_R_NO_KEY                                     130
+#define CMS_R_NO_KEY_OR_CERT                             174
+#define CMS_R_NO_MATCHING_DIGEST                         131
+#define CMS_R_NO_MATCHING_RECIPIENT                      132
+#define CMS_R_NO_MATCHING_SIGNATURE                      166
+#define CMS_R_NO_MSGSIGDIGEST                            167
+#define CMS_R_NO_PRIVATE_KEY                             133
+#define CMS_R_NO_PUBLIC_KEY                              134
+#define CMS_R_NO_RECEIPT_REQUEST                         168
+#define CMS_R_NO_SIGNERS                                 135
+#define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE     136
+#define CMS_R_RECEIPT_DECODE_ERROR                       169
+#define CMS_R_RECIPIENT_ERROR                            137
+#define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND               138
+#define CMS_R_SIGNFINAL_ERROR                            139
+#define CMS_R_SMIME_TEXT_ERROR                           140
+#define CMS_R_STORE_INIT_ERROR                           141
+#define CMS_R_TYPE_NOT_COMPRESSED_DATA                   142
+#define CMS_R_TYPE_NOT_DATA                              143
+#define CMS_R_TYPE_NOT_DIGESTED_DATA                     144
+#define CMS_R_TYPE_NOT_ENCRYPTED_DATA                    145
+#define CMS_R_TYPE_NOT_ENVELOPED_DATA                    146
+#define CMS_R_UNABLE_TO_FINALIZE_CONTEXT                 147
+#define CMS_R_UNKNOWN_CIPHER                             148
+#define CMS_R_UNKNOWN_DIGEST_ALGORIHM                    149
+#define CMS_R_UNKNOWN_ID                                 150
+#define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM          151
+#define CMS_R_UNSUPPORTED_CONTENT_TYPE                   152
+#define CMS_R_UNSUPPORTED_KEK_ALGORITHM                  153
+#define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
+#define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE              155
+#define CMS_R_UNSUPPORTED_TYPE                           156
+#define CMS_R_UNWRAP_ERROR                               157
+#define CMS_R_VERIFICATION_FAILURE                       158
+#define CMS_R_WRAP_ERROR                                 159
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
diff --git a/src/lib/libssl/src/crypto/cms/cms_asn1.c b/src/lib/libssl/src/crypto/cms/cms_asn1.c
new file mode 100644
index 0000000000..7664921861
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_asn1.c
@@ -0,0 +1,346 @@
+/* crypto/cms/cms_asn1.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <openssl/asn1t.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+#include "cms.h"
+#include "cms_lcl.h"
+
+
+ASN1_SEQUENCE(CMS_IssuerAndSerialNumber) = {
+        ASN1_SIMPLE(CMS_IssuerAndSerialNumber, issuer, X509_NAME),
+        ASN1_SIMPLE(CMS_IssuerAndSerialNumber, serialNumber, ASN1_INTEGER)
+} ASN1_SEQUENCE_END(CMS_IssuerAndSerialNumber)
+
+ASN1_SEQUENCE(CMS_OtherCertificateFormat) = {
+        ASN1_SIMPLE(CMS_OtherCertificateFormat, otherCertFormat, ASN1_OBJECT),
+        ASN1_OPT(CMS_OtherCertificateFormat, otherCert, ASN1_ANY)
+} ASN1_SEQUENCE_END(CMS_OtherCertificateFormat)
+
+ASN1_CHOICE(CMS_CertificateChoices) = {
+        ASN1_SIMPLE(CMS_CertificateChoices, d.certificate, X509),
+        ASN1_IMP(CMS_CertificateChoices, d.extendedCertificate, ASN1_SEQUENCE, 0),
+        ASN1_IMP(CMS_CertificateChoices, d.v1AttrCert, ASN1_SEQUENCE, 1),
+        ASN1_IMP(CMS_CertificateChoices, d.v2AttrCert, ASN1_SEQUENCE, 2),
+        ASN1_IMP(CMS_CertificateChoices, d.other, CMS_OtherCertificateFormat, 3)
+} ASN1_CHOICE_END(CMS_CertificateChoices)
+
+ASN1_CHOICE(CMS_SignerIdentifier) = {
+        ASN1_SIMPLE(CMS_SignerIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+        ASN1_IMP(CMS_SignerIdentifier, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0)
+} ASN1_CHOICE_END(CMS_SignerIdentifier)
+
+ASN1_NDEF_SEQUENCE(CMS_EncapsulatedContentInfo) = {
+        ASN1_SIMPLE(CMS_EncapsulatedContentInfo, eContentType, ASN1_OBJECT),
+        ASN1_NDEF_EXP_OPT(CMS_EncapsulatedContentInfo, eContent, ASN1_OCTET_STRING_NDEF, 0)
+} ASN1_NDEF_SEQUENCE_END(CMS_EncapsulatedContentInfo)
+
+/* Minor tweak to operation: free up signer key, cert */
+static int cms_si_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
+        {
+        if(operation == ASN1_OP_FREE_POST)
+                {
+                CMS_SignerInfo *si = (CMS_SignerInfo *)*pval;
+                if (si->pkey)
+                        EVP_PKEY_free(si->pkey);
+                if (si->signer)
+                        X509_free(si->signer);
+                }
+        return 1;
+        }
+
+ASN1_SEQUENCE_cb(CMS_SignerInfo, cms_si_cb) = {
+        ASN1_SIMPLE(CMS_SignerInfo, version, LONG),
+        ASN1_SIMPLE(CMS_SignerInfo, sid, CMS_SignerIdentifier),
+        ASN1_SIMPLE(CMS_SignerInfo, digestAlgorithm, X509_ALGOR),
+        ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, signedAttrs, X509_ATTRIBUTE, 0),
+        ASN1_SIMPLE(CMS_SignerInfo, signatureAlgorithm, X509_ALGOR),
+        ASN1_SIMPLE(CMS_SignerInfo, signature, ASN1_OCTET_STRING),
+        ASN1_IMP_SET_OF_OPT(CMS_SignerInfo, unsignedAttrs, X509_ATTRIBUTE, 1)
+} ASN1_SEQUENCE_END_cb(CMS_SignerInfo, CMS_SignerInfo)
+
+ASN1_SEQUENCE(CMS_OtherRevocationInfoFormat) = {
+        ASN1_SIMPLE(CMS_OtherRevocationInfoFormat, otherRevInfoFormat, ASN1_OBJECT),
+        ASN1_OPT(CMS_OtherRevocationInfoFormat, otherRevInfo, ASN1_ANY)
+} ASN1_SEQUENCE_END(CMS_OtherRevocationInfoFormat)
+
+ASN1_CHOICE(CMS_RevocationInfoChoice) = {
+        ASN1_SIMPLE(CMS_RevocationInfoChoice, d.crl, X509_CRL),
+        ASN1_IMP(CMS_RevocationInfoChoice, d.other, CMS_OtherRevocationInfoFormat, 1)
+} ASN1_CHOICE_END(CMS_RevocationInfoChoice)
+
+ASN1_NDEF_SEQUENCE(CMS_SignedData) = {
+        ASN1_SIMPLE(CMS_SignedData, version, LONG),
+        ASN1_SET_OF(CMS_SignedData, digestAlgorithms, X509_ALGOR),
+        ASN1_SIMPLE(CMS_SignedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+        ASN1_IMP_SET_OF_OPT(CMS_SignedData, certificates, CMS_CertificateChoices, 0),
+        ASN1_IMP_SET_OF_OPT(CMS_SignedData, crls, CMS_RevocationInfoChoice, 1),
+        ASN1_SET_OF(CMS_SignedData, signerInfos, CMS_SignerInfo)
+} ASN1_NDEF_SEQUENCE_END(CMS_SignedData)
+
+ASN1_SEQUENCE(CMS_OriginatorInfo) = {
+        ASN1_IMP_SET_OF_OPT(CMS_SignedData, certificates, CMS_CertificateChoices, 0),
+        ASN1_IMP_SET_OF_OPT(CMS_SignedData, crls, CMS_RevocationInfoChoice, 1)
+} ASN1_SEQUENCE_END(CMS_OriginatorInfo)
+
+ASN1_NDEF_SEQUENCE(CMS_EncryptedContentInfo) = {
+        ASN1_SIMPLE(CMS_EncryptedContentInfo, contentType, ASN1_OBJECT),
+        ASN1_SIMPLE(CMS_EncryptedContentInfo, contentEncryptionAlgorithm, X509_ALGOR),
+        ASN1_IMP_OPT(CMS_EncryptedContentInfo, encryptedContent, ASN1_OCTET_STRING_NDEF, 0)
+} ASN1_NDEF_SEQUENCE_END(CMS_EncryptedContentInfo)
+
+ASN1_SEQUENCE(CMS_KeyTransRecipientInfo) = {
+        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, version, LONG),
+        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, rid, CMS_SignerIdentifier),
+        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+        ASN1_SIMPLE(CMS_KeyTransRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
+} ASN1_SEQUENCE_END(CMS_KeyTransRecipientInfo)
+
+ASN1_SEQUENCE(CMS_OtherKeyAttribute) = {
+        ASN1_SIMPLE(CMS_OtherKeyAttribute, keyAttrId, ASN1_OBJECT),
+        ASN1_OPT(CMS_OtherKeyAttribute, keyAttr, ASN1_ANY)
+} ASN1_SEQUENCE_END(CMS_OtherKeyAttribute)
+
+ASN1_SEQUENCE(CMS_RecipientKeyIdentifier) = {
+        ASN1_SIMPLE(CMS_RecipientKeyIdentifier, subjectKeyIdentifier, ASN1_OCTET_STRING),
+        ASN1_OPT(CMS_RecipientKeyIdentifier, date, ASN1_GENERALIZEDTIME),
+        ASN1_OPT(CMS_RecipientKeyIdentifier, other, CMS_OtherKeyAttribute)
+} ASN1_SEQUENCE_END(CMS_RecipientKeyIdentifier)
+
+ASN1_CHOICE(CMS_KeyAgreeRecipientIdentifier) = {
+  ASN1_SIMPLE(CMS_KeyAgreeRecipientIdentifier, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+  ASN1_IMP(CMS_KeyAgreeRecipientIdentifier, d.rKeyId, CMS_RecipientKeyIdentifier, 0)
+} ASN1_CHOICE_END(CMS_KeyAgreeRecipientIdentifier)
+
+ASN1_SEQUENCE(CMS_RecipientEncryptedKey) = {
+        ASN1_SIMPLE(CMS_RecipientEncryptedKey, rid, CMS_KeyAgreeRecipientIdentifier),
+        ASN1_SIMPLE(CMS_RecipientEncryptedKey, encryptedKey, ASN1_OCTET_STRING)
+} ASN1_SEQUENCE_END(CMS_RecipientEncryptedKey)
+
+ASN1_SEQUENCE(CMS_OriginatorPublicKey) = {
+  ASN1_SIMPLE(CMS_OriginatorPublicKey, algorithm, X509_ALGOR),
+  ASN1_SIMPLE(CMS_OriginatorPublicKey, publicKey, ASN1_BIT_STRING)
+} ASN1_SEQUENCE_END(CMS_OriginatorPublicKey)
+
+ASN1_CHOICE(CMS_OriginatorIdentifierOrKey) = {
+  ASN1_SIMPLE(CMS_OriginatorIdentifierOrKey, d.issuerAndSerialNumber, CMS_IssuerAndSerialNumber),
+  ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.subjectKeyIdentifier, ASN1_OCTET_STRING, 0),
+  ASN1_IMP(CMS_OriginatorIdentifierOrKey, d.originatorKey, CMS_OriginatorPublicKey, 1)
+} ASN1_CHOICE_END(CMS_OriginatorIdentifierOrKey)
+
+ASN1_SEQUENCE(CMS_KeyAgreeRecipientInfo) = {
+        ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, version, LONG),
+        ASN1_EXP(CMS_KeyAgreeRecipientInfo, originator, CMS_OriginatorIdentifierOrKey, 0),
+        ASN1_EXP_OPT(CMS_KeyAgreeRecipientInfo, ukm, ASN1_OCTET_STRING, 1),
+        ASN1_SIMPLE(CMS_KeyAgreeRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+        ASN1_SEQUENCE_OF(CMS_KeyAgreeRecipientInfo, recipientEncryptedKeys, CMS_RecipientEncryptedKey)
+} ASN1_SEQUENCE_END(CMS_KeyAgreeRecipientInfo)
+
+ASN1_SEQUENCE(CMS_KEKIdentifier) = {
+        ASN1_SIMPLE(CMS_KEKIdentifier, keyIdentifier, ASN1_OCTET_STRING),
+        ASN1_OPT(CMS_KEKIdentifier, date, ASN1_GENERALIZEDTIME),
+        ASN1_OPT(CMS_KEKIdentifier, other, CMS_OtherKeyAttribute)
+} ASN1_SEQUENCE_END(CMS_KEKIdentifier)
+
+ASN1_SEQUENCE(CMS_KEKRecipientInfo) = {
+        ASN1_SIMPLE(CMS_KEKRecipientInfo, version, LONG),
+        ASN1_SIMPLE(CMS_KEKRecipientInfo, kekid, CMS_KEKIdentifier),
+        ASN1_SIMPLE(CMS_KEKRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+        ASN1_SIMPLE(CMS_KEKRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
+} ASN1_SEQUENCE_END(CMS_KEKRecipientInfo)
+
+ASN1_SEQUENCE(CMS_PasswordRecipientInfo) = {
+        ASN1_SIMPLE(CMS_PasswordRecipientInfo, version, LONG),
+        ASN1_IMP_OPT(CMS_PasswordRecipientInfo, keyDerivationAlgorithm, X509_ALGOR, 0),
+        ASN1_SIMPLE(CMS_PasswordRecipientInfo, keyEncryptionAlgorithm, X509_ALGOR),
+        ASN1_SIMPLE(CMS_PasswordRecipientInfo, encryptedKey, ASN1_OCTET_STRING)
+} ASN1_SEQUENCE_END(CMS_PasswordRecipientInfo)
+
+ASN1_SEQUENCE(CMS_OtherRecipientInfo) = {
+  ASN1_SIMPLE(CMS_OtherRecipientInfo, oriType, ASN1_OBJECT),
+  ASN1_OPT(CMS_OtherRecipientInfo, oriValue, ASN1_ANY)
+} ASN1_SEQUENCE_END(CMS_OtherRecipientInfo)
+
+/* Free up RecipientInfo additional data */
+static int cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
+        {
+        if(operation == ASN1_OP_FREE_PRE)
+                {
+                CMS_RecipientInfo *ri = (CMS_RecipientInfo *)*pval;
+                if (ri->type == CMS_RECIPINFO_TRANS)
+                        {
+                        CMS_KeyTransRecipientInfo *ktri = ri->d.ktri;
+                        if (ktri->pkey)
+                                EVP_PKEY_free(ktri->pkey);
+                        if (ktri->recip)
+                                X509_free(ktri->recip);
+                        }
+                else if (ri->type == CMS_RECIPINFO_KEK)
+                        {
+                        CMS_KEKRecipientInfo *kekri = ri->d.kekri;
+                        if (kekri->key)
+                                {
+                                OPENSSL_cleanse(kekri->key, kekri->keylen);
+                                OPENSSL_free(kekri->key);
+                                }
+                        }
+                }
+        return 1;
+        }
+
+ASN1_CHOICE_cb(CMS_RecipientInfo, cms_ri_cb) = {
+        ASN1_SIMPLE(CMS_RecipientInfo, d.ktri, CMS_KeyTransRecipientInfo),
+        ASN1_IMP(CMS_RecipientInfo, d.kari, CMS_KeyAgreeRecipientInfo, 1),
+        ASN1_IMP(CMS_RecipientInfo, d.kekri, CMS_KEKRecipientInfo, 2),
+        ASN1_IMP(CMS_RecipientInfo, d.pwri, CMS_PasswordRecipientInfo, 3),
+        ASN1_IMP(CMS_RecipientInfo, d.ori, CMS_OtherRecipientInfo, 4)
+} ASN1_CHOICE_END_cb(CMS_RecipientInfo, CMS_RecipientInfo, type)
+
+ASN1_NDEF_SEQUENCE(CMS_EnvelopedData) = {
+        ASN1_SIMPLE(CMS_EnvelopedData, version, LONG),
+        ASN1_IMP_OPT(CMS_EnvelopedData, originatorInfo, CMS_OriginatorInfo, 0),
+        ASN1_SET_OF(CMS_EnvelopedData, recipientInfos, CMS_RecipientInfo),
+        ASN1_SIMPLE(CMS_EnvelopedData, encryptedContentInfo, CMS_EncryptedContentInfo),
+        ASN1_IMP_SET_OF_OPT(CMS_EnvelopedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
+} ASN1_NDEF_SEQUENCE_END(CMS_EnvelopedData)
+
+ASN1_NDEF_SEQUENCE(CMS_DigestedData) = {
+        ASN1_SIMPLE(CMS_DigestedData, version, LONG),
+        ASN1_SIMPLE(CMS_DigestedData, digestAlgorithm, X509_ALGOR),
+        ASN1_SIMPLE(CMS_DigestedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+        ASN1_SIMPLE(CMS_DigestedData, digest, ASN1_OCTET_STRING)
+} ASN1_NDEF_SEQUENCE_END(CMS_DigestedData)
+
+ASN1_NDEF_SEQUENCE(CMS_EncryptedData) = {
+        ASN1_SIMPLE(CMS_EncryptedData, version, LONG),
+        ASN1_SIMPLE(CMS_EncryptedData, encryptedContentInfo, CMS_EncryptedContentInfo),
+        ASN1_IMP_SET_OF_OPT(CMS_EncryptedData, unprotectedAttrs, X509_ATTRIBUTE, 1)
+} ASN1_NDEF_SEQUENCE_END(CMS_EncryptedData)
+
+ASN1_NDEF_SEQUENCE(CMS_AuthenticatedData) = {
+        ASN1_SIMPLE(CMS_AuthenticatedData, version, LONG),
+        ASN1_IMP_OPT(CMS_AuthenticatedData, originatorInfo, CMS_OriginatorInfo, 0),
+        ASN1_SET_OF(CMS_AuthenticatedData, recipientInfos, CMS_RecipientInfo),
+        ASN1_SIMPLE(CMS_AuthenticatedData, macAlgorithm, X509_ALGOR),
+        ASN1_IMP(CMS_AuthenticatedData, digestAlgorithm, X509_ALGOR, 1),
+        ASN1_SIMPLE(CMS_AuthenticatedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+        ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, authAttrs, X509_ALGOR, 2),
+        ASN1_SIMPLE(CMS_AuthenticatedData, mac, ASN1_OCTET_STRING),
+        ASN1_IMP_SET_OF_OPT(CMS_AuthenticatedData, unauthAttrs, X509_ALGOR, 3)
+} ASN1_NDEF_SEQUENCE_END(CMS_AuthenticatedData)
+
+ASN1_NDEF_SEQUENCE(CMS_CompressedData) = {
+        ASN1_SIMPLE(CMS_CompressedData, version, LONG),
+        ASN1_SIMPLE(CMS_CompressedData, compressionAlgorithm, X509_ALGOR),
+        ASN1_SIMPLE(CMS_CompressedData, encapContentInfo, CMS_EncapsulatedContentInfo),
+} ASN1_NDEF_SEQUENCE_END(CMS_CompressedData)
+
+/* This is the ANY DEFINED BY table for the top level ContentInfo structure */
+
+ASN1_ADB_TEMPLATE(cms_default) = ASN1_EXP(CMS_ContentInfo, d.other, ASN1_ANY, 0);
+
+ASN1_ADB(CMS_ContentInfo) = {
+        ADB_ENTRY(NID_pkcs7_data, ASN1_NDEF_EXP(CMS_ContentInfo, d.data, ASN1_OCTET_STRING_NDEF, 0)),
+        ADB_ENTRY(NID_pkcs7_signed, ASN1_NDEF_EXP(CMS_ContentInfo, d.signedData, CMS_SignedData, 0)),
+        ADB_ENTRY(NID_pkcs7_enveloped, ASN1_NDEF_EXP(CMS_ContentInfo, d.envelopedData, CMS_EnvelopedData, 0)),
+        ADB_ENTRY(NID_pkcs7_digest, ASN1_NDEF_EXP(CMS_ContentInfo, d.digestedData, CMS_DigestedData, 0)),
+        ADB_ENTRY(NID_pkcs7_encrypted, ASN1_NDEF_EXP(CMS_ContentInfo, d.encryptedData, CMS_EncryptedData, 0)),
+        ADB_ENTRY(NID_id_smime_ct_authData, ASN1_NDEF_EXP(CMS_ContentInfo, d.authenticatedData, CMS_AuthenticatedData, 0)),
+        ADB_ENTRY(NID_id_smime_ct_compressedData, ASN1_NDEF_EXP(CMS_ContentInfo, d.compressedData, CMS_CompressedData, 0)),
+} ASN1_ADB_END(CMS_ContentInfo, 0, contentType, 0, &cms_default_tt, NULL);
+
+ASN1_NDEF_SEQUENCE(CMS_ContentInfo) = {
+        ASN1_SIMPLE(CMS_ContentInfo, contentType, ASN1_OBJECT),
+        ASN1_ADB_OBJECT(CMS_ContentInfo)
+} ASN1_NDEF_SEQUENCE_END(CMS_ContentInfo)
+
+/* Specials for signed attributes */
+
+/* When signing attributes we want to reorder them to match the sorted
+ * encoding.
+ */
+
+ASN1_ITEM_TEMPLATE(CMS_Attributes_Sign) = 
+        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SET_ORDER, 0, CMS_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Sign)
+
+/* When verifying attributes we need to use the received order. So 
+ * we use SEQUENCE OF and tag it to SET OF
+ */
+
+ASN1_ITEM_TEMPLATE(CMS_Attributes_Verify) = 
+        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_IMPTAG | ASN1_TFLG_UNIVERSAL,
+                                V_ASN1_SET, CMS_ATTRIBUTES, X509_ATTRIBUTE)
+ASN1_ITEM_TEMPLATE_END(CMS_Attributes_Verify)
+
+
+
+ASN1_CHOICE(CMS_ReceiptsFrom) = {
+  ASN1_IMP(CMS_ReceiptsFrom, d.allOrFirstTier, LONG, 0),
+  ASN1_IMP_SEQUENCE_OF(CMS_ReceiptsFrom, d.receiptList, GENERAL_NAMES, 1)
+} ASN1_CHOICE_END(CMS_ReceiptsFrom)
+
+ASN1_SEQUENCE(CMS_ReceiptRequest) = {
+  ASN1_SIMPLE(CMS_ReceiptRequest, signedContentIdentifier, ASN1_OCTET_STRING),
+  ASN1_SIMPLE(CMS_ReceiptRequest, receiptsFrom, CMS_ReceiptsFrom),
+  ASN1_SEQUENCE_OF(CMS_ReceiptRequest, receiptsTo, GENERAL_NAMES)
+} ASN1_SEQUENCE_END(CMS_ReceiptRequest)
+
+ASN1_SEQUENCE(CMS_Receipt) = {
+  ASN1_SIMPLE(CMS_Receipt, version, LONG),
+  ASN1_SIMPLE(CMS_Receipt, contentType, ASN1_OBJECT),
+  ASN1_SIMPLE(CMS_Receipt, signedContentIdentifier, ASN1_OCTET_STRING),
+  ASN1_SIMPLE(CMS_Receipt, originatorSignatureValue, ASN1_OCTET_STRING)
+} ASN1_SEQUENCE_END(CMS_Receipt)
+
diff --git a/src/lib/libssl/src/crypto/cms/cms_att.c b/src/lib/libssl/src/crypto/cms/cms_att.c
new file mode 100644
index 0000000000..5b71722ebc
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_att.c
@@ -0,0 +1,195 @@
+/* crypto/cms/cms_att.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <openssl/asn1t.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+#include <openssl/err.h>
+#include "cms.h"
+#include "cms_lcl.h"
+
+/* CMS SignedData Attribute utilities */
+
+int CMS_signed_get_attr_count(const CMS_SignerInfo *si)
+{
+        return X509at_get_attr_count(si->signedAttrs);
+}
+
+int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
+                          int lastpos)
+{
+        return X509at_get_attr_by_NID(si->signedAttrs, nid, lastpos);
+}
+
+int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
+                          int lastpos)
+{
+        return X509at_get_attr_by_OBJ(si->signedAttrs, obj, lastpos);
+}
+
+X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc)
+{
+        return X509at_get_attr(si->signedAttrs, loc);
+}
+
+X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc)
+{
+        return X509at_delete_attr(si->signedAttrs, loc);
+}
+
+int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr)
+{
+        if(X509at_add1_attr(&si->signedAttrs, attr)) return 1;
+        return 0;
+}
+
+int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
+                        const ASN1_OBJECT *obj, int type,
+                        const void *bytes, int len)
+{
+        if(X509at_add1_attr_by_OBJ(&si->signedAttrs, obj,
+                                type, bytes, len)) return 1;
+        return 0;
+}
+
+int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
+                        int nid, int type,
+                        const void *bytes, int len)
+{
+        if(X509at_add1_attr_by_NID(&si->signedAttrs, nid,
+                                type, bytes, len)) return 1;
+        return 0;
+}
+
+int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
+                        const char *attrname, int type,
+                        const void *bytes, int len)
+{
+        if(X509at_add1_attr_by_txt(&si->signedAttrs, attrname,
+                                type, bytes, len)) return 1;
+        return 0;
+}
+
+void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
+                                        int lastpos, int type)
+{
+        return X509at_get0_data_by_OBJ(si->signedAttrs, oid, lastpos, type);
+}
+
+int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si)
+{
+        return X509at_get_attr_count(si->unsignedAttrs);
+}
+
+int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
+                          int lastpos)
+{
+        return X509at_get_attr_by_NID(si->unsignedAttrs, nid, lastpos);
+}
+
+int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
+                          int lastpos)
+{
+        return X509at_get_attr_by_OBJ(si->unsignedAttrs, obj, lastpos);
+}
+
+X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc)
+{
+        return X509at_get_attr(si->unsignedAttrs, loc);
+}
+
+X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc)
+{
+        return X509at_delete_attr(si->unsignedAttrs, loc);
+}
+
+int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr)
+{
+        if(X509at_add1_attr(&si->unsignedAttrs, attr)) return 1;
+        return 0;
+}
+
+int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
+                        const ASN1_OBJECT *obj, int type,
+                        const void *bytes, int len)
+{
+        if(X509at_add1_attr_by_OBJ(&si->unsignedAttrs, obj,
+                                type, bytes, len)) return 1;
+        return 0;
+}
+
+int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
+                        int nid, int type,
+                        const void *bytes, int len)
+{
+        if(X509at_add1_attr_by_NID(&si->unsignedAttrs, nid,
+                                type, bytes, len)) return 1;
+        return 0;
+}
+
+int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
+                        const char *attrname, int type,
+                        const void *bytes, int len)
+{
+        if(X509at_add1_attr_by_txt(&si->unsignedAttrs, attrname,
+                                type, bytes, len)) return 1;
+        return 0;
+}
+
+void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
+                                        int lastpos, int type)
+{
+        return X509at_get0_data_by_OBJ(si->unsignedAttrs, oid, lastpos, type);
+}
+
+/* Specific attribute cases */
diff --git a/src/lib/libssl/src/crypto/cms/cms_cd.c b/src/lib/libssl/src/crypto/cms/cms_cd.c
new file mode 100644
index 0000000000..a5fc2c4e2b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_cd.c
@@ -0,0 +1,134 @@
+/* crypto/cms/cms_cd.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+#include <openssl/err.h>
+#include <openssl/cms.h>
+#include <openssl/bio.h>
+#include <openssl/comp.h>
+#include "cms_lcl.h"
+
+DECLARE_ASN1_ITEM(CMS_CompressedData)
+
+#ifdef ZLIB
+
+/* CMS CompressedData Utilities */
+
+CMS_ContentInfo *cms_CompressedData_create(int comp_nid)
+        {
+        CMS_ContentInfo *cms;
+        CMS_CompressedData *cd;
+        /* Will need something cleverer if there is ever more than one
+         * compression algorithm or parameters have some meaning...
+         */
+        if (comp_nid != NID_zlib_compression)
+                {
+                CMSerr(CMS_F_CMS_COMPRESSEDDATA_CREATE,
+                                CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+                return NULL;
+                }
+        cms = CMS_ContentInfo_new();
+        if (!cms)
+                return NULL;
+
+        cd = M_ASN1_new_of(CMS_CompressedData);
+
+        if (!cd)
+                goto err;
+
+        cms->contentType = OBJ_nid2obj(NID_id_smime_ct_compressedData);
+        cms->d.compressedData = cd;
+
+        cd->version = 0;
+
+        X509_ALGOR_set0(cd->compressionAlgorithm,
+                        OBJ_nid2obj(NID_zlib_compression),
+                        V_ASN1_UNDEF, NULL);
+
+        cd->encapContentInfo->eContentType = OBJ_nid2obj(NID_pkcs7_data);
+
+        return cms;
+
+        err:
+
+        if (cms)
+                CMS_ContentInfo_free(cms);
+
+        return NULL;
+        }
+
+BIO *cms_CompressedData_init_bio(CMS_ContentInfo *cms)
+        {
+        CMS_CompressedData *cd;
+        ASN1_OBJECT *compoid;
+        if (OBJ_obj2nid(cms->contentType) != NID_id_smime_ct_compressedData)
+                {
+                CMSerr(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO,
+                                CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA);
+                return NULL;
+                }
+        cd = cms->d.compressedData;
+        X509_ALGOR_get0(&compoid, NULL, NULL, cd->compressionAlgorithm);
+        if (OBJ_obj2nid(compoid) != NID_zlib_compression)
+                {
+                CMSerr(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO,
+                                CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+                return NULL;
+                }
+        return BIO_new(BIO_f_zlib());
+        }
+
+#endif
diff --git a/src/lib/libssl/src/crypto/cms/cms_dd.c b/src/lib/libssl/src/crypto/cms/cms_dd.c
new file mode 100644
index 0000000000..8919c15be1
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_dd.c
@@ -0,0 +1,148 @@
+/* crypto/cms/cms_dd.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+#include <openssl/err.h>
+#include <openssl/cms.h>
+#include "cms_lcl.h"
+
+DECLARE_ASN1_ITEM(CMS_DigestedData)
+
+/* CMS DigestedData Utilities */
+
+CMS_ContentInfo *cms_DigestedData_create(const EVP_MD *md)
+        {
+        CMS_ContentInfo *cms;
+        CMS_DigestedData *dd;
+        cms = CMS_ContentInfo_new();
+        if (!cms)
+                return NULL;
+
+        dd = M_ASN1_new_of(CMS_DigestedData);
+
+        if (!dd)
+                goto err;
+
+        cms->contentType = OBJ_nid2obj(NID_pkcs7_digest);
+        cms->d.digestedData = dd;
+
+        dd->version = 0;
+        dd->encapContentInfo->eContentType = OBJ_nid2obj(NID_pkcs7_data);
+
+        cms_DigestAlgorithm_set(dd->digestAlgorithm, md);
+
+        return cms;
+
+        err:
+
+        if (cms)
+                CMS_ContentInfo_free(cms);
+
+        return NULL;
+        }
+
+BIO *cms_DigestedData_init_bio(CMS_ContentInfo *cms)
+        {
+        CMS_DigestedData *dd;
+        dd = cms->d.digestedData;
+        return cms_DigestAlgorithm_init_bio(dd->digestAlgorithm);
+        }
+
+int cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify)
+        {
+        EVP_MD_CTX mctx;
+        unsigned char md[EVP_MAX_MD_SIZE];
+        unsigned int mdlen;
+        int r = 0;
+        CMS_DigestedData *dd;
+        EVP_MD_CTX_init(&mctx);
+
+        dd = cms->d.digestedData;
+
+        if (!cms_DigestAlgorithm_find_ctx(&mctx, chain, dd->digestAlgorithm))
+                goto err;
+
+        if (EVP_DigestFinal_ex(&mctx, md, &mdlen) <= 0)
+                goto err;
+
+        if (verify)
+                {
+                if (mdlen != (unsigned int)dd->digest->length)
+                        {
+                        CMSerr(CMS_F_CMS_DIGESTEDDATA_DO_FINAL,
+                                CMS_R_MESSAGEDIGEST_WRONG_LENGTH);
+                        goto err;
+                        }
+
+                if (memcmp(md, dd->digest->data, mdlen))
+                        CMSerr(CMS_F_CMS_DIGESTEDDATA_DO_FINAL,
+                                CMS_R_VERIFICATION_FAILURE);
+                else
+                        r = 1;
+                }
+        else
+                {
+                if (!ASN1_STRING_set(dd->digest, md, mdlen))
+                        goto err;
+                r = 1;
+                }
+
+        err:
+        EVP_MD_CTX_cleanup(&mctx);
+
+        return r;
+
+        }
diff --git a/src/lib/libssl/src/crypto/cms/cms_enc.c b/src/lib/libssl/src/crypto/cms/cms_enc.c
new file mode 100644
index 0000000000..bab26235bd
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_enc.c
@@ -0,0 +1,262 @@
+/* crypto/cms/cms_enc.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+#include <openssl/err.h>
+#include <openssl/cms.h>
+#include <openssl/rand.h>
+#include "cms_lcl.h"
+
+/* CMS EncryptedData Utilities */
+
+DECLARE_ASN1_ITEM(CMS_EncryptedData)
+
+/* Return BIO based on EncryptedContentInfo and key */
+
+BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
+        {
+        BIO *b;
+        EVP_CIPHER_CTX *ctx;
+        const EVP_CIPHER *ciph;
+        X509_ALGOR *calg = ec->contentEncryptionAlgorithm;
+        unsigned char iv[EVP_MAX_IV_LENGTH], *piv = NULL;
+
+        int ok = 0;
+
+        int enc, keep_key = 0;
+
+        enc = ec->cipher ? 1 : 0;
+
+        b = BIO_new(BIO_f_cipher());
+        if (!b)
+                {
+                CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                                        ERR_R_MALLOC_FAILURE);
+                return NULL;
+                }
+
+        BIO_get_cipher_ctx(b, &ctx);
+
+        if (enc)
+                {
+                ciph = ec->cipher;
+                /* If not keeping key set cipher to NULL so subsequent calls
+                 * decrypt.
+                 */
+                if (ec->key)
+                        ec->cipher = NULL;
+                }
+        else
+                {
+                ciph = EVP_get_cipherbyobj(calg->algorithm);
+
+                if (!ciph)
+                        {
+                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                                        CMS_R_UNKNOWN_CIPHER);
+                        goto err;
+                        }
+                }
+
+        if (EVP_CipherInit_ex(ctx, ciph, NULL, NULL, NULL, enc) <= 0)
+                {
+                CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                CMS_R_CIPHER_INITIALISATION_ERROR);
+                goto err;
+                }
+
+        if (enc)
+                {
+                int ivlen;
+                calg->algorithm = OBJ_nid2obj(EVP_CIPHER_CTX_type(ctx));
+                /* Generate a random IV if we need one */
+                ivlen = EVP_CIPHER_CTX_iv_length(ctx);
+                if (ivlen > 0)
+                        {
+                        if (RAND_pseudo_bytes(iv, ivlen) <= 0)
+                                goto err;
+                        piv = iv;
+                        }
+                }
+        else if (EVP_CIPHER_asn1_to_param(ctx, calg->parameter) <= 0)
+                {
+                CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
+                goto err;
+                }
+
+
+        if (enc && !ec->key)
+                {
+                /* Generate random key */
+                if (!ec->keylen)
+                        ec->keylen = EVP_CIPHER_CTX_key_length(ctx);
+                ec->key = OPENSSL_malloc(ec->keylen);
+                if (!ec->key)
+                        {
+                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                                        ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                if (EVP_CIPHER_CTX_rand_key(ctx, ec->key) <= 0)
+                        goto err;
+                keep_key = 1;
+                }
+        else if (ec->keylen != (unsigned int)EVP_CIPHER_CTX_key_length(ctx))
+                {
+                /* If necessary set key length */
+                if (EVP_CIPHER_CTX_set_key_length(ctx, ec->keylen) <= 0)
+                        {
+                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                CMS_R_INVALID_KEY_LENGTH);
+                        goto err;
+                        }
+                }
+
+        if (EVP_CipherInit_ex(ctx, NULL, NULL, ec->key, piv, enc) <= 0)
+                {
+                CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                CMS_R_CIPHER_INITIALISATION_ERROR);
+                goto err;
+                }
+
+        if (piv)
+                {
+                calg->parameter = ASN1_TYPE_new();
+                if (!calg->parameter)
+                        {
+                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                                        ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                if (EVP_CIPHER_param_to_asn1(ctx, calg->parameter) <= 0)
+                        {
+                        CMSerr(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO,
+                                CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR);
+                        goto err;
+                        }
+                }
+        ok = 1;
+
+        err:
+        if (ec->key && !keep_key)
+                {
+                OPENSSL_cleanse(ec->key, ec->keylen);
+                OPENSSL_free(ec->key);
+                ec->key = NULL;
+                }
+        if (ok)
+                return b;
+        BIO_free(b);
+        return NULL;
+        }
+
+int cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec, 
+                                const EVP_CIPHER *cipher,
+                                const unsigned char *key, size_t keylen)
+        {
+        ec->cipher = cipher;
+        if (key)
+                {
+                ec->key = OPENSSL_malloc(keylen);
+                if (!ec->key)
+                        return 0;
+                memcpy(ec->key, key, keylen);
+                }
+        ec->keylen = keylen;
+        if (cipher)
+                ec->contentType = OBJ_nid2obj(NID_pkcs7_data);
+        return 1;
+        }
+
+int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
+                                const unsigned char *key, size_t keylen)
+        {
+        CMS_EncryptedContentInfo *ec;
+        if (!key || !keylen)
+                {
+                CMSerr(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY, CMS_R_NO_KEY);
+                return 0;
+                }
+        if (ciph)
+                {
+                cms->d.encryptedData = M_ASN1_new_of(CMS_EncryptedData);
+                if (!cms->d.encryptedData)
+                        {
+                        CMSerr(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY,
+                                ERR_R_MALLOC_FAILURE);
+                        return 0;
+                        }
+                cms->contentType = OBJ_nid2obj(NID_pkcs7_encrypted);
+                cms->d.encryptedData->version = 0;
+                }
+        else if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_encrypted)
+                {
+                CMSerr(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY,
+                                                CMS_R_NOT_ENCRYPTED_DATA);
+                return 0;
+                }
+        ec = cms->d.encryptedData->encryptedContentInfo;
+        return cms_EncryptedContent_init(ec, ciph, key, keylen);
+        }
+
+BIO *cms_EncryptedData_init_bio(CMS_ContentInfo *cms)
+        {
+        CMS_EncryptedData *enc = cms->d.encryptedData;
+        if (enc->encryptedContentInfo->cipher && enc->unprotectedAttrs)
+                enc->version = 2;
+        return cms_EncryptedContent_init_bio(enc->encryptedContentInfo);
+        }
diff --git a/src/lib/libssl/src/crypto/cms/cms_env.c b/src/lib/libssl/src/crypto/cms/cms_env.c
new file mode 100644
index 0000000000..d499ae85b4
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_env.c
@@ -0,0 +1,825 @@
+/* crypto/cms/cms_env.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+#include <openssl/err.h>
+#include <openssl/cms.h>
+#include <openssl/rand.h>
+#include <openssl/aes.h>
+#include "cms_lcl.h"
+
+/* CMS EnvelopedData Utilities */
+
+DECLARE_ASN1_ITEM(CMS_EnvelopedData)
+DECLARE_ASN1_ITEM(CMS_RecipientInfo)
+DECLARE_ASN1_ITEM(CMS_KeyTransRecipientInfo)
+DECLARE_ASN1_ITEM(CMS_KEKRecipientInfo)
+DECLARE_ASN1_ITEM(CMS_OtherKeyAttribute)
+
+DECLARE_STACK_OF(CMS_RecipientInfo)
+
+static CMS_EnvelopedData *cms_get0_enveloped(CMS_ContentInfo *cms)
+        {
+        if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_enveloped)
+                {
+                CMSerr(CMS_F_CMS_GET0_ENVELOPED,
+                                CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA);
+                return NULL;
+                }
+        return cms->d.envelopedData;
+        }
+
+static CMS_EnvelopedData *cms_enveloped_data_init(CMS_ContentInfo *cms)
+        {
+        if (cms->d.other == NULL)
+                {
+                cms->d.envelopedData = M_ASN1_new_of(CMS_EnvelopedData);
+                if (!cms->d.envelopedData)
+                        {
+                        CMSerr(CMS_F_CMS_ENVELOPED_DATA_INIT,
+                                                        ERR_R_MALLOC_FAILURE);
+                        return NULL;
+                        }
+                cms->d.envelopedData->version = 0;
+                cms->d.envelopedData->encryptedContentInfo->contentType =
+                                                OBJ_nid2obj(NID_pkcs7_data);
+                ASN1_OBJECT_free(cms->contentType);
+                cms->contentType = OBJ_nid2obj(NID_pkcs7_enveloped);
+                return cms->d.envelopedData;
+                }
+        return cms_get0_enveloped(cms);
+        }
+
+STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms)
+        {
+        CMS_EnvelopedData *env;
+        env = cms_get0_enveloped(cms);
+        if (!env)
+                return NULL;
+        return env->recipientInfos;
+        }
+
+int CMS_RecipientInfo_type(CMS_RecipientInfo *ri)
+        {
+        return ri->type;
+        }
+
+CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher)
+        {
+        CMS_ContentInfo *cms;
+        CMS_EnvelopedData *env;
+        cms = CMS_ContentInfo_new();
+        if (!cms)
+                goto merr;
+        env = cms_enveloped_data_init(cms);
+        if (!env)
+                goto merr;
+        if (!cms_EncryptedContent_init(env->encryptedContentInfo,
+                                        cipher, NULL, 0))
+                goto merr;
+        return cms;
+        merr:
+        if (cms)
+                CMS_ContentInfo_free(cms);
+        CMSerr(CMS_F_CMS_ENVELOPEDDATA_CREATE, ERR_R_MALLOC_FAILURE);
+        return NULL;
+        }
+
+/* Key Transport Recipient Info (KTRI) routines */
+
+/* Add a recipient certificate. For now only handle key transport.
+ * If we ever handle key agreement will need updating.
+ */
+
+CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
+                                        X509 *recip, unsigned int flags)
+        {
+        CMS_RecipientInfo *ri = NULL;
+        CMS_KeyTransRecipientInfo *ktri;
+        CMS_EnvelopedData *env;
+        EVP_PKEY *pk = NULL;
+        int type;
+        env = cms_get0_enveloped(cms);
+        if (!env)
+                goto err;
+
+        /* Initialize recipient info */
+        ri = M_ASN1_new_of(CMS_RecipientInfo);
+        if (!ri)
+                goto merr;
+
+        /* Initialize and add key transport recipient info */
+
+        ri->d.ktri = M_ASN1_new_of(CMS_KeyTransRecipientInfo);
+        if (!ri->d.ktri)
+                goto merr;
+        ri->type = CMS_RECIPINFO_TRANS;
+
+        ktri = ri->d.ktri;
+
+        X509_check_purpose(recip, -1, -1);
+        pk = X509_get_pubkey(recip);
+        if (!pk)
+                {
+                CMSerr(CMS_F_CMS_ADD1_RECIPIENT_CERT,
+                                CMS_R_ERROR_GETTING_PUBLIC_KEY);
+                goto err;
+                }
+        CRYPTO_add(&recip->references, 1, CRYPTO_LOCK_X509);
+        ktri->pkey = pk;
+        ktri->recip = recip;
+
+        if (flags & CMS_USE_KEYID)
+                {
+                ktri->version = 2;
+                type = CMS_RECIPINFO_KEYIDENTIFIER;
+                }
+        else
+                {
+                ktri->version = 0;
+                type = CMS_RECIPINFO_ISSUER_SERIAL;
+                }
+
+        /* Not a typo: RecipientIdentifier and SignerIdentifier are the
+         * same structure.
+         */
+
+        if (!cms_set1_SignerIdentifier(ktri->rid, recip, type))
+                goto err;
+
+        /* Since we have no EVP_PKEY_ASN1_METHOD in OpenSSL 0.9.8,
+         * hard code algorithm parameters.
+         */
+
+        if (pk->type == EVP_PKEY_RSA)
+                {
+                X509_ALGOR_set0(ktri->keyEncryptionAlgorithm,
+                                        OBJ_nid2obj(NID_rsaEncryption), 
+                                        V_ASN1_NULL, 0);
+                }
+        else
+                {
+                CMSerr(CMS_F_CMS_ADD1_RECIPIENT_CERT,
+                                CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+                goto err;
+                }
+
+        if (!sk_CMS_RecipientInfo_push(env->recipientInfos, ri))
+                goto merr;
+
+        return ri;
+
+        merr:
+        CMSerr(CMS_F_CMS_ADD1_RECIPIENT_CERT, ERR_R_MALLOC_FAILURE);
+        err:
+        if (ri)
+                M_ASN1_free_of(ri, CMS_RecipientInfo);
+        return NULL;
+
+        }
+
+int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
+                                        EVP_PKEY **pk, X509 **recip,
+                                        X509_ALGOR **palg)
+        {
+        CMS_KeyTransRecipientInfo *ktri;
+        if (ri->type != CMS_RECIPINFO_TRANS)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS,
+                        CMS_R_NOT_KEY_TRANSPORT);
+                return 0;
+                }
+
+        ktri = ri->d.ktri;
+
+        if (pk)
+                *pk = ktri->pkey;
+        if (recip)
+                *recip = ktri->recip;
+        if (palg)
+                *palg = ktri->keyEncryptionAlgorithm;
+        return 1;
+        }
+
+int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
+                                        ASN1_OCTET_STRING **keyid,
+                                        X509_NAME **issuer, ASN1_INTEGER **sno)
+        {
+        CMS_KeyTransRecipientInfo *ktri;
+        if (ri->type != CMS_RECIPINFO_TRANS)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID,
+                        CMS_R_NOT_KEY_TRANSPORT);
+                return 0;
+                }
+        ktri = ri->d.ktri;
+
+        return cms_SignerIdentifier_get0_signer_id(ktri->rid,
+                                                        keyid, issuer, sno);
+        }
+
+int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert)
+        {
+        if (ri->type != CMS_RECIPINFO_TRANS)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP,
+                        CMS_R_NOT_KEY_TRANSPORT);
+                return -2;
+                }
+        return cms_SignerIdentifier_cert_cmp(ri->d.ktri->rid, cert);
+        }
+
+int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey)
+        {
+        if (ri->type != CMS_RECIPINFO_TRANS)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_SET0_PKEY,
+                        CMS_R_NOT_KEY_TRANSPORT);
+                return 0;
+                }
+        ri->d.ktri->pkey = pkey;
+        return 1;
+        }
+
+/* Encrypt content key in key transport recipient info */
+
+static int cms_RecipientInfo_ktri_encrypt(CMS_ContentInfo *cms,
+                                        CMS_RecipientInfo *ri)
+        {
+        CMS_KeyTransRecipientInfo *ktri;
+        CMS_EncryptedContentInfo *ec;
+        unsigned char *ek = NULL;
+        int eklen;
+
+        int ret = 0;
+
+        if (ri->type != CMS_RECIPINFO_TRANS)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT,
+                        CMS_R_NOT_KEY_TRANSPORT);
+                return 0;
+                }
+        ktri = ri->d.ktri;
+        ec = cms->d.envelopedData->encryptedContentInfo;
+
+        eklen = EVP_PKEY_size(ktri->pkey);
+
+        ek = OPENSSL_malloc(eklen);
+
+        if (ek == NULL)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT,
+                                                        ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        eklen = EVP_PKEY_encrypt(ek, ec->key, ec->keylen, ktri->pkey);
+
+        if (eklen <= 0)
+                goto err;
+
+        ASN1_STRING_set0(ktri->encryptedKey, ek, eklen);
+        ek = NULL;
+
+        ret = 1;
+
+        err:
+        if (ek)
+                OPENSSL_free(ek);
+        return ret;
+
+        }
+
+/* Decrypt content key from KTRI */
+
+static int cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms,
+                                                        CMS_RecipientInfo *ri)
+        {
+        CMS_KeyTransRecipientInfo *ktri = ri->d.ktri;
+        unsigned char *ek = NULL;
+        int eklen;
+        int ret = 0;
+
+        if (ktri->pkey == NULL)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT,
+                        CMS_R_NO_PRIVATE_KEY);
+                return 0;
+                }
+
+        eklen = EVP_PKEY_size(ktri->pkey);
+
+        ek = OPENSSL_malloc(eklen);
+
+        if (ek == NULL)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT,
+                                                        ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        eklen = EVP_PKEY_decrypt(ek, 
+                                ktri->encryptedKey->data,
+                                ktri->encryptedKey->length, ktri->pkey);
+        if (eklen <= 0)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT, CMS_R_CMS_LIB);
+                goto err;
+                }
+
+        ret = 1;
+
+        cms->d.envelopedData->encryptedContentInfo->key = ek;
+        cms->d.envelopedData->encryptedContentInfo->keylen = eklen;
+
+        err:
+        if (!ret && ek)
+                OPENSSL_free(ek);
+
+        return ret;
+        }
+
+/* Key Encrypted Key (KEK) RecipientInfo routines */
+
+int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri, 
+                                        const unsigned char *id, size_t idlen)
+        {
+        ASN1_OCTET_STRING tmp_os;
+        CMS_KEKRecipientInfo *kekri;
+        if (ri->type != CMS_RECIPINFO_KEK)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP, CMS_R_NOT_KEK);
+                return -2;
+                }
+        kekri = ri->d.kekri;
+        tmp_os.type = V_ASN1_OCTET_STRING;
+        tmp_os.flags = 0;
+        tmp_os.data = (unsigned char *)id;
+        tmp_os.length = (int)idlen;
+        return ASN1_OCTET_STRING_cmp(&tmp_os, kekri->kekid->keyIdentifier);
+        }
+
+/* For now hard code AES key wrap info */
+
+static size_t aes_wrap_keylen(int nid)
+        {
+        switch (nid)
+                {
+                case NID_id_aes128_wrap:
+                return 16;
+
+                case NID_id_aes192_wrap:
+                return  24;
+
+                case NID_id_aes256_wrap:
+                return  32;
+
+                default:
+                return 0;
+                }
+        }
+
+CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
+                                        unsigned char *key, size_t keylen,
+                                        unsigned char *id, size_t idlen,
+                                        ASN1_GENERALIZEDTIME *date,
+                                        ASN1_OBJECT *otherTypeId,
+                                        ASN1_TYPE *otherType)
+        {
+        CMS_RecipientInfo *ri = NULL;
+        CMS_EnvelopedData *env;
+        CMS_KEKRecipientInfo *kekri;
+        env = cms_get0_enveloped(cms);
+        if (!env)
+                goto err;
+
+        if (nid == NID_undef)
+                {
+                switch (keylen)
+                        {
+                        case 16:
+                        nid = NID_id_aes128_wrap;
+                        break;
+
+                        case  24:
+                        nid = NID_id_aes192_wrap;
+                        break;
+
+                        case  32:
+                        nid = NID_id_aes256_wrap;
+                        break;
+
+                        default:
+                        CMSerr(CMS_F_CMS_ADD0_RECIPIENT_KEY,
+                                                CMS_R_INVALID_KEY_LENGTH);
+                        goto err;
+                        }
+
+                }
+        else
+                {
+
+                size_t exp_keylen = aes_wrap_keylen(nid);
+
+                if (!exp_keylen)
+                        {
+                        CMSerr(CMS_F_CMS_ADD0_RECIPIENT_KEY,
+                                        CMS_R_UNSUPPORTED_KEK_ALGORITHM);
+                        goto err;
+                        }
+
+                if (keylen != exp_keylen)
+                        {
+                        CMSerr(CMS_F_CMS_ADD0_RECIPIENT_KEY,
+                                        CMS_R_INVALID_KEY_LENGTH);
+                        goto err;
+                        }
+
+                }
+
+        /* Initialize recipient info */
+        ri = M_ASN1_new_of(CMS_RecipientInfo);
+        if (!ri)
+                goto merr;
+
+        ri->d.kekri = M_ASN1_new_of(CMS_KEKRecipientInfo);
+        if (!ri->d.kekri)
+                goto merr;
+        ri->type = CMS_RECIPINFO_KEK;
+
+        kekri = ri->d.kekri;
+
+        if (otherTypeId)
+                {
+                kekri->kekid->other = M_ASN1_new_of(CMS_OtherKeyAttribute);
+                if (kekri->kekid->other == NULL)
+                        goto merr;
+                }
+
+        if (!sk_CMS_RecipientInfo_push(env->recipientInfos, ri))
+                goto merr;
+
+
+        /* After this point no calls can fail */
+
+        kekri->version = 4;
+
+        kekri->key = key;
+        kekri->keylen = keylen;
+
+        ASN1_STRING_set0(kekri->kekid->keyIdentifier, id, idlen);
+
+        kekri->kekid->date = date;
+
+        if (kekri->kekid->other)
+                {
+                kekri->kekid->other->keyAttrId = otherTypeId;
+                kekri->kekid->other->keyAttr = otherType;
+                }
+
+        X509_ALGOR_set0(kekri->keyEncryptionAlgorithm,
+                                OBJ_nid2obj(nid), V_ASN1_UNDEF, NULL);
+
+        return ri;
+
+        merr:
+        CMSerr(CMS_F_CMS_ADD0_RECIPIENT_KEY, ERR_R_MALLOC_FAILURE);
+        err:
+        if (ri)
+                M_ASN1_free_of(ri, CMS_RecipientInfo);
+        return NULL;
+
+        }
+
+int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
+                                        X509_ALGOR **palg,
+                                        ASN1_OCTET_STRING **pid,
+                                        ASN1_GENERALIZEDTIME **pdate,
+                                        ASN1_OBJECT **potherid,
+                                        ASN1_TYPE **pothertype)
+        {
+        CMS_KEKIdentifier *rkid;
+        if (ri->type != CMS_RECIPINFO_KEK)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID, CMS_R_NOT_KEK);
+                return 0;
+                }
+        rkid =  ri->d.kekri->kekid;
+        if (palg)
+                *palg = ri->d.kekri->keyEncryptionAlgorithm;
+        if (pid)
+                *pid = rkid->keyIdentifier;
+        if (pdate)
+                *pdate = rkid->date;
+        if (potherid)
+                {
+                if (rkid->other)
+                        *potherid = rkid->other->keyAttrId;
+                else
+                        *potherid = NULL;
+                }
+        if (pothertype)
+                {
+                if (rkid->other)
+                        *pothertype = rkid->other->keyAttr;
+                else
+                        *pothertype = NULL;
+                }
+        return 1;
+        }
+
+int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri, 
+                                unsigned char *key, size_t keylen)
+        {
+        CMS_KEKRecipientInfo *kekri;
+        if (ri->type != CMS_RECIPINFO_KEK)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_SET0_KEY, CMS_R_NOT_KEK);
+                return 0;
+                }
+
+        kekri = ri->d.kekri;
+        kekri->key = key;
+        kekri->keylen = keylen;
+        return 1;
+        }
+
+
+/* Encrypt content key in KEK recipient info */
+
+static int cms_RecipientInfo_kekri_encrypt(CMS_ContentInfo *cms,
+                                        CMS_RecipientInfo *ri)
+        {
+        CMS_EncryptedContentInfo *ec;
+        CMS_KEKRecipientInfo *kekri;
+        AES_KEY actx;
+        unsigned char *wkey = NULL;
+        int wkeylen;
+        int r = 0;
+
+        ec = cms->d.envelopedData->encryptedContentInfo;
+
+        kekri = ri->d.kekri;
+
+        if (!kekri->key)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT, CMS_R_NO_KEY);
+                return 0;
+                }
+
+        if (AES_set_encrypt_key(kekri->key, kekri->keylen << 3, &actx))
+                { 
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT,
+                                                CMS_R_ERROR_SETTING_KEY);
+                goto err;
+                }
+
+        wkey = OPENSSL_malloc(ec->keylen + 8);
+
+        if (!wkey)
+                { 
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT,
+                                                ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        wkeylen = AES_wrap_key(&actx, NULL, wkey, ec->key, ec->keylen);
+
+        if (wkeylen <= 0)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT, CMS_R_WRAP_ERROR);
+                goto err;
+                }
+
+        ASN1_STRING_set0(kekri->encryptedKey, wkey, wkeylen);
+
+        r = 1;
+
+        err:
+
+        if (!r && wkey)
+                OPENSSL_free(wkey);
+        OPENSSL_cleanse(&actx, sizeof(actx));
+
+        return r;
+
+        }
+
+/* Decrypt content key in KEK recipient info */
+
+static int cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms,
+                                        CMS_RecipientInfo *ri)
+        {
+        CMS_EncryptedContentInfo *ec;
+        CMS_KEKRecipientInfo *kekri;
+        AES_KEY actx;
+        unsigned char *ukey = NULL;
+        int ukeylen;
+        int r = 0, wrap_nid;
+
+        ec = cms->d.envelopedData->encryptedContentInfo;
+
+        kekri = ri->d.kekri;
+
+        if (!kekri->key)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT, CMS_R_NO_KEY);
+                return 0;
+                }
+
+        wrap_nid = OBJ_obj2nid(kekri->keyEncryptionAlgorithm->algorithm);
+        if (aes_wrap_keylen(wrap_nid) != kekri->keylen)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT,
+                        CMS_R_INVALID_KEY_LENGTH);
+                return 0;
+                }
+
+        /* If encrypted key length is invalid don't bother */
+
+        if (kekri->encryptedKey->length < 16)
+                { 
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT,
+                                        CMS_R_INVALID_ENCRYPTED_KEY_LENGTH);
+                goto err;
+                }
+
+        if (AES_set_decrypt_key(kekri->key, kekri->keylen << 3, &actx))
+                { 
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT,
+                                                CMS_R_ERROR_SETTING_KEY);
+                goto err;
+                }
+
+        ukey = OPENSSL_malloc(kekri->encryptedKey->length - 8);
+
+        if (!ukey)
+                { 
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT,
+                                                ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        ukeylen = AES_unwrap_key(&actx, NULL, ukey,
+                                        kekri->encryptedKey->data,
+                                        kekri->encryptedKey->length);
+
+        if (ukeylen <= 0)
+                {
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT,
+                                                        CMS_R_UNWRAP_ERROR);
+                goto err;
+                }
+
+        ec->key = ukey;
+        ec->keylen = ukeylen;
+
+        r = 1;
+
+        err:
+
+        if (!r && ukey)
+                OPENSSL_free(ukey);
+        OPENSSL_cleanse(&actx, sizeof(actx));
+
+        return r;
+
+        }
+
+int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri)
+        {
+        switch(ri->type)
+                {
+                case CMS_RECIPINFO_TRANS:
+                return cms_RecipientInfo_ktri_decrypt(cms, ri);
+
+                case CMS_RECIPINFO_KEK:
+                return cms_RecipientInfo_kekri_decrypt(cms, ri);
+
+                default:
+                CMSerr(CMS_F_CMS_RECIPIENTINFO_DECRYPT,
+                        CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE);
+                return 0;
+                }
+        }
+
+BIO *cms_EnvelopedData_init_bio(CMS_ContentInfo *cms)
+        {
+        CMS_EncryptedContentInfo *ec;
+        STACK_OF(CMS_RecipientInfo) *rinfos;
+        CMS_RecipientInfo *ri;
+        int i, r, ok = 0;
+        BIO *ret;
+
+        /* Get BIO first to set up key */
+
+        ec = cms->d.envelopedData->encryptedContentInfo;
+        ret = cms_EncryptedContent_init_bio(ec);
+
+        /* If error or no cipher end of processing */
+
+        if (!ret || !ec->cipher)
+                return ret;
+
+        /* Now encrypt content key according to each RecipientInfo type */
+
+        rinfos = cms->d.envelopedData->recipientInfos;
+
+        for (i = 0; i < sk_CMS_RecipientInfo_num(rinfos); i++)
+                {
+                ri = sk_CMS_RecipientInfo_value(rinfos, i);
+
+                switch (ri->type)
+                        {
+                        case CMS_RECIPINFO_TRANS:
+                        r = cms_RecipientInfo_ktri_encrypt(cms, ri);
+                        break;
+
+                        case CMS_RECIPINFO_KEK:
+                        r = cms_RecipientInfo_kekri_encrypt(cms, ri);
+                        break;
+
+                        default:
+                        CMSerr(CMS_F_CMS_ENVELOPEDDATA_INIT_BIO,
+                                CMS_R_UNSUPPORTED_RECIPIENT_TYPE);
+                        goto err;
+                        }
+
+                if (r <= 0)
+                        {
+                        CMSerr(CMS_F_CMS_ENVELOPEDDATA_INIT_BIO,
+                                CMS_R_ERROR_SETTING_RECIPIENTINFO);
+                        goto err;
+                        }
+                }
+
+        ok = 1;
+
+        err:
+        ec->cipher = NULL;
+        if (ec->key)
+                {
+                OPENSSL_cleanse(ec->key, ec->keylen);
+                OPENSSL_free(ec->key);
+                ec->key = NULL;
+                ec->keylen = 0;
+                }
+        if (ok)
+                return ret;
+        BIO_free(ret);
+        return NULL;
+
+        }
diff --git a/src/lib/libssl/src/crypto/cms/cms_err.c b/src/lib/libssl/src/crypto/cms/cms_err.c
new file mode 100644
index 0000000000..52fa53954f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_err.c
@@ -0,0 +1,236 @@
+/* crypto/cms/cms_err.c */
+/* ====================================================================
+ * Copyright (c) 1999-2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
+ */
+
+#include <stdio.h>
+#include <openssl/err.h>
+#include <openssl/cms.h>
+
+/* BEGIN ERROR CODES */
+#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(ERR_LIB_CMS,func,0)
+#define ERR_REASON(reason) ERR_PACK(ERR_LIB_CMS,0,reason)
+
+static ERR_STRING_DATA CMS_str_functs[]=
+        {
+{ERR_FUNC(CMS_F_CHECK_CONTENT), "CHECK_CONTENT"},
+{ERR_FUNC(CMS_F_CMS_ADD0_CERT), "CMS_add0_cert"},
+{ERR_FUNC(CMS_F_CMS_ADD0_RECIPIENT_KEY),        "CMS_add0_recipient_key"},
+{ERR_FUNC(CMS_F_CMS_ADD1_RECEIPTREQUEST),       "CMS_add1_ReceiptRequest"},
+{ERR_FUNC(CMS_F_CMS_ADD1_RECIPIENT_CERT),       "CMS_add1_recipient_cert"},
+{ERR_FUNC(CMS_F_CMS_ADD1_SIGNER),       "CMS_add1_signer"},
+{ERR_FUNC(CMS_F_CMS_ADD1_SIGNINGTIME),  "CMS_ADD1_SIGNINGTIME"},
+{ERR_FUNC(CMS_F_CMS_COMPRESS),  "CMS_compress"},
+{ERR_FUNC(CMS_F_CMS_COMPRESSEDDATA_CREATE),     "cms_CompressedData_create"},
+{ERR_FUNC(CMS_F_CMS_COMPRESSEDDATA_INIT_BIO),   "cms_CompressedData_init_bio"},
+{ERR_FUNC(CMS_F_CMS_COPY_CONTENT),      "CMS_COPY_CONTENT"},
+{ERR_FUNC(CMS_F_CMS_COPY_MESSAGEDIGEST),        "CMS_COPY_MESSAGEDIGEST"},
+{ERR_FUNC(CMS_F_CMS_DATA),      "CMS_data"},
+{ERR_FUNC(CMS_F_CMS_DATAFINAL), "CMS_dataFinal"},
+{ERR_FUNC(CMS_F_CMS_DATAINIT),  "CMS_dataInit"},
+{ERR_FUNC(CMS_F_CMS_DECRYPT),   "CMS_decrypt"},
+{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_KEY),  "CMS_decrypt_set1_key"},
+{ERR_FUNC(CMS_F_CMS_DECRYPT_SET1_PKEY), "CMS_decrypt_set1_pkey"},
+{ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_FIND_CTX),  "cms_DigestAlgorithm_find_ctx"},
+{ERR_FUNC(CMS_F_CMS_DIGESTALGORITHM_INIT_BIO),  "cms_DigestAlgorithm_init_bio"},
+{ERR_FUNC(CMS_F_CMS_DIGESTEDDATA_DO_FINAL),     "cms_DigestedData_do_final"},
+{ERR_FUNC(CMS_F_CMS_DIGEST_VERIFY),     "CMS_digest_verify"},
+{ERR_FUNC(CMS_F_CMS_ENCODE_RECEIPT),    "cms_encode_Receipt"},
+{ERR_FUNC(CMS_F_CMS_ENCRYPT),   "CMS_encrypt"},
+{ERR_FUNC(CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO), "cms_EncryptedContent_init_bio"},
+{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_DECRYPT),     "CMS_EncryptedData_decrypt"},
+{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT),     "CMS_EncryptedData_encrypt"},
+{ERR_FUNC(CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY),    "CMS_EncryptedData_set1_key"},
+{ERR_FUNC(CMS_F_CMS_ENVELOPEDDATA_CREATE),      "CMS_EnvelopedData_create"},
+{ERR_FUNC(CMS_F_CMS_ENVELOPEDDATA_INIT_BIO),    "cms_EnvelopedData_init_bio"},
+{ERR_FUNC(CMS_F_CMS_ENVELOPED_DATA_INIT),       "CMS_ENVELOPED_DATA_INIT"},
+{ERR_FUNC(CMS_F_CMS_FINAL),     "CMS_final"},
+{ERR_FUNC(CMS_F_CMS_GET0_CERTIFICATE_CHOICES),  "CMS_GET0_CERTIFICATE_CHOICES"},
+{ERR_FUNC(CMS_F_CMS_GET0_CONTENT),      "CMS_get0_content"},
+{ERR_FUNC(CMS_F_CMS_GET0_ECONTENT_TYPE),        "CMS_GET0_ECONTENT_TYPE"},
+{ERR_FUNC(CMS_F_CMS_GET0_ENVELOPED),    "CMS_GET0_ENVELOPED"},
+{ERR_FUNC(CMS_F_CMS_GET0_REVOCATION_CHOICES),   "CMS_GET0_REVOCATION_CHOICES"},
+{ERR_FUNC(CMS_F_CMS_GET0_SIGNED),       "CMS_GET0_SIGNED"},
+{ERR_FUNC(CMS_F_CMS_MSGSIGDIGEST_ADD1), "cms_msgSigDigest_add1"},
+{ERR_FUNC(CMS_F_CMS_RECEIPTREQUEST_CREATE0),    "CMS_ReceiptRequest_create0"},
+{ERR_FUNC(CMS_F_CMS_RECEIPT_VERIFY),    "cms_Receipt_verify"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_DECRYPT),     "CMS_RecipientInfo_decrypt"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT),       "CMS_RECIPIENTINFO_KEKRI_DECRYPT"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT),       "CMS_RECIPIENTINFO_KEKRI_ENCRYPT"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID),       "CMS_RecipientInfo_kekri_get0_id"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP),        "CMS_RecipientInfo_kekri_id_cmp"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP),       "CMS_RecipientInfo_ktri_cert_cmp"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT),        "CMS_RECIPIENTINFO_KTRI_DECRYPT"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT),        "CMS_RECIPIENTINFO_KTRI_ENCRYPT"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS),      "CMS_RecipientInfo_ktri_get0_algs"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID), "CMS_RecipientInfo_ktri_get0_signer_id"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_SET0_KEY),    "CMS_RecipientInfo_set0_key"},
+{ERR_FUNC(CMS_F_CMS_RECIPIENTINFO_SET0_PKEY),   "CMS_RecipientInfo_set0_pkey"},
+{ERR_FUNC(CMS_F_CMS_SET1_SIGNERIDENTIFIER),     "cms_set1_SignerIdentifier"},
+{ERR_FUNC(CMS_F_CMS_SET_DETACHED),      "CMS_set_detached"},
+{ERR_FUNC(CMS_F_CMS_SIGN),      "CMS_sign"},
+{ERR_FUNC(CMS_F_CMS_SIGNED_DATA_INIT),  "CMS_SIGNED_DATA_INIT"},
+{ERR_FUNC(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN),   "CMS_SIGNERINFO_CONTENT_SIGN"},
+{ERR_FUNC(CMS_F_CMS_SIGNERINFO_SIGN),   "CMS_SignerInfo_sign"},
+{ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY), "CMS_SignerInfo_verify"},
+{ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY_CERT),    "CMS_SIGNERINFO_VERIFY_CERT"},
+{ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT), "CMS_SignerInfo_verify_content"},
+{ERR_FUNC(CMS_F_CMS_SIGN_RECEIPT),      "CMS_sign_receipt"},
+{ERR_FUNC(CMS_F_CMS_STREAM),    "CMS_STREAM"},
+{ERR_FUNC(CMS_F_CMS_UNCOMPRESS),        "CMS_uncompress"},
+{ERR_FUNC(CMS_F_CMS_VERIFY),    "CMS_verify"},
+{0,NULL}
+        };
+
+static ERR_STRING_DATA CMS_str_reasons[]=
+        {
+{ERR_REASON(CMS_R_ADD_SIGNER_ERROR)      ,"add signer error"},
+{ERR_REASON(CMS_R_CERTIFICATE_ALREADY_PRESENT),"certificate already present"},
+{ERR_REASON(CMS_R_CERTIFICATE_HAS_NO_KEYID),"certificate has no keyid"},
+{ERR_REASON(CMS_R_CERTIFICATE_VERIFY_ERROR),"certificate verify error"},
+{ERR_REASON(CMS_R_CIPHER_INITIALISATION_ERROR),"cipher initialisation error"},
+{ERR_REASON(CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR),"cipher parameter initialisation error"},
+{ERR_REASON(CMS_R_CMS_DATAFINAL_ERROR)   ,"cms datafinal error"},
+{ERR_REASON(CMS_R_CMS_LIB)               ,"cms lib"},
+{ERR_REASON(CMS_R_CONTENTIDENTIFIER_MISMATCH),"contentidentifier mismatch"},
+{ERR_REASON(CMS_R_CONTENT_NOT_FOUND)     ,"content not found"},
+{ERR_REASON(CMS_R_CONTENT_TYPE_MISMATCH) ,"content type mismatch"},
+{ERR_REASON(CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA),"content type not compressed data"},
+{ERR_REASON(CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA),"content type not enveloped data"},
+{ERR_REASON(CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA),"content type not signed data"},
+{ERR_REASON(CMS_R_CONTENT_VERIFY_ERROR)  ,"content verify error"},
+{ERR_REASON(CMS_R_CTRL_ERROR)            ,"ctrl error"},
+{ERR_REASON(CMS_R_CTRL_FAILURE)          ,"ctrl failure"},
+{ERR_REASON(CMS_R_DECRYPT_ERROR)         ,"decrypt error"},
+{ERR_REASON(CMS_R_DIGEST_ERROR)          ,"digest error"},
+{ERR_REASON(CMS_R_ERROR_GETTING_PUBLIC_KEY),"error getting public key"},
+{ERR_REASON(CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE),"error reading messagedigest attribute"},
+{ERR_REASON(CMS_R_ERROR_SETTING_KEY)     ,"error setting key"},
+{ERR_REASON(CMS_R_ERROR_SETTING_RECIPIENTINFO),"error setting recipientinfo"},
+{ERR_REASON(CMS_R_INVALID_ENCRYPTED_KEY_LENGTH),"invalid encrypted key length"},
+{ERR_REASON(CMS_R_INVALID_KEY_LENGTH)    ,"invalid key length"},
+{ERR_REASON(CMS_R_MD_BIO_INIT_ERROR)     ,"md bio init error"},
+{ERR_REASON(CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH),"messagedigest attribute wrong length"},
+{ERR_REASON(CMS_R_MESSAGEDIGEST_WRONG_LENGTH),"messagedigest wrong length"},
+{ERR_REASON(CMS_R_MSGSIGDIGEST_ERROR)    ,"msgsigdigest error"},
+{ERR_REASON(CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE),"msgsigdigest verification failure"},
+{ERR_REASON(CMS_R_MSGSIGDIGEST_WRONG_LENGTH),"msgsigdigest wrong length"},
+{ERR_REASON(CMS_R_NEED_ONE_SIGNER)       ,"need one signer"},
+{ERR_REASON(CMS_R_NOT_A_SIGNED_RECEIPT)  ,"not a signed receipt"},
+{ERR_REASON(CMS_R_NOT_ENCRYPTED_DATA)    ,"not encrypted data"},
+{ERR_REASON(CMS_R_NOT_KEK)               ,"not kek"},
+{ERR_REASON(CMS_R_NOT_KEY_TRANSPORT)     ,"not key transport"},
+{ERR_REASON(CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE),"not supported for this key type"},
+{ERR_REASON(CMS_R_NO_CIPHER)             ,"no cipher"},
+{ERR_REASON(CMS_R_NO_CONTENT)            ,"no content"},
+{ERR_REASON(CMS_R_NO_CONTENT_TYPE)       ,"no content type"},
+{ERR_REASON(CMS_R_NO_DEFAULT_DIGEST)     ,"no default digest"},
+{ERR_REASON(CMS_R_NO_DIGEST_SET)         ,"no digest set"},
+{ERR_REASON(CMS_R_NO_KEY)                ,"no key"},
+{ERR_REASON(CMS_R_NO_KEY_OR_CERT)        ,"no key or cert"},
+{ERR_REASON(CMS_R_NO_MATCHING_DIGEST)    ,"no matching digest"},
+{ERR_REASON(CMS_R_NO_MATCHING_RECIPIENT) ,"no matching recipient"},
+{ERR_REASON(CMS_R_NO_MATCHING_SIGNATURE) ,"no matching signature"},
+{ERR_REASON(CMS_R_NO_MSGSIGDIGEST)       ,"no msgsigdigest"},
+{ERR_REASON(CMS_R_NO_PRIVATE_KEY)        ,"no private key"},
+{ERR_REASON(CMS_R_NO_PUBLIC_KEY)         ,"no public key"},
+{ERR_REASON(CMS_R_NO_RECEIPT_REQUEST)    ,"no receipt request"},
+{ERR_REASON(CMS_R_NO_SIGNERS)            ,"no signers"},
+{ERR_REASON(CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),"private key does not match certificate"},
+{ERR_REASON(CMS_R_RECEIPT_DECODE_ERROR)  ,"receipt decode error"},
+{ERR_REASON(CMS_R_RECIPIENT_ERROR)       ,"recipient error"},
+{ERR_REASON(CMS_R_SIGNER_CERTIFICATE_NOT_FOUND),"signer certificate not found"},
+{ERR_REASON(CMS_R_SIGNFINAL_ERROR)       ,"signfinal error"},
+{ERR_REASON(CMS_R_SMIME_TEXT_ERROR)      ,"smime text error"},
+{ERR_REASON(CMS_R_STORE_INIT_ERROR)      ,"store init error"},
+{ERR_REASON(CMS_R_TYPE_NOT_COMPRESSED_DATA),"type not compressed data"},
+{ERR_REASON(CMS_R_TYPE_NOT_DATA)         ,"type not data"},
+{ERR_REASON(CMS_R_TYPE_NOT_DIGESTED_DATA),"type not digested data"},
+{ERR_REASON(CMS_R_TYPE_NOT_ENCRYPTED_DATA),"type not encrypted data"},
+{ERR_REASON(CMS_R_TYPE_NOT_ENVELOPED_DATA),"type not enveloped data"},
+{ERR_REASON(CMS_R_UNABLE_TO_FINALIZE_CONTEXT),"unable to finalize context"},
+{ERR_REASON(CMS_R_UNKNOWN_CIPHER)        ,"unknown cipher"},
+{ERR_REASON(CMS_R_UNKNOWN_DIGEST_ALGORIHM),"unknown digest algorihm"},
+{ERR_REASON(CMS_R_UNKNOWN_ID)            ,"unknown id"},
+{ERR_REASON(CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM),"unsupported compression algorithm"},
+{ERR_REASON(CMS_R_UNSUPPORTED_CONTENT_TYPE),"unsupported content type"},
+{ERR_REASON(CMS_R_UNSUPPORTED_KEK_ALGORITHM),"unsupported kek algorithm"},
+{ERR_REASON(CMS_R_UNSUPPORTED_RECIPIENT_TYPE),"unsupported recipient type"},
+{ERR_REASON(CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE),"unsupported recpientinfo type"},
+{ERR_REASON(CMS_R_UNSUPPORTED_TYPE)      ,"unsupported type"},
+{ERR_REASON(CMS_R_UNWRAP_ERROR)          ,"unwrap error"},
+{ERR_REASON(CMS_R_VERIFICATION_FAILURE)  ,"verification failure"},
+{ERR_REASON(CMS_R_WRAP_ERROR)            ,"wrap error"},
+{0,NULL}
+        };
+
+#endif
+
+void ERR_load_CMS_strings(void)
+        {
+#ifndef OPENSSL_NO_ERR
+
+        if (ERR_func_error_string(CMS_str_functs[0].error) == NULL)
+                {
+                ERR_load_strings(0,CMS_str_functs);
+                ERR_load_strings(0,CMS_str_reasons);
+                }
+#endif
+        }
diff --git a/src/lib/libssl/src/crypto/cms/cms_ess.c b/src/lib/libssl/src/crypto/cms/cms_ess.c
new file mode 100644
index 0000000000..ed34ff3228
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_ess.c
@@ -0,0 +1,420 @@
+/* crypto/cms/cms_ess.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/pem.h>
+#include <openssl/rand.h>
+#include <openssl/x509v3.h>
+#include <openssl/err.h>
+#include <openssl/cms.h>
+#include "cms_lcl.h"
+
+DECLARE_ASN1_ITEM(CMS_ReceiptRequest)
+DECLARE_ASN1_ITEM(CMS_Receipt)
+
+IMPLEMENT_ASN1_FUNCTIONS_const(CMS_ReceiptRequest)
+
+/* ESS services: for now just Signed Receipt related */
+
+int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr)
+        {
+        ASN1_STRING *str;
+        CMS_ReceiptRequest *rr = NULL;
+        if (prr)
+                *prr = NULL;
+        str = CMS_signed_get0_data_by_OBJ(si,
+                                OBJ_nid2obj(NID_id_smime_aa_receiptRequest),
+                                        -3, V_ASN1_SEQUENCE);
+        if (!str)
+                return 0;
+
+        rr = ASN1_item_unpack(str, ASN1_ITEM_rptr(CMS_ReceiptRequest));
+        if (!rr)
+                return -1;
+        if (prr)
+                *prr = rr;
+        else
+                CMS_ReceiptRequest_free(rr);
+        return 1;
+        }
+
+CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
+                                int allorfirst,
+                                STACK_OF(GENERAL_NAMES) *receiptList,
+                                STACK_OF(GENERAL_NAMES) *receiptsTo)
+        {
+        CMS_ReceiptRequest *rr = NULL;
+
+        rr = CMS_ReceiptRequest_new();
+        if (!rr)
+                goto merr;
+        if (id)
+                ASN1_STRING_set0(rr->signedContentIdentifier, id, idlen);
+        else
+                {
+                if (!ASN1_STRING_set(rr->signedContentIdentifier, NULL, 32))
+                        goto merr;
+                if (RAND_pseudo_bytes(rr->signedContentIdentifier->data, 32) 
+                                        <= 0)
+                        goto err;
+                }
+
+        sk_GENERAL_NAMES_pop_free(rr->receiptsTo, GENERAL_NAMES_free);
+        rr->receiptsTo = receiptsTo;
+
+        if (receiptList)
+                {
+                rr->receiptsFrom->type = 1;
+                rr->receiptsFrom->d.receiptList = receiptList;
+                }
+        else
+                {
+                rr->receiptsFrom->type = 0;
+                rr->receiptsFrom->d.allOrFirstTier = allorfirst;
+                }
+
+        return rr;
+
+        merr:
+        CMSerr(CMS_F_CMS_RECEIPTREQUEST_CREATE0, ERR_R_MALLOC_FAILURE);
+
+        err:
+        if (rr)
+                CMS_ReceiptRequest_free(rr);
+
+        return NULL;
+        
+        }
+
+int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr)
+        {
+        unsigned char *rrder = NULL;
+        int rrderlen, r = 0;
+
+        rrderlen = i2d_CMS_ReceiptRequest(rr, &rrder);
+        if (rrderlen < 0)
+                goto merr;
+
+        if (!CMS_signed_add1_attr_by_NID(si, NID_id_smime_aa_receiptRequest,
+                                        V_ASN1_SEQUENCE, rrder, rrderlen))
+                goto merr;
+
+        r = 1;
+
+        merr:
+        if (!r)
+                CMSerr(CMS_F_CMS_ADD1_RECEIPTREQUEST, ERR_R_MALLOC_FAILURE);
+
+        if (rrder)
+                OPENSSL_free(rrder);
+
+        return r;
+        
+        }
+
+void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
+                                        ASN1_STRING **pcid,
+                                        int *pallorfirst,
+                                        STACK_OF(GENERAL_NAMES) **plist,
+                                        STACK_OF(GENERAL_NAMES) **prto)
+        {
+        if (pcid)
+                *pcid = rr->signedContentIdentifier;
+        if (rr->receiptsFrom->type == 0)
+                {
+                if (pallorfirst)
+                        *pallorfirst = (int)rr->receiptsFrom->d.allOrFirstTier;
+                if (plist)
+                        *plist = NULL;
+                }
+        else
+                {
+                if (pallorfirst)
+                        *pallorfirst = -1;
+                if (plist)
+                        *plist = rr->receiptsFrom->d.receiptList;
+                }
+        if (prto)
+                *prto = rr->receiptsTo;
+        }
+
+/* Digest a SignerInfo structure for msgSigDigest attribute processing */
+
+static int cms_msgSigDigest(CMS_SignerInfo *si,
+                                unsigned char *dig, unsigned int *diglen)
+        {
+        const EVP_MD *md;
+        md = EVP_get_digestbyobj(si->digestAlgorithm->algorithm);
+        if (md == NULL)
+                return 0;
+        if (!ASN1_item_digest(ASN1_ITEM_rptr(CMS_Attributes_Verify), md,
+                                                si->signedAttrs, dig, diglen))
+                return 0;
+        return 1;
+        }
+
+/* Add a msgSigDigest attribute to a SignerInfo */
+
+int cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src)
+        {
+        unsigned char dig[EVP_MAX_MD_SIZE];
+        unsigned int diglen;
+        if (!cms_msgSigDigest(src, dig, &diglen))
+                {
+                CMSerr(CMS_F_CMS_MSGSIGDIGEST_ADD1, CMS_R_MSGSIGDIGEST_ERROR);
+                return 0;
+                }
+        if (!CMS_signed_add1_attr_by_NID(dest, NID_id_smime_aa_msgSigDigest,
+                                        V_ASN1_OCTET_STRING, dig, diglen))
+                {
+                CMSerr(CMS_F_CMS_MSGSIGDIGEST_ADD1, ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        return 1;
+        }
+
+/* Verify signed receipt after it has already passed normal CMS verify */
+
+int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms)
+        {
+        int r = 0, i;
+        CMS_ReceiptRequest *rr = NULL;
+        CMS_Receipt *rct = NULL;
+        STACK_OF(CMS_SignerInfo) *sis, *osis;
+        CMS_SignerInfo *si, *osi = NULL;
+        ASN1_OCTET_STRING *msig, **pcont;
+        ASN1_OBJECT *octype;
+        unsigned char dig[EVP_MAX_MD_SIZE];
+        unsigned int diglen;
+
+        /* Get SignerInfos, also checks SignedData content type */
+        osis = CMS_get0_SignerInfos(req_cms);
+        sis = CMS_get0_SignerInfos(cms);
+        if (!osis || !sis)
+                goto err;
+
+        if (sk_CMS_SignerInfo_num(sis) != 1)
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NEED_ONE_SIGNER);
+                goto err;
+                }
+
+        /* Check receipt content type */
+        if (OBJ_obj2nid(CMS_get0_eContentType(cms)) != NID_id_smime_ct_receipt)
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NOT_A_SIGNED_RECEIPT);
+                goto err;
+                }
+
+        /* Extract and decode receipt content */
+        pcont = CMS_get0_content(cms);
+        if (!pcont || !*pcont)
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_CONTENT);
+                goto err;
+                }
+
+        rct = ASN1_item_unpack(*pcont, ASN1_ITEM_rptr(CMS_Receipt));
+
+        if (!rct)       
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_RECEIPT_DECODE_ERROR);
+                goto err;
+                }
+
+        /* Locate original request */
+
+        for (i = 0; i < sk_CMS_SignerInfo_num(osis); i++)
+                {
+                osi = sk_CMS_SignerInfo_value(osis, i);
+                if (!ASN1_STRING_cmp(osi->signature,
+                                        rct->originatorSignatureValue))
+                        break;
+                }
+
+        if (i == sk_CMS_SignerInfo_num(osis))
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_MATCHING_SIGNATURE);
+                goto err;
+                }
+
+        si = sk_CMS_SignerInfo_value(sis, 0);
+
+        /* Get msgSigDigest value and compare */
+
+        msig = CMS_signed_get0_data_by_OBJ(si,
+                                OBJ_nid2obj(NID_id_smime_aa_msgSigDigest),
+                                        -3, V_ASN1_OCTET_STRING);
+
+        if (!msig)
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_MSGSIGDIGEST);
+                goto err;
+                }
+
+        if (!cms_msgSigDigest(osi, dig, &diglen))
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_MSGSIGDIGEST_ERROR);
+                goto err;
+                }
+
+        if (diglen != (unsigned int)msig->length)
+                        {
+                        CMSerr(CMS_F_CMS_RECEIPT_VERIFY,
+                                CMS_R_MSGSIGDIGEST_WRONG_LENGTH);
+                        goto err;
+                        }
+
+        if (memcmp(dig, msig->data, diglen))
+                        {
+                        CMSerr(CMS_F_CMS_RECEIPT_VERIFY,
+                                CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE);
+                        goto err;
+                        }
+
+        /* Compare content types */
+
+        octype = CMS_signed_get0_data_by_OBJ(osi,
+                                OBJ_nid2obj(NID_pkcs9_contentType),
+                                        -3, V_ASN1_OBJECT);
+        if (!octype)
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_CONTENT_TYPE);
+                goto err;
+                }
+
+        /* Compare details in receipt request */
+
+        if (OBJ_cmp(octype, rct->contentType))
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_CONTENT_TYPE_MISMATCH);
+                goto err;
+                }
+
+        /* Get original receipt request details */
+
+        if (!CMS_get1_ReceiptRequest(osi, &rr))
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_RECEIPT_REQUEST);
+                goto err;
+                }
+
+        if (ASN1_STRING_cmp(rr->signedContentIdentifier,
+                                        rct->signedContentIdentifier))
+                {
+                CMSerr(CMS_F_CMS_RECEIPT_VERIFY,
+                                        CMS_R_CONTENTIDENTIFIER_MISMATCH);
+                goto err;
+                }
+
+        r = 1;
+
+        err:
+        if (rr)
+                CMS_ReceiptRequest_free(rr);
+        if (rct)
+                M_ASN1_free_of(rct, CMS_Receipt);
+
+        return r;
+
+        }
+
+/* Encode a Receipt into an OCTET STRING read for including into content of
+ * a SignedData ContentInfo.
+ */
+
+ASN1_OCTET_STRING *cms_encode_Receipt(CMS_SignerInfo *si)
+        {
+        CMS_Receipt rct;
+        CMS_ReceiptRequest *rr = NULL;
+        ASN1_OBJECT *ctype;
+        ASN1_OCTET_STRING *os = NULL;
+
+        /* Get original receipt request */
+
+        /* Get original receipt request details */
+
+        if (!CMS_get1_ReceiptRequest(si, &rr))
+                {
+                CMSerr(CMS_F_CMS_ENCODE_RECEIPT, CMS_R_NO_RECEIPT_REQUEST);
+                goto err;
+                }
+
+        /* Get original content type */
+
+        ctype = CMS_signed_get0_data_by_OBJ(si,
+                                OBJ_nid2obj(NID_pkcs9_contentType),
+                                        -3, V_ASN1_OBJECT);
+        if (!ctype)
+                {
+                CMSerr(CMS_F_CMS_ENCODE_RECEIPT, CMS_R_NO_CONTENT_TYPE);
+                goto err;
+                }
+
+        rct.version = 1;
+        rct.contentType = ctype;
+        rct.signedContentIdentifier = rr->signedContentIdentifier;
+        rct.originatorSignatureValue = si->signature;
+
+        os = ASN1_item_pack(&rct, ASN1_ITEM_rptr(CMS_Receipt), NULL);
+
+        err:
+        if (rr)
+                CMS_ReceiptRequest_free(rr);
+
+        return os;
+
+        }
+
+
diff --git a/src/lib/libssl/src/crypto/cms/cms_io.c b/src/lib/libssl/src/crypto/cms/cms_io.c
new file mode 100644
index 0000000000..30f5ddfe6d
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_io.c
@@ -0,0 +1,140 @@
+/* crypto/cms/cms_io.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <openssl/asn1t.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include "cms.h"
+#include "cms_lcl.h"
+
+CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms)
+        {
+        return ASN1_item_d2i_bio(ASN1_ITEM_rptr(CMS_ContentInfo), bp, cms);
+        }
+
+int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms)
+        {
+        return ASN1_item_i2d_bio(ASN1_ITEM_rptr(CMS_ContentInfo), bp, cms);
+        }
+
+IMPLEMENT_PEM_rw_const(CMS, CMS_ContentInfo, PEM_STRING_CMS, CMS_ContentInfo)
+
+/* Callback for int_smime_write_ASN1 */
+
+static int cms_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
+                                        const ASN1_ITEM *it)
+        {
+        CMS_ContentInfo *cms = (CMS_ContentInfo *)val;
+        BIO *tmpbio, *cmsbio;
+        int r = 0;
+
+        if (!(flags & SMIME_DETACHED))
+                {
+                SMIME_crlf_copy(data, out, flags);
+                return 1;
+                }
+
+        /* Let CMS code prepend any needed BIOs */
+
+        cmsbio = CMS_dataInit(cms, out);
+
+        if (!cmsbio)
+                return 0;
+
+        /* Copy data across, passing through filter BIOs for processing */
+        SMIME_crlf_copy(data, cmsbio, flags);
+
+        /* Finalize structure */
+        if (CMS_dataFinal(cms, cmsbio) <= 0)
+                goto err;
+
+        r = 1;
+
+        err:
+
+        /* Now remove any digests prepended to the BIO */
+
+        while (cmsbio != out)
+                {
+                tmpbio = BIO_pop(cmsbio);
+                BIO_free(cmsbio);
+                cmsbio = tmpbio;
+                }
+
+        return 1;
+
+        }
+
+
+int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags)
+        {
+        STACK_OF(X509_ALGOR) *mdalgs;
+        int ctype_nid = OBJ_obj2nid(cms->contentType);
+        int econt_nid = OBJ_obj2nid(CMS_get0_eContentType(cms));
+        if (ctype_nid == NID_pkcs7_signed)
+                mdalgs = cms->d.signedData->digestAlgorithms;
+        else
+                mdalgs = NULL;
+
+        return int_smime_write_ASN1(bio, (ASN1_VALUE *)cms, data, flags,
+                                        ctype_nid, econt_nid, mdalgs,
+                                        cms_output_data,
+                                        ASN1_ITEM_rptr(CMS_ContentInfo));       
+        }
+
+CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont)
+        {
+        return (CMS_ContentInfo *)SMIME_read_ASN1(bio, bcont,
+                                        ASN1_ITEM_rptr(CMS_ContentInfo));
+        }
diff --git a/src/lib/libssl/src/crypto/cms/cms_lcl.h b/src/lib/libssl/src/crypto/cms/cms_lcl.h
new file mode 100644
index 0000000000..7d60fac67e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_lcl.h
@@ -0,0 +1,460 @@
+/* crypto/cms/cms_lcl.h */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#ifndef HEADER_CMS_LCL_H
+#define HEADER_CMS_LCL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <openssl/x509.h>
+
+/* Cryptographic message syntax (CMS) structures: taken
+ * from RFC3852
+ */
+
+/* Forward references */
+
+typedef struct CMS_IssuerAndSerialNumber_st CMS_IssuerAndSerialNumber;
+typedef struct CMS_EncapsulatedContentInfo_st CMS_EncapsulatedContentInfo;
+typedef struct CMS_SignerIdentifier_st CMS_SignerIdentifier;
+typedef struct CMS_SignedData_st CMS_SignedData;
+typedef struct CMS_OtherRevocationInfoFormat_st CMS_OtherRevocationInfoFormat;
+typedef struct CMS_OriginatorInfo_st CMS_OriginatorInfo;
+typedef struct CMS_EncryptedContentInfo_st CMS_EncryptedContentInfo;
+typedef struct CMS_EnvelopedData_st CMS_EnvelopedData;
+typedef struct CMS_DigestedData_st CMS_DigestedData;
+typedef struct CMS_EncryptedData_st CMS_EncryptedData;
+typedef struct CMS_AuthenticatedData_st CMS_AuthenticatedData;
+typedef struct CMS_CompressedData_st CMS_CompressedData;
+typedef struct CMS_OtherCertificateFormat_st CMS_OtherCertificateFormat;
+typedef struct CMS_KeyTransRecipientInfo_st CMS_KeyTransRecipientInfo;
+typedef struct CMS_OriginatorPublicKey_st CMS_OriginatorPublicKey;
+typedef struct CMS_OriginatorIdentifierOrKey_st CMS_OriginatorIdentifierOrKey;
+typedef struct CMS_KeyAgreeRecipientInfo_st CMS_KeyAgreeRecipientInfo;
+typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute;
+typedef struct CMS_RecipientKeyIdentifier_st CMS_RecipientKeyIdentifier;
+typedef struct CMS_KeyAgreeRecipientIdentifier_st CMS_KeyAgreeRecipientIdentifier;
+typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey;
+typedef struct CMS_KEKIdentifier_st CMS_KEKIdentifier;
+typedef struct CMS_KEKRecipientInfo_st CMS_KEKRecipientInfo;
+typedef struct CMS_PasswordRecipientInfo_st CMS_PasswordRecipientInfo;
+typedef struct CMS_OtherRecipientInfo_st CMS_OtherRecipientInfo;
+typedef struct CMS_ReceiptsFrom_st CMS_ReceiptsFrom;
+
+struct CMS_ContentInfo_st
+        {
+        ASN1_OBJECT *contentType;
+        union   {
+                ASN1_OCTET_STRING *data;
+                CMS_SignedData *signedData;
+                CMS_EnvelopedData *envelopedData;
+                CMS_DigestedData *digestedData;
+                CMS_EncryptedData *encryptedData;
+                CMS_AuthenticatedData *authenticatedData;
+                CMS_CompressedData *compressedData;
+                ASN1_TYPE *other;
+                /* Other types ... */
+                void *otherData;
+                } d;
+        };
+
+struct CMS_SignedData_st
+        {
+        long version;
+        STACK_OF(X509_ALGOR) *digestAlgorithms;
+        CMS_EncapsulatedContentInfo *encapContentInfo;
+        STACK_OF(CMS_CertificateChoices) *certificates;
+        STACK_OF(CMS_RevocationInfoChoice) *crls;
+        STACK_OF(CMS_SignerInfo) *signerInfos;
+        };
+ 
+struct CMS_EncapsulatedContentInfo_st
+        {
+        ASN1_OBJECT *eContentType;
+        ASN1_OCTET_STRING *eContent;
+        /* Set to 1 if incomplete structure only part set up */
+        int partial;
+        };
+
+struct CMS_SignerInfo_st
+        {
+        long version;
+        CMS_SignerIdentifier *sid;
+        X509_ALGOR *digestAlgorithm;
+        STACK_OF(X509_ATTRIBUTE) *signedAttrs;
+        X509_ALGOR *signatureAlgorithm;
+        ASN1_OCTET_STRING *signature;
+        STACK_OF(X509_ATTRIBUTE) *unsignedAttrs;
+        /* Signing certificate and key */
+        X509 *signer;
+        EVP_PKEY *pkey;
+        };
+
+struct CMS_SignerIdentifier_st
+        {
+        int type;
+        union   {
+                CMS_IssuerAndSerialNumber *issuerAndSerialNumber;
+                ASN1_OCTET_STRING *subjectKeyIdentifier;
+                } d;
+        };
+
+struct CMS_EnvelopedData_st
+        {
+        long version;
+        CMS_OriginatorInfo *originatorInfo;
+        STACK_OF(CMS_RecipientInfo) *recipientInfos;
+        CMS_EncryptedContentInfo *encryptedContentInfo;
+        STACK_OF(X509_ATTRIBUTE) *unprotectedAttrs;
+        };
+
+struct CMS_OriginatorInfo_st
+        {
+        STACK_OF(CMS_CertificateChoices) *certificates;
+        STACK_OF(CMS_RevocationInfoChoice) *crls;
+        };
+
+struct CMS_EncryptedContentInfo_st
+        {
+        ASN1_OBJECT *contentType;
+        X509_ALGOR *contentEncryptionAlgorithm;
+        ASN1_OCTET_STRING *encryptedContent;
+        /* Content encryption algorithm and key */
+        const EVP_CIPHER *cipher;
+        unsigned char *key;
+        size_t keylen;
+        };
+
+struct CMS_RecipientInfo_st
+        {
+        int type;
+        union   {
+                CMS_KeyTransRecipientInfo *ktri;
+                CMS_KeyAgreeRecipientInfo *kari;
+                CMS_KEKRecipientInfo *kekri;
+                CMS_PasswordRecipientInfo *pwri;
+                CMS_OtherRecipientInfo *ori;
+                } d;
+        };
+
+typedef CMS_SignerIdentifier CMS_RecipientIdentifier;
+
+struct CMS_KeyTransRecipientInfo_st
+        {
+        long version;
+        CMS_RecipientIdentifier *rid;
+        X509_ALGOR *keyEncryptionAlgorithm;
+        ASN1_OCTET_STRING *encryptedKey;
+        /* Recipient Key and cert */
+        X509 *recip;
+        EVP_PKEY *pkey;
+        };
+
+struct CMS_KeyAgreeRecipientInfo_st
+        {
+        long version;
+        CMS_OriginatorIdentifierOrKey *originator;
+        ASN1_OCTET_STRING *ukm;
+        X509_ALGOR *keyEncryptionAlgorithm;
+        STACK_OF(CMS_RecipientEncryptedKey) *recipientEncryptedKeys;
+        };
+
+struct CMS_OriginatorIdentifierOrKey_st
+        {
+        int type;
+        union   {
+                CMS_IssuerAndSerialNumber *issuerAndSerialNumber;
+                ASN1_OCTET_STRING *subjectKeyIdentifier;
+                CMS_OriginatorPublicKey *originatorKey;
+                } d;
+        };
+
+struct CMS_OriginatorPublicKey_st
+        {
+        X509_ALGOR *algorithm;
+        ASN1_BIT_STRING *publicKey;
+        };
+
+struct CMS_RecipientEncryptedKey_st
+        {
+        CMS_KeyAgreeRecipientIdentifier *rid;
+        ASN1_OCTET_STRING *encryptedKey;
+        };
+
+struct CMS_KeyAgreeRecipientIdentifier_st
+        {
+        int type;
+        union   {
+                CMS_IssuerAndSerialNumber *issuerAndSerialNumber;
+                CMS_RecipientKeyIdentifier *rKeyId;
+                } d;
+        };
+
+struct CMS_RecipientKeyIdentifier_st
+        {
+        ASN1_OCTET_STRING *subjectKeyIdentifier;
+        ASN1_GENERALIZEDTIME *date;
+        CMS_OtherKeyAttribute *other;
+        };
+
+struct CMS_KEKRecipientInfo_st
+        {
+        long version;
+        CMS_KEKIdentifier *kekid;
+        X509_ALGOR *keyEncryptionAlgorithm;
+        ASN1_OCTET_STRING *encryptedKey;
+        /* Extra info: symmetric key to use */
+        unsigned char *key;
+        size_t keylen;
+        };
+
+struct CMS_KEKIdentifier_st
+        {
+        ASN1_OCTET_STRING *keyIdentifier;
+        ASN1_GENERALIZEDTIME *date;
+        CMS_OtherKeyAttribute *other;
+        };
+
+struct CMS_PasswordRecipientInfo_st
+        {
+        long version;
+        X509_ALGOR *keyDerivationAlgorithm;
+        X509_ALGOR *keyEncryptionAlgorithm;
+        ASN1_OCTET_STRING *encryptedKey;
+        };
+
+struct CMS_OtherRecipientInfo_st
+        {
+        ASN1_OBJECT *oriType;
+        ASN1_TYPE *oriValue;
+        };
+
+struct CMS_DigestedData_st
+        {
+        long version;
+        X509_ALGOR *digestAlgorithm;
+        CMS_EncapsulatedContentInfo *encapContentInfo;
+        ASN1_OCTET_STRING *digest;
+        };
+
+struct CMS_EncryptedData_st
+        {
+        long version;
+        CMS_EncryptedContentInfo *encryptedContentInfo;
+        STACK_OF(X509_ATTRIBUTE) *unprotectedAttrs;
+        };
+
+struct CMS_AuthenticatedData_st
+        {
+        long version;
+        CMS_OriginatorInfo *originatorInfo;
+        STACK_OF(CMS_RecipientInfo) *recipientInfos;
+        X509_ALGOR *macAlgorithm;
+        X509_ALGOR *digestAlgorithm;
+        CMS_EncapsulatedContentInfo *encapContentInfo;
+        STACK_OF(X509_ATTRIBUTE) *authAttrs;
+        ASN1_OCTET_STRING *mac;
+        STACK_OF(X509_ATTRIBUTE) *unauthAttrs;
+        };
+
+struct CMS_CompressedData_st
+        {
+        long version;
+        X509_ALGOR *compressionAlgorithm;
+        STACK_OF(CMS_RecipientInfo) *recipientInfos;
+        CMS_EncapsulatedContentInfo *encapContentInfo;
+        };
+
+struct CMS_RevocationInfoChoice_st
+        {
+        int type;
+        union   {
+                X509_CRL *crl;
+                CMS_OtherRevocationInfoFormat *other;
+                } d;
+        };
+
+#define CMS_REVCHOICE_CRL               0
+#define CMS_REVCHOICE_OTHER             1
+
+struct CMS_OtherRevocationInfoFormat_st
+        {
+        ASN1_OBJECT *otherRevInfoFormat;
+        ASN1_TYPE *otherRevInfo;
+        };
+
+struct CMS_CertificateChoices
+        {
+        int type;
+                union {
+                X509 *certificate;
+                ASN1_STRING *extendedCertificate;       /* Obsolete */
+                ASN1_STRING *v1AttrCert;        /* Left encoded for now */
+                ASN1_STRING *v2AttrCert;        /* Left encoded for now */
+                CMS_OtherCertificateFormat *other;
+                } d;
+        };
+
+#define CMS_CERTCHOICE_CERT             0
+#define CMS_CERTCHOICE_EXCERT           1
+#define CMS_CERTCHOICE_V1ACERT          2
+#define CMS_CERTCHOICE_V2ACERT          3
+#define CMS_CERTCHOICE_OTHER            4
+
+struct CMS_OtherCertificateFormat_st
+        {
+        ASN1_OBJECT *otherCertFormat;
+        ASN1_TYPE *otherCert;
+        };
+
+/* This is also defined in pkcs7.h but we duplicate it
+ * to allow the CMS code to be independent of PKCS#7
+ */
+
+struct CMS_IssuerAndSerialNumber_st
+        {
+        X509_NAME *issuer;
+        ASN1_INTEGER *serialNumber;
+        };
+
+struct CMS_OtherKeyAttribute_st
+        {
+        ASN1_OBJECT *keyAttrId;
+        ASN1_TYPE *keyAttr;
+        };
+
+/* ESS structures */
+
+#ifdef HEADER_X509V3_H
+
+struct CMS_ReceiptRequest_st
+        {
+        ASN1_OCTET_STRING *signedContentIdentifier;
+        CMS_ReceiptsFrom *receiptsFrom;
+        STACK_OF(GENERAL_NAMES) *receiptsTo;
+        };
+
+
+struct CMS_ReceiptsFrom_st
+        {
+        int type;
+        union
+                {
+                long allOrFirstTier;
+                STACK_OF(GENERAL_NAMES) *receiptList;
+                } d;
+        };
+#endif
+
+struct CMS_Receipt_st
+        {
+        long version;
+        ASN1_OBJECT *contentType;
+        ASN1_OCTET_STRING *signedContentIdentifier;
+        ASN1_OCTET_STRING *originatorSignatureValue;
+        };
+
+DECLARE_ASN1_ITEM(CMS_SignerInfo)
+DECLARE_ASN1_ITEM(CMS_IssuerAndSerialNumber)
+DECLARE_ASN1_ITEM(CMS_Attributes_Sign)
+DECLARE_ASN1_ITEM(CMS_Attributes_Verify)
+DECLARE_ASN1_ALLOC_FUNCTIONS(CMS_IssuerAndSerialNumber)
+
+#define CMS_SIGNERINFO_ISSUER_SERIAL    0
+#define CMS_SIGNERINFO_KEYIDENTIFIER    1
+
+#define CMS_RECIPINFO_ISSUER_SERIAL     0
+#define CMS_RECIPINFO_KEYIDENTIFIER     1
+
+BIO *cms_content_bio(CMS_ContentInfo *cms);
+
+CMS_ContentInfo *cms_Data_create(void);
+
+CMS_ContentInfo *cms_DigestedData_create(const EVP_MD *md);
+BIO *cms_DigestedData_init_bio(CMS_ContentInfo *cms);
+int cms_DigestedData_do_final(CMS_ContentInfo *cms, BIO *chain, int verify);
+
+BIO *cms_SignedData_init_bio(CMS_ContentInfo *cms);
+int cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain);
+int cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert, int type);
+int cms_SignerIdentifier_get0_signer_id(CMS_SignerIdentifier *sid,
+                                        ASN1_OCTET_STRING **keyid,
+                                        X509_NAME **issuer, ASN1_INTEGER **sno);
+int cms_SignerIdentifier_cert_cmp(CMS_SignerIdentifier *sid, X509 *cert);
+
+CMS_ContentInfo *cms_CompressedData_create(int comp_nid);
+BIO *cms_CompressedData_init_bio(CMS_ContentInfo *cms);
+
+void cms_DigestAlgorithm_set(X509_ALGOR *alg, const EVP_MD *md);
+BIO *cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm);
+int cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
+                                        X509_ALGOR *mdalg);
+
+BIO *cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec);
+BIO *cms_EncryptedData_init_bio(CMS_ContentInfo *cms);
+int cms_EncryptedContent_init(CMS_EncryptedContentInfo *ec, 
+                                const EVP_CIPHER *cipher,
+                                const unsigned char *key, size_t keylen);
+
+int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms);
+int cms_msgSigDigest_add1(CMS_SignerInfo *dest, CMS_SignerInfo *src);
+ASN1_OCTET_STRING *cms_encode_Receipt(CMS_SignerInfo *si);
+
+BIO *cms_EnvelopedData_init_bio(CMS_ContentInfo *cms);
+        
+#ifdef  __cplusplus
+}
+#endif
+#endif
diff --git a/src/lib/libssl/src/crypto/cms/cms_lib.c b/src/lib/libssl/src/crypto/cms/cms_lib.c
new file mode 100644
index 0000000000..8e6c1d29a5
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_lib.c
@@ -0,0 +1,623 @@
+/* crypto/cms/cms_lib.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <openssl/asn1t.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include "cms.h"
+#include "cms_lcl.h"
+
+IMPLEMENT_ASN1_FUNCTIONS_const(CMS_ContentInfo)
+
+DECLARE_ASN1_ITEM(CMS_CertificateChoices)
+DECLARE_ASN1_ITEM(CMS_RevocationInfoChoice)
+DECLARE_STACK_OF(CMS_CertificateChoices)
+DECLARE_STACK_OF(CMS_RevocationInfoChoice)
+
+const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms)
+        {
+        return cms->contentType;
+        }
+
+CMS_ContentInfo *cms_Data_create(void)
+        {
+        CMS_ContentInfo *cms;
+        cms = CMS_ContentInfo_new();
+        if (cms)
+                {
+                cms->contentType = OBJ_nid2obj(NID_pkcs7_data);
+                /* Never detached */
+                CMS_set_detached(cms, 0);
+                }
+        return cms;
+        }
+
+BIO *cms_content_bio(CMS_ContentInfo *cms)
+        {
+        ASN1_OCTET_STRING **pos = CMS_get0_content(cms);
+        if (!pos)
+                return NULL;
+        /* If content detached data goes nowhere: create NULL BIO */
+        if (!*pos)
+                return BIO_new(BIO_s_null());
+        /* If content not detached and created return memory BIO
+         */
+        if (!*pos || ((*pos)->flags == ASN1_STRING_FLAG_CONT))
+                return BIO_new(BIO_s_mem());
+        /* Else content was read in: return read only BIO for it */
+        return BIO_new_mem_buf((*pos)->data, (*pos)->length);
+        }
+
+BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont)
+        {
+        BIO *cmsbio, *cont;
+        if (icont)
+                cont = icont;
+        else
+                cont = cms_content_bio(cms);
+        if (!cont)
+                {
+                CMSerr(CMS_F_CMS_DATAINIT, CMS_R_NO_CONTENT);
+                return NULL;
+                }
+        switch (OBJ_obj2nid(cms->contentType))
+                {
+
+                case NID_pkcs7_data:
+                return cont;
+
+                case NID_pkcs7_signed:
+                cmsbio = cms_SignedData_init_bio(cms);
+                break;
+
+                case NID_pkcs7_digest:
+                cmsbio = cms_DigestedData_init_bio(cms);
+                break;
+#ifdef ZLIB
+                case NID_id_smime_ct_compressedData:
+                cmsbio = cms_CompressedData_init_bio(cms);
+                break;
+#endif
+
+                case NID_pkcs7_encrypted:
+                cmsbio = cms_EncryptedData_init_bio(cms);
+                break;
+
+                case NID_pkcs7_enveloped:
+                cmsbio = cms_EnvelopedData_init_bio(cms);
+                break;
+
+                default:
+                CMSerr(CMS_F_CMS_DATAINIT, CMS_R_UNSUPPORTED_TYPE);
+                return NULL;
+                }
+
+        if (cmsbio)
+                return BIO_push(cmsbio, cont);
+
+        if (!icont)
+                BIO_free(cont);
+        return NULL;
+
+        }
+
+int CMS_dataFinal(CMS_ContentInfo *cms, BIO *cmsbio)
+        {
+        ASN1_OCTET_STRING **pos = CMS_get0_content(cms);
+        if (!pos)
+                return 0;
+        /* If ebmedded content find memory BIO and set content */
+        if (*pos && ((*pos)->flags & ASN1_STRING_FLAG_CONT))
+                {
+                BIO *mbio;
+                unsigned char *cont;
+                long contlen;
+                mbio = BIO_find_type(cmsbio, BIO_TYPE_MEM);
+                if (!mbio)
+                        {
+                        CMSerr(CMS_F_CMS_DATAFINAL, CMS_R_CONTENT_NOT_FOUND);
+                        return 0;
+                        }
+                contlen = BIO_get_mem_data(mbio, &cont);
+                /* Set bio as read only so its content can't be clobbered */
+                BIO_set_flags(mbio, BIO_FLAGS_MEM_RDONLY);
+                BIO_set_mem_eof_return(mbio, 0);
+                ASN1_STRING_set0(*pos, cont, contlen);
+                (*pos)->flags &= ~ASN1_STRING_FLAG_CONT;
+                }
+
+        switch (OBJ_obj2nid(cms->contentType))
+                {
+
+                case NID_pkcs7_data:
+                case NID_pkcs7_enveloped:
+                case NID_pkcs7_encrypted:
+                case NID_id_smime_ct_compressedData:
+                /* Nothing to do */
+                return 1;
+
+                case NID_pkcs7_signed:
+                return cms_SignedData_final(cms, cmsbio);
+
+                case NID_pkcs7_digest:
+                return cms_DigestedData_do_final(cms, cmsbio, 0);
+
+                default:
+                CMSerr(CMS_F_CMS_DATAFINAL, CMS_R_UNSUPPORTED_TYPE);
+                return 0;
+                }
+        }
+
+/* Return an OCTET STRING pointer to content. This allows it to
+ * be accessed or set later.
+ */
+
+ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms)
+        {
+        switch (OBJ_obj2nid(cms->contentType))
+                {
+
+                case NID_pkcs7_data:
+                return &cms->d.data;
+
+                case NID_pkcs7_signed:
+                return &cms->d.signedData->encapContentInfo->eContent;
+
+                case NID_pkcs7_enveloped:
+                return &cms->d.envelopedData->encryptedContentInfo->encryptedContent;
+
+                case NID_pkcs7_digest:
+                return &cms->d.digestedData->encapContentInfo->eContent;
+
+                case NID_pkcs7_encrypted:
+                return &cms->d.encryptedData->encryptedContentInfo->encryptedContent;
+
+                case NID_id_smime_ct_authData:
+                return &cms->d.authenticatedData->encapContentInfo->eContent;
+
+                case NID_id_smime_ct_compressedData:
+                return &cms->d.compressedData->encapContentInfo->eContent;
+
+                default:
+                if (cms->d.other->type == V_ASN1_OCTET_STRING)
+                        return &cms->d.other->value.octet_string;
+                CMSerr(CMS_F_CMS_GET0_CONTENT, CMS_R_UNSUPPORTED_CONTENT_TYPE);
+                return NULL;
+
+                }
+        }
+
+/* Return an ASN1_OBJECT pointer to content type. This allows it to
+ * be accessed or set later.
+ */
+
+static ASN1_OBJECT **cms_get0_econtent_type(CMS_ContentInfo *cms)
+        {
+        switch (OBJ_obj2nid(cms->contentType))
+                {
+
+                case NID_pkcs7_signed:
+                return &cms->d.signedData->encapContentInfo->eContentType;
+
+                case NID_pkcs7_enveloped:
+                return &cms->d.envelopedData->encryptedContentInfo->contentType;
+
+                case NID_pkcs7_digest:
+                return &cms->d.digestedData->encapContentInfo->eContentType;
+
+                case NID_pkcs7_encrypted:
+                return &cms->d.encryptedData->encryptedContentInfo->contentType;
+
+                case NID_id_smime_ct_authData:
+                return &cms->d.authenticatedData->encapContentInfo->eContentType;
+
+                case NID_id_smime_ct_compressedData:
+                return &cms->d.compressedData->encapContentInfo->eContentType;
+
+                default:
+                CMSerr(CMS_F_CMS_GET0_ECONTENT_TYPE,
+                                        CMS_R_UNSUPPORTED_CONTENT_TYPE);
+                return NULL;
+
+                }
+        }
+
+const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms)
+        {
+        ASN1_OBJECT **petype;
+        petype = cms_get0_econtent_type(cms);
+        if (petype)
+                return *petype;
+        return NULL;
+        }
+
+int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid)
+        {
+        ASN1_OBJECT **petype, *etype;
+        petype = cms_get0_econtent_type(cms);
+        if (!petype)
+                return 0;
+        if (!oid)
+                return 1;
+        etype = OBJ_dup(oid);
+        if (!etype)
+                return 0;
+        ASN1_OBJECT_free(*petype);
+        *petype = etype;
+        return 1;
+        }
+
+int CMS_is_detached(CMS_ContentInfo *cms)
+        {
+        ASN1_OCTET_STRING **pos;
+        pos = CMS_get0_content(cms);
+        if (!pos)
+                return -1;
+        if (*pos)
+                return 0;
+        return 1;
+        }
+
+int CMS_set_detached(CMS_ContentInfo *cms, int detached)
+        {
+        ASN1_OCTET_STRING **pos;
+        pos = CMS_get0_content(cms);
+        if (!pos)
+                return 0;
+        if (detached)
+                {
+                if (*pos)
+                        {
+                        ASN1_OCTET_STRING_free(*pos);
+                        *pos = NULL;
+                        }
+                return 1;
+                }
+        if (!*pos)
+                *pos = ASN1_OCTET_STRING_new();
+        if (*pos)
+                {
+                /* NB: special flag to show content is created and not
+                 * read in.
+                 */
+                (*pos)->flags |= ASN1_STRING_FLAG_CONT;
+                return 1;
+                }
+        CMSerr(CMS_F_CMS_SET_DETACHED, ERR_R_MALLOC_FAILURE);
+        return 0;
+        }
+
+/* Set up an X509_ALGOR DigestAlgorithmIdentifier from an EVP_MD */
+
+void cms_DigestAlgorithm_set(X509_ALGOR *alg, const EVP_MD *md)
+        {
+        int param_type;
+
+        switch (EVP_MD_type(md))
+                {
+                case NID_sha1:
+                case NID_sha224:
+                case NID_sha256:
+                case NID_sha384:
+                case NID_sha512:
+                param_type = V_ASN1_UNDEF;
+                break;
+        
+                default:
+                param_type = V_ASN1_NULL;
+                break;
+                }
+
+        X509_ALGOR_set0(alg, OBJ_nid2obj(EVP_MD_type(md)), param_type, NULL);
+
+        }
+
+/* Create a digest BIO from an X509_ALGOR structure */
+
+BIO *cms_DigestAlgorithm_init_bio(X509_ALGOR *digestAlgorithm)
+        {
+        BIO *mdbio = NULL;
+        ASN1_OBJECT *digestoid;
+        const EVP_MD *digest;
+        X509_ALGOR_get0(&digestoid, NULL, NULL, digestAlgorithm);
+        digest = EVP_get_digestbyobj(digestoid);
+        if (!digest)
+                {
+                CMSerr(CMS_F_CMS_DIGESTALGORITHM_INIT_BIO,
+                                CMS_R_UNKNOWN_DIGEST_ALGORIHM);
+                goto err;       
+                }
+        mdbio = BIO_new(BIO_f_md());
+        if (!mdbio || !BIO_set_md(mdbio, digest))
+                {
+                CMSerr(CMS_F_CMS_DIGESTALGORITHM_INIT_BIO,
+                                CMS_R_MD_BIO_INIT_ERROR);
+                goto err;       
+                }
+        return mdbio;
+        err:
+        if (mdbio)
+                BIO_free(mdbio);
+        return NULL;
+        }
+
+/* Locate a message digest content from a BIO chain based on SignerInfo */
+
+int cms_DigestAlgorithm_find_ctx(EVP_MD_CTX *mctx, BIO *chain,
+                                        X509_ALGOR *mdalg)
+        {
+        int nid;
+        ASN1_OBJECT *mdoid;
+        X509_ALGOR_get0(&mdoid, NULL, NULL, mdalg);
+        nid = OBJ_obj2nid(mdoid);
+        /* Look for digest type to match signature */
+        for (;;)
+                {
+                EVP_MD_CTX *mtmp;
+                chain = BIO_find_type(chain, BIO_TYPE_MD);
+                if (chain == NULL)
+                        {
+                        CMSerr(CMS_F_CMS_DIGESTALGORITHM_FIND_CTX,
+                                                CMS_R_NO_MATCHING_DIGEST);
+                        return 0;
+                        }
+                BIO_get_md_ctx(chain, &mtmp);
+                if (EVP_MD_CTX_type(mtmp) == nid)
+                        {
+                        EVP_MD_CTX_copy_ex(mctx, mtmp);
+                        return 1;
+                        }
+                chain = BIO_next(chain);
+                }
+        }
+
+static STACK_OF(CMS_CertificateChoices) **cms_get0_certificate_choices(CMS_ContentInfo *cms)
+        {
+        switch (OBJ_obj2nid(cms->contentType))
+                {
+
+                case NID_pkcs7_signed:
+                return &cms->d.signedData->certificates;
+
+                case NID_pkcs7_enveloped:
+                return &cms->d.envelopedData->originatorInfo->certificates;
+
+                default:
+                CMSerr(CMS_F_CMS_GET0_CERTIFICATE_CHOICES,
+                                        CMS_R_UNSUPPORTED_CONTENT_TYPE);
+                return NULL;
+
+                }
+        }
+
+CMS_CertificateChoices *CMS_add0_CertificateChoices(CMS_ContentInfo *cms)
+        {
+        STACK_OF(CMS_CertificateChoices) **pcerts;
+        CMS_CertificateChoices *cch;
+        pcerts = cms_get0_certificate_choices(cms);
+        if (!pcerts)
+                return NULL;
+        if (!*pcerts)
+                *pcerts = sk_CMS_CertificateChoices_new_null();
+        if (!*pcerts)
+                return NULL;
+        cch = M_ASN1_new_of(CMS_CertificateChoices);
+        if (!cch)
+                return NULL;
+        if (!sk_CMS_CertificateChoices_push(*pcerts, cch))
+                {
+                M_ASN1_free_of(cch, CMS_CertificateChoices);
+                return NULL;
+                }
+        return cch;
+        }
+
+int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert)
+        {
+        CMS_CertificateChoices *cch;
+        STACK_OF(CMS_CertificateChoices) **pcerts;
+        int i;
+        pcerts = cms_get0_certificate_choices(cms);
+        if (!pcerts)
+                return 0;
+        if (!pcerts)
+                return 0;
+        for (i = 0; i < sk_CMS_CertificateChoices_num(*pcerts); i++)
+                {
+                cch = sk_CMS_CertificateChoices_value(*pcerts, i);
+                if (cch->type == CMS_CERTCHOICE_CERT)
+                        {
+                        if (!X509_cmp(cch->d.certificate, cert))
+                                {
+                                CMSerr(CMS_F_CMS_ADD0_CERT, 
+                                        CMS_R_CERTIFICATE_ALREADY_PRESENT);
+                                return 0;
+                                }
+                        }
+                }
+        cch = CMS_add0_CertificateChoices(cms);
+        if (!cch)
+                return 0;
+        cch->type = CMS_CERTCHOICE_CERT;
+        cch->d.certificate = cert;
+        return 1;
+        }
+
+int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert)
+        {
+        int r;
+        r = CMS_add0_cert(cms, cert);
+        if (r > 0)
+                CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509);
+        return r;
+        }
+
+static STACK_OF(CMS_RevocationInfoChoice) **cms_get0_revocation_choices(CMS_ContentInfo *cms)
+        {
+        switch (OBJ_obj2nid(cms->contentType))
+                {
+
+                case NID_pkcs7_signed:
+                return &cms->d.signedData->crls;
+
+                case NID_pkcs7_enveloped:
+                return &cms->d.envelopedData->originatorInfo->crls;
+
+                default:
+                CMSerr(CMS_F_CMS_GET0_REVOCATION_CHOICES,
+                                        CMS_R_UNSUPPORTED_CONTENT_TYPE);
+                return NULL;
+
+                }
+        }
+
+CMS_RevocationInfoChoice *CMS_add0_RevocationInfoChoice(CMS_ContentInfo *cms)
+        {
+        STACK_OF(CMS_RevocationInfoChoice) **pcrls;
+        CMS_RevocationInfoChoice *rch;
+        pcrls = cms_get0_revocation_choices(cms);
+        if (!pcrls)
+                return NULL;
+        if (!*pcrls)
+                *pcrls = sk_CMS_RevocationInfoChoice_new_null();
+        if (!*pcrls)
+                return NULL;
+        rch = M_ASN1_new_of(CMS_RevocationInfoChoice);
+        if (!rch)
+                return NULL;
+        if (!sk_CMS_RevocationInfoChoice_push(*pcrls, rch))
+                {
+                M_ASN1_free_of(rch, CMS_RevocationInfoChoice);
+                return NULL;
+                }
+        return rch;
+        }
+
+int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl)
+        {
+        CMS_RevocationInfoChoice *rch;
+        rch = CMS_add0_RevocationInfoChoice(cms);
+        if (!rch)
+                return 0;
+        rch->type = CMS_REVCHOICE_CRL;
+        rch->d.crl = crl;
+        return 1;
+        }
+
+STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms)
+        {
+        STACK_OF(X509) *certs = NULL;
+        CMS_CertificateChoices *cch;
+        STACK_OF(CMS_CertificateChoices) **pcerts;
+        int i;
+        pcerts = cms_get0_certificate_choices(cms);
+        if (!pcerts)
+                return NULL;
+        for (i = 0; i < sk_CMS_CertificateChoices_num(*pcerts); i++)
+                {
+                cch = sk_CMS_CertificateChoices_value(*pcerts, i);
+                if (cch->type == 0)
+                        {
+                        if (!certs)
+                                {
+                                certs = sk_X509_new_null();
+                                if (!certs)
+                                        return NULL;
+                                }
+                        if (!sk_X509_push(certs, cch->d.certificate))
+                                {
+                                sk_X509_pop_free(certs, X509_free);
+                                return NULL;
+                                }
+                        CRYPTO_add(&cch->d.certificate->references,
+                                                1, CRYPTO_LOCK_X509);
+                        }
+                }
+        return certs;
+
+        }
+
+STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms)
+        {
+        STACK_OF(X509_CRL) *crls = NULL;
+        STACK_OF(CMS_RevocationInfoChoice) **pcrls;
+        CMS_RevocationInfoChoice *rch;
+        int i;
+        pcrls = cms_get0_revocation_choices(cms);
+        if (!pcrls)
+                return NULL;
+        for (i = 0; i < sk_CMS_RevocationInfoChoice_num(*pcrls); i++)
+                {
+                rch = sk_CMS_RevocationInfoChoice_value(*pcrls, i);
+                if (rch->type == 0)
+                        {
+                        if (!crls)
+                                {
+                                crls = sk_X509_CRL_new_null();
+                                if (!crls)
+                                        return NULL;
+                                }
+                        if (!sk_X509_CRL_push(crls, rch->d.crl))
+                                {
+                                sk_X509_CRL_pop_free(crls, X509_CRL_free);
+                                return NULL;
+                                }
+                        CRYPTO_add(&rch->d.crl->references,
+                                                1, CRYPTO_LOCK_X509_CRL);
+                        }
+                }
+        return crls;
+        }
diff --git a/src/lib/libssl/src/crypto/cms/cms_sd.c b/src/lib/libssl/src/crypto/cms/cms_sd.c
new file mode 100644
index 0000000000..591bfbec33
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_sd.c
@@ -0,0 +1,1014 @@
+/* crypto/cms/cms_sd.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/pem.h>
+#include <openssl/x509v3.h>
+#include <openssl/err.h>
+#include <openssl/cms.h>
+#include "cms_lcl.h"
+
+/* CMS SignedData Utilities */
+
+DECLARE_ASN1_ITEM(CMS_SignedData)
+
+static CMS_SignedData *cms_get0_signed(CMS_ContentInfo *cms)
+        {
+        if (OBJ_obj2nid(cms->contentType) != NID_pkcs7_signed)
+                {
+                CMSerr(CMS_F_CMS_GET0_SIGNED, CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA);
+                return NULL;
+                }
+        return cms->d.signedData;
+        }
+
+static CMS_SignedData *cms_signed_data_init(CMS_ContentInfo *cms)
+        {
+        if (cms->d.other == NULL)
+                {
+                cms->d.signedData = M_ASN1_new_of(CMS_SignedData);
+                if (!cms->d.signedData)
+                        {
+                        CMSerr(CMS_F_CMS_SIGNED_DATA_INIT, ERR_R_MALLOC_FAILURE);
+                        return NULL;
+                        }
+                cms->d.signedData->version = 1;
+                cms->d.signedData->encapContentInfo->eContentType =
+                                                OBJ_nid2obj(NID_pkcs7_data);
+                cms->d.signedData->encapContentInfo->partial = 1;
+                ASN1_OBJECT_free(cms->contentType);
+                cms->contentType = OBJ_nid2obj(NID_pkcs7_signed);
+                return cms->d.signedData;
+                }
+        return cms_get0_signed(cms);
+        }
+
+/* Just initialize SignedData e.g. for certs only structure */
+
+int CMS_SignedData_init(CMS_ContentInfo *cms)
+        {
+        if (cms_signed_data_init(cms))
+                return 1;
+        else
+                return 0;
+        }
+
+/* Check structures and fixup version numbers (if necessary) */
+
+static void cms_sd_set_version(CMS_SignedData *sd)
+        {
+        int i;
+        CMS_CertificateChoices *cch;
+        CMS_RevocationInfoChoice *rch;
+        CMS_SignerInfo *si;
+
+        for (i = 0; i < sk_CMS_CertificateChoices_num(sd->certificates); i++)
+                {
+                cch = sk_CMS_CertificateChoices_value(sd->certificates, i);
+                if (cch->type == CMS_CERTCHOICE_OTHER)
+                        {
+                        if (sd->version < 5)
+                                sd->version = 5;
+                        }
+                else if (cch->type == CMS_CERTCHOICE_V2ACERT)
+                        {
+                        if (sd->version < 4)
+                                sd->version = 4;
+                        }
+                else if (cch->type == CMS_CERTCHOICE_V1ACERT)
+                        {
+                        if (sd->version < 3)
+                                sd->version = 3;
+                        }
+                }
+
+        for (i = 0; i < sk_CMS_RevocationInfoChoice_num(sd->crls); i++)
+                {
+                rch = sk_CMS_RevocationInfoChoice_value(sd->crls, i);
+                if (rch->type == CMS_REVCHOICE_OTHER)
+                        {
+                        if (sd->version < 5)
+                                sd->version = 5;
+                        }
+                }
+
+        if ((OBJ_obj2nid(sd->encapContentInfo->eContentType) != NID_pkcs7_data)
+                        && (sd->version < 3))
+                sd->version = 3;
+
+        for (i = 0; i < sk_CMS_SignerInfo_num(sd->signerInfos); i++)
+                {
+                si = sk_CMS_SignerInfo_value(sd->signerInfos, i);
+                if (si->sid->type == CMS_SIGNERINFO_KEYIDENTIFIER)
+                        {
+                        if (si->version < 3)
+                                si->version = 3;
+                        if (sd->version < 3)
+                                sd->version = 3;
+                        }
+                else
+                        sd->version = 1;
+                }
+
+        if (sd->version < 1)
+                sd->version = 1;
+
+        }
+        
+/* Copy an existing messageDigest value */
+
+static int cms_copy_messageDigest(CMS_ContentInfo *cms, CMS_SignerInfo *si)
+        {
+        STACK_OF(CMS_SignerInfo) *sinfos;
+        CMS_SignerInfo *sitmp;
+        int i;
+        sinfos = CMS_get0_SignerInfos(cms);
+        for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++)
+                {
+                ASN1_OCTET_STRING *messageDigest;
+                sitmp = sk_CMS_SignerInfo_value(sinfos, i);
+                if (sitmp == si)
+                        continue;
+                if (CMS_signed_get_attr_count(sitmp) < 0)
+                        continue;
+                if (OBJ_cmp(si->digestAlgorithm->algorithm,
+                                sitmp->digestAlgorithm->algorithm))
+                        continue;
+                messageDigest = CMS_signed_get0_data_by_OBJ(sitmp,
+                                        OBJ_nid2obj(NID_pkcs9_messageDigest),
+                                        -3, V_ASN1_OCTET_STRING);
+                if (!messageDigest)
+                        {
+                        CMSerr(CMS_F_CMS_COPY_MESSAGEDIGEST,
+                                CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
+                        return 0;
+                        }
+
+                if (CMS_signed_add1_attr_by_NID(si, NID_pkcs9_messageDigest,
+                                                V_ASN1_OCTET_STRING,
+                                                messageDigest, -1))
+                        return 1;
+                else
+                        return 0;
+                }
+                CMSerr(CMS_F_CMS_COPY_MESSAGEDIGEST, CMS_R_NO_MATCHING_DIGEST);
+                return 0;
+        }
+
+int cms_set1_SignerIdentifier(CMS_SignerIdentifier *sid, X509 *cert, int type)
+        {
+        switch(type)
+                {
+                case CMS_SIGNERINFO_ISSUER_SERIAL:
+                sid->d.issuerAndSerialNumber =
+                        M_ASN1_new_of(CMS_IssuerAndSerialNumber);
+                if (!sid->d.issuerAndSerialNumber)
+                        goto merr;
+                if (!X509_NAME_set(&sid->d.issuerAndSerialNumber->issuer,
+                                        X509_get_issuer_name(cert)))
+                        goto merr;
+                ASN1_STRING_free(sid->d.issuerAndSerialNumber->serialNumber);
+                sid->d.issuerAndSerialNumber->serialNumber =
+                                ASN1_STRING_dup(X509_get_serialNumber(cert));
+                if(!sid->d.issuerAndSerialNumber->serialNumber)
+                        goto merr;
+                break;
+
+                case CMS_SIGNERINFO_KEYIDENTIFIER:
+                if (!cert->skid)
+                        {
+                        CMSerr(CMS_F_CMS_SET1_SIGNERIDENTIFIER,
+                                        CMS_R_CERTIFICATE_HAS_NO_KEYID);
+                        return 0;
+                        }
+                sid->d.subjectKeyIdentifier = ASN1_STRING_dup(cert->skid);
+                if (!sid->d.subjectKeyIdentifier)
+                        goto merr;
+                break;
+
+                default:
+                CMSerr(CMS_F_CMS_SET1_SIGNERIDENTIFIER, CMS_R_UNKNOWN_ID);
+                return 0;
+                }
+
+        sid->type = type;
+
+        return 1;
+
+        merr:
+        CMSerr(CMS_F_CMS_SET1_SIGNERIDENTIFIER, ERR_R_MALLOC_FAILURE);
+        return 0;
+
+        }
+
+int cms_SignerIdentifier_get0_signer_id(CMS_SignerIdentifier *sid,
+                                        ASN1_OCTET_STRING **keyid,
+                                        X509_NAME **issuer, ASN1_INTEGER **sno)
+        {
+        if (sid->type == CMS_SIGNERINFO_ISSUER_SERIAL)
+                {
+                if (issuer)
+                        *issuer = sid->d.issuerAndSerialNumber->issuer;
+                if (sno)
+                        *sno = sid->d.issuerAndSerialNumber->serialNumber;
+                }
+        else if (sid->type == CMS_SIGNERINFO_KEYIDENTIFIER)
+                {
+                if (keyid)
+                        *keyid = sid->d.subjectKeyIdentifier;
+                }
+        else
+                return 0;
+        return 1;
+        }
+
+int cms_SignerIdentifier_cert_cmp(CMS_SignerIdentifier *sid, X509 *cert)
+        {
+        int ret;
+        if (sid->type == CMS_SIGNERINFO_ISSUER_SERIAL)
+                {
+                ret = X509_NAME_cmp(sid->d.issuerAndSerialNumber->issuer,
+                                        X509_get_issuer_name(cert));
+                if (ret)
+                        return ret;
+                return ASN1_INTEGER_cmp(sid->d.issuerAndSerialNumber->serialNumber,
+                                        X509_get_serialNumber(cert));
+                }
+        else if (sid->type == CMS_SIGNERINFO_KEYIDENTIFIER)
+                {
+                X509_check_purpose(cert, -1, -1);
+                if (!cert->skid)
+                        return -1;
+                return ASN1_OCTET_STRING_cmp(sid->d.subjectKeyIdentifier,
+                                                        cert->skid);
+                }
+        else
+                return -1;
+        }
+
+CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
+                        X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
+                        unsigned int flags)
+        {
+        CMS_SignedData *sd;
+        CMS_SignerInfo *si = NULL;
+        X509_ALGOR *alg;
+        int i, type;
+        if(!X509_check_private_key(signer, pk))
+                {
+                CMSerr(CMS_F_CMS_ADD1_SIGNER,
+                        CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE);
+                return NULL;
+                }
+        sd = cms_signed_data_init(cms);
+        if (!sd)
+                goto err;
+        si = M_ASN1_new_of(CMS_SignerInfo);
+        if (!si)
+                goto merr;
+        X509_check_purpose(signer, -1, -1);
+
+        CRYPTO_add(&pk->references, 1, CRYPTO_LOCK_EVP_PKEY);
+        CRYPTO_add(&signer->references, 1, CRYPTO_LOCK_X509);
+
+        si->pkey = pk;
+        si->signer = signer;
+
+        if (flags & CMS_USE_KEYID)
+                {
+                si->version = 3;
+                if (sd->version < 3)
+                        sd->version = 3;
+                type = CMS_SIGNERINFO_KEYIDENTIFIER;
+                }
+        else
+                {
+                type = CMS_SIGNERINFO_ISSUER_SERIAL;
+                si->version = 1;
+                }
+
+        if (!cms_set1_SignerIdentifier(si->sid, signer, type))
+                goto err;
+
+        /* Since no EVP_PKEY_METHOD in 0.9.8 hard code SHA1 as default */
+        if (md == NULL)
+                md = EVP_sha1();
+
+        /* OpenSSL 0.9.8 only supports SHA1 with non-RSA keys */
+
+        if ((pk->type != EVP_PKEY_RSA) && (EVP_MD_type(md) != NID_sha1))
+                {
+                CMSerr(CMS_F_CMS_ADD1_SIGNER,
+                                CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+                goto err;
+                }
+
+        cms_DigestAlgorithm_set(si->digestAlgorithm, md);
+
+        /* See if digest is present in digestAlgorithms */
+        for (i = 0; i < sk_X509_ALGOR_num(sd->digestAlgorithms); i++)
+                {
+                ASN1_OBJECT *aoid;
+                alg = sk_X509_ALGOR_value(sd->digestAlgorithms, i);
+                X509_ALGOR_get0(&aoid, NULL, NULL, alg);
+                if (OBJ_obj2nid(aoid) == EVP_MD_type(md))
+                        break;
+                }
+
+        if (i == sk_X509_ALGOR_num(sd->digestAlgorithms))
+                {
+                alg = X509_ALGOR_new();
+                if (!alg)
+                        goto merr;
+                cms_DigestAlgorithm_set(alg, md);
+                if (!sk_X509_ALGOR_push(sd->digestAlgorithms, alg))
+                        {
+                        X509_ALGOR_free(alg);
+                        goto merr;
+                        }
+                }
+
+        /* Since we have no EVP_PKEY_ASN1_METHOD in OpenSSL 0.9.8,
+         * hard code algorithm parameters.
+         */
+
+        switch (pk->type)
+                {
+
+                case EVP_PKEY_RSA:
+                X509_ALGOR_set0(si->signatureAlgorithm,
+                                        OBJ_nid2obj(NID_rsaEncryption),
+                                        V_ASN1_NULL, 0);
+                break;
+
+                case EVP_PKEY_DSA:
+                X509_ALGOR_set0(si->signatureAlgorithm,
+                                        OBJ_nid2obj(NID_dsaWithSHA1),
+                                        V_ASN1_UNDEF, 0);
+                break;
+
+
+                case EVP_PKEY_EC:
+                X509_ALGOR_set0(si->signatureAlgorithm,
+                                        OBJ_nid2obj(NID_ecdsa_with_SHA1),
+                                        V_ASN1_UNDEF, 0);
+                break;
+
+                default:
+                CMSerr(CMS_F_CMS_ADD1_SIGNER,
+                                CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE);
+                goto err;
+
+                }
+
+        if (!(flags & CMS_NOATTR))
+                {
+                /* Initialialize signed attributes strutucture so other
+                 * attributes such as signing time etc are added later
+                 * even if we add none here.
+                 */
+                if (!si->signedAttrs)
+                        {
+                        si->signedAttrs = sk_X509_ATTRIBUTE_new_null();
+                        if (!si->signedAttrs)
+                                goto merr;
+                        }
+
+                if (!(flags & CMS_NOSMIMECAP))
+                        {
+                        STACK_OF(X509_ALGOR) *smcap = NULL;
+                        i = CMS_add_standard_smimecap(&smcap);
+                        if (i)
+                                i = CMS_add_smimecap(si, smcap);
+                        sk_X509_ALGOR_pop_free(smcap, X509_ALGOR_free);
+                        if (!i)
+                                goto merr;
+                        }
+                if (flags & CMS_REUSE_DIGEST)
+                        {
+                        if (!cms_copy_messageDigest(cms, si))
+                                goto err;
+                        if (!(flags & CMS_PARTIAL) &&
+                                        !CMS_SignerInfo_sign(si))
+                                goto err;
+                        }
+                }
+
+        if (!(flags & CMS_NOCERTS))
+                {
+                /* NB ignore -1 return for duplicate cert */
+                if (!CMS_add1_cert(cms, signer))
+                        goto merr;
+                }
+
+        if (!sd->signerInfos)
+                sd->signerInfos = sk_CMS_SignerInfo_new_null();
+        if (!sd->signerInfos ||
+                !sk_CMS_SignerInfo_push(sd->signerInfos, si))
+                goto merr;
+
+        return si;
+
+        merr:
+        CMSerr(CMS_F_CMS_ADD1_SIGNER, ERR_R_MALLOC_FAILURE);
+        err:
+        if (si)
+                M_ASN1_free_of(si, CMS_SignerInfo);
+        return NULL;
+
+        }
+
+static int cms_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME *t)
+        {
+        ASN1_TIME *tt;
+        int r = 0;
+        if (t)
+                tt = t;
+        else
+                tt = X509_gmtime_adj(NULL, 0);
+
+        if (!tt)
+                goto merr;
+
+        if (CMS_signed_add1_attr_by_NID(si, NID_pkcs9_signingTime,
+                                                tt->type, tt, -1) <= 0)
+                goto merr;
+
+        r = 1;
+
+        merr:
+
+        if (!t)
+                ASN1_TIME_free(tt);
+
+        if (!r)
+                CMSerr(CMS_F_CMS_ADD1_SIGNINGTIME, ERR_R_MALLOC_FAILURE);
+
+        return r;
+
+        }
+
+STACK_OF(CMS_SignerInfo) *CMS_get0_SignerInfos(CMS_ContentInfo *cms)
+        {
+        CMS_SignedData *sd;
+        sd = cms_get0_signed(cms);
+        if (!sd)
+                return NULL;
+        return sd->signerInfos;
+        }
+
+STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms)
+        {
+        STACK_OF(X509) *signers = NULL;
+        STACK_OF(CMS_SignerInfo) *sinfos;
+        CMS_SignerInfo *si;
+        int i;
+        sinfos = CMS_get0_SignerInfos(cms);
+        for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++)
+                {
+                si = sk_CMS_SignerInfo_value(sinfos, i);
+                if (si->signer)
+                        {
+                        if (!signers)
+                                {
+                                signers = sk_X509_new_null();
+                                if (!signers)
+                                        return NULL;
+                                }
+                        if (!sk_X509_push(signers, si->signer))
+                                {
+                                sk_X509_free(signers);
+                                return NULL;
+                                }
+                        }
+                }
+        return signers;
+        }
+
+void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer)
+        {
+        if (signer)
+                {
+                CRYPTO_add(&signer->references, 1, CRYPTO_LOCK_X509);
+                if (si->pkey)
+                        EVP_PKEY_free(si->pkey);
+                si->pkey = X509_get_pubkey(signer);
+                }
+        if (si->signer)
+                X509_free(si->signer);
+        si->signer = signer;
+        }
+
+int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,
+                                        ASN1_OCTET_STRING **keyid,
+                                        X509_NAME **issuer, ASN1_INTEGER **sno)
+        {
+        return cms_SignerIdentifier_get0_signer_id(si->sid, keyid, issuer, sno);
+        }
+
+int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert)
+        {
+        return cms_SignerIdentifier_cert_cmp(si->sid, cert);
+        }
+
+int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *scerts,
+                                unsigned int flags)
+        {
+        CMS_SignedData *sd;
+        CMS_SignerInfo *si;
+        CMS_CertificateChoices *cch;
+        STACK_OF(CMS_CertificateChoices) *certs;
+        X509 *x;
+        int i, j;
+        int ret = 0;
+        sd = cms_get0_signed(cms);
+        if (!sd)
+                return -1;
+        certs = sd->certificates;
+        for (i = 0; i < sk_CMS_SignerInfo_num(sd->signerInfos); i++)
+                {
+                si = sk_CMS_SignerInfo_value(sd->signerInfos, i);
+                if (si->signer)
+                        continue;
+
+                for (j = 0; j < sk_X509_num(scerts); j++)
+                        {
+                        x = sk_X509_value(scerts, j);
+                        if (CMS_SignerInfo_cert_cmp(si, x) == 0)
+                                {
+                                CMS_SignerInfo_set1_signer_cert(si, x);
+                                ret++;
+                                break;
+                                }
+                        }
+
+                if (si->signer || (flags & CMS_NOINTERN))
+                        continue;
+
+                for (j = 0; j < sk_CMS_CertificateChoices_num(certs); j++)
+                        {
+                        cch = sk_CMS_CertificateChoices_value(certs, j);
+                        if (cch->type != 0)
+                                continue;
+                        x = cch->d.certificate;
+                        if (CMS_SignerInfo_cert_cmp(si, x) == 0)
+                                {
+                                CMS_SignerInfo_set1_signer_cert(si, x);
+                                ret++;
+                                break;
+                                }
+                        }
+                }
+        return ret;
+        }
+
+void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk, X509 **signer,
+                                        X509_ALGOR **pdig, X509_ALGOR **psig)
+        {
+        if (pk)
+                *pk = si->pkey;
+        if (signer)
+                *signer = si->signer;
+        if (pdig)
+                *pdig = si->digestAlgorithm;
+        if (psig)
+                *psig = si->signatureAlgorithm;
+        }
+
+/* In OpenSSL 0.9.8 we have the link between digest types and public
+ * key types so we need to fixup the digest type if the public key
+ * type is not appropriate.
+ */
+
+static void cms_fixup_mctx(EVP_MD_CTX *mctx, EVP_PKEY *pkey)
+        {
+        if (EVP_MD_CTX_type(mctx) != NID_sha1)
+                return;
+#ifndef OPENSSL_NO_DSA
+        if (pkey->type == EVP_PKEY_DSA)
+                mctx->digest = EVP_dss1();      
+#endif
+#ifndef OPENSSL_NO_ECDSA
+        if (pkey->type == EVP_PKEY_EC)
+                mctx->digest = EVP_ecdsa();     
+#endif
+        }
+
+static int cms_SignerInfo_content_sign(CMS_ContentInfo *cms,
+                                        CMS_SignerInfo *si, BIO *chain)
+        {
+        EVP_MD_CTX mctx;
+        int r = 0;
+        EVP_MD_CTX_init(&mctx);
+
+
+        if (!si->pkey)
+                {
+                CMSerr(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN, CMS_R_NO_PRIVATE_KEY);
+                return 0;
+                }
+
+        if (!cms_DigestAlgorithm_find_ctx(&mctx, chain, si->digestAlgorithm))
+                goto err;
+
+        /* If any signed attributes calculate and add messageDigest attribute */
+
+        if (CMS_signed_get_attr_count(si) >= 0)
+                {
+                ASN1_OBJECT *ctype =
+                        cms->d.signedData->encapContentInfo->eContentType; 
+                unsigned char md[EVP_MAX_MD_SIZE];
+                unsigned int mdlen;
+                EVP_DigestFinal_ex(&mctx, md, &mdlen);
+                if (!CMS_signed_add1_attr_by_NID(si, NID_pkcs9_messageDigest,
+                                                V_ASN1_OCTET_STRING,
+                                                md, mdlen))
+                        goto err;
+                /* Copy content type across */
+                if (CMS_signed_add1_attr_by_NID(si, NID_pkcs9_contentType,
+                                        V_ASN1_OBJECT, ctype, -1) <= 0)
+                        goto err;
+                if (!CMS_SignerInfo_sign(si))
+                        goto err;
+                }
+        else
+                {
+                unsigned char *sig;
+                unsigned int siglen;
+                sig = OPENSSL_malloc(EVP_PKEY_size(si->pkey));
+                if (!sig)
+                        {
+                        CMSerr(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN,
+                                        ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                cms_fixup_mctx(&mctx, si->pkey);
+                if (!EVP_SignFinal(&mctx, sig, &siglen, si->pkey))
+                        {
+                        CMSerr(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN,
+                                        CMS_R_SIGNFINAL_ERROR);
+                        OPENSSL_free(sig);
+                        goto err;
+                        }
+                ASN1_STRING_set0(si->signature, sig, siglen);
+                }
+
+        r = 1;
+
+        err:
+        EVP_MD_CTX_cleanup(&mctx);
+        return r;
+
+        }
+
+int cms_SignedData_final(CMS_ContentInfo *cms, BIO *chain)
+        {
+        STACK_OF(CMS_SignerInfo) *sinfos;
+        CMS_SignerInfo *si;
+        int i;
+        sinfos = CMS_get0_SignerInfos(cms);
+        for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++)
+                {
+                si = sk_CMS_SignerInfo_value(sinfos, i);
+                if (!cms_SignerInfo_content_sign(cms, si, chain))
+                        return 0;
+                }
+        cms->d.signedData->encapContentInfo->partial = 0;
+        return 1;
+        }
+
+int CMS_SignerInfo_sign(CMS_SignerInfo *si)
+        {
+        EVP_MD_CTX mctx;
+        unsigned char *abuf = NULL;
+        int alen;
+        unsigned int siglen;
+        const EVP_MD *md = NULL;
+
+        md = EVP_get_digestbyobj(si->digestAlgorithm->algorithm);
+        if (md == NULL)
+                return 0;
+
+        EVP_MD_CTX_init(&mctx);
+
+        if (CMS_signed_get_attr_by_NID(si, NID_pkcs9_signingTime, -1) < 0)
+                {
+                if (!cms_add1_signingTime(si, NULL))
+                        goto err;
+                }
+
+        if (EVP_SignInit_ex(&mctx, md, NULL) <= 0)
+                goto err;
+
+#if 0
+        if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
+                                EVP_PKEY_CTRL_CMS_SIGN, 0, si) <= 0)
+                {
+                CMSerr(CMS_F_CMS_SIGNERINFO_SIGN, CMS_R_CTRL_ERROR);
+                goto err;
+                }
+#endif
+
+        alen = ASN1_item_i2d((ASN1_VALUE *)si->signedAttrs,&abuf,
+                                ASN1_ITEM_rptr(CMS_Attributes_Sign));
+        if(!abuf)
+                goto err;
+        if (EVP_SignUpdate(&mctx, abuf, alen) <= 0)
+                goto err;
+        siglen = EVP_PKEY_size(si->pkey);
+        OPENSSL_free(abuf);
+        abuf = OPENSSL_malloc(siglen);
+        if(!abuf)
+                goto err;
+        cms_fixup_mctx(&mctx, si->pkey);
+        if (EVP_SignFinal(&mctx, abuf, &siglen, si->pkey) <= 0)
+                goto err;
+#if 0
+        if (EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_SIGN,
+                                EVP_PKEY_CTRL_CMS_SIGN, 1, si) <= 0)
+                {
+                CMSerr(CMS_F_CMS_SIGNERINFO_SIGN, CMS_R_CTRL_ERROR);
+                goto err;
+                }
+#endif
+        EVP_MD_CTX_cleanup(&mctx);
+
+        ASN1_STRING_set0(si->signature, abuf, siglen);
+
+        return 1;
+
+        err:
+        if (abuf)
+                OPENSSL_free(abuf);
+        EVP_MD_CTX_cleanup(&mctx);
+        return 0;
+
+        }
+
+int CMS_SignerInfo_verify(CMS_SignerInfo *si)
+        {
+        EVP_MD_CTX mctx;
+        unsigned char *abuf = NULL;
+        int alen, r = -1;
+        const EVP_MD *md = NULL;
+
+        if (!si->pkey)
+                {
+                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_NO_PUBLIC_KEY);
+                return -1;
+                }
+
+        md = EVP_get_digestbyobj(si->digestAlgorithm->algorithm);
+        if (md == NULL)
+                return -1;
+        EVP_MD_CTX_init(&mctx);
+        if (EVP_VerifyInit_ex(&mctx, md, NULL) <= 0)
+                goto err;
+
+        alen = ASN1_item_i2d((ASN1_VALUE *)si->signedAttrs,&abuf,
+                                ASN1_ITEM_rptr(CMS_Attributes_Verify));
+        if(!abuf)
+                goto err;
+        r = EVP_VerifyUpdate(&mctx, abuf, alen);
+        OPENSSL_free(abuf);
+        if (r <= 0)
+                {
+                r = -1;
+                goto err;
+                }
+        cms_fixup_mctx(&mctx, si->pkey);
+        r = EVP_VerifyFinal(&mctx,
+                        si->signature->data, si->signature->length, si->pkey);
+        if (!r)
+                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY, CMS_R_VERIFICATION_FAILURE);
+        err:
+        EVP_MD_CTX_cleanup(&mctx);
+        return r;
+        }
+
+/* Create a chain of digest BIOs from a CMS ContentInfo */
+
+BIO *cms_SignedData_init_bio(CMS_ContentInfo *cms)
+        {
+        int i;
+        CMS_SignedData *sd;
+        BIO *chain = NULL;
+        sd = cms_get0_signed(cms);
+        if (!sd)
+                return NULL;
+        if (cms->d.signedData->encapContentInfo->partial)
+                cms_sd_set_version(sd);
+        for (i = 0; i < sk_X509_ALGOR_num(sd->digestAlgorithms); i++)
+                {
+                X509_ALGOR *digestAlgorithm;
+                BIO *mdbio;
+                digestAlgorithm = sk_X509_ALGOR_value(sd->digestAlgorithms, i);
+                mdbio = cms_DigestAlgorithm_init_bio(digestAlgorithm);
+                if (!mdbio)
+                        goto err;       
+                if (chain)
+                         BIO_push(chain, mdbio);
+                else
+                        chain = mdbio;
+                }
+        return chain;
+        err:
+        if (chain)
+                BIO_free_all(chain);
+        return NULL;
+        }
+
+int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
+        {
+        ASN1_OCTET_STRING *os = NULL;
+        EVP_MD_CTX mctx;
+        int r = -1;
+        EVP_MD_CTX_init(&mctx);
+        /* If we have any signed attributes look for messageDigest value */
+        if (CMS_signed_get_attr_count(si) >= 0)
+                {
+                os = CMS_signed_get0_data_by_OBJ(si,
+                                        OBJ_nid2obj(NID_pkcs9_messageDigest),
+                                        -3, V_ASN1_OCTET_STRING);
+                if (!os)
+                        {
+                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
+                                CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE);
+                        goto err;
+                        }
+                }
+
+        if (!cms_DigestAlgorithm_find_ctx(&mctx, chain, si->digestAlgorithm))
+                goto err;
+
+        /* If messageDigest found compare it */
+
+        if (os)
+                {
+                unsigned char mval[EVP_MAX_MD_SIZE];
+                unsigned int mlen;
+                if (EVP_DigestFinal_ex(&mctx, mval, &mlen) <= 0)
+                        {
+                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
+                                CMS_R_UNABLE_TO_FINALIZE_CONTEXT);
+                        goto err;
+                        }
+                if (mlen != (unsigned int)os->length)
+                        {
+                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
+                                CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH);
+                        goto err;
+                        }
+
+                if (memcmp(mval, os->data, mlen))
+                        {
+                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
+                                CMS_R_VERIFICATION_FAILURE);
+                        r = 0;
+                        }
+                else
+                        r = 1;
+                }
+        else
+                {
+                cms_fixup_mctx(&mctx, si->pkey);
+                r = EVP_VerifyFinal(&mctx, si->signature->data,
+                                        si->signature->length, si->pkey);
+                if (r <= 0)
+                        {
+                        CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
+                                CMS_R_VERIFICATION_FAILURE);
+                        r = 0;
+                        }
+                }
+
+        err:
+        EVP_MD_CTX_cleanup(&mctx);
+        return r;
+
+        }
+
+int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs)
+        {
+        unsigned char *smder = NULL;
+        int smderlen, r;
+        smderlen = i2d_X509_ALGORS(algs, &smder);
+        if (smderlen <= 0)
+                return 0;
+        r = CMS_signed_add1_attr_by_NID(si, NID_SMIMECapabilities,
+                                        V_ASN1_SEQUENCE, smder, smderlen);
+        OPENSSL_free(smder);
+        return r;
+        }
+
+int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
+                                int algnid, int keysize)
+        {
+        X509_ALGOR *alg;
+        ASN1_INTEGER *key = NULL;
+        if (keysize > 0)
+                {
+                key = ASN1_INTEGER_new();
+                if (!key || !ASN1_INTEGER_set(key, keysize))
+                        return 0;
+                }
+        alg = X509_ALGOR_new();
+        if (!alg)
+                {
+                if (key)
+                        ASN1_INTEGER_free(key);
+                return 0;
+                }
+                
+        X509_ALGOR_set0(alg, OBJ_nid2obj(algnid),
+                                key ? V_ASN1_INTEGER : V_ASN1_UNDEF, key);
+        if (!*algs)
+                *algs = sk_X509_ALGOR_new_null();
+        if (!*algs || !sk_X509_ALGOR_push(*algs, alg))
+                {
+                X509_ALGOR_free(alg);
+                return 0;
+                }
+        return 1;
+        }
+
+/* Check to see if a cipher exists and if so add S/MIME capabilities */
+
+static int cms_add_cipher_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg)
+        {
+        if (EVP_get_cipherbynid(nid))
+                return CMS_add_simple_smimecap(sk, nid, arg);
+        return 1;
+        }
+#if 0
+static int cms_add_digest_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg)
+        {
+        if (EVP_get_digestbynid(nid))
+                return CMS_add_simple_smimecap(sk, nid, arg);
+        return 1;
+        }
+#endif
+int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap)
+        {
+        if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
+                || !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1)
+                || !cms_add_cipher_smcap(smcap, NID_aes_128_cbc, -1)
+                || !cms_add_cipher_smcap(smcap, NID_des_ede3_cbc, -1)
+                || !cms_add_cipher_smcap(smcap, NID_rc2_cbc, 128)
+                || !cms_add_cipher_smcap(smcap, NID_rc2_cbc, 64)
+                || !cms_add_cipher_smcap(smcap, NID_des_cbc, -1)
+                || !cms_add_cipher_smcap(smcap, NID_rc2_cbc, 40))
+                return 0;
+        return 1;
+        }
diff --git a/src/lib/libssl/src/crypto/cms/cms_smime.c b/src/lib/libssl/src/crypto/cms/cms_smime.c
new file mode 100644
index 0000000000..f79c504e91
--- /dev/null
+++ b/src/lib/libssl/src/crypto/cms/cms_smime.c
@@ -0,0 +1,806 @@
+/* crypto/cms/cms_smime.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2008 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/err.h>
+#include <openssl/cms.h>
+#include "cms_lcl.h"
+
+static int cms_copy_content(BIO *out, BIO *in, unsigned int flags)
+        {
+        unsigned char buf[4096];
+        int r = 0, i;
+        BIO *tmpout = NULL;
+
+        if (out == NULL)
+                tmpout = BIO_new(BIO_s_null());
+        else if (flags & CMS_TEXT)
+                tmpout = BIO_new(BIO_s_mem());
+        else
+                tmpout = out;
+
+        if(!tmpout)
+                {
+                CMSerr(CMS_F_CMS_COPY_CONTENT,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        /* Read all content through chain to process digest, decrypt etc */
+        for (;;)
+        {
+                i=BIO_read(in,buf,sizeof(buf));
+                if (i <= 0)
+                        {
+                        if (BIO_method_type(in) == BIO_TYPE_CIPHER)
+                                {
+                                if (!BIO_get_cipher_status(in))
+                                        goto err;
+                                }
+                        break;
+                        }
+                                
+                if (tmpout)
+                        BIO_write(tmpout, buf, i);
+        }
+
+        if(flags & CMS_TEXT)
+                {
+                if(!SMIME_text(tmpout, out))
+                        {
+                        CMSerr(CMS_F_CMS_COPY_CONTENT,CMS_R_SMIME_TEXT_ERROR);
+                        goto err;
+                        }
+                }
+
+        r = 1;
+
+        err:
+        if (tmpout && (tmpout != out))
+                BIO_free(tmpout);
+        return r;
+
+        }
+
+static int check_content(CMS_ContentInfo *cms)
+        {
+        ASN1_OCTET_STRING **pos = CMS_get0_content(cms);
+        if (!pos || !*pos)
+                {
+                CMSerr(CMS_F_CHECK_CONTENT, CMS_R_NO_CONTENT);
+                return 0;
+                }
+        return 1;
+        }
+
+static void do_free_upto(BIO *f, BIO *upto)
+        {
+        if (upto)
+                {
+                BIO *tbio;
+                do 
+                        {
+                        tbio = BIO_pop(f);
+                        BIO_free(f);
+                        f = tbio;
+                        }
+                while (f != upto);
+                }
+        else
+                BIO_free_all(f);
+        }
+
+int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags)
+        {
+        BIO *cont;
+        int r;
+        if (OBJ_obj2nid(CMS_get0_type(cms)) != NID_pkcs7_data)
+                {
+                CMSerr(CMS_F_CMS_DATA, CMS_R_TYPE_NOT_DATA);
+                return 0;
+                }
+        cont = CMS_dataInit(cms, NULL);
+        if (!cont)
+                return 0;
+        r = cms_copy_content(out, cont, flags);
+        BIO_free_all(cont);
+        return r;
+        }
+
+CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags)
+        {
+        CMS_ContentInfo *cms;
+        cms = cms_Data_create();
+        if (!cms)
+                return NULL;
+
+        if (CMS_final(cms, in, NULL, flags))
+                return cms;
+
+        CMS_ContentInfo_free(cms);
+
+        return NULL;
+        }
+
+int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
+                                                        unsigned int flags)
+        {
+        BIO *cont;
+        int r;
+        if (OBJ_obj2nid(CMS_get0_type(cms)) != NID_pkcs7_digest)
+                {
+                CMSerr(CMS_F_CMS_DIGEST_VERIFY, CMS_R_TYPE_NOT_DIGESTED_DATA);
+                return 0;
+                }
+
+        if (!dcont && !check_content(cms))
+                return 0;
+
+        cont = CMS_dataInit(cms, dcont);
+        if (!cont)
+                return 0;
+        r = cms_copy_content(out, cont, flags);
+        if (r)
+                r = cms_DigestedData_do_final(cms, cont, 1);
+        do_free_upto(cont, dcont);
+        return r;
+        }
+
+CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
+                                        unsigned int flags)
+        {
+        CMS_ContentInfo *cms;
+        if (!md)
+                md = EVP_sha1();
+        cms = cms_DigestedData_create(md);
+        if (!cms)
+                return NULL;
+
+        if(!(flags & CMS_DETACHED))
+                {
+                flags &= ~CMS_STREAM;
+                CMS_set_detached(cms, 0);
+                }
+
+        if ((flags & CMS_STREAM) || CMS_final(cms, in, NULL, flags))
+                return cms;
+
+        CMS_ContentInfo_free(cms);
+        return NULL;
+        }
+
+int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
+                                const unsigned char *key, size_t keylen,
+                                BIO *dcont, BIO *out, unsigned int flags)
+        {
+        BIO *cont;
+        int r;
+        if (OBJ_obj2nid(CMS_get0_type(cms)) != NID_pkcs7_encrypted)
+                {
+                CMSerr(CMS_F_CMS_ENCRYPTEDDATA_DECRYPT,
+                                        CMS_R_TYPE_NOT_ENCRYPTED_DATA);
+                return 0;
+                }
+
+        if (!dcont && !check_content(cms))
+                return 0;
+
+        if (CMS_EncryptedData_set1_key(cms, NULL, key, keylen) <= 0)
+                return 0;
+        cont = CMS_dataInit(cms, dcont);
+        if (!cont)
+                return 0;
+        r = cms_copy_content(out, cont, flags);
+        do_free_upto(cont, dcont);
+        return r;
+        }
+
+CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,
+                                        const unsigned char *key, size_t keylen,
+                                        unsigned int flags)
+        {
+        CMS_ContentInfo *cms;
+        if (!cipher)
+                {
+                CMSerr(CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT, CMS_R_NO_CIPHER);
+                return NULL;
+                }
+        cms = CMS_ContentInfo_new();
+        if (!cms)
+                return NULL;
+        if (!CMS_EncryptedData_set1_key(cms, cipher, key, keylen))
+                return NULL;
+
+        if(!(flags & CMS_DETACHED))
+                {
+                flags &= ~CMS_STREAM;
+                CMS_set_detached(cms, 0);
+                }
+
+        if ((flags & (CMS_STREAM|CMS_PARTIAL))
+                || CMS_final(cms, in, NULL, flags))
+                return cms;
+
+        CMS_ContentInfo_free(cms);
+        return NULL;
+        }
+
+static int cms_signerinfo_verify_cert(CMS_SignerInfo *si,
+                                        X509_STORE *store,
+                                        STACK_OF(X509) *certs,
+                                        STACK_OF(X509_CRL) *crls,
+                                        unsigned int flags)
+        {
+        X509_STORE_CTX ctx;
+        X509 *signer;
+        int i, j, r = 0;
+        CMS_SignerInfo_get0_algs(si, NULL, &signer, NULL, NULL);
+        if (!X509_STORE_CTX_init(&ctx, store, signer, certs))
+                {
+                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CERT,
+                                                CMS_R_STORE_INIT_ERROR);
+                goto err;
+                }
+        X509_STORE_CTX_set_purpose(&ctx, X509_PURPOSE_SMIME_SIGN);
+        if (crls)
+                X509_STORE_CTX_set0_crls(&ctx, crls);
+
+        i = X509_verify_cert(&ctx);
+        if (i <= 0)
+                {
+                j = X509_STORE_CTX_get_error(&ctx);
+                CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CERT,
+                                                CMS_R_CERTIFICATE_VERIFY_ERROR);
+                ERR_add_error_data(2, "Verify error:",
+                                         X509_verify_cert_error_string(j));
+                goto err;
+                }
+        r = 1;
+        err:
+        X509_STORE_CTX_cleanup(&ctx);
+        return r;
+
+        }
+
+int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
+                 X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags)
+        {
+        CMS_SignerInfo *si;
+        STACK_OF(CMS_SignerInfo) *sinfos;
+        STACK_OF(X509) *cms_certs = NULL;
+        STACK_OF(X509_CRL) *crls = NULL;
+        X509 *signer;
+        int i, scount = 0, ret = 0;
+        BIO *cmsbio = NULL, *tmpin = NULL;
+
+        if (!dcont && !check_content(cms))
+                return 0;
+
+        /* Attempt to find all signer certificates */
+
+        sinfos = CMS_get0_SignerInfos(cms);
+
+        if (sk_CMS_SignerInfo_num(sinfos) <= 0)
+                {
+                CMSerr(CMS_F_CMS_VERIFY, CMS_R_NO_SIGNERS);
+                goto err;
+                }
+
+        for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++)
+                {
+                si = sk_CMS_SignerInfo_value(sinfos, i);
+                CMS_SignerInfo_get0_algs(si, NULL, &signer, NULL, NULL);
+                if (signer)
+                        scount++;
+                }
+
+        if (scount != sk_CMS_SignerInfo_num(sinfos))
+                scount += CMS_set1_signers_certs(cms, certs, flags);
+
+        if (scount != sk_CMS_SignerInfo_num(sinfos))
+                {
+                CMSerr(CMS_F_CMS_VERIFY, CMS_R_SIGNER_CERTIFICATE_NOT_FOUND);
+                goto err;
+                }
+
+        /* Attempt to verify all signers certs */
+
+        if (!(flags & CMS_NO_SIGNER_CERT_VERIFY))
+                {
+                cms_certs = CMS_get1_certs(cms);
+                if (!(flags & CMS_NOCRL))
+                        crls = CMS_get1_crls(cms);
+                for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++)
+                        {
+                        si = sk_CMS_SignerInfo_value(sinfos, i);
+                        if (!cms_signerinfo_verify_cert(si, store,
+                                                        cms_certs, crls, flags))
+                                goto err;
+                        }
+                }
+
+        /* Attempt to verify all SignerInfo signed attribute signatures */
+
+        if (!(flags & CMS_NO_ATTR_VERIFY))
+                {
+                for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++)
+                        {
+                        si = sk_CMS_SignerInfo_value(sinfos, i);
+                        if (CMS_signed_get_attr_count(si) < 0)
+                                continue;
+                        if (CMS_SignerInfo_verify(si) <= 0)
+                                goto err;
+                        }
+                }
+
+        /* Performance optimization: if the content is a memory BIO then
+         * store its contents in a temporary read only memory BIO. This
+         * avoids potentially large numbers of slow copies of data which will
+         * occur when reading from a read write memory BIO when signatures
+         * are calculated.
+         */
+
+        if (dcont && (BIO_method_type(dcont) == BIO_TYPE_MEM))
+                {
+                char *ptr;
+                long len;
+                len = BIO_get_mem_data(dcont, &ptr);
+                tmpin = BIO_new_mem_buf(ptr, len);
+                if (tmpin == NULL)
+                        {
+                        CMSerr(CMS_F_CMS_VERIFY,ERR_R_MALLOC_FAILURE);
+                        return 0;
+                        }
+                }
+        else
+                tmpin = dcont;
+                
+
+        cmsbio=CMS_dataInit(cms, tmpin);
+        if (!cmsbio)
+                goto err;
+
+        if (!cms_copy_content(out, cmsbio, flags))
+                goto err;
+
+        if (!(flags & CMS_NO_CONTENT_VERIFY))
+                {
+                for (i = 0; i < sk_CMS_SignerInfo_num(sinfos); i++)
+                        {
+                        si = sk_CMS_SignerInfo_value(sinfos, i);
+                        if (!CMS_SignerInfo_verify_content(si, cmsbio))
+                                {
+                                CMSerr(CMS_F_CMS_VERIFY,
+                                        CMS_R_CONTENT_VERIFY_ERROR);
+                                goto err;
+                                }
+                        }
+                }
+
+        ret = 1;
+
+        err:
+        
+        if (dcont && (tmpin == dcont))
+                do_free_upto(cmsbio, dcont);
+        else
+                BIO_free_all(cmsbio);
+
+        if (cms_certs)
+                sk_X509_pop_free(cms_certs, X509_free);
+        if (crls)
+                sk_X509_CRL_pop_free(crls, X509_CRL_free);
+
+        return ret;
+        }
+
+int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
+                        STACK_OF(X509) *certs,
+                        X509_STORE *store, unsigned int flags)
+        {
+        int r;
+        r = CMS_verify(rcms, certs, store, NULL, NULL, flags);
+        if (r <= 0)
+                return r;
+        return cms_Receipt_verify(rcms, ocms);
+        }
+
+CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
+                                                BIO *data, unsigned int flags)
+        {
+        CMS_ContentInfo *cms;
+        int i;
+
+        cms = CMS_ContentInfo_new();
+        if (!cms || !CMS_SignedData_init(cms))
+                goto merr;
+
+        if (pkey && !CMS_add1_signer(cms, signcert, pkey, NULL, flags))
+                {
+                CMSerr(CMS_F_CMS_SIGN, CMS_R_ADD_SIGNER_ERROR);
+                goto err;
+                }
+
+        for (i = 0; i < sk_X509_num(certs); i++)
+                {
+                X509 *x = sk_X509_value(certs, i);
+                if (!CMS_add1_cert(cms, x))
+                        goto merr;
+                }
+
+        if(!(flags & CMS_DETACHED))
+                {
+                flags &= ~CMS_STREAM;
+                CMS_set_detached(cms, 0);
+                }
+
+        if ((flags & (CMS_STREAM|CMS_PARTIAL))
+                || CMS_final(cms, data, NULL, flags))
+                return cms;
+        else
+                goto err;
+
+        merr:
+        CMSerr(CMS_F_CMS_SIGN, ERR_R_MALLOC_FAILURE);
+
+        err:
+        if (cms)
+                CMS_ContentInfo_free(cms);
+        return NULL;
+        }
+
+CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
+                                        X509 *signcert, EVP_PKEY *pkey,
+                                        STACK_OF(X509) *certs,
+                                        unsigned int flags)
+        {
+        CMS_SignerInfo *rct_si;
+        CMS_ContentInfo *cms = NULL;
+        ASN1_OCTET_STRING **pos, *os;
+        BIO *rct_cont = NULL;
+        int r = 0;
+
+        flags &= ~CMS_STREAM;
+        /* Not really detached but avoids content being allocated */
+        flags |= CMS_PARTIAL|CMS_BINARY|CMS_DETACHED;
+        if (!pkey || !signcert)
+                {
+                CMSerr(CMS_F_CMS_SIGN_RECEIPT, CMS_R_NO_KEY_OR_CERT);
+                return NULL;
+                }
+
+        /* Initialize signed data */
+
+        cms = CMS_sign(NULL, NULL, certs, NULL, flags);
+        if (!cms)
+                goto err;
+
+        /* Set inner content type to signed receipt */
+        if (!CMS_set1_eContentType(cms, OBJ_nid2obj(NID_id_smime_ct_receipt)))
+                goto err;
+
+        rct_si = CMS_add1_signer(cms, signcert, pkey, NULL, flags);
+        if (!rct_si)
+                {
+                CMSerr(CMS_F_CMS_SIGN_RECEIPT, CMS_R_ADD_SIGNER_ERROR);
+                goto err;
+                }
+
+        os = cms_encode_Receipt(si);
+
+        if (!os)
+                goto err;
+
+        /* Set content to digest */
+        rct_cont = BIO_new_mem_buf(os->data, os->length);
+        if (!rct_cont)
+                goto err;
+
+        /* Add msgSigDigest attribute */
+
+        if (!cms_msgSigDigest_add1(rct_si, si))
+                goto err;
+
+        /* Finalize structure */
+        if (!CMS_final(cms, rct_cont, NULL, flags))
+                goto err;
+
+        /* Set embedded content */
+        pos = CMS_get0_content(cms);
+        *pos = os;
+
+        r = 1;
+
+        err:
+        if (rct_cont)
+                BIO_free(rct_cont);
+        if (r)
+                return cms;
+        CMS_ContentInfo_free(cms);
+        return NULL;
+
+        }
+
+CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *data,
+                                const EVP_CIPHER *cipher, unsigned int flags)
+        {
+        CMS_ContentInfo *cms;
+        int i;
+        X509 *recip;
+        cms = CMS_EnvelopedData_create(cipher);
+        if (!cms)
+                goto merr;
+        for (i = 0; i < sk_X509_num(certs); i++)
+                {
+                recip = sk_X509_value(certs, i);
+                if (!CMS_add1_recipient_cert(cms, recip, flags))
+                        {
+                        CMSerr(CMS_F_CMS_ENCRYPT, CMS_R_RECIPIENT_ERROR);
+                        goto err;
+                        }
+                }
+
+        if(!(flags & CMS_DETACHED))
+                {
+                flags &= ~CMS_STREAM;
+                CMS_set_detached(cms, 0);
+                }
+
+        if ((flags & (CMS_STREAM|CMS_PARTIAL))
+                || CMS_final(cms, data, NULL, flags))
+                return cms;
+        else
+                goto err;
+
+        merr:
+        CMSerr(CMS_F_CMS_ENCRYPT, ERR_R_MALLOC_FAILURE);
+        err:
+        if (cms)
+                CMS_ContentInfo_free(cms);
+        return NULL;
+        }
+
+int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert)
+        {
+        STACK_OF(CMS_RecipientInfo) *ris;
+        CMS_RecipientInfo *ri;
+        int i, r;
+        ris = CMS_get0_RecipientInfos(cms);
+        for (i = 0; i < sk_CMS_RecipientInfo_num(ris); i++)
+                {
+                ri = sk_CMS_RecipientInfo_value(ris, i);
+                if (CMS_RecipientInfo_type(ri) != CMS_RECIPINFO_TRANS)
+                                continue;
+                /* If we have a cert try matching RecipientInfo
+                 * otherwise try them all.
+                 */
+                if (!cert || (CMS_RecipientInfo_ktri_cert_cmp(ri, cert) == 0))
+                        {
+                        CMS_RecipientInfo_set0_pkey(ri, pk);
+                        r = CMS_RecipientInfo_decrypt(cms, ri);
+                        CMS_RecipientInfo_set0_pkey(ri, NULL);
+                        if (r > 0)
+                                return 1;
+                        if (cert)
+                                {
+                                CMSerr(CMS_F_CMS_DECRYPT_SET1_PKEY,
+                                                CMS_R_DECRYPT_ERROR);
+                                return 0;
+                                }
+                        ERR_clear_error();
+                        }
+                }
+
+        CMSerr(CMS_F_CMS_DECRYPT_SET1_PKEY, CMS_R_NO_MATCHING_RECIPIENT);
+        return 0;
+
+        }
+
+int CMS_decrypt_set1_key(CMS_ContentInfo *cms, 
+                                unsigned char *key, size_t keylen,
+                                unsigned char *id, size_t idlen)
+        {
+        STACK_OF(CMS_RecipientInfo) *ris;
+        CMS_RecipientInfo *ri;
+        int i, r;
+        ris = CMS_get0_RecipientInfos(cms);
+        for (i = 0; i < sk_CMS_RecipientInfo_num(ris); i++)
+                {
+                ri = sk_CMS_RecipientInfo_value(ris, i);
+                if (CMS_RecipientInfo_type(ri) != CMS_RECIPINFO_KEK)
+                                continue;
+
+                /* If we have an id try matching RecipientInfo
+                 * otherwise try them all.
+                 */
+                if (!id || (CMS_RecipientInfo_kekri_id_cmp(ri, id, idlen) == 0))
+                        {
+                        CMS_RecipientInfo_set0_key(ri, key, keylen);
+                        r = CMS_RecipientInfo_decrypt(cms, ri);
+                        CMS_RecipientInfo_set0_key(ri, NULL, 0);
+                        if (r > 0)
+                                return 1;
+                        if (id)
+                                {
+                                CMSerr(CMS_F_CMS_DECRYPT_SET1_KEY,
+                                                CMS_R_DECRYPT_ERROR);
+                                return 0;
+                                }
+                        ERR_clear_error();
+                        }
+                }
+
+        CMSerr(CMS_F_CMS_DECRYPT_SET1_KEY, CMS_R_NO_MATCHING_RECIPIENT);
+        return 0;
+
+        }
+        
+int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert,
+                                BIO *dcont, BIO *out,
+                                unsigned int flags)
+        {
+        int r;
+        BIO *cont;
+        if (OBJ_obj2nid(CMS_get0_type(cms)) != NID_pkcs7_enveloped)
+                {
+                CMSerr(CMS_F_CMS_DECRYPT, CMS_R_TYPE_NOT_ENVELOPED_DATA);
+                return 0;
+                }
+        if (!dcont && !check_content(cms))
+                return 0;
+        if (pk && !CMS_decrypt_set1_pkey(cms, pk, cert))
+                return 0;
+
+        cont = CMS_dataInit(cms, dcont);
+        if (!cont)
+                return 0;
+        r = cms_copy_content(out, cont, flags);
+        do_free_upto(cont, dcont);
+        return r;
+        }
+
+int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags)
+        {
+        BIO *cmsbio;
+        int ret = 0;
+        if (!(cmsbio = CMS_dataInit(cms, dcont)))
+                {
+                CMSerr(CMS_F_CMS_FINAL,ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+
+        SMIME_crlf_copy(data, cmsbio, flags);
+
+        (void)BIO_flush(cmsbio);
+
+
+        if (!CMS_dataFinal(cms, cmsbio))
+                {
+                CMSerr(CMS_F_CMS_FINAL,CMS_R_CMS_DATAFINAL_ERROR);
+                goto err;
+                }
+
+        ret = 1;
+
+        err:
+        do_free_upto(cmsbio, dcont);
+
+        return ret;
+
+        }
+
+#ifdef ZLIB
+
+int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
+                                                        unsigned int flags)
+        {
+        BIO *cont;
+        int r;
+        if (OBJ_obj2nid(CMS_get0_type(cms)) != NID_id_smime_ct_compressedData)
+                {
+                CMSerr(CMS_F_CMS_UNCOMPRESS,
+                                        CMS_R_TYPE_NOT_COMPRESSED_DATA);
+                return 0;
+                }
+
+        if (!dcont && !check_content(cms))
+                return 0;
+
+        cont = CMS_dataInit(cms, dcont);
+        if (!cont)
+                return 0;
+        r = cms_copy_content(out, cont, flags);
+        do_free_upto(cont, dcont);
+        return r;
+        }
+
+CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags)
+        {
+        CMS_ContentInfo *cms;
+        if (comp_nid <= 0)
+                comp_nid = NID_zlib_compression;
+        cms = cms_CompressedData_create(comp_nid);
+        if (!cms)
+                return NULL;
+
+        if(!(flags & CMS_DETACHED))
+                {
+                flags &= ~CMS_STREAM;
+                CMS_set_detached(cms, 0);
+                }
+
+        if (CMS_final(cms, in, NULL, flags))
+                return cms;
+
+        CMS_ContentInfo_free(cms);
+        return NULL;
+        }
+
+#else
+
+int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
+                                                        unsigned int flags)
+        {
+        CMSerr(CMS_F_CMS_UNCOMPRESS, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+        return 0;
+        }
+
+CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags)
+        {
+        CMSerr(CMS_F_CMS_COMPRESS, CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM);
+        return NULL;
+        }
+
+#endif
diff --git a/src/lib/libssl/src/crypto/des/asm/des_enc.m4 b/src/lib/libssl/src/crypto/des/asm/des_enc.m4
new file mode 100644
index 0000000000..f5b1928f99
--- /dev/null
+++ b/src/lib/libssl/src/crypto/des/asm/des_enc.m4
@@ -0,0 +1,1980 @@
+!  des_enc.m4
+!  des_enc.S  (generated from des_enc.m4)
+!
+!  UltraSPARC assembler version of the LibDES/SSLeay/OpenSSL des_enc.c file.
+!
+!  Version 1.0. 32-bit version.
+!
+!  June 8, 2000.
+!
+!  Version 2.0. 32/64-bit, PIC-ification, blended CPU adaptation
+!               by Andy Polyakov.
+!
+!  January 1, 2003.
+!
+!  Assembler version: Copyright Svend Olaf Mikkelsen.
+!
+!  Original C code: Copyright Eric A. Young.
+!
+!  This code can be freely used by LibDES/SSLeay/OpenSSL users.
+!
+!  The LibDES/SSLeay/OpenSSL copyright notices must be respected.
+!
+!  This version can be redistributed.
+!
+!  To expand the m4 macros: m4 -B 8192 des_enc.m4 > des_enc.S
+!
+!  Global registers 1 to 5 are used. This is the same as done by the
+!  cc compiler. The UltraSPARC load/store little endian feature is used.
+!
+!  Instruction grouping often refers to one CPU cycle.
+!
+!  Assemble through gcc: gcc -c -mcpu=ultrasparc -o des_enc.o des_enc.S
+!
+!  Assemble through cc:  cc -c -xarch=v8plusa -o des_enc.o des_enc.S
+!
+!  Performance improvement according to './apps/openssl speed des'
+!
+!       32-bit build:
+!               23%  faster than cc-5.2 -xarch=v8plus -xO5
+!               115% faster than gcc-3.2.1 -m32 -mcpu=ultrasparc -O5
+!       64-bit build:
+!               50%  faster than cc-5.2 -xarch=v9 -xO5
+!               100% faster than gcc-3.2.1 -m64 -mcpu=ultrasparc -O5
+!
+
+.ident "des_enc.m4 2.1"
+
+#if defined(__SUNPRO_C) && defined(__sparcv9)
+# define ABI64  /* They've said -xarch=v9 at command line */
+#elif defined(__GNUC__) && defined(__arch64__)
+# define ABI64  /* They've said -m64 at command line */
+#endif
+
+#ifdef ABI64
+  .register     %g2,#scratch
+  .register     %g3,#scratch
+# define        FRAME   -192
+# define        BIAS    2047
+# define        LDPTR   ldx
+# define        STPTR   stx
+# define        ARG0    128
+# define        ARGSZ   8
+# ifndef OPENSSL_SYSNAME_ULTRASPARC
+# define OPENSSL_SYSNAME_ULTRASPARC
+# endif
+#else
+# define        FRAME   -96
+# define        BIAS    0
+# define        LDPTR   ld
+# define        STPTR   st
+# define        ARG0    68
+# define        ARGSZ   4
+#endif
+
+#define LOOPS 7
+
+#define global0 %g0
+#define global1 %g1
+#define global2 %g2
+#define global3 %g3
+#define global4 %g4
+#define global5 %g5
+
+#define local0 %l0
+#define local1 %l1
+#define local2 %l2
+#define local3 %l3
+#define local4 %l4
+#define local5 %l5
+#define local7 %l6
+#define local6 %l7
+
+#define in0 %i0
+#define in1 %i1
+#define in2 %i2
+#define in3 %i3
+#define in4 %i4
+#define in5 %i5
+#define in6 %i6
+#define in7 %i7
+
+#define out0 %o0
+#define out1 %o1
+#define out2 %o2
+#define out3 %o3
+#define out4 %o4
+#define out5 %o5
+#define out6 %o6
+#define out7 %o7
+
+#define stub stb
+
+changequote({,})
+
+
+! Macro definitions:
+
+
+! {ip_macro}
+!
+! The logic used in initial and final permutations is the same as in
+! the C code. The permutations are done with a clever shift, xor, and
+! technique.
+!
+! The macro also loads address sbox 1 to 5 to global 1 to 5, address
+! sbox 6 to local6, and addres sbox 8 to out3.
+!
+! Rotates the halfs 3 left to bring the sbox bits in convenient positions.
+!
+! Loads key first round from address in parameter 5 to out0, out1.
+!
+! After the the original LibDES initial permutation, the resulting left
+! is in the variable initially used for right and vice versa. The macro
+! implements the possibility to keep the halfs in the original registers.
+!
+! parameter 1  left
+! parameter 2  right
+! parameter 3  result left (modify in first round)
+! parameter 4  result right (use in first round)
+! parameter 5  key address
+! parameter 6  1/2 for include encryption/decryption
+! parameter 7  1 for move in1 to in3
+! parameter 8  1 for move in3 to in4, 2 for move in4 to in3
+! parameter 9  1 for load ks3 and ks2 to in4 and in3
+
+define(ip_macro, {
+
+! {ip_macro}
+! $1 $2 $4 $3 $5 $6 $7 $8 $9
+
+        ld      [out2+256], local1
+        srl     $2, 4, local4
+
+        xor     local4, $1, local4
+        ifelse($7,1,{mov in1, in3},{nop})
+
+        ld      [out2+260], local2
+        and     local4, local1, local4
+        ifelse($8,1,{mov in3, in4},{})
+        ifelse($8,2,{mov in4, in3},{})
+
+        ld      [out2+280], out4          ! loop counter
+        sll     local4, 4, local1
+        xor     $1, local4, $1
+
+        ld      [out2+264], local3
+        srl     $1, 16, local4
+        xor     $2, local1, $2
+
+        ifelse($9,1,{LDPTR      KS3, in4},{})
+        xor     local4, $2, local4
+        nop     !sethi  %hi(DES_SPtrans), global1 ! sbox addr
+
+        ifelse($9,1,{LDPTR      KS2, in3},{})
+        and     local4, local2, local4
+        nop     !or     global1, %lo(DES_SPtrans), global1   ! sbox addr
+
+        sll     local4, 16, local1
+        xor     $2, local4, $2
+
+        srl     $2, 2, local4
+        xor     $1, local1, $1
+
+        sethi   %hi(16711680), local5
+        xor     local4, $1, local4
+
+        and     local4, local3, local4
+        or      local5, 255, local5
+
+        sll     local4, 2, local2
+        xor     $1, local4, $1
+
+        srl     $1, 8, local4
+        xor     $2, local2, $2
+
+        xor     local4, $2, local4
+        add     global1, 768, global4
+
+        and     local4, local5, local4
+        add     global1, 1024, global5
+
+        ld      [out2+272], local7
+        sll     local4, 8, local1
+        xor     $2, local4, $2
+
+        srl     $2, 1, local4
+        xor     $1, local1, $1
+
+        ld      [$5], out0                ! key 7531
+        xor     local4, $1, local4
+        add     global1, 256, global2
+
+        ld      [$5+4], out1              ! key 8642
+        and     local4, local7, local4
+        add     global1, 512, global3
+
+        sll     local4, 1, local1
+        xor     $1, local4, $1
+
+        sll     $1, 3, local3
+        xor     $2, local1, $2
+
+        sll     $2, 3, local2
+        add     global1, 1280, local6     ! address sbox 8
+
+        srl     $1, 29, local4
+        add     global1, 1792, out3       ! address sbox 8
+
+        srl     $2, 29, local1
+        or      local4, local3, $4
+
+        or      local2, local1, $3
+
+        ifelse($6, 1, {
+
+                ld      [out2+284], local5     ! 0x0000FC00 used in the rounds
+                or      local2, local1, $3
+                xor     $4, out0, local1
+
+                call .des_enc.1
+                and     local1, 252, local1
+
+        },{})
+
+        ifelse($6, 2, {
+
+                ld      [out2+284], local5     ! 0x0000FC00 used in the rounds
+                or      local2, local1, $3
+                xor     $4, out0, local1
+
+                call .des_dec.1
+                and     local1, 252, local1
+
+        },{})
+})
+
+
+! {rounds_macro}
+!
+! The logic used in the DES rounds is the same as in the C code,
+! except that calculations for sbox 1 and sbox 5 begin before
+! the previous round is finished.
+!
+! In each round one half (work) is modified based on key and the
+! other half (use).
+!
+! In this version we do two rounds in a loop repeated 7 times
+! and two rounds seperately.
+!
+! One half has the bits for the sboxes in the following positions:
+!
+!       777777xx555555xx333333xx111111xx
+!
+!       88xx666666xx444444xx222222xx8888
+!
+! The bits for each sbox are xor-ed with the key bits for that box.
+! The above xx bits are cleared, and the result used for lookup in
+! the sbox table. Each sbox entry contains the 4 output bits permuted
+! into 32 bits according to the P permutation.
+!
+! In the description of DES, left and right are switched after
+! each round, except after last round. In this code the original
+! left and right are kept in the same register in all rounds, meaning
+! that after the 16 rounds the result for right is in the register
+! originally used for left.
+!
+! parameter 1  first work (left in first round)
+! parameter 2  first use (right in first round)
+! parameter 3  enc/dec  1/-1
+! parameter 4  loop label
+! parameter 5  key address register
+! parameter 6  optional address for key next encryption/decryption
+! parameter 7  not empty for include retl
+!
+! also compares in2 to 8
+
+define(rounds_macro, {
+
+! {rounds_macro}
+! $1 $2 $3 $4 $5 $6 $7 $8 $9
+
+        xor     $2, out0, local1
+
+        ld      [out2+284], local5        ! 0x0000FC00
+        ba      $4
+        and     local1, 252, local1
+
+        .align 32
+
+$4:
+        ! local6 is address sbox 6
+        ! out3   is address sbox 8
+        ! out4   is loop counter
+
+        ld      [global1+local1], local1
+        xor     $2, out1, out1            ! 8642
+        xor     $2, out0, out0            ! 7531
+        fmovs   %f0, %f0                  ! fxor used for alignment
+
+        srl     out1, 4, local0           ! rotate 4 right
+        and     out0, local5, local3      ! 3
+        fmovs   %f0, %f0
+
+        ld      [$5+$3*8], local7         ! key 7531 next round
+        srl     local3, 8, local3         ! 3
+        and     local0, 252, local2       ! 2
+        fmovs   %f0, %f0
+
+        ld      [global3+local3],local3   ! 3
+        sll     out1, 28, out1            ! rotate
+        xor     $1, local1, $1            ! 1 finished, local1 now sbox 7
+
+        ld      [global2+local2], local2  ! 2 
+        srl     out0, 24, local1          ! 7
+        or      out1, local0, out1        ! rotate
+
+        ldub    [out2+local1], local1     ! 7 (and 0xFC)
+        srl     out1, 24, local0          ! 8
+        and     out1, local5, local4      ! 4
+
+        ldub    [out2+local0], local0     ! 8 (and 0xFC)
+        srl     local4, 8, local4         ! 4
+        xor     $1, local2, $1            ! 2 finished local2 now sbox 6
+
+        ld      [global4+local4],local4   ! 4
+        srl     out1, 16, local2          ! 6
+        xor     $1, local3, $1            ! 3 finished local3 now sbox 5
+
+        ld      [out3+local0],local0      ! 8
+        and     local2, 252, local2       ! 6
+        add     global1, 1536, local5     ! address sbox 7
+
+        ld      [local6+local2], local2   ! 6
+        srl     out0, 16, local3          ! 5
+        xor     $1, local4, $1            ! 4 finished
+
+        ld      [local5+local1],local1    ! 7
+        and     local3, 252, local3       ! 5
+        xor     $1, local0, $1            ! 8 finished
+
+        ld      [global5+local3],local3   ! 5
+        xor     $1, local2, $1            ! 6 finished
+        subcc   out4, 1, out4
+
+        ld      [$5+$3*8+4], out0         ! key 8642 next round
+        xor     $1, local7, local2        ! sbox 5 next round
+        xor     $1, local1, $1            ! 7 finished
+
+        srl     local2, 16, local2        ! sbox 5 next round
+        xor     $1, local3, $1            ! 5 finished
+
+        ld      [$5+$3*16+4], out1        ! key 8642 next round again
+        and     local2, 252, local2       ! sbox5 next round
+! next round
+        xor     $1, local7, local7        ! 7531
+
+        ld      [global5+local2], local2  ! 5
+        srl     local7, 24, local3        ! 7
+        xor     $1, out0, out0            ! 8642
+
+        ldub    [out2+local3], local3     ! 7 (and 0xFC)
+        srl     out0, 4, local0           ! rotate 4 right
+        and     local7, 252, local1       ! 1
+
+        sll     out0, 28, out0            ! rotate
+        xor     $2, local2, $2            ! 5 finished local2 used
+
+        srl     local0, 8, local4         ! 4
+        and     local0, 252, local2       ! 2
+        ld      [local5+local3], local3   ! 7
+
+        srl     local0, 16, local5        ! 6
+        or      out0, local0, out0        ! rotate
+        ld      [global2+local2], local2  ! 2
+
+        srl     out0, 24, local0
+        ld      [$5+$3*16], out0          ! key 7531 next round
+        and     local4, 252, local4       ! 4
+
+        and     local5, 252, local5       ! 6
+        ld      [global4+local4], local4  ! 4
+        xor     $2, local3, $2            ! 7 finished local3 used
+
+        and     local0, 252, local0       ! 8
+        ld      [local6+local5], local5   ! 6
+        xor     $2, local2, $2            ! 2 finished local2 now sbox 3
+
+        srl     local7, 8, local2         ! 3 start
+        ld      [out3+local0], local0     ! 8
+        xor     $2, local4, $2            ! 4 finished
+
+        and     local2, 252, local2       ! 3
+        ld      [global1+local1], local1  ! 1
+        xor     $2, local5, $2            ! 6 finished local5 used
+
+        ld      [global3+local2], local2  ! 3
+        xor     $2, local0, $2            ! 8 finished
+        add     $5, $3*16, $5             ! enc add 8, dec add -8 to key pointer
+
+        ld      [out2+284], local5        ! 0x0000FC00
+        xor     $2, out0, local4          ! sbox 1 next round
+        xor     $2, local1, $2            ! 1 finished
+
+        xor     $2, local2, $2            ! 3 finished
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bne,pt  %icc, $4
+#else
+        bne     $4
+#endif
+        and     local4, 252, local1       ! sbox 1 next round
+
+! two rounds more:
+
+        ld      [global1+local1], local1
+        xor     $2, out1, out1
+        xor     $2, out0, out0
+
+        srl     out1, 4, local0           ! rotate
+        and     out0, local5, local3
+
+        ld      [$5+$3*8], local7         ! key 7531
+        srl     local3, 8, local3
+        and     local0, 252, local2
+
+        ld      [global3+local3],local3
+        sll     out1, 28, out1            ! rotate
+        xor     $1, local1, $1            ! 1 finished, local1 now sbox 7
+
+        ld      [global2+local2], local2
+        srl     out0, 24, local1
+        or      out1, local0, out1        ! rotate
+
+        ldub    [out2+local1], local1
+        srl     out1, 24, local0
+        and     out1, local5, local4
+
+        ldub    [out2+local0], local0
+        srl     local4, 8, local4
+        xor     $1, local2, $1            ! 2 finished local2 now sbox 6
+
+        ld      [global4+local4],local4
+        srl     out1, 16, local2
+        xor     $1, local3, $1            ! 3 finished local3 now sbox 5
+
+        ld      [out3+local0],local0
+        and     local2, 252, local2
+        add     global1, 1536, local5     ! address sbox 7
+
+        ld      [local6+local2], local2
+        srl     out0, 16, local3
+        xor     $1, local4, $1            ! 4 finished
+
+        ld      [local5+local1],local1
+        and     local3, 252, local3
+        xor     $1, local0, $1
+
+        ld      [global5+local3],local3
+        xor     $1, local2, $1            ! 6 finished
+        cmp     in2, 8
+
+        ifelse($6,{}, {}, {ld   [out2+280], out4})  ! loop counter
+        xor     $1, local7, local2        ! sbox 5 next round
+        xor     $1, local1, $1            ! 7 finished
+
+        ld      [$5+$3*8+4], out0
+        srl     local2, 16, local2        ! sbox 5 next round
+        xor     $1, local3, $1            ! 5 finished
+
+        and     local2, 252, local2
+! next round (two rounds more)
+        xor     $1, local7, local7        ! 7531
+
+        ld      [global5+local2], local2
+        srl     local7, 24, local3
+        xor     $1, out0, out0            ! 8642
+
+        ldub    [out2+local3], local3
+        srl     out0, 4, local0           ! rotate
+        and     local7, 252, local1
+
+        sll     out0, 28, out0            ! rotate
+        xor     $2, local2, $2            ! 5 finished local2 used
+
+        srl     local0, 8, local4
+        and     local0, 252, local2
+        ld      [local5+local3], local3
+
+        srl     local0, 16, local5
+        or      out0, local0, out0        ! rotate
+        ld      [global2+local2], local2
+
+        srl     out0, 24, local0
+        ifelse($6,{}, {}, {ld   [$6], out0})   ! key next encryption/decryption
+        and     local4, 252, local4
+
+        and     local5, 252, local5
+        ld      [global4+local4], local4
+        xor     $2, local3, $2            ! 7 finished local3 used
+
+        and     local0, 252, local0
+        ld      [local6+local5], local5
+        xor     $2, local2, $2            ! 2 finished local2 now sbox 3
+
+        srl     local7, 8, local2         ! 3 start
+        ld      [out3+local0], local0
+        xor     $2, local4, $2
+
+        and     local2, 252, local2
+        ld      [global1+local1], local1
+        xor     $2, local5, $2            ! 6 finished local5 used
+
+        ld      [global3+local2], local2
+        srl     $1, 3, local3
+        xor     $2, local0, $2
+
+        ifelse($6,{}, {}, {ld   [$6+4], out1}) ! key next encryption/decryption
+        sll     $1, 29, local4
+        xor     $2, local1, $2
+
+        ifelse($7,{}, {}, {retl})
+        xor     $2, local2, $2
+})
+
+
+! {fp_macro}
+!
+!  parameter 1   right (original left)
+!  parameter 2   left (original right)
+!  parameter 3   1 for optional store to [in0]
+!  parameter 4   1 for load input/output address to local5/7
+!
+!  The final permutation logic switches the halfes, meaning that
+!  left and right ends up the the registers originally used.
+
+define(fp_macro, {
+
+! {fp_macro}
+! $1 $2 $3 $4 $5 $6 $7 $8 $9
+
+        ! initially undo the rotate 3 left done after initial permutation
+        ! original left is received shifted 3 right and 29 left in local3/4
+
+        sll     $2, 29, local1
+        or      local3, local4, $1
+
+        srl     $2, 3, $2
+        sethi   %hi(0x55555555), local2
+
+        or      $2, local1, $2
+        or      local2, %lo(0x55555555), local2
+
+        srl     $2, 1, local3
+        sethi   %hi(0x00ff00ff), local1
+        xor     local3, $1, local3
+        or      local1, %lo(0x00ff00ff), local1
+        and     local3, local2, local3
+        sethi   %hi(0x33333333), local4
+        sll     local3, 1, local2
+
+        xor     $1, local3, $1
+
+        srl     $1, 8, local3
+        xor     $2, local2, $2
+        xor     local3, $2, local3
+        or      local4, %lo(0x33333333), local4
+        and     local3, local1, local3
+        sethi   %hi(0x0000ffff), local1
+        sll     local3, 8, local2
+
+        xor     $2, local3, $2
+
+        srl     $2, 2, local3
+        xor     $1, local2, $1
+        xor     local3, $1, local3
+        or      local1, %lo(0x0000ffff), local1
+        and     local3, local4, local3
+        sethi   %hi(0x0f0f0f0f), local4
+        sll     local3, 2, local2
+
+        ifelse($4,1, {LDPTR INPUT, local5})
+        xor     $1, local3, $1
+
+        ifelse($4,1, {LDPTR OUTPUT, local7})
+        srl     $1, 16, local3
+        xor     $2, local2, $2
+        xor     local3, $2, local3
+        or      local4, %lo(0x0f0f0f0f), local4
+        and     local3, local1, local3
+        sll     local3, 16, local2
+
+        xor     $2, local3, local1
+
+        srl     local1, 4, local3
+        xor     $1, local2, $1
+        xor     local3, $1, local3
+        and     local3, local4, local3
+        sll     local3, 4, local2
+
+        xor     $1, local3, $1
+
+        ! optional store:
+
+        ifelse($3,1, {st $1, [in0]})
+
+        xor     local1, local2, $2
+
+        ifelse($3,1, {st $2, [in0+4]})
+
+})
+
+
+! {fp_ip_macro}
+!
+! Does initial permutation for next block mixed with
+! final permutation for current block.
+!
+! parameter 1   original left
+! parameter 2   original right
+! parameter 3   left ip
+! parameter 4   right ip
+! parameter 5   1: load ks1/ks2 to in3/in4, add 120 to in4
+!                2: mov in4 to in3
+!
+! also adds -8 to length in2 and loads loop counter to out4
+
+define(fp_ip_macro, {
+
+! {fp_ip_macro}
+! $1 $2 $3 $4 $5 $6 $7 $8 $9
+
+        define({temp1},{out4})
+        define({temp2},{local3})
+
+        define({ip1},{local1})
+        define({ip2},{local2})
+        define({ip4},{local4})
+        define({ip5},{local5})
+
+        ! $1 in local3, local4
+
+        ld      [out2+256], ip1
+        sll     out5, 29, temp1
+        or      local3, local4, $1
+
+        srl     out5, 3, $2
+        ifelse($5,2,{mov in4, in3})
+
+        ld      [out2+272], ip5
+        srl     $4, 4, local0
+        or      $2, temp1, $2
+
+        srl     $2, 1, temp1
+        xor     temp1, $1, temp1
+
+        and     temp1, ip5, temp1
+        xor     local0, $3, local0
+
+        sll     temp1, 1, temp2
+        xor     $1, temp1, $1
+
+        and     local0, ip1, local0
+        add     in2, -8, in2
+
+        sll     local0, 4, local7
+        xor     $3, local0, $3
+
+        ld      [out2+268], ip4
+        srl     $1, 8, temp1
+        xor     $2, temp2, $2
+        ld      [out2+260], ip2
+        srl     $3, 16, local0
+        xor     $4, local7, $4
+        xor     temp1, $2, temp1
+        xor     local0, $4, local0
+        and     temp1, ip4, temp1
+        and     local0, ip2, local0
+        sll     temp1, 8, temp2
+        xor     $2, temp1, $2
+        sll     local0, 16, local7
+        xor     $4, local0, $4
+
+        srl     $2, 2, temp1
+        xor     $1, temp2, $1
+
+        ld      [out2+264], temp2         ! ip3
+        srl     $4, 2, local0
+        xor     $3, local7, $3
+        xor     temp1, $1, temp1
+        xor     local0, $3, local0
+        and     temp1, temp2, temp1
+        and     local0, temp2, local0
+        sll     temp1, 2, temp2
+        xor     $1, temp1, $1
+        sll     local0, 2, local7
+        xor     $3, local0, $3
+
+        srl     $1, 16, temp1
+        xor     $2, temp2, $2
+        srl     $3, 8, local0
+        xor     $4, local7, $4
+        xor     temp1, $2, temp1
+        xor     local0, $4, local0
+        and     temp1, ip2, temp1
+        and     local0, ip4, local0
+        sll     temp1, 16, temp2
+        xor     $2, temp1, local4
+        sll     local0, 8, local7
+        xor     $4, local0, $4
+
+        srl     $4, 1, local0
+        xor     $3, local7, $3
+
+        srl     local4, 4, temp1
+        xor     local0, $3, local0
+
+        xor     $1, temp2, $1
+        and     local0, ip5, local0
+
+        sll     local0, 1, local7
+        xor     temp1, $1, temp1
+
+        xor     $3, local0, $3
+        xor     $4, local7, $4
+
+        sll     $3, 3, local5
+        and     temp1, ip1, temp1
+
+        sll     temp1, 4, temp2
+        xor     $1, temp1, $1
+
+        ifelse($5,1,{LDPTR      KS2, in4})
+        sll     $4, 3, local2
+        xor     local4, temp2, $2
+
+        ! reload since used as temporar:
+
+        ld      [out2+280], out4          ! loop counter
+
+        srl     $3, 29, local0
+        ifelse($5,1,{add in4, 120, in4})
+
+        ifelse($5,1,{LDPTR      KS1, in3})
+        srl     $4, 29, local7
+
+        or      local0, local5, $4
+        or      local2, local7, $3
+
+})
+
+
+
+! {load_little_endian}
+!
+! parameter 1  address
+! parameter 2  destination left
+! parameter 3  destination right
+! parameter 4  temporar
+! parameter 5  label
+
+define(load_little_endian, {
+
+! {load_little_endian}
+! $1 $2 $3 $4 $5 $6 $7 $8 $9
+
+        ! first in memory to rightmost in register
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        andcc   $1, 3, global0
+        bne,pn  %icc, $5
+        nop
+
+        lda     [$1] 0x88, $2
+        add     $1, 4, $4
+
+        ba,pt   %icc, $5a
+        lda     [$4] 0x88, $3
+#endif
+
+$5:
+        ldub    [$1+3], $2
+
+        ldub    [$1+2], $4
+        sll     $2, 8, $2
+        or      $2, $4, $2
+
+        ldub    [$1+1], $4
+        sll     $2, 8, $2
+        or      $2, $4, $2
+
+        ldub    [$1+0], $4
+        sll     $2, 8, $2
+        or      $2, $4, $2
+
+
+        ldub    [$1+3+4], $3
+
+        ldub    [$1+2+4], $4
+        sll     $3, 8, $3
+        or      $3, $4, $3
+
+        ldub    [$1+1+4], $4
+        sll     $3, 8, $3
+        or      $3, $4, $3
+
+        ldub    [$1+0+4], $4
+        sll     $3, 8, $3
+        or      $3, $4, $3
+$5a:
+
+})
+
+
+! {load_little_endian_inc}
+!
+! parameter 1  address
+! parameter 2  destination left
+! parameter 3  destination right
+! parameter 4  temporar
+! parameter 4  label
+!
+! adds 8 to address
+
+define(load_little_endian_inc, {
+
+! {load_little_endian_inc}
+! $1 $2 $3 $4 $5 $6 $7 $8 $9
+
+        ! first in memory to rightmost in register
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        andcc   $1, 3, global0
+        bne,pn  %icc, $5
+        nop
+
+        lda     [$1] 0x88, $2
+        add     $1, 4, $1
+
+        lda     [$1] 0x88, $3
+        ba,pt   %icc, $5a
+        add     $1, 4, $1
+#endif
+
+$5:
+        ldub    [$1+3], $2
+
+        ldub    [$1+2], $4
+        sll     $2, 8, $2
+        or      $2, $4, $2
+
+        ldub    [$1+1], $4
+        sll     $2, 8, $2
+        or      $2, $4, $2
+
+        ldub    [$1+0], $4
+        sll     $2, 8, $2
+        or      $2, $4, $2
+
+        ldub    [$1+3+4], $3
+        add     $1, 8, $1
+
+        ldub    [$1+2+4-8], $4
+        sll     $3, 8, $3
+        or      $3, $4, $3
+
+        ldub    [$1+1+4-8], $4
+        sll     $3, 8, $3
+        or      $3, $4, $3
+
+        ldub    [$1+0+4-8], $4
+        sll     $3, 8, $3
+        or      $3, $4, $3
+$5a:
+
+})
+
+
+! {load_n_bytes}
+!
+! Loads 1 to 7 bytes little endian
+! Remaining bytes are zeroed.
+!
+! parameter 1  address
+! parameter 2  length
+! parameter 3  destination register left
+! parameter 4  destination register right
+! parameter 5  temp
+! parameter 6  temp2
+! parameter 7  label
+! parameter 8  return label
+
+define(load_n_bytes, {
+
+! {load_n_bytes}
+! $1 $2 $5 $6 $7 $8 $7 $8 $9
+
+$7.0:   call    .+8
+        sll     $2, 2, $6
+
+        add     %o7,$7.jmp.table-$7.0,$5
+
+        add     $5, $6, $5
+        mov     0, $4
+
+        ld      [$5], $5
+
+        jmp     %o7+$5
+        mov     0, $3
+
+$7.7:
+        ldub    [$1+6], $5
+        sll     $5, 16, $5
+        or      $3, $5, $3
+$7.6:
+        ldub    [$1+5], $5
+        sll     $5, 8, $5
+        or      $3, $5, $3
+$7.5:
+        ldub    [$1+4], $5
+        or      $3, $5, $3
+$7.4:
+        ldub    [$1+3], $5
+        sll     $5, 24, $5
+        or      $4, $5, $4
+$7.3:
+        ldub    [$1+2], $5
+        sll     $5, 16, $5
+        or      $4, $5, $4
+$7.2:
+        ldub    [$1+1], $5
+        sll     $5, 8, $5
+        or      $4, $5, $4
+$7.1:
+        ldub    [$1+0], $5
+        ba      $8
+        or      $4, $5, $4
+
+        .align 4
+
+$7.jmp.table:
+        .word   0
+        .word   $7.1-$7.0
+        .word   $7.2-$7.0
+        .word   $7.3-$7.0
+        .word   $7.4-$7.0
+        .word   $7.5-$7.0
+        .word   $7.6-$7.0
+        .word   $7.7-$7.0
+})
+
+
+! {store_little_endian}
+!
+! parameter 1  address
+! parameter 2  source left
+! parameter 3  source right
+! parameter 4  temporar
+
+define(store_little_endian, {
+
+! {store_little_endian}
+! $1 $2 $3 $4 $5 $6 $7 $8 $9
+
+        ! rightmost in register to first in memory
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        andcc   $1, 3, global0
+        bne,pn  %icc, $5
+        nop
+
+        sta     $2, [$1] 0x88
+        add     $1, 4, $4
+
+        ba,pt   %icc, $5a
+        sta     $3, [$4] 0x88
+#endif
+
+$5:
+        and     $2, 255, $4
+        stub    $4, [$1+0]
+
+        srl     $2, 8, $4
+        and     $4, 255, $4
+        stub    $4, [$1+1]
+
+        srl     $2, 16, $4
+        and     $4, 255, $4
+        stub    $4, [$1+2]
+
+        srl     $2, 24, $4
+        stub    $4, [$1+3]
+
+
+        and     $3, 255, $4
+        stub    $4, [$1+0+4]
+
+        srl     $3, 8, $4
+        and     $4, 255, $4
+        stub    $4, [$1+1+4]
+
+        srl     $3, 16, $4
+        and     $4, 255, $4
+        stub    $4, [$1+2+4]
+
+        srl     $3, 24, $4
+        stub    $4, [$1+3+4]
+
+$5a:
+
+})
+
+
+! {store_n_bytes}
+!
+! Stores 1 to 7 bytes little endian
+!
+! parameter 1  address
+! parameter 2  length
+! parameter 3  source register left
+! parameter 4  source register right
+! parameter 5  temp
+! parameter 6  temp2
+! parameter 7  label
+! parameter 8  return label
+
+define(store_n_bytes, {
+
+! {store_n_bytes}
+! $1 $2 $5 $6 $7 $8 $7 $8 $9
+
+$7.0:   call    .+8
+        sll     $2, 2, $6
+
+        add     %o7,$7.jmp.table-$7.0,$5
+
+        add     $5, $6, $5
+
+        ld      [$5], $5
+
+        jmp     %o7+$5
+        nop
+
+$7.7:
+        srl     $3, 16, $5
+        and     $5, 0xff, $5
+        stub    $5, [$1+6]
+$7.6:
+        srl     $3, 8, $5
+        and     $5, 0xff, $5
+        stub    $5, [$1+5]
+$7.5:
+        and     $3, 0xff, $5
+        stub    $5, [$1+4]
+$7.4:
+        srl     $4, 24, $5
+        stub    $5, [$1+3]
+$7.3:
+        srl     $4, 16, $5
+        and     $5, 0xff, $5
+        stub    $5, [$1+2]
+$7.2:
+        srl     $4, 8, $5
+        and     $5, 0xff, $5
+        stub    $5, [$1+1]
+$7.1:
+        and     $4, 0xff, $5
+
+
+        ba      $8
+        stub    $5, [$1]
+
+        .align 4
+
+$7.jmp.table:
+
+        .word   0
+        .word   $7.1-$7.0
+        .word   $7.2-$7.0
+        .word   $7.3-$7.0
+        .word   $7.4-$7.0
+        .word   $7.5-$7.0
+        .word   $7.6-$7.0
+        .word   $7.7-$7.0
+})
+
+
+define(testvalue,{1})
+
+define(register_init, {
+
+! For test purposes:
+
+        sethi   %hi(testvalue), local0
+        or      local0, %lo(testvalue), local0
+
+        ifelse($1,{},{}, {mov   local0, $1})
+        ifelse($2,{},{}, {mov   local0, $2})
+        ifelse($3,{},{}, {mov   local0, $3})
+        ifelse($4,{},{}, {mov   local0, $4})
+        ifelse($5,{},{}, {mov   local0, $5})
+        ifelse($6,{},{}, {mov   local0, $6})
+        ifelse($7,{},{}, {mov   local0, $7})
+        ifelse($8,{},{}, {mov   local0, $8})
+
+        mov     local0, local1
+        mov     local0, local2
+        mov     local0, local3
+        mov     local0, local4
+        mov     local0, local5
+        mov     local0, local7
+        mov     local0, local6
+        mov     local0, out0
+        mov     local0, out1
+        mov     local0, out2
+        mov     local0, out3
+        mov     local0, out4
+        mov     local0, out5
+        mov     local0, global1
+        mov     local0, global2
+        mov     local0, global3
+        mov     local0, global4
+        mov     local0, global5
+
+})
+
+.section        ".text"
+
+        .align 32
+
+.des_enc:
+
+        ! key address in3
+        ! loads key next encryption/decryption first round from [in4]
+
+        rounds_macro(in5, out5, 1, .des_enc.1, in3, in4, retl)
+
+
+        .align 32
+
+.des_dec:
+
+        ! implemented with out5 as first parameter to avoid
+        ! register exchange in ede modes
+
+        ! key address in4
+        ! loads key next encryption/decryption first round from [in3]
+
+        rounds_macro(out5, in5, -1, .des_dec.1, in4, in3, retl)
+
+
+
+! void DES_encrypt1(data, ks, enc)
+! *******************************
+
+        .align 32
+        .global DES_encrypt1
+        .type    DES_encrypt1,#function
+
+DES_encrypt1:
+
+        save    %sp, FRAME, %sp
+
+        call    .PIC.me.up
+        mov     .PIC.me.up-(.-4),out0
+
+        ld      [in0], in5                ! left
+        cmp     in2, 0                    ! enc
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        be,pn   %icc, .encrypt.dec        ! enc/dec
+#else
+        be      .encrypt.dec
+#endif
+        ld      [in0+4], out5             ! right
+
+        ! parameter 6  1/2 for include encryption/decryption
+        ! parameter 7  1 for move in1 to in3
+        ! parameter 8  1 for move in3 to in4, 2 for move in4 to in3
+
+        ip_macro(in5, out5, in5, out5, in3, 0, 1, 1)
+
+        rounds_macro(in5, out5, 1, .des_encrypt1.1, in3, in4) ! in4 not used
+
+        fp_macro(in5, out5, 1)            ! 1 for store to [in0]
+
+        ret
+        restore
+
+.encrypt.dec:
+
+        add     in1, 120, in3             ! use last subkey for first round
+
+        ! parameter 6  1/2 for include encryption/decryption
+        ! parameter 7  1 for move in1 to in3
+        ! parameter 8  1 for move in3 to in4, 2 for move in4 to in3
+
+        ip_macro(in5, out5, out5, in5, in4, 2, 0, 1) ! include dec,  ks in4
+
+        fp_macro(out5, in5, 1)            ! 1 for store to [in0]
+
+        ret
+        restore
+
+.DES_encrypt1.end:
+        .size    DES_encrypt1,.DES_encrypt1.end-DES_encrypt1
+
+
+! void DES_encrypt2(data, ks, enc)
+!*********************************
+
+        ! encrypts/decrypts without initial/final permutation
+
+        .align 32
+        .global DES_encrypt2
+        .type    DES_encrypt2,#function
+
+DES_encrypt2:
+
+        save    %sp, FRAME, %sp
+
+        call    .PIC.me.up
+        mov     .PIC.me.up-(.-4),out0
+
+        ! Set sbox address 1 to 6 and rotate halfs 3 left
+        ! Errors caught by destest? Yes. Still? *NO*
+
+        !sethi  %hi(DES_SPtrans), global1 ! address sbox 1
+
+        !or     global1, %lo(DES_SPtrans), global1  ! sbox 1
+
+        add     global1, 256, global2     ! sbox 2
+        add     global1, 512, global3     ! sbox 3
+
+        ld      [in0], out5               ! right
+        add     global1, 768, global4     ! sbox 4
+        add     global1, 1024, global5    ! sbox 5
+
+        ld      [in0+4], in5              ! left
+        add     global1, 1280, local6     ! sbox 6
+        add     global1, 1792, out3       ! sbox 8
+
+        ! rotate
+
+        sll     in5, 3, local5
+        mov     in1, in3                  ! key address to in3
+
+        sll     out5, 3, local7
+        srl     in5, 29, in5
+
+        srl     out5, 29, out5
+        add     in5, local5, in5
+
+        add     out5, local7, out5
+        cmp     in2, 0
+
+        ! we use our own stackframe
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        be,pn   %icc, .encrypt2.dec       ! decryption
+#else
+        be      .encrypt2.dec
+#endif
+        STPTR   in0, [%sp+BIAS+ARG0+0*ARGSZ]
+
+        ld      [in3], out0               ! key 7531 first round
+        mov     LOOPS, out4               ! loop counter
+
+        ld      [in3+4], out1             ! key 8642 first round
+        sethi   %hi(0x0000FC00), local5
+
+        call .des_enc
+        mov     in3, in4
+
+        ! rotate
+        sll     in5, 29, in0
+        srl     in5, 3, in5
+        sll     out5, 29, in1
+        add     in5, in0, in5
+        srl     out5, 3, out5
+        LDPTR   [%sp+BIAS+ARG0+0*ARGSZ], in0
+        add     out5, in1, out5
+        st      in5, [in0]
+        st      out5, [in0+4]
+
+        ret
+        restore
+
+
+.encrypt2.dec:
+
+        add in3, 120, in4
+
+        ld      [in4], out0               ! key 7531 first round
+        mov     LOOPS, out4               ! loop counter
+
+        ld      [in4+4], out1             ! key 8642 first round
+        sethi   %hi(0x0000FC00), local5
+
+        mov     in5, local1               ! left expected in out5
+        mov     out5, in5
+
+        call .des_dec
+        mov     local1, out5
+
+.encrypt2.finish:
+
+        ! rotate
+        sll     in5, 29, in0
+        srl     in5, 3, in5
+        sll     out5, 29, in1
+        add     in5, in0, in5
+        srl     out5, 3, out5
+        LDPTR   [%sp+BIAS+ARG0+0*ARGSZ], in0
+        add     out5, in1, out5
+        st      out5, [in0]
+        st      in5, [in0+4]
+
+        ret
+        restore
+
+.DES_encrypt2.end:
+        .size    DES_encrypt2, .DES_encrypt2.end-DES_encrypt2
+
+
+! void DES_encrypt3(data, ks1, ks2, ks3)
+! **************************************
+
+        .align 32
+        .global DES_encrypt3
+        .type    DES_encrypt3,#function
+
+DES_encrypt3:
+
+        save    %sp, FRAME, %sp
+        
+        call    .PIC.me.up
+        mov     .PIC.me.up-(.-4),out0
+
+        ld      [in0], in5                ! left
+        add     in2, 120, in4             ! ks2
+
+        ld      [in0+4], out5             ! right
+        mov     in3, in2                  ! save ks3
+
+        ! parameter 6  1/2 for include encryption/decryption
+        ! parameter 7  1 for mov in1 to in3
+        ! parameter 8  1 for mov in3 to in4
+        ! parameter 9  1 for load ks3 and ks2 to in4 and in3
+
+        ip_macro(in5, out5, in5, out5, in3, 1, 1, 0, 0)
+
+        call    .des_dec
+        mov     in2, in3                  ! preload ks3
+
+        call    .des_enc
+        nop
+
+        fp_macro(in5, out5, 1)
+
+        ret
+        restore
+
+.DES_encrypt3.end:
+        .size    DES_encrypt3,.DES_encrypt3.end-DES_encrypt3
+
+
+! void DES_decrypt3(data, ks1, ks2, ks3)
+! **************************************
+
+        .align 32
+        .global DES_decrypt3
+        .type    DES_decrypt3,#function
+
+DES_decrypt3:
+
+        save    %sp, FRAME, %sp
+        
+        call    .PIC.me.up
+        mov     .PIC.me.up-(.-4),out0
+
+        ld      [in0], in5                ! left
+        add     in3, 120, in4             ! ks3
+
+        ld      [in0+4], out5             ! right
+        mov     in2, in3                  ! ks2
+
+        ! parameter 6  1/2 for include encryption/decryption
+        ! parameter 7  1 for mov in1 to in3
+        ! parameter 8  1 for mov in3 to in4
+        ! parameter 9  1 for load ks3 and ks2 to in4 and in3
+
+        ip_macro(in5, out5, out5, in5, in4, 2, 0, 0, 0)
+
+        call    .des_enc
+        add     in1, 120, in4             ! preload ks1
+
+        call    .des_dec
+        nop
+
+        fp_macro(out5, in5, 1)
+
+        ret
+        restore
+
+.DES_decrypt3.end:
+        .size    DES_decrypt3,.DES_decrypt3.end-DES_decrypt3
+
+        .align  256
+        .type    .des_and,#object
+        .size    .des_and,284
+
+.des_and:
+
+! This table is used for AND 0xFC when it is known that register
+! bits 8-31 are zero. Makes it possible to do three arithmetic
+! operations in one cycle.
+
+        .byte  0, 0, 0, 0, 4, 4, 4, 4
+        .byte  8, 8, 8, 8, 12, 12, 12, 12
+        .byte  16, 16, 16, 16, 20, 20, 20, 20
+        .byte  24, 24, 24, 24, 28, 28, 28, 28
+        .byte  32, 32, 32, 32, 36, 36, 36, 36
+        .byte  40, 40, 40, 40, 44, 44, 44, 44
+        .byte  48, 48, 48, 48, 52, 52, 52, 52
+        .byte  56, 56, 56, 56, 60, 60, 60, 60
+        .byte  64, 64, 64, 64, 68, 68, 68, 68
+        .byte  72, 72, 72, 72, 76, 76, 76, 76
+        .byte  80, 80, 80, 80, 84, 84, 84, 84
+        .byte  88, 88, 88, 88, 92, 92, 92, 92
+        .byte  96, 96, 96, 96, 100, 100, 100, 100
+        .byte  104, 104, 104, 104, 108, 108, 108, 108
+        .byte  112, 112, 112, 112, 116, 116, 116, 116
+        .byte  120, 120, 120, 120, 124, 124, 124, 124
+        .byte  128, 128, 128, 128, 132, 132, 132, 132
+        .byte  136, 136, 136, 136, 140, 140, 140, 140
+        .byte  144, 144, 144, 144, 148, 148, 148, 148
+        .byte  152, 152, 152, 152, 156, 156, 156, 156
+        .byte  160, 160, 160, 160, 164, 164, 164, 164
+        .byte  168, 168, 168, 168, 172, 172, 172, 172
+        .byte  176, 176, 176, 176, 180, 180, 180, 180
+        .byte  184, 184, 184, 184, 188, 188, 188, 188
+        .byte  192, 192, 192, 192, 196, 196, 196, 196
+        .byte  200, 200, 200, 200, 204, 204, 204, 204
+        .byte  208, 208, 208, 208, 212, 212, 212, 212
+        .byte  216, 216, 216, 216, 220, 220, 220, 220
+        .byte  224, 224, 224, 224, 228, 228, 228, 228
+        .byte  232, 232, 232, 232, 236, 236, 236, 236
+        .byte  240, 240, 240, 240, 244, 244, 244, 244
+        .byte  248, 248, 248, 248, 252, 252, 252, 252
+
+        ! 5 numbers for initil/final permutation
+
+        .word   0x0f0f0f0f                ! offset 256
+        .word   0x0000ffff                ! 260
+        .word   0x33333333                ! 264
+        .word   0x00ff00ff                ! 268
+        .word   0x55555555                ! 272
+
+        .word   0                         ! 276
+        .word   LOOPS                     ! 280
+        .word   0x0000FC00                ! 284
+.PIC.DES_SPtrans:
+        .word   %r_disp32(DES_SPtrans)
+
+! input:        out0    offset between .PIC.me.up and caller
+! output:       out0    pointer to .PIC.me.up
+!               out2    pointer to .des_and
+!               global1 pointer to DES_SPtrans
+        .align  32
+.PIC.me.up:
+        add     out0,%o7,out0                   ! pointer to .PIC.me.up
+#if 1
+        ld      [out0+(.PIC.DES_SPtrans-.PIC.me.up)],global1
+        add     global1,(.PIC.DES_SPtrans-.PIC.me.up),global1
+        add     global1,out0,global1
+#else
+# ifdef OPENSSL_PIC
+        ! In case anybody wonders why this code is same for both ABI.
+        ! To start with it is not. Do note LDPTR below. But of course
+        ! you must be wondering why the rest of it does not contain
+        ! things like %hh, %hm and %lm. Well, those are needed only
+        ! if OpenSSL library *itself* will become larger than 4GB,
+        ! which is not going to happen any time soon. 
+        sethi   %hi(DES_SPtrans),global1
+        or      global1,%lo(DES_SPtrans),global1
+        sethi   %hi(_GLOBAL_OFFSET_TABLE_-(.PIC.me.up-.)),out2
+        add     global1,out0,global1
+        add     out2,%lo(_GLOBAL_OFFSET_TABLE_-(.PIC.me.up-.)),out2
+        LDPTR   [out2+global1],global1
+# elif 0
+        setn    DES_SPtrans,out2,global1        ! synthetic instruction !
+# elif defined(ABI64)
+        sethi   %hh(DES_SPtrans),out2
+        or      out2,%hm(DES_SPtrans),out2
+        sethi   %lm(DES_SPtrans),global1
+        or      global1,%lo(DES_SPtrans),global1
+        sllx    out2,32,out2
+        or      out2,global1,global1
+# else
+        sethi   %hi(DES_SPtrans),global1
+        or      global1,%lo(DES_SPtrans),global1
+# endif
+#endif
+        retl
+        add     out0,.des_and-.PIC.me.up,out2
+
+! void DES_ncbc_encrypt(input, output, length, schedule, ivec, enc)
+! *****************************************************************
+
+
+        .align 32
+        .global DES_ncbc_encrypt
+        .type    DES_ncbc_encrypt,#function
+
+DES_ncbc_encrypt:
+
+        save    %sp, FRAME, %sp
+        
+        define({INPUT},  { [%sp+BIAS+ARG0+0*ARGSZ] })
+        define({OUTPUT}, { [%sp+BIAS+ARG0+1*ARGSZ] })
+        define({IVEC},   { [%sp+BIAS+ARG0+4*ARGSZ] })
+
+        call    .PIC.me.up
+        mov     .PIC.me.up-(.-4),out0
+
+        cmp     in5, 0                    ! enc   
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        be,pn   %icc, .ncbc.dec
+#else
+        be      .ncbc.dec
+#endif
+        STPTR   in4, IVEC
+
+        ! addr  left  right  temp  label
+        load_little_endian(in4, in5, out5, local3, .LLE1)  ! iv
+
+        addcc   in2, -8, in2              ! bytes missing when first block done
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bl,pn   %icc, .ncbc.enc.seven.or.less
+#else
+        bl      .ncbc.enc.seven.or.less
+#endif
+        mov     in3, in4                  ! schedule
+
+.ncbc.enc.next.block:
+
+        load_little_endian(in0, out4, global4, local3, .LLE2)  ! block
+
+.ncbc.enc.next.block_1:
+
+        xor     in5, out4, in5            ! iv xor
+        xor     out5, global4, out5       ! iv xor
+
+        ! parameter 8  1 for move in3 to in4, 2 for move in4 to in3
+        ip_macro(in5, out5, in5, out5, in3, 0, 0, 2)
+
+.ncbc.enc.next.block_2:
+
+!//     call .des_enc                     ! compares in2 to 8
+!       rounds inlined for alignment purposes
+
+        add     global1, 768, global4     ! address sbox 4 since register used below
+
+        rounds_macro(in5, out5, 1, .ncbc.enc.1, in3, in4) ! include encryption  ks in3
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bl,pn   %icc, .ncbc.enc.next.block_fp
+#else
+        bl      .ncbc.enc.next.block_fp
+#endif
+        add     in0, 8, in0               ! input address
+
+        ! If 8 or more bytes are to be encrypted after this block,
+        ! we combine final permutation for this block with initial
+        ! permutation for next block. Load next block:
+
+        load_little_endian(in0, global3, global4, local5, .LLE12)
+
+        !  parameter 1   original left
+        !  parameter 2   original right
+        !  parameter 3   left ip
+        !  parameter 4   right ip
+        !  parameter 5   1: load ks1/ks2 to in3/in4, add 120 to in4
+        !                2: mov in4 to in3
+        !
+        ! also adds -8 to length in2 and loads loop counter to out4
+
+        fp_ip_macro(out0, out1, global3, global4, 2)
+
+        store_little_endian(in1, out0, out1, local3, .SLE10)  ! block
+
+        ld      [in3], out0               ! key 7531 first round next block
+        mov     in5, local1
+        xor     global3, out5, in5        ! iv xor next block
+
+        ld      [in3+4], out1             ! key 8642
+        add     global1, 512, global3     ! address sbox 3 since register used
+        xor     global4, local1, out5     ! iv xor next block
+
+        ba      .ncbc.enc.next.block_2
+        add     in1, 8, in1               ! output adress
+
+.ncbc.enc.next.block_fp:
+
+        fp_macro(in5, out5)
+
+        store_little_endian(in1, in5, out5, local3, .SLE1)  ! block
+
+        addcc   in2, -8, in2              ! bytes missing when next block done
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bpos,pt %icc, .ncbc.enc.next.block  ! also jumps if 0
+#else
+        bpos    .ncbc.enc.next.block
+#endif
+        add     in1, 8, in1
+
+.ncbc.enc.seven.or.less:
+
+        cmp     in2, -8
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        ble,pt  %icc, .ncbc.enc.finish
+#else
+        ble     .ncbc.enc.finish
+#endif
+        nop
+
+        add     in2, 8, local1            ! bytes to load
+
+        ! addr, length, dest left, dest right, temp, temp2, label, ret label
+        load_n_bytes(in0, local1, global4, out4, local2, local3, .LNB1, .ncbc.enc.next.block_1)
+
+        ! Loads 1 to 7 bytes little endian to global4, out4
+
+
+.ncbc.enc.finish:
+
+        LDPTR   IVEC, local4
+        store_little_endian(local4, in5, out5, local5, .SLE2)  ! ivec
+
+        ret
+        restore
+
+
+.ncbc.dec:
+
+        STPTR   in0, INPUT
+        cmp     in2, 0                    ! length
+        add     in3, 120, in3
+
+        LDPTR   IVEC, local7              ! ivec
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        ble,pn  %icc, .ncbc.dec.finish
+#else
+        ble     .ncbc.dec.finish
+#endif
+        mov     in3, in4                  ! schedule
+
+        STPTR   in1, OUTPUT
+        mov     in0, local5               ! input
+
+        load_little_endian(local7, in0, in1, local3, .LLE3)   ! ivec
+
+.ncbc.dec.next.block:
+
+        load_little_endian(local5, in5, out5, local3, .LLE4)  ! block
+
+        ! parameter 6  1/2 for include encryption/decryption
+        ! parameter 7  1 for mov in1 to in3
+        ! parameter 8  1 for mov in3 to in4
+
+        ip_macro(in5, out5, out5, in5, in4, 2, 0, 1) ! include decryprion  ks in4
+
+        fp_macro(out5, in5, 0, 1) ! 1 for input and output address to local5/7
+
+        ! in2 is bytes left to be stored
+        ! in2 is compared to 8 in the rounds
+
+        xor     out5, in0, out4           ! iv xor
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bl,pn   %icc, .ncbc.dec.seven.or.less
+#else
+        bl      .ncbc.dec.seven.or.less
+#endif
+        xor     in5, in1, global4         ! iv xor
+
+        ! Load ivec next block now, since input and output address might be the same.
+
+        load_little_endian_inc(local5, in0, in1, local3, .LLE5)  ! iv
+
+        store_little_endian(local7, out4, global4, local3, .SLE3)
+
+        STPTR   local5, INPUT
+        add     local7, 8, local7
+        addcc   in2, -8, in2
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bg,pt   %icc, .ncbc.dec.next.block
+#else
+        bg      .ncbc.dec.next.block
+#endif
+        STPTR   local7, OUTPUT
+
+
+.ncbc.dec.store.iv:
+
+        LDPTR   IVEC, local4              ! ivec
+        store_little_endian(local4, in0, in1, local5, .SLE4)
+
+.ncbc.dec.finish:
+
+        ret
+        restore
+
+.ncbc.dec.seven.or.less:
+
+        load_little_endian_inc(local5, in0, in1, local3, .LLE13)     ! ivec
+
+        store_n_bytes(local7, in2, global4, out4, local3, local4, .SNB1, .ncbc.dec.store.iv)
+
+
+.DES_ncbc_encrypt.end:
+        .size    DES_ncbc_encrypt, .DES_ncbc_encrypt.end-DES_ncbc_encrypt
+
+
+! void DES_ede3_cbc_encrypt(input, output, lenght, ks1, ks2, ks3, ivec, enc)
+! **************************************************************************
+
+
+        .align 32
+        .global DES_ede3_cbc_encrypt
+        .type    DES_ede3_cbc_encrypt,#function
+
+DES_ede3_cbc_encrypt:
+
+        save    %sp, FRAME, %sp
+
+        define({KS1}, { [%sp+BIAS+ARG0+3*ARGSZ] })
+        define({KS2}, { [%sp+BIAS+ARG0+4*ARGSZ] })
+        define({KS3}, { [%sp+BIAS+ARG0+5*ARGSZ] })
+
+        call    .PIC.me.up
+        mov     .PIC.me.up-(.-4),out0
+
+        LDPTR   [%fp+BIAS+ARG0+7*ARGSZ], local3          ! enc
+        LDPTR   [%fp+BIAS+ARG0+6*ARGSZ], local4          ! ivec
+        cmp     local3, 0                 ! enc
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        be,pn   %icc, .ede3.dec
+#else
+        be      .ede3.dec
+#endif
+        STPTR   in4, KS2
+
+        STPTR   in5, KS3
+
+        load_little_endian(local4, in5, out5, local3, .LLE6)  ! ivec
+
+        addcc   in2, -8, in2              ! bytes missing after next block
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bl,pn   %icc,  .ede3.enc.seven.or.less
+#else
+        bl      .ede3.enc.seven.or.less
+#endif
+        STPTR   in3, KS1
+
+.ede3.enc.next.block:
+
+        load_little_endian(in0, out4, global4, local3, .LLE7)
+
+.ede3.enc.next.block_1:
+
+        LDPTR   KS2, in4
+        xor     in5, out4, in5            ! iv xor
+        xor     out5, global4, out5       ! iv xor
+
+        LDPTR   KS1, in3
+        add     in4, 120, in4             ! for decryption we use last subkey first
+        nop
+
+        ip_macro(in5, out5, in5, out5, in3)
+
+.ede3.enc.next.block_2:
+
+        call .des_enc                     ! ks1 in3
+        nop
+
+        call .des_dec                     ! ks2 in4
+        LDPTR   KS3, in3
+
+        call .des_enc                     ! ks3 in3  compares in2 to 8
+        nop
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bl,pn   %icc, .ede3.enc.next.block_fp
+#else
+        bl      .ede3.enc.next.block_fp
+#endif
+        add     in0, 8, in0
+
+        ! If 8 or more bytes are to be encrypted after this block,
+        ! we combine final permutation for this block with initial
+        ! permutation for next block. Load next block:
+
+        load_little_endian(in0, global3, global4, local5, .LLE11)
+
+        !  parameter 1   original left
+        !  parameter 2   original right
+        !  parameter 3   left ip
+        !  parameter 4   right ip
+        !  parameter 5   1: load ks1/ks2 to in3/in4, add 120 to in4
+        !                2: mov in4 to in3
+        !
+        ! also adds -8 to length in2 and loads loop counter to out4
+
+        fp_ip_macro(out0, out1, global3, global4, 1)
+
+        store_little_endian(in1, out0, out1, local3, .SLE9)  ! block
+
+        mov     in5, local1
+        xor     global3, out5, in5        ! iv xor next block
+
+        ld      [in3], out0               ! key 7531
+        add     global1, 512, global3     ! address sbox 3
+        xor     global4, local1, out5     ! iv xor next block
+
+        ld      [in3+4], out1             ! key 8642
+        add     global1, 768, global4     ! address sbox 4
+        ba      .ede3.enc.next.block_2
+        add     in1, 8, in1
+
+.ede3.enc.next.block_fp:
+
+        fp_macro(in5, out5)
+
+        store_little_endian(in1, in5, out5, local3, .SLE5)  ! block
+
+        addcc   in2, -8, in2              ! bytes missing when next block done
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bpos,pt %icc, .ede3.enc.next.block
+#else
+        bpos    .ede3.enc.next.block
+#endif
+        add     in1, 8, in1
+
+.ede3.enc.seven.or.less:
+
+        cmp     in2, -8
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        ble,pt  %icc, .ede3.enc.finish
+#else
+        ble     .ede3.enc.finish
+#endif
+        nop
+
+        add     in2, 8, local1            ! bytes to load
+
+        ! addr, length, dest left, dest right, temp, temp2, label, ret label
+        load_n_bytes(in0, local1, global4, out4, local2, local3, .LNB2, .ede3.enc.next.block_1)
+
+.ede3.enc.finish:
+
+        LDPTR   [%fp+BIAS+ARG0+6*ARGSZ], local4          ! ivec
+        store_little_endian(local4, in5, out5, local5, .SLE6)  ! ivec
+
+        ret
+        restore
+
+.ede3.dec:
+
+        STPTR   in0, INPUT
+        add     in5, 120, in5
+
+        STPTR   in1, OUTPUT
+        mov     in0, local5
+        add     in3, 120, in3
+
+        STPTR   in3, KS1
+        cmp     in2, 0
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        ble     %icc, .ede3.dec.finish
+#else
+        ble     .ede3.dec.finish
+#endif
+        STPTR   in5, KS3
+
+        LDPTR   [%fp+BIAS+ARG0+6*ARGSZ], local7          ! iv
+        load_little_endian(local7, in0, in1, local3, .LLE8)
+
+.ede3.dec.next.block:
+
+        load_little_endian(local5, in5, out5, local3, .LLE9)
+
+        ! parameter 6  1/2 for include encryption/decryption
+        ! parameter 7  1 for mov in1 to in3
+        ! parameter 8  1 for mov in3 to in4
+        ! parameter 9  1 for load ks3 and ks2 to in4 and in3
+
+        ip_macro(in5, out5, out5, in5, in4, 2, 0, 0, 1) ! inc .des_dec ks3 in4
+
+        call .des_enc                     ! ks2 in3
+        LDPTR   KS1, in4
+
+        call .des_dec                     ! ks1 in4
+        nop
+
+        fp_macro(out5, in5, 0, 1)   ! 1 for input and output address local5/7
+
+        ! in2 is bytes left to be stored
+        ! in2 is compared to 8 in the rounds
+
+        xor     out5, in0, out4
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bl,pn   %icc, .ede3.dec.seven.or.less
+#else
+        bl      .ede3.dec.seven.or.less
+#endif
+        xor     in5, in1, global4
+
+        load_little_endian_inc(local5, in0, in1, local3, .LLE10)   ! iv next block
+
+        store_little_endian(local7, out4, global4, local3, .SLE7)  ! block
+
+        STPTR   local5, INPUT
+        addcc   in2, -8, in2
+        add     local7, 8, local7
+
+#ifdef OPENSSL_SYSNAME_ULTRASPARC
+        bg,pt   %icc, .ede3.dec.next.block
+#else
+        bg      .ede3.dec.next.block
+#endif
+        STPTR   local7, OUTPUT
+
+.ede3.dec.store.iv:
+
+        LDPTR   [%fp+BIAS+ARG0+6*ARGSZ], local4          ! ivec
+        store_little_endian(local4, in0, in1, local5, .SLE8)  ! ivec
+
+.ede3.dec.finish:
+
+        ret
+        restore
+
+.ede3.dec.seven.or.less:
+
+        load_little_endian_inc(local5, in0, in1, local3, .LLE14)     ! iv
+
+        store_n_bytes(local7, in2, global4, out4, local3, local4, .SNB2, .ede3.dec.store.iv)
+
+
+.DES_ede3_cbc_encrypt.end:
+        .size    DES_ede3_cbc_encrypt,.DES_ede3_cbc_encrypt.end-DES_ede3_cbc_encrypt
diff --git a/src/lib/libssl/src/fips-1.0/fips_locl.h b/src/lib/libssl/src/crypto/dh/dh_depr.c
index bbddfaab82..acc05f252c 100644
--- a/src/lib/libssl/src/fips-1.0/fips_locl.h
+++ b/src/lib/libssl/src/crypto/dh/dh_depr.c
@@ -1,5 +1,6 @@
+/* crypto/dh/dh_depr.c */
 /* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2002 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
@@ -44,28 +45,39 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
  *
  */
 
-#ifdef OPENSSL_FIPS
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
+/* This file contains deprecated functions as wrappers to the new ones */
 
-/* These are trampolines implemented in crypto/cryptlib.c */
-void fips_w_lock(void);
-void fips_w_unlock(void);
-void fips_r_lock(void);
-void fips_r_unlock(void);
-int fips_is_started(void);
-void fips_set_started(void);
-int fips_is_owning_thread(void);
-int fips_set_owning_thread(void);
-int fips_clear_owning_thread(void);
-unsigned char *fips_signature_witness(void);
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/dh.h>
 
-#ifdef  __cplusplus
-}
-#endif
+static void *dummy=&dummy;
+
+#ifndef OPENSSL_NO_DEPRECATED
+DH *DH_generate_parameters(int prime_len, int generator,
+             void (*callback)(int,int,void *), void *cb_arg)
+        {
+        BN_GENCB cb;
+        DH *ret=NULL;
+
+        if((ret=DH_new()) == NULL)
+                return NULL;
+
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+
+        if(DH_generate_parameters_ex(ret, prime_len, generator, &cb))
+                return ret;
+        DH_free(ret);
+        return NULL;
+        }
 #endif
diff --git a/src/lib/libssl/src/crypto/dsa/dsa_depr.c b/src/lib/libssl/src/crypto/dsa/dsa_depr.c
new file mode 100644
index 0000000000..f2da680eb4
--- /dev/null
+++ b/src/lib/libssl/src/crypto/dsa/dsa_depr.c
@@ -0,0 +1,106 @@
+/* crypto/dsa/dsa_depr.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* This file contains deprecated function(s) that are now wrappers to the new
+ * version(s). */
+
+#undef GENUINE_DSA
+
+#ifdef GENUINE_DSA
+/* Parameter generation follows the original release of FIPS PUB 186,
+ * Appendix 2.2 (i.e. use SHA as defined in FIPS PUB 180) */
+#define HASH    EVP_sha()
+#else
+/* Parameter generation follows the updated Appendix 2.2 for FIPS PUB 186,
+ * also Appendix 2.2 of FIPS PUB 186-1 (i.e. use SHA as defined in
+ * FIPS PUB 180-1) */
+#define HASH    EVP_sha1()
+#endif 
+
+static void *dummy=&dummy;
+
+#ifndef OPENSSL_NO_SHA
+
+#include <stdio.h>
+#include <time.h>
+#include "cryptlib.h"
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#include <openssl/dsa.h>
+#include <openssl/rand.h>
+#include <openssl/sha.h>
+
+#ifndef OPENSSL_NO_DEPRECATED
+DSA *DSA_generate_parameters(int bits,
+                unsigned char *seed_in, int seed_len,
+                int *counter_ret, unsigned long *h_ret,
+                void (*callback)(int, int, void *),
+                void *cb_arg)
+        {
+        BN_GENCB cb;
+        DSA *ret;
+
+        if ((ret=DSA_new()) == NULL) return NULL;
+
+        BN_GENCB_set_old(&cb, callback, cb_arg);
+
+        if(DSA_generate_parameters_ex(ret, bits, seed_in, seed_len,
+                                counter_ret, h_ret, &cb))
+                return ret;
+        DSA_free(ret);
+        return NULL;
+        }
+#endif
+#endif
diff --git a/src/lib/libssl/src/crypto/ec/ec2_mult.c b/src/lib/libssl/src/crypto/ec/ec2_mult.c
new file mode 100644
index 0000000000..ff368fd7d7
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ec/ec2_mult.c
@@ -0,0 +1,380 @@
+/* crypto/ec/ec2_mult.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The software is originally written by Sheueling Chang Shantz and
+ * Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <openssl/err.h>
+
+#include "ec_lcl.h"
+
+
+/* Compute the x-coordinate x/z for the point 2*(x/z) in Montgomery projective 
+ * coordinates.
+ * Uses algorithm Mdouble in appendix of 
+ *     Lopez, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
+ *     GF(2^m) without precomputation".
+ * modified to not require precomputation of c=b^{2^{m-1}}.
+ */
+static int gf2m_Mdouble(const EC_GROUP *group, BIGNUM *x, BIGNUM *z, BN_CTX *ctx)
+        {
+        BIGNUM *t1;
+        int ret = 0;
+        
+        /* Since Mdouble is static we can guarantee that ctx != NULL. */
+        BN_CTX_start(ctx);
+        t1 = BN_CTX_get(ctx);
+        if (t1 == NULL) goto err;
+
+        if (!group->meth->field_sqr(group, x, x, ctx)) goto err;
+        if (!group->meth->field_sqr(group, t1, z, ctx)) goto err;
+        if (!group->meth->field_mul(group, z, x, t1, ctx)) goto err;
+        if (!group->meth->field_sqr(group, x, x, ctx)) goto err;
+        if (!group->meth->field_sqr(group, t1, t1, ctx)) goto err;
+        if (!group->meth->field_mul(group, t1, &group->b, t1, ctx)) goto err;
+        if (!BN_GF2m_add(x, x, t1)) goto err;
+
+        ret = 1;
+
+ err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Compute the x-coordinate x1/z1 for the point (x1/z1)+(x2/x2) in Montgomery 
+ * projective coordinates.
+ * Uses algorithm Madd in appendix of 
+ *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
+ *     GF(2^m) without precomputation".
+ */
+static int gf2m_Madd(const EC_GROUP *group, const BIGNUM *x, BIGNUM *x1, BIGNUM *z1, 
+        const BIGNUM *x2, const BIGNUM *z2, BN_CTX *ctx)
+        {
+        BIGNUM *t1, *t2;
+        int ret = 0;
+        
+        /* Since Madd is static we can guarantee that ctx != NULL. */
+        BN_CTX_start(ctx);
+        t1 = BN_CTX_get(ctx);
+        t2 = BN_CTX_get(ctx);
+        if (t2 == NULL) goto err;
+
+        if (!BN_copy(t1, x)) goto err;
+        if (!group->meth->field_mul(group, x1, x1, z2, ctx)) goto err;
+        if (!group->meth->field_mul(group, z1, z1, x2, ctx)) goto err;
+        if (!group->meth->field_mul(group, t2, x1, z1, ctx)) goto err;
+        if (!BN_GF2m_add(z1, z1, x1)) goto err;
+        if (!group->meth->field_sqr(group, z1, z1, ctx)) goto err;
+        if (!group->meth->field_mul(group, x1, z1, t1, ctx)) goto err;
+        if (!BN_GF2m_add(x1, x1, t2)) goto err;
+
+        ret = 1;
+
+ err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Compute the x, y affine coordinates from the point (x1, z1) (x2, z2) 
+ * using Montgomery point multiplication algorithm Mxy() in appendix of 
+ *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
+ *     GF(2^m) without precomputation".
+ * Returns:
+ *     0 on error
+ *     1 if return value should be the point at infinity
+ *     2 otherwise
+ */
+static int gf2m_Mxy(const EC_GROUP *group, const BIGNUM *x, const BIGNUM *y, BIGNUM *x1, 
+        BIGNUM *z1, BIGNUM *x2, BIGNUM *z2, BN_CTX *ctx)
+        {
+        BIGNUM *t3, *t4, *t5;
+        int ret = 0;
+        
+        if (BN_is_zero(z1))
+                {
+                BN_zero(x2);
+                BN_zero(z2);
+                return 1;
+                }
+        
+        if (BN_is_zero(z2))
+                {
+                if (!BN_copy(x2, x)) return 0;
+                if (!BN_GF2m_add(z2, x, y)) return 0;
+                return 2;
+                }
+                
+        /* Since Mxy is static we can guarantee that ctx != NULL. */
+        BN_CTX_start(ctx);
+        t3 = BN_CTX_get(ctx);
+        t4 = BN_CTX_get(ctx);
+        t5 = BN_CTX_get(ctx);
+        if (t5 == NULL) goto err;
+
+        if (!BN_one(t5)) goto err;
+
+        if (!group->meth->field_mul(group, t3, z1, z2, ctx)) goto err;
+
+        if (!group->meth->field_mul(group, z1, z1, x, ctx)) goto err;
+        if (!BN_GF2m_add(z1, z1, x1)) goto err;
+        if (!group->meth->field_mul(group, z2, z2, x, ctx)) goto err;
+        if (!group->meth->field_mul(group, x1, z2, x1, ctx)) goto err;
+        if (!BN_GF2m_add(z2, z2, x2)) goto err;
+
+        if (!group->meth->field_mul(group, z2, z2, z1, ctx)) goto err;
+        if (!group->meth->field_sqr(group, t4, x, ctx)) goto err;
+        if (!BN_GF2m_add(t4, t4, y)) goto err;
+        if (!group->meth->field_mul(group, t4, t4, t3, ctx)) goto err;
+        if (!BN_GF2m_add(t4, t4, z2)) goto err;
+
+        if (!group->meth->field_mul(group, t3, t3, x, ctx)) goto err;
+        if (!group->meth->field_div(group, t3, t5, t3, ctx)) goto err;
+        if (!group->meth->field_mul(group, t4, t3, t4, ctx)) goto err;
+        if (!group->meth->field_mul(group, x2, x1, t3, ctx)) goto err;
+        if (!BN_GF2m_add(z2, x2, x)) goto err;
+
+        if (!group->meth->field_mul(group, z2, z2, t4, ctx)) goto err;
+        if (!BN_GF2m_add(z2, z2, y)) goto err;
+
+        ret = 2;
+
+ err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+/* Computes scalar*point and stores the result in r.
+ * point can not equal r.
+ * Uses algorithm 2P of
+ *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 
+ *     GF(2^m) without precomputation".
+ */
+static int ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
+        const EC_POINT *point, BN_CTX *ctx)
+        {
+        BIGNUM *x1, *x2, *z1, *z2;
+        int ret = 0, i, j;
+        BN_ULONG mask;
+
+        if (r == point)
+                {
+                ECerr(EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY, EC_R_INVALID_ARGUMENT);
+                return 0;
+                }
+        
+        /* if result should be point at infinity */
+        if ((scalar == NULL) || BN_is_zero(scalar) || (point == NULL) || 
+                EC_POINT_is_at_infinity(group, point))
+                {
+                return EC_POINT_set_to_infinity(group, r);
+                }
+
+        /* only support affine coordinates */
+        if (!point->Z_is_one) return 0;
+
+        /* Since point_multiply is static we can guarantee that ctx != NULL. */
+        BN_CTX_start(ctx);
+        x1 = BN_CTX_get(ctx);
+        z1 = BN_CTX_get(ctx);
+        if (z1 == NULL) goto err;
+
+        x2 = &r->X;
+        z2 = &r->Y;
+
+        if (!BN_GF2m_mod_arr(x1, &point->X, group->poly)) goto err; /* x1 = x */
+        if (!BN_one(z1)) goto err; /* z1 = 1 */
+        if (!group->meth->field_sqr(group, z2, x1, ctx)) goto err; /* z2 = x1^2 = x^2 */
+        if (!group->meth->field_sqr(group, x2, z2, ctx)) goto err;
+        if (!BN_GF2m_add(x2, x2, &group->b)) goto err; /* x2 = x^4 + b */
+
+        /* find top most bit and go one past it */
+        i = scalar->top - 1; j = BN_BITS2 - 1;
+        mask = BN_TBIT;
+        while (!(scalar->d[i] & mask)) { mask >>= 1; j--; }
+        mask >>= 1; j--;
+        /* if top most bit was at word break, go to next word */
+        if (!mask) 
+                {
+                i--; j = BN_BITS2 - 1;
+                mask = BN_TBIT;
+                }
+
+        for (; i >= 0; i--)
+                {
+                for (; j >= 0; j--)
+                        {
+                        if (scalar->d[i] & mask)
+                                {
+                                if (!gf2m_Madd(group, &point->X, x1, z1, x2, z2, ctx)) goto err;
+                                if (!gf2m_Mdouble(group, x2, z2, ctx)) goto err;
+                                }
+                        else
+                                {
+                                if (!gf2m_Madd(group, &point->X, x2, z2, x1, z1, ctx)) goto err;
+                                if (!gf2m_Mdouble(group, x1, z1, ctx)) goto err;
+                                }
+                        mask >>= 1;
+                        }
+                j = BN_BITS2 - 1;
+                mask = BN_TBIT;
+                }
+
+        /* convert out of "projective" coordinates */
+        i = gf2m_Mxy(group, &point->X, &point->Y, x1, z1, x2, z2, ctx);
+        if (i == 0) goto err;
+        else if (i == 1) 
+                {
+                if (!EC_POINT_set_to_infinity(group, r)) goto err;
+                }
+        else
+                {
+                if (!BN_one(&r->Z)) goto err;
+                r->Z_is_one = 1;
+                }
+
+        /* GF(2^m) field elements should always have BIGNUM::neg = 0 */
+        BN_set_negative(&r->X, 0);
+        BN_set_negative(&r->Y, 0);
+
+        ret = 1;
+
+ err:
+        BN_CTX_end(ctx);
+        return ret;
+        }
+
+
+/* Computes the sum
+ *     scalar*group->generator + scalars[0]*points[0] + ... + scalars[num-1]*points[num-1]
+ * gracefully ignoring NULL scalar values.
+ */
+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 *ctx)
+        {
+        BN_CTX *new_ctx = NULL;
+        int ret = 0;
+        size_t i;
+        EC_POINT *p=NULL;
+
+        if (ctx == NULL)
+                {
+                ctx = new_ctx = BN_CTX_new();
+                if (ctx == NULL)
+                        return 0;
+                }
+
+        /* This implementation is more efficient than the wNAF implementation for 2
+         * or fewer points.  Use the ec_wNAF_mul implementation for 3 or more points,
+         * or if we can perform a fast multiplication based on precomputation.
+         */
+        if ((scalar && (num > 1)) || (num > 2) || (num == 0 && EC_GROUP_have_precompute_mult(group)))
+                {
+                ret = ec_wNAF_mul(group, r, scalar, num, points, scalars, ctx);
+                goto err;
+                }
+
+        if ((p = EC_POINT_new(group)) == NULL) goto err;
+
+        if (!EC_POINT_set_to_infinity(group, r)) goto err;
+
+        if (scalar)
+                {
+                if (!ec_GF2m_montgomery_point_multiply(group, p, scalar, group->generator, ctx)) goto err;
+                if (BN_is_negative(scalar)) 
+                        if (!group->meth->invert(group, p, ctx)) goto err;
+                if (!group->meth->add(group, r, r, p, ctx)) goto err;
+                }
+
+        for (i = 0; i < num; i++)
+                {
+                if (!ec_GF2m_montgomery_point_multiply(group, p, scalars[i], points[i], ctx)) goto err;
+                if (BN_is_negative(scalars[i]))
+                        if (!group->meth->invert(group, p, ctx)) goto err;
+                if (!group->meth->add(group, r, r, p, ctx)) goto err;
+                }
+
+        ret = 1;
+
+  err:
+        if (p) EC_POINT_free(p);
+        if (new_ctx != NULL)
+                BN_CTX_free(new_ctx);
+        return ret;
+        }
+
+
+/* Precomputation for point multiplication: fall back to wNAF methods
+ * because ec_GF2m_simple_mul() uses ec_wNAF_mul() if appropriate */
+
+int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
+        {
+        return ec_wNAF_precompute_mult(group, ctx);
+        }
+
+int ec_GF2m_have_precompute_mult(const EC_GROUP *group)
+        {
+        return ec_wNAF_have_precompute_mult(group);
+        }
diff --git a/src/lib/libssl/src/crypto/ec/ec2_smpl.c b/src/lib/libssl/src/crypto/ec/ec2_smpl.c
new file mode 100644
index 0000000000..5cd1eac41f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ec/ec2_smpl.c
@@ -0,0 +1,971 @@
+/* crypto/ec/ec2_smpl.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The software is originally written by Sheueling Chang Shantz and
+ * Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <openssl/err.h>
+
+#include "ec_lcl.h"
+
+
+const EC_METHOD *EC_GF2m_simple_method(void)
+        {
+        static const EC_METHOD ret = {
+                NID_X9_62_characteristic_two_field,
+                ec_GF2m_simple_group_init,
+                ec_GF2m_simple_group_finish,
+                ec_GF2m_simple_group_clear_finish,
+                ec_GF2m_simple_group_copy,
+                ec_GF2m_simple_group_set_curve,
+                ec_GF2m_simple_group_get_curve,
+                ec_GF2m_simple_group_get_degree,
+                ec_GF2m_simple_group_check_discriminant,
+                ec_GF2m_simple_point_init,
+                ec_GF2m_simple_point_finish,
+                ec_GF2m_simple_point_clear_finish,
+                ec_GF2m_simple_point_copy,
+                ec_GF2m_simple_point_set_to_infinity,
+                0 /* set_Jprojective_coordinates_GFp */,
+                0 /* get_Jprojective_coordinates_GFp */,
+                ec_GF2m_simple_point_set_affine_coordinates,
+                ec_GF2m_simple_point_get_affine_coordinates,
+                ec_GF2m_simple_set_compressed_coordinates,
+                ec_GF2m_simple_point2oct,
+                ec_GF2m_simple_oct2point,
+                ec_GF2m_simple_add,
+                ec_GF2m_simple_dbl,
+                ec_GF2m_simple_invert,
+                ec_GF2m_simple_is_at_infinity,
+                ec_GF2m_simple_is_on_curve,
+                ec_GF2m_simple_cmp,
+                ec_GF2m_simple_make_affine,
+                ec_GF2m_simple_points_make_affine,
+
+                /* the following three method functions are defined in ec2_mult.c */
+                ec_GF2m_simple_mul,
+                ec_GF2m_precompute_mult,
+                ec_GF2m_have_precompute_mult,
+
+                ec_GF2m_simple_field_mul,
+                ec_GF2m_simple_field_sqr,
+                ec_GF2m_simple_field_div,
+                0 /* field_encode */,
+                0 /* field_decode */,
+                0 /* field_set_to_one */ };
+
+        return &ret;
+        }
+
+
+/* Initialize a GF(2^m)-based EC_GROUP structure.
+ * Note that all other members are handled by EC_GROUP_new.
+ */
+int ec_GF2m_simple_group_init(EC_GROUP *group)
+        {
+        BN_init(&group->field);
+        BN_init(&group->a);
+        BN_init(&group->b);
+        return 1;
+        }
+
+
+/* Free a GF(2^m)-based EC_GROUP structure.
+ * Note that all other members are handled by EC_GROUP_free.
+ */
+void ec_GF2m_simple_group_finish(EC_GROUP *group)
+        {
+        BN_free(&group->field);
+        BN_free(&group->a);
+        BN_free(&group->b);
+        }
+
+
+/* Clear and free a GF(2^m)-based EC_GROUP structure.
+ * Note that all other members are handled by EC_GROUP_clear_free.
+ */
+void ec_GF2m_simple_group_clear_finish(EC_GROUP *group)
+        {
+        BN_clear_free(&group->field);
+        BN_clear_free(&group->a);
+        BN_clear_free(&group->b);
+        group->poly[0] = 0;
+        group->poly[1] = 0;
+        group->poly[2] = 0;
+        group->poly[3] = 0;
+        group->poly[4] = 0;
+        }
+
+
+/* Copy a GF(2^m)-based EC_GROUP structure.
+ * Note that all other members are handled by EC_GROUP_copy.
+ */
+int ec_GF2m_simple_group_copy(EC_GROUP *dest, const EC_GROUP *src)
+        {
+        int i;
+        if (!BN_copy(&dest->field, &src->field)) return 0;
+        if (!BN_copy(&dest->a, &src->a)) return 0;
+        if (!BN_copy(&dest->b, &src->b)) return 0;
+        dest->poly[0] = src->poly[0];
+        dest->poly[1] = src->poly[1];
+        dest->poly[2] = src->poly[2];
+        dest->poly[3] = src->poly[3];
+        dest->poly[4] = src->poly[4];
+        bn_wexpand(&dest->a, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2);
+        bn_wexpand(&dest->b, (int)(dest->poly[0] + BN_BITS2 - 1) / BN_BITS2);
+        for (i = dest->a.top; i < dest->a.dmax; i++) dest->a.d[i] = 0;
+        for (i = dest->b.top; i < dest->b.dmax; i++) dest->b.d[i] = 0;
+        return 1;
+        }
+
+
+/* Set the curve parameters of an EC_GROUP structure. */
+int ec_GF2m_simple_group_set_curve(EC_GROUP *group,
+        const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+        {
+        int ret = 0, i;
+
+        /* group->field */
+        if (!BN_copy(&group->field, p)) goto err;
+        i = BN_GF2m_poly2arr(&group->field, group->poly, 5);
+        if ((i != 5) && (i != 3))
+                {
+                ECerr(EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);
+                goto err;
+                }
+
+        /* group->a */
+        if (!BN_GF2m_mod_arr(&group->a, a, group->poly)) goto err;
+        bn_wexpand(&group->a, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2);
+        for (i = group->a.top; i < group->a.dmax; i++) group->a.d[i] = 0;
+        
+        /* group->b */
+        if (!BN_GF2m_mod_arr(&group->b, b, group->poly)) goto err;
+        bn_wexpand(&group->b, (int)(group->poly[0] + BN_BITS2 - 1) / BN_BITS2);
+        for (i = group->b.top; i < group->b.dmax; i++) group->b.d[i] = 0;
+                
+        ret = 1;
+  err:
+        return ret;
+        }
+
+
+/* Get the curve parameters of an EC_GROUP structure.
+ * If p, a, or b are NULL then there values will not be set but the method will return with success.
+ */
+int ec_GF2m_simple_group_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
+        {
+        int ret = 0;
+        
+        if (p != NULL)
+                {
+                if (!BN_copy(p, &group->field)) return 0;
+                }
+
+        if (a != NULL)
+                {
+                if (!BN_copy(a, &group->a)) goto err;
+                }
+
+        if (b != NULL)
+                {
+                if (!BN_copy(b, &group->b)) goto err;
+                }
+        
+        ret = 1;
+        
+  err:
+        return ret;
+        }
+
+
+/* Gets the degree of the field.  For a curve over GF(2^m) this is the value m. */
+int ec_GF2m_simple_group_get_degree(const EC_GROUP *group)
+        {
+        return BN_num_bits(&group->field)-1;
+        }
+
+
+/* Checks the discriminant of the curve.
+ * y^2 + x*y = x^3 + a*x^2 + b is an elliptic curve <=> b != 0 (mod p) 
+ */
+int ec_GF2m_simple_group_check_discriminant(const EC_GROUP *group, BN_CTX *ctx)
+        {
+        int ret = 0;
+        BIGNUM *b;
+        BN_CTX *new_ctx = NULL;
+
+        if (ctx == NULL)
+                {
+                ctx = new_ctx = BN_CTX_new();
+                if (ctx == NULL)
+                        {
+                        ECerr(EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT, ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                }
+        BN_CTX_start(ctx);
+        b = BN_CTX_get(ctx);
+        if (b == NULL) goto err;
+
+        if (!BN_GF2m_mod_arr(b, &group->b, group->poly)) goto err;
+        
+        /* check the discriminant:
+         * y^2 + x*y = x^3 + a*x^2 + b is an elliptic curve <=> b != 0 (mod p) 
+         */
+        if (BN_is_zero(b)) goto err;
+
+        ret = 1;
+
+err:
+        if (ctx != NULL)
+                BN_CTX_end(ctx);
+        if (new_ctx != NULL)
+                BN_CTX_free(new_ctx);
+        return ret;
+        }
+
+
+/* Initializes an EC_POINT. */
+int ec_GF2m_simple_point_init(EC_POINT *point)
+        {
+        BN_init(&point->X);
+        BN_init(&point->Y);
+        BN_init(&point->Z);
+        return 1;
+        }
+
+
+/* Frees an EC_POINT. */
+void ec_GF2m_simple_point_finish(EC_POINT *point)
+        {
+        BN_free(&point->X);
+        BN_free(&point->Y);
+        BN_free(&point->Z);
+        }
+
+
+/* Clears and frees an EC_POINT. */
+void ec_GF2m_simple_point_clear_finish(EC_POINT *point)
+        {
+        BN_clear_free(&point->X);
+        BN_clear_free(&point->Y);
+        BN_clear_free(&point->Z);
+        point->Z_is_one = 0;
+        }
+
+
+/* Copy the contents of one EC_POINT into another.  Assumes dest is initialized. */
+int ec_GF2m_simple_point_copy(EC_POINT *dest, const EC_POINT *src)
+        {
+        if (!BN_copy(&dest->X, &src->X)) return 0;
+        if (!BN_copy(&dest->Y, &src->Y)) return 0;
+        if (!BN_copy(&dest->Z, &src->Z)) return 0;
+        dest->Z_is_one = src->Z_is_one;
+
+        return 1;
+        }
+
+
+/* Set an EC_POINT to the point at infinity.  
+ * A point at infinity is represented by having Z=0.
+ */
+int ec_GF2m_simple_point_set_to_infinity(const EC_GROUP *group, EC_POINT *point)
+        {
+        point->Z_is_one = 0;
+        BN_zero(&point->Z);
+        return 1;
+        }
+
+
+/* Set the coordinates of an EC_POINT using affine coordinates. 
+ * Note that the simple implementation only uses affine coordinates.
+ */
+int ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP *group, EC_POINT *point,
+        const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx)
+        {
+        int ret = 0;    
+        if (x == NULL || y == NULL)
+                {
+                ECerr(EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+
+        if (!BN_copy(&point->X, x)) goto err;
+        BN_set_negative(&point->X, 0);
+        if (!BN_copy(&point->Y, y)) goto err;
+        BN_set_negative(&point->Y, 0);
+        if (!BN_copy(&point->Z, BN_value_one())) goto err;
+        BN_set_negative(&point->Z, 0);
+        point->Z_is_one = 1;
+        ret = 1;
+
+  err:
+        return ret;
+        }
+
+
+/* Gets the affine coordinates of an EC_POINT. 
+ * Note that the simple implementation only uses affine coordinates.
+ */
+int ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *point,
+        BIGNUM *x, BIGNUM *y, BN_CTX *ctx)
+        {
+        int ret = 0;
+
+        if (EC_POINT_is_at_infinity(group, point))
+                {
+                ECerr(EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES, EC_R_POINT_AT_INFINITY);
+                return 0;
+                }
+
+        if (BN_cmp(&point->Z, BN_value_one())) 
+                {
+                ECerr(EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                return 0;
+                }
+        if (x != NULL)
+                {
+                if (!BN_copy(x, &point->X)) goto err;
+                BN_set_negative(x, 0);
+                }
+        if (y != NULL)
+                {
+                if (!BN_copy(y, &point->Y)) goto err;
+                BN_set_negative(y, 0);
+                }
+        ret = 1;
+                
+ err:
+        return ret;
+        }
+
+
+/* Include patented algorithms. */
+#include "ec2_smpt.c"
+
+
+/* Converts an EC_POINT to an octet string.  
+ * If buf is NULL, the encoded length will be returned.
+ * If the length len of buf is smaller than required an error will be returned.
+ *
+ * The point compression section of this function is patented by Certicom Corp. 
+ * under US Patent 6,141,420.  Point compression is disabled by default and can 
+ * be enabled by defining the preprocessor macro OPENSSL_EC_BIN_PT_COMP at 
+ * Configure-time.
+ */
+size_t ec_GF2m_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, *yxi;
+        size_t field_len, i, skip;
+
+#ifndef OPENSSL_EC_BIN_PT_COMP
+        if ((form == POINT_CONVERSION_COMPRESSED) || (form == POINT_CONVERSION_HYBRID)) 
+                {
+                ECerr(EC_F_EC_GF2M_SIMPLE_POINT2OCT, ERR_R_DISABLED);
+                goto err;
+                }
+#endif
+
+        if ((form != POINT_CONVERSION_COMPRESSED)
+                && (form != POINT_CONVERSION_UNCOMPRESSED)
+                && (form != POINT_CONVERSION_HYBRID))
+                {
+                ECerr(EC_F_EC_GF2M_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_GF2M_SIMPLE_POINT2OCT, EC_R_BUFFER_TOO_SMALL);
+                                return 0;
+                                }
+                        buf[0] = 0;
+                        }
+                return 1;
+                }
+
+
+        /* ret := required output buffer length */
+        field_len = (EC_GROUP_get_degree(group) + 7) / 8;
+        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_GF2M_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);
+                yxi = BN_CTX_get(ctx);
+                if (yxi == NULL) goto err;
+
+                if (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
+
+                buf[0] = form;
+#ifdef OPENSSL_EC_BIN_PT_COMP
+                if ((form != POINT_CONVERSION_UNCOMPRESSED) && !BN_is_zero(x))
+                        {
+                        if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;
+                        if (BN_is_odd(yxi)) buf[0]++;
+                        }
+#endif
+
+                i = 1;
+                
+                skip = field_len - BN_num_bytes(x);
+                if (skip > field_len)
+                        {
+                        ECerr(EC_F_EC_GF2M_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_GF2M_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_GF2M_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_GF2M_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;
+        }
+
+
+/* Converts an octet string representation to an EC_POINT. 
+ * Note that the simple implementation only uses affine coordinates.
+ */
+int ec_GF2m_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, *yxi;
+        size_t field_len, enc_len;
+        int ret = 0;
+
+        if (len == 0)
+                {
+                ECerr(EC_F_EC_GF2M_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_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                return 0;
+                }
+        if ((form == 0 || form == POINT_CONVERSION_UNCOMPRESSED) && y_bit)
+                {
+                ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                return 0;
+                }
+
+        if (form == 0)
+                {
+                if (len != 1)
+                        {
+                        ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                        return 0;
+                        }
+
+                return EC_POINT_set_to_infinity(group, point);
+                }
+        
+        field_len = (EC_GROUP_get_degree(group) + 7) / 8;
+        enc_len = (form == POINT_CONVERSION_COMPRESSED) ? 1 + field_len : 1 + 2*field_len;
+
+        if (len != enc_len)
+                {
+                ECerr(EC_F_EC_GF2M_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);
+        yxi = BN_CTX_get(ctx);
+        if (yxi == NULL) goto err;
+
+        if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
+        if (BN_ucmp(x, &group->field) >= 0)
+                {
+                ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                goto err;
+                }
+
+        if (form == POINT_CONVERSION_COMPRESSED)
+                {
+                if (!EC_POINT_set_compressed_coordinates_GF2m(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_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                        goto err;
+                        }
+                if (form == POINT_CONVERSION_HYBRID)
+                        {
+                        if (!group->meth->field_div(group, yxi, y, x, ctx)) goto err;
+                        if (y_bit != BN_is_odd(yxi))
+                                {
+                                ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
+                                goto err;
+                                }
+                        }
+
+                if (!EC_POINT_set_affine_coordinates_GF2m(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_GF2M_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;
+        }
+
+
+/* Computes a + b and stores the result in r.  r could be a or b, a could be b.
+ * Uses algorithm A.10.2 of IEEE P1363.
+ */
+int ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
+        {
+        BN_CTX *new_ctx = NULL;
+        BIGNUM *x0, *y0, *x1, *y1, *x2, *y2, *s, *t;
+        int ret = 0;
+        
+        if (EC_POINT_is_at_infinity(group, a))
+                {
+                if (!EC_POINT_copy(r, b)) return 0;
+                return 1;
+                }
+
+        if (EC_POINT_is_at_infinity(group, b))
+                {
+                if (!EC_POINT_copy(r, a)) return 0;
+                return 1;
+                }
+
+        if (ctx == NULL)
+                {
+                ctx = new_ctx = BN_CTX_new();
+                if (ctx == NULL)
+                        return 0;
+                }
+
+        BN_CTX_start(ctx);
+        x0 = BN_CTX_get(ctx);
+        y0 = BN_CTX_get(ctx);
+        x1 = BN_CTX_get(ctx);
+        y1 = BN_CTX_get(ctx);
+        x2 = BN_CTX_get(ctx);
+        y2 = BN_CTX_get(ctx);
+        s = BN_CTX_get(ctx);
+        t = BN_CTX_get(ctx);
+        if (t == NULL) goto err;
+
+        if (a->Z_is_one) 
+                {
+                if (!BN_copy(x0, &a->X)) goto err;
+                if (!BN_copy(y0, &a->Y)) goto err;
+                }
+        else
+                {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group, a, x0, y0, ctx)) goto err;
+                }
+        if (b->Z_is_one) 
+                {
+                if (!BN_copy(x1, &b->X)) goto err;
+                if (!BN_copy(y1, &b->Y)) goto err;
+                }
+        else
+                {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group, b, x1, y1, ctx)) goto err;
+                }
+
+
+        if (BN_GF2m_cmp(x0, x1))
+                {
+                if (!BN_GF2m_add(t, x0, x1)) goto err;
+                if (!BN_GF2m_add(s, y0, y1)) goto err;
+                if (!group->meth->field_div(group, s, s, t, ctx)) goto err;
+                if (!group->meth->field_sqr(group, x2, s, ctx)) goto err;
+                if (!BN_GF2m_add(x2, x2, &group->a)) goto err;
+                if (!BN_GF2m_add(x2, x2, s)) goto err;
+                if (!BN_GF2m_add(x2, x2, t)) goto err;
+                }
+        else
+                {
+                if (BN_GF2m_cmp(y0, y1) || BN_is_zero(x1))
+                        {
+                        if (!EC_POINT_set_to_infinity(group, r)) goto err;
+                        ret = 1;
+                        goto err;
+                        }
+                if (!group->meth->field_div(group, s, y1, x1, ctx)) goto err;
+                if (!BN_GF2m_add(s, s, x1)) goto err;
+                
+                if (!group->meth->field_sqr(group, x2, s, ctx)) goto err;
+                if (!BN_GF2m_add(x2, x2, s)) goto err;
+                if (!BN_GF2m_add(x2, x2, &group->a)) goto err;
+                }
+
+        if (!BN_GF2m_add(y2, x1, x2)) goto err;
+        if (!group->meth->field_mul(group, y2, y2, s, ctx)) goto err;
+        if (!BN_GF2m_add(y2, y2, x2)) goto err;
+        if (!BN_GF2m_add(y2, y2, y1)) goto err;
+
+        if (!EC_POINT_set_affine_coordinates_GF2m(group, r, x2, y2, ctx)) goto err;
+
+        ret = 1;
+
+ err:
+        BN_CTX_end(ctx);
+        if (new_ctx != NULL)
+                BN_CTX_free(new_ctx);
+        return ret;
+        }
+
+
+/* Computes 2 * a and stores the result in r.  r could be a.
+ * Uses algorithm A.10.2 of IEEE P1363.
+ */
+int ec_GF2m_simple_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a, BN_CTX *ctx)
+        {
+        return ec_GF2m_simple_add(group, r, a, a, ctx);
+        }
+
+
+int ec_GF2m_simple_invert(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
+        {
+        if (EC_POINT_is_at_infinity(group, point) || BN_is_zero(&point->Y))
+                /* point is its own inverse */
+                return 1;
+        
+        if (!EC_POINT_make_affine(group, point, ctx)) return 0;
+        return BN_GF2m_add(&point->Y, &point->X, &point->Y);
+        }
+
+
+/* Indicates whether the given point is the point at infinity. */
+int ec_GF2m_simple_is_at_infinity(const EC_GROUP *group, const EC_POINT *point)
+        {
+        return BN_is_zero(&point->Z);
+        }
+
+
+/* Determines whether the given EC_POINT is an actual point on the curve defined
+ * in the EC_GROUP.  A point is valid if it satisfies the Weierstrass equation:
+ *      y^2 + x*y = x^3 + a*x^2 + b.
+ */
+int ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX *ctx)
+        {
+        int ret = -1;
+        BN_CTX *new_ctx = NULL;
+        BIGNUM *lh, *y2;
+        int (*field_mul)(const EC_GROUP *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *);
+        int (*field_sqr)(const EC_GROUP *, BIGNUM *, const BIGNUM *, BN_CTX *);
+
+        if (EC_POINT_is_at_infinity(group, point))
+                return 1;
+
+        field_mul = group->meth->field_mul;
+        field_sqr = group->meth->field_sqr;     
+
+        /* only support affine coordinates */
+        if (!point->Z_is_one) goto err;
+
+        if (ctx == NULL)
+                {
+                ctx = new_ctx = BN_CTX_new();
+                if (ctx == NULL)
+                        return -1;
+                }
+
+        BN_CTX_start(ctx);
+        y2 = BN_CTX_get(ctx);
+        lh = BN_CTX_get(ctx);
+        if (lh == NULL) goto err;
+
+        /* We have a curve defined by a Weierstrass equation
+         *      y^2 + x*y = x^3 + a*x^2 + b.
+         *  <=> x^3 + a*x^2 + x*y + b + y^2 = 0
+         *  <=> ((x + a) * x + y ) * x + b + y^2 = 0
+         */
+        if (!BN_GF2m_add(lh, &point->X, &group->a)) goto err;
+        if (!field_mul(group, lh, lh, &point->X, ctx)) goto err;
+        if (!BN_GF2m_add(lh, lh, &point->Y)) goto err;
+        if (!field_mul(group, lh, lh, &point->X, ctx)) goto err;
+        if (!BN_GF2m_add(lh, lh, &group->b)) goto err;
+        if (!field_sqr(group, y2, &point->Y, ctx)) goto err;
+        if (!BN_GF2m_add(lh, lh, y2)) goto err;
+        ret = BN_is_zero(lh);
+ err:
+        if (ctx) BN_CTX_end(ctx);
+        if (new_ctx) BN_CTX_free(new_ctx);
+        return ret;
+        }
+
+
+/* Indicates whether two points are equal.
+ * Return values:
+ *  -1   error
+ *   0   equal (in affine coordinates)
+ *   1   not equal
+ */
+int ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN_CTX *ctx)
+        {
+        BIGNUM *aX, *aY, *bX, *bY;
+        BN_CTX *new_ctx = NULL;
+        int ret = -1;
+
+        if (EC_POINT_is_at_infinity(group, a))
+                {
+                return EC_POINT_is_at_infinity(group, b) ? 0 : 1;
+                }
+        
+        if (a->Z_is_one && b->Z_is_one)
+                {
+                return ((BN_cmp(&a->X, &b->X) == 0) && BN_cmp(&a->Y, &b->Y) == 0) ? 0 : 1;
+                }
+
+        if (ctx == NULL)
+                {
+                ctx = new_ctx = BN_CTX_new();
+                if (ctx == NULL)
+                        return -1;
+                }
+
+        BN_CTX_start(ctx);
+        aX = BN_CTX_get(ctx);
+        aY = BN_CTX_get(ctx);
+        bX = BN_CTX_get(ctx);
+        bY = BN_CTX_get(ctx);
+        if (bY == NULL) goto err;
+
+        if (!EC_POINT_get_affine_coordinates_GF2m(group, a, aX, aY, ctx)) goto err;
+        if (!EC_POINT_get_affine_coordinates_GF2m(group, b, bX, bY, ctx)) goto err;
+        ret = ((BN_cmp(aX, bX) == 0) && BN_cmp(aY, bY) == 0) ? 0 : 1;
+
+  err:  
+        if (ctx) BN_CTX_end(ctx);
+        if (new_ctx) BN_CTX_free(new_ctx);
+        return ret;
+        }
+
+
+/* Forces the given EC_POINT to internally use affine coordinates. */
+int ec_GF2m_simple_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx)
+        {
+        BN_CTX *new_ctx = NULL;
+        BIGNUM *x, *y;
+        int ret = 0;
+
+        if (point->Z_is_one || EC_POINT_is_at_infinity(group, point))
+                return 1;
+        
+        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 (!EC_POINT_get_affine_coordinates_GF2m(group, point, x, y, ctx)) goto err;
+        if (!BN_copy(&point->X, x)) goto err;
+        if (!BN_copy(&point->Y, y)) goto err;
+        if (!BN_one(&point->Z)) goto err;
+        
+        ret = 1;                
+
+  err:
+        if (ctx) BN_CTX_end(ctx);
+        if (new_ctx) BN_CTX_free(new_ctx);
+        return ret;
+        }
+
+
+/* Forces each of the EC_POINTs in the given array to use affine coordinates. */
+int ec_GF2m_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx)
+        {
+        size_t i;
+
+        for (i = 0; i < num; i++)
+                {
+                if (!group->meth->make_affine(group, points[i], ctx)) return 0;
+                }
+
+        return 1;
+        }
+
+
+/* Wrapper to simple binary polynomial field multiplication implementation. */
+int ec_GF2m_simple_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+        {
+        return BN_GF2m_mod_mul_arr(r, a, b, group->poly, ctx);
+        }
+
+
+/* Wrapper to simple binary polynomial field squaring implementation. */
+int ec_GF2m_simple_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx)
+        {
+        return BN_GF2m_mod_sqr_arr(r, a, group->poly, ctx);
+        }
+
+
+/* Wrapper to simple binary polynomial field division implementation. */
+int ec_GF2m_simple_field_div(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx)
+        {
+        return BN_GF2m_mod_div(r, a, b, &group->field, ctx);
+        }
diff --git a/src/lib/libssl/src/crypto/ec/ec_asn1.c b/src/lib/libssl/src/crypto/ec/ec_asn1.c
new file mode 100644
index 0000000000..ae55539859
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ec/ec_asn1.c
@@ -0,0 +1,1429 @@
+/* crypto/ec/ec_asn1.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project.
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include "ec_lcl.h"
+#include <openssl/err.h>
+#include <openssl/asn1t.h>
+#include <openssl/objects.h>
+
+
+int EC_GROUP_get_basis_type(const EC_GROUP *group)
+        {
+        int i=0;
+
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
+                NID_X9_62_characteristic_two_field)
+                /* everything else is currently not supported */
+                return 0;
+
+        while (group->poly[i] != 0)
+                i++;
+
+        if (i == 4)
+                return NID_X9_62_ppBasis;
+        else if (i == 2)
+                return NID_X9_62_tpBasis;
+        else
+                /* everything else is currently not supported */
+                return 0;
+        }
+
+int EC_GROUP_get_trinomial_basis(const EC_GROUP *group, unsigned int *k)
+        {
+        if (group == NULL)
+                return 0;
+
+        if (EC_GROUP_method_of(group)->group_set_curve != ec_GF2m_simple_group_set_curve
+            || !((group->poly[0] != 0) && (group->poly[1] != 0) && (group->poly[2] == 0)))
+                {
+                ECerr(EC_F_EC_GROUP_GET_TRINOMIAL_BASIS, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                return 0;
+                }
+
+        if (k)
+                *k = group->poly[1];
+
+        return 1;
+        }
+
+int EC_GROUP_get_pentanomial_basis(const EC_GROUP *group, unsigned int *k1,
+        unsigned int *k2, unsigned int *k3)
+        {
+        if (group == NULL)
+                return 0;
+
+        if (EC_GROUP_method_of(group)->group_set_curve != ec_GF2m_simple_group_set_curve
+            || !((group->poly[0] != 0) && (group->poly[1] != 0) && (group->poly[2] != 0) && (group->poly[3] != 0) && (group->poly[4] == 0)))
+                {
+                ECerr(EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
+                return 0;
+                }
+
+        if (k1)
+                *k1 = group->poly[3];
+        if (k2)
+                *k2 = group->poly[2];
+        if (k3)
+                *k3 = group->poly[1];
+
+        return 1;
+        }
+
+
+
+/* some structures needed for the asn1 encoding */
+typedef struct x9_62_pentanomial_st {
+        long k1;
+        long k2;
+        long k3;
+        } X9_62_PENTANOMIAL;
+
+typedef struct x9_62_characteristic_two_st {
+        long m;
+        ASN1_OBJECT  *type;
+        union   {
+                char *ptr;
+                /* NID_X9_62_onBasis */
+                ASN1_NULL    *onBasis;
+                /* NID_X9_62_tpBasis */
+                ASN1_INTEGER *tpBasis;
+                /* NID_X9_62_ppBasis */
+                X9_62_PENTANOMIAL *ppBasis;
+                /* anything else */
+                ASN1_TYPE *other;
+                } p;
+        } X9_62_CHARACTERISTIC_TWO;
+
+typedef struct x9_62_fieldid_st {
+        ASN1_OBJECT *fieldType;
+        union   {
+                char *ptr;
+                /* NID_X9_62_prime_field */
+                ASN1_INTEGER *prime;
+                /* NID_X9_62_characteristic_two_field */
+                X9_62_CHARACTERISTIC_TWO *char_two;
+                /* anything else */
+                ASN1_TYPE *other;
+                } p;
+        } X9_62_FIELDID;
+
+typedef struct x9_62_curve_st {
+        ASN1_OCTET_STRING *a;
+        ASN1_OCTET_STRING *b;
+        ASN1_BIT_STRING   *seed;
+        } X9_62_CURVE;
+
+typedef struct ec_parameters_st {
+        long              version;
+        X9_62_FIELDID     *fieldID;
+        X9_62_CURVE       *curve;
+        ASN1_OCTET_STRING *base;
+        ASN1_INTEGER      *order;
+        ASN1_INTEGER      *cofactor;
+        } ECPARAMETERS;
+
+struct ecpk_parameters_st {
+        int     type;
+        union {
+                ASN1_OBJECT  *named_curve;
+                ECPARAMETERS *parameters;
+                ASN1_NULL    *implicitlyCA;
+        } value;
+        }/* ECPKPARAMETERS */;
+
+/* SEC1 ECPrivateKey */
+typedef struct ec_privatekey_st {
+        long              version;
+        ASN1_OCTET_STRING *privateKey;
+        ECPKPARAMETERS    *parameters;
+        ASN1_BIT_STRING   *publicKey;
+        } EC_PRIVATEKEY;
+
+/* the OpenSSL ASN.1 definitions */
+ASN1_SEQUENCE(X9_62_PENTANOMIAL) = {
+        ASN1_SIMPLE(X9_62_PENTANOMIAL, k1, LONG),
+        ASN1_SIMPLE(X9_62_PENTANOMIAL, k2, LONG),
+        ASN1_SIMPLE(X9_62_PENTANOMIAL, k3, LONG)
+} ASN1_SEQUENCE_END(X9_62_PENTANOMIAL)
+
+DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
+IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
+
+ASN1_ADB_TEMPLATE(char_two_def) = ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.other, ASN1_ANY);
+
+ASN1_ADB(X9_62_CHARACTERISTIC_TWO) = {
+        ADB_ENTRY(NID_X9_62_onBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.onBasis, ASN1_NULL)),
+        ADB_ENTRY(NID_X9_62_tpBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.tpBasis, ASN1_INTEGER)),
+        ADB_ENTRY(NID_X9_62_ppBasis, ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.ppBasis, X9_62_PENTANOMIAL))
+} ASN1_ADB_END(X9_62_CHARACTERISTIC_TWO, 0, type, 0, &char_two_def_tt, NULL);
+
+ASN1_SEQUENCE(X9_62_CHARACTERISTIC_TWO) = {
+        ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, m, LONG),
+        ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, type, ASN1_OBJECT),
+        ASN1_ADB_OBJECT(X9_62_CHARACTERISTIC_TWO)
+} ASN1_SEQUENCE_END(X9_62_CHARACTERISTIC_TWO)
+
+DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
+IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
+
+ASN1_ADB_TEMPLATE(fieldID_def) = ASN1_SIMPLE(X9_62_FIELDID, p.other, ASN1_ANY);
+
+ASN1_ADB(X9_62_FIELDID) = {
+        ADB_ENTRY(NID_X9_62_prime_field, ASN1_SIMPLE(X9_62_FIELDID, p.prime, ASN1_INTEGER)),
+        ADB_ENTRY(NID_X9_62_characteristic_two_field, ASN1_SIMPLE(X9_62_FIELDID, p.char_two, X9_62_CHARACTERISTIC_TWO))
+} ASN1_ADB_END(X9_62_FIELDID, 0, fieldType, 0, &fieldID_def_tt, NULL);
+
+ASN1_SEQUENCE(X9_62_FIELDID) = {
+        ASN1_SIMPLE(X9_62_FIELDID, fieldType, ASN1_OBJECT),
+        ASN1_ADB_OBJECT(X9_62_FIELDID)
+} ASN1_SEQUENCE_END(X9_62_FIELDID)
+
+ASN1_SEQUENCE(X9_62_CURVE) = {
+        ASN1_SIMPLE(X9_62_CURVE, a, ASN1_OCTET_STRING),
+        ASN1_SIMPLE(X9_62_CURVE, b, ASN1_OCTET_STRING),
+        ASN1_OPT(X9_62_CURVE, seed, ASN1_BIT_STRING)
+} ASN1_SEQUENCE_END(X9_62_CURVE)
+
+ASN1_SEQUENCE(ECPARAMETERS) = {
+        ASN1_SIMPLE(ECPARAMETERS, version, LONG),
+        ASN1_SIMPLE(ECPARAMETERS, fieldID, X9_62_FIELDID),
+        ASN1_SIMPLE(ECPARAMETERS, curve, X9_62_CURVE),
+        ASN1_SIMPLE(ECPARAMETERS, base, ASN1_OCTET_STRING),
+        ASN1_SIMPLE(ECPARAMETERS, order, ASN1_INTEGER),
+        ASN1_OPT(ECPARAMETERS, cofactor, ASN1_INTEGER)
+} ASN1_SEQUENCE_END(ECPARAMETERS)
+
+DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
+IMPLEMENT_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
+
+ASN1_CHOICE(ECPKPARAMETERS) = {
+        ASN1_SIMPLE(ECPKPARAMETERS, value.named_curve, ASN1_OBJECT),
+        ASN1_SIMPLE(ECPKPARAMETERS, value.parameters, ECPARAMETERS),
+        ASN1_SIMPLE(ECPKPARAMETERS, value.implicitlyCA, ASN1_NULL)
+} ASN1_CHOICE_END(ECPKPARAMETERS)
+
+DECLARE_ASN1_FUNCTIONS_const(ECPKPARAMETERS)
+DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECPKPARAMETERS, ECPKPARAMETERS)
+IMPLEMENT_ASN1_FUNCTIONS_const(ECPKPARAMETERS)
+
+ASN1_SEQUENCE(EC_PRIVATEKEY) = {
+        ASN1_SIMPLE(EC_PRIVATEKEY, version, LONG),
+        ASN1_SIMPLE(EC_PRIVATEKEY, privateKey, ASN1_OCTET_STRING),
+        ASN1_EXP_OPT(EC_PRIVATEKEY, parameters, ECPKPARAMETERS, 0),
+        ASN1_EXP_OPT(EC_PRIVATEKEY, publicKey, ASN1_BIT_STRING, 1)
+} ASN1_SEQUENCE_END(EC_PRIVATEKEY)
+
+DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY)
+DECLARE_ASN1_ENCODE_FUNCTIONS_const(EC_PRIVATEKEY, EC_PRIVATEKEY)
+IMPLEMENT_ASN1_FUNCTIONS_const(EC_PRIVATEKEY)
+
+/* some declarations of internal function */
+
+/* ec_asn1_group2field() sets the values in a X9_62_FIELDID object */ 
+static int ec_asn1_group2fieldid(const EC_GROUP *, X9_62_FIELDID *);
+/* ec_asn1_group2curve() sets the values in a X9_62_CURVE object */ 
+static int ec_asn1_group2curve(const EC_GROUP *, X9_62_CURVE *);
+/* ec_asn1_parameters2group() creates a EC_GROUP object from a
+ * ECPARAMETERS object */
+static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *); 
+/* ec_asn1_group2parameters() creates a ECPARAMETERS object from a 
+ * EC_GROUP object */
+static ECPARAMETERS *ec_asn1_group2parameters(const EC_GROUP *,ECPARAMETERS *);
+/* ec_asn1_pkparameters2group() creates a EC_GROUP object from a
+ * ECPKPARAMETERS object */
+static EC_GROUP *ec_asn1_pkparameters2group(const ECPKPARAMETERS *); 
+/* ec_asn1_group2pkparameters() creates a ECPKPARAMETERS object from a 
+ * EC_GROUP object */
+static ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *, 
+        ECPKPARAMETERS *);
+
+
+/* the function definitions */
+
+static int ec_asn1_group2fieldid(const EC_GROUP *group, X9_62_FIELDID *field)
+        {
+        int                     ok=0, nid;
+        BIGNUM                  *tmp = NULL;
+        
+        if (group == NULL || field == NULL)
+                return 0;
+
+        /* clear the old values (if necessary) */
+        if (field->fieldType != NULL)
+                ASN1_OBJECT_free(field->fieldType);
+        if (field->p.other != NULL)
+                ASN1_TYPE_free(field->p.other);
+
+        nid = EC_METHOD_get_field_type(EC_GROUP_method_of(group));
+        /* set OID for the field */
+        if ((field->fieldType = OBJ_nid2obj(nid)) == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_OBJ_LIB);
+                goto err;
+                }
+
+        if (nid == NID_X9_62_prime_field)
+                {
+                if ((tmp = BN_new()) == NULL) 
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                /* the parameters are specified by the prime number p */
+                if (!EC_GROUP_get_curve_GFp(group, tmp, NULL, NULL, NULL))
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                /* set the prime number */
+                field->p.prime = BN_to_ASN1_INTEGER(tmp,NULL);
+                if (field->p.prime == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_ASN1_LIB);
+                        goto err;
+                        }
+                }
+        else    /* nid == NID_X9_62_characteristic_two_field */
+                {
+                int             field_type;
+                X9_62_CHARACTERISTIC_TWO *char_two;
+
+                field->p.char_two = X9_62_CHARACTERISTIC_TWO_new();
+                char_two = field->p.char_two;
+
+                if (char_two == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+        
+                char_two->m = (long)EC_GROUP_get_degree(group);
+
+                field_type = EC_GROUP_get_basis_type(group);
+
+                if (field_type == 0)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                /* set base type OID */
+                if ((char_two->type = OBJ_nid2obj(field_type)) == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_OBJ_LIB);
+                        goto err;
+                        }
+
+                if (field_type == NID_X9_62_tpBasis)
+                        {
+                        unsigned int k;
+
+                        if (!EC_GROUP_get_trinomial_basis(group, &k))
+                                goto err;
+
+                        char_two->p.tpBasis = ASN1_INTEGER_new();
+                        if (!char_two->p.tpBasis)
+                                {
+                                ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        if (!ASN1_INTEGER_set(char_two->p.tpBasis, (long)k))
+                                {
+                                ECerr(EC_F_EC_ASN1_GROUP2FIELDID,
+                                        ERR_R_ASN1_LIB);
+                                goto err;
+                                }
+                        }
+                else if (field_type == NID_X9_62_ppBasis)
+                        {
+                        unsigned int k1, k2, k3;
+
+                        if (!EC_GROUP_get_pentanomial_basis(group, &k1, &k2, &k3))
+                                goto err;
+
+                        char_two->p.ppBasis = X9_62_PENTANOMIAL_new();
+                        if (!char_two->p.ppBasis)
+                                {
+                                ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+
+                        /* set k? values */
+                        char_two->p.ppBasis->k1 = (long)k1;
+                        char_two->p.ppBasis->k2 = (long)k2;
+                        char_two->p.ppBasis->k3 = (long)k3;
+                        }
+                else /* field_type == NID_X9_62_onBasis */
+                        {
+                        /* for ONB the parameters are (asn1) NULL */
+                        char_two->p.onBasis = ASN1_NULL_new();
+                        if (!char_two->p.onBasis)
+                                {
+                                ECerr(EC_F_EC_ASN1_GROUP2FIELDID, ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        }
+                }
+
+        ok = 1;
+
+err :   if (tmp)
+                BN_free(tmp);
+        return(ok);
+}
+
+static int ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
+        {
+        int           ok=0, nid;
+        BIGNUM        *tmp_1=NULL, *tmp_2=NULL;
+        unsigned char *buffer_1=NULL, *buffer_2=NULL,
+                      *a_buf=NULL, *b_buf=NULL;
+        size_t        len_1, len_2;
+        unsigned char char_zero = 0;
+
+        if (!group || !curve || !curve->a || !curve->b)
+                return 0;
+
+        if ((tmp_1 = BN_new()) == NULL || (tmp_2 = BN_new()) == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        nid = EC_METHOD_get_field_type(EC_GROUP_method_of(group));
+
+        /* get a and b */
+        if (nid == NID_X9_62_prime_field)
+                {
+                if (!EC_GROUP_get_curve_GFp(group, NULL, tmp_1, tmp_2, NULL))
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                }
+        else    /* nid == NID_X9_62_characteristic_two_field */
+                {
+                if (!EC_GROUP_get_curve_GF2m(group, NULL, tmp_1, tmp_2, NULL))
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                }
+
+        len_1 = (size_t)BN_num_bytes(tmp_1);
+        len_2 = (size_t)BN_num_bytes(tmp_2);
+
+        if (len_1 == 0)
+                {
+                /* len_1 == 0 => a == 0 */
+                a_buf = &char_zero;
+                len_1 = 1;
+                }
+        else
+                {
+                if ((buffer_1 = OPENSSL_malloc(len_1)) == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2CURVE,
+                              ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                if ( (len_1 = BN_bn2bin(tmp_1, buffer_1)) == 0)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_BN_LIB);
+                        goto err;
+                        }
+                a_buf = buffer_1;
+                }
+
+        if (len_2 == 0)
+                {
+                /* len_2 == 0 => b == 0 */
+                b_buf = &char_zero;
+                len_2 = 1;
+                }
+        else
+                {
+                if ((buffer_2 = OPENSSL_malloc(len_2)) == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2CURVE,
+                              ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                if ( (len_2 = BN_bn2bin(tmp_2, buffer_2)) == 0)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_BN_LIB);
+                        goto err;
+                        }
+                b_buf = buffer_2;
+                }
+        
+        /* set a and b */
+        if (!M_ASN1_OCTET_STRING_set(curve->a, a_buf, len_1) ||
+            !M_ASN1_OCTET_STRING_set(curve->b, b_buf, len_2))
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_ASN1_LIB);
+                goto err;
+                }
+        
+        /* set the seed (optional) */
+        if (group->seed)
+                {       
+                if (!curve->seed)
+                        if ((curve->seed = ASN1_BIT_STRING_new()) == NULL)
+                                {
+                                ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                curve->seed->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
+                curve->seed->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+                if (!ASN1_BIT_STRING_set(curve->seed, group->seed, 
+                                         (int)group->seed_len))
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_ASN1_LIB);
+                        goto err;
+                        }
+                }
+        else
+                {
+                if (curve->seed)
+                        {
+                        ASN1_BIT_STRING_free(curve->seed);
+                        curve->seed = NULL;
+                        }
+                }
+
+        ok = 1;
+
+err:    if (buffer_1)
+                OPENSSL_free(buffer_1);
+        if (buffer_2)
+                OPENSSL_free(buffer_2);
+        if (tmp_1)
+                BN_free(tmp_1);
+        if (tmp_2)
+                BN_free(tmp_2);
+        return(ok);
+        }
+
+static ECPARAMETERS *ec_asn1_group2parameters(const EC_GROUP *group,
+                                              ECPARAMETERS *param)
+        {
+        int     ok=0;
+        size_t  len=0;
+        ECPARAMETERS   *ret=NULL;
+        BIGNUM         *tmp=NULL;
+        unsigned char  *buffer=NULL;
+        const EC_POINT *point=NULL;
+        point_conversion_form_t form;
+
+        if ((tmp = BN_new()) == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        if (param == NULL)
+        {
+                if ((ret = ECPARAMETERS_new()) == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, 
+                              ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+        }
+        else
+                ret = param;
+
+        /* set the version (always one) */
+        ret->version = (long)0x1;
+
+        /* set the fieldID */
+        if (!ec_asn1_group2fieldid(group, ret->fieldID))
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
+                goto err;
+                }
+
+        /* set the curve */
+        if (!ec_asn1_group2curve(group, ret->curve))
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
+                goto err;
+                }
+
+        /* set the base point */
+        if ((point = EC_GROUP_get0_generator(group)) == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, EC_R_UNDEFINED_GENERATOR);
+                goto err;
+                }
+
+        form = EC_GROUP_get_point_conversion_form(group);
+
+        len = EC_POINT_point2oct(group, point, form, NULL, len, NULL);
+        if (len == 0)
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
+                goto err;
+                }
+        if ((buffer = OPENSSL_malloc(len)) == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        if (!EC_POINT_point2oct(group, point, form, buffer, len, NULL))
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
+                goto err;
+                }
+        if (ret->base == NULL && (ret->base = ASN1_OCTET_STRING_new()) == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        if (!ASN1_OCTET_STRING_set(ret->base, buffer, len))
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_ASN1_LIB);
+                goto err;
+                }
+
+        /* set the order */
+        if (!EC_GROUP_get_order(group, tmp, NULL))
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_EC_LIB);
+                goto err;
+                }
+        ret->order = BN_to_ASN1_INTEGER(tmp, ret->order);
+        if (ret->order == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_ASN1_LIB);
+                goto err;
+                }
+
+        /* set the cofactor (optional) */
+        if (EC_GROUP_get_cofactor(group, tmp, NULL))
+                {
+                ret->cofactor = BN_to_ASN1_INTEGER(tmp, ret->cofactor);
+                if (ret->cofactor == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2PARAMETERS, ERR_R_ASN1_LIB);
+                        goto err;
+                        }
+                }
+
+        ok = 1;
+
+err :   if(!ok)
+                {
+                if (ret && !param)
+                        ECPARAMETERS_free(ret);
+                ret = NULL;
+                }
+        if (tmp)
+                BN_free(tmp);
+        if (buffer)
+                OPENSSL_free(buffer);
+        return(ret);
+        }
+
+ECPKPARAMETERS *ec_asn1_group2pkparameters(const EC_GROUP *group, 
+                                           ECPKPARAMETERS *params)
+        {
+        int            ok = 1, tmp;
+        ECPKPARAMETERS *ret = params;
+
+        if (ret == NULL)
+                {
+                if ((ret = ECPKPARAMETERS_new()) == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_GROUP2PKPARAMETERS, 
+                              ERR_R_MALLOC_FAILURE);
+                        return NULL;
+                        }
+                }
+        else
+                {
+                if (ret->type == 0 && ret->value.named_curve)
+                        ASN1_OBJECT_free(ret->value.named_curve);
+                else if (ret->type == 1 && ret->value.parameters)
+                        ECPARAMETERS_free(ret->value.parameters);
+                }
+
+        if (EC_GROUP_get_asn1_flag(group))
+                {
+                /* use the asn1 OID to describe the
+                 * the elliptic curve parameters
+                 */
+                tmp = EC_GROUP_get_curve_name(group);
+                if (tmp)
+                        {
+                        ret->type = 0;
+                        if ((ret->value.named_curve = OBJ_nid2obj(tmp)) == NULL)
+                                ok = 0;
+                        }
+                else
+                        /* we don't kmow the nid => ERROR */
+                        ok = 0;
+                }
+        else
+                {       
+                /* use the ECPARAMETERS structure */
+                ret->type = 1;
+                if ((ret->value.parameters = ec_asn1_group2parameters(
+                     group, NULL)) == NULL)
+                        ok = 0;
+                }
+
+        if (!ok)
+                {
+                ECPKPARAMETERS_free(ret);
+                return NULL;
+                }
+        return ret;
+        }
+
+static EC_GROUP *ec_asn1_parameters2group(const ECPARAMETERS *params)
+        {
+        int                     ok = 0, tmp;
+        EC_GROUP                *ret = NULL;
+        BIGNUM                  *p = NULL, *a = NULL, *b = NULL;
+        EC_POINT                *point=NULL;
+        long                    field_bits;
+
+        if (!params->fieldID || !params->fieldID->fieldType || 
+            !params->fieldID->p.ptr)
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
+                goto err;
+                }
+
+        /* now extract the curve parameters a and b */
+        if (!params->curve || !params->curve->a || 
+            !params->curve->a->data || !params->curve->b ||
+            !params->curve->b->data)
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
+                goto err;
+                }
+        a = BN_bin2bn(params->curve->a->data, params->curve->a->length, NULL);
+        if (a == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_BN_LIB);
+                goto err;
+                }
+        b = BN_bin2bn(params->curve->b->data, params->curve->b->length, NULL);
+        if (b == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_BN_LIB);
+                goto err;
+                }
+
+        /* get the field parameters */
+        tmp = OBJ_obj2nid(params->fieldID->fieldType);
+
+        if (tmp == NID_X9_62_characteristic_two_field)
+                {
+                X9_62_CHARACTERISTIC_TWO *char_two;
+
+                char_two = params->fieldID->p.char_two;
+
+                field_bits = char_two->m;
+                if (field_bits > OPENSSL_ECC_MAX_FIELD_BITS)
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_FIELD_TOO_LARGE);
+                        goto err;
+                        }
+
+                if ((p = BN_new()) == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+
+                /* get the base type */
+                tmp = OBJ_obj2nid(char_two->type);
+
+                if (tmp ==  NID_X9_62_tpBasis)
+                        {
+                        long tmp_long;
+
+                        if (!char_two->p.tpBasis)
+                                {
+                                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
+                                goto err;
+                                }
+
+                        tmp_long = ASN1_INTEGER_get(char_two->p.tpBasis);
+
+                        if (!(char_two->m > tmp_long && tmp_long > 0))
+                                {
+                                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_TRINOMIAL_BASIS);
+                                goto err;
+                                }
+                        
+                        /* create the polynomial */
+                        if (!BN_set_bit(p, (int)char_two->m))
+                                goto err;
+                        if (!BN_set_bit(p, (int)tmp_long))
+                                goto err;
+                        if (!BN_set_bit(p, 0))
+                                goto err;
+                        }
+                else if (tmp == NID_X9_62_ppBasis)
+                        {
+                        X9_62_PENTANOMIAL *penta;
+
+                        penta = char_two->p.ppBasis;
+                        if (!penta)
+                                {
+                                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
+                                goto err;
+                                }
+
+                        if (!(char_two->m > penta->k3 && penta->k3 > penta->k2 && penta->k2 > penta->k1 && penta->k1 > 0))
+                                {
+                                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_PENTANOMIAL_BASIS);
+                                goto err;
+                                }
+                        
+                        /* create the polynomial */
+                        if (!BN_set_bit(p, (int)char_two->m)) goto err;
+                        if (!BN_set_bit(p, (int)penta->k1)) goto err;
+                        if (!BN_set_bit(p, (int)penta->k2)) goto err;
+                        if (!BN_set_bit(p, (int)penta->k3)) goto err;
+                        if (!BN_set_bit(p, 0)) goto err;
+                        }
+                else if (tmp == NID_X9_62_onBasis)
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_NOT_IMPLEMENTED);
+                        goto err;
+                        }
+                else /* error */
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
+                        goto err;
+                        }
+
+                /* create the EC_GROUP structure */
+                ret = EC_GROUP_new_curve_GF2m(p, a, b, NULL);
+                }
+        else if (tmp == NID_X9_62_prime_field)
+                {
+                /* we have a curve over a prime field */
+                /* extract the prime number */
+                if (!params->fieldID->p.prime)
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
+                        goto err;
+                        }
+                p = ASN1_INTEGER_to_BN(params->fieldID->p.prime, NULL);
+                if (p == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB);
+                        goto err;
+                        }
+
+                if (BN_is_negative(p) || BN_is_zero(p))
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_FIELD);
+                        goto err;
+                        }
+
+                field_bits = BN_num_bits(p);
+                if (field_bits > OPENSSL_ECC_MAX_FIELD_BITS)
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_FIELD_TOO_LARGE);
+                        goto err;
+                        }
+
+                /* create the EC_GROUP structure */
+                ret = EC_GROUP_new_curve_GFp(p, a, b, NULL);
+                }
+        else
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_FIELD);
+                goto err;
+                }
+
+        if (ret == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB);
+                goto err;
+                }
+
+        /* extract seed (optional) */
+        if (params->curve->seed != NULL)
+                {
+                if (ret->seed != NULL)
+                        OPENSSL_free(ret->seed);
+                if (!(ret->seed = OPENSSL_malloc(params->curve->seed->length)))
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, 
+                              ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                memcpy(ret->seed, params->curve->seed->data, 
+                       params->curve->seed->length);
+                ret->seed_len = params->curve->seed->length;
+                }
+
+        if (!params->order || !params->base || !params->base->data)
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_ASN1_ERROR);
+                goto err;
+                }
+
+        if ((point = EC_POINT_new(ret)) == NULL) goto err;
+
+        /* set the point conversion form */
+        EC_GROUP_set_point_conversion_form(ret, (point_conversion_form_t)
+                                (params->base->data[0] & ~0x01));
+
+        /* extract the ec point */
+        if (!EC_POINT_oct2point(ret, point, params->base->data, 
+                                params->base->length, NULL))
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB);
+                goto err;
+                }
+
+        /* extract the order */
+        if ((a = ASN1_INTEGER_to_BN(params->order, a)) == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB);
+                goto err;
+                }
+        if (BN_is_negative(a) || BN_is_zero(a))
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_GROUP_ORDER);
+                goto err;
+                }
+        if (BN_num_bits(a) > (int)field_bits + 1) /* Hasse bound */
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, EC_R_INVALID_GROUP_ORDER);
+                goto err;
+                }
+        
+        /* extract the cofactor (optional) */
+        if (params->cofactor == NULL)
+                {
+                if (b)
+                        {
+                        BN_free(b);
+                        b = NULL;
+                        }
+                }
+        else
+                if ((b = ASN1_INTEGER_to_BN(params->cofactor, b)) == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_ASN1_LIB);
+                        goto err;
+                        }
+        /* set the generator, order and cofactor (if present) */
+        if (!EC_GROUP_set_generator(ret, point, a, b))
+                {
+                ECerr(EC_F_EC_ASN1_PARAMETERS2GROUP, ERR_R_EC_LIB);
+                goto err;
+                }
+
+        ok = 1;
+
+err:    if (!ok)
+                {
+                if (ret) 
+                        EC_GROUP_clear_free(ret);
+                ret = NULL;
+                }
+
+        if (p)  
+                BN_free(p);
+        if (a)  
+                BN_free(a);
+        if (b)  
+                BN_free(b);
+        if (point)      
+                EC_POINT_free(point);
+        return(ret);
+}
+
+EC_GROUP *ec_asn1_pkparameters2group(const ECPKPARAMETERS *params)
+        {
+        EC_GROUP *ret=NULL;
+        int      tmp=0;
+
+        if (params == NULL)
+                {
+                ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP, 
+                      EC_R_MISSING_PARAMETERS);
+                return NULL;
+                }
+
+        if (params->type == 0)
+                { /* the curve is given by an OID */
+                tmp = OBJ_obj2nid(params->value.named_curve);
+                if ((ret = EC_GROUP_new_by_curve_name(tmp)) == NULL)
+                        {
+                        ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP, 
+                              EC_R_EC_GROUP_NEW_BY_NAME_FAILURE);
+                        return NULL;
+                        }
+                EC_GROUP_set_asn1_flag(ret, OPENSSL_EC_NAMED_CURVE);
+                }
+        else if (params->type == 1)
+                { /* the parameters are given by a ECPARAMETERS
+                   * structure */
+                ret = ec_asn1_parameters2group(params->value.parameters);
+                if (!ret)
+                        {
+                        ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP, ERR_R_EC_LIB);
+                        return NULL;
+                        }
+                EC_GROUP_set_asn1_flag(ret, 0x0);
+                }
+        else if (params->type == 2)
+                { /* implicitlyCA */
+                return NULL;
+                }
+        else
+                {
+                ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP, EC_R_ASN1_ERROR);
+                return NULL;
+                }
+
+        return ret;
+        }
+
+/* EC_GROUP <-> DER encoding of ECPKPARAMETERS */
+
+EC_GROUP *d2i_ECPKParameters(EC_GROUP **a, const unsigned char **in, long len)
+        {
+        EC_GROUP        *group  = NULL;
+        ECPKPARAMETERS  *params = NULL;
+
+        if ((params = d2i_ECPKPARAMETERS(NULL, in, len)) == NULL)
+                {
+                ECerr(EC_F_D2I_ECPKPARAMETERS, EC_R_D2I_ECPKPARAMETERS_FAILURE);
+                ECPKPARAMETERS_free(params);
+                return NULL;
+                }
+        
+        if ((group = ec_asn1_pkparameters2group(params)) == NULL)
+                {
+                ECerr(EC_F_D2I_ECPKPARAMETERS, EC_R_PKPARAMETERS2GROUP_FAILURE);
+                return NULL; 
+                }
+
+        
+        if (a && *a)
+                EC_GROUP_clear_free(*a);
+        if (a)
+                *a = group;
+
+        ECPKPARAMETERS_free(params);
+        return(group);
+        }
+
+int i2d_ECPKParameters(const EC_GROUP *a, unsigned char **out)
+        {
+        int             ret=0;
+        ECPKPARAMETERS  *tmp = ec_asn1_group2pkparameters(a, NULL);
+        if (tmp == NULL)
+                {
+                ECerr(EC_F_I2D_ECPKPARAMETERS, EC_R_GROUP2PKPARAMETERS_FAILURE);
+                return 0;
+                }
+        if ((ret = i2d_ECPKPARAMETERS(tmp, out)) == 0)
+                {
+                ECerr(EC_F_I2D_ECPKPARAMETERS, EC_R_I2D_ECPKPARAMETERS_FAILURE);
+                ECPKPARAMETERS_free(tmp);
+                return 0;
+                }       
+        ECPKPARAMETERS_free(tmp);
+        return(ret);
+        }
+
+/* some EC_KEY functions */
+
+EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len)
+        {
+        int             ok=0;
+        EC_KEY          *ret=NULL;
+        EC_PRIVATEKEY   *priv_key=NULL;
+
+        if ((priv_key = EC_PRIVATEKEY_new()) == NULL)
+                {
+                ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_MALLOC_FAILURE);
+                return NULL;
+                }
+
+        if ((priv_key = d2i_EC_PRIVATEKEY(&priv_key, in, len)) == NULL)
+                {
+                ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB);
+                EC_PRIVATEKEY_free(priv_key);
+                return NULL;
+                }
+
+        if (a == NULL || *a == NULL)
+                {
+                if ((ret = EC_KEY_new()) == NULL)       
+                        {
+                        ECerr(EC_F_D2I_ECPRIVATEKEY,
+                                 ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                if (a)
+                        *a = ret;
+                }
+        else
+                ret = *a;
+
+        if (priv_key->parameters)
+                {
+                if (ret->group)
+                        EC_GROUP_clear_free(ret->group);
+                ret->group = ec_asn1_pkparameters2group(priv_key->parameters);
+                }
+
+        if (ret->group == NULL)
+                {
+                ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB);
+                goto err;
+                }
+
+        ret->version = priv_key->version;
+
+        if (priv_key->privateKey)
+                {
+                ret->priv_key = BN_bin2bn(
+                        M_ASN1_STRING_data(priv_key->privateKey),
+                        M_ASN1_STRING_length(priv_key->privateKey),
+                        ret->priv_key);
+                if (ret->priv_key == NULL)
+                        {
+                        ECerr(EC_F_D2I_ECPRIVATEKEY,
+                              ERR_R_BN_LIB);
+                        goto err;
+                        }
+                }
+        else
+                {
+                ECerr(EC_F_D2I_ECPRIVATEKEY, 
+                      EC_R_MISSING_PRIVATE_KEY);
+                goto err;
+                }
+
+        if (priv_key->publicKey)
+                {
+                const unsigned char *pub_oct;
+                size_t pub_oct_len;
+
+                if (ret->pub_key)
+                        EC_POINT_clear_free(ret->pub_key);
+                ret->pub_key = EC_POINT_new(ret->group);
+                if (ret->pub_key == NULL)
+                        {
+                        ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                pub_oct     = M_ASN1_STRING_data(priv_key->publicKey);
+                pub_oct_len = M_ASN1_STRING_length(priv_key->publicKey);
+                /* save the point conversion form */
+                ret->conv_form = (point_conversion_form_t)(pub_oct[0] & ~0x01);
+                if (!EC_POINT_oct2point(ret->group, ret->pub_key,
+                        pub_oct, pub_oct_len, NULL))
+                        {
+                        ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                }
+
+        ok = 1;
+err:
+        if (!ok)
+                {
+                if (ret)
+                        EC_KEY_free(ret);
+                ret = NULL;
+                }
+
+        if (priv_key)
+                EC_PRIVATEKEY_free(priv_key);
+
+        return(ret);
+        }
+
+int     i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
+        {
+        int             ret=0, ok=0;
+        unsigned char   *buffer=NULL;
+        size_t          buf_len=0, tmp_len;
+        EC_PRIVATEKEY   *priv_key=NULL;
+
+        if (a == NULL || a->group == NULL || a->priv_key == NULL)
+                {
+                ECerr(EC_F_I2D_ECPRIVATEKEY,
+                      ERR_R_PASSED_NULL_PARAMETER);
+                goto err;
+                }
+
+        if ((priv_key = EC_PRIVATEKEY_new()) == NULL)
+                {
+                ECerr(EC_F_I2D_ECPRIVATEKEY,
+                      ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        priv_key->version = a->version;
+
+        buf_len = (size_t)BN_num_bytes(a->priv_key);
+        buffer = OPENSSL_malloc(buf_len);
+        if (buffer == NULL)
+                {
+                ECerr(EC_F_I2D_ECPRIVATEKEY,
+                      ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        
+        if (!BN_bn2bin(a->priv_key, buffer))
+                {
+                ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_BN_LIB);
+                goto err;
+                }
+
+        if (!M_ASN1_OCTET_STRING_set(priv_key->privateKey, buffer, buf_len))
+                {
+                ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
+                goto err;
+                }       
+
+        if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS))
+                {
+                if ((priv_key->parameters = ec_asn1_group2pkparameters(
+                        a->group, priv_key->parameters)) == NULL)
+                        {
+                        ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                }
+
+        if (!(a->enc_flag & EC_PKEY_NO_PUBKEY))
+                {
+                priv_key->publicKey = M_ASN1_BIT_STRING_new();
+                if (priv_key->publicKey == NULL)
+                        {
+                        ECerr(EC_F_I2D_ECPRIVATEKEY,
+                                ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+
+                tmp_len = EC_POINT_point2oct(a->group, a->pub_key, 
+                                a->conv_form, NULL, 0, NULL);
+
+                if (tmp_len > buf_len)
+                        {
+                        unsigned char *tmp_buffer = OPENSSL_realloc(buffer, tmp_len);
+                        if (!tmp_buffer)
+                                {
+                                ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        buffer = tmp_buffer;
+                        buf_len = tmp_len;
+                        }
+
+                if (!EC_POINT_point2oct(a->group, a->pub_key, 
+                        a->conv_form, buffer, buf_len, NULL))
+                        {
+                        ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_EC_LIB);
+                        goto err;
+                        }
+
+                priv_key->publicKey->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
+                priv_key->publicKey->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+                if (!M_ASN1_BIT_STRING_set(priv_key->publicKey, buffer, 
+                                buf_len))
+                        {
+                        ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
+                        goto err;
+                        }
+                }
+
+        if ((ret = i2d_EC_PRIVATEKEY(priv_key, out)) == 0)
+                {
+                ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_EC_LIB);
+                goto err;
+                }
+        ok=1;
+err:
+        if (buffer)
+                OPENSSL_free(buffer);
+        if (priv_key)
+                EC_PRIVATEKEY_free(priv_key);
+        return(ok?ret:0);
+        }
+
+int i2d_ECParameters(EC_KEY *a, unsigned char **out)
+        {
+        if (a == NULL)
+                {
+                ECerr(EC_F_I2D_ECPARAMETERS, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        return i2d_ECPKParameters(a->group, out);
+        }
+
+EC_KEY *d2i_ECParameters(EC_KEY **a, const unsigned char **in, long len)
+        {
+        EC_KEY   *ret;
+
+        if (in == NULL || *in == NULL)
+                {
+                ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+
+        if (a == NULL || *a == NULL)
+                {
+                if ((ret = EC_KEY_new()) == NULL)
+                        {
+                        ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_MALLOC_FAILURE);
+                        return NULL;
+                        }
+                if (a)
+                        *a = ret;
+                }
+        else
+                ret = *a;
+
+        if (!d2i_ECPKParameters(&ret->group, in, len))
+                {
+                ECerr(EC_F_D2I_ECPARAMETERS, ERR_R_EC_LIB);
+                return NULL;
+                }
+
+        return ret;
+        }
+
+EC_KEY *o2i_ECPublicKey(EC_KEY **a, const unsigned char **in, long len)
+        {
+        EC_KEY *ret=NULL;
+
+        if (a == NULL || (*a) == NULL || (*a)->group == NULL)
+                {
+                /* sorry, but a EC_GROUP-structur is necessary
+                 * to set the public key */
+                ECerr(EC_F_O2I_ECPUBLICKEY, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        ret = *a;
+        if (ret->pub_key == NULL && 
+                (ret->pub_key = EC_POINT_new(ret->group)) == NULL)
+                {
+                ECerr(EC_F_O2I_ECPUBLICKEY, ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        if (!EC_POINT_oct2point(ret->group, ret->pub_key, *in, len, NULL))
+                {
+                ECerr(EC_F_O2I_ECPUBLICKEY, ERR_R_EC_LIB);
+                return 0;
+                }
+        /* save the point conversion form */
+        ret->conv_form = (point_conversion_form_t)(*in[0] & ~0x01);
+        *in += len;
+        return ret;
+        }
+
+int i2o_ECPublicKey(EC_KEY *a, unsigned char **out)
+        {
+        size_t buf_len=0;
+        int new_buffer = 0;
+
+        if (a == NULL) 
+                {
+                ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+
+        buf_len = EC_POINT_point2oct(a->group, a->pub_key, 
+                              a->conv_form, NULL, 0, NULL);
+
+        if (out == NULL || buf_len == 0)
+        /* out == NULL => just return the length of the octet string */
+                return buf_len;
+
+        if (*out == NULL)
+                {
+                if ((*out = OPENSSL_malloc(buf_len)) == NULL)
+                        {
+                        ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_MALLOC_FAILURE);
+                        return 0;
+                        }
+                new_buffer = 1;
+                }
+        if (!EC_POINT_point2oct(a->group, a->pub_key, a->conv_form,
+                                *out, buf_len, NULL))
+                {
+                ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB);
+                OPENSSL_free(*out);
+                *out = NULL;
+                return 0;
+                }
+        if (!new_buffer)
+                *out += buf_len;
+        return buf_len;
+        }
diff --git a/src/lib/libssl/src/crypto/ec/ec_check.c b/src/lib/libssl/src/crypto/ec/ec_check.c
new file mode 100644
index 0000000000..0e316b4b3f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ec/ec_check.c
@@ -0,0 +1,123 @@
+/* crypto/ec/ec_check.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "ec_lcl.h"
+#include <openssl/err.h>
+
+int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx)
+        {
+        int ret = 0;
+        BIGNUM *order;
+        BN_CTX *new_ctx = NULL;
+        EC_POINT *point = NULL;
+
+        if (ctx == NULL)
+                {
+                ctx = new_ctx = BN_CTX_new();
+                if (ctx == NULL)
+                        {
+                        ECerr(EC_F_EC_GROUP_CHECK, ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                }
+        BN_CTX_start(ctx);
+        if ((order = BN_CTX_get(ctx)) == NULL) goto err;
+
+        /* check the discriminant */
+        if (!EC_GROUP_check_discriminant(group, ctx))
+                {
+                ECerr(EC_F_EC_GROUP_CHECK, EC_R_DISCRIMINANT_IS_ZERO);
+                goto err;
+                }
+
+        /* check the generator */
+        if (group->generator == NULL)
+                {
+                ECerr(EC_F_EC_GROUP_CHECK, EC_R_UNDEFINED_GENERATOR);
+                goto err;
+                }
+        if (!EC_POINT_is_on_curve(group, group->generator, ctx))
+                {
+                ECerr(EC_F_EC_GROUP_CHECK, EC_R_POINT_IS_NOT_ON_CURVE);
+                goto err;
+                }
+
+        /* check the order of the generator */
+        if ((point = EC_POINT_new(group)) == NULL) goto err;
+        if (!EC_GROUP_get_order(group, order, ctx)) goto err; 
+        if (BN_is_zero(order))
+                {
+                ECerr(EC_F_EC_GROUP_CHECK, EC_R_UNDEFINED_ORDER);
+                goto err;
+                }
+        
+        if (!EC_POINT_mul(group, point, order, NULL, NULL, ctx)) goto err;
+        if (!EC_POINT_is_at_infinity(group, point))
+                {
+                ECerr(EC_F_EC_GROUP_CHECK, EC_R_INVALID_GROUP_ORDER);
+                goto err;
+                }
+
+        ret = 1;
+
+err:
+        if (ctx != NULL)
+                BN_CTX_end(ctx);
+        if (new_ctx != NULL)
+                BN_CTX_free(new_ctx);
+        if (point)
+                EC_POINT_free(point);
+        return ret;
+        }
diff --git a/src/lib/libssl/src/crypto/ec/ec_curve.c b/src/lib/libssl/src/crypto/ec/ec_curve.c
new file mode 100644
index 0000000000..beac20969b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ec/ec_curve.c
@@ -0,0 +1,1270 @@
+/* crypto/ec/ec_curve.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project.
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the OpenSSL open source
+ * license provided above.
+ *
+ * The elliptic curve binary polynomial software is originally written by 
+ * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+
+#include "ec_lcl.h"
+#include <openssl/err.h>
+#include <openssl/obj_mac.h>
+
+typedef struct ec_curve_data_st {
+        int     field_type;     /* either NID_X9_62_prime_field or
+                                 * NID_X9_62_characteristic_two_field */
+        const char *p;          /* either a prime number or a polynomial */
+        const char *a;
+        const char *b;
+        const char *x;          /* the x coordinate of the generator */
+        const char *y;          /* the y coordinate of the generator */
+        const char *order;      /* the order of the group generated by the
+                                 * generator */
+        const BN_ULONG cofactor;/* the cofactor */
+        const unsigned char *seed;/* the seed (optional) */
+        size_t  seed_len;
+        const char *comment;    /* a short description of the curve */
+} EC_CURVE_DATA;
+
+/* the nist prime curves */
+static const unsigned char _EC_NIST_PRIME_192_SEED[] = {
+        0x30,0x45,0xAE,0x6F,0xC8,0x42,0x2F,0x64,0xED,0x57,
+        0x95,0x28,0xD3,0x81,0x20,0xEA,0xE1,0x21,0x96,0xD5};
+static const EC_CURVE_DATA _EC_NIST_PRIME_192 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+        "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
+        "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
+        "07192b95ffc8da78631011ed6b24cdd573f977a11e794811",
+        "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",1,
+        _EC_NIST_PRIME_192_SEED, 20,
+        "NIST/X9.62/SECG curve over a 192 bit prime field"
+        };
+
+static const unsigned char _EC_NIST_PRIME_224_SEED[] = {
+        0xBD,0x71,0x34,0x47,0x99,0xD5,0xC7,0xFC,0xDC,0x45,
+        0xB5,0x9F,0xA3,0xB9,0xAB,0x8F,0x6A,0x94,0x8B,0xC5};
+static const EC_CURVE_DATA _EC_NIST_PRIME_224 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+        "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+        "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+        "bd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",1,
+        _EC_NIST_PRIME_224_SEED, 20,
+        "NIST/SECG curve over a 224 bit prime field"
+        };
+
+static const unsigned char _EC_NIST_PRIME_384_SEED[] = {
+        0xA3,0x35,0x92,0x6A,0xA3,0x19,0xA2,0x7A,0x1D,0x00,
+        0x89,0x6A,0x67,0x73,0xA4,0x82,0x7A,0xCD,0xAC,0x73};
+static const EC_CURVE_DATA _EC_NIST_PRIME_384 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFF"
+        "FFF0000000000000000FFFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFF"
+        "FFF0000000000000000FFFFFFFC",
+        "B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC6563"
+        "98D8A2ED19D2A85C8EDD3EC2AEF",
+        "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F"
+        "25DBF55296C3A545E3872760AB7",
+        "3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c00a60b"
+        "1ce1d7e819d7a431d7c90ea0e5f",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0"
+        "DB248B0A77AECEC196ACCC52973",1,
+        _EC_NIST_PRIME_384_SEED, 20,
+        "NIST/SECG curve over a 384 bit prime field"
+        };
+
+static const unsigned char _EC_NIST_PRIME_521_SEED[] = {
+        0xD0,0x9E,0x88,0x00,0x29,0x1C,0xB8,0x53,0x96,0xCC,
+        0x67,0x17,0x39,0x32,0x84,0xAA,0xA0,0xDA,0x64,0xBA};
+static const EC_CURVE_DATA _EC_NIST_PRIME_521 = {
+        NID_X9_62_prime_field,
+        "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
+        "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC",
+        "051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156"
+        "193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00",
+        "C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14"
+        "B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66",
+        "011839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e662c9"
+        "7ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650",
+        "1FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51"
+        "868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409",1,
+        _EC_NIST_PRIME_521_SEED, 20,
+        "NIST/SECG curve over a 521 bit prime field"
+        };
+/* the x9.62 prime curves (minus the nist prime curves) */
+static const unsigned char _EC_X9_62_PRIME_192V2_SEED[] = {
+        0x31,0xA9,0x2E,0xE2,0x02,0x9F,0xD1,0x0D,0x90,0x1B,
+        0x11,0x3E,0x99,0x07,0x10,0xF0,0xD2,0x1A,0xC6,0xB6};
+static const EC_CURVE_DATA _EC_X9_62_PRIME_192V2 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+        "CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953",
+        "EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A",
+        "6574d11d69b6ec7a672bb82a083df2f2b0847de970b2de15",
+        "FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31",1,
+        _EC_X9_62_PRIME_192V2_SEED, 20,
+        "X9.62 curve over a 192 bit prime field"
+        };
+
+static const unsigned char _EC_X9_62_PRIME_192V3_SEED[] = {
+        0xC4,0x69,0x68,0x44,0x35,0xDE,0xB3,0x78,0xC4,0xB6,
+        0x5C,0xA9,0x59,0x1E,0x2A,0x57,0x63,0x05,0x9A,0x2E};
+static const EC_CURVE_DATA _EC_X9_62_PRIME_192V3 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+        "22123DC2395A05CAA7423DAECCC94760A7D462256BD56916",
+        "7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896",
+        "38a90f22637337334b49dcb66a6dc8f9978aca7648a943b0",
+        "FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13",1,
+        _EC_X9_62_PRIME_192V3_SEED, 20,
+        "X9.62 curve over a 192 bit prime field"
+        };
+
+static const unsigned char _EC_X9_62_PRIME_239V1_SEED[] = {
+        0xE4,0x3B,0xB4,0x60,0xF0,0xB8,0x0C,0xC0,0xC0,0xB0,
+        0x75,0x79,0x8E,0x94,0x80,0x60,0xF8,0x32,0x1B,0x7D};
+static const EC_CURVE_DATA _EC_X9_62_PRIME_239V1 = {
+        NID_X9_62_prime_field,
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+        "6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A",
+        "0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF",
+        "7debe8e4e90a5dae6e4054ca530ba04654b36818ce226b39fccb7b02f1ae",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B",1,
+        _EC_X9_62_PRIME_239V1_SEED, 20,
+        "X9.62 curve over a 239 bit prime field"
+        };
+
+static const unsigned char _EC_X9_62_PRIME_239V2_SEED[] = {
+        0xE8,0xB4,0x01,0x16,0x04,0x09,0x53,0x03,0xCA,0x3B,
+        0x80,0x99,0x98,0x2B,0xE0,0x9F,0xCB,0x9A,0xE6,0x16};
+static const EC_CURVE_DATA _EC_X9_62_PRIME_239V2 = {
+        NID_X9_62_prime_field,
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+        "617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C",
+        "38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7",
+        "5b0125e4dbea0ec7206da0fc01d9b081329fb555de6ef460237dff8be4ba",
+        "7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063",1,
+        _EC_X9_62_PRIME_239V2_SEED, 20,
+        "X9.62 curve over a 239 bit prime field"
+        };
+
+static const unsigned char _EC_X9_62_PRIME_239V3_SEED[] = {
+        0x7D,0x73,0x74,0x16,0x8F,0xFE,0x34,0x71,0xB6,0x0A,
+        0x85,0x76,0x86,0xA1,0x94,0x75,0xD3,0xBF,0xA2,0xFF};
+static const EC_CURVE_DATA _EC_X9_62_PRIME_239V3 = {
+        NID_X9_62_prime_field,
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC",
+        "255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E",
+        "6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A",
+        "1607e6898f390c06bc1d552bad226f3b6fcfe48b6e818499af18e3ed6cf3",
+        "7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551",1,
+        _EC_X9_62_PRIME_239V3_SEED, 20,
+        "X9.62 curve over a 239 bit prime field"
+        };
+
+static const unsigned char _EC_X9_62_PRIME_256V1_SEED[] = {
+        0xC4,0x9D,0x36,0x08,0x86,0xE7,0x04,0x93,0x6A,0x66,
+        0x78,0xE1,0x13,0x9D,0x26,0xB7,0x81,0x9F,0x7E,0x90};
+static const EC_CURVE_DATA _EC_X9_62_PRIME_256V1 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF",
+        "FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC",
+        "5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B",
+        "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296",
+        "4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5",
+        "FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551",1,
+        _EC_X9_62_PRIME_256V1_SEED, 20,
+        "X9.62/SECG curve over a 256 bit prime field"
+        };
+/* the secg prime curves (minus the nist and x9.62 prime curves) */
+static const unsigned char _EC_SECG_PRIME_112R1_SEED[] = {
+        0x00,0xF5,0x0B,0x02,0x8E,0x4D,0x69,0x6E,0x67,0x68,
+        0x75,0x61,0x51,0x75,0x29,0x04,0x72,0x78,0x3F,0xB1};
+static const EC_CURVE_DATA _EC_SECG_PRIME_112R1 = {
+        NID_X9_62_prime_field,
+        "DB7C2ABF62E35E668076BEAD208B",
+        "DB7C2ABF62E35E668076BEAD2088",
+        "659EF8BA043916EEDE8911702B22",
+        "09487239995A5EE76B55F9C2F098",
+        "a89ce5af8724c0a23e0e0ff77500",
+        "DB7C2ABF62E35E7628DFAC6561C5",1,
+        _EC_SECG_PRIME_112R1_SEED, 20,
+        "SECG/WTLS curve over a 112 bit prime field"
+        };
+
+static const unsigned char _EC_SECG_PRIME_112R2_SEED[] = {
+        0x00,0x27,0x57,0xA1,0x11,0x4D,0x69,0x6E,0x67,0x68,
+        0x75,0x61,0x51,0x75,0x53,0x16,0xC0,0x5E,0x0B,0xD4};
+static const EC_CURVE_DATA _EC_SECG_PRIME_112R2 = {
+        NID_X9_62_prime_field,
+        "DB7C2ABF62E35E668076BEAD208B",
+        "6127C24C05F38A0AAAF65C0EF02C",
+        "51DEF1815DB5ED74FCC34C85D709",
+        "4BA30AB5E892B4E1649DD0928643",
+        "adcd46f5882e3747def36e956e97",
+        "36DF0AAFD8B8D7597CA10520D04B",4, 
+        _EC_SECG_PRIME_112R2_SEED, 20,
+        "SECG curve over a 112 bit prime field"
+        };
+
+static const unsigned char _EC_SECG_PRIME_128R1_SEED[] = {
+        0x00,0x0E,0x0D,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
+        0x51,0x75,0x0C,0xC0,0x3A,0x44,0x73,0xD0,0x36,0x79};
+static const EC_CURVE_DATA _EC_SECG_PRIME_128R1 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+        "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
+        "E87579C11079F43DD824993C2CEE5ED3",
+        "161FF7528B899B2D0C28607CA52C5B86",
+        "cf5ac8395bafeb13c02da292dded7a83",
+        "FFFFFFFE0000000075A30D1B9038A115",1,
+        _EC_SECG_PRIME_128R1_SEED, 20,
+        "SECG curve over a 128 bit prime field"
+        };
+
+static const unsigned char _EC_SECG_PRIME_128R2_SEED[] = {
+        0x00,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,0x51,0x75,
+        0x12,0xD8,0xF0,0x34,0x31,0xFC,0xE6,0x3B,0x88,0xF4};
+static const EC_CURVE_DATA _EC_SECG_PRIME_128R2 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+        "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
+        "5EEEFCA380D02919DC2C6558BB6D8A5D",
+        "7B6AA5D85E572983E6FB32A7CDEBC140",
+        "27b6916a894d3aee7106fe805fc34b44",
+        "3FFFFFFF7FFFFFFFBE0024720613B5A3",4,
+        _EC_SECG_PRIME_128R2_SEED, 20,
+        "SECG curve over a 128 bit prime field"
+        };
+
+static const EC_CURVE_DATA _EC_SECG_PRIME_160K1 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+        "0",
+        "7",
+        "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
+        "938cf935318fdced6bc28286531733c3f03c4fee",
+        "0100000000000000000001B8FA16DFAB9ACA16B6B3",1,
+        NULL, 0,
+        "SECG curve over a 160 bit prime field"
+        };
+
+static const unsigned char _EC_SECG_PRIME_160R1_SEED[] = {
+        0x10,0x53,0xCD,0xE4,0x2C,0x14,0xD6,0x96,0xE6,0x76,
+        0x87,0x56,0x15,0x17,0x53,0x3B,0xF3,0xF8,0x33,0x45};
+static const EC_CURVE_DATA _EC_SECG_PRIME_160R1 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
+        "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
+        "4A96B5688EF573284664698968C38BB913CBFC82",
+        "23a628553168947d59dcc912042351377ac5fb32",
+        "0100000000000000000001F4C8F927AED3CA752257",1,
+        _EC_SECG_PRIME_160R1_SEED, 20,
+        "SECG curve over a 160 bit prime field"
+        };
+
+static const unsigned char _EC_SECG_PRIME_160R2_SEED[] = {
+        0xB9,0x9B,0x99,0xB0,0x99,0xB3,0x23,0xE0,0x27,0x09,
+        0xA4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x51};
+static const EC_CURVE_DATA _EC_SECG_PRIME_160R2 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
+        "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
+        "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
+        "feaffef2e331f296e071fa0df9982cfea7d43f2e",
+        "0100000000000000000000351EE786A818F3A1A16B",1,
+        _EC_SECG_PRIME_160R2_SEED, 20,
+        "SECG/WTLS curve over a 160 bit prime field"
+        };
+
+static const EC_CURVE_DATA _EC_SECG_PRIME_192K1 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
+        "0",
+        "3",
+        "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
+        "9b2f2f6d9c5628a7844163d015be86344082aa88d95e2f9d",
+        "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",1,
+        NULL, 20,
+        "SECG curve over a 192 bit prime field"
+        };
+
+static const EC_CURVE_DATA _EC_SECG_PRIME_224K1 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
+        "0",
+        "5",
+        "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
+        "7e089fed7fba344282cafbd6f7e319f7c0b0bd59e2ca4bdb556d61a5",
+        "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",1,
+        NULL, 20,
+        "SECG curve over a 224 bit prime field"
+        };
+
+static const EC_CURVE_DATA _EC_SECG_PRIME_256K1 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F",
+        "0",
+        "7",
+        "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798",
+        "483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141",1,
+        NULL, 20,
+        "SECG curve over a 256 bit prime field"
+        };
+
+/* some wap/wtls curves */
+static const EC_CURVE_DATA _EC_WTLS_8 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFDE7",
+        "0",
+        "3",
+        "1",
+        "2",
+        "0100000000000001ECEA551AD837E9",1,
+        NULL, 20,
+        "WTLS curve over a 112 bit prime field"
+        };
+
+static const EC_CURVE_DATA _EC_WTLS_9 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC808F",
+        "0",
+        "3",
+        "1",
+        "2",
+        "0100000000000000000001CDC98AE0E2DE574ABF33",1,
+        NULL, 20,
+        "WTLS curve over a 160 bit prime field"
+        };
+
+static const EC_CURVE_DATA _EC_WTLS_12 = {
+        NID_X9_62_prime_field,
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+        "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+        "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+        "bd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34",
+        "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D", 1,
+        NULL, 0,
+        "WTLS curvs over a 224 bit prime field"
+        };
+
+/* characteristic two curves */
+static const unsigned char _EC_SECG_CHAR2_113R1_SEED[] = {
+        0x10,0xE7,0x23,0xAB,0x14,0xD6,0x96,0xE6,0x76,0x87,
+        0x56,0x15,0x17,0x56,0xFE,0xBF,0x8F,0xCB,0x49,0xA9};
+static const EC_CURVE_DATA _EC_SECG_CHAR2_113R1 = {
+        NID_X9_62_characteristic_two_field,
+        "020000000000000000000000000201",
+        "003088250CA6E7C7FE649CE85820F7",
+        "00E8BEE4D3E2260744188BE0E9C723",
+        "009D73616F35F4AB1407D73562C10F",
+        "00A52830277958EE84D1315ED31886",
+        "0100000000000000D9CCEC8A39E56F", 2,
+        _EC_SECG_CHAR2_113R1_SEED, 20,
+        "SECG curve over a 113 bit binary field"
+        };
+
+static const unsigned char _EC_SECG_CHAR2_113R2_SEED[] = {
+        0x10,0xC0,0xFB,0x15,0x76,0x08,0x60,0xDE,0xF1,0xEE,
+        0xF4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x5D};
+static const EC_CURVE_DATA _EC_SECG_CHAR2_113R2 = {
+        NID_X9_62_characteristic_two_field,
+        "020000000000000000000000000201",
+        "00689918DBEC7E5A0DD6DFC0AA55C7",
+        "0095E9A9EC9B297BD4BF36E059184F",
+        "01A57A6A7B26CA5EF52FCDB8164797",
+        "00B3ADC94ED1FE674C06E695BABA1D",
+        "010000000000000108789B2496AF93", 2,
+        _EC_SECG_CHAR2_113R2_SEED, 20,
+        "SECG curve over a 113 bit binary field"
+        };
+
+static const unsigned char _EC_SECG_CHAR2_131R1_SEED[] = {
+        0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,0x51,0x75,0x98,
+        0x5B,0xD3,0xAD,0xBA,0xDA,0x21,0xB4,0x3A,0x97,0xE2};
+static const EC_CURVE_DATA _EC_SECG_CHAR2_131R1 = {
+        NID_X9_62_characteristic_two_field,
+        "080000000000000000000000000000010D",
+        "07A11B09A76B562144418FF3FF8C2570B8",
+        "0217C05610884B63B9C6C7291678F9D341",
+        "0081BAF91FDF9833C40F9C181343638399",
+        "078C6E7EA38C001F73C8134B1B4EF9E150",
+        "0400000000000000023123953A9464B54D", 2,
+        _EC_SECG_CHAR2_131R1_SEED, 20,
+        "SECG/WTLS curve over a 131 bit binary field"
+        };
+
+static const unsigned char _EC_SECG_CHAR2_131R2_SEED[] = {
+        0x98,0x5B,0xD3,0xAD,0xBA,0xD4,0xD6,0x96,0xE6,0x76,
+        0x87,0x56,0x15,0x17,0x5A,0x21,0xB4,0x3A,0x97,0xE3};
+static const EC_CURVE_DATA _EC_SECG_CHAR2_131R2 = {
+        NID_X9_62_characteristic_two_field,
+        "080000000000000000000000000000010D",
+        "03E5A88919D7CAFCBF415F07C2176573B2",
+        "04B8266A46C55657AC734CE38F018F2192",
+        "0356DCD8F2F95031AD652D23951BB366A8",
+        "0648F06D867940A5366D9E265DE9EB240F",
+        "0400000000000000016954A233049BA98F", 2,
+        _EC_SECG_CHAR2_131R2_SEED, 20,
+        "SECG curve over a 131 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_NIST_CHAR2_163K = {
+        NID_X9_62_characteristic_two_field,
+        "0800000000000000000000000000000000000000C9",
+        "1",
+        "1",
+        "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8",
+        "0289070FB05D38FF58321F2E800536D538CCDAA3D9",
+        "04000000000000000000020108A2E0CC0D99F8A5EF", 2,
+        NULL, 0,
+        "NIST/SECG/WTLS curve over a 163 bit binary field"
+        };
+
+static const unsigned char _EC_SECG_CHAR2_163R1_SEED[] = {
+        0x24,0xB7,0xB1,0x37,0xC8,0xA1,0x4D,0x69,0x6E,0x67,
+        0x68,0x75,0x61,0x51,0x75,0x6F,0xD0,0xDA,0x2E,0x5C};
+static const EC_CURVE_DATA _EC_SECG_CHAR2_163R1 = {
+        NID_X9_62_characteristic_two_field,
+        "0800000000000000000000000000000000000000C9",
+        "07B6882CAAEFA84F9554FF8428BD88E246D2782AE2",
+        "0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9",
+        "0369979697AB43897789566789567F787A7876A654",
+        "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883",
+        "03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B", 2,
+/* The algorithm used to derive the curve parameters from
+ * the seed used here is slightly different than the
+ * algorithm described in X9.62 .
+ */
+#if 0
+        _EC_SECG_CHAR2_163R1_SEED, 20,
+#else
+        NULL, 0,
+#endif
+        "SECG curve over a 163 bit binary field"
+        };
+
+static const unsigned char _EC_NIST_CHAR2_163B_SEED[] = {
+        0x85,0xE2,0x5B,0xFE,0x5C,0x86,0x22,0x6C,0xDB,0x12,
+        0x01,0x6F,0x75,0x53,0xF9,0xD0,0xE6,0x93,0xA2,0x68};
+static const EC_CURVE_DATA _EC_NIST_CHAR2_163B ={
+        NID_X9_62_characteristic_two_field,
+        "0800000000000000000000000000000000000000C9",
+        "1",
+        "020A601907B8C953CA1481EB10512F78744A3205FD",
+        "03F0EBA16286A2D57EA0991168D4994637E8343E36",
+        "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1",
+        "040000000000000000000292FE77E70C12A4234C33", 2,
+/* The seed here was used to created the curve parameters in normal
+ * basis representation (and not the polynomial representation used here) 
+ */
+#if 0
+        _EC_NIST_CHAR2_163B_SEED, 20,
+#else
+        NULL, 0,
+#endif
+        "NIST/SECG curve over a 163 bit binary field"
+        };
+
+static const unsigned char _EC_SECG_CHAR2_193R1_SEED[] = {
+        0x10,0x3F,0xAE,0xC7,0x4D,0x69,0x6E,0x67,0x68,0x75,
+        0x61,0x51,0x75,0x77,0x7F,0xC5,0xB1,0x91,0xEF,0x30};
+static const EC_CURVE_DATA _EC_SECG_CHAR2_193R1 = {
+        NID_X9_62_characteristic_two_field,
+        "02000000000000000000000000000000000000000000008001",
+        "0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01",
+        "00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814",
+        "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1",
+        "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05",
+        "01000000000000000000000000C7F34A778F443ACC920EBA49", 2,
+        _EC_SECG_CHAR2_193R1_SEED, 20,
+        "SECG curve over a 193 bit binary field"
+        };
+
+static const unsigned char _EC_SECG_CHAR2_193R2_SEED[] = {
+        0x10,0xB7,0xB4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,
+        0x17,0x51,0x37,0xC8,0xA1,0x6F,0xD0,0xDA,0x22,0x11};
+static const EC_CURVE_DATA _EC_SECG_CHAR2_193R2 = {
+        NID_X9_62_characteristic_two_field,
+        "02000000000000000000000000000000000000000000008001",
+        "0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B",
+        "00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE",
+        "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F",
+        "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C",
+        "010000000000000000000000015AAB561B005413CCD4EE99D5", 2,
+        _EC_SECG_CHAR2_193R2_SEED, 20,
+        "SECG curve over a 193 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_NIST_CHAR2_233K = {
+        NID_X9_62_characteristic_two_field,
+        "020000000000000000000000000000000000000004000000000000000001",
+        "0",
+        "1",
+        "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126",
+        "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3",
+        "008000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF", 4,
+        NULL, 0,
+        "NIST/SECG/WTLS curve over a 233 bit binary field"
+        };
+
+static const unsigned char _EC_NIST_CHAR2_233B_SEED[] = {
+        0x74,0xD5,0x9F,0xF0,0x7F,0x6B,0x41,0x3D,0x0E,0xA1,
+        0x4B,0x34,0x4B,0x20,0xA2,0xDB,0x04,0x9B,0x50,0xC3};
+static const EC_CURVE_DATA _EC_NIST_CHAR2_233B = {
+        NID_X9_62_characteristic_two_field,
+        "020000000000000000000000000000000000000004000000000000000001",
+        "000000000000000000000000000000000000000000000000000000000001",
+        "0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD",
+        "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B",
+        "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052",
+        "01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", 2,
+        _EC_NIST_CHAR2_233B_SEED, 20,
+        "NIST/SECG/WTLS curve over a 233 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_SECG_CHAR2_239K1 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000004000000000000000000000000000000000000001",
+        "0",
+        "1",
+        "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC",
+        "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA",
+        "2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5", 4,
+        NULL, 0,
+        "SECG curve over a 239 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_NIST_CHAR2_283K = {
+        NID_X9_62_characteristic_two_field,
+        "080000000000000000000000000000000000000000000000000000000000000000001"
+        "0A1",
+        "0",
+        "1",
+        "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492"
+        "836",
+        "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2"
+        "259",
+        "01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163"
+        "C61", 4,
+        NULL, 20,
+        "NIST/SECG curve over a 283 bit binary field"
+        };
+
+static const unsigned char _EC_NIST_CHAR2_283B_SEED[] = {
+        0x77,0xE2,0xB0,0x73,0x70,0xEB,0x0F,0x83,0x2A,0x6D,
+        0xD5,0xB6,0x2D,0xFC,0x88,0xCD,0x06,0xBB,0x84,0xBE};
+static const EC_CURVE_DATA _EC_NIST_CHAR2_283B = {
+        NID_X9_62_characteristic_two_field,
+        "080000000000000000000000000000000000000000000000000000000000000000001"
+        "0A1",
+        "000000000000000000000000000000000000000000000000000000000000000000000"
+        "001",
+        "027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A"
+        "2F5",
+        "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12"
+        "053",
+        "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE811"
+        "2F4",
+        "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB"
+        "307", 2,
+        _EC_NIST_CHAR2_283B_SEED, 20,
+        "NIST/SECG curve over a 283 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_NIST_CHAR2_409K = {
+        NID_X9_62_characteristic_two_field,
+        "020000000000000000000000000000000000000000000000000000000000000000000"
+        "00000000000008000000000000000000001",
+        "0",
+        "1",
+        "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C4601"
+        "89EB5AAAA62EE222EB1B35540CFE9023746",
+        "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6"
+        "C42E9C55215AA9CA27A5863EC48D8E0286B",
+        "007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F83B2D4EA20400"
+        "EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF", 4,
+        NULL, 0,
+        "NIST/SECG curve over a 409 bit binary field"
+        };
+
+static const unsigned char _EC_NIST_CHAR2_409B_SEED[] = {
+        0x40,0x99,0xB5,0xA4,0x57,0xF9,0xD6,0x9F,0x79,0x21,
+        0x3D,0x09,0x4C,0x4B,0xCD,0x4D,0x42,0x62,0x21,0x0B};
+static const EC_CURVE_DATA _EC_NIST_CHAR2_409B = {
+        NID_X9_62_characteristic_two_field,
+        "020000000000000000000000000000000000000000000000000000000000000000000"
+        "00000000000008000000000000000000001",
+        "000000000000000000000000000000000000000000000000000000000000000000000"
+        "00000000000000000000000000000000001",
+        "0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A19"
+        "7B272822F6CD57A55AA4F50AE317B13545F",
+        "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255"
+        "A868A1180515603AEAB60794E54BB7996A7",
+        "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514"
+        "F1FDF4B4F40D2181B3681C364BA0273C706",
+        "010000000000000000000000000000000000000000000000000001E2AAD6A612F3330"
+        "7BE5FA47C3C9E052F838164CD37D9A21173", 2,
+        _EC_NIST_CHAR2_409B_SEED, 20,
+        "NIST/SECG curve over a 409 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_NIST_CHAR2_571K = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000000000000000000000000000"
+        "000000000000000000000000000000000000000000000000000000000000000000000"
+        "00425",
+        "0",
+        "1",
+        "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA443709"
+        "58493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A0"
+        "1C8972",
+        "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D497"
+        "9C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143E"
+        "F1C7A3",
+        "020000000000000000000000000000000000000000000000000000000000000000000"
+        "000131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F63"
+        "7C1001", 4,
+        NULL, 0,
+        "NIST/SECG curve over a 571 bit binary field"
+        };
+
+static const unsigned char _EC_NIST_CHAR2_571B_SEED[] = {
+        0x2A,0xA0,0x58,0xF7,0x3A,0x0E,0x33,0xAB,0x48,0x6B,
+        0x0F,0x61,0x04,0x10,0xC5,0x3A,0x7F,0x13,0x23,0x10};
+static const EC_CURVE_DATA _EC_NIST_CHAR2_571B = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000000000000000000000000000"
+        "000000000000000000000000000000000000000000000000000000000000000000000"
+        "00425",
+        "000000000000000000000000000000000000000000000000000000000000000000000"
+        "000000000000000000000000000000000000000000000000000000000000000000000"
+        "000001",
+        "02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFA"
+        "BBD8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F29"
+        "55727A",
+        "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53"
+        "950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8E"
+        "EC2D19",
+        "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423"
+        "E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B"
+        "8AC15B",
+        "03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+        "FFFE661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2F"
+        "E84E47", 2,
+        _EC_NIST_CHAR2_571B_SEED, 20,
+        "NIST/SECG curve over a 571 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_163V1_SEED[] = {
+        0xD2,0xC0,0xFB,0x15,0x76,0x08,0x60,0xDE,0xF1,0xEE,
+        0xF4,0xD6,0x96,0xE6,0x76,0x87,0x56,0x15,0x17,0x54};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_163V1 = {
+        NID_X9_62_characteristic_two_field,
+        "080000000000000000000000000000000000000107",
+        "072546B5435234A422E0789675F432C89435DE5242",
+        "00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9",
+        "07AF69989546103D79329FCC3D74880F33BBE803CB",
+        "01EC23211B5966ADEA1D3F87F7EA5848AEF0B7CA9F",
+        "0400000000000000000001E60FC8821CC74DAEAFC1", 2,
+        _EC_X9_62_CHAR2_163V1_SEED, 20,
+        "X9.62 curve over a 163 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_163V2_SEED[] = {
+        0x53,0x81,0x4C,0x05,0x0D,0x44,0xD6,0x96,0xE6,0x76,
+        0x87,0x56,0x15,0x17,0x58,0x0C,0xA4,0xE2,0x9F,0xFD};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_163V2 = {
+        NID_X9_62_characteristic_two_field,
+        "080000000000000000000000000000000000000107",
+        "0108B39E77C4B108BED981ED0E890E117C511CF072",
+        "0667ACEB38AF4E488C407433FFAE4F1C811638DF20",
+        "0024266E4EB5106D0A964D92C4860E2671DB9B6CC5",
+        "079F684DDF6684C5CD258B3890021B2386DFD19FC5",
+        "03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", 2,
+        _EC_X9_62_CHAR2_163V2_SEED, 20,
+        "X9.62 curve over a 163 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_163V3_SEED[] = {
+        0x50,0xCB,0xF1,0xD9,0x5C,0xA9,0x4D,0x69,0x6E,0x67,
+        0x68,0x75,0x61,0x51,0x75,0xF1,0x6A,0x36,0xA3,0xB8};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_163V3 = {
+        NID_X9_62_characteristic_two_field,
+        "080000000000000000000000000000000000000107",
+        "07A526C63D3E25A256A007699F5447E32AE456B50E",
+        "03F7061798EB99E238FD6F1BF95B48FEEB4854252B",
+        "02F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB",
+        "05B935590C155E17EA48EB3FF3718B893DF59A05D0",
+        "03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", 2,
+        _EC_X9_62_CHAR2_163V3_SEED, 20,
+        "X9.62 curve over a 163 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_176V1 = {
+        NID_X9_62_characteristic_two_field,
+        "0100000000000000000000000000000000080000000007",
+        "E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B",
+        "5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2",
+        "8D16C2866798B600F9F08BB4A8E860F3298CE04A5798",
+        "6FA4539C2DADDDD6BAB5167D61B436E1D92BB16A562C",
+        "00010092537397ECA4F6145799D62B0A19CE06FE26AD", 0xFF6E,
+        NULL, 0,
+        "X9.62 curve over a 176 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_191V1_SEED[] = {
+        0x4E,0x13,0xCA,0x54,0x27,0x44,0xD6,0x96,0xE6,0x76,
+        0x87,0x56,0x15,0x17,0x55,0x2F,0x27,0x9A,0x8C,0x84};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_191V1 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000201",
+        "2866537B676752636A68F56554E12640276B649EF7526267",
+        "2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC",
+        "36B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D",
+        "765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB",
+        "40000000000000000000000004A20E90C39067C893BBB9A5", 2,
+        _EC_X9_62_CHAR2_191V1_SEED, 20,
+        "X9.62 curve over a 191 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_191V2_SEED[] = {
+        0x08,0x71,0xEF,0x2F,0xEF,0x24,0xD6,0x96,0xE6,0x76,
+        0x87,0x56,0x15,0x17,0x58,0xBE,0xE0,0xD9,0x5C,0x15};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_191V2 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000201",
+        "401028774D7777C7B7666D1366EA432071274F89FF01E718",
+        "0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01",
+        "3809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10",
+        "17434386626D14F3DBF01760D9213A3E1CF37AEC437D668A",
+        "20000000000000000000000050508CB89F652824E06B8173", 4,
+        _EC_X9_62_CHAR2_191V2_SEED, 20,
+        "X9.62 curve over a 191 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_191V3_SEED[] = {
+        0xE0,0x53,0x51,0x2D,0xC6,0x84,0xD6,0x96,0xE6,0x76,
+        0x87,0x56,0x15,0x17,0x50,0x67,0xAE,0x78,0x6D,0x1F};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_191V3 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000201",
+        "6C01074756099122221056911C77D77E77A777E7E7E77FCB",
+        "71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8",
+        "375D4CE24FDE434489DE8746E71786015009E66E38A926DD",
+        "545A39176196575D985999366E6AD34CE0A77CD7127B06BE",
+        "155555555555555555555555610C0B196812BFB6288A3EA3", 6,
+        _EC_X9_62_CHAR2_191V3_SEED, 20,
+        "X9.62 curve over a 191 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_208W1 = {
+        NID_X9_62_characteristic_two_field,
+        "010000000000000000000000000000000800000000000000000007",
+        "0000000000000000000000000000000000000000000000000000",
+        "C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E",
+        "89FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A",
+        "0F55B51A06E78E9AC38A035FF520D8B01781BEB1A6BB08617DE3",
+        "000101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", 0xFE48,
+        NULL, 0,
+        "X9.62 curve over a 208 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_239V1_SEED[] = {
+        0xD3,0x4B,0x9A,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
+        0x51,0x75,0xCA,0x71,0xB9,0x20,0xBF,0xEF,0xB0,0x5D};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_239V1 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000000001000000001",
+        "32010857077C5431123A46B808906756F543423E8D27877578125778AC76",
+        "790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16",
+        "57927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D",
+        "61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305",
+        "2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", 4,
+        _EC_X9_62_CHAR2_239V1_SEED, 20,
+        "X9.62 curve over a 239 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_239V2_SEED[] = {
+        0x2A,0xA6,0x98,0x2F,0xDF,0xA4,0xD6,0x96,0xE6,0x76,
+        0x87,0x56,0x15,0x17,0x5D,0x26,0x67,0x27,0x27,0x7D};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_239V2 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000000001000000001",
+        "4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F",
+        "5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B",
+        "28F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205",
+        "5667334C45AFF3B5A03BAD9DD75E2C71A99362567D5453F7FA6E227EC833",
+        "1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", 6,
+        _EC_X9_62_CHAR2_239V2_SEED, 20,
+        "X9.62 curve over a 239 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_239V3_SEED[] = {
+        0x9E,0x07,0x6F,0x4D,0x69,0x6E,0x67,0x68,0x75,0x61,
+        0x51,0x75,0xE1,0x1E,0x9F,0xDD,0x77,0xF9,0x20,0x41};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_239V3 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000000001000000001",
+        "01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F",
+        "6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40",
+        "70F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92",
+        "2E5A0EAF6E5E1305B9004DCE5C0ED7FE59A35608F33837C816D80B79F461",
+        "0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", 0xA,
+        _EC_X9_62_CHAR2_239V3_SEED, 20,
+        "X9.62 curve over a 239 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_272W1 = {
+        NID_X9_62_characteristic_two_field,
+        "010000000000000000000000000000000000000000000000000000010000000000000"
+        "B",
+        "91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20",
+        "7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7",
+        "6108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D",
+        "10C7695716851EEF6BA7F6872E6142FBD241B830FF5EFCACECCAB05E02005DDE9D23",
+        "000100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521",
+        0xFF06,
+        NULL, 0,
+        "X9.62 curve over a 272 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_304W1 = {
+        NID_X9_62_characteristic_two_field,
+        "010000000000000000000000000000000000000000000000000000000000000000000"
+        "000000807",
+        "FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A039"
+        "6C8E681",
+        "BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E558"
+        "27340BE",
+        "197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F7"
+        "40A2614",
+        "E19FBEB76E0DA171517ECF401B50289BF014103288527A9B416A105E80260B549FDC1"
+        "B92C03B",
+        "000101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164"
+        "443051D", 0xFE2E,
+        NULL, 0,
+        "X9.62 curve over a 304 bit binary field"
+        };
+
+static const unsigned char _EC_X9_62_CHAR2_359V1_SEED[] = {
+        0x2B,0x35,0x49,0x20,0xB7,0x24,0xD6,0x96,0xE6,0x76,
+        0x87,0x56,0x15,0x17,0x58,0x5B,0xA1,0x33,0x2D,0xC6};
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_359V1 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000000000000000000000000000"
+        "000100000000000000001",
+        "5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05"
+        "656FB549016A96656A557",
+        "2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC34562608968"
+        "7742B6329E70680231988",
+        "3C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE9"
+        "8E8E707C07A2239B1B097",
+        "53D7E08529547048121E9C95F3791DD804963948F34FAE7BF44EA82365DC7868FE57E"
+        "4AE2DE211305A407104BD",
+        "01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB9"
+        "64FE7719E74F490758D3B", 0x4C,
+        _EC_X9_62_CHAR2_359V1_SEED, 20,
+        "X9.62 curve over a 359 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_368W1 = {
+        NID_X9_62_characteristic_two_field,
+        "010000000000000000000000000000000000000000000000000000000000000000000"
+        "0002000000000000000000007",
+        "E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62"
+        "F0AB7519CCD2A1A906AE30D",
+        "FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112"
+        "D84D164F444F8F74786046A",
+        "1085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E78"
+        "9E927BE216F02E1FB136A5F",
+        "7B3EB1BDDCBA62D5D8B2059B525797FC73822C59059C623A45FF3843CEE8F87CD1855"
+        "ADAA81E2A0750B80FDA2310",
+        "00010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E90"
+        "9AE40A6F131E9CFCE5BD967", 0xFF70,
+        NULL, 0,
+        "X9.62 curve over a 368 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_X9_62_CHAR2_431R1 = {
+        NID_X9_62_characteristic_two_field,
+        "800000000000000000000000000000000000000000000000000000000000000000000"
+        "000000001000000000000000000000000000001",
+        "1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0E"
+        "B9906D0957F6C6FEACD615468DF104DE296CD8F",
+        "10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B6"
+        "26D4E50A8DD731B107A9962381FB5D807BF2618",
+        "120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C2"
+        "1E7C5EFE965361F6C2999C0C247B0DBD70CE6B7",
+        "20D0AF8903A96F8D5FA2C255745D3C451B302C9346D9B7E485E7BCE41F6B591F3E8F6"
+        "ADDCBB0BC4C2F947A7DE1A89B625D6A598B3760",
+        "0340340340340340340340340340340340340340340340340340340323C313FAB5058"
+        "9703B5EC68D3587FEC60D161CC149C1AD4A91", 0x2760,
+        NULL, 0,
+        "X9.62 curve over a 431 bit binary field"
+        };
+
+static const EC_CURVE_DATA _EC_WTLS_1 = {
+        NID_X9_62_characteristic_two_field,
+        "020000000000000000000000000201",
+        "1",
+        "1",
+        "01667979A40BA497E5D5C270780617",
+        "00F44B4AF1ECC2630E08785CEBCC15",
+        "00FFFFFFFFFFFFFFFDBF91AF6DEA73", 2,
+        NULL, 0,
+        "WTLS curve over a 113 bit binary field"
+        };
+
+/* IPSec curves */
+/* NOTE: The of curves over a extension field of non prime degree
+ * is not recommended (Weil-descent).
+ * As the group order is not a prime this curve is not suitable
+ * for ECDSA.
+ */
+static const EC_CURVE_DATA _EC_IPSEC_155_ID3 = {
+        NID_X9_62_characteristic_two_field,
+        "0800000000000000000000004000000000000001",
+        "0",
+        "07338f",
+        "7b",
+        "1c8",
+        "2AAAAAAAAAAAAAAAAAAC7F3C7881BD0868FA86C",3,
+        NULL, 0,
+        "\n\tIPSec/IKE/Oakley curve #3 over a 155 bit binary field.\n"
+        "\tNot suitable for ECDSA.\n\tQuestionable extension field!"
+        };
+
+/* NOTE: The of curves over a extension field of non prime degree
+ * is not recommended (Weil-descent).
+ * As the group order is not a prime this curve is not suitable
+ * for ECDSA.
+ */
+static const EC_CURVE_DATA _EC_IPSEC_185_ID4 = {
+        NID_X9_62_characteristic_two_field,
+        "020000000000000000000000000000200000000000000001",
+        "0",
+        "1ee9",
+        "18",
+        "0d",
+        "FFFFFFFFFFFFFFFFFFFFFFEDF97C44DB9F2420BAFCA75E",2,
+        NULL, 0,
+        "\n\tIPSec/IKE/Oakley curve #4 over a 185 bit binary field.\n"
+        "\tNot suitable for ECDSA.\n\tQuestionable extension field!"
+        };
+
+typedef struct _ec_list_element_st {
+        int     nid;
+        const EC_CURVE_DATA *data;
+        } ec_list_element;
+
+static const ec_list_element curve_list[] = {
+        /* prime field curves */        
+        /* secg curves */
+        { NID_secp112r1, &_EC_SECG_PRIME_112R1},
+        { NID_secp112r2, &_EC_SECG_PRIME_112R2},
+        { NID_secp128r1, &_EC_SECG_PRIME_128R1},
+        { NID_secp128r2, &_EC_SECG_PRIME_128R2},
+        { NID_secp160k1, &_EC_SECG_PRIME_160K1},
+        { NID_secp160r1, &_EC_SECG_PRIME_160R1},
+        { NID_secp160r2, &_EC_SECG_PRIME_160R2},
+        /* SECG secp192r1 is the same as X9.62 prime192v1 and hence omitted */
+        { NID_secp192k1, &_EC_SECG_PRIME_192K1},
+        { NID_secp224k1, &_EC_SECG_PRIME_224K1},
+        { NID_secp224r1, &_EC_NIST_PRIME_224},
+        { NID_secp256k1, &_EC_SECG_PRIME_256K1},
+        /* SECG secp256r1 is the same as X9.62 prime256v1 and hence omitted */
+        { NID_secp384r1, &_EC_NIST_PRIME_384},
+        { NID_secp521r1, &_EC_NIST_PRIME_521},
+        /* X9.62 curves */
+        { NID_X9_62_prime192v1, &_EC_NIST_PRIME_192},
+        { NID_X9_62_prime192v2, &_EC_X9_62_PRIME_192V2},
+        { NID_X9_62_prime192v3, &_EC_X9_62_PRIME_192V3},
+        { NID_X9_62_prime239v1, &_EC_X9_62_PRIME_239V1},
+        { NID_X9_62_prime239v2, &_EC_X9_62_PRIME_239V2},
+        { NID_X9_62_prime239v3, &_EC_X9_62_PRIME_239V3},
+        { NID_X9_62_prime256v1, &_EC_X9_62_PRIME_256V1},
+        /* characteristic two field curves */
+        /* NIST/SECG curves */
+        { NID_sect113r1, &_EC_SECG_CHAR2_113R1},
+        { NID_sect113r2, &_EC_SECG_CHAR2_113R2},
+        { NID_sect131r1, &_EC_SECG_CHAR2_131R1},
+        { NID_sect131r2, &_EC_SECG_CHAR2_131R2},
+        { NID_sect163k1, &_EC_NIST_CHAR2_163K },
+        { NID_sect163r1, &_EC_SECG_CHAR2_163R1},
+        { NID_sect163r2, &_EC_NIST_CHAR2_163B },
+        { NID_sect193r1, &_EC_SECG_CHAR2_193R1},
+        { NID_sect193r2, &_EC_SECG_CHAR2_193R2},
+        { NID_sect233k1, &_EC_NIST_CHAR2_233K },
+        { NID_sect233r1, &_EC_NIST_CHAR2_233B },
+        { NID_sect239k1, &_EC_SECG_CHAR2_239K1},
+        { NID_sect283k1, &_EC_NIST_CHAR2_283K },
+        { NID_sect283r1, &_EC_NIST_CHAR2_283B },
+        { NID_sect409k1, &_EC_NIST_CHAR2_409K },
+        { NID_sect409r1, &_EC_NIST_CHAR2_409B },
+        { NID_sect571k1, &_EC_NIST_CHAR2_571K },
+        { NID_sect571r1, &_EC_NIST_CHAR2_571B },
+        /* X9.62 curves */
+        { NID_X9_62_c2pnb163v1, &_EC_X9_62_CHAR2_163V1},
+        { NID_X9_62_c2pnb163v2, &_EC_X9_62_CHAR2_163V2},
+        { NID_X9_62_c2pnb163v3, &_EC_X9_62_CHAR2_163V3},
+        { NID_X9_62_c2pnb176v1, &_EC_X9_62_CHAR2_176V1},
+        { NID_X9_62_c2tnb191v1, &_EC_X9_62_CHAR2_191V1},
+        { NID_X9_62_c2tnb191v2, &_EC_X9_62_CHAR2_191V2},
+        { NID_X9_62_c2tnb191v3, &_EC_X9_62_CHAR2_191V3},
+        { NID_X9_62_c2pnb208w1, &_EC_X9_62_CHAR2_208W1},
+        { NID_X9_62_c2tnb239v1, &_EC_X9_62_CHAR2_239V1},
+        { NID_X9_62_c2tnb239v2, &_EC_X9_62_CHAR2_239V2},
+        { NID_X9_62_c2tnb239v3, &_EC_X9_62_CHAR2_239V3},
+        { NID_X9_62_c2pnb272w1, &_EC_X9_62_CHAR2_272W1},
+        { NID_X9_62_c2pnb304w1, &_EC_X9_62_CHAR2_304W1},
+        { NID_X9_62_c2tnb359v1, &_EC_X9_62_CHAR2_359V1},
+        { NID_X9_62_c2pnb368w1, &_EC_X9_62_CHAR2_368W1},
+        { NID_X9_62_c2tnb431r1, &_EC_X9_62_CHAR2_431R1},
+        /* the WAP/WTLS curves
+         * [unlike SECG, spec has its own OIDs for curves from X9.62] */
+        { NID_wap_wsg_idm_ecid_wtls1, &_EC_WTLS_1},
+        { NID_wap_wsg_idm_ecid_wtls3, &_EC_NIST_CHAR2_163K},
+        { NID_wap_wsg_idm_ecid_wtls4, &_EC_SECG_CHAR2_113R1},
+        { NID_wap_wsg_idm_ecid_wtls5, &_EC_X9_62_CHAR2_163V1},
+        { NID_wap_wsg_idm_ecid_wtls6, &_EC_SECG_PRIME_112R1},
+        { NID_wap_wsg_idm_ecid_wtls7, &_EC_SECG_PRIME_160R2},
+        { NID_wap_wsg_idm_ecid_wtls8, &_EC_WTLS_8},
+        { NID_wap_wsg_idm_ecid_wtls9, &_EC_WTLS_9 },
+        { NID_wap_wsg_idm_ecid_wtls10, &_EC_NIST_CHAR2_233K},
+        { NID_wap_wsg_idm_ecid_wtls11, &_EC_NIST_CHAR2_233B},
+        { NID_wap_wsg_idm_ecid_wtls12, &_EC_WTLS_12},
+        /* IPSec curves */
+        { NID_ipsec3, &_EC_IPSEC_155_ID3},
+        { NID_ipsec4, &_EC_IPSEC_185_ID4},
+};
+
+static size_t curve_list_length = sizeof(curve_list)/sizeof(ec_list_element);
+
+static EC_GROUP *ec_group_new_from_data(const EC_CURVE_DATA *data)
+        {
+        EC_GROUP *group=NULL;
+        EC_POINT *P=NULL;
+        BN_CTX   *ctx=NULL;
+        BIGNUM   *p=NULL, *a=NULL, *b=NULL, *x=NULL, *y=NULL, *order=NULL;
+        int      ok=0;
+
+        if ((ctx = BN_CTX_new()) == NULL)
+                {
+                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        if ((p = BN_new()) == NULL || (a = BN_new()) == NULL || 
+                (b = BN_new()) == NULL || (x = BN_new()) == NULL ||
+                (y = BN_new()) == NULL || (order = BN_new()) == NULL)
+                {
+                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        
+        if (!BN_hex2bn(&p, data->p) || !BN_hex2bn(&a, data->a)
+                || !BN_hex2bn(&b, data->b))
+                {
+                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
+                goto err;
+                }
+
+        if (data->field_type == NID_X9_62_prime_field)
+                {
+                if ((group = EC_GROUP_new_curve_GFp(p, a, b, ctx)) == NULL)
+                        {
+                        ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                }
+                else
+                { /* field_type == NID_X9_62_characteristic_two_field */
+                if ((group = EC_GROUP_new_curve_GF2m(p, a, b, ctx)) == NULL)
+                        {
+                        ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                }
+
+        if ((P = EC_POINT_new(group)) == NULL)
+                {
+                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+                goto err;
+                }
+        
+        if (!BN_hex2bn(&x, data->x) || !BN_hex2bn(&y, data->y))
+                {
+                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
+                goto err;
+                }
+        if (!EC_POINT_set_affine_coordinates_GF2m(group, P, x, y, ctx))
+                {
+                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+                goto err;
+                }
+        if (!BN_hex2bn(&order, data->order) || !BN_set_word(x, data->cofactor))
+                {
+                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_BN_LIB);
+                goto err;
+                }
+        if (!EC_GROUP_set_generator(group, P, order, x))
+                {
+                ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+                goto err;
+                }
+        if (data->seed)
+                {
+                if (!EC_GROUP_set_seed(group, data->seed, data->seed_len))
+                        {
+                        ECerr(EC_F_EC_GROUP_NEW_FROM_DATA, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                }
+        ok=1;
+err:
+        if (!ok)
+                {
+                EC_GROUP_free(group);
+                group = NULL;
+                }
+        if (P)
+                EC_POINT_free(P);
+        if (ctx)
+                BN_CTX_free(ctx);
+        if (p)
+                BN_free(p);
+        if (a)
+                BN_free(a);
+        if (b)
+                BN_free(b);
+        if (order)
+                BN_free(order);
+        if (x)
+                BN_free(x);
+        if (y)
+                BN_free(y);
+        return group;
+        }
+
+EC_GROUP *EC_GROUP_new_by_curve_name(int nid)
+        {
+        size_t i;
+        EC_GROUP *ret = NULL;
+
+        if (nid <= 0)
+                return NULL;
+
+        for (i=0; i<curve_list_length; i++)
+                if (curve_list[i].nid == nid)
+                        {
+                        ret = ec_group_new_from_data(curve_list[i].data);
+                        break;
+                        }
+
+        if (ret == NULL)
+                {
+                ECerr(EC_F_EC_GROUP_NEW_BY_CURVE_NAME, EC_R_UNKNOWN_GROUP);
+                return NULL;
+                }
+
+        EC_GROUP_set_curve_name(ret, nid);
+
+        return ret;
+        }
+
+size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems)
+        {
+        size_t  i, min;
+
+        if (r == NULL || nitems == 0)
+                return curve_list_length;
+
+        min = nitems < curve_list_length ? nitems : curve_list_length;
+
+        for (i = 0; i < min; i++)
+                {
+                r[i].nid = curve_list[i].nid;
+                r[i].comment = curve_list[i].data->comment;
+                }
+
+        return curve_list_length;
+        }
diff --git a/src/lib/libssl/src/crypto/ec/ec_key.c b/src/lib/libssl/src/crypto/ec/ec_key.c
new file mode 100644
index 0000000000..3d6c900b95
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ec/ec_key.c
@@ -0,0 +1,465 @@
+/* crypto/ec/ec_key.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project.
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ * Portions originally developed by SUN MICROSYSTEMS, INC., and 
+ * contributed to the OpenSSL project.
+ */
+
+#include <string.h>
+#include "ec_lcl.h"
+#include <openssl/err.h>
+#include <string.h>
+
+EC_KEY *EC_KEY_new(void)
+        {
+        EC_KEY *ret;
+
+        ret=(EC_KEY *)OPENSSL_malloc(sizeof(EC_KEY));
+        if (ret == NULL)
+                {
+                ECerr(EC_F_EC_KEY_NEW, ERR_R_MALLOC_FAILURE);
+                return(NULL);
+                }
+
+        ret->version = 1;       
+        ret->group   = NULL;
+        ret->pub_key = NULL;
+        ret->priv_key= NULL;
+        ret->enc_flag= 0; 
+        ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;
+        ret->references= 1;
+        ret->method_data = NULL;
+        return(ret);
+        }
+
+EC_KEY *EC_KEY_new_by_curve_name(int nid)
+        {
+        EC_KEY *ret = EC_KEY_new();
+        if (ret == NULL)
+                return NULL;
+        ret->group = EC_GROUP_new_by_curve_name(nid);
+        if (ret->group == NULL)
+                {
+                EC_KEY_free(ret);
+                return NULL;
+                }
+        return ret;
+        }
+
+void EC_KEY_free(EC_KEY *r)
+        {
+        int i;
+
+        if (r == NULL) return;
+
+        i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_EC);
+#ifdef REF_PRINT
+        REF_PRINT("EC_KEY",r);
+#endif
+        if (i > 0) return;
+#ifdef REF_CHECK
+        if (i < 0)
+                {
+                fprintf(stderr,"EC_KEY_free, bad reference count\n");
+                abort();
+                }
+#endif
+
+        if (r->group    != NULL) 
+                EC_GROUP_free(r->group);
+        if (r->pub_key  != NULL)
+                EC_POINT_free(r->pub_key);
+        if (r->priv_key != NULL)
+                BN_clear_free(r->priv_key);
+
+        EC_EX_DATA_free_all_data(&r->method_data);
+
+        OPENSSL_cleanse((void *)r, sizeof(EC_KEY));
+
+        OPENSSL_free(r);
+        }
+
+EC_KEY *EC_KEY_copy(EC_KEY *dest, const EC_KEY *src)
+        {
+        EC_EXTRA_DATA *d;
+
+        if (dest == NULL || src == NULL)
+                {
+                ECerr(EC_F_EC_KEY_COPY, ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        /* copy the parameters */
+        if (src->group)
+                {
+                const EC_METHOD *meth = EC_GROUP_method_of(src->group);
+                /* clear the old group */
+                if (dest->group)
+                        EC_GROUP_free(dest->group);
+                dest->group = EC_GROUP_new(meth);
+                if (dest->group == NULL)
+                        return NULL;
+                if (!EC_GROUP_copy(dest->group, src->group))
+                        return NULL;
+                }
+        /*  copy the public key */
+        if (src->pub_key && src->group)
+                {
+                if (dest->pub_key)
+                        EC_POINT_free(dest->pub_key);
+                dest->pub_key = EC_POINT_new(src->group);
+                if (dest->pub_key == NULL)
+                        return NULL;
+                if (!EC_POINT_copy(dest->pub_key, src->pub_key))
+                        return NULL;
+                }
+        /* copy the private key */
+        if (src->priv_key)
+                {
+                if (dest->priv_key == NULL)
+                        {
+                        dest->priv_key = BN_new();
+                        if (dest->priv_key == NULL)
+                                return NULL;
+                        }
+                if (!BN_copy(dest->priv_key, src->priv_key))
+                        return NULL;
+                }
+        /* copy method/extra data */
+        EC_EX_DATA_free_all_data(&dest->method_data);
+
+        for (d = src->method_data; d != NULL; d = d->next)
+                {
+                void *t = d->dup_func(d->data);
+                
+                if (t == NULL)
+                        return 0;
+                if (!EC_EX_DATA_set_data(&dest->method_data, t, d->dup_func, d->free_func, d->clear_free_func))
+                        return 0;
+                }
+
+        /* copy the rest */
+        dest->enc_flag  = src->enc_flag;
+        dest->conv_form = src->conv_form;
+        dest->version   = src->version;
+
+        return dest;
+        }
+
+EC_KEY *EC_KEY_dup(const EC_KEY *ec_key)
+        {
+        EC_KEY *ret = EC_KEY_new();
+        if (ret == NULL)
+                return NULL;
+        if (EC_KEY_copy(ret, ec_key) == NULL)
+                {
+                EC_KEY_free(ret);
+                return NULL;
+                }
+        return ret;
+        }
+
+int EC_KEY_up_ref(EC_KEY *r)
+        {
+        int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_EC);
+#ifdef REF_PRINT
+        REF_PRINT("EC_KEY",r);
+#endif
+#ifdef REF_CHECK
+        if (i < 2)
+                {
+                fprintf(stderr, "EC_KEY_up, bad reference count\n");
+                abort();
+                }
+#endif
+        return ((i > 1) ? 1 : 0);
+        }
+
+int EC_KEY_generate_key(EC_KEY *eckey)
+        {       
+        int     ok = 0;
+        BN_CTX  *ctx = NULL;
+        BIGNUM  *priv_key = NULL, *order = NULL;
+        EC_POINT *pub_key = NULL;
+
+        if (!eckey || !eckey->group)
+                {
+                ECerr(EC_F_EC_KEY_GENERATE_KEY, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+
+        if ((order = BN_new()) == NULL) goto err;
+        if ((ctx = BN_CTX_new()) == NULL) goto err;
+
+        if (eckey->priv_key == NULL)
+                {
+                priv_key = BN_new();
+                if (priv_key == NULL)
+                        goto err;
+                }
+        else
+                priv_key = eckey->priv_key;
+
+        if (!EC_GROUP_get_order(eckey->group, order, ctx))
+                goto err;
+
+        do
+                if (!BN_rand_range(priv_key, order))
+                        goto err;
+        while (BN_is_zero(priv_key));
+
+        if (eckey->pub_key == NULL)
+                {
+                pub_key = EC_POINT_new(eckey->group);
+                if (pub_key == NULL)
+                        goto err;
+                }
+        else
+                pub_key = eckey->pub_key;
+
+        if (!EC_POINT_mul(eckey->group, pub_key, priv_key, NULL, NULL, ctx))
+                goto err;
+
+        eckey->priv_key = priv_key;
+        eckey->pub_key  = pub_key;
+
+        ok=1;
+
+err:    
+        if (order)
+                BN_free(order);
+        if (pub_key  != NULL && eckey->pub_key  == NULL)
+                EC_POINT_free(pub_key);
+        if (priv_key != NULL && eckey->priv_key == NULL)
+                BN_free(priv_key);
+        if (ctx != NULL)
+                BN_CTX_free(ctx);
+        return(ok);
+        }
+
+int EC_KEY_check_key(const EC_KEY *eckey)
+        {
+        int     ok   = 0;
+        BN_CTX  *ctx = NULL;
+        BIGNUM  *order  = NULL;
+        EC_POINT *point = NULL;
+
+        if (!eckey || !eckey->group || !eckey->pub_key)
+                {
+                ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        
+        if ((ctx = BN_CTX_new()) == NULL)
+                goto err;
+        if ((order = BN_new()) == NULL)
+                goto err;
+        if ((point = EC_POINT_new(eckey->group)) == NULL)
+                goto err;
+
+        /* testing whether the pub_key is on the elliptic curve */
+        if (!EC_POINT_is_on_curve(eckey->group, eckey->pub_key, ctx))
+                {
+                ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_POINT_IS_NOT_ON_CURVE);
+                goto err;
+                }
+        /* testing whether pub_key * order is the point at infinity */
+        if (!EC_GROUP_get_order(eckey->group, order, ctx))
+                {
+                ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_INVALID_GROUP_ORDER);
+                goto err;
+                }
+        if (!EC_POINT_copy(point, eckey->pub_key))
+                {
+                ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB);
+                goto err;
+                }
+        if (!EC_POINT_mul(eckey->group, point, order, NULL, NULL, ctx))
+                {
+                ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB);
+                goto err;
+                }
+        if (!EC_POINT_is_at_infinity(eckey->group, point))
+                {
+                ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_WRONG_ORDER);
+                goto err;
+                }
+        /* in case the priv_key is present : 
+         * check if generator * priv_key == pub_key 
+         */
+        if (eckey->priv_key)
+                {
+                if (BN_cmp(eckey->priv_key, order) >= 0)
+                        {
+                        ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_WRONG_ORDER);
+                        goto err;
+                        }
+                if (!EC_POINT_mul(eckey->group, point, eckey->priv_key,
+                        NULL, NULL, ctx))
+                        {
+                        ECerr(EC_F_EC_KEY_CHECK_KEY, ERR_R_EC_LIB);
+                        goto err;
+                        }
+                if (EC_POINT_cmp(eckey->group, point, eckey->pub_key, 
+                        ctx) != 0)
+                        {
+                        ECerr(EC_F_EC_KEY_CHECK_KEY, EC_R_INVALID_PRIVATE_KEY);
+                        goto err;
+                        }
+                }
+        ok = 1;
+err:
+        if (ctx   != NULL)
+                BN_CTX_free(ctx);
+        if (order != NULL)
+                BN_free(order);
+        if (point != NULL)
+                EC_POINT_free(point);
+        return(ok);
+        }
+
+const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key)
+        {
+        return key->group;
+        }
+
+int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group)
+        {
+        if (key->group != NULL)
+                EC_GROUP_free(key->group);
+        key->group = EC_GROUP_dup(group);
+        return (key->group == NULL) ? 0 : 1;
+        }
+
+const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key)
+        {
+        return key->priv_key;
+        }
+
+int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *priv_key)
+        {
+        if (key->priv_key)
+                BN_clear_free(key->priv_key);
+        key->priv_key = BN_dup(priv_key);
+        return (key->priv_key == NULL) ? 0 : 1;
+        }
+
+const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key)
+        {
+        return key->pub_key;
+        }
+
+int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub_key)
+        {
+        if (key->pub_key != NULL)
+                EC_POINT_free(key->pub_key);
+        key->pub_key = EC_POINT_dup(pub_key, key->group);
+        return (key->pub_key == NULL) ? 0 : 1;
+        }
+
+unsigned int EC_KEY_get_enc_flags(const EC_KEY *key)
+        {
+        return key->enc_flag;
+        }
+
+void EC_KEY_set_enc_flags(EC_KEY *key, unsigned int flags)
+        {
+        key->enc_flag = flags;
+        }
+
+point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key)
+        {
+        return key->conv_form;
+        }
+
+void EC_KEY_set_conv_form(EC_KEY *key, point_conversion_form_t cform)
+        {
+        key->conv_form = cform;
+        if (key->group != NULL)
+                EC_GROUP_set_point_conversion_form(key->group, cform);
+        }
+
+void *EC_KEY_get_key_method_data(EC_KEY *key,
+        void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))
+        {
+        return EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func);
+        }
+
+void EC_KEY_insert_key_method_data(EC_KEY *key, void *data,
+        void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *))
+        {
+        EC_EXTRA_DATA *ex_data;
+        CRYPTO_w_lock(CRYPTO_LOCK_EC);
+        ex_data = EC_EX_DATA_get_data(key->method_data, dup_func, free_func, clear_free_func);
+        if (ex_data == NULL)
+                EC_EX_DATA_set_data(&key->method_data, data, dup_func, free_func, clear_free_func);
+        CRYPTO_w_unlock(CRYPTO_LOCK_EC);
+        }
+
+void EC_KEY_set_asn1_flag(EC_KEY *key, int flag)
+        {
+        if (key->group != NULL)
+                EC_GROUP_set_asn1_flag(key->group, flag);
+        }
+
+int EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx)
+        {
+        if (key->group == NULL)
+                return 0;
+        return EC_GROUP_precompute_mult(key->group, ctx);
+        }
diff --git a/src/lib/libssl/src/crypto/ec/ec_print.c b/src/lib/libssl/src/crypto/ec/ec_print.c
new file mode 100644
index 0000000000..f7c8a303ac
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ec/ec_print.c
@@ -0,0 +1,195 @@
+/* crypto/ec/ec_print.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <openssl/crypto.h>
+#include "ec_lcl.h"
+
+BIGNUM *EC_POINT_point2bn(const EC_GROUP *group, 
+                          const EC_POINT *point, 
+                          point_conversion_form_t form,
+                          BIGNUM *ret,
+                          BN_CTX *ctx)
+        {
+        size_t        buf_len=0;
+        unsigned char *buf;
+
+        buf_len = EC_POINT_point2oct(group, point, form,
+                                     NULL, 0, ctx);
+        if (buf_len == 0)
+                return NULL;
+
+        if ((buf = OPENSSL_malloc(buf_len)) == NULL)
+                return NULL;
+
+        if (!EC_POINT_point2oct(group, point, form, buf, buf_len, ctx))
+                {
+                OPENSSL_free(buf);
+                return NULL;
+                }
+
+        ret = BN_bin2bn(buf, buf_len, ret);
+
+        OPENSSL_free(buf);
+
+        return ret;
+}
+
+EC_POINT *EC_POINT_bn2point(const EC_GROUP *group,
+                            const BIGNUM *bn,
+                            EC_POINT *point, 
+                            BN_CTX *ctx)
+        {
+        size_t        buf_len=0;
+        unsigned char *buf;
+        EC_POINT      *ret;
+
+        if ((buf_len = BN_num_bytes(bn)) == 0) return NULL;
+        buf = OPENSSL_malloc(buf_len);
+        if (buf == NULL)
+                return NULL;
+
+        if (!BN_bn2bin(bn, buf)) 
+                {
+                OPENSSL_free(buf);
+                return NULL;
+                }
+
+        if (point == NULL)
+                {
+                if ((ret = EC_POINT_new(group)) == NULL)
+                        {
+                        OPENSSL_free(buf);
+                        return NULL;
+                        }
+                }
+        else
+                ret = point;
+
+        if (!EC_POINT_oct2point(group, ret, buf, buf_len, ctx))
+                {
+                if (point == NULL)
+                        EC_POINT_clear_free(ret);
+                OPENSSL_free(buf);
+                return NULL;
+                }
+
+        OPENSSL_free(buf);
+        return ret;
+        }
+
+static const char *HEX_DIGITS = "0123456789ABCDEF";
+
+/* the return value must be freed (using OPENSSL_free()) */
+char *EC_POINT_point2hex(const EC_GROUP *group,
+                         const EC_POINT *point,
+                         point_conversion_form_t form,
+                         BN_CTX *ctx)
+        {
+        char          *ret, *p;
+        size_t        buf_len=0,i;
+        unsigned char *buf, *pbuf;
+
+        buf_len = EC_POINT_point2oct(group, point, form,
+                                     NULL, 0, ctx);
+        if (buf_len == 0)
+                return NULL;
+
+        if ((buf = OPENSSL_malloc(buf_len)) == NULL)
+                return NULL;
+
+        if (!EC_POINT_point2oct(group, point, form, buf, buf_len, ctx))
+                {
+                OPENSSL_free(buf);
+                return NULL;
+                }
+
+        ret = (char *)OPENSSL_malloc(buf_len*2+2);
+        if (ret == NULL)
+                {
+                OPENSSL_free(buf);
+                return NULL;
+                }
+        p = ret;
+        pbuf = buf;
+        for (i=buf_len; i > 0; i--)
+                {
+                        int v = (int) *(pbuf++);
+                        *(p++)=HEX_DIGITS[v>>4];
+                        *(p++)=HEX_DIGITS[v&0x0F];
+                }
+        *p='\0';
+
+        OPENSSL_free(buf);
+
+        return ret;
+        }
+
+EC_POINT *EC_POINT_hex2point(const EC_GROUP *group,
+                             const char *buf,
+                             EC_POINT *point,
+                             BN_CTX *ctx)
+        {
+        EC_POINT *ret=NULL;
+        BIGNUM   *tmp_bn=NULL;
+
+        if (!BN_hex2bn(&tmp_bn, buf))
+                return NULL;
+
+        ret = EC_POINT_bn2point(group, tmp_bn, point, ctx);
+
+        BN_clear_free(tmp_bn);
+
+        return ret;
+        }
diff --git a/src/lib/libssl/src/crypto/ecdh/Makefile b/src/lib/libssl/src/crypto/ecdh/Makefile
new file mode 100644
index 0000000000..95aa69fea5
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdh/Makefile
@@ -0,0 +1,111 @@
+#
+# crypto/ecdh/Makefile
+#
+
+DIR=    ecdh
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g -Wall
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=ecdhtest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= ech_lib.c ech_ossl.c ech_key.c ech_err.c
+
+LIBOBJ= ech_lib.o ech_ossl.o ech_key.o ech_err.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= ecdh.h
+HEADER= ech_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+ech_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ech_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ech_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ech_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ech_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ech_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+ech_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ech_err.o: ech_err.c
+ech_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ech_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ech_key.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ech_key.o: ../../include/openssl/engine.h ../../include/openssl/opensslconf.h
+ech_key.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ech_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ech_key.o: ../../include/openssl/symhacks.h ech_key.c ech_locl.h
+ech_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ech_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ech_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ech_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h
+ech_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+ech_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ech_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ech_lib.o: ../../include/openssl/symhacks.h ech_lib.c ech_locl.h
+ech_ossl.o: ../../e_os.h ../../include/openssl/asn1.h
+ech_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+ech_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+ech_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ech_ossl.o: ../../include/openssl/ecdh.h ../../include/openssl/err.h
+ech_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ech_ossl.o: ../../include/openssl/opensslconf.h
+ech_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ech_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+ech_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ech_ossl.o: ../cryptlib.h ech_locl.h ech_ossl.c
diff --git a/src/lib/libssl/src/crypto/ecdh/ecdh.h b/src/lib/libssl/src/crypto/ecdh/ecdh.h
new file mode 100644
index 0000000000..b4b58ee65b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdh/ecdh.h
@@ -0,0 +1,123 @@
+/* crypto/ecdh/ecdh.h */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH software is originally written by Douglas Stebila of
+ * Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+#ifndef HEADER_ECDH_H
+#define HEADER_ECDH_H
+
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_ECDH
+#error ECDH is disabled.
+#endif
+
+#include <openssl/ec.h>
+#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const ECDH_METHOD *ECDH_OpenSSL(void);
+
+void      ECDH_set_default_method(const ECDH_METHOD *);
+const ECDH_METHOD *ECDH_get_default_method(void);
+int       ECDH_set_method(EC_KEY *, const ECDH_METHOD *);
+
+int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
+                     void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
+
+int       ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new 
+                *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+int       ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
+void      *ECDH_get_ex_data(EC_KEY *d, int idx);
+
+
+/* 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.
+ */
+void ERR_load_ECDH_strings(void);
+
+/* Error codes for the ECDH functions. */
+
+/* Function codes. */
+#define ECDH_F_ECDH_COMPUTE_KEY                          100
+#define ECDH_F_ECDH_DATA_NEW_METHOD                      101
+
+/* Reason codes. */
+#define ECDH_R_KDF_FAILED                                102
+#define ECDH_R_NO_PRIVATE_VALUE                          100
+#define ECDH_R_POINT_ARITHMETIC_FAILURE                  101
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
diff --git a/src/lib/libssl/src/crypto/ecdh/ecdhtest.c b/src/lib/libssl/src/crypto/ecdh/ecdhtest.c
new file mode 100644
index 0000000000..1575006b51
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdh/ecdhtest.c
@@ -0,0 +1,368 @@
+/* crypto/ecdh/ecdhtest.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH software is originally written by Douglas Stebila of
+ * Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "../e_os.h"
+
+#include <openssl/opensslconf.h>        /* for OPENSSL_NO_ECDH */
+#include <openssl/crypto.h>
+#include <openssl/bio.h>
+#include <openssl/bn.h>
+#include <openssl/objects.h>
+#include <openssl/rand.h>
+#include <openssl/sha.h>
+#include <openssl/err.h>
+
+#ifdef OPENSSL_NO_ECDH
+int main(int argc, char *argv[])
+{
+    printf("No ECDH support\n");
+    return(0);
+}
+#else
+#include <openssl/ec.h>
+#include <openssl/ecdh.h>
+
+#ifdef OPENSSL_SYS_WIN16
+#define MS_CALLBACK     _far _loadds
+#else
+#define MS_CALLBACK
+#endif
+
+#if 0
+static void MS_CALLBACK cb(int p, int n, void *arg);
+#endif
+
+static const char rnd_seed[] = "string to make the random number generator think it has entropy";
+
+
+static const int KDF1_SHA1_len = 20;
+static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen)
+        {
+#ifndef OPENSSL_NO_SHA
+        if (*outlen < SHA_DIGEST_LENGTH)
+                return NULL;
+        else
+                *outlen = SHA_DIGEST_LENGTH;
+        return SHA1(in, inlen, out);
+#else
+        return NULL;
+#endif
+        }
+
+
+static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
+        {
+        EC_KEY *a=NULL;
+        EC_KEY *b=NULL;
+        BIGNUM *x_a=NULL, *y_a=NULL,
+               *x_b=NULL, *y_b=NULL;
+        char buf[12];
+        unsigned char *abuf=NULL,*bbuf=NULL;
+        int i,alen,blen,aout,bout,ret=0;
+        const EC_GROUP *group;
+
+        a = EC_KEY_new_by_curve_name(nid);
+        b = EC_KEY_new_by_curve_name(nid);
+        if (a == NULL || b == NULL)
+                goto err;
+
+        group = EC_KEY_get0_group(a);
+
+        if ((x_a=BN_new()) == NULL) goto err;
+        if ((y_a=BN_new()) == NULL) goto err;
+        if ((x_b=BN_new()) == NULL) goto err;
+        if ((y_b=BN_new()) == NULL) goto err;
+
+        BIO_puts(out,"Testing key generation with ");
+        BIO_puts(out,text);
+#ifdef NOISY
+        BIO_puts(out,"\n");
+#else
+        (void)BIO_flush(out);
+#endif
+
+        if (!EC_KEY_generate_key(a)) goto err;
+        
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) 
+                {
+                if (!EC_POINT_get_affine_coordinates_GFp(group,
+                        EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
+                }
+        else
+                {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group,
+                        EC_KEY_get0_public_key(a), x_a, y_a, ctx)) goto err;
+                }
+#ifdef NOISY
+        BIO_puts(out,"  pri 1=");
+        BN_print(out,a->priv_key);
+        BIO_puts(out,"\n  pub 1=");
+        BN_print(out,x_a);
+        BIO_puts(out,",");
+        BN_print(out,y_a);
+        BIO_puts(out,"\n");
+#else
+        BIO_printf(out," .");
+        (void)BIO_flush(out);
+#endif
+
+        if (!EC_KEY_generate_key(b)) goto err;
+
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) 
+                {
+                if (!EC_POINT_get_affine_coordinates_GFp(group, 
+                        EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
+                }
+        else
+                {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group, 
+                        EC_KEY_get0_public_key(b), x_b, y_b, ctx)) goto err;
+                }
+
+#ifdef NOISY
+        BIO_puts(out,"  pri 2=");
+        BN_print(out,b->priv_key);
+        BIO_puts(out,"\n  pub 2=");
+        BN_print(out,x_b);
+        BIO_puts(out,",");
+        BN_print(out,y_b);
+        BIO_puts(out,"\n");
+#else
+        BIO_printf(out,".");
+        (void)BIO_flush(out);
+#endif
+
+        alen=KDF1_SHA1_len;
+        abuf=(unsigned char *)OPENSSL_malloc(alen);
+        aout=ECDH_compute_key(abuf,alen,EC_KEY_get0_public_key(b),a,KDF1_SHA1);
+
+#ifdef NOISY
+        BIO_puts(out,"  key1 =");
+        for (i=0; i<aout; i++)
+                {
+                sprintf(buf,"%02X",abuf[i]);
+                BIO_puts(out,buf);
+                }
+        BIO_puts(out,"\n");
+#else
+        BIO_printf(out,".");
+        (void)BIO_flush(out);
+#endif
+
+        blen=KDF1_SHA1_len;
+        bbuf=(unsigned char *)OPENSSL_malloc(blen);
+        bout=ECDH_compute_key(bbuf,blen,EC_KEY_get0_public_key(a),b,KDF1_SHA1);
+
+#ifdef NOISY
+        BIO_puts(out,"  key2 =");
+        for (i=0; i<bout; i++)
+                {
+                sprintf(buf,"%02X",bbuf[i]);
+                BIO_puts(out,buf);
+                }
+        BIO_puts(out,"\n");
+#else
+        BIO_printf(out,".");
+        (void)BIO_flush(out);
+#endif
+
+        if ((aout < 4) || (bout != aout) || (memcmp(abuf,bbuf,aout) != 0))
+                {
+#ifndef NOISY
+                BIO_printf(out, " failed\n\n");
+                BIO_printf(out, "key a:\n");
+                BIO_printf(out, "private key: ");
+                BN_print(out, EC_KEY_get0_private_key(a));
+                BIO_printf(out, "\n");
+                BIO_printf(out, "public key (x,y): ");
+                BN_print(out, x_a);
+                BIO_printf(out, ",");
+                BN_print(out, y_a);
+                BIO_printf(out, "\nkey b:\n");
+                BIO_printf(out, "private key: ");
+                BN_print(out, EC_KEY_get0_private_key(b));
+                BIO_printf(out, "\n");
+                BIO_printf(out, "public key (x,y): ");
+                BN_print(out, x_b);
+                BIO_printf(out, ",");
+                BN_print(out, y_b);
+                BIO_printf(out, "\n");
+                BIO_printf(out, "generated key a: ");
+                for (i=0; i<bout; i++)
+                        {
+                        sprintf(buf, "%02X", bbuf[i]);
+                        BIO_puts(out, buf);
+                        }
+                BIO_printf(out, "\n");
+                BIO_printf(out, "generated key b: ");
+                for (i=0; i<aout; i++)
+                        {
+                        sprintf(buf, "%02X", abuf[i]);
+                        BIO_puts(out,buf);
+                        }
+                BIO_printf(out, "\n");
+#endif
+                fprintf(stderr,"Error in ECDH routines\n");
+                ret=0;
+                }
+        else
+                {
+#ifndef NOISY
+                BIO_printf(out, " ok\n");
+#endif
+                ret=1;
+                }
+err:
+        ERR_print_errors_fp(stderr);
+
+        if (abuf != NULL) OPENSSL_free(abuf);
+        if (bbuf != NULL) OPENSSL_free(bbuf);
+        if (x_a) BN_free(x_a);
+        if (y_a) BN_free(y_a);
+        if (x_b) BN_free(x_b);
+        if (y_b) BN_free(y_b);
+        if (b) EC_KEY_free(b);
+        if (a) EC_KEY_free(a);
+        return(ret);
+        }
+
+int main(int argc, char *argv[])
+        {
+        BN_CTX *ctx=NULL;
+        int ret=1;
+        BIO *out;
+
+        CRYPTO_malloc_debug_init();
+        CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
+        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+#ifdef OPENSSL_SYS_WIN32
+        CRYPTO_malloc_init();
+#endif
+
+        RAND_seed(rnd_seed, sizeof rnd_seed);
+
+        out=BIO_new(BIO_s_file());
+        if (out == NULL) EXIT(1);
+        BIO_set_fp(out,stdout,BIO_NOCLOSE);
+
+        if ((ctx=BN_CTX_new()) == NULL) goto err;
+
+        /* NIST PRIME CURVES TESTS */
+        if (!test_ecdh_curve(NID_X9_62_prime192v1, "NIST Prime-Curve P-192", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_secp384r1, "NIST Prime-Curve P-384", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_secp521r1, "NIST Prime-Curve P-521", ctx, out)) goto err;
+        /* NIST BINARY CURVES TESTS */
+        if (!test_ecdh_curve(NID_sect163k1, "NIST Binary-Curve K-163", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect163r2, "NIST Binary-Curve B-163", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect233k1, "NIST Binary-Curve K-233", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect233r1, "NIST Binary-Curve B-233", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect283k1, "NIST Binary-Curve K-283", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect283r1, "NIST Binary-Curve B-283", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect409k1, "NIST Binary-Curve K-409", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect409r1, "NIST Binary-Curve B-409", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect571k1, "NIST Binary-Curve K-571", ctx, out)) goto err;
+        if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out)) goto err;
+
+        ret = 0;
+
+err:
+        ERR_print_errors_fp(stderr);
+        if (ctx) BN_CTX_free(ctx);
+        BIO_free(out);
+        CRYPTO_cleanup_all_ex_data();
+        ERR_remove_state(0);
+        CRYPTO_mem_leaks_fp(stderr);
+        EXIT(ret);
+        return(ret);
+        }
+
+#if 0
+static void MS_CALLBACK cb(int p, int n, void *arg)
+        {
+        char c='*';
+
+        if (p == 0) c='.';
+        if (p == 1) c='+';
+        if (p == 2) c='*';
+        if (p == 3) c='\n';
+        BIO_write((BIO *)arg,&c,1);
+        (void)BIO_flush((BIO *)arg);
+#ifdef LINT
+        p=n;
+#endif
+        }
+#endif
+#endif
diff --git a/src/lib/libssl/src/crypto/ecdh/ech_err.c b/src/lib/libssl/src/crypto/ecdh/ech_err.c
new file mode 100644
index 0000000000..4d2ede75bd
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdh/ech_err.c
@@ -0,0 +1,98 @@
+/* crypto/ecdh/ech_err.c */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
+ */
+
+#include <stdio.h>
+#include <openssl/err.h>
+#include <openssl/ecdh.h>
+
+/* BEGIN ERROR CODES */
+#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDH,func,0)
+#define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDH,0,reason)
+
+static ERR_STRING_DATA ECDH_str_functs[]=
+        {
+{ERR_FUNC(ECDH_F_ECDH_COMPUTE_KEY),     "ECDH_compute_key"},
+{ERR_FUNC(ECDH_F_ECDH_DATA_NEW_METHOD), "ECDH_DATA_NEW_METHOD"},
+{0,NULL}
+        };
+
+static ERR_STRING_DATA ECDH_str_reasons[]=
+        {
+{ERR_REASON(ECDH_R_KDF_FAILED)           ,"KDF failed"},
+{ERR_REASON(ECDH_R_NO_PRIVATE_VALUE)     ,"no private value"},
+{ERR_REASON(ECDH_R_POINT_ARITHMETIC_FAILURE),"point arithmetic failure"},
+{0,NULL}
+        };
+
+#endif
+
+void ERR_load_ECDH_strings(void)
+        {
+#ifndef OPENSSL_NO_ERR
+
+        if (ERR_func_error_string(ECDH_str_functs[0].error) == NULL)
+                {
+                ERR_load_strings(0,ECDH_str_functs);
+                ERR_load_strings(0,ECDH_str_reasons);
+                }
+#endif
+        }
diff --git a/src/lib/libssl/src/crypto/ecdh/ech_key.c b/src/lib/libssl/src/crypto/ecdh/ech_key.c
new file mode 100644
index 0000000000..f44da9298b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdh/ech_key.c
@@ -0,0 +1,83 @@
+/* crypto/ecdh/ecdh_key.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH software is originally written by Douglas Stebila of
+ * Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "ech_locl.h"
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+
+int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
+        EC_KEY *eckey,
+        void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
+{
+        ECDH_DATA *ecdh = ecdh_check(eckey);
+        if (ecdh == NULL)
+                return 0;
+        return ecdh->meth->compute_key(out, outlen, pub_key, eckey, KDF);
+}
diff --git a/src/lib/libssl/src/crypto/ecdh/ech_lib.c b/src/lib/libssl/src/crypto/ecdh/ech_lib.c
new file mode 100644
index 0000000000..e89b1d4772
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdh/ech_lib.c
@@ -0,0 +1,247 @@
+/* crypto/ecdh/ech_lib.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH software is originally written by Douglas Stebila of
+ * Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "ech_locl.h"
+#include <string.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include <openssl/err.h>
+
+const char ECDH_version[]="ECDH" OPENSSL_VERSION_PTEXT;
+
+static const ECDH_METHOD *default_ECDH_method = NULL;
+
+static void *ecdh_data_new(void);
+static void *ecdh_data_dup(void *);
+static void  ecdh_data_free(void *);
+
+void ECDH_set_default_method(const ECDH_METHOD *meth)
+        {
+        default_ECDH_method = meth;
+        }
+
+const ECDH_METHOD *ECDH_get_default_method(void)
+        {
+        if(!default_ECDH_method) 
+                default_ECDH_method = ECDH_OpenSSL();
+        return default_ECDH_method;
+        }
+
+int ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth)
+        {
+        const ECDH_METHOD *mtmp;
+        ECDH_DATA *ecdh;
+
+        ecdh = ecdh_check(eckey);
+
+        if (ecdh == NULL)
+                return 0;
+
+        mtmp = ecdh->meth;
+#if 0
+        if (mtmp->finish)
+                mtmp->finish(eckey);
+#endif
+#ifndef OPENSSL_NO_ENGINE
+        if (ecdh->engine)
+                {
+                ENGINE_finish(ecdh->engine);
+                ecdh->engine = NULL;
+                }
+#endif
+        ecdh->meth = meth;
+#if 0
+        if (meth->init) 
+                meth->init(eckey);
+#endif
+        return 1;
+        }
+
+static ECDH_DATA *ECDH_DATA_new_method(ENGINE *engine)
+        {
+        ECDH_DATA *ret;
+
+        ret=(ECDH_DATA *)OPENSSL_malloc(sizeof(ECDH_DATA));
+        if (ret == NULL)
+                {
+                ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_MALLOC_FAILURE);
+                return(NULL);
+                }
+
+        ret->init = NULL;
+
+        ret->meth = ECDH_get_default_method();
+        ret->engine = engine;
+#ifndef OPENSSL_NO_ENGINE
+        if (!ret->engine)
+                ret->engine = ENGINE_get_default_ECDH();
+        if (ret->engine)
+                {
+                ret->meth = ENGINE_get_ECDH(ret->engine);
+                if (!ret->meth)
+                        {
+                        ECDHerr(ECDH_F_ECDH_DATA_NEW_METHOD, ERR_R_ENGINE_LIB);
+                        ENGINE_finish(ret->engine);
+                        OPENSSL_free(ret);
+                        return NULL;
+                        }
+                }
+#endif
+
+        ret->flags = ret->meth->flags;
+        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDH, ret, &ret->ex_data);
+#if 0
+        if ((ret->meth->init != NULL) && !ret->meth->init(ret))
+                {
+                CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDH, ret, &ret->ex_data);
+                OPENSSL_free(ret);
+                ret=NULL;
+                }
+#endif  
+        return(ret);
+        }
+
+static void *ecdh_data_new(void)
+        {
+        return (void *)ECDH_DATA_new_method(NULL);
+        }
+
+static void *ecdh_data_dup(void *data)
+{
+        ECDH_DATA *r = (ECDH_DATA *)data;
+
+        /* XXX: dummy operation */
+        if (r == NULL)
+                return NULL;
+
+        return (void *)ecdh_data_new();
+}
+
+void ecdh_data_free(void *data)
+        {
+        ECDH_DATA *r = (ECDH_DATA *)data;
+
+#ifndef OPENSSL_NO_ENGINE
+        if (r->engine)
+                ENGINE_finish(r->engine);
+#endif
+
+        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDH, r, &r->ex_data);
+
+        OPENSSL_cleanse((void *)r, sizeof(ECDH_DATA));
+
+        OPENSSL_free(r);
+        }
+
+ECDH_DATA *ecdh_check(EC_KEY *key)
+        {
+        ECDH_DATA *ecdh_data;
+ 
+        void *data = EC_KEY_get_key_method_data(key, ecdh_data_dup,
+                                        ecdh_data_free, ecdh_data_free);
+        if (data == NULL)
+        {
+                ecdh_data = (ECDH_DATA *)ecdh_data_new();
+                if (ecdh_data == NULL)
+                        return NULL;
+                EC_KEY_insert_key_method_data(key, (void *)ecdh_data,
+                        ecdh_data_dup, ecdh_data_free, ecdh_data_free);
+        }
+        else
+                ecdh_data = (ECDH_DATA *)data;
+        
+
+        return ecdh_data;
+        }
+
+int ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
+        {
+        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ECDH, argl, argp,
+                                new_func, dup_func, free_func);
+        }
+
+int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg)
+        {
+        ECDH_DATA *ecdh;
+        ecdh = ecdh_check(d);
+        if (ecdh == NULL)
+                return 0;
+        return(CRYPTO_set_ex_data(&ecdh->ex_data,idx,arg));
+        }
+
+void *ECDH_get_ex_data(EC_KEY *d, int idx)
+        {
+        ECDH_DATA *ecdh;
+        ecdh = ecdh_check(d);
+        if (ecdh == NULL)
+                return NULL;
+        return(CRYPTO_get_ex_data(&ecdh->ex_data,idx));
+        }
diff --git a/src/lib/libssl/src/crypto/ecdh/ech_locl.h b/src/lib/libssl/src/crypto/ecdh/ech_locl.h
new file mode 100644
index 0000000000..f658526a7e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdh/ech_locl.h
@@ -0,0 +1,94 @@
+/* crypto/ecdh/ech_locl.h */
+/* ====================================================================
+ * Copyright (c) 2000-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_ECH_LOCL_H
+#define HEADER_ECH_LOCL_H
+
+#include <openssl/ecdh.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct ecdh_method 
+        {
+        const char *name;
+        int (*compute_key)(void *key, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
+                           void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
+#if 0
+        int (*init)(EC_KEY *eckey);
+        int (*finish)(EC_KEY *eckey);
+#endif
+        int flags;
+        char *app_data;
+        };
+
+typedef struct ecdh_data_st {
+        /* EC_KEY_METH_DATA part */
+        int (*init)(EC_KEY *);
+        /* method specific part */
+        ENGINE  *engine;
+        int     flags;
+        const ECDH_METHOD *meth;
+        CRYPTO_EX_DATA ex_data;
+} ECDH_DATA;
+
+ECDH_DATA *ecdh_check(EC_KEY *);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* HEADER_ECH_LOCL_H */
diff --git a/src/lib/libssl/src/crypto/ecdh/ech_ossl.c b/src/lib/libssl/src/crypto/ecdh/ech_ossl.c
new file mode 100644
index 0000000000..2a40ff12df
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdh/ech_ossl.c
@@ -0,0 +1,213 @@
+/* crypto/ecdh/ech_ossl.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH software is originally written by Douglas Stebila of
+ * Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#include <string.h>
+#include <limits.h>
+
+#include "cryptlib.h"
+
+#include "ech_locl.h"
+#include <openssl/err.h>
+#include <openssl/sha.h>
+#include <openssl/obj_mac.h>
+#include <openssl/bn.h>
+
+static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key,
+        EC_KEY *ecdh, 
+        void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen));
+
+static ECDH_METHOD openssl_ecdh_meth = {
+        "OpenSSL ECDH method",
+        ecdh_compute_key,
+#if 0
+        NULL, /* init     */
+        NULL, /* finish   */
+#endif
+        0,    /* flags    */
+        NULL  /* app_data */
+};
+
+const ECDH_METHOD *ECDH_OpenSSL(void)
+        {
+        return &openssl_ecdh_meth;
+        }
+
+
+/* This implementation is based on the following primitives in the IEEE 1363 standard:
+ *  - ECKAS-DH1
+ *  - ECSVDP-DH
+ * Finally an optional KDF is applied.
+ */
+static int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
+        EC_KEY *ecdh,
+        void *(*KDF)(const void *in, size_t inlen, void *out, size_t *outlen))
+        {
+        BN_CTX *ctx;
+        EC_POINT *tmp=NULL;
+        BIGNUM *x=NULL, *y=NULL;
+        const BIGNUM *priv_key;
+        const EC_GROUP* group;
+        int ret= -1;
+        size_t buflen, len;
+        unsigned char *buf=NULL;
+
+        if (outlen > INT_MAX)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE); /* sort of, anyway */
+                return -1;
+                }
+
+        if ((ctx = BN_CTX_new()) == NULL) goto err;
+        BN_CTX_start(ctx);
+        x = BN_CTX_get(ctx);
+        y = BN_CTX_get(ctx);
+        
+        priv_key = EC_KEY_get0_private_key(ecdh);
+        if (priv_key == NULL)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_NO_PRIVATE_VALUE);
+                goto err;
+                }
+
+        group = EC_KEY_get0_group(ecdh);
+        if ((tmp=EC_POINT_new(group)) == NULL)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+
+        if (!EC_POINT_mul(group, tmp, NULL, pub_key, priv_key, ctx)) 
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+                goto err;
+                }
+                
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field) 
+                {
+                if (!EC_POINT_get_affine_coordinates_GFp(group, tmp, x, y, ctx)) 
+                        {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+                        goto err;
+                        }
+                }
+        else
+                {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group, tmp, x, y, ctx)) 
+                        {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_POINT_ARITHMETIC_FAILURE);
+                        goto err;
+                        }
+                }
+
+        buflen = (EC_GROUP_get_degree(group) + 7)/8;
+        len = BN_num_bytes(x);
+        if (len > buflen)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_INTERNAL_ERROR);
+                goto err;
+                }
+        if ((buf = OPENSSL_malloc(buflen)) == NULL)
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        
+        memset(buf, 0, buflen - len);
+        if (len != (size_t)BN_bn2bin(x, buf + buflen - len))
+                {
+                ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ERR_R_BN_LIB);
+                goto err;
+                }
+
+        if (KDF != 0)
+                {
+                if (KDF(buf, buflen, out, &outlen) == NULL)
+                        {
+                        ECDHerr(ECDH_F_ECDH_COMPUTE_KEY,ECDH_R_KDF_FAILED);
+                        goto err;
+                        }
+                ret = outlen;
+                }
+        else
+                {
+                /* no KDF, just copy as much as we can */
+                if (outlen > buflen)
+                        outlen = buflen;
+                memcpy(out, buf, outlen);
+                ret = outlen;
+                }
+        
+err:
+        if (tmp) EC_POINT_free(tmp);
+        if (ctx) BN_CTX_end(ctx);
+        if (ctx) BN_CTX_free(ctx);
+        if (buf) OPENSSL_free(buf);
+        return(ret);
+        }
diff --git a/src/lib/libssl/src/crypto/ecdsa/Makefile b/src/lib/libssl/src/crypto/ecdsa/Makefile
new file mode 100644
index 0000000000..16a93cd3ae
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/Makefile
@@ -0,0 +1,125 @@
+#
+# crypto/ecdsa/Makefile
+#
+
+DIR=    ecdsa
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g -Wall
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=ecdsatest.c
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c
+
+LIBOBJ= ecs_lib.o ecs_asn1.o ecs_ossl.o ecs_sign.o ecs_vrf.o ecs_err.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= ecdsa.h
+HEADER= ecs_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+ecs_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h
+ecs_asn1.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+ecs_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+ecs_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+ecs_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecs_asn1.o: ../../include/openssl/symhacks.h ecs_asn1.c ecs_locl.h
+ecs_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ecs_err.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+ecs_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ecs_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ecs_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+ecs_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ecs_err.o: ecs_err.c
+ecs_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_lib.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ecs_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+ecs_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
+ecs_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
+ecs_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
+ecs_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+ecs_lib.o: ecs_lib.c ecs_locl.h
+ecs_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
+ecs_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
+ecs_ossl.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h
+ecs_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+ecs_ossl.o: ../../include/openssl/opensslconf.h
+ecs_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecs_ossl.o: ../../include/openssl/symhacks.h ecs_locl.h ecs_ossl.c
+ecs_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ecs_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+ecs_sign.o: ../../include/openssl/engine.h ../../include/openssl/opensslconf.h
+ecs_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecs_sign.o: ../../include/openssl/symhacks.h ecs_locl.h ecs_sign.c
+ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+ecs_vrf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ecs_vrf.o: ../../include/openssl/ec.h ../../include/openssl/ecdsa.h
+ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/opensslconf.h
+ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+ecs_vrf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+ecs_vrf.o: ../../include/openssl/symhacks.h ecs_locl.h ecs_vrf.c
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecdsa.h b/src/lib/libssl/src/crypto/ecdsa/ecdsa.h
new file mode 100644
index 0000000000..f20c8ee738
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecdsa.h
@@ -0,0 +1,271 @@
+/* crypto/ecdsa/ecdsa.h */
+/**
+ * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
+ * \author Written by Nils Larsch for the OpenSSL project
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+#ifndef HEADER_ECDSA_H
+#define HEADER_ECDSA_H
+
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_ECDSA
+#error ECDSA is disabled.
+#endif
+
+#include <openssl/ec.h>
+#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/bn.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct ECDSA_SIG_st
+        {
+        BIGNUM *r;
+        BIGNUM *s;
+        } ECDSA_SIG;
+
+/** ECDSA_SIG *ECDSA_SIG_new(void)
+ * allocates and initialize a ECDSA_SIG structure
+ * \return pointer to a ECDSA_SIG structure or NULL if an error occurred
+ */
+ECDSA_SIG *ECDSA_SIG_new(void);
+
+/** ECDSA_SIG_free
+ * frees a ECDSA_SIG structure
+ * \param a pointer to the ECDSA_SIG structure
+ */
+void      ECDSA_SIG_free(ECDSA_SIG *a);
+
+/** i2d_ECDSA_SIG
+ * DER encode content of ECDSA_SIG object (note: this function modifies *pp
+ * (*pp += length of the DER encoded signature)).
+ * \param a  pointer to the ECDSA_SIG object
+ * \param pp pointer to a unsigned char pointer for the output or NULL
+ * \return the length of the DER encoded ECDSA_SIG object or 0 
+ */
+int       i2d_ECDSA_SIG(const ECDSA_SIG *a, unsigned char **pp);
+
+/** d2i_ECDSA_SIG
+ * decodes a DER encoded ECDSA signature (note: this function changes *pp
+ * (*pp += len)). 
+ * \param v pointer to ECDSA_SIG pointer (may be NULL)
+ * \param pp buffer with the DER encoded signature
+ * \param len bufferlength
+ * \return pointer to the decoded ECDSA_SIG structure (or NULL)
+ */
+ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **v, const unsigned char **pp, long len);
+
+/** ECDSA_do_sign
+ * computes the ECDSA signature of the given hash value using
+ * the supplied private key and returns the created signature.
+ * \param dgst pointer to the hash value
+ * \param dgst_len length of the hash value
+ * \param eckey pointer to the EC_KEY object containing a private EC key
+ * \return pointer to a ECDSA_SIG structure or NULL
+ */
+ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst,int dgst_len,EC_KEY *eckey);
+
+/** ECDSA_do_sign_ex
+ * computes ECDSA signature of a given hash value using the supplied
+ * private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
+ * \param dgst pointer to the hash value to sign
+ * \param dgstlen length of the hash value
+ * \param kinv optional pointer to a pre-computed inverse k
+ * \param rp optional pointer to the pre-computed rp value (see 
+ *        ECDSA_sign_setup
+ * \param eckey pointer to the EC_KEY object containing a private EC key
+ * \return pointer to a ECDSA_SIG structure or NULL
+ */
+ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen, 
+                const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey);
+
+/** ECDSA_do_verify
+ * verifies that the supplied signature is a valid ECDSA
+ * signature of the supplied hash value using the supplied public key.
+ * \param dgst pointer to the hash value
+ * \param dgst_len length of the hash value
+ * \param sig  pointer to the ECDSA_SIG structure
+ * \param eckey pointer to the EC_KEY object containing a public EC key
+ * \return 1 if the signature is valid, 0 if the signature is invalid and -1 on error
+ */
+int       ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
+                const ECDSA_SIG *sig, EC_KEY* eckey);
+
+const ECDSA_METHOD *ECDSA_OpenSSL(void);
+
+/** ECDSA_set_default_method
+ * sets the default ECDSA method
+ * \param meth the new default ECDSA_METHOD
+ */
+void      ECDSA_set_default_method(const ECDSA_METHOD *meth);
+
+/** ECDSA_get_default_method
+ * returns the default ECDSA method
+ * \return pointer to ECDSA_METHOD structure containing the default method
+ */
+const ECDSA_METHOD *ECDSA_get_default_method(void);
+
+/** ECDSA_set_method
+ * sets method to be used for the ECDSA operations
+ * \param eckey pointer to the EC_KEY object
+ * \param meth  pointer to the new method
+ * \return 1 on success and 0 otherwise 
+ */
+int       ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth);
+
+/** ECDSA_size
+ * returns the maximum length of the DER encoded signature
+ * \param  eckey pointer to a EC_KEY object
+ * \return numbers of bytes required for the DER encoded signature
+ */
+int       ECDSA_size(const EC_KEY *eckey);
+
+/** ECDSA_sign_setup
+ * precompute parts of the signing operation. 
+ * \param eckey pointer to the EC_KEY object containing a private EC key
+ * \param ctx  pointer to a BN_CTX object (may be NULL)
+ * \param kinv pointer to a BIGNUM pointer for the inverse of k
+ * \param rp   pointer to a BIGNUM pointer for x coordinate of k * generator
+ * \return 1 on success and 0 otherwise
+ */
+int       ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, 
+                BIGNUM **rp);
+
+/** ECDSA_sign
+ * computes ECDSA signature of a given hash value using the supplied
+ * private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
+ * \param type this parameter is ignored
+ * \param dgst pointer to the hash value to sign
+ * \param dgstlen length of the hash value
+ * \param sig buffer to hold the DER encoded signature
+ * \param siglen pointer to the length of the returned signature
+ * \param eckey pointer to the EC_KEY object containing a private EC key
+ * \return 1 on success and 0 otherwise
+ */
+int       ECDSA_sign(int type, const unsigned char *dgst, int dgstlen, 
+                unsigned char *sig, unsigned int *siglen, EC_KEY *eckey);
+
+
+/** ECDSA_sign_ex
+ * computes ECDSA signature of a given hash value using the supplied
+ * private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
+ * \param type this parameter is ignored
+ * \param dgst pointer to the hash value to sign
+ * \param dgstlen length of the hash value
+ * \param sig buffer to hold the DER encoded signature
+ * \param siglen pointer to the length of the returned signature
+ * \param kinv optional pointer to a pre-computed inverse k
+ * \param rp optional pointer to the pre-computed rp value (see 
+ *        ECDSA_sign_setup
+ * \param eckey pointer to the EC_KEY object containing a private EC key
+ * \return 1 on success and 0 otherwise
+ */
+int       ECDSA_sign_ex(int type, const unsigned char *dgst, int dgstlen, 
+                unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv,
+                const BIGNUM *rp, EC_KEY *eckey);
+
+/** ECDSA_verify
+ * verifies that the given signature is valid ECDSA signature
+ * of the supplied hash value using the specified public key.
+ * \param type this parameter is ignored
+ * \param dgst pointer to the hash value 
+ * \param dgstlen length of the hash value
+ * \param sig  pointer to the DER encoded signature
+ * \param siglen length of the DER encoded signature
+ * \param eckey pointer to the EC_KEY object containing a public EC key
+ * \return 1 if the signature is valid, 0 if the signature is invalid and -1 on error
+ */
+int       ECDSA_verify(int type, const unsigned char *dgst, int dgstlen, 
+                const unsigned char *sig, int siglen, EC_KEY *eckey);
+
+/* the standard ex_data functions */
+int       ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new 
+                *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+int       ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg);
+void      *ECDSA_get_ex_data(EC_KEY *d, int idx);
+
+
+/* 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.
+ */
+void ERR_load_ECDSA_strings(void);
+
+/* Error codes for the ECDSA functions. */
+
+/* Function codes. */
+#define ECDSA_F_ECDSA_DATA_NEW_METHOD                    100
+#define ECDSA_F_ECDSA_DO_SIGN                            101
+#define ECDSA_F_ECDSA_DO_VERIFY                          102
+#define ECDSA_F_ECDSA_SIGN_SETUP                         103
+
+/* Reason codes. */
+#define ECDSA_R_BAD_SIGNATURE                            100
+#define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE              101
+#define ECDSA_R_ERR_EC_LIB                               102
+#define ECDSA_R_MISSING_PARAMETERS                       103
+#define ECDSA_R_NEED_NEW_SETUP_VALUES                    106
+#define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED          104
+#define ECDSA_R_SIGNATURE_MALLOC_FAILED                  105
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecdsatest.c b/src/lib/libssl/src/crypto/ecdsa/ecdsatest.c
new file mode 100644
index 0000000000..b07e31252b
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecdsatest.c
@@ -0,0 +1,500 @@
+/* crypto/ecdsa/ecdsatest.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project.
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * Portions of the attached software ("Contribution") are developed by 
+ * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
+ *
+ * The Contribution is licensed pursuant to the OpenSSL open source
+ * license provided above.
+ *
+ * The elliptic curve binary polynomial software is originally written by 
+ * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_ECDSA is defined */
+
+#ifdef OPENSSL_NO_ECDSA
+int main(int argc, char * argv[])
+        {
+        puts("Elliptic curves are disabled.");
+        return 0;
+        }
+#else
+
+#include <openssl/crypto.h>
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#include <openssl/ecdsa.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include <openssl/err.h>
+#include <openssl/rand.h>
+
+static const char rnd_seed[] = "string to make the random number generator "
+        "think it has entropy";
+
+/* declaration of the test functions */
+int x9_62_tests(BIO *);
+int x9_62_test_internal(BIO *out, int nid, const char *r, const char *s);
+int test_builtin(BIO *);
+
+/* functions to change the RAND_METHOD */
+int change_rand(void);
+int restore_rand(void);
+int fbytes(unsigned char *buf, int num);
+
+RAND_METHOD     fake_rand;
+const RAND_METHOD *old_rand;
+
+int change_rand(void)
+        {
+        /* save old rand method */
+        if ((old_rand = RAND_get_rand_method()) == NULL)
+                return 0;
+
+        fake_rand.seed    = old_rand->seed;
+        fake_rand.cleanup = old_rand->cleanup;
+        fake_rand.add     = old_rand->add;
+        fake_rand.status  = old_rand->status;
+        /* use own random function */
+        fake_rand.bytes      = fbytes;
+        fake_rand.pseudorand = old_rand->bytes;
+        /* set new RAND_METHOD */
+        if (!RAND_set_rand_method(&fake_rand))
+                return 0;
+        return 1;
+        }
+
+int restore_rand(void)
+        {
+        if (!RAND_set_rand_method(old_rand))
+                return 0;
+        else
+                return 1;
+        }
+
+static int fbytes_counter = 0;
+static const char *numbers[8] = {
+        "651056770906015076056810763456358567190100156695615665659",
+        "6140507067065001063065065565667405560006161556565665656654",
+        "8763001015071075675010661307616710783570106710677817767166"
+        "71676178726717",
+        "7000000175690566466555057817571571075705015757757057795755"
+        "55657156756655",
+        "1275552191113212300012030439187146164646146646466749494799",
+        "1542725565216523985789236956265265265235675811949404040041",
+        "1456427555219115346513212300075341203043918714616464614664"
+        "64667494947990",
+        "1712787255652165239672857892369562652652652356758119494040"
+        "40041670216363"};
+
+int fbytes(unsigned char *buf, int num)
+        {
+        int     ret;
+        BIGNUM  *tmp = NULL;
+
+        if (fbytes_counter >= 8)
+                return 0;
+        tmp = BN_new();
+        if (!tmp)
+                return 0;
+        if (!BN_dec2bn(&tmp, numbers[fbytes_counter]))
+                {
+                BN_free(tmp);
+                return 0;
+                }
+        fbytes_counter ++;
+        ret = BN_bn2bin(tmp, buf);      
+        if (ret == 0 || ret != num)
+                ret = 0;
+        else
+                ret = 1;
+        if (tmp)
+                BN_free(tmp);
+        return ret;
+        }
+
+/* some tests from the X9.62 draft */
+int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
+        {
+        int     ret = 0;
+        const char message[] = "abc";
+        unsigned char digest[20];
+        unsigned int  dgst_len = 0;
+        EVP_MD_CTX md_ctx;
+        EC_KEY    *key = NULL;
+        ECDSA_SIG *signature = NULL;
+        BIGNUM    *r = NULL, *s = NULL;
+
+        EVP_MD_CTX_init(&md_ctx);
+        /* get the message digest */
+        EVP_DigestInit(&md_ctx, EVP_ecdsa());
+        EVP_DigestUpdate(&md_ctx, (const void*)message, 3);
+        EVP_DigestFinal(&md_ctx, digest, &dgst_len);
+
+        BIO_printf(out, "testing %s: ", OBJ_nid2sn(nid));
+        /* create the key */
+        if ((key = EC_KEY_new_by_curve_name(nid)) == NULL)
+                goto x962_int_err;
+        if (!EC_KEY_generate_key(key))
+                goto x962_int_err;
+        BIO_printf(out, ".");
+        (void)BIO_flush(out);
+        /* create the signature */
+        signature = ECDSA_do_sign(digest, 20, key);
+        if (signature == NULL)
+                goto x962_int_err;
+        BIO_printf(out, ".");
+        (void)BIO_flush(out);
+        /* compare the created signature with the expected signature */
+        if ((r = BN_new()) == NULL || (s = BN_new()) == NULL)
+                goto x962_int_err;
+        if (!BN_dec2bn(&r, r_in) ||
+            !BN_dec2bn(&s, s_in))
+                goto x962_int_err;
+        if (BN_cmp(signature->r ,r) || BN_cmp(signature->s, s))
+                goto x962_int_err;
+        BIO_printf(out, ".");
+        (void)BIO_flush(out);
+        /* verify the signature */
+        if (ECDSA_do_verify(digest, 20, signature, key) != 1)
+                goto x962_int_err;
+        BIO_printf(out, ".");
+        (void)BIO_flush(out);
+
+        BIO_printf(out, " ok\n");
+        ret = 1;
+x962_int_err:
+        if (!ret)
+                BIO_printf(out, " failed\n");
+        if (key)
+                EC_KEY_free(key);
+        if (signature)
+                ECDSA_SIG_free(signature);
+        if (r)
+                BN_free(r);
+        if (s)
+                BN_free(s);
+        EVP_MD_CTX_cleanup(&md_ctx);
+        return ret;
+        }
+
+int x9_62_tests(BIO *out)
+        {
+        int ret = 0;
+
+        BIO_printf(out, "some tests from X9.62:\n");
+
+        /* set own rand method */
+        if (!change_rand())
+                goto x962_err;
+
+        if (!x9_62_test_internal(out, NID_X9_62_prime192v1,
+                "3342403536405981729393488334694600415596881826869351677613",
+                "5735822328888155254683894997897571951568553642892029982342"))
+                goto x962_err;
+        if (!x9_62_test_internal(out, NID_X9_62_prime239v1,
+                "3086361431751678114926225473006680188549593787585317781474"
+                "62058306432176",
+                "3238135532097973577080787768312505059318910517550078427819"
+                "78505179448783"))
+                goto x962_err;
+        if (!x9_62_test_internal(out, NID_X9_62_c2tnb191v1,
+                "87194383164871543355722284926904419997237591535066528048",
+                "308992691965804947361541664549085895292153777025772063598"))
+                goto x962_err;
+        if (!x9_62_test_internal(out, NID_X9_62_c2tnb239v1,
+                "2159633321041961198501834003903461262881815148684178964245"
+                "5876922391552",
+                "1970303740007316867383349976549972270528498040721988191026"
+                "49413465737174"))
+                goto x962_err;
+
+        ret = 1;
+x962_err:
+        if (!restore_rand())
+                ret = 0;
+        return ret;
+        }
+
+int test_builtin(BIO *out)
+        {
+        EC_builtin_curve *curves = NULL;
+        size_t          crv_len = 0, n = 0;
+        EC_KEY          *eckey = NULL, *wrong_eckey = NULL;
+        EC_GROUP        *group;
+        unsigned char   digest[20], wrong_digest[20];
+        unsigned char   *signature = NULL; 
+        unsigned int    sig_len;
+        int             nid, ret =  0;
+        
+        /* fill digest values with some random data */
+        if (!RAND_pseudo_bytes(digest, 20) ||
+            !RAND_pseudo_bytes(wrong_digest, 20))
+                {
+                BIO_printf(out, "ERROR: unable to get random data\n");
+                goto builtin_err;
+                }
+
+        /* create and verify a ecdsa signature with every availble curve
+         * (with ) */
+        BIO_printf(out, "\ntesting ECDSA_sign() and ECDSA_verify() "
+                "with some internal curves:\n");
+
+        /* get a list of all internal curves */
+        crv_len = EC_get_builtin_curves(NULL, 0);
+
+        curves = OPENSSL_malloc(sizeof(EC_builtin_curve) * crv_len);
+
+        if (curves == NULL)
+                {
+                BIO_printf(out, "malloc error\n");
+                goto builtin_err;
+                }
+        
+        if (!EC_get_builtin_curves(curves, crv_len))
+                {
+                BIO_printf(out, "unable to get internal curves\n");
+                goto builtin_err;
+                }
+
+        /* now create and verify a signature for every curve */
+        for (n = 0; n < crv_len; n++)
+                {
+                unsigned char dirt, offset;
+
+                nid = curves[n].nid;
+                if (nid == NID_ipsec4)
+                        continue;
+                /* create new ecdsa key (== EC_KEY) */
+                if ((eckey = EC_KEY_new()) == NULL)
+                        goto builtin_err;
+                group = EC_GROUP_new_by_curve_name(nid);
+                if (group == NULL)
+                        goto builtin_err;
+                if (EC_KEY_set_group(eckey, group) == 0)
+                        goto builtin_err;
+                EC_GROUP_free(group);
+                if (EC_GROUP_get_degree(EC_KEY_get0_group(eckey)) < 160)
+                        /* drop the curve */ 
+                        {
+                        EC_KEY_free(eckey);
+                        eckey = NULL;
+                        continue;
+                        }
+                BIO_printf(out, "%s: ", OBJ_nid2sn(nid));
+                /* create key */
+                if (!EC_KEY_generate_key(eckey))
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                /* create second key */
+                if ((wrong_eckey = EC_KEY_new()) == NULL)
+                        goto builtin_err;
+                group = EC_GROUP_new_by_curve_name(nid);
+                if (group == NULL)
+                        goto builtin_err;
+                if (EC_KEY_set_group(wrong_eckey, group) == 0)
+                        goto builtin_err;
+                EC_GROUP_free(group);
+                if (!EC_KEY_generate_key(wrong_eckey))
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* check key */
+                if (!EC_KEY_check_key(eckey))
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* create signature */
+                sig_len = ECDSA_size(eckey);
+                if ((signature = OPENSSL_malloc(sig_len)) == NULL)
+                        goto builtin_err;
+                if (!ECDSA_sign(0, digest, 20, signature, &sig_len, eckey))
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* verify signature */
+                if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1)
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* verify signature with the wrong key */
+                if (ECDSA_verify(0, digest, 20, signature, sig_len, 
+                        wrong_eckey) == 1)
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* wrong digest */
+                if (ECDSA_verify(0, wrong_digest, 20, signature, sig_len,
+                        eckey) == 1)
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                /* modify a single byte of the signature */
+                offset = signature[10] % sig_len;
+                dirt   = signature[11];
+                signature[offset] ^= dirt ? dirt : 1; 
+                if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) == 1)
+                        {
+                        BIO_printf(out, " failed\n");
+                        goto builtin_err;
+                        }
+                BIO_printf(out, ".");
+                (void)BIO_flush(out);
+                
+                BIO_printf(out, " ok\n");
+                /* cleanup */
+                OPENSSL_free(signature);
+                signature = NULL;
+                EC_KEY_free(eckey);
+                eckey = NULL;
+                EC_KEY_free(wrong_eckey);
+                wrong_eckey = NULL;
+                }
+
+        ret = 1;        
+builtin_err:
+        if (eckey)
+                EC_KEY_free(eckey);
+        if (wrong_eckey)
+                EC_KEY_free(wrong_eckey);
+        if (signature)
+                OPENSSL_free(signature);
+        if (curves)
+                OPENSSL_free(curves);
+
+        return ret;
+        }
+
+int main(void)
+        {
+        int     ret = 1;
+        BIO     *out;
+
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);
+        
+        /* enable memory leak checking unless explicitly disabled */
+        if (!((getenv("OPENSSL_DEBUG_MEMORY") != NULL) && 
+                (0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off"))))
+                {
+                CRYPTO_malloc_debug_init();
+                CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+                }
+        else
+                {
+                /* OPENSSL_DEBUG_MEMORY=off */
+                CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
+                }
+        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+
+        ERR_load_crypto_strings();
+
+        /* initialize the prng */
+        RAND_seed(rnd_seed, sizeof(rnd_seed));
+
+        /* the tests */
+        if (!x9_62_tests(out))  goto err;
+        if (!test_builtin(out)) goto err;
+        
+        ret = 0;
+err:    
+        if (ret)        
+                BIO_printf(out, "\nECDSA test failed\n");
+        else 
+                BIO_printf(out, "\nECDSA test passed\n");
+        if (ret)
+                ERR_print_errors(out);
+        CRYPTO_cleanup_all_ex_data();
+        ERR_remove_state(0);
+        ERR_free_strings();
+        CRYPTO_mem_leaks(out);
+        if (out != NULL)
+                BIO_free(out);
+        return ret;
+        }       
+#endif
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c b/src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c
new file mode 100644
index 0000000000..b295489400
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecs_asn1.c
@@ -0,0 +1,67 @@
+/* crypto/ecdsa/ecs_asn1.c */
+/* ====================================================================
+ * Copyright (c) 2000-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "ecs_locl.h"
+#include <openssl/err.h>
+#include <openssl/asn1t.h>
+
+ASN1_SEQUENCE(ECDSA_SIG) = {
+        ASN1_SIMPLE(ECDSA_SIG, r, CBIGNUM),
+        ASN1_SIMPLE(ECDSA_SIG, s, CBIGNUM)
+} ASN1_SEQUENCE_END(ECDSA_SIG)
+
+DECLARE_ASN1_FUNCTIONS_const(ECDSA_SIG)
+DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECDSA_SIG, ECDSA_SIG)
+IMPLEMENT_ASN1_FUNCTIONS_const(ECDSA_SIG)
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecs_err.c b/src/lib/libssl/src/crypto/ecdsa/ecs_err.c
new file mode 100644
index 0000000000..d2a53730ea
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecs_err.c
@@ -0,0 +1,104 @@
+/* crypto/ecdsa/ecs_err.c */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
+ */
+
+#include <stdio.h>
+#include <openssl/err.h>
+#include <openssl/ecdsa.h>
+
+/* BEGIN ERROR CODES */
+#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDSA,func,0)
+#define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDSA,0,reason)
+
+static ERR_STRING_DATA ECDSA_str_functs[]=
+        {
+{ERR_FUNC(ECDSA_F_ECDSA_DATA_NEW_METHOD),       "ECDSA_DATA_NEW_METHOD"},
+{ERR_FUNC(ECDSA_F_ECDSA_DO_SIGN),       "ECDSA_do_sign"},
+{ERR_FUNC(ECDSA_F_ECDSA_DO_VERIFY),     "ECDSA_do_verify"},
+{ERR_FUNC(ECDSA_F_ECDSA_SIGN_SETUP),    "ECDSA_sign_setup"},
+{0,NULL}
+        };
+
+static ERR_STRING_DATA ECDSA_str_reasons[]=
+        {
+{ERR_REASON(ECDSA_R_BAD_SIGNATURE)       ,"bad signature"},
+{ERR_REASON(ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),"data too large for key size"},
+{ERR_REASON(ECDSA_R_ERR_EC_LIB)          ,"err ec lib"},
+{ERR_REASON(ECDSA_R_MISSING_PARAMETERS)  ,"missing parameters"},
+{ERR_REASON(ECDSA_R_NEED_NEW_SETUP_VALUES),"need new setup values"},
+{ERR_REASON(ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED),"random number generation failed"},
+{ERR_REASON(ECDSA_R_SIGNATURE_MALLOC_FAILED),"signature malloc failed"},
+{0,NULL}
+        };
+
+#endif
+
+void ERR_load_ECDSA_strings(void)
+        {
+#ifndef OPENSSL_NO_ERR
+
+        if (ERR_func_error_string(ECDSA_str_functs[0].error) == NULL)
+                {
+                ERR_load_strings(0,ECDSA_str_functs);
+                ERR_load_strings(0,ECDSA_str_reasons);
+                }
+#endif
+        }
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecs_lib.c b/src/lib/libssl/src/crypto/ecdsa/ecs_lib.c
new file mode 100644
index 0000000000..85e8a3a7ed
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecs_lib.c
@@ -0,0 +1,261 @@
+/* crypto/ecdsa/ecs_lib.c */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include "ecs_locl.h"
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include <openssl/err.h>
+#include <openssl/bn.h>
+
+const char ECDSA_version[]="ECDSA" OPENSSL_VERSION_PTEXT;
+
+static const ECDSA_METHOD *default_ECDSA_method = NULL;
+
+static void *ecdsa_data_new(void);
+static void *ecdsa_data_dup(void *);
+static void  ecdsa_data_free(void *);
+
+void ECDSA_set_default_method(const ECDSA_METHOD *meth)
+{
+        default_ECDSA_method = meth;
+}
+
+const ECDSA_METHOD *ECDSA_get_default_method(void)
+{
+        if(!default_ECDSA_method) 
+                default_ECDSA_method = ECDSA_OpenSSL();
+        return default_ECDSA_method;
+}
+
+int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth)
+{
+        const ECDSA_METHOD *mtmp;
+        ECDSA_DATA *ecdsa;
+
+        ecdsa = ecdsa_check(eckey);
+
+        if (ecdsa == NULL)
+                return 0;
+
+        mtmp = ecdsa->meth;
+#ifndef OPENSSL_NO_ENGINE
+        if (ecdsa->engine)
+        {
+                ENGINE_finish(ecdsa->engine);
+                ecdsa->engine = NULL;
+        }
+#endif
+        ecdsa->meth = meth;
+
+        return 1;
+}
+
+static ECDSA_DATA *ECDSA_DATA_new_method(ENGINE *engine)
+{
+        ECDSA_DATA *ret;
+
+        ret=(ECDSA_DATA *)OPENSSL_malloc(sizeof(ECDSA_DATA));
+        if (ret == NULL)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DATA_NEW_METHOD, ERR_R_MALLOC_FAILURE);
+                return(NULL);
+        }
+
+        ret->init = NULL;
+
+        ret->meth = ECDSA_get_default_method();
+        ret->engine = engine;
+#ifndef OPENSSL_NO_ENGINE
+        if (!ret->engine)
+                ret->engine = ENGINE_get_default_ECDSA();
+        if (ret->engine)
+        {
+                ret->meth = ENGINE_get_ECDSA(ret->engine);
+                if (!ret->meth)
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_DATA_NEW_METHOD, ERR_R_ENGINE_LIB);
+                        ENGINE_finish(ret->engine);
+                        OPENSSL_free(ret);
+                        return NULL;
+                }
+        }
+#endif
+
+        ret->flags = ret->meth->flags;
+        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDSA, ret, &ret->ex_data);
+#if 0
+        if ((ret->meth->init != NULL) && !ret->meth->init(ret))
+        {
+                CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDSA, ret, &ret->ex_data);
+                OPENSSL_free(ret);
+                ret=NULL;
+        }
+#endif  
+        return(ret);
+}
+
+static void *ecdsa_data_new(void)
+{
+        return (void *)ECDSA_DATA_new_method(NULL);
+}
+
+static void *ecdsa_data_dup(void *data)
+{
+        ECDSA_DATA *r = (ECDSA_DATA *)data;
+
+        /* XXX: dummy operation */
+        if (r == NULL)
+                return NULL;
+
+        return ecdsa_data_new();
+}
+
+static void ecdsa_data_free(void *data)
+{
+        ECDSA_DATA *r = (ECDSA_DATA *)data;
+
+#ifndef OPENSSL_NO_ENGINE
+        if (r->engine)
+                ENGINE_finish(r->engine);
+#endif
+        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDSA, r, &r->ex_data);
+
+        OPENSSL_cleanse((void *)r, sizeof(ECDSA_DATA));
+
+        OPENSSL_free(r);
+}
+
+ECDSA_DATA *ecdsa_check(EC_KEY *key)
+{
+        ECDSA_DATA *ecdsa_data;
+ 
+        void *data = EC_KEY_get_key_method_data(key, ecdsa_data_dup,
+                                        ecdsa_data_free, ecdsa_data_free);
+        if (data == NULL)
+        {
+                ecdsa_data = (ECDSA_DATA *)ecdsa_data_new();
+                if (ecdsa_data == NULL)
+                        return NULL;
+                EC_KEY_insert_key_method_data(key, (void *)ecdsa_data,
+                        ecdsa_data_dup, ecdsa_data_free, ecdsa_data_free);
+        }
+        else
+                ecdsa_data = (ECDSA_DATA *)data;
+        
+
+        return ecdsa_data;
+}
+
+int ECDSA_size(const EC_KEY *r)
+{
+        int ret,i;
+        ASN1_INTEGER bs;
+        BIGNUM  *order=NULL;
+        unsigned char buf[4];
+        const EC_GROUP *group;
+
+        if (r == NULL)
+                return 0;
+        group = EC_KEY_get0_group(r);
+        if (group == NULL)
+                return 0;
+
+        if ((order = BN_new()) == NULL) return 0;
+        if (!EC_GROUP_get_order(group,order,NULL))
+        {
+                BN_clear_free(order);
+                return 0;
+        } 
+        i=BN_num_bits(order);
+        bs.length=(i+7)/8;
+        bs.data=buf;
+        bs.type=V_ASN1_INTEGER;
+        /* If the top bit is set the asn1 encoding is 1 larger. */
+        buf[0]=0xff;    
+
+        i=i2d_ASN1_INTEGER(&bs,NULL);
+        i+=i; /* r and s */
+        ret=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
+        BN_clear_free(order);
+        return(ret);
+}
+
+
+int ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
+{
+        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ECDSA, argl, argp,
+                                new_func, dup_func, free_func);
+}
+
+int ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg)
+{
+        ECDSA_DATA *ecdsa;
+        ecdsa = ecdsa_check(d);
+        if (ecdsa == NULL)
+                return 0;
+        return(CRYPTO_set_ex_data(&ecdsa->ex_data,idx,arg));
+}
+
+void *ECDSA_get_ex_data(EC_KEY *d, int idx)
+{
+        ECDSA_DATA *ecdsa;
+        ecdsa = ecdsa_check(d);
+        if (ecdsa == NULL)
+                return NULL;
+        return(CRYPTO_get_ex_data(&ecdsa->ex_data,idx));
+}
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecs_locl.h b/src/lib/libssl/src/crypto/ecdsa/ecs_locl.h
new file mode 100644
index 0000000000..3a69a840e2
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecs_locl.h
@@ -0,0 +1,107 @@
+/* crypto/ecdsa/ecs_locl.h */
+/*
+ * Written by Nils Larsch for the OpenSSL project
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_ECS_LOCL_H
+#define HEADER_ECS_LOCL_H
+
+#include <openssl/ecdsa.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct ecdsa_method 
+        {
+        const char *name;
+        ECDSA_SIG *(*ecdsa_do_sign)(const unsigned char *dgst, int dgst_len, 
+                        const BIGNUM *inv, const BIGNUM *rp, EC_KEY *eckey);
+        int (*ecdsa_sign_setup)(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, 
+                        BIGNUM **r);
+        int (*ecdsa_do_verify)(const unsigned char *dgst, int dgst_len, 
+                        const ECDSA_SIG *sig, EC_KEY *eckey);
+#if 0
+        int (*init)(EC_KEY *eckey);
+        int (*finish)(EC_KEY *eckey);
+#endif
+        int flags;
+        char *app_data;
+        };
+
+typedef struct ecdsa_data_st {
+        /* EC_KEY_METH_DATA part */
+        int (*init)(EC_KEY *);
+        /* method (ECDSA) specific part */
+        ENGINE  *engine;
+        int     flags;
+        const ECDSA_METHOD *meth;
+        CRYPTO_EX_DATA ex_data;
+} ECDSA_DATA;
+
+/** ecdsa_check
+ * checks whether ECKEY->meth_data is a pointer to a ECDSA_DATA structure
+ * and if not it removes the old meth_data and creates a ECDSA_DATA structure.
+ * \param  eckey pointer to a EC_KEY object
+ * \return pointer to a ECDSA_DATA structure
+ */
+ECDSA_DATA *ecdsa_check(EC_KEY *eckey);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* HEADER_ECS_LOCL_H */
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecs_ossl.c b/src/lib/libssl/src/crypto/ecdsa/ecs_ossl.c
new file mode 100644
index 0000000000..3ead1af94e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecs_ossl.c
@@ -0,0 +1,478 @@
+/* crypto/ecdsa/ecs_ossl.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "ecs_locl.h"
+#include <openssl/err.h>
+#include <openssl/obj_mac.h>
+#include <openssl/bn.h>
+
+static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dlen, 
+                const BIGNUM *, const BIGNUM *, EC_KEY *eckey);
+static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, 
+                BIGNUM **rp);
+static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len, 
+                const ECDSA_SIG *sig, EC_KEY *eckey);
+
+static ECDSA_METHOD openssl_ecdsa_meth = {
+        "OpenSSL ECDSA method",
+        ecdsa_do_sign,
+        ecdsa_sign_setup,
+        ecdsa_do_verify,
+#if 0
+        NULL, /* init     */
+        NULL, /* finish   */
+#endif
+        0,    /* flags    */
+        NULL  /* app_data */
+};
+
+const ECDSA_METHOD *ECDSA_OpenSSL(void)
+{
+        return &openssl_ecdsa_meth;
+}
+
+static int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp,
+                BIGNUM **rp)
+{
+        BN_CTX   *ctx = NULL;
+        BIGNUM   *k = NULL, *r = NULL, *order = NULL, *X = NULL;
+        EC_POINT *tmp_point=NULL;
+        const EC_GROUP *group;
+        int      ret = 0;
+
+        if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+        }
+
+        if (ctx_in == NULL) 
+        {
+                if ((ctx = BN_CTX_new()) == NULL)
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_MALLOC_FAILURE);
+                        return 0;
+                }
+        }
+        else
+                ctx = ctx_in;
+
+        k     = BN_new();       /* this value is later returned in *kinvp */
+        r     = BN_new();       /* this value is later returned in *rp    */
+        order = BN_new();
+        X     = BN_new();
+        if (!k || !r || !order || !X)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_MALLOC_FAILURE);
+                goto err;
+        }
+        if ((tmp_point = EC_POINT_new(group)) == NULL)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB);
+                goto err;
+        }
+        if (!EC_GROUP_get_order(group, order, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB);
+                goto err;
+        }
+        
+        do
+        {
+                /* get random k */      
+                do
+                        if (!BN_rand_range(k, order))
+                        {
+                                ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,
+                                 ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED);      
+                                goto err;
+                        }
+                while (BN_is_zero(k));
+
+                /* compute r the x-coordinate of generator * k */
+                if (!EC_POINT_mul(group, tmp_point, k, NULL, NULL, ctx))
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_EC_LIB);
+                        goto err;
+                }
+                if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field)
+                {
+                        if (!EC_POINT_get_affine_coordinates_GFp(group,
+                                tmp_point, X, NULL, ctx))
+                        {
+                                ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_EC_LIB);
+                                goto err;
+                        }
+                }
+                else /* NID_X9_62_characteristic_two_field */
+                {
+                        if (!EC_POINT_get_affine_coordinates_GF2m(group,
+                                tmp_point, X, NULL, ctx))
+                        {
+                                ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP,ERR_R_EC_LIB);
+                                goto err;
+                        }
+                }
+                if (!BN_nnmod(r, X, order, ctx))
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB);
+                        goto err;
+                }
+        }
+        while (BN_is_zero(r));
+
+        /* compute the inverse of k */
+        if (!BN_mod_inverse(k, k, order, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB);
+                goto err;       
+        }
+        /* clear old values if necessary */
+        if (*rp != NULL)
+                BN_clear_free(*rp);
+        if (*kinvp != NULL) 
+                BN_clear_free(*kinvp);
+        /* save the pre-computed values  */
+        *rp    = r;
+        *kinvp = k;
+        ret = 1;
+err:
+        if (!ret)
+        {
+                if (k != NULL) BN_clear_free(k);
+                if (r != NULL) BN_clear_free(r);
+        }
+        if (ctx_in == NULL) 
+                BN_CTX_free(ctx);
+        if (order != NULL)
+                BN_free(order);
+        if (tmp_point != NULL) 
+                EC_POINT_free(tmp_point);
+        if (X)
+                BN_clear_free(X);
+        return(ret);
+}
+
+
+static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dgst_len, 
+                const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *eckey)
+{
+        int     ok = 0;
+        BIGNUM *kinv=NULL, *s, *m=NULL,*tmp=NULL,*order=NULL;
+        const BIGNUM *ckinv;
+        BN_CTX     *ctx = NULL;
+        const EC_GROUP   *group;
+        ECDSA_SIG  *ret;
+        ECDSA_DATA *ecdsa;
+        const BIGNUM *priv_key;
+
+        ecdsa    = ecdsa_check(eckey);
+        group    = EC_KEY_get0_group(eckey);
+        priv_key = EC_KEY_get0_private_key(eckey);
+        
+        if (group == NULL || priv_key == NULL || ecdsa == NULL)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+        }
+
+        ret = ECDSA_SIG_new();
+        if (!ret)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE);
+                return NULL;
+        }
+        s = ret->s;
+
+        if ((ctx = BN_CTX_new()) == NULL || (order = BN_new()) == NULL ||
+                (tmp = BN_new()) == NULL || (m = BN_new()) == NULL)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE);
+                goto err;
+        }
+
+        if (!EC_GROUP_get_order(group, order, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_EC_LIB);
+                goto err;
+        }
+        if (8 * dgst_len > BN_num_bits(order))
+        {
+                /* XXX
+                 * 
+                 * Should provide for optional hash truncation:
+                 * Keep the BN_num_bits(order) leftmost bits of dgst
+                 * (see March 2006 FIPS 186-3 draft, which has a few
+                 * confusing errors in this part though)
+                 */
+
+                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN,
+                        ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
+                goto err;
+        }
+
+        if (!BN_bin2bn(dgst, dgst_len, m))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB);
+                goto err;
+        }
+        do
+        {
+                if (in_kinv == NULL || in_r == NULL)
+                {
+                        if (!ECDSA_sign_setup(eckey, ctx, &kinv, &ret->r))
+                        {
+                                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN,ERR_R_ECDSA_LIB);
+                                goto err;
+                        }
+                        ckinv = kinv;
+                }
+                else
+                {
+                        ckinv  = in_kinv;
+                        if (BN_copy(ret->r, in_r) == NULL)
+                        {
+                                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_MALLOC_FAILURE);
+                                goto err;
+                        }
+                }
+
+                if (!BN_mod_mul(tmp, priv_key, ret->r, order, ctx))
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB);
+                        goto err;
+                }
+                if (!BN_mod_add_quick(s, tmp, m, order))
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB);
+                        goto err;
+                }
+                if (!BN_mod_mul(s, s, ckinv, order, ctx))
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ERR_R_BN_LIB);
+                        goto err;
+                }
+                if (BN_is_zero(s))
+                {
+                        /* if kinv and r have been supplied by the caller
+                         * don't to generate new kinv and r values */
+                        if (in_kinv != NULL && in_r != NULL)
+                        {
+                                ECDSAerr(ECDSA_F_ECDSA_DO_SIGN, ECDSA_R_NEED_NEW_SETUP_VALUES);
+                                goto err;
+                        }
+                }
+                else
+                        /* s != 0 => we have a valid signature */
+                        break;
+        }
+        while (1);
+
+        ok = 1;
+err:
+        if (!ok)
+        {
+                ECDSA_SIG_free(ret);
+                ret = NULL;
+        }
+        if (ctx)
+                BN_CTX_free(ctx);
+        if (m)
+                BN_clear_free(m);
+        if (tmp)
+                BN_clear_free(tmp);
+        if (order)
+                BN_free(order);
+        if (kinv)
+                BN_clear_free(kinv);
+        return ret;
+}
+
+static int ecdsa_do_verify(const unsigned char *dgst, int dgst_len,
+                const ECDSA_SIG *sig, EC_KEY *eckey)
+{
+        int ret = -1;
+        BN_CTX   *ctx;
+        BIGNUM   *order, *u1, *u2, *m, *X;
+        EC_POINT *point = NULL;
+        const EC_GROUP *group;
+        const EC_POINT *pub_key;
+
+        /* check input values */
+        if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL ||
+            (pub_key = EC_KEY_get0_public_key(eckey)) == NULL || sig == NULL)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ECDSA_R_MISSING_PARAMETERS);
+                return -1;
+        }
+
+        ctx = BN_CTX_new();
+        if (!ctx)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_MALLOC_FAILURE);
+                return -1;
+        }
+        BN_CTX_start(ctx);
+        order = BN_CTX_get(ctx);        
+        u1    = BN_CTX_get(ctx);
+        u2    = BN_CTX_get(ctx);
+        m     = BN_CTX_get(ctx);
+        X     = BN_CTX_get(ctx);
+        if (!X)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
+                goto err;
+        }
+        
+        if (!EC_GROUP_get_order(group, order, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB);
+                goto err;
+        }
+        if (8 * dgst_len > BN_num_bits(order))
+        {
+                /* XXX
+                 * 
+                 * Should provide for optional hash truncation:
+                 * Keep the BN_num_bits(order) leftmost bits of dgst
+                 * (see March 2006 FIPS 186-3 draft, which has a few
+                 * confusing errors in this part though)
+                 */
+
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY,
+                        ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
+                ret = 0;
+                goto err;
+        }
+
+        if (BN_is_zero(sig->r)          || BN_is_negative(sig->r) || 
+            BN_ucmp(sig->r, order) >= 0 || BN_is_zero(sig->s)  ||
+            BN_is_negative(sig->s)      || BN_ucmp(sig->s, order) >= 0)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ECDSA_R_BAD_SIGNATURE);
+                ret = 0;        /* signature is invalid */
+                goto err;
+        }
+        /* calculate tmp1 = inv(S) mod order */
+        if (!BN_mod_inverse(u2, sig->s, order, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
+                goto err;
+        }
+        /* digest -> m */
+        if (!BN_bin2bn(dgst, dgst_len, m))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
+                goto err;
+        }
+        /* u1 = m * tmp mod order */
+        if (!BN_mod_mul(u1, m, u2, order, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
+                goto err;
+        }
+        /* u2 = r * w mod q */
+        if (!BN_mod_mul(u2, sig->r, u2, order, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
+                goto err;
+        }
+
+        if ((point = EC_POINT_new(group)) == NULL)
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_MALLOC_FAILURE);
+                goto err;
+        }
+        if (!EC_POINT_mul(group, point, u1, pub_key, u2, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB);
+                goto err;
+        }
+        if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) == NID_X9_62_prime_field)
+        {
+                if (!EC_POINT_get_affine_coordinates_GFp(group,
+                        point, X, NULL, ctx))
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB);
+                        goto err;
+                }
+        }
+        else /* NID_X9_62_characteristic_two_field */
+        {
+                if (!EC_POINT_get_affine_coordinates_GF2m(group,
+                        point, X, NULL, ctx))
+                {
+                        ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_EC_LIB);
+                        goto err;
+                }
+        }
+        
+        if (!BN_nnmod(u1, X, order, ctx))
+        {
+                ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);
+                goto err;
+        }
+        /*  if the signature is correct u1 is equal to sig->r */
+        ret = (BN_ucmp(u1, sig->r) == 0);
+err:
+        BN_CTX_end(ctx);
+        BN_CTX_free(ctx);
+        if (point)
+                EC_POINT_free(point);
+        return ret;
+}
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecs_sign.c b/src/lib/libssl/src/crypto/ecdsa/ecs_sign.c
new file mode 100644
index 0000000000..74b1fe8caf
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecs_sign.c
@@ -0,0 +1,104 @@
+/* crypto/ecdsa/ecdsa_sign.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "ecs_locl.h"
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+
+ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey)
+{
+        return ECDSA_do_sign_ex(dgst, dlen, NULL, NULL, eckey);
+}
+
+ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dlen,
+        const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey)
+{
+        ECDSA_DATA *ecdsa = ecdsa_check(eckey);
+        if (ecdsa == NULL)
+                return NULL;
+        return ecdsa->meth->ecdsa_do_sign(dgst, dlen, kinv, rp, eckey);
+}
+
+int ECDSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char 
+                *sig, unsigned int *siglen, EC_KEY *eckey)
+{
+        return ECDSA_sign_ex(type, dgst, dlen, sig, siglen, NULL, NULL, eckey);
+}
+
+int ECDSA_sign_ex(int type, const unsigned char *dgst, int dlen, unsigned char 
+        *sig, unsigned int *siglen, const BIGNUM *kinv, const BIGNUM *r, 
+        EC_KEY *eckey)
+{
+        ECDSA_SIG *s;
+        s = ECDSA_do_sign_ex(dgst, dlen, kinv, r, eckey);
+        if (s == NULL)
+        {
+                *siglen=0;
+                return 0;
+        }
+        *siglen = i2d_ECDSA_SIG(s, &sig);
+        ECDSA_SIG_free(s);
+        return 1;
+}
+
+int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, 
+                BIGNUM **rp)
+{
+        ECDSA_DATA *ecdsa = ecdsa_check(eckey);
+        if (ecdsa == NULL)
+                return 0;
+        return ecdsa->meth->ecdsa_sign_setup(eckey, ctx_in, kinvp, rp); 
+}
diff --git a/src/lib/libssl/src/crypto/ecdsa/ecs_vrf.c b/src/lib/libssl/src/crypto/ecdsa/ecs_vrf.c
new file mode 100644
index 0000000000..ef9acf7b61
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ecdsa/ecs_vrf.c
@@ -0,0 +1,96 @@
+/* crypto/ecdsa/ecdsa_vrf.c */
+/*
+ * Written by Nils Larsch for the OpenSSL project
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "ecs_locl.h"
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+
+/* returns
+ *      1: correct signature
+ *      0: incorrect signature
+ *     -1: error
+ */
+int ECDSA_do_verify(const unsigned char *dgst, int dgst_len, 
+                const ECDSA_SIG *sig, EC_KEY *eckey)
+        {
+        ECDSA_DATA *ecdsa = ecdsa_check(eckey);
+        if (ecdsa == NULL)
+                return 0;
+        return ecdsa->meth->ecdsa_do_verify(dgst, dgst_len, sig, eckey);
+        }
+
+/* returns
+ *      1: correct signature
+ *      0: incorrect signature
+ *     -1: error
+ */
+int ECDSA_verify(int type, const unsigned char *dgst, int dgst_len,
+                const unsigned char *sigbuf, int sig_len, EC_KEY *eckey)
+        {
+        ECDSA_SIG *s;
+        int ret=-1;
+
+        s = ECDSA_SIG_new();
+        if (s == NULL) return(ret);
+        if (d2i_ECDSA_SIG(&s, &sigbuf, sig_len) == NULL) goto err;
+        ret=ECDSA_do_verify(dgst, dgst_len, s, eckey);
+err:
+        ECDSA_SIG_free(s);
+        return(ret);
+        }
diff --git a/src/lib/libssl/src/crypto/engine/hw.ec b/src/lib/libssl/src/crypto/engine/hw.ec
deleted file mode 100644
index 5481a43918..0000000000
--- a/src/lib/libssl/src/crypto/engine/hw.ec
+++ /dev/null
@@ -1,8 +0,0 @@
-L AEPHK         hw_aep_err.h                    hw_aep_err.c
-L ATALLA        hw_atalla_err.h                 hw_atalla_err.c
-L CSWIFT        hw_cswift_err.h                 hw_cswift_err.c
-L HWCRHK        hw_ncipher_err.h                hw_ncipher_err.c
-L NURON         hw_nuron_err.h                  hw_nuron_err.c
-L SUREWARE      hw_sureware_err.h               hw_sureware_err.c
-L UBSEC         hw_ubsec_err.h                  hw_ubsec_err.c
-L CCA4758       hw_4758_cca_err.h               hw_4758_cca_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_cryptodev.c b/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
deleted file mode 100644
index 3e7fff1c1e..0000000000
--- a/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
+++ /dev/null
@@ -1,1135 +0,0 @@
-/*
- * Copyright (c) 2002 Bob Beck <beck@openbsd.org>
- * Copyright (c) 2002 Theo de Raadt
- * Copyright (c) 2002 Markus Friedl
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <openssl/objects.h>
-#include <openssl/engine.h>
-#include <openssl/evp.h>
-
-#if (defined(__unix__) || defined(unix)) && !defined(USG)
-#include <sys/param.h>
-# if (OpenBSD >= 200112) || ((__FreeBSD_version >= 470101 && __FreeBSD_version < 500000) || __FreeBSD_version >= 500041)
-# define HAVE_CRYPTODEV
-# endif
-# if (OpenBSD >= 200110)
-# define HAVE_SYSLOG_R
-# endif
-#endif
-
-#ifndef HAVE_CRYPTODEV
-
-void
-ENGINE_load_cryptodev(void)
-{
-        /* This is a NOP on platforms without /dev/crypto */
-        return;
-}
-
-#else 
-
-#include <sys/types.h>
-#include <crypto/cryptodev.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <syslog.h>
-#include <errno.h>
-#include <string.h>
-
-struct dev_crypto_state {
-        struct session_op d_sess;
-        int d_fd;
-};
-
-static u_int32_t cryptodev_asymfeat = 0;
-
-static int get_asym_dev_crypto(void);
-static int open_dev_crypto(void);
-static int get_dev_crypto(void);
-static int cryptodev_max_iv(int cipher);
-static int cryptodev_key_length_valid(int cipher, int len);
-static int cipher_nid_to_cryptodev(int nid);
-static int get_cryptodev_ciphers(const int **cnids);
-/*static int get_cryptodev_digests(const int **cnids);*/
-static int cryptodev_usable_ciphers(const int **nids);
-static int cryptodev_usable_digests(const int **nids);
-static int cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, unsigned int inl);
-static int cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc);
-static int cryptodev_cleanup(EVP_CIPHER_CTX *ctx);
-static int cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-    const int **nids, int nid);
-static int cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
-    const int **nids, int nid);
-static int bn2crparam(const BIGNUM *a, struct crparam *crp);
-static int crparam2bn(struct crparam *crp, BIGNUM *a);
-static void zapparams(struct crypt_kop *kop);
-static int cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r,
-    int slen, BIGNUM *s);
-
-static int cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a,
-    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I,
-    RSA *rsa);
-static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
-static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a,
-    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-static int cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
-    BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, BIGNUM *p,
-    BN_CTX *ctx, BN_MONT_CTX *mont);
-static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst,
-    int dlen, DSA *dsa);
-static int cryptodev_dsa_verify(const unsigned char *dgst, int dgst_len,
-    DSA_SIG *sig, DSA *dsa);
-static int cryptodev_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-    BN_MONT_CTX *m_ctx);
-static int cryptodev_dh_compute_key(unsigned char *key,
-    const BIGNUM *pub_key, DH *dh);
-static int cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p,
-    void (*f)());
-void ENGINE_load_cryptodev(void);
-
-static const ENGINE_CMD_DEFN cryptodev_defns[] = {
-        { 0, NULL, NULL, 0 }
-};
-
-static struct {
-        int     id;
-        int     nid;
-        int     ivmax;
-        int     keylen;
-} ciphers[] = {
-        { CRYPTO_DES_CBC,               NID_des_cbc,            8,       8, },
-        { CRYPTO_3DES_CBC,              NID_des_ede3_cbc,       8,      24, },
-        { CRYPTO_AES_CBC,               NID_aes_128_cbc,        16,     16, },
-        { CRYPTO_BLF_CBC,               NID_bf_cbc,             8,      16, },
-        { CRYPTO_CAST_CBC,              NID_cast5_cbc,          8,      16, },
-        { CRYPTO_SKIPJACK_CBC,          NID_undef,              0,       0, },
-        { 0,                            NID_undef,              0,       0, },
-};
-
-#if 0 /* UNUSED */
-static struct {
-        int     id;
-        int     nid;
-} digests[] = {
-        { CRYPTO_SHA1_HMAC,             NID_hmacWithSHA1,       },
-        { CRYPTO_RIPEMD160_HMAC,        NID_ripemd160,          },
-        { CRYPTO_MD5_KPDK,              NID_undef,              },
-        { CRYPTO_SHA1_KPDK,             NID_undef,              },
-        { CRYPTO_MD5,                   NID_md5,                },
-        { CRYPTO_SHA1,                  NID_undef,              },
-        { 0,                            NID_undef,              },
-};
-#endif
-
-/*
- * Return a fd if /dev/crypto seems usable, 0 otherwise.
- */
-static int
-open_dev_crypto(void)
-{
-        static int fd = -1;
-
-        if (fd == -1) {
-                if ((fd = open("/dev/crypto", O_RDWR, 0)) == -1)
-                        return (-1);
-                /* close on exec */
-                if (fcntl(fd, F_SETFD, 1) == -1) {
-                        close(fd);
-                        fd = -1;
-                        return (-1);
-                }
-        }
-        return (fd);
-}
-
-static int
-get_dev_crypto(void)
-{
-        int fd, retfd;
-
-        if ((fd = open_dev_crypto()) == -1)
-                return (-1);
-        if (ioctl(fd, CRIOGET, &retfd) == -1)
-                return (-1);
-
-        /* close on exec */
-        if (fcntl(retfd, F_SETFD, 1) == -1) {
-                close(retfd);
-                return (-1);
-        }
-        return (retfd);
-}
-
-/* Caching version for asym operations */
-static int
-get_asym_dev_crypto(void)
-{
-        static int fd = -1;
-
-        if (fd == -1)
-                fd = get_dev_crypto();
-        return fd;
-}
-
-/*
- * XXXX this needs to be set for each alg - and determined from
- * a running card.
- */
-static int
-cryptodev_max_iv(int cipher)
-{
-        int i;
-
-        for (i = 0; ciphers[i].id; i++)
-                if (ciphers[i].id == cipher)
-                        return (ciphers[i].ivmax);
-        return (0);
-}
-
-/*
- * XXXX this needs to be set for each alg - and determined from
- * a running card. For now, fake it out - but most of these
- * for real devices should return 1 for the supported key
- * sizes the device can handle.
- */
-static int
-cryptodev_key_length_valid(int cipher, int len)
-{
-        int i;
-
-        for (i = 0; ciphers[i].id; i++)
-                if (ciphers[i].id == cipher)
-                        return (ciphers[i].keylen == len);
-        return (0);
-}
-
-/* convert libcrypto nids to cryptodev */
-static int
-cipher_nid_to_cryptodev(int nid)
-{
-        int i;
-
-        for (i = 0; ciphers[i].id; i++)
-                if (ciphers[i].nid == nid)
-                        return (ciphers[i].id);
-        return (0);
-}
-
-/*
- * Find out what ciphers /dev/crypto will let us have a session for.
- * XXX note, that some of these openssl doesn't deal with yet!
- * returning them here is harmless, as long as we return NULL
- * when asked for a handler in the cryptodev_engine_ciphers routine
- */
-static int
-get_cryptodev_ciphers(const int **cnids)
-{
-        static int nids[CRYPTO_ALGORITHM_MAX];
-        struct session_op sess;
-        int fd, i, count = 0;
-
-        if ((fd = get_dev_crypto()) < 0) {
-                *cnids = NULL;
-                return (0);
-        }
-        memset(&sess, 0, sizeof(sess));
-        sess.key = (caddr_t)"123456781234567812345678";
-
-        for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
-                if (ciphers[i].nid == NID_undef)
-                        continue;
-                sess.cipher = ciphers[i].id;
-                sess.keylen = ciphers[i].keylen;
-                sess.mac = 0;
-                if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
-                    ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
-                        nids[count++] = ciphers[i].nid;
-        }
-        close(fd);
-
-        if (count > 0)
-                *cnids = nids;
-        else
-                *cnids = NULL;
-        return (count);
-}
-
-/*
- * Find out what digests /dev/crypto will let us have a session for.
- * XXX note, that some of these openssl doesn't deal with yet!
- * returning them here is harmless, as long as we return NULL
- * when asked for a handler in the cryptodev_engine_digests routine
- */
-#if 0 /* UNUSED */
-static int
-get_cryptodev_digests(const int **cnids)
-{
-        static int nids[CRYPTO_ALGORITHM_MAX];
-        struct session_op sess;
-        int fd, i, count = 0;
-
-        if ((fd = get_dev_crypto()) < 0) {
-                *cnids = NULL;
-                return (0);
-        }
-        memset(&sess, 0, sizeof(sess));
-        for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {
-                if (digests[i].nid == NID_undef)
-                        continue;
-                sess.mac = digests[i].id;
-                sess.cipher = 0;
-                if (ioctl(fd, CIOCGSESSION, &sess) != -1 &&
-                    ioctl(fd, CIOCFSESSION, &sess.ses) != -1)
-                        nids[count++] = digests[i].nid;
-        }
-        close(fd);
-
-        if (count > 0)
-                *cnids = nids;
-        else
-                *cnids = NULL;
-        return (count);
-}
-#endif
-
-/*
- * Find the useable ciphers|digests from dev/crypto - this is the first
- * thing called by the engine init crud which determines what it
- * can use for ciphers from this engine. We want to return
- * only what we can do, anythine else is handled by software.
- *
- * If we can't initialize the device to do anything useful for
- * any reason, we want to return a NULL array, and 0 length,
- * which forces everything to be done is software. By putting
- * the initalization of the device in here, we ensure we can
- * use this engine as the default, and if for whatever reason
- * /dev/crypto won't do what we want it will just be done in
- * software
- *
- * This can (should) be greatly expanded to perhaps take into
- * account speed of the device, and what we want to do.
- * (although the disabling of particular alg's could be controlled
- * by the device driver with sysctl's.) - this is where we
- * want most of the decisions made about what we actually want
- * to use from /dev/crypto.
- */
-static int
-cryptodev_usable_ciphers(const int **nids)
-{
-        return (get_cryptodev_ciphers(nids));
-}
-
-static int
-cryptodev_usable_digests(const int **nids)
-{
-        /*
-         * XXXX just disable all digests for now, because it sucks.
-         * we need a better way to decide this - i.e. I may not
-         * want digests on slow cards like hifn on fast machines,
-         * but might want them on slow or loaded machines, etc.
-         * will also want them when using crypto cards that don't
-         * suck moose gonads - would be nice to be able to decide something
-         * as reasonable default without having hackery that's card dependent.
-         * of course, the default should probably be just do everything,
-         * with perhaps a sysctl to turn algoritms off (or have them off
-         * by default) on cards that generally suck like the hifn.
-         */
-        *nids = NULL;
-        return (0);
-}
-
-static int
-cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-    const unsigned char *in, unsigned int inl)
-{
-        struct crypt_op cryp;
-        struct dev_crypto_state *state = ctx->cipher_data;
-        struct session_op *sess = &state->d_sess;
-        void *iiv;
-        unsigned char save_iv[EVP_MAX_IV_LENGTH];
-
-        if (state->d_fd < 0)
-                return (0);
-        if (!inl)
-                return (1);
-        if ((inl % ctx->cipher->block_size) != 0)
-                return (0);
-
-        memset(&cryp, 0, sizeof(cryp));
-
-        cryp.ses = sess->ses;
-        cryp.flags = 0;
-        cryp.len = inl;
-        cryp.src = (caddr_t) in;
-        cryp.dst = (caddr_t) out;
-        cryp.mac = 0;
-
-        cryp.op = ctx->encrypt ? COP_ENCRYPT : COP_DECRYPT;
-
-        if (ctx->cipher->iv_len) {
-                cryp.iv = (caddr_t) ctx->iv;
-                if (!ctx->encrypt) {
-                        iiv = (void *) in + inl - ctx->cipher->iv_len;
-                        memcpy(save_iv, iiv, ctx->cipher->iv_len);
-                }
-        } else
-                cryp.iv = NULL;
-
-        if (ioctl(state->d_fd, CIOCCRYPT, &cryp) == -1) {
-                /* XXX need better errror handling
-                 * this can fail for a number of different reasons.
-                 */
-                return (0);
-        }
-
-        if (ctx->cipher->iv_len) {
-                if (ctx->encrypt)
-                        iiv = (void *) out + inl - ctx->cipher->iv_len;
-                else
-                        iiv = save_iv;
-                memcpy(ctx->iv, iiv, ctx->cipher->iv_len);
-        }
-        return (1);
-}
-
-static int
-cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-    const unsigned char *iv, int enc)
-{
-        struct dev_crypto_state *state = ctx->cipher_data;
-        struct session_op *sess = &state->d_sess;
-        int cipher;
-
-        if ((cipher = cipher_nid_to_cryptodev(ctx->cipher->nid)) == NID_undef)
-                return (0);
-
-        if (ctx->cipher->iv_len > cryptodev_max_iv(cipher))
-                return (0);
-
-        if (!cryptodev_key_length_valid(cipher, ctx->key_len))
-                return (0);
-
-        memset(sess, 0, sizeof(struct session_op));
-
-        if ((state->d_fd = get_dev_crypto()) < 0)
-                return (0);
-
-        sess->key = (unsigned char *)key;
-        sess->keylen = ctx->key_len;
-        sess->cipher = cipher;
-
-        if (ioctl(state->d_fd, CIOCGSESSION, sess) == -1) {
-                close(state->d_fd);
-                state->d_fd = -1;
-                return (0);
-        }
-        return (1);
-}
-
-/*
- * free anything we allocated earlier when initting a
- * session, and close the session.
- */
-static int
-cryptodev_cleanup(EVP_CIPHER_CTX *ctx)
-{
-        int ret = 0;
-        struct dev_crypto_state *state = ctx->cipher_data;
-        struct session_op *sess = &state->d_sess;
-
-        if (state->d_fd < 0)
-                return (0);
-
-        /* XXX if this ioctl fails, someting's wrong. the invoker
-         * may have called us with a bogus ctx, or we could
-         * have a device that for whatever reason just doesn't
-         * want to play ball - it's not clear what's right
-         * here - should this be an error? should it just
-         * increase a counter, hmm. For right now, we return
-         * 0 - I don't believe that to be "right". we could
-         * call the gorpy openssl lib error handlers that
-         * print messages to users of the library. hmm..
-         */
-
-        if (ioctl(state->d_fd, CIOCFSESSION, &sess->ses) == -1) {
-                ret = 0;
-        } else {
-                ret = 1;
-        }
-        close(state->d_fd);
-        state->d_fd = -1;
-
-        return (ret);
-}
-
-/*
- * libcrypto EVP stuff - this is how we get wired to EVP so the engine
- * gets called when libcrypto requests a cipher NID.
- */
-
-/* DES CBC EVP */
-const EVP_CIPHER cryptodev_des_cbc = {
-        NID_des_cbc,
-        8, 8, 8,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-/* 3DES CBC EVP */
-const EVP_CIPHER cryptodev_3des_cbc = {
-        NID_des_ede3_cbc,
-        8, 24, 8,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-const EVP_CIPHER cryptodev_bf_cbc = {
-        NID_bf_cbc,
-        8, 16, 8,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-const EVP_CIPHER cryptodev_cast_cbc = {
-        NID_cast5_cbc,
-        8, 16, 8,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-const EVP_CIPHER cryptodev_aes_cbc = {
-        NID_aes_128_cbc,
-        16, 16, 16,
-        EVP_CIPH_CBC_MODE,
-        cryptodev_init_key,
-        cryptodev_cipher,
-        cryptodev_cleanup,
-        sizeof(struct dev_crypto_state),
-        EVP_CIPHER_set_asn1_iv,
-        EVP_CIPHER_get_asn1_iv,
-        NULL
-};
-
-/*
- * Registered by the ENGINE when used to find out how to deal with
- * a particular NID in the ENGINE. this says what we'll do at the
- * top level - note, that list is restricted by what we answer with
- */
-static int
-cryptodev_engine_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-    const int **nids, int nid)
-{
-        if (!cipher)
-                return (cryptodev_usable_ciphers(nids));
-
-        switch (nid) {
-        case NID_des_ede3_cbc:
-                *cipher = &cryptodev_3des_cbc;
-                break;
-        case NID_des_cbc:
-                *cipher = &cryptodev_des_cbc;
-                break;
-        case NID_bf_cbc:
-                *cipher = &cryptodev_bf_cbc;
-                break;
-        case NID_cast5_cbc:
-                *cipher = &cryptodev_cast_cbc;
-                break;
-        case NID_aes_128_cbc:
-                *cipher = &cryptodev_aes_cbc;
-                break;
-        default:
-                *cipher = NULL;
-                break;
-        }
-        return (*cipher != NULL);
-}
-
-static int
-cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest,
-    const int **nids, int nid)
-{
-        if (!digest)
-                return (cryptodev_usable_digests(nids));
-
-        switch (nid) {
-        case NID_md5:
-                *digest = NULL; /* need to make a clean md5 critter */
-                break;
-        default:
-                *digest = NULL;
-                break;
-        }
-        return (*digest != NULL);
-}
-
-/*
- * Convert a BIGNUM to the representation that /dev/crypto needs.
- * Upon completion of use, the caller is responsible for freeing
- * crp->crp_p.
- */
-static int
-bn2crparam(const BIGNUM *a, struct crparam *crp)
-{
-        int i, j, k;
-        ssize_t bytes, bits;
-        u_char *b;
-
-        crp->crp_p = NULL;
-        crp->crp_nbits = 0;
-
-        bits = BN_num_bits(a);
-        bytes = (bits + 7) / 8;
-
-        b = malloc(bytes);
-        if (b == NULL)
-                return (1);
-
-        crp->crp_p = b;
-        crp->crp_nbits = bits;
-
-        for (i = 0, j = 0; i < a->top; i++) {
-                for (k = 0; k < BN_BITS2 / 8; k++) {
-                        if ((j + k) >= bytes)
-                                return (0);
-                        b[j + k] = a->d[i] >> (k * 8);
-                }
-                j += BN_BITS2 / 8;
-        }
-        return (0);
-}
-
-/* Convert a /dev/crypto parameter to a BIGNUM */
-static int
-crparam2bn(struct crparam *crp, BIGNUM *a)
-{
-        u_int8_t *pd;
-        int i, bytes;
-
-        bytes = (crp->crp_nbits + 7) / 8;
-
-        if (bytes == 0)
-                return (-1);
-
-        if ((pd = (u_int8_t *) malloc(bytes)) == NULL)
-                return (-1);
-
-        for (i = 0; i < bytes; i++)
-                pd[i] = crp->crp_p[bytes - i - 1];
-
-        BN_bin2bn(pd, bytes, a);
-        free(pd);
-
-        return (0);
-}
-
-static void
-zapparams(struct crypt_kop *kop)
-{
-        int i;
-
-        for (i = 0; i <= kop->crk_iparams + kop->crk_oparams; i++) {
-                if (kop->crk_param[i].crp_p)
-                        free(kop->crk_param[i].crp_p);
-                kop->crk_param[i].crp_p = NULL;
-                kop->crk_param[i].crp_nbits = 0;
-        }
-}
-
-static int
-cryptodev_asym(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen, BIGNUM *s)
-{
-        int fd, ret = -1;
-
-        if ((fd = get_asym_dev_crypto()) < 0)
-                return (ret);
-
-        if (r) {
-                kop->crk_param[kop->crk_iparams].crp_p = calloc(rlen, sizeof(char));
-                kop->crk_param[kop->crk_iparams].crp_nbits = rlen * 8;
-                kop->crk_oparams++;
-        }
-        if (s) {
-                kop->crk_param[kop->crk_iparams+1].crp_p = calloc(slen, sizeof(char));
-                kop->crk_param[kop->crk_iparams+1].crp_nbits = slen * 8;
-                kop->crk_oparams++;
-        }
-
-        if (ioctl(fd, CIOCKEY, kop) == 0) {
-                if (r)
-                        crparam2bn(&kop->crk_param[kop->crk_iparams], r);
-                if (s)
-                        crparam2bn(&kop->crk_param[kop->crk_iparams+1], s);
-                ret = 0;
-        }
-
-        return (ret);
-}
-
-static int
-cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont)
-{
-        struct crypt_kop kop;
-        int ret = 1;
-
-        /* Currently, we know we can do mod exp iff we can do any
-         * asymmetric operations at all.
-         */
-        if (cryptodev_asymfeat == 0) {
-                ret = BN_mod_exp(r, a, p, m, ctx);
-                return (ret);
-        }
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_MOD_EXP;
-
-        /* inputs: a^p % m */
-        if (bn2crparam(a, &kop.crk_param[0]))
-                goto err;
-        if (bn2crparam(p, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(m, &kop.crk_param[2]))
-                goto err;
-        kop.crk_iparams = 3;
-
-        if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL) == -1) {
-                const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-                ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
-        }
-err:
-        zapparams(&kop);
-        return (ret);
-}
-
-static int
-cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
-{
-        int r;
-        BN_CTX *ctx;
-
-        ctx = BN_CTX_new();
-        r = cryptodev_bn_mod_exp(r0, I, rsa->d, rsa->n, ctx, NULL);
-        BN_CTX_free(ctx);
-        return (r);
-}
-
-static int
-cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
-{
-        struct crypt_kop kop;
-        int ret = 1;
-
-        if (!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp) {
-                /* XXX 0 means failure?? */
-                return (0);
-        }
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_MOD_EXP_CRT;
-        /* inputs: rsa->p rsa->q I rsa->dmp1 rsa->dmq1 rsa->iqmp */
-        if (bn2crparam(rsa->p, &kop.crk_param[0]))
-                goto err;
-        if (bn2crparam(rsa->q, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(I, &kop.crk_param[2]))
-                goto err;
-        if (bn2crparam(rsa->dmp1, &kop.crk_param[3]))
-                goto err;
-        if (bn2crparam(rsa->dmq1, &kop.crk_param[4]))
-                goto err;
-        if (bn2crparam(rsa->iqmp, &kop.crk_param[5]))
-                goto err;
-        kop.crk_iparams = 6;
-
-        if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL) == -1) {
-                const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-                ret = (*meth->rsa_mod_exp)(r0, I, rsa);
-        }
-err:
-        zapparams(&kop);
-        return (ret);
-}
-
-static RSA_METHOD cryptodev_rsa = {
-        "cryptodev RSA method",
-        NULL,                           /* rsa_pub_enc */
-        NULL,                           /* rsa_pub_dec */
-        NULL,                           /* rsa_priv_enc */
-        NULL,                           /* rsa_priv_dec */
-        NULL,
-        NULL,
-        NULL,                           /* init */
-        NULL,                           /* finish */
-        0,                              /* flags */
-        NULL,                           /* app_data */
-        NULL,                           /* rsa_sign */
-        NULL                            /* rsa_verify */
-};
-
-static int
-cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
-{
-        return (cryptodev_bn_mod_exp(r, a, p, m, ctx, m_ctx));
-}
-
-static int
-cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
-    BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, BIGNUM *p,
-    BN_CTX *ctx, BN_MONT_CTX *mont)
-{
-        BIGNUM t2;
-        int ret = 0;
-
-        BN_init(&t2);
-
-        /* v = ( g^u1 * y^u2 mod p ) mod q */
-        /* let t1 = g ^ u1 mod p */
-        ret = 0;
-
-        if (!dsa->meth->bn_mod_exp(dsa,t1,dsa->g,u1,dsa->p,ctx,mont))
-                goto err;
-
-        /* let t2 = y ^ u2 mod p */
-        if (!dsa->meth->bn_mod_exp(dsa,&t2,dsa->pub_key,u2,dsa->p,ctx,mont))
-                goto err;
-        /* let u1 = t1 * t2 mod p */
-        if (!BN_mod_mul(u1,t1,&t2,dsa->p,ctx))
-                goto err;
-
-        BN_copy(t1,u1);
-
-        ret = 1;
-err:
-        BN_free(&t2);
-        return(ret);
-}
-
-static DSA_SIG *
-cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
-{
-        struct crypt_kop kop;
-        BIGNUM *r = NULL, *s = NULL;
-        DSA_SIG *dsaret = NULL;
-
-        if ((r = BN_new()) == NULL)
-                goto err;
-        if ((s = BN_new()) == NULL) {
-                BN_free(r);
-                goto err;
-        }
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_DSA_SIGN;
-
-        /* inputs: dgst dsa->p dsa->q dsa->g dsa->priv_key */
-        kop.crk_param[0].crp_p = (caddr_t)dgst;
-        kop.crk_param[0].crp_nbits = dlen * 8;
-        if (bn2crparam(dsa->p, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(dsa->q, &kop.crk_param[2]))
-                goto err;
-        if (bn2crparam(dsa->g, &kop.crk_param[3]))
-                goto err;
-        if (bn2crparam(dsa->priv_key, &kop.crk_param[4]))
-                goto err;
-        kop.crk_iparams = 5;
-
-        if (cryptodev_asym(&kop, BN_num_bytes(dsa->q), r,
-            BN_num_bytes(dsa->q), s) == 0) {
-                dsaret = DSA_SIG_new();
-                dsaret->r = r;
-                dsaret->s = s;
-        } else {
-                const DSA_METHOD *meth = DSA_OpenSSL();
-                BN_free(r);
-                BN_free(s);
-                dsaret = (meth->dsa_do_sign)(dgst, dlen, dsa);
-        }
-err:
-        kop.crk_param[0].crp_p = NULL;
-        zapparams(&kop);
-        return (dsaret);
-}
-
-static int
-cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
-    DSA_SIG *sig, DSA *dsa)
-{
-        struct crypt_kop kop;
-        int dsaret = 1;
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_DSA_VERIFY;
-
-        /* inputs: dgst dsa->p dsa->q dsa->g dsa->pub_key sig->r sig->s */
-        kop.crk_param[0].crp_p = (caddr_t)dgst;
-        kop.crk_param[0].crp_nbits = dlen * 8;
-        if (bn2crparam(dsa->p, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(dsa->q, &kop.crk_param[2]))
-                goto err;
-        if (bn2crparam(dsa->g, &kop.crk_param[3]))
-                goto err;
-        if (bn2crparam(dsa->pub_key, &kop.crk_param[4]))
-                goto err;
-        if (bn2crparam(sig->r, &kop.crk_param[5]))
-                goto err;
-        if (bn2crparam(sig->s, &kop.crk_param[6]))
-                goto err;
-        kop.crk_iparams = 7;
-
-        if (cryptodev_asym(&kop, 0, NULL, 0, NULL) == 0) {
-                dsaret = kop.crk_status;
-        } else {
-                const DSA_METHOD *meth = DSA_OpenSSL();
-
-                dsaret = (meth->dsa_do_verify)(dgst, dlen, sig, dsa);
-        }
-err:
-        kop.crk_param[0].crp_p = NULL;
-        zapparams(&kop);
-        return (dsaret);
-}
-
-static DSA_METHOD cryptodev_dsa = {
-        "cryptodev DSA method",
-        NULL,
-        NULL,                           /* dsa_sign_setup */
-        NULL,
-        NULL,                           /* dsa_mod_exp */
-        NULL,
-        NULL,                           /* init */
-        NULL,                           /* finish */
-        0,      /* flags */
-        NULL    /* app_data */
-};
-
-static int
-cryptodev_mod_exp_dh(const DH *dh, BIGNUM *r, const BIGNUM *a,
-    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-    BN_MONT_CTX *m_ctx)
-{
-        return (cryptodev_bn_mod_exp(r, a, p, m, ctx, m_ctx));
-}
-
-static int
-cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
-{
-        struct crypt_kop kop;
-        int dhret = 1;
-        int fd, keylen;
-
-        if ((fd = get_asym_dev_crypto()) < 0) {
-                const DH_METHOD *meth = DH_OpenSSL();
-
-                return ((meth->compute_key)(key, pub_key, dh));
-        }
-
-        keylen = BN_num_bits(dh->p);
-
-        memset(&kop, 0, sizeof kop);
-        kop.crk_op = CRK_DH_COMPUTE_KEY;
-
-        /* inputs: dh->priv_key pub_key dh->p key */
-        if (bn2crparam(dh->priv_key, &kop.crk_param[0]))
-                goto err;
-        if (bn2crparam(pub_key, &kop.crk_param[1]))
-                goto err;
-        if (bn2crparam(dh->p, &kop.crk_param[2]))
-                goto err;
-        kop.crk_iparams = 3;
-
-        kop.crk_param[3].crp_p = key;
-        kop.crk_param[3].crp_nbits = keylen * 8;
-        kop.crk_oparams = 1;
-
-        if (ioctl(fd, CIOCKEY, &kop) == -1) {
-                const DH_METHOD *meth = DH_OpenSSL();
-
-                dhret = (meth->compute_key)(key, pub_key, dh);
-        }
-err:
-        kop.crk_param[3].crp_p = NULL;
-        zapparams(&kop);
-        return (dhret);
-}
-
-static DH_METHOD cryptodev_dh = {
-        "cryptodev DH method",
-        NULL,                           /* cryptodev_dh_generate_key */
-        NULL,
-        NULL,
-        NULL,
-        NULL,
-        0,      /* flags */
-        NULL    /* app_data */
-};
-
-/*
- * ctrl right now is just a wrapper that doesn't do much
- * but I expect we'll want some options soon.
- */
-static int
-cryptodev_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
-{
-#ifdef HAVE_SYSLOG_R
-        struct syslog_data sd = SYSLOG_DATA_INIT;
-#endif
-
-        switch (cmd) {
-        default:
-#ifdef HAVE_SYSLOG_R
-                syslog_r(LOG_ERR, &sd,
-                    "cryptodev_ctrl: unknown command %d", cmd);
-#else
-                syslog(LOG_ERR, "cryptodev_ctrl: unknown command %d", cmd);
-#endif
-                break;
-        }
-        return (1);
-}
-
-void
-ENGINE_load_cryptodev(void)
-{
-        ENGINE *engine = ENGINE_new();
-        int fd;
-
-        if (engine == NULL)
-                return;
-        if ((fd = get_dev_crypto()) < 0) {
-                ENGINE_free(engine);
-                return;
-        }
-
-        /*
-         * find out what asymmetric crypto algorithms we support
-         */
-        if (ioctl(fd, CIOCASYMFEAT, &cryptodev_asymfeat) == -1) {
-                close(fd);
-                ENGINE_free(engine);
-                return;
-        }
-        close(fd);
-
-        if (!ENGINE_set_id(engine, "cryptodev") ||
-            !ENGINE_set_name(engine, "BSD cryptodev engine") ||
-            !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) ||
-            !ENGINE_set_digests(engine, cryptodev_engine_digests) ||
-            !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) ||
-            !ENGINE_set_cmd_defns(engine, cryptodev_defns)) {
-                ENGINE_free(engine);
-                return;
-        }
-
-        if (ENGINE_set_RSA(engine, &cryptodev_rsa)) {
-                const RSA_METHOD *rsa_meth = RSA_PKCS1_SSLeay();
-
-                cryptodev_rsa.bn_mod_exp = rsa_meth->bn_mod_exp;
-                cryptodev_rsa.rsa_mod_exp = rsa_meth->rsa_mod_exp;
-                cryptodev_rsa.rsa_pub_enc = rsa_meth->rsa_pub_enc;
-                cryptodev_rsa.rsa_pub_dec = rsa_meth->rsa_pub_dec;
-                cryptodev_rsa.rsa_priv_enc = rsa_meth->rsa_priv_enc;
-                cryptodev_rsa.rsa_priv_dec = rsa_meth->rsa_priv_dec;
-                if (cryptodev_asymfeat & CRF_MOD_EXP) {
-                        cryptodev_rsa.bn_mod_exp = cryptodev_bn_mod_exp;
-                        if (cryptodev_asymfeat & CRF_MOD_EXP_CRT)
-                                cryptodev_rsa.rsa_mod_exp =
-                                    cryptodev_rsa_mod_exp;
-                        else
-                                cryptodev_rsa.rsa_mod_exp =
-                                    cryptodev_rsa_nocrt_mod_exp;
-                }
-        }
-
-        if (ENGINE_set_DSA(engine, &cryptodev_dsa)) {
-                const DSA_METHOD *meth = DSA_OpenSSL();
-
-                memcpy(&cryptodev_dsa, meth, sizeof(DSA_METHOD));
-                if (cryptodev_asymfeat & CRF_DSA_SIGN)
-                        cryptodev_dsa.dsa_do_sign = cryptodev_dsa_do_sign;
-                if (cryptodev_asymfeat & CRF_MOD_EXP) {
-                        cryptodev_dsa.bn_mod_exp = cryptodev_dsa_bn_mod_exp;
-                        cryptodev_dsa.dsa_mod_exp = cryptodev_dsa_dsa_mod_exp;
-                }
-                if (cryptodev_asymfeat & CRF_DSA_VERIFY)
-                        cryptodev_dsa.dsa_do_verify = cryptodev_dsa_verify;
-        }
-
-        if (ENGINE_set_DH(engine, &cryptodev_dh)){
-                const DH_METHOD *dh_meth = DH_OpenSSL();
-
-                cryptodev_dh.generate_key = dh_meth->generate_key;
-                cryptodev_dh.compute_key = dh_meth->compute_key;
-                cryptodev_dh.bn_mod_exp = dh_meth->bn_mod_exp;
-                if (cryptodev_asymfeat & CRF_MOD_EXP) {
-                        cryptodev_dh.bn_mod_exp = cryptodev_mod_exp_dh;
-                        if (cryptodev_asymfeat & CRF_DH_COMPUTE_KEY)
-                                cryptodev_dh.compute_key =
-                                    cryptodev_dh_compute_key;
-                }
-        }
-
-        ENGINE_add(engine);
-        ENGINE_free(engine);
-        ERR_clear_error();
-}
-
-#endif /* HAVE_CRYPTODEV */
diff --git a/src/lib/libssl/src/crypto/engine/tb_ecdh.c b/src/lib/libssl/src/crypto/engine/tb_ecdh.c
new file mode 100644
index 0000000000..c8ec7812c5
--- /dev/null
+++ b/src/lib/libssl/src/crypto/engine/tb_ecdh.c
@@ -0,0 +1,133 @@
+/* crypto/engine/tb_ecdh.c */
+/* ====================================================================
+ * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+ *
+ * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
+ * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
+ * to the OpenSSL project.
+ *
+ * The ECC Code is licensed pursuant to the OpenSSL open source
+ * license provided below.
+ *
+ * The ECDH engine software is originally written by Nils Gura and
+ * Douglas Stebila of Sun Microsystems Laboratories.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 2000-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "eng_int.h"
+
+/* If this symbol is defined then ENGINE_get_default_ECDH(), the function that is
+ * used by ECDH to hook in implementation code and cache defaults (etc), will
+ * display brief debugging summaries to stderr with the 'nid'. */
+/* #define ENGINE_ECDH_DEBUG */
+
+static ENGINE_TABLE *ecdh_table = NULL;
+static const int dummy_nid = 1;
+
+void ENGINE_unregister_ECDH(ENGINE *e)
+        {
+        engine_table_unregister(&ecdh_table, e);
+        }
+
+static void engine_unregister_all_ECDH(void)
+        {
+        engine_table_cleanup(&ecdh_table);
+        }
+
+int ENGINE_register_ECDH(ENGINE *e)
+        {
+        if(e->ecdh_meth)
+                return engine_table_register(&ecdh_table,
+                                engine_unregister_all_ECDH, e, &dummy_nid, 1, 0);
+        return 1;
+        }
+
+void ENGINE_register_all_ECDH()
+        {
+        ENGINE *e;
+
+        for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
+                ENGINE_register_ECDH(e);
+        }
+
+int ENGINE_set_default_ECDH(ENGINE *e)
+        {
+        if(e->ecdh_meth)
+                return engine_table_register(&ecdh_table,
+                                engine_unregister_all_ECDH, e, &dummy_nid, 1, 1);
+        return 1;
+        }
+
+/* Exposed API function to get a functional reference from the implementation
+ * table (ie. try to get a functional reference from the tabled structural
+ * references). */
+ENGINE *ENGINE_get_default_ECDH(void)
+        {
+        return engine_table_select(&ecdh_table, dummy_nid);
+        }
+
+/* Obtains an ECDH implementation from an ENGINE functional reference */
+const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e)
+        {
+        return e->ecdh_meth;
+        }
+
+/* Sets an ECDH implementation in an ENGINE structure */
+int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth)
+        {
+        e->ecdh_meth = ecdh_meth;
+        return 1;
+        }
diff --git a/src/lib/libssl/src/crypto/engine/tb_ecdsa.c b/src/lib/libssl/src/crypto/engine/tb_ecdsa.c
new file mode 100644
index 0000000000..005ecb622c
--- /dev/null
+++ b/src/lib/libssl/src/crypto/engine/tb_ecdsa.c
@@ -0,0 +1,118 @@
+/* ====================================================================
+ * Copyright (c) 2000-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "eng_int.h"
+
+/* If this symbol is defined then ENGINE_get_default_ECDSA(), the function that is
+ * used by ECDSA to hook in implementation code and cache defaults (etc), will
+ * display brief debugging summaries to stderr with the 'nid'. */
+/* #define ENGINE_ECDSA_DEBUG */
+
+static ENGINE_TABLE *ecdsa_table = NULL;
+static const int dummy_nid = 1;
+
+void ENGINE_unregister_ECDSA(ENGINE *e)
+        {
+        engine_table_unregister(&ecdsa_table, e);
+        }
+
+static void engine_unregister_all_ECDSA(void)
+        {
+        engine_table_cleanup(&ecdsa_table);
+        }
+
+int ENGINE_register_ECDSA(ENGINE *e)
+        {
+        if(e->ecdsa_meth)
+                return engine_table_register(&ecdsa_table,
+                                engine_unregister_all_ECDSA, e, &dummy_nid, 1, 0);
+        return 1;
+        }
+
+void ENGINE_register_all_ECDSA()
+        {
+        ENGINE *e;
+
+        for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
+                ENGINE_register_ECDSA(e);
+        }
+
+int ENGINE_set_default_ECDSA(ENGINE *e)
+        {
+        if(e->ecdsa_meth)
+                return engine_table_register(&ecdsa_table,
+                                engine_unregister_all_ECDSA, e, &dummy_nid, 1, 1);
+        return 1;
+        }
+
+/* Exposed API function to get a functional reference from the implementation
+ * table (ie. try to get a functional reference from the tabled structural
+ * references). */
+ENGINE *ENGINE_get_default_ECDSA(void)
+        {
+        return engine_table_select(&ecdsa_table, dummy_nid);
+        }
+
+/* Obtains an ECDSA implementation from an ENGINE functional reference */
+const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e)
+        {
+        return e->ecdsa_meth;
+        }
+
+/* Sets an ECDSA implementation in an ENGINE structure */
+int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth)
+        {
+        e->ecdsa_meth = ecdsa_meth;
+        return 1;
+        }
diff --git a/src/lib/libssl/src/crypto/engine/tb_store.c b/src/lib/libssl/src/crypto/engine/tb_store.c
new file mode 100644
index 0000000000..8cc435c935
--- /dev/null
+++ b/src/lib/libssl/src/crypto/engine/tb_store.c
@@ -0,0 +1,123 @@
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "eng_int.h"
+
+/* If this symbol is defined then ENGINE_get_default_STORE(), the function that is
+ * used by STORE to hook in implementation code and cache defaults (etc), will
+ * display brief debugging summaries to stderr with the 'nid'. */
+/* #define ENGINE_STORE_DEBUG */
+
+static ENGINE_TABLE *store_table = NULL;
+static const int dummy_nid = 1;
+
+void ENGINE_unregister_STORE(ENGINE *e)
+        {
+        engine_table_unregister(&store_table, e);
+        }
+
+static void engine_unregister_all_STORE(void)
+        {
+        engine_table_cleanup(&store_table);
+        }
+
+int ENGINE_register_STORE(ENGINE *e)
+        {
+        if(e->store_meth)
+                return engine_table_register(&store_table,
+                                engine_unregister_all_STORE, e, &dummy_nid, 1, 0);
+        return 1;
+        }
+
+void ENGINE_register_all_STORE()
+        {
+        ENGINE *e;
+
+        for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
+                ENGINE_register_STORE(e);
+        }
+
+/* The following two functions are removed because they're useless. */
+#if 0
+int ENGINE_set_default_STORE(ENGINE *e)
+        {
+        if(e->store_meth)
+                return engine_table_register(&store_table,
+                                engine_unregister_all_STORE, e, &dummy_nid, 1, 1);
+        return 1;
+        }
+#endif
+
+#if 0
+/* Exposed API function to get a functional reference from the implementation
+ * table (ie. try to get a functional reference from the tabled structural
+ * references). */
+ENGINE *ENGINE_get_default_STORE(void)
+        {
+        return engine_table_select(&store_table, dummy_nid);
+        }
+#endif
+
+/* Obtains an STORE implementation from an ENGINE functional reference */
+const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e)
+        {
+        return e->store_meth;
+        }
+
+/* Sets an STORE implementation in an ENGINE structure */
+int ENGINE_set_STORE(ENGINE *e, const STORE_METHOD *store_meth)
+        {
+        e->store_meth = store_meth;
+        return 1;
+        }
diff --git a/src/lib/libssl/src/crypto/evp/e_camellia.c b/src/lib/libssl/src/crypto/evp/e_camellia.c
new file mode 100644
index 0000000000..a7b40d1c60
--- /dev/null
+++ b/src/lib/libssl/src/crypto/evp/e_camellia.c
@@ -0,0 +1,131 @@
+/* crypto/evp/e_camellia.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_CAMELLIA
+#include <openssl/evp.h>
+#include <openssl/err.h>
+#include <string.h>
+#include <assert.h>
+#include <openssl/camellia.h>
+#include "evp_locl.h"
+
+static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+        const unsigned char *iv, int enc);
+
+/* Camellia subkey Structure */
+typedef struct
+        {
+        CAMELLIA_KEY ks;
+        } EVP_CAMELLIA_KEY;
+
+/* Attribute operation for Camellia */
+#define data(ctx)       EVP_C_DATA(EVP_CAMELLIA_KEY,ctx)
+
+IMPLEMENT_BLOCK_CIPHER(camellia_128, ks, Camellia, EVP_CAMELLIA_KEY,
+        NID_camellia_128, 16, 16, 16, 128,
+        0, camellia_init_key, NULL, 
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        NULL)
+IMPLEMENT_BLOCK_CIPHER(camellia_192, ks, Camellia, EVP_CAMELLIA_KEY,
+        NID_camellia_192, 16, 24, 16, 128,
+        0, camellia_init_key, NULL, 
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        NULL)
+IMPLEMENT_BLOCK_CIPHER(camellia_256, ks, Camellia, EVP_CAMELLIA_KEY,
+        NID_camellia_256, 16, 32, 16, 128,
+        0, camellia_init_key, NULL, 
+        EVP_CIPHER_set_asn1_iv,
+        EVP_CIPHER_get_asn1_iv,
+        NULL)
+
+#define IMPLEMENT_CAMELLIA_CFBR(ksize,cbits)    IMPLEMENT_CFBR(camellia,Camellia,EVP_CAMELLIA_KEY,ks,ksize,cbits,16)
+
+IMPLEMENT_CAMELLIA_CFBR(128,1)
+IMPLEMENT_CAMELLIA_CFBR(192,1)
+IMPLEMENT_CAMELLIA_CFBR(256,1)
+
+IMPLEMENT_CAMELLIA_CFBR(128,8)
+IMPLEMENT_CAMELLIA_CFBR(192,8)
+IMPLEMENT_CAMELLIA_CFBR(256,8)
+
+
+
+/* The subkey for Camellia is generated. */ 
+static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+        const unsigned char *iv, int enc)
+        {
+        int ret;
+
+        ret=Camellia_set_key(key, ctx->key_len * 8, ctx->cipher_data);
+
+        if(ret < 0)
+                {
+                EVPerr(EVP_F_CAMELLIA_INIT_KEY,EVP_R_CAMELLIA_KEY_SETUP_FAILED);
+                return 0;
+                }
+
+        return 1;
+        }
+
+#else
+
+# ifdef PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_sha1_selftest.c b/src/lib/libssl/src/crypto/evp/e_seed.c
index 73a65cdc06..8c1ec0d43a 100644
--- a/src/lib/libssl/src/fips-1.0/sha/fips_sha1_selftest.c
+++ b/src/lib/libssl/src/crypto/evp/e_seed.c
@@ -1,5 +1,6 @@
+/* crypto/evp/e_seed.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2007 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
@@ -44,53 +45,39 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
  *
  */
 
-#include <string.h>
+#include <openssl/opensslconf.h>
+#include <openssl/evp.h>
 #include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/fips_sha.h>
-
-#ifdef OPENSSL_FIPS
-static char test[][60]=
-    {
-    "",
-    "abc",
-    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-    };
+#include <string.h>
+#include <assert.h>
+#ifndef OPENSSL_NO_SEED
+#include <openssl/seed.h>
+#include "evp_locl.h"
 
-static const unsigned char ret[][SHA_DIGEST_LENGTH]=
-    {
-    { 0xda,0x39,0xa3,0xee,0x5e,0x6b,0x4b,0x0d,0x32,0x55,
-      0xbf,0xef,0x95,0x60,0x18,0x90,0xaf,0xd8,0x07,0x09 },
-    { 0xa9,0x99,0x3e,0x36,0x47,0x06,0x81,0x6a,0xba,0x3e,
-      0x25,0x71,0x78,0x50,0xc2,0x6c,0x9c,0xd0,0xd8,0x9d },
-    { 0x84,0x98,0x3e,0x44,0x1c,0x3b,0xd2,0x6e,0xba,0xae,
-      0x4a,0xa1,0xf9,0x51,0x29,0xe5,0xe5,0x46,0x70,0xf1 },
-    };
+static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc);
 
-void FIPS_corrupt_sha1()
-    {
-    test[2][0]++;
-    }
+typedef struct
+        {
+        SEED_KEY_SCHEDULE ks;
+        } EVP_SEED_KEY;
 
-int FIPS_selftest_sha1()
-    {
-    int n;
+IMPLEMENT_BLOCK_CIPHER(seed, ks, SEED, EVP_SEED_KEY, NID_seed,
+                       16, 16, 16, 128,
+                       0, seed_init_key, 0, 0, 0, 0)
 
-    for(n=0 ; n<sizeof(test)/sizeof(test[0]) ; ++n)
+static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+                         const unsigned char *iv, int enc)
         {
-        unsigned char md[SHA_DIGEST_LENGTH];
-
-        SHA1((unsigned char*)test[n],strlen(test[n]),md);
-        if(memcmp(md,ret[n],sizeof md))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_SHA,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
+        SEED_set_key(key, ctx->cipher_data);
+        return 1;
         }
-    return 1;
-    }
 
 #endif
diff --git a/src/lib/libssl/src/crypto/evp/m_ecdsa.c b/src/lib/libssl/src/crypto/evp/m_ecdsa.c
new file mode 100644
index 0000000000..fad270faca
--- /dev/null
+++ b/src/lib/libssl/src/crypto/evp/m_ecdsa.c
@@ -0,0 +1,148 @@
+/* crypto/evp/m_ecdsa.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+
+#ifndef OPENSSL_NO_SHA
+static int init(EVP_MD_CTX *ctx)
+        { return SHA1_Init(ctx->md_data); }
+
+static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
+        { return SHA1_Update(ctx->md_data,data,count); }
+
+static int final(EVP_MD_CTX *ctx,unsigned char *md)
+        { return SHA1_Final(md,ctx->md_data); }
+
+static const EVP_MD ecdsa_md=
+        {
+        NID_ecdsa_with_SHA1,
+        NID_ecdsa_with_SHA1,
+        SHA_DIGEST_LENGTH,
+        0,
+        init,
+        update,
+        final,
+        NULL,
+        NULL,
+        EVP_PKEY_ECDSA_method,
+        SHA_CBLOCK,
+        sizeof(EVP_MD *)+sizeof(SHA_CTX),
+        };
+
+const EVP_MD *EVP_ecdsa(void)
+        {
+        return(&ecdsa_md);
+        }
+#endif
diff --git a/src/lib/libssl/src/crypto/ia64cpuid.S b/src/lib/libssl/src/crypto/ia64cpuid.S
new file mode 100644
index 0000000000..04fbb3439e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/ia64cpuid.S
@@ -0,0 +1,121 @@
+// Works on all IA-64 platforms: Linux, HP-UX, Win64i...
+// On Win64i compile with ias.exe.
+.text
+.global OPENSSL_rdtsc#
+.proc   OPENSSL_rdtsc#
+OPENSSL_rdtsc:
+{ .mib; mov                     r8=ar.itc
+        br.ret.sptk.many        b0              };;
+.endp   OPENSSL_rdtsc#
+
+.global OPENSSL_atomic_add#
+.proc   OPENSSL_atomic_add#
+.align  32
+OPENSSL_atomic_add:
+{ .mii; ld4             r2=[r32]
+        nop.i           0
+        nop.i           0               };;
+.Lspin:
+{ .mii; mov             ar.ccv=r2
+        add             r8=r2,r33
+        mov             r3=r2           };;
+{ .mmi; mf
+        cmpxchg4.acq    r2=[r32],r8,ar.ccv
+        nop.i           0               };;
+{ .mib; cmp.ne          p6,p0=r2,r3
+        nop.i           0
+(p6)    br.dpnt         .Lspin          };;
+{ .mib; nop.m           0
+        sxt4            r8=r8
+        br.ret.sptk.many        b0      };;
+.endp   OPENSSL_atomic_add#
+
+// Returns a structure comprising pointer to the top of stack of
+// the caller and pointer beyond backing storage for the current
+// register frame. The latter is required, because it might be
+// insufficient to wipe backing storage for the current frame
+// (as this procedure does), one might have to go further, toward
+// higher addresses to reach for whole "retroactively" saved
+// context...
+.global OPENSSL_wipe_cpu#
+.proc   OPENSSL_wipe_cpu#
+.align  32
+OPENSSL_wipe_cpu:
+        .prologue
+        .fframe 0
+        .save   ar.pfs,r2
+        .save   ar.lc,r3
+{ .mib; alloc           r2=ar.pfs,0,96,0,96
+        mov             r3=ar.lc
+        brp.loop.imp    .L_wipe_top,.L_wipe_end-16
+                                        };;
+{ .mii; mov             r9=ar.bsp
+        mov             r8=pr
+        mov             ar.lc=96        };;
+        .body
+{ .mii; add             r9=96*8-8,r9
+        mov             ar.ec=1         };;
+
+// One can sweep double as fast, but then we can't quarantee
+// that backing storage is wiped...
+.L_wipe_top:
+{ .mfi; st8             [r9]=r0,-8
+        mov             f127=f0
+        mov             r127=r0         }
+{ .mfb; nop.m           0
+        nop.f           0
+        br.ctop.sptk    .L_wipe_top     };;
+.L_wipe_end:
+
+{ .mfi; mov             r11=r0
+        mov             f6=f0
+        mov             r14=r0          }
+{ .mfi; mov             r15=r0
+        mov             f7=f0
+        mov             r16=r0          }
+{ .mfi; mov             r17=r0
+        mov             f8=f0
+        mov             r18=r0          }
+{ .mfi; mov             r19=r0
+        mov             f9=f0
+        mov             r20=r0          }
+{ .mfi; mov             r21=r0
+        mov             f10=f0
+        mov             r22=r0          }
+{ .mfi; mov             r23=r0
+        mov             f11=f0
+        mov             r24=r0          }
+{ .mfi; mov             r25=r0
+        mov             f12=f0
+        mov             r26=r0          }
+{ .mfi; mov             r27=r0
+        mov             f13=f0
+        mov             r28=r0          }
+{ .mfi; mov             r29=r0
+        mov             f14=f0
+        mov             r30=r0          }
+{ .mfi; mov             r31=r0
+        mov             f15=f0
+        nop.i           0               }
+{ .mfi; mov             f16=f0          }
+{ .mfi; mov             f17=f0          }
+{ .mfi; mov             f18=f0          }
+{ .mfi; mov             f19=f0          }
+{ .mfi; mov             f20=f0          }
+{ .mfi; mov             f21=f0          }
+{ .mfi; mov             f22=f0          }
+{ .mfi; mov             f23=f0          }
+{ .mfi; mov             f24=f0          }
+{ .mfi; mov             f25=f0          }
+{ .mfi; mov             f26=f0          }
+{ .mfi; mov             f27=f0          }
+{ .mfi; mov             f28=f0          }
+{ .mfi; mov             f29=f0          }
+{ .mfi; mov             f30=f0          }
+{ .mfi; add             r9=96*8+8,r9
+        mov             f31=f0
+        mov             pr=r8,0x1ffff   }
+{ .mib; mov             r8=sp
+        mov             ar.lc=r3
+        br.ret.sptk     b0              };;
+.endp   OPENSSL_wipe_cpu#
diff --git a/src/lib/libssl/src/crypto/md5/asm/md5-sparcv9.S b/src/lib/libssl/src/crypto/md5/asm/md5-sparcv9.S
deleted file mode 100644
index db45aa4c97..0000000000
--- a/src/lib/libssl/src/crypto/md5/asm/md5-sparcv9.S
+++ /dev/null
@@ -1,1031 +0,0 @@
-.ident  "md5-sparcv9.S, Version 1.0"
-.ident  "SPARC V9 ISA artwork by Andy Polyakov <appro@fy.chalmers.se>"
-.file   "md5-sparcv9.S"
-
-/*
- * ====================================================================
- * Copyright (c) 1999 Andy Polyakov <appro@fy.chalmers.se>.
- *
- * Rights for redistribution and usage in source and binary forms are
- * granted as long as above copyright notices are retained. Warranty
- * of any kind is (of course:-) disclaimed.
- * ====================================================================
- */
-
-/*
- * This is my modest contribution to OpenSSL project (see
- * http://www.openssl.org/ for more information about it) and is an
- * assembler implementation of MD5 block hash function. I've hand-coded
- * this for the sole reason to reach UltraSPARC-specific "load in
- * little-endian byte order" instruction. This gives up to 15%
- * performance improvement for cases when input message is aligned at
- * 32 bits boundary. The module was tested under both 32 *and* 64 bit
- * kernels. For updates see http://fy.chalmers.se/~appro/hpe/.
- *
- * To compile with SC4.x/SC5.x:
- *
- *      cc -xarch=v[9|8plus] -DOPENSSL_SYSNAME_ULTRASPARC -DMD5_BLOCK_DATA_ORDER \
- *              -c md5-sparcv9.S
- *
- * and with gcc:
- *
- *      gcc -mcpu=ultrasparc -DOPENSSL_SYSNAME_ULTRASPARC -DMD5_BLOCK_DATA_ORDER \
- *              -c md5-sparcv9.S
- *
- * or if above fails (it does if you have gas):
- *
- *      gcc -E -DOPENSSL_SYSNAMEULTRASPARC -DMD5_BLOCK_DATA_ORDER md5_block.sparc.S | \
- *              as -xarch=v8plus /dev/fd/0 -o md5-sparcv9.o
- */
-
-#include <openssl/e_os2.h>
-
-#define A       %o0
-#define B       %o1
-#define C       %o2
-#define D       %o3
-#define T1      %o4
-#define T2      %o5
-
-#define R0      %l0
-#define R1      %l1
-#define R2      %l2
-#define R3      %l3
-#define R4      %l4
-#define R5      %l5
-#define R6      %l6
-#define R7      %l7
-#define R8      %i3
-#define R9      %i4
-#define R10     %i5
-#define R11     %g1
-#define R12     %g2
-#define R13     %g3
-#define RX      %g4
-
-#define Aptr    %i0+0
-#define Bptr    %i0+4
-#define Cptr    %i0+8
-#define Dptr    %i0+12
-
-#define Aval    R5      /* those not used at the end of the last round */
-#define Bval    R6
-#define Cval    R7
-#define Dval    R8
-
-#if defined(MD5_BLOCK_DATA_ORDER)
-# if defined(OPENSSL_SYSNAME_ULTRASPARC)
-#  define       LOAD                    lda
-#  define       X(i)                    [%i1+i*4]%asi
-#  define       md5_block               md5_block_asm_data_order_aligned
-#  define       ASI_PRIMARY_LITTLE      0x88
-# else
-#  error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!"
-# endif
-#else
-# define        LOAD                    ld
-# define        X(i)                    [%i1+i*4]
-# define        md5_block               md5_block_asm_host_order
-#endif
-
-.section        ".text",#alloc,#execinstr
-
-#if defined(__SUNPRO_C) && defined(__sparcv9)
-  /* They've said -xarch=v9 at command line */
-  .register     %g2,#scratch
-  .register     %g3,#scratch
-# define        FRAME   -192
-#elif defined(__GNUC__) && defined(__arch64__)
-  /* They've said -m64 at command line */
-  .register     %g2,#scratch
-  .register     %g3,#scratch
-# define        FRAME   -192
-#else
-# define        FRAME   -96
-#endif
-
-.align  32
-
-.global md5_block
-md5_block:
-        save    %sp,FRAME,%sp
-
-        ld      [Dptr],D
-        ld      [Cptr],C
-        ld      [Bptr],B
-        ld      [Aptr],A
-#ifdef ASI_PRIMARY_LITTLE
-        rd      %asi,%o7        ! How dare I? Well, I just do:-)
-        wr      %g0,ASI_PRIMARY_LITTLE,%asi
-#endif
-        LOAD    X(0),R0
-
-.Lmd5_block_loop:
-
-!!!!!!!!Round 0
-
-        xor     C,D,T1
-        sethi   %hi(0xd76aa478),T2
-        and     T1,B,T1
-        or      T2,%lo(0xd76aa478),T2   !=
-        xor     T1,D,T1
-        add     T1,R0,T1
-        LOAD    X(1),R1
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,7,T2
-        srl     A,32-7,A
-        or      A,T2,A                  !=
-         xor     B,C,T1
-        add     A,B,A
-
-        sethi   %hi(0xe8c7b756),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0xe8c7b756),T2
-        xor     T1,C,T1
-        LOAD    X(2),R2
-        add     T1,R1,T1                !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,12,T2
-        srl     D,32-12,D               !=
-        or      D,T2,D
-         xor     A,B,T1
-        add     D,A,D
-
-        sethi   %hi(0x242070db),T2      !=
-        and     T1,D,T1
-        or      T2,%lo(0x242070db),T2
-        xor     T1,B,T1
-        add     T1,R2,T1                !=
-        LOAD    X(3),R3
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,17,T2                 !=
-        srl     C,32-17,C
-        or      C,T2,C
-         xor     D,A,T1
-        add     C,D,C                   !=
-
-        sethi   %hi(0xc1bdceee),T2
-        and     T1,C,T1
-        or      T2,%lo(0xc1bdceee),T2
-        xor     T1,A,T1                 !=
-        add     T1,R3,T1
-        LOAD    X(4),R4
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,22,T2
-        srl     B,32-22,B
-        or      B,T2,B
-         xor     C,D,T1                 !=
-        add     B,C,B
-
-        sethi   %hi(0xf57c0faf),T2
-        and     T1,B,T1
-        or      T2,%lo(0xf57c0faf),T2   !=
-        xor     T1,D,T1
-        add     T1,R4,T1
-        LOAD    X(5),R5
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,7,T2
-        srl     A,32-7,A
-        or      A,T2,A                  !=
-         xor     B,C,T1
-        add     A,B,A
-
-        sethi   %hi(0x4787c62a),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0x4787c62a),T2
-        xor     T1,C,T1
-        LOAD    X(6),R6
-        add     T1,R5,T1                !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,12,T2
-        srl     D,32-12,D               !=
-        or      D,T2,D
-         xor     A,B,T1
-        add     D,A,D
-
-        sethi   %hi(0xa8304613),T2      !=
-        and     T1,D,T1
-        or      T2,%lo(0xa8304613),T2
-        xor     T1,B,T1
-        add     T1,R6,T1                !=
-        LOAD    X(7),R7
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,17,T2                 !=
-        srl     C,32-17,C
-        or      C,T2,C
-         xor     D,A,T1
-        add     C,D,C                   !=
-
-        sethi   %hi(0xfd469501),T2
-        and     T1,C,T1
-        or      T2,%lo(0xfd469501),T2
-        xor     T1,A,T1                 !=
-        add     T1,R7,T1
-        LOAD    X(8),R8
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,22,T2
-        srl     B,32-22,B
-        or      B,T2,B
-         xor     C,D,T1                 !=
-        add     B,C,B
-
-        sethi   %hi(0x698098d8),T2
-        and     T1,B,T1
-        or      T2,%lo(0x698098d8),T2   !=
-        xor     T1,D,T1
-        add     T1,R8,T1
-        LOAD    X(9),R9
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,7,T2
-        srl     A,32-7,A
-        or      A,T2,A                  !=
-         xor     B,C,T1
-        add     A,B,A
-
-        sethi   %hi(0x8b44f7af),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0x8b44f7af),T2
-        xor     T1,C,T1
-        LOAD    X(10),R10
-        add     T1,R9,T1                !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,12,T2
-        srl     D,32-12,D               !=
-        or      D,T2,D
-         xor     A,B,T1
-        add     D,A,D
-
-        sethi   %hi(0xffff5bb1),T2      !=
-        and     T1,D,T1
-        or      T2,%lo(0xffff5bb1),T2
-        xor     T1,B,T1
-        add     T1,R10,T1               !=
-        LOAD    X(11),R11
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,17,T2                 !=
-        srl     C,32-17,C
-        or      C,T2,C
-         xor     D,A,T1
-        add     C,D,C                   !=
-
-        sethi   %hi(0x895cd7be),T2
-        and     T1,C,T1
-        or      T2,%lo(0x895cd7be),T2
-        xor     T1,A,T1                 !=
-        add     T1,R11,T1
-        LOAD    X(12),R12
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,22,T2
-        srl     B,32-22,B
-        or      B,T2,B
-         xor     C,D,T1                 !=
-        add     B,C,B
-
-        sethi   %hi(0x6b901122),T2
-        and     T1,B,T1
-        or      T2,%lo(0x6b901122),T2   !=
-        xor     T1,D,T1
-        add     T1,R12,T1
-        LOAD    X(13),R13
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,7,T2
-        srl     A,32-7,A
-        or      A,T2,A                  !=
-         xor     B,C,T1
-        add     A,B,A
-
-        sethi   %hi(0xfd987193),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0xfd987193),T2
-        xor     T1,C,T1
-        LOAD    X(14),RX
-        add     T1,R13,T1               !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,12,T2
-        srl     D,32-12,D               !=
-        or      D,T2,D
-         xor     A,B,T1
-        add     D,A,D
-
-        sethi   %hi(0xa679438e),T2      !=
-        and     T1,D,T1
-        or      T2,%lo(0xa679438e),T2
-        xor     T1,B,T1
-        add     T1,RX,T1                !=
-        LOAD    X(15),RX
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,17,T2                 !=
-        srl     C,32-17,C
-        or      C,T2,C
-         xor     D,A,T1
-        add     C,D,C                   !=
-
-        sethi   %hi(0x49b40821),T2
-        and     T1,C,T1
-        or      T2,%lo(0x49b40821),T2
-        xor     T1,A,T1                 !=
-        add     T1,RX,T1
-        !pre-LOADed     X(1),R1
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,22,T2                 !=
-        srl     B,32-22,B
-        or      B,T2,B
-        add     B,C,B
-
-!!!!!!!!Round 1
-
-        xor     B,C,T1                  !=
-        sethi   %hi(0xf61e2562),T2
-        and     T1,D,T1
-        or      T2,%lo(0xf61e2562),T2
-        xor     T1,C,T1                 !=
-        add     T1,R1,T1
-        !pre-LOADed     X(6),R6
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,5,T2                  !=
-        srl     A,32-5,A
-        or      A,T2,A
-        add     A,B,A
-
-        xor     A,B,T1                  !=
-        sethi   %hi(0xc040b340),T2
-        and     T1,C,T1
-        or      T2,%lo(0xc040b340),T2
-        xor     T1,B,T1                 !=
-        add     T1,R6,T1
-        !pre-LOADed     X(11),R11
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,9,T2                  !=
-        srl     D,32-9,D
-        or      D,T2,D
-        add     D,A,D
-
-        xor     D,A,T1                  !=
-        sethi   %hi(0x265e5a51),T2
-        and     T1,B,T1
-        or      T2,%lo(0x265e5a51),T2
-        xor     T1,A,T1                 !=
-        add     T1,R11,T1
-        !pre-LOADed     X(0),R0
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,14,T2                 !=
-        srl     C,32-14,C
-        or      C,T2,C
-        add     C,D,C
-
-        xor     C,D,T1                  !=
-        sethi   %hi(0xe9b6c7aa),T2
-        and     T1,A,T1
-        or      T2,%lo(0xe9b6c7aa),T2
-        xor     T1,D,T1                 !=
-        add     T1,R0,T1
-        !pre-LOADed     X(5),R5
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,20,T2                 !=
-        srl     B,32-20,B
-        or      B,T2,B
-        add     B,C,B
-
-        xor     B,C,T1                  !=
-        sethi   %hi(0xd62f105d),T2
-        and     T1,D,T1
-        or      T2,%lo(0xd62f105d),T2
-        xor     T1,C,T1                 !=
-        add     T1,R5,T1
-        !pre-LOADed     X(10),R10
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,5,T2                  !=
-        srl     A,32-5,A
-        or      A,T2,A
-        add     A,B,A
-
-        xor     A,B,T1                  !=
-        sethi   %hi(0x02441453),T2
-        and     T1,C,T1
-        or      T2,%lo(0x02441453),T2
-        xor     T1,B,T1                 !=
-        add     T1,R10,T1
-        LOAD    X(15),RX
-        add     T1,T2,T1
-        add     D,T1,D                  !=
-        sll     D,9,T2
-        srl     D,32-9,D
-        or      D,T2,D
-        add     D,A,D                   !=
-
-        xor     D,A,T1
-        sethi   %hi(0xd8a1e681),T2
-        and     T1,B,T1
-        or      T2,%lo(0xd8a1e681),T2   !=
-        xor     T1,A,T1
-        add     T1,RX,T1
-        !pre-LOADed     X(4),R4
-        add     T1,T2,T1
-        add     C,T1,C                  !=
-        sll     C,14,T2
-        srl     C,32-14,C
-        or      C,T2,C
-        add     C,D,C                   !=
-
-        xor     C,D,T1
-        sethi   %hi(0xe7d3fbc8),T2
-        and     T1,A,T1
-        or      T2,%lo(0xe7d3fbc8),T2   !=
-        xor     T1,D,T1
-        add     T1,R4,T1
-        !pre-LOADed     X(9),R9
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,20,T2
-        srl     B,32-20,B
-        or      B,T2,B
-        add     B,C,B                   !=
-
-        xor     B,C,T1
-        sethi   %hi(0x21e1cde6),T2
-        and     T1,D,T1
-        or      T2,%lo(0x21e1cde6),T2   !=
-        xor     T1,C,T1
-        add     T1,R9,T1
-        LOAD    X(14),RX
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,5,T2
-        srl     A,32-5,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0xc33707d6),T2
-        and     T1,C,T1                 !=
-        or      T2,%lo(0xc33707d6),T2
-        xor     T1,B,T1
-        add     T1,RX,T1
-        !pre-LOADed     X(3),R3
-        add     T1,T2,T1                !=
-        add     D,T1,D
-        sll     D,9,T2
-        srl     D,32-9,D
-        or      D,T2,D                  !=
-        add     D,A,D
-
-        xor     D,A,T1
-        sethi   %hi(0xf4d50d87),T2
-        and     T1,B,T1                 !=
-        or      T2,%lo(0xf4d50d87),T2
-        xor     T1,A,T1
-        add     T1,R3,T1
-        !pre-LOADed     X(8),R8
-        add     T1,T2,T1                !=
-        add     C,T1,C
-        sll     C,14,T2
-        srl     C,32-14,C
-        or      C,T2,C                  !=
-        add     C,D,C
-
-        xor     C,D,T1
-        sethi   %hi(0x455a14ed),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0x455a14ed),T2
-        xor     T1,D,T1
-        add     T1,R8,T1
-        !pre-LOADed     X(13),R13
-        add     T1,T2,T1                !=
-        add     B,T1,B
-        sll     B,20,T2
-        srl     B,32-20,B
-        or      B,T2,B                  !=
-        add     B,C,B
-
-        xor     B,C,T1
-        sethi   %hi(0xa9e3e905),T2
-        and     T1,D,T1                 !=
-        or      T2,%lo(0xa9e3e905),T2
-        xor     T1,C,T1
-        add     T1,R13,T1
-        !pre-LOADed     X(2),R2
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,5,T2
-        srl     A,32-5,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0xfcefa3f8),T2
-        and     T1,C,T1                 !=
-        or      T2,%lo(0xfcefa3f8),T2
-        xor     T1,B,T1
-        add     T1,R2,T1
-        !pre-LOADed     X(7),R7
-        add     T1,T2,T1                !=
-        add     D,T1,D
-        sll     D,9,T2
-        srl     D,32-9,D
-        or      D,T2,D                  !=
-        add     D,A,D
-
-        xor     D,A,T1
-        sethi   %hi(0x676f02d9),T2
-        and     T1,B,T1                 !=
-        or      T2,%lo(0x676f02d9),T2
-        xor     T1,A,T1
-        add     T1,R7,T1
-        !pre-LOADed     X(12),R12
-        add     T1,T2,T1                !=
-        add     C,T1,C
-        sll     C,14,T2
-        srl     C,32-14,C
-        or      C,T2,C                  !=
-        add     C,D,C
-
-        xor     C,D,T1
-        sethi   %hi(0x8d2a4c8a),T2
-        and     T1,A,T1                 !=
-        or      T2,%lo(0x8d2a4c8a),T2
-        xor     T1,D,T1
-        add     T1,R12,T1
-        !pre-LOADed     X(5),R5
-        add     T1,T2,T1                !=
-        add     B,T1,B
-        sll     B,20,T2
-        srl     B,32-20,B
-        or      B,T2,B                  !=
-        add     B,C,B
-
-!!!!!!!!Round 2
-
-        xor     B,C,T1
-        sethi   %hi(0xfffa3942),T2
-        xor     T1,D,T1                 !=
-        or      T2,%lo(0xfffa3942),T2
-        add     T1,R5,T1
-        !pre-LOADed     X(8),R8
-        add     T1,T2,T1
-        add     A,T1,A                  !=
-        sll     A,4,T2
-        srl     A,32-4,A
-        or      A,T2,A
-        add     A,B,A                   !=
-
-        xor     A,B,T1
-        sethi   %hi(0x8771f681),T2
-        xor     T1,C,T1
-        or      T2,%lo(0x8771f681),T2   !=
-        add     T1,R8,T1
-        !pre-LOADed     X(11),R11
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,11,T2                 !=
-        srl     D,32-11,D
-        or      D,T2,D
-        add     D,A,D
-
-        xor     D,A,T1                  !=
-        sethi   %hi(0x6d9d6122),T2
-        xor     T1,B,T1
-        or      T2,%lo(0x6d9d6122),T2
-        add     T1,R11,T1               !=
-        LOAD    X(14),RX
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,16,T2                 !=
-        srl     C,32-16,C
-        or      C,T2,C
-        add     C,D,C
-
-        xor     C,D,T1                  !=
-        sethi   %hi(0xfde5380c),T2
-        xor     T1,A,T1
-        or      T2,%lo(0xfde5380c),T2
-        add     T1,RX,T1                !=
-        !pre-LOADed     X(1),R1
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,23,T2
-        srl     B,32-23,B               !=
-        or      B,T2,B
-        add     B,C,B
-
-        xor     B,C,T1
-        sethi   %hi(0xa4beea44),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0xa4beea44),T2
-        add     T1,R1,T1
-        !pre-LOADed     X(4),R4
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,4,T2
-        srl     A,32-4,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0x4bdecfa9),T2
-        xor     T1,C,T1                 !=
-        or      T2,%lo(0x4bdecfa9),T2
-        add     T1,R4,T1
-        !pre-LOADed     X(7),R7
-        add     T1,T2,T1
-        add     D,T1,D                  !=
-        sll     D,11,T2
-        srl     D,32-11,D
-        or      D,T2,D
-        add     D,A,D                   !=
-
-        xor     D,A,T1
-        sethi   %hi(0xf6bb4b60),T2
-        xor     T1,B,T1
-        or      T2,%lo(0xf6bb4b60),T2   !=
-        add     T1,R7,T1
-        !pre-LOADed     X(10),R10
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,16,T2                 !=
-        srl     C,32-16,C
-        or      C,T2,C
-        add     C,D,C
-
-        xor     C,D,T1                  !=
-        sethi   %hi(0xbebfbc70),T2
-        xor     T1,A,T1
-        or      T2,%lo(0xbebfbc70),T2
-        add     T1,R10,T1               !=
-        !pre-LOADed     X(13),R13
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,23,T2
-        srl     B,32-23,B               !=
-        or      B,T2,B
-        add     B,C,B
-
-        xor     B,C,T1
-        sethi   %hi(0x289b7ec6),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0x289b7ec6),T2
-        add     T1,R13,T1
-        !pre-LOADed     X(0),R0
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,4,T2
-        srl     A,32-4,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0xeaa127fa),T2
-        xor     T1,C,T1                 !=
-        or      T2,%lo(0xeaa127fa),T2
-        add     T1,R0,T1
-        !pre-LOADed     X(3),R3
-        add     T1,T2,T1
-        add     D,T1,D                  !=
-        sll     D,11,T2
-        srl     D,32-11,D
-        or      D,T2,D
-        add     D,A,D                   !=
-
-        xor     D,A,T1
-        sethi   %hi(0xd4ef3085),T2
-        xor     T1,B,T1
-        or      T2,%lo(0xd4ef3085),T2   !=
-        add     T1,R3,T1
-        !pre-LOADed     X(6),R6
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,16,T2                 !=
-        srl     C,32-16,C
-        or      C,T2,C
-        add     C,D,C
-
-        xor     C,D,T1                  !=
-        sethi   %hi(0x04881d05),T2
-        xor     T1,A,T1
-        or      T2,%lo(0x04881d05),T2
-        add     T1,R6,T1                !=
-        !pre-LOADed     X(9),R9
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,23,T2
-        srl     B,32-23,B               !=
-        or      B,T2,B
-        add     B,C,B
-
-        xor     B,C,T1
-        sethi   %hi(0xd9d4d039),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0xd9d4d039),T2
-        add     T1,R9,T1
-        !pre-LOADed     X(12),R12
-        add     T1,T2,T1                !=
-        add     A,T1,A
-        sll     A,4,T2
-        srl     A,32-4,A
-        or      A,T2,A                  !=
-        add     A,B,A
-
-        xor     A,B,T1
-        sethi   %hi(0xe6db99e5),T2
-        xor     T1,C,T1                 !=
-        or      T2,%lo(0xe6db99e5),T2
-        add     T1,R12,T1
-        LOAD    X(15),RX
-        add     T1,T2,T1                !=
-        add     D,T1,D
-        sll     D,11,T2
-        srl     D,32-11,D
-        or      D,T2,D                  !=
-        add     D,A,D
-
-        xor     D,A,T1
-        sethi   %hi(0x1fa27cf8),T2
-        xor     T1,B,T1                 !=
-        or      T2,%lo(0x1fa27cf8),T2
-        add     T1,RX,T1
-        !pre-LOADed     X(2),R2
-        add     T1,T2,T1
-        add     C,T1,C                  !=
-        sll     C,16,T2
-        srl     C,32-16,C
-        or      C,T2,C
-        add     C,D,C                   !=
-
-        xor     C,D,T1
-        sethi   %hi(0xc4ac5665),T2
-        xor     T1,A,T1
-        or      T2,%lo(0xc4ac5665),T2   !=
-        add     T1,R2,T1
-        !pre-LOADed     X(0),R0
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,23,T2                 !=
-        srl     B,32-23,B
-        or      B,T2,B
-        add     B,C,B
-
-!!!!!!!!Round 3
-
-        orn     B,D,T1                  !=
-        sethi   %hi(0xf4292244),T2
-        xor     T1,C,T1
-        or      T2,%lo(0xf4292244),T2
-        add     T1,R0,T1                !=
-        !pre-LOADed     X(7),R7
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,6,T2
-        srl     A,32-6,A                !=
-        or      A,T2,A
-        add     A,B,A
-
-        orn     A,C,T1
-        sethi   %hi(0x432aff97),T2      !=
-        xor     T1,B,T1
-        or      T2,%lo(0x432aff97),T2
-        LOAD    X(14),RX
-        add     T1,R7,T1                !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,10,T2
-        srl     D,32-10,D               !=
-        or      D,T2,D
-        add     D,A,D
-
-        orn     D,B,T1
-        sethi   %hi(0xab9423a7),T2      !=
-        xor     T1,A,T1
-        or      T2,%lo(0xab9423a7),T2
-        add     T1,RX,T1
-        !pre-LOADed     X(5),R5
-        add     T1,T2,T1                !=
-        add     C,T1,C
-        sll     C,15,T2
-        srl     C,32-15,C
-        or      C,T2,C                  !=
-        add     C,D,C
-
-        orn     C,A,T1
-        sethi   %hi(0xfc93a039),T2
-        xor     T1,D,T1                 !=
-        or      T2,%lo(0xfc93a039),T2
-        add     T1,R5,T1
-        !pre-LOADed     X(12),R12
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,21,T2
-        srl     B,32-21,B
-        or      B,T2,B
-        add     B,C,B                   !=
-
-        orn     B,D,T1
-        sethi   %hi(0x655b59c3),T2
-        xor     T1,C,T1
-        or      T2,%lo(0x655b59c3),T2   !=
-        add     T1,R12,T1
-        !pre-LOADed     X(3),R3
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,6,T2                  !=
-        srl     A,32-6,A
-        or      A,T2,A
-        add     A,B,A
-
-        orn     A,C,T1                  !=
-        sethi   %hi(0x8f0ccc92),T2
-        xor     T1,B,T1
-        or      T2,%lo(0x8f0ccc92),T2
-        add     T1,R3,T1                !=
-        !pre-LOADed     X(10),R10
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,10,T2
-        srl     D,32-10,D               !=
-        or      D,T2,D
-        add     D,A,D
-
-        orn     D,B,T1
-        sethi   %hi(0xffeff47d),T2      !=
-        xor     T1,A,T1
-        or      T2,%lo(0xffeff47d),T2
-        add     T1,R10,T1
-        !pre-LOADed     X(1),R1
-        add     T1,T2,T1                !=
-        add     C,T1,C
-        sll     C,15,T2
-        srl     C,32-15,C
-        or      C,T2,C                  !=
-        add     C,D,C
-
-        orn     C,A,T1
-        sethi   %hi(0x85845dd1),T2
-        xor     T1,D,T1                 !=
-        or      T2,%lo(0x85845dd1),T2
-        add     T1,R1,T1
-        !pre-LOADed     X(8),R8
-        add     T1,T2,T1
-        add     B,T1,B                  !=
-        sll     B,21,T2
-        srl     B,32-21,B
-        or      B,T2,B
-        add     B,C,B                   !=
-
-        orn     B,D,T1
-        sethi   %hi(0x6fa87e4f),T2
-        xor     T1,C,T1
-        or      T2,%lo(0x6fa87e4f),T2   !=
-        add     T1,R8,T1
-        LOAD    X(15),RX
-        add     T1,T2,T1
-        add     A,T1,A                  !=
-        sll     A,6,T2
-        srl     A,32-6,A
-        or      A,T2,A
-        add     A,B,A                   !=
-
-        orn     A,C,T1
-        sethi   %hi(0xfe2ce6e0),T2
-        xor     T1,B,T1
-        or      T2,%lo(0xfe2ce6e0),T2   !=
-        add     T1,RX,T1
-        !pre-LOADed     X(6),R6
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,10,T2                 !=
-        srl     D,32-10,D
-        or      D,T2,D
-        add     D,A,D
-
-        orn     D,B,T1                  !=
-        sethi   %hi(0xa3014314),T2
-        xor     T1,A,T1
-        or      T2,%lo(0xa3014314),T2
-        add     T1,R6,T1                !=
-        !pre-LOADed     X(13),R13
-        add     T1,T2,T1
-        add     C,T1,C
-        sll     C,15,T2
-        srl     C,32-15,C               !=
-        or      C,T2,C
-        add     C,D,C
-
-        orn     C,A,T1
-        sethi   %hi(0x4e0811a1),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0x4e0811a1),T2
-        !pre-LOADed     X(4),R4
-         ld      [Aptr],Aval
-        add     T1,R13,T1               !=
-        add     T1,T2,T1
-        add     B,T1,B
-        sll     B,21,T2
-        srl     B,32-21,B               !=
-        or      B,T2,B
-        add     B,C,B
-
-        orn     B,D,T1
-        sethi   %hi(0xf7537e82),T2      !=
-        xor     T1,C,T1
-        or      T2,%lo(0xf7537e82),T2
-        !pre-LOADed     X(11),R11
-         ld      [Dptr],Dval
-        add     T1,R4,T1                !=
-        add     T1,T2,T1
-        add     A,T1,A
-        sll     A,6,T2
-        srl     A,32-6,A                !=
-        or      A,T2,A
-        add     A,B,A
-
-        orn     A,C,T1
-        sethi   %hi(0xbd3af235),T2      !=
-        xor     T1,B,T1
-        or      T2,%lo(0xbd3af235),T2
-        !pre-LOADed     X(2),R2
-         ld      [Cptr],Cval
-        add     T1,R11,T1               !=
-        add     T1,T2,T1
-        add     D,T1,D
-        sll     D,10,T2
-        srl     D,32-10,D               !=
-        or      D,T2,D
-        add     D,A,D
-
-        orn     D,B,T1
-        sethi   %hi(0x2ad7d2bb),T2      !=
-        xor     T1,A,T1
-        or      T2,%lo(0x2ad7d2bb),T2
-        !pre-LOADed     X(9),R9
-         ld      [Bptr],Bval
-        add     T1,R2,T1                !=
-         add     Aval,A,Aval
-        add     T1,T2,T1
-         st      Aval,[Aptr]
-        add     C,T1,C                  !=
-        sll     C,15,T2
-         add     Dval,D,Dval
-        srl     C,32-15,C
-        or      C,T2,C                  !=
-         st      Dval,[Dptr]
-        add     C,D,C
-
-        orn     C,A,T1
-        sethi   %hi(0xeb86d391),T2      !=
-        xor     T1,D,T1
-        or      T2,%lo(0xeb86d391),T2
-        add     T1,R9,T1
-        !pre-LOADed     X(0),R0
-         mov     Aval,A                 !=
-        add     T1,T2,T1
-         mov     Dval,D
-        add     B,T1,B
-        sll     B,21,T2                 !=
-         add     Cval,C,Cval
-        srl     B,32-21,B
-         st      Cval,[Cptr]
-        or      B,T2,B                  !=
-        add     B,C,B
-
-        deccc   %i2
-        mov     Cval,C
-        add     B,Bval,B                !=
-        inc     64,%i1
-        nop
-        st      B,[Bptr]
-        nop                             !=
-
-#ifdef  OPENSSL_SYSNAME_ULTRASPARC
-        bg,a,pt %icc,.Lmd5_block_loop
-#else
-        bg,a    .Lmd5_block_loop
-#endif
-        LOAD    X(0),R0
-
-#ifdef ASI_PRIMARY_LITTLE
-        wr      %g0,%o7,%asi
-#endif
-        ret
-        restore %g0,0,%o0
-
-.type   md5_block,#function
-.size   md5_block,(.-md5_block)
diff --git a/src/lib/libssl/src/crypto/md5/asm/md5-x86_64.pl b/src/lib/libssl/src/crypto/md5/asm/md5-x86_64.pl
new file mode 100755
index 0000000000..9a6fa67224
--- /dev/null
+++ b/src/lib/libssl/src/crypto/md5/asm/md5-x86_64.pl
@@ -0,0 +1,245 @@
+#!/usr/bin/perl -w
+#
+# MD5 optimized for AMD64.
+#
+# Author: Marc Bevand <bevand_m (at) epita.fr>
+# Licence: I hereby disclaim the copyright on this code and place it
+# in the public domain.
+#
+
+use strict;
+
+my $code;
+
+# round1_step() does:
+#   dst = x + ((dst + F(x,y,z) + X[k] + T_i) <<< s)
+#   %r10d = X[k_next]
+#   %r11d = z' (copy of z for the next step)
+# Each round1_step() takes about 5.71 clocks (9 instructions, 1.58 IPC)
+sub round1_step
+{
+    my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
+    $code .= " mov      0*4(%rsi),      %r10d           /* (NEXT STEP) X[0] */\n" if ($pos == -1);
+    $code .= " mov      %edx,           %r11d           /* (NEXT STEP) z' = %edx */\n" if ($pos == -1);
+    $code .= <<EOF;
+        xor     $y,             %r11d           /* y ^ ... */
+        lea     $T_i($dst,%r10d),$dst           /* Const + dst + ... */
+        and     $x,             %r11d           /* x & ... */
+        xor     $z,             %r11d           /* z ^ ... */
+        mov     $k_next*4(%rsi),%r10d           /* (NEXT STEP) X[$k_next] */
+        add     %r11d,          $dst            /* dst += ... */
+        rol     \$$s,           $dst            /* dst <<< s */
+        mov     $y,             %r11d           /* (NEXT STEP) z' = $y */
+        add     $x,             $dst            /* dst += x */
+EOF
+}
+
+# round2_step() does:
+#   dst = x + ((dst + G(x,y,z) + X[k] + T_i) <<< s)
+#   %r10d = X[k_next]
+#   %r11d = y' (copy of y for the next step)
+# Each round2_step() takes about 6.22 clocks (9 instructions, 1.45 IPC)
+sub round2_step
+{
+    my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
+    $code .= " mov      1*4(%rsi),      %r10d           /* (NEXT STEP) X[1] */\n" if ($pos == -1);
+    $code .= " mov      %ecx,           %r11d           /* (NEXT STEP) y' = %ecx */\n" if ($pos == -1);
+    $code .= <<EOF;
+        xor     $x,             %r11d           /* x ^ ... */
+        lea     $T_i($dst,%r10d),$dst           /* Const + dst + ... */
+        and     $z,             %r11d           /* z & ... */
+        xor     $y,             %r11d           /* y ^ ... */
+        mov     $k_next*4(%rsi),%r10d           /* (NEXT STEP) X[$k_next] */
+        add     %r11d,          $dst            /* dst += ... */
+        rol     \$$s,           $dst            /* dst <<< s */
+        mov     $x,             %r11d           /* (NEXT STEP) y' = $x */
+        add     $x,             $dst            /* dst += x */
+EOF
+}
+
+# round3_step() does:
+#   dst = x + ((dst + H(x,y,z) + X[k] + T_i) <<< s)
+#   %r10d = X[k_next]
+#   %r11d = y' (copy of y for the next step)
+# Each round3_step() takes about 4.26 clocks (8 instructions, 1.88 IPC)
+sub round3_step
+{
+    my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
+    $code .= " mov      5*4(%rsi),      %r10d           /* (NEXT STEP) X[5] */\n" if ($pos == -1);
+    $code .= " mov      %ecx,           %r11d           /* (NEXT STEP) y' = %ecx */\n" if ($pos == -1);
+    $code .= <<EOF;
+        lea     $T_i($dst,%r10d),$dst           /* Const + dst + ... */
+        mov     $k_next*4(%rsi),%r10d           /* (NEXT STEP) X[$k_next] */
+        xor     $z,             %r11d           /* z ^ ... */
+        xor     $x,             %r11d           /* x ^ ... */
+        add     %r11d,          $dst            /* dst += ... */
+        rol     \$$s,           $dst            /* dst <<< s */
+        mov     $x,             %r11d           /* (NEXT STEP) y' = $x */
+        add     $x,             $dst            /* dst += x */
+EOF
+}
+
+# round4_step() does:
+#   dst = x + ((dst + I(x,y,z) + X[k] + T_i) <<< s)
+#   %r10d = X[k_next]
+#   %r11d = not z' (copy of not z for the next step)
+# Each round4_step() takes about 5.27 clocks (9 instructions, 1.71 IPC)
+sub round4_step
+{
+    my ($pos, $dst, $x, $y, $z, $k_next, $T_i, $s) = @_;
+    $code .= " mov      0*4(%rsi),      %r10d           /* (NEXT STEP) X[0] */\n" if ($pos == -1);
+    $code .= " mov      \$0xffffffff,   %r11d\n" if ($pos == -1);
+    $code .= " xor      %edx,           %r11d           /* (NEXT STEP) not z' = not %edx*/\n"
+    if ($pos == -1);
+    $code .= <<EOF;
+        lea     $T_i($dst,%r10d),$dst           /* Const + dst + ... */
+        or      $x,             %r11d           /* x | ... */
+        xor     $y,             %r11d           /* y ^ ... */
+        add     %r11d,          $dst            /* dst += ... */
+        mov     $k_next*4(%rsi),%r10d           /* (NEXT STEP) X[$k_next] */
+        mov     \$0xffffffff,   %r11d
+        rol     \$$s,           $dst            /* dst <<< s */
+        xor     $y,             %r11d           /* (NEXT STEP) not z' = not $y */
+        add     $x,             $dst            /* dst += x */
+EOF
+}
+
+my $output = shift;
+open STDOUT,"| $^X ../perlasm/x86_64-xlate.pl $output";
+
+$code .= <<EOF;
+.text
+.align 16
+
+.globl md5_block_asm_data_order
+.type md5_block_asm_data_order,\@function,3
+md5_block_asm_data_order:
+        push    %rbp
+        push    %rbx
+        push    %r14
+        push    %r15
+
+        # rdi = arg #1 (ctx, MD5_CTX pointer)
+        # rsi = arg #2 (ptr, data pointer)
+        # rdx = arg #3 (nbr, number of 16-word blocks to process)
+        mov     %rdi,           %rbp    # rbp = ctx
+        shl     \$6,            %rdx    # rdx = nbr in bytes
+        lea     (%rsi,%rdx),    %rdi    # rdi = end
+        mov     0*4(%rbp),      %eax    # eax = ctx->A
+        mov     1*4(%rbp),      %ebx    # ebx = ctx->B
+        mov     2*4(%rbp),      %ecx    # ecx = ctx->C
+        mov     3*4(%rbp),      %edx    # edx = ctx->D
+        # end is 'rdi'
+        # ptr is 'rsi'
+        # A is 'eax'
+        # B is 'ebx'
+        # C is 'ecx'
+        # D is 'edx'
+
+        cmp     %rdi,           %rsi            # cmp end with ptr
+        je      .Lend                           # jmp if ptr == end
+
+        # BEGIN of loop over 16-word blocks
+.Lloop: # save old values of A, B, C, D
+        mov     %eax,           %r8d
+        mov     %ebx,           %r9d
+        mov     %ecx,           %r14d
+        mov     %edx,           %r15d
+EOF
+round1_step(-1,'%eax','%ebx','%ecx','%edx', '1','0xd76aa478', '7');
+round1_step( 0,'%edx','%eax','%ebx','%ecx', '2','0xe8c7b756','12');
+round1_step( 0,'%ecx','%edx','%eax','%ebx', '3','0x242070db','17');
+round1_step( 0,'%ebx','%ecx','%edx','%eax', '4','0xc1bdceee','22');
+round1_step( 0,'%eax','%ebx','%ecx','%edx', '5','0xf57c0faf', '7');
+round1_step( 0,'%edx','%eax','%ebx','%ecx', '6','0x4787c62a','12');
+round1_step( 0,'%ecx','%edx','%eax','%ebx', '7','0xa8304613','17');
+round1_step( 0,'%ebx','%ecx','%edx','%eax', '8','0xfd469501','22');
+round1_step( 0,'%eax','%ebx','%ecx','%edx', '9','0x698098d8', '7');
+round1_step( 0,'%edx','%eax','%ebx','%ecx','10','0x8b44f7af','12');
+round1_step( 0,'%ecx','%edx','%eax','%ebx','11','0xffff5bb1','17');
+round1_step( 0,'%ebx','%ecx','%edx','%eax','12','0x895cd7be','22');
+round1_step( 0,'%eax','%ebx','%ecx','%edx','13','0x6b901122', '7');
+round1_step( 0,'%edx','%eax','%ebx','%ecx','14','0xfd987193','12');
+round1_step( 0,'%ecx','%edx','%eax','%ebx','15','0xa679438e','17');
+round1_step( 1,'%ebx','%ecx','%edx','%eax', '0','0x49b40821','22');
+
+round2_step(-1,'%eax','%ebx','%ecx','%edx', '6','0xf61e2562', '5');
+round2_step( 0,'%edx','%eax','%ebx','%ecx','11','0xc040b340', '9');
+round2_step( 0,'%ecx','%edx','%eax','%ebx', '0','0x265e5a51','14');
+round2_step( 0,'%ebx','%ecx','%edx','%eax', '5','0xe9b6c7aa','20');
+round2_step( 0,'%eax','%ebx','%ecx','%edx','10','0xd62f105d', '5');
+round2_step( 0,'%edx','%eax','%ebx','%ecx','15', '0x2441453', '9');
+round2_step( 0,'%ecx','%edx','%eax','%ebx', '4','0xd8a1e681','14');
+round2_step( 0,'%ebx','%ecx','%edx','%eax', '9','0xe7d3fbc8','20');
+round2_step( 0,'%eax','%ebx','%ecx','%edx','14','0x21e1cde6', '5');
+round2_step( 0,'%edx','%eax','%ebx','%ecx', '3','0xc33707d6', '9');
+round2_step( 0,'%ecx','%edx','%eax','%ebx', '8','0xf4d50d87','14');
+round2_step( 0,'%ebx','%ecx','%edx','%eax','13','0x455a14ed','20');
+round2_step( 0,'%eax','%ebx','%ecx','%edx', '2','0xa9e3e905', '5');
+round2_step( 0,'%edx','%eax','%ebx','%ecx', '7','0xfcefa3f8', '9');
+round2_step( 0,'%ecx','%edx','%eax','%ebx','12','0x676f02d9','14');
+round2_step( 1,'%ebx','%ecx','%edx','%eax', '0','0x8d2a4c8a','20');
+
+round3_step(-1,'%eax','%ebx','%ecx','%edx', '8','0xfffa3942', '4');
+round3_step( 0,'%edx','%eax','%ebx','%ecx','11','0x8771f681','11');
+round3_step( 0,'%ecx','%edx','%eax','%ebx','14','0x6d9d6122','16');
+round3_step( 0,'%ebx','%ecx','%edx','%eax', '1','0xfde5380c','23');
+round3_step( 0,'%eax','%ebx','%ecx','%edx', '4','0xa4beea44', '4');
+round3_step( 0,'%edx','%eax','%ebx','%ecx', '7','0x4bdecfa9','11');
+round3_step( 0,'%ecx','%edx','%eax','%ebx','10','0xf6bb4b60','16');
+round3_step( 0,'%ebx','%ecx','%edx','%eax','13','0xbebfbc70','23');
+round3_step( 0,'%eax','%ebx','%ecx','%edx', '0','0x289b7ec6', '4');
+round3_step( 0,'%edx','%eax','%ebx','%ecx', '3','0xeaa127fa','11');
+round3_step( 0,'%ecx','%edx','%eax','%ebx', '6','0xd4ef3085','16');
+round3_step( 0,'%ebx','%ecx','%edx','%eax', '9', '0x4881d05','23');
+round3_step( 0,'%eax','%ebx','%ecx','%edx','12','0xd9d4d039', '4');
+round3_step( 0,'%edx','%eax','%ebx','%ecx','15','0xe6db99e5','11');
+round3_step( 0,'%ecx','%edx','%eax','%ebx', '2','0x1fa27cf8','16');
+round3_step( 1,'%ebx','%ecx','%edx','%eax', '0','0xc4ac5665','23');
+
+round4_step(-1,'%eax','%ebx','%ecx','%edx', '7','0xf4292244', '6');
+round4_step( 0,'%edx','%eax','%ebx','%ecx','14','0x432aff97','10');
+round4_step( 0,'%ecx','%edx','%eax','%ebx', '5','0xab9423a7','15');
+round4_step( 0,'%ebx','%ecx','%edx','%eax','12','0xfc93a039','21');
+round4_step( 0,'%eax','%ebx','%ecx','%edx', '3','0x655b59c3', '6');
+round4_step( 0,'%edx','%eax','%ebx','%ecx','10','0x8f0ccc92','10');
+round4_step( 0,'%ecx','%edx','%eax','%ebx', '1','0xffeff47d','15');
+round4_step( 0,'%ebx','%ecx','%edx','%eax', '8','0x85845dd1','21');
+round4_step( 0,'%eax','%ebx','%ecx','%edx','15','0x6fa87e4f', '6');
+round4_step( 0,'%edx','%eax','%ebx','%ecx', '6','0xfe2ce6e0','10');
+round4_step( 0,'%ecx','%edx','%eax','%ebx','13','0xa3014314','15');
+round4_step( 0,'%ebx','%ecx','%edx','%eax', '4','0x4e0811a1','21');
+round4_step( 0,'%eax','%ebx','%ecx','%edx','11','0xf7537e82', '6');
+round4_step( 0,'%edx','%eax','%ebx','%ecx', '2','0xbd3af235','10');
+round4_step( 0,'%ecx','%edx','%eax','%ebx', '9','0x2ad7d2bb','15');
+round4_step( 1,'%ebx','%ecx','%edx','%eax', '0','0xeb86d391','21');
+$code .= <<EOF;
+        # add old values of A, B, C, D
+        add     %r8d,   %eax
+        add     %r9d,   %ebx
+        add     %r14d,  %ecx
+        add     %r15d,  %edx
+
+        # loop control
+        add     \$64,           %rsi            # ptr += 64
+        cmp     %rdi,           %rsi            # cmp end with ptr
+        jb      .Lloop                          # jmp if ptr < end
+        # END of loop over 16-word blocks
+
+.Lend:
+        mov     %eax,           0*4(%rbp)       # ctx->A = A
+        mov     %ebx,           1*4(%rbp)       # ctx->B = B
+        mov     %ecx,           2*4(%rbp)       # ctx->C = C
+        mov     %edx,           3*4(%rbp)       # ctx->D = D
+
+        pop     %r15
+        pop     %r14
+        pop     %rbx
+        pop     %rbp
+        ret
+.size md5_block_asm_data_order,.-md5_block_asm_data_order
+EOF
+
+print $code;
+
+close STDOUT;
diff --git a/src/lib/libssl/src/crypto/o_dir.c b/src/lib/libssl/src/crypto/o_dir.c
new file mode 100644
index 0000000000..42891ea459
--- /dev/null
+++ b/src/lib/libssl/src/crypto/o_dir.c
@@ -0,0 +1,83 @@
+/* crypto/o_dir.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <errno.h>
+#include <e_os.h>
+
+/* The routines really come from the Levitte Programming, so to make
+   life simple, let's just use the raw files and hack the symbols to
+   fit our namespace.  */
+#define LP_DIR_CTX OPENSSL_DIR_CTX
+#define LP_dir_context_st OPENSSL_dir_context_st
+#define LP_find_file OPENSSL_DIR_read
+#define LP_find_file_end OPENSSL_DIR_end
+
+#include "o_dir.h"
+
+#define LPDIR_H
+#if defined OPENSSL_SYS_UNIX || defined DJGPP
+#include "LPdir_unix.c"
+#elif defined OPENSSL_SYS_VMS
+#include "LPdir_vms.c"
+#elif defined OPENSSL_SYS_WIN32
+#include "LPdir_win32.c"
+#elif defined OPENSSL_SYS_WINCE
+#include "LPdir_wince.c"
+#else
+#include "LPdir_nyi.c"
+#endif
diff --git a/src/lib/libssl/src/crypto/o_dir.h b/src/lib/libssl/src/crypto/o_dir.h
new file mode 100644
index 0000000000..4b725c0312
--- /dev/null
+++ b/src/lib/libssl/src/crypto/o_dir.h
@@ -0,0 +1,53 @@
+/* crypto/o_dir.h -*- mode:C; c-file-style: "eay" -*- */
+/* Copied from Richard Levitte's (richard@levitte.org) LP library.  All
+ * symbol names have been changed, with permission from the author.
+ */
+
+/* $LP: LPlib/source/LPdir.h,v 1.1 2004/06/14 08:56:04 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+
+#ifndef O_DIR_H
+#define O_DIR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+  typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX;
+
+  /* returns NULL on error or end-of-directory.
+     If it is end-of-directory, errno will be zero */
+  const char *OPENSSL_DIR_read(OPENSSL_DIR_CTX **ctx, const char *directory);
+  /* returns 1 on success, 0 on error */
+  int OPENSSL_DIR_end(OPENSSL_DIR_CTX **ctx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LPDIR_H */
diff --git a/src/lib/libssl/src/crypto/o_dir_test.c b/src/lib/libssl/src/crypto/o_dir_test.c
new file mode 100644
index 0000000000..3d75ecb005
--- /dev/null
+++ b/src/lib/libssl/src/crypto/o_dir_test.c
@@ -0,0 +1,70 @@
+/* crypto/o_dir.h -*- mode:C; c-file-style: "eay" -*- */
+/* Copied from Richard Levitte's (richard@levitte.org) LP library.  All
+ * symbol names have been changed, with permission from the author.
+ */
+
+/* $LP: LPlib/test/test_dir.c,v 1.1 2004/06/16 22:59:47 _cvs_levitte Exp $ */
+/*
+ * Copyright (c) 2004, Richard Levitte <richard@levitte.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include "e_os2.h"
+#include "o_dir.h"
+
+#if defined OPENSSL_SYS_UNIX || defined OPENSSL_SYS_WIN32 || defined OPENSSL_SYS_WINCE
+#define CURRDIR "."
+#elif defined OPENSSL_SYS_VMS
+#define CURRDIR "SYS$DISK:[]"
+#else
+#error "No supported platform defined!"
+#endif
+
+int main()
+{
+  OPENSSL_DIR_CTX *ctx = NULL;
+  const char *result;
+
+  while((result = OPENSSL_DIR_read(&ctx, CURRDIR)) != NULL)
+    {
+      printf("%s\n", result);
+    }
+
+  if (errno)
+    {
+      perror("test_dir");
+      exit(1);
+    }
+
+  if (!OPENSSL_DIR_end(&ctx))
+    {
+      perror("test_dir");
+      exit(2);
+    }
+  exit(0);
+}
diff --git a/src/lib/libssl/src/crypto/perlasm/alpha.pl b/src/lib/libssl/src/crypto/perlasm/alpha.pl
deleted file mode 100644
index 3dac571743..0000000000
--- a/src/lib/libssl/src/crypto/perlasm/alpha.pl
+++ /dev/null
@@ -1,434 +0,0 @@
-#!/usr/local/bin/perl
-
-package alpha;
-use Carp qw(croak cluck);
-
-$label="100";
-
-$n_debug=0;
-$smear_regs=1;
-$reg_alloc=1;
-
-$align="3";
-$com_start="#";
-
-sub main'asm_init_output { @out=(); }
-sub main'asm_get_output { return(@out); }
-sub main'get_labels { return(@labels); }
-sub main'external_label { push(@labels,@_); }
-
-# General registers
-
-%regs=( 'r0',   '$0',
-        'r1',   '$1',
-        'r2',   '$2',
-        'r3',   '$3',
-        'r4',   '$4',
-        'r5',   '$5',
-        'r6',   '$6',
-        'r7',   '$7',
-        'r8',   '$8',
-        'r9',   '$22',
-        'r10',  '$23',
-        'r11',  '$24',
-        'r12',  '$25',
-        'r13',  '$27',
-        'r14',  '$28',
-        'r15',  '$21', # argc == 5
-        'r16',  '$20', # argc == 4
-        'r17',  '$19', # argc == 3
-        'r18',  '$18', # argc == 2
-        'r19',  '$17', # argc == 1
-        'r20',  '$16', # argc == 0
-        'r21',  '$9',  # save 0
-        'r22',  '$10', # save 1
-        'r23',  '$11', # save 2
-        'r24',  '$12', # save 3
-        'r25',  '$13', # save 4
-        'r26',  '$14', # save 5
-
-        'a0',   '$16',
-        'a1',   '$17',
-        'a2',   '$18',
-        'a3',   '$19',
-        'a4',   '$20',
-        'a5',   '$21',
-
-        's0',   '$9',
-        's1',   '$10',
-        's2',   '$11',
-        's3',   '$12',
-        's4',   '$13',
-        's5',   '$14',
-        'zero', '$31',
-        'sp',   '$30',
-        );
-
-$main'reg_s0="r21";
-$main'reg_s1="r22";
-$main'reg_s2="r23";
-$main'reg_s3="r24";
-$main'reg_s4="r25";
-$main'reg_s5="r26";
-
-@reg=(  '$0', '$1' ,'$2' ,'$3' ,'$4' ,'$5' ,'$6' ,'$7' ,'$8',
-        '$22','$23','$24','$25','$20','$21','$27','$28');
-
-
-sub main'sub    { &out3("subq",@_); }
-sub main'add    { &out3("addq",@_); }
-sub main'mov    { &out3("bis",$_[0],$_[0],$_[1]); }
-sub main'or     { &out3("bis",@_); }
-sub main'bis    { &out3("bis",@_); }
-sub main'br     { &out1("br",@_); }
-sub main'ld     { &out2("ldq",@_); }
-sub main'st     { &out2("stq",@_); }
-sub main'cmpult { &out3("cmpult",@_); }
-sub main'cmplt  { &out3("cmplt",@_); }
-sub main'bgt    { &out2("bgt",@_); }
-sub main'ble    { &out2("ble",@_); }
-sub main'blt    { &out2("blt",@_); }
-sub main'mul    { &out3("mulq",@_); }
-sub main'muh    { &out3("umulh",@_); }
-
-$main'QWS=8;
-
-sub main'asm_add
-        {
-        push(@out,@_);
-        }
-
-sub main'asm_finish
-        {
-        &main'file_end();
-        print &main'asm_get_output();
-        }
-
-sub main'asm_init
-        {
-        ($type,$fn)=@_;
-        $filename=$fn;
-
-        &main'asm_init_output();
-        &main'comment("Don't even think of reading this code");
-        &main'comment("It was automatically generated by $filename");
-        &main'comment("Which is a perl program used to generate the alpha assember.");
-        &main'comment("eric <eay\@cryptsoft.com>");
-        &main'comment("");
-
-        $filename =~ s/\.pl$//;
-        &main'file($filename);
-        }
-
-sub conv
-        {
-        local($r)=@_;
-        local($v);
-
-        return($regs{$r}) if defined($regs{$r});
-        return($r);
-        }
-
-sub main'QWPw
-        {
-        local($off,$reg)=@_;
-
-        return(&main'QWP($off*8,$reg));
-        }
-
-sub main'QWP
-        {
-        local($off,$reg)=@_;
-
-        $ret="$off(".&conv($reg).")";
-        return($ret);
-        }
-
-sub out3
-        {
-        local($name,$p1,$p2,$p3)=@_;
-
-        $p1=&conv($p1);
-        $p2=&conv($p2);
-        $p3=&conv($p3);
-        push(@out,"\t$name\t");
-        $l=length($p1)+1;
-        push(@out,$p1.",");
-        $ll=3-($l+9)/8;
-        $tmp1=sprintf("\t" x $ll);
-        push(@out,$tmp1);
-
-        $l=length($p2)+1;
-        push(@out,$p2.",");
-        $ll=3-($l+9)/8;
-        $tmp1=sprintf("\t" x $ll);
-        push(@out,$tmp1);
-
-        push(@out,&conv($p3)."\n");
-        }
-
-sub out2
-        {
-        local($name,$p1,$p2,$p3)=@_;
-
-        $p1=&conv($p1);
-        $p2=&conv($p2);
-        push(@out,"\t$name\t");
-        $l=length($p1)+1;
-        push(@out,$p1.",");
-        $ll=3-($l+9)/8;
-        $tmp1=sprintf("\t" x $ll);
-        push(@out,$tmp1);
-
-        push(@out,&conv($p2)."\n");
-        }
-
-sub out1
-        {
-        local($name,$p1)=@_;
-
-        $p1=&conv($p1);
-        push(@out,"\t$name\t".$p1."\n");
-        }
-
-sub out0
-        {
-        push(@out,"\t$_[0]\n");
-        }
-
-sub main'file
-        {
-        local($file)=@_;
-
-        local($tmp)=<<"EOF";
- # DEC Alpha assember
- # Generated from perl scripts contains in SSLeay
-        .file   1 "$file.s"
-        .set noat
-EOF
-        push(@out,$tmp);
-        }
-
-sub main'function_begin
-        {
-        local($func)=@_;
-
-print STDERR "$func\n";
-        local($tmp)=<<"EOF";
-        .text
-        .align $align
-        .globl $func
-        .ent $func
-${func}:
-${func}..ng:
-        .frame \$30,0,\$26,0
-        .prologue 0
-EOF
-        push(@out,$tmp);
-        $stack=0;
-        }
-
-sub main'function_end
-        {
-        local($func)=@_;
-
-        local($tmp)=<<"EOF";
-        ret     \$31,(\$26),1
-        .end $func
-EOF
-        push(@out,$tmp);
-        $stack=0;
-        %label=();
-        }
-
-sub main'function_end_A
-        {
-        local($func)=@_;
-
-        local($tmp)=<<"EOF";
-        ret     \$31,(\$26),1
-EOF
-        push(@out,$tmp);
-        }
-
-sub main'function_end_B
-        {
-        local($func)=@_;
-
-        $func=$under.$func;
-
-        push(@out,"\t.end $func\n");
-        $stack=0;
-        %label=();
-        }
-
-sub main'wparam
-        {
-        local($num)=@_;
-
-        if ($num < 6)
-                {
-                $num=20-$num;
-                return("r$num");
-                }
-        else
-                { return(&main'QWP($stack+$num*8,"sp")); }
-        }
-
-sub main'stack_push
-        {
-        local($num)=@_;
-        $stack+=$num*8;
-        &main'sub("sp",$num*8,"sp");
-        }
-
-sub main'stack_pop
-        {
-        local($num)=@_;
-        $stack-=$num*8;
-        &main'add("sp",$num*8,"sp");
-        }
-
-sub main'swtmp
-        {
-        return(&main'QWP(($_[0])*8,"sp"));
-        }
-
-# Should use swtmp, which is above sp.  Linix can trash the stack above esp
-#sub main'wtmp
-#       {
-#       local($num)=@_;
-#
-#       return(&main'QWP(-($num+1)*4,"esp","",0));
-#       }
-
-sub main'comment
-        {
-        foreach (@_)
-                {
-                if (/^\s*$/)
-                        { push(@out,"\n"); }
-                else
-                        { push(@out,"\t$com_start $_ $com_end\n"); }
-                }
-        }
-
-sub main'label
-        {
-        if (!defined($label{$_[0]}))
-                {
-                $label{$_[0]}=$label;
-                $label++;
-                }
-        return('$'.$label{$_[0]});
-        }
-
-sub main'set_label
-        {
-        if (!defined($label{$_[0]}))
-                {
-                $label{$_[0]}=$label;
-                $label++;
-                }
-#       push(@out,".align $align\n") if ($_[1] != 0);
-        push(@out,'$'."$label{$_[0]}:\n");
-        }
-
-sub main'file_end
-        {
-        }
-
-sub main'data_word
-        {
-        push(@out,"\t.long $_[0]\n");
-        }
-
-@pool_free=();
-@pool_taken=();
-$curr_num=0;
-$max=0;
-
-sub main'init_pool
-        {
-        local($args)=@_;
-        local($i);
-
-        @pool_free=();
-        for ($i=(14+(6-$args)); $i >= 0; $i--)
-                {
-                push(@pool_free,"r$i");
-                }
-        print STDERR "START :register pool:@pool_free\n";
-        $curr_num=$max=0;
-        }
-
-sub main'fin_pool
-        {
-        printf STDERR "END %2d:register pool:@pool_free\n",$max;
-        }
-
-sub main'GR
-        {
-        local($r)=@_;
-        local($i,@n,$_);
-
-        foreach (@pool_free)
-                {
-                if ($r ne $_)
-                        { push(@n,$_); }
-                else
-                        {
-                        $curr_num++;
-                        $max=$curr_num if ($curr_num > $max);
-                        }
-                }
-        @pool_free=@n;
-print STDERR "GR:@pool_free\n" if $reg_alloc;
-        return(@_);
-        }
-
-sub main'NR
-        {
-        local($num)=@_;
-        local(@ret);
-
-        $num=1 if $num == 0;
-        ($#pool_free >= ($num-1)) || croak "out of registers: want $num, have @pool_free";
-        while ($num > 0)
-                {
-                push(@ret,pop @pool_free);
-                $curr_num++;
-                $max=$curr_num if ($curr_num > $max);
-                $num--
-                }
-        print STDERR "nr @ret\n" if $n_debug;
-print STDERR "NR:@pool_free\n" if $reg_alloc;
-        return(@ret);
-
-        }
-
-sub main'FR
-        {
-        local(@r)=@_;
-        local(@a,$v,$w);
-
-        print STDERR "fr @r\n" if $n_debug;
-#       cluck "fr @r";
-        for $w (@pool_free)
-                {
-                foreach $v (@r)
-                        {
-                        croak "double register free of $v (@pool_free)" if $w eq $v;
-                        }
-                }
-        foreach $v (@r)
-                {
-                croak "bad argument to FR" if ($v !~ /^r\d+$/);
-                if ($smear_regs)
-                        { unshift(@pool_free,$v); }
-                else    { push(@pool_free,$v); }
-                $curr_num--;
-                }
-print STDERR "FR:@pool_free\n" if $reg_alloc;
-        }
-1;
diff --git a/src/lib/libssl/src/crypto/perlasm/x86_64-xlate.pl b/src/lib/libssl/src/crypto/perlasm/x86_64-xlate.pl
new file mode 100755
index 0000000000..a4af769b4a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/perlasm/x86_64-xlate.pl
@@ -0,0 +1,554 @@
+#!/usr/bin/env perl
+
+# Ascetic x86_64 AT&T to MASM assembler translator by <appro>.
+#
+# Why AT&T to MASM and not vice versa? Several reasons. Because AT&T
+# format is way easier to parse. Because it's simpler to "gear" from
+# Unix ABI to Windows one [see cross-reference "card" at the end of
+# file]. Because Linux targets were available first...
+#
+# In addition the script also "distills" code suitable for GNU
+# assembler, so that it can be compiled with more rigid assemblers,
+# such as Solaris /usr/ccs/bin/as.
+#
+# This translator is not designed to convert *arbitrary* assembler
+# code from AT&T format to MASM one. It's designed to convert just
+# enough to provide for dual-ABI OpenSSL modules development...
+# There *are* limitations and you might have to modify your assembler
+# code or this script to achieve the desired result...
+#
+# Currently recognized limitations:
+#
+# - can't use multiple ops per line;
+# - indirect calls and jumps are not supported;
+#
+# Dual-ABI styling rules.
+#
+# 1. Adhere to Unix register and stack layout [see the end for
+#    explanation].
+# 2. Forget about "red zone," stick to more traditional blended
+#    stack frame allocation. If volatile storage is actually required
+#    that is. If not, just leave the stack as is.
+# 3. Functions tagged with ".type name,@function" get crafted with
+#    unified Win64 prologue and epilogue automatically. If you want
+#    to take care of ABI differences yourself, tag functions as
+#    ".type name,@abi-omnipotent" instead.
+# 4. To optimize the Win64 prologue you can specify number of input
+#    arguments as ".type name,@function,N." Keep in mind that if N is
+#    larger than 6, then you *have to* write "abi-omnipotent" code,
+#    because >6 cases can't be addressed with unified prologue.
+# 5. Name local labels as .L*, do *not* use dynamic labels such as 1:
+#    (sorry about latter).
+# 6. Don't use [or hand-code with .byte] "rep ret." "ret" mnemonic is
+#    required to identify the spots, where to inject Win64 epilogue!
+#    But on the pros, it's then prefixed with rep automatically:-)
+# 7. Due to MASM limitations [and certain general counter-intuitivity
+#    of ip-relative addressing] generation of position-independent
+#    code is assisted by synthetic directive, .picmeup, which puts
+#    address of the *next* instruction into target register.
+#
+#    Example 1:
+#               .picmeup        %rax
+#               lea             .Label-.(%rax),%rax
+#    Example 2:
+#               .picmeup        %rcx
+#       .Lpic_point:
+#               ...
+#               lea             .Label-.Lpic_point(%rcx),%rbp
+
+my $output = shift;
+
+{ my ($stddev,$stdino,@junk)=stat(STDOUT);
+  my ($outdev,$outino,@junk)=stat($output);
+
+    open STDOUT,">$output" || die "can't open $output: $!"
+        if ($stddev!=$outdev || $stdino!=$outino);
+}
+
+my $masmref=8 + 50727*2**-32;   # 8.00.50727 shipped with VS2005
+my $masm=$masmref if ($output =~ /\.asm/);
+if ($masm && `ml64 2>&1` =~ m/Version ([0-9]+)\.([0-9]+)(\.([0-9]+))?/)
+{   $masm=$1 + $2*2**-16 + $4*2**-32;   }
+
+my $current_segment;
+my $current_function;
+
+{ package opcode;       # pick up opcodes
+    sub re {
+        my      $self = shift;  # single instance in enough...
+        local   *line = shift;
+        undef   $ret;
+
+        if ($line =~ /^([a-z][a-z0-9]*)/i) {
+            $self->{op} = $1;
+            $ret = $self;
+            $line = substr($line,@+[0]); $line =~ s/^\s+//;
+
+            undef $self->{sz};
+            if ($self->{op} =~ /^(movz)b.*/) {  # movz is pain...
+                $self->{op} = $1;
+                $self->{sz} = "b";
+            } elsif ($self->{op} =~ /call/) {
+                $self->{sz} = ""
+            } elsif ($self->{op} =~ /([a-z]{3,})([qlwb])$/) {
+                $self->{op} = $1;
+                $self->{sz} = $2;
+            }
+        }
+        $ret;
+    }
+    sub size {
+        my $self = shift;
+        my $sz   = shift;
+        $self->{sz} = $sz if (defined($sz) && !defined($self->{sz}));
+        $self->{sz};
+    }
+    sub out {
+        my $self = shift;
+        if (!$masm) {
+            if ($self->{op} eq "movz") {        # movz is pain...
+                sprintf "%s%s%s",$self->{op},$self->{sz},shift;
+            } elsif ($self->{op} =~ /^set/) { 
+                "$self->{op}";
+            } elsif ($self->{op} eq "ret") {
+                ".byte  0xf3,0xc3";
+            } else {
+                "$self->{op}$self->{sz}";
+            }
+        } else {
+            $self->{op} =~ s/^movz/movzx/;
+            if ($self->{op} eq "ret") {
+                $self->{op} = "";
+                if ($current_function->{abi} eq "svr4") {
+                    $self->{op} = "mov  rdi,QWORD PTR 8[rsp]\t;WIN64 epilogue\n\t".
+                                  "mov  rsi,QWORD PTR 16[rsp]\n\t";
+                }
+                $self->{op} .= "DB\t0F3h,0C3h\t\t;repret";
+            }
+            $self->{op};
+        }
+    }
+}
+{ package const;        # pick up constants, which start with $
+    sub re {
+        my      $self = shift;  # single instance in enough...
+        local   *line = shift;
+        undef   $ret;
+
+        if ($line =~ /^\$([^,]+)/) {
+            $self->{value} = $1;
+            $ret = $self;
+            $line = substr($line,@+[0]); $line =~ s/^\s+//;
+        }
+        $ret;
+    }
+    sub out {
+        my $self = shift;
+
+        if (!$masm) {
+            # Solaris /usr/ccs/bin/as can't handle multiplications
+            # in $self->{value}
+            $self->{value} =~ s/(?<![0-9a-f])(0[x0-9a-f]+)/oct($1)/egi;
+            $self->{value} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+            sprintf "\$%s",$self->{value};
+        } else {
+            $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig;
+            sprintf "%s",$self->{value};
+        }
+    }
+}
+{ package ea;           # pick up effective addresses: expr(%reg,%reg,scale)
+    sub re {
+        my      $self = shift;  # single instance in enough...
+        local   *line = shift;
+        undef   $ret;
+
+        if ($line =~ /^([^\(,]*)\(([%\w,]+)\)/) {
+            $self->{label} = $1;
+            ($self->{base},$self->{index},$self->{scale})=split(/,/,$2);
+            $self->{scale} = 1 if (!defined($self->{scale}));
+            $ret = $self;
+            $line = substr($line,@+[0]); $line =~ s/^\s+//;
+
+            $self->{base}  =~ s/^%//;
+            $self->{index} =~ s/^%// if (defined($self->{index}));
+        }
+        $ret;
+    }
+    sub size {}
+    sub out {
+        my $self = shift;
+        my $sz = shift;
+
+        # Silently convert all EAs to 64-bit. This is required for
+        # elder GNU assembler and results in more compact code,
+        # *but* most importantly AES module depends on this feature!
+        $self->{index} =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
+        $self->{base}  =~ s/^[er](.?[0-9xpi])[d]?$/r\1/;
+
+        if (!$masm) {
+            # Solaris /usr/ccs/bin/as can't handle multiplications
+            # in $self->{label}
+            $self->{label} =~ s/(?<![0-9a-f])(0[x0-9a-f]+)/oct($1)/egi;
+            $self->{label} =~ s/([0-9]+\s*[\*\/\%]\s*[0-9]+)/eval($1)/eg;
+
+            if (defined($self->{index})) {
+                sprintf "%s(%%%s,%%%s,%d)",
+                                        $self->{label},$self->{base},
+                                        $self->{index},$self->{scale};
+            } else {
+                sprintf "%s(%%%s)",     $self->{label},$self->{base};
+            }
+        } else {
+            %szmap = ( b=>"BYTE", w=>"WORD", l=>"DWORD", q=>"QWORD" );
+
+            $self->{label} =~ s/\./\$/g;
+            $self->{label} =~ s/0x([0-9a-f]+)/0$1h/ig;
+            $self->{label} = "($self->{label})" if ($self->{label} =~ /[\*\+\-\/]/);
+
+            if (defined($self->{index})) {
+                sprintf "%s PTR %s[%s*%d+%s]",$szmap{$sz},
+                                        $self->{label},
+                                        $self->{index},$self->{scale},
+                                        $self->{base};
+            } elsif ($self->{base} eq "rip") {
+                sprintf "%s PTR %s",$szmap{$sz},$self->{label};
+            } else {
+                sprintf "%s PTR %s[%s]",$szmap{$sz},
+                                        $self->{label},$self->{base};
+            }
+        }
+    }
+}
+{ package register;     # pick up registers, which start with %.
+    sub re {
+        my      $class = shift; # muliple instances...
+        my      $self = {};
+        local   *line = shift;
+        undef   $ret;
+
+        if ($line =~ /^%(\w+)/) {
+            bless $self,$class;
+            $self->{value} = $1;
+            $ret = $self;
+            $line = substr($line,@+[0]); $line =~ s/^\s+//;
+        }
+        $ret;
+    }
+    sub size {
+        my      $self = shift;
+        undef   $ret;
+
+        if    ($self->{value} =~ /^r[\d]+b$/i)  { $ret="b"; }
+        elsif ($self->{value} =~ /^r[\d]+w$/i)  { $ret="w"; }
+        elsif ($self->{value} =~ /^r[\d]+d$/i)  { $ret="l"; }
+        elsif ($self->{value} =~ /^r[\w]+$/i)   { $ret="q"; }
+        elsif ($self->{value} =~ /^[a-d][hl]$/i){ $ret="b"; }
+        elsif ($self->{value} =~ /^[\w]{2}l$/i) { $ret="b"; }
+        elsif ($self->{value} =~ /^[\w]{2}$/i)  { $ret="w"; }
+        elsif ($self->{value} =~ /^e[a-z]{2}$/i){ $ret="l"; }
+
+        $ret;
+    }
+    sub out {
+        my $self = shift;
+        sprintf $masm?"%s":"%%%s",$self->{value};
+    }
+}
+{ package label;        # pick up labels, which end with :
+    sub re {
+        my      $self = shift;  # single instance is enough...
+        local   *line = shift;
+        undef   $ret;
+
+        if ($line =~ /(^[\.\w]+\:)/) {
+            $self->{value} = $1;
+            $ret = $self;
+            $line = substr($line,@+[0]); $line =~ s/^\s+//;
+
+            $self->{value} =~ s/\.L/\$L/ if ($masm);
+        }
+        $ret;
+    }
+    sub out {
+        my $self = shift;
+
+        if (!$masm) {
+            $self->{value};
+        } elsif ($self->{value} ne "$current_function->{name}:") {
+            $self->{value};
+        } elsif ($current_function->{abi} eq "svr4") {
+            my $func =  "$current_function->{name}      PROC\n".
+                        "       mov     QWORD PTR 8[rsp],rdi\t;WIN64 prologue\n".
+                        "       mov     QWORD PTR 16[rsp],rsi\n";
+            my $narg = $current_function->{narg};
+            $narg=6 if (!defined($narg));
+            $func .= "  mov     rdi,rcx\n" if ($narg>0);
+            $func .= "  mov     rsi,rdx\n" if ($narg>1);
+            $func .= "  mov     rdx,r8\n"  if ($narg>2);
+            $func .= "  mov     rcx,r9\n"  if ($narg>3);
+            $func .= "  mov     r8,QWORD PTR 40[rsp]\n" if ($narg>4);
+            $func .= "  mov     r9,QWORD PTR 48[rsp]\n" if ($narg>5);
+            $func .= "\n";
+        } else {
+           "$current_function->{name}   PROC";
+        }
+    }
+}
+{ package expr;         # pick up expressioins
+    sub re {
+        my      $self = shift;  # single instance is enough...
+        local   *line = shift;
+        undef   $ret;
+
+        if ($line =~ /(^[^,]+)/) {
+            $self->{value} = $1;
+            $ret = $self;
+            $line = substr($line,@+[0]); $line =~ s/^\s+//;
+
+            $self->{value} =~ s/\.L/\$L/g if ($masm);
+        }
+        $ret;
+    }
+    sub out {
+        my $self = shift;
+        $self->{value};
+    }
+}
+{ package directive;    # pick up directives, which start with .
+    sub re {
+        my      $self = shift;  # single instance is enough...
+        local   *line = shift;
+        undef   $ret;
+        my      $dir;
+        my      %opcode =       # lea 2f-1f(%rip),%dst; 1: nop; 2:
+                (       "%rax"=>0x01058d48,     "%rcx"=>0x010d8d48,
+                        "%rdx"=>0x01158d48,     "%rbx"=>0x011d8d48,
+                        "%rsp"=>0x01258d48,     "%rbp"=>0x012d8d48,
+                        "%rsi"=>0x01358d48,     "%rdi"=>0x013d8d48,
+                        "%r8" =>0x01058d4c,     "%r9" =>0x010d8d4c,
+                        "%r10"=>0x01158d4c,     "%r11"=>0x011d8d4c,
+                        "%r12"=>0x01258d4c,     "%r13"=>0x012d8d4c,
+                        "%r14"=>0x01358d4c,     "%r15"=>0x013d8d4c      );
+
+        if ($line =~ /^\s*(\.\w+)/) {
+            if (!$masm) {
+                $self->{value} = $1;
+                $line =~ s/\@abi\-omnipotent/\@function/;
+                $line =~ s/\@function.*/\@function/;
+                if ($line =~ /\.picmeup\s+(%r[\w]+)/i) {
+                    $self->{value} = sprintf "\t.long\t0x%x,0x90000000",$opcode{$1};
+                } elsif ($line =~ /\.asciz\s+"(.*)"$/) {
+                    $self->{value} = ".byte\t".join(",",unpack("C*",$1),0);
+                } elsif ($line =~ /\.extern/) {
+                    $self->{value} = ""; # swallow extern
+                } else {
+                    $self->{value} = $line;
+                }
+                $line = "";
+                return $self;
+            }
+
+            $dir = $1;
+            $ret = $self;
+            undef $self->{value};
+            $line = substr($line,@+[0]); $line =~ s/^\s+//;
+            SWITCH: for ($dir) {
+                /\.(text)/
+                            && do { my $v=undef;
+                                    $v="$current_segment\tENDS\n" if ($current_segment);
+                                    $current_segment = "_$1\$";
+                                    $current_segment =~ tr/[a-z]/[A-Z]/;
+                                    $v.="$current_segment\tSEGMENT ";
+                                    $v.=$masm>=$masmref ? "ALIGN(64)" : "PAGE";
+                                    $v.=" 'CODE'";
+                                    $self->{value} = $v;
+                                    last;
+                                  };
+                /\.extern/  && do { $self->{value} = "EXTRN\t".$line.":BYTE"; last;  };
+                /\.globl/   && do { $self->{value} = "PUBLIC\t".$line; last; };
+                /\.type/    && do { ($sym,$type,$narg) = split(',',$line);
+                                    if ($type eq "\@function") {
+                                        undef $current_function;
+                                        $current_function->{name} = $sym;
+                                        $current_function->{abi}  = "svr4";
+                                        $current_function->{narg} = $narg;
+                                    } elsif ($type eq "\@abi-omnipotent") {
+                                        undef $current_function;
+                                        $current_function->{name} = $sym;
+                                    }
+                                    last;
+                                  };
+                /\.size/    && do { if (defined($current_function)) {
+                                        $self->{value}="$current_function->{name}\tENDP";
+                                        undef $current_function;
+                                    }
+                                    last;
+                                  };
+                /\.align/   && do { $self->{value} = "ALIGN\t".$line; last; };
+                /\.(byte|value|long|quad)/
+                            && do { my @arr = split(',',$line);
+                                    my $sz  = substr($1,0,1);
+                                    my $last = pop(@arr);
+                                    my $conv = sub  {   my $var=shift;
+                                                        if ($var=~s/0x([0-9a-f]+)/0$1h/i) { $var; }
+                                                        else { sprintf"0%Xh",$var; }
+                                                    };  
+
+                                    $sz =~ tr/bvlq/BWDQ/;
+                                    $self->{value} = "\tD$sz\t";
+                                    for (@arr) { $self->{value} .= &$conv($_).","; }
+                                    $self->{value} .= &$conv($last);
+                                    last;
+                                  };
+                /\.picmeup/ && do { $self->{value} = sprintf"\tDD\t 0%Xh,090000000h",$opcode{$line};
+                                    last;
+                                  };
+                /\.asciz/   && do { if ($line =~ /^"(.*)"$/) {
+                                        my @str=unpack("C*",$1);
+                                        push @str,0;
+                                        while ($#str>15) {
+                                            $self->{value}.="DB\t"
+                                                .join(",",@str[0..15])."\n";
+                                            foreach (0..15) { shift @str; }
+                                        }
+                                        $self->{value}.="DB\t"
+                                                .join(",",@str) if (@str);
+                                    }
+                                    last;
+                                  };
+            }
+            $line = "";
+        }
+
+        $ret;
+    }
+    sub out {
+        my $self = shift;
+        $self->{value};
+    }
+}
+
+while($line=<>) {
+
+    chomp($line);
+
+    $line =~ s|[#!].*$||;       # get rid of asm-style comments...
+    $line =~ s|/\*.*\*/||;      # ... and C-style comments...
+    $line =~ s|^\s+||;          # ... and skip white spaces in beginning
+
+    undef $label;
+    undef $opcode;
+    undef $dst;
+    undef $src;
+    undef $sz;
+
+    if ($label=label->re(\$line))       { print $label->out(); }
+
+    if (directive->re(\$line)) {
+        printf "%s",directive->out();
+    } elsif ($opcode=opcode->re(\$line)) { ARGUMENT: {
+
+        if ($src=register->re(\$line))  { opcode->size($src->size()); }
+        elsif ($src=const->re(\$line))  { }
+        elsif ($src=ea->re(\$line))     { }
+        elsif ($src=expr->re(\$line))   { }
+
+        last ARGUMENT if ($line !~ /^,/);
+
+        $line = substr($line,1); $line =~ s/^\s+//;
+
+        if ($dst=register->re(\$line))  { opcode->size($dst->size()); }
+        elsif ($dst=const->re(\$line))  { }
+        elsif ($dst=ea->re(\$line))     { }
+
+        } # ARGUMENT:
+
+        $sz=opcode->size();
+
+        if (defined($dst)) {
+            if (!$masm) {
+                printf "\t%s\t%s,%s",   $opcode->out($dst->size()),
+                                        $src->out($sz),$dst->out($sz);
+            } else {
+                printf "\t%s\t%s,%s",   $opcode->out(),
+                                        $dst->out($sz),$src->out($sz);
+            }
+        } elsif (defined($src)) {
+            printf "\t%s\t%s",$opcode->out(),$src->out($sz);
+        } else {
+            printf "\t%s",$opcode->out();
+        }
+    }
+
+    print $line,"\n";
+}
+
+print "\n$current_segment\tENDS\nEND\n" if ($masm);
+
+close STDOUT;
+
+#################################################
+# Cross-reference x86_64 ABI "card"
+#
+#               Unix            Win64
+# %rax          *               *
+# %rbx          -               -
+# %rcx          #4              #1
+# %rdx          #3              #2
+# %rsi          #2              -
+# %rdi          #1              -
+# %rbp          -               -
+# %rsp          -               -
+# %r8           #5              #3
+# %r9           #6              #4
+# %r10          *               *
+# %r11          *               *
+# %r12          -               -
+# %r13          -               -
+# %r14          -               -
+# %r15          -               -
+# 
+# (*)   volatile register
+# (-)   preserved by callee
+# (#)   Nth argument, volatile
+#
+# In Unix terms top of stack is argument transfer area for arguments
+# which could not be accomodated in registers. Or in other words 7th
+# [integer] argument resides at 8(%rsp) upon function entry point.
+# 128 bytes above %rsp constitute a "red zone" which is not touched
+# by signal handlers and can be used as temporal storage without
+# allocating a frame.
+#
+# In Win64 terms N*8 bytes on top of stack is argument transfer area,
+# which belongs to/can be overwritten by callee. N is the number of
+# arguments passed to callee, *but* not less than 4! This means that
+# upon function entry point 5th argument resides at 40(%rsp), as well
+# as that 32 bytes from 8(%rsp) can always be used as temporal
+# storage [without allocating a frame]. One can actually argue that
+# one can assume a "red zone" above stack pointer under Win64 as well.
+# Point is that at apparently no occasion Windows kernel would alter
+# the area above user stack pointer in true asynchronous manner...
+#
+# All the above means that if assembler programmer adheres to Unix
+# register and stack layout, but disregards the "red zone" existense,
+# it's possible to use following prologue and epilogue to "gear" from
+# Unix to Win64 ABI in leaf functions with not more than 6 arguments.
+#
+# omnipotent_function:
+# ifdef WIN64
+#       movq    %rdi,8(%rsp)
+#       movq    %rsi,16(%rsp)
+#       movq    %rcx,%rdi       ; if 1st argument is actually present
+#       movq    %rdx,%rsi       ; if 2nd argument is actually ...
+#       movq    %r8,%rdx        ; if 3rd argument is ...
+#       movq    %r9,%rcx        ; if 4th argument ...
+#       movq    40(%rsp),%r8    ; if 5th ...
+#       movq    48(%rsp),%r9    ; if 6th ...
+# endif
+#       ...
+# ifdef WIN64
+#       movq    8(%rsp),%rdi
+#       movq    16(%rsp),%rsi
+# endif
+#       ret
diff --git a/src/lib/libssl/src/crypto/pqueue/Makefile b/src/lib/libssl/src/crypto/pqueue/Makefile
new file mode 100644
index 0000000000..d0c39d25ce
--- /dev/null
+++ b/src/lib/libssl/src/crypto/pqueue/Makefile
@@ -0,0 +1,84 @@
+#
+# OpenSSL/crypto/pqueue/Makefile
+#
+
+DIR=    pqueue
+TOP=    ../..
+CC=     cc
+INCLUDES=
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=pqueue.c
+LIBOBJ=pqueue.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= pqueue.h pq_compat.h
+HEADER= $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+pqueue.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
+pqueue.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+pqueue.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+pqueue.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+pqueue.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+pqueue.o: ../../include/openssl/pq_compat.h ../../include/openssl/safestack.h
+pqueue.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+pqueue.o: ../cryptlib.h pqueue.c pqueue.h
diff --git a/src/lib/libssl/src/crypto/pqueue/pq_test.c b/src/lib/libssl/src/crypto/pqueue/pq_test.c
new file mode 100644
index 0000000000..8d496dfc65
--- /dev/null
+++ b/src/lib/libssl/src/crypto/pqueue/pq_test.c
@@ -0,0 +1,95 @@
+/* crypto/pqueue/pq_test.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "pqueue.h"
+
+int
+main(void)
+        {
+        pitem *item;
+        pqueue pq;
+
+        pq = pqueue_new();
+
+        item = pitem_new(3, NULL);
+        pqueue_insert(pq, item);
+
+        item = pitem_new(1, NULL);
+        pqueue_insert(pq, item);
+
+        item = pitem_new(2, NULL);
+        pqueue_insert(pq, item);
+
+        item = pqueue_find(pq, 1);
+        fprintf(stderr, "found %ld\n", item->priority);
+
+        item = pqueue_find(pq, 2);
+        fprintf(stderr, "found %ld\n", item->priority);
+
+        item = pqueue_find(pq, 3);
+        fprintf(stderr, "found %ld\n", item ? item->priority: 0);
+
+        pqueue_print(pq);
+
+        for(item = pqueue_pop(pq); item != NULL; item = pqueue_pop(pq))
+                pitem_free(item);
+
+        pqueue_free(pq);
+        return 0;
+        }
diff --git a/src/lib/libssl/src/crypto/pqueue/pqueue.c b/src/lib/libssl/src/crypto/pqueue/pqueue.c
new file mode 100644
index 0000000000..5cc18527f8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/pqueue/pqueue.c
@@ -0,0 +1,236 @@
+/* crypto/pqueue/pqueue.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+#include <openssl/bn.h>
+#include "pqueue.h"
+
+typedef struct _pqueue
+        {
+        pitem *items;
+        int count;
+        } pqueue_s;
+
+pitem *
+pitem_new(PQ_64BIT priority, void *data)
+        {
+        pitem *item = (pitem *) OPENSSL_malloc(sizeof(pitem));
+        if (item == NULL) return NULL;
+
+        pq_64bit_init(&(item->priority));
+        pq_64bit_assign(&item->priority, &priority);
+
+        item->data = data;
+        item->next = NULL;
+
+        return item;
+        }
+
+void
+pitem_free(pitem *item)
+        {
+        if (item == NULL) return;
+
+        pq_64bit_free(&(item->priority));
+        OPENSSL_free(item);
+        }
+
+pqueue_s *
+pqueue_new()
+        {
+        pqueue_s *pq = (pqueue_s *) OPENSSL_malloc(sizeof(pqueue_s));
+        if (pq == NULL) return NULL;
+
+        memset(pq, 0x00, sizeof(pqueue_s));
+        return pq;
+        }
+
+void
+pqueue_free(pqueue_s *pq)
+        {
+        if (pq == NULL) return;
+
+        OPENSSL_free(pq);
+        }
+
+pitem *
+pqueue_insert(pqueue_s *pq, pitem *item)
+        {
+        pitem *curr, *next;
+
+        if (pq->items == NULL)
+                {
+                pq->items = item;
+                return item;
+                }
+
+        for(curr = NULL, next = pq->items; 
+                next != NULL;
+                curr = next, next = next->next)
+                {
+                if (pq_64bit_gt(&(next->priority), &(item->priority)))
+                        {
+                        item->next = next;
+
+                        if (curr == NULL) 
+                                pq->items = item;
+                        else  
+                                curr->next = item;
+
+                        return item;
+                        }
+                /* duplicates not allowed */
+                if (pq_64bit_eq(&(item->priority), &(next->priority)))
+                        return NULL;
+                }
+
+        item->next = NULL;
+        curr->next = item;
+
+        return item;
+        }
+
+pitem *
+pqueue_peek(pqueue_s *pq)
+        {
+        return pq->items;
+        }
+
+pitem *
+pqueue_pop(pqueue_s *pq)
+        {
+        pitem *item = pq->items;
+
+        if (pq->items != NULL)
+                pq->items = pq->items->next;
+
+        return item;
+        }
+
+pitem *
+pqueue_find(pqueue_s *pq, PQ_64BIT priority)
+        {
+        pitem *next, *prev = NULL;
+        pitem *found = NULL;
+
+        if ( pq->items == NULL)
+                return NULL;
+
+        for ( next = pq->items; next->next != NULL; 
+                  prev = next, next = next->next)
+                {
+                if ( pq_64bit_eq(&(next->priority), &priority))
+                        {
+                        found = next;
+                        break;
+                        }
+                }
+        
+        /* check the one last node */
+        if ( pq_64bit_eq(&(next->priority), &priority))
+                found = next;
+
+        if ( ! found)
+                return NULL;
+
+#if 0 /* find works in peek mode */
+        if ( prev == NULL)
+                pq->items = next->next;
+        else
+                prev->next = next->next;
+#endif
+
+        return found;
+        }
+
+#if PQ_64BIT_IS_INTEGER
+void
+pqueue_print(pqueue_s *pq)
+        {
+        pitem *item = pq->items;
+
+        while(item != NULL)
+                {
+                printf("item\t" PQ_64BIT_PRINT "\n", item->priority);
+                item = item->next;
+                }
+        }
+#endif
+
+pitem *
+pqueue_iterator(pqueue_s *pq)
+        {
+        return pqueue_peek(pq);
+        }
+
+pitem *
+pqueue_next(pitem **item)
+        {
+        pitem *ret;
+
+        if ( item == NULL || *item == NULL)
+                return NULL;
+
+
+        /* *item != NULL */
+        ret = *item;
+        *item = (*item)->next;
+
+        return ret;
+        }
diff --git a/src/lib/libssl/src/crypto/pqueue/pqueue.h b/src/lib/libssl/src/crypto/pqueue/pqueue.h
new file mode 100644
index 0000000000..02386d130e
--- /dev/null
+++ b/src/lib/libssl/src/crypto/pqueue/pqueue.h
@@ -0,0 +1,95 @@
+/* crypto/pqueue/pqueue.h */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_PQUEUE_H
+#define HEADER_PQUEUE_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <openssl/pq_compat.h>
+
+typedef struct _pqueue *pqueue;
+
+typedef struct _pitem
+        {
+        PQ_64BIT priority;
+        void *data;
+        struct _pitem *next;
+        } pitem;
+
+typedef struct _pitem *piterator;
+
+pitem *pitem_new(PQ_64BIT priority, void *data);
+void   pitem_free(pitem *item);
+
+pqueue pqueue_new(void);
+void   pqueue_free(pqueue pq);
+
+pitem *pqueue_insert(pqueue pq, pitem *item);
+pitem *pqueue_peek(pqueue pq);
+pitem *pqueue_pop(pqueue pq);
+pitem *pqueue_find(pqueue pq, PQ_64BIT priority);
+pitem *pqueue_iterator(pqueue pq);
+pitem *pqueue_next(piterator *iter);
+
+void   pqueue_print(pqueue pq);
+
+#endif /* ! HEADER_PQUEUE_H */
diff --git a/src/lib/libssl/src/crypto/rand/rand_nw.c b/src/lib/libssl/src/crypto/rand/rand_nw.c
new file mode 100644
index 0000000000..f177ffbe82
--- /dev/null
+++ b/src/lib/libssl/src/crypto/rand/rand_nw.c
@@ -0,0 +1,183 @@
+/* crypto/rand/rand_nw.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2000 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+#include <openssl/rand.h>
+#include "rand_lcl.h"
+
+#if defined (OPENSSL_SYS_NETWARE)
+
+#if defined(NETWARE_LIBC)
+#include <nks/thread.h>
+#else
+#include <nwthread.h>
+#endif
+
+extern int GetProcessSwitchCount(void);
+#if !defined(NETWARE_LIBC) || (CURRENT_NDK_THRESHOLD < 509220000)
+extern void *RunningProcess; /* declare here same as found in newer NDKs */
+extern unsigned long GetSuperHighResolutionTimer(void);
+#endif
+
+   /* the FAQ indicates we need to provide at least 20 bytes (160 bits) of seed
+   */
+int RAND_poll(void)
+{
+   unsigned long l;
+   unsigned long tsc;
+   int i; 
+
+      /* There are several options to gather miscellaneous data
+       * but for now we will loop checking the time stamp counter (rdtsc) and
+       * the SuperHighResolutionTimer.  Each iteration will collect 8 bytes
+       * of data but it is treated as only 1 byte of entropy.  The call to
+       * ThreadSwitchWithDelay() will introduce additional variability into
+       * the data returned by rdtsc.
+       *
+       * Applications can agument the seed material by adding additional
+       * stuff with RAND_add() and should probably do so.
+      */
+   l = GetProcessSwitchCount();
+   RAND_add(&l,sizeof(l),1);
+   
+   /* need to cast the void* to unsigned long here */
+   l = (unsigned long)RunningProcess;
+   RAND_add(&l,sizeof(l),1);
+
+   for( i=2; i<ENTROPY_NEEDED; i++)
+   {
+#ifdef __MWERKS__
+      asm 
+      {
+         rdtsc
+         mov tsc, eax        
+      }
+#else
+      asm volatile("rdtsc":"=A" (tsc));
+#endif
+
+      RAND_add(&tsc, sizeof(tsc), 1);
+
+      l = GetSuperHighResolutionTimer();
+      RAND_add(&l, sizeof(l), 0);
+
+# if defined(NETWARE_LIBC)
+      NXThreadYield();
+# else /* NETWARE_CLIB */
+      ThreadSwitchWithDelay();
+# endif
+   }
+
+   return 1;
+}
+
+#endif 
+
diff --git a/src/lib/libssl/src/crypto/rc4/asm/rc4-x86_64.pl b/src/lib/libssl/src/crypto/rc4/asm/rc4-x86_64.pl
new file mode 100755
index 0000000000..2d47320485
--- /dev/null
+++ b/src/lib/libssl/src/crypto/rc4/asm/rc4-x86_64.pl
@@ -0,0 +1,364 @@
+#!/usr/bin/env perl
+#
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. The module is, however, dual licensed under OpenSSL and
+# CRYPTOGAMS licenses depending on where you obtain it. For further
+# details see http://www.openssl.org/~appro/cryptogams/.
+# ====================================================================
+#
+# 2.22x RC4 tune-up:-) It should be noted though that my hand [as in
+# "hand-coded assembler"] doesn't stand for the whole improvement
+# coefficient. It turned out that eliminating RC4_CHAR from config
+# line results in ~40% improvement (yes, even for C implementation).
+# Presumably it has everything to do with AMD cache architecture and
+# RAW or whatever penalties. Once again! The module *requires* config
+# line *without* RC4_CHAR! As for coding "secret," I bet on partial
+# register arithmetics. For example instead of 'inc %r8; and $255,%r8'
+# I simply 'inc %r8b'. Even though optimization manual discourages
+# to operate on partial registers, it turned out to be the best bet.
+# At least for AMD... How IA32E would perform remains to be seen...
+
+# As was shown by Marc Bevand reordering of couple of load operations
+# results in even higher performance gain of 3.3x:-) At least on
+# Opteron... For reference, 1x in this case is RC4_CHAR C-code
+# compiled with gcc 3.3.2, which performs at ~54MBps per 1GHz clock.
+# Latter means that if you want to *estimate* what to expect from
+# *your* Opteron, then multiply 54 by 3.3 and clock frequency in GHz.
+
+# Intel P4 EM64T core was found to run the AMD64 code really slow...
+# The only way to achieve comparable performance on P4 was to keep
+# RC4_CHAR. Kind of ironic, huh? As it's apparently impossible to
+# compose blended code, which would perform even within 30% marginal
+# on either AMD and Intel platforms, I implement both cases. See
+# rc4_skey.c for further details...
+
+# P4 EM64T core appears to be "allergic" to 64-bit inc/dec. Replacing 
+# those with add/sub results in 50% performance improvement of folded
+# loop...
+
+# As was shown by Zou Nanhai loop unrolling can improve Intel EM64T
+# performance by >30% [unlike P4 32-bit case that is]. But this is
+# provided that loads are reordered even more aggressively! Both code
+# pathes, AMD64 and EM64T, reorder loads in essentially same manner
+# as my IA-64 implementation. On Opteron this resulted in modest 5%
+# improvement [I had to test it], while final Intel P4 performance
+# achieves respectful 432MBps on 2.8GHz processor now. For reference.
+# If executed on Xeon, current RC4_CHAR code-path is 2.7x faster than
+# RC4_INT code-path. While if executed on Opteron, it's only 25%
+# slower than the RC4_INT one [meaning that if CPU µ-arch detection
+# is not implemented, then this final RC4_CHAR code-path should be
+# preferred, as it provides better *all-round* performance].
+
+# Intel Core2 was observed to perform poorly on both code paths:-( It
+# apparently suffers from some kind of partial register stall, which
+# occurs in 64-bit mode only [as virtually identical 32-bit loop was
+# observed to outperform 64-bit one by almost 50%]. Adding two movzb to
+# cloop1 boosts its performance by 80%! This loop appears to be optimal
+# fit for Core2 and therefore the code was modified to skip cloop8 on
+# this CPU.
+
+$output=shift;
+
+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
+( $xlate="${dir}x86_64-xlate.pl" and -f $xlate ) or
+( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
+die "can't locate x86_64-xlate.pl";
+
+open STDOUT,"| $^X $xlate $output";
+
+$dat="%rdi";        # arg1
+$len="%rsi";        # arg2
+$inp="%rdx";        # arg3
+$out="%rcx";        # arg4
+
+@XX=("%r8","%r10");
+@TX=("%r9","%r11");
+$YY="%r12";
+$TY="%r13";
+
+$code=<<___;
+.text
+
+.globl  RC4
+.type   RC4,\@function,4
+.align  16
+RC4:    or      $len,$len
+        jne     .Lentry
+        ret
+.Lentry:
+        push    %r12
+        push    %r13
+
+        add     \$8,$dat
+        movl    -8($dat),$XX[0]#d
+        movl    -4($dat),$YY#d
+        cmpl    \$-1,256($dat)
+        je      .LRC4_CHAR
+        inc     $XX[0]#b
+        movl    ($dat,$XX[0],4),$TX[0]#d
+        test    \$-8,$len
+        jz      .Lloop1
+        jmp     .Lloop8
+.align  16
+.Lloop8:
+___
+for ($i=0;$i<8;$i++) {
+$code.=<<___;
+        add     $TX[0]#b,$YY#b
+        mov     $XX[0],$XX[1]
+        movl    ($dat,$YY,4),$TY#d
+        ror     \$8,%rax                        # ror is redundant when $i=0
+        inc     $XX[1]#b
+        movl    ($dat,$XX[1],4),$TX[1]#d
+        cmp     $XX[1],$YY
+        movl    $TX[0]#d,($dat,$YY,4)
+        cmove   $TX[0],$TX[1]
+        movl    $TY#d,($dat,$XX[0],4)
+        add     $TX[0]#b,$TY#b
+        movb    ($dat,$TY,4),%al
+___
+push(@TX,shift(@TX)); push(@XX,shift(@XX));     # "rotate" registers
+}
+$code.=<<___;
+        ror     \$8,%rax
+        sub     \$8,$len
+
+        xor     ($inp),%rax
+        add     \$8,$inp
+        mov     %rax,($out)
+        add     \$8,$out
+
+        test    \$-8,$len
+        jnz     .Lloop8
+        cmp     \$0,$len
+        jne     .Lloop1
+___
+$code.=<<___;
+.Lexit:
+        sub     \$1,$XX[0]#b
+        movl    $XX[0]#d,-8($dat)
+        movl    $YY#d,-4($dat)
+
+        pop     %r13
+        pop     %r12
+        ret
+.align  16
+.Lloop1:
+        add     $TX[0]#b,$YY#b
+        movl    ($dat,$YY,4),$TY#d
+        movl    $TX[0]#d,($dat,$YY,4)
+        movl    $TY#d,($dat,$XX[0],4)
+        add     $TY#b,$TX[0]#b
+        inc     $XX[0]#b
+        movl    ($dat,$TX[0],4),$TY#d
+        movl    ($dat,$XX[0],4),$TX[0]#d
+        xorb    ($inp),$TY#b
+        inc     $inp
+        movb    $TY#b,($out)
+        inc     $out
+        dec     $len
+        jnz     .Lloop1
+        jmp     .Lexit
+
+.align  16
+.LRC4_CHAR:
+        add     \$1,$XX[0]#b
+        movzb   ($dat,$XX[0]),$TX[0]#d
+        test    \$-8,$len
+        jz      .Lcloop1
+        cmp     \$0,260($dat)
+        jnz     .Lcloop1
+        push    %rbx
+        jmp     .Lcloop8
+.align  16
+.Lcloop8:
+        mov     ($inp),%eax
+        mov     4($inp),%ebx
+___
+# unroll 2x4-wise, because 64-bit rotates kill Intel P4...
+for ($i=0;$i<4;$i++) {
+$code.=<<___;
+        add     $TX[0]#b,$YY#b
+        lea     1($XX[0]),$XX[1]
+        movzb   ($dat,$YY),$TY#d
+        movzb   $XX[1]#b,$XX[1]#d
+        movzb   ($dat,$XX[1]),$TX[1]#d
+        movb    $TX[0]#b,($dat,$YY)
+        cmp     $XX[1],$YY
+        movb    $TY#b,($dat,$XX[0])
+        jne     .Lcmov$i                        # Intel cmov is sloooow...
+        mov     $TX[0],$TX[1]
+.Lcmov$i:
+        add     $TX[0]#b,$TY#b
+        xor     ($dat,$TY),%al
+        ror     \$8,%eax
+___
+push(@TX,shift(@TX)); push(@XX,shift(@XX));     # "rotate" registers
+}
+for ($i=4;$i<8;$i++) {
+$code.=<<___;
+        add     $TX[0]#b,$YY#b
+        lea     1($XX[0]),$XX[1]
+        movzb   ($dat,$YY),$TY#d
+        movzb   $XX[1]#b,$XX[1]#d
+        movzb   ($dat,$XX[1]),$TX[1]#d
+        movb    $TX[0]#b,($dat,$YY)
+        cmp     $XX[1],$YY
+        movb    $TY#b,($dat,$XX[0])
+        jne     .Lcmov$i                        # Intel cmov is sloooow...
+        mov     $TX[0],$TX[1]
+.Lcmov$i:
+        add     $TX[0]#b,$TY#b
+        xor     ($dat,$TY),%bl
+        ror     \$8,%ebx
+___
+push(@TX,shift(@TX)); push(@XX,shift(@XX));     # "rotate" registers
+}
+$code.=<<___;
+        lea     -8($len),$len
+        mov     %eax,($out)
+        lea     8($inp),$inp
+        mov     %ebx,4($out)
+        lea     8($out),$out
+
+        test    \$-8,$len
+        jnz     .Lcloop8
+        pop     %rbx
+        cmp     \$0,$len
+        jne     .Lcloop1
+        jmp     .Lexit
+___
+$code.=<<___;
+.align  16
+.Lcloop1:
+        add     $TX[0]#b,$YY#b
+        movzb   ($dat,$YY),$TY#d
+        movb    $TX[0]#b,($dat,$YY)
+        movb    $TY#b,($dat,$XX[0])
+        add     $TX[0]#b,$TY#b
+        add     \$1,$XX[0]#b
+        movzb   $TY#b,$TY#d
+        movzb   $XX[0]#b,$XX[0]#d
+        movzb   ($dat,$TY),$TY#d
+        movzb   ($dat,$XX[0]),$TX[0]#d
+        xorb    ($inp),$TY#b
+        lea     1($inp),$inp
+        movb    $TY#b,($out)
+        lea     1($out),$out
+        sub     \$1,$len
+        jnz     .Lcloop1
+        jmp     .Lexit
+.size   RC4,.-RC4
+___
+
+$idx="%r8";
+$ido="%r9";
+
+$code.=<<___;
+.extern OPENSSL_ia32cap_P
+.globl  RC4_set_key
+.type   RC4_set_key,\@function,3
+.align  16
+RC4_set_key:
+        lea     8($dat),$dat
+        lea     ($inp,$len),$inp
+        neg     $len
+        mov     $len,%rcx
+        xor     %eax,%eax
+        xor     $ido,$ido
+        xor     %r10,%r10
+        xor     %r11,%r11
+
+        mov     OPENSSL_ia32cap_P(%rip),$idx#d
+        bt      \$20,$idx#d
+        jnc     .Lw1stloop
+        bt      \$30,$idx#d
+        setc    $ido#b
+        mov     $ido#d,260($dat)
+        jmp     .Lc1stloop
+
+.align  16
+.Lw1stloop:
+        mov     %eax,($dat,%rax,4)
+        add     \$1,%al
+        jnc     .Lw1stloop
+
+        xor     $ido,$ido
+        xor     $idx,$idx
+.align  16
+.Lw2ndloop:
+        mov     ($dat,$ido,4),%r10d
+        add     ($inp,$len,1),$idx#b
+        add     %r10b,$idx#b
+        add     \$1,$len
+        mov     ($dat,$idx,4),%r11d
+        cmovz   %rcx,$len
+        mov     %r10d,($dat,$idx,4)
+        mov     %r11d,($dat,$ido,4)
+        add     \$1,$ido#b
+        jnc     .Lw2ndloop
+        jmp     .Lexit_key
+
+.align  16
+.Lc1stloop:
+        mov     %al,($dat,%rax)
+        add     \$1,%al
+        jnc     .Lc1stloop
+
+        xor     $ido,$ido
+        xor     $idx,$idx
+.align  16
+.Lc2ndloop:
+        mov     ($dat,$ido),%r10b
+        add     ($inp,$len),$idx#b
+        add     %r10b,$idx#b
+        add     \$1,$len
+        mov     ($dat,$idx),%r11b
+        jnz     .Lcnowrap
+        mov     %rcx,$len
+.Lcnowrap:
+        mov     %r10b,($dat,$idx)
+        mov     %r11b,($dat,$ido)
+        add     \$1,$ido#b
+        jnc     .Lc2ndloop
+        movl    \$-1,256($dat)
+
+.align  16
+.Lexit_key:
+        xor     %eax,%eax
+        mov     %eax,-8($dat)
+        mov     %eax,-4($dat)
+        ret
+.size   RC4_set_key,.-RC4_set_key
+
+.globl  RC4_options
+.type   RC4_options,\@function,0
+.align  16
+RC4_options:
+        .picmeup %rax
+        lea     .Lopts-.(%rax),%rax
+        mov     OPENSSL_ia32cap_P(%rip),%edx
+        bt      \$20,%edx
+        jnc     .Ldone
+        add     \$12,%rax
+        bt      \$30,%edx
+        jnc     .Ldone
+        add     \$13,%rax
+.Ldone:
+        ret
+.align  64
+.Lopts:
+.asciz  "rc4(8x,int)"
+.asciz  "rc4(8x,char)"
+.asciz  "rc4(1x,char)"
+.asciz  "RC4 for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
+.align  64
+.size   RC4_options,.-RC4_options
+___
+
+$code =~ s/#([bwd])/$1/gm;
+
+print $code;
+
+close STDOUT;
diff --git a/src/lib/libssl/src/fips-1.0/aes/fips_aes_locl.h b/src/lib/libssl/src/crypto/rsa/rsa_depr.c
index 4184729e34..a859ded987 100644
--- a/src/lib/libssl/src/fips-1.0/aes/fips_aes_locl.h
+++ b/src/lib/libssl/src/crypto/rsa/rsa_depr.c
@@ -1,4 +1,4 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
+/* crypto/rsa/rsa_depr.c */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -47,39 +47,55 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ====================================================================
  *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
  */
 
-#ifndef HEADER_AES_LOCL_H
-#define HEADER_AES_LOCL_H
+/* NB: This file contains deprecated functions (compatibility wrappers to the
+ * "new" versions). */
 
-#include <openssl/e_os2.h>
+#include <stdio.h>
+#include <time.h>
+#include "cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
 
-#ifdef OPENSSL_NO_AES
-#error AES is disabled.
-#endif
+#ifdef OPENSSL_NO_DEPRECATED
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+static void *dummy=&dummy;
 
-#if defined(_MSC_VER) && !defined(_M_IA64) && !defined(OPENSSL_SYS_WINCE)
-# define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
-# define GETU32(p) SWAP(*((u32 *)(p)))
-# define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }
 #else
-# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
-# define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
-#endif
 
-typedef unsigned long u32;
-typedef unsigned short u16;
-typedef unsigned char u8;
+RSA *RSA_generate_key(int bits, unsigned long e_value,
+             void (*callback)(int,int,void *), void *cb_arg)
+        {
+        BN_GENCB cb;
+        int i;
+        RSA *rsa = RSA_new();
+        BIGNUM *e = BN_new();
+
+        if(!rsa || !e) goto err;
 
-#define MAXKC   (256/32)
-#define MAXKB   (256/8)
-#define MAXNR   14
+        /* The problem is when building with 8, 16, or 32 BN_ULONG,
+         * unsigned long can be larger */
+        for (i=0; i<(int)sizeof(unsigned long)*8; i++)
+                {
+                if (e_value & (1UL<<i))
+                        if (BN_set_bit(e,i) == 0)
+                                goto err;
+                }
 
-/* This controls loop-unrolling in aes_core.c */
-#undef FULL_UNROLL
+        BN_GENCB_set_old(&cb, callback, cb_arg);
 
-#endif /* !HEADER_AES_LOCL_H */
+        if(RSA_generate_key_ex(rsa, bits, e, &cb)) {
+                BN_free(e);
+                return rsa;
+        }
+err:
+        if(e) BN_free(e);
+        if(rsa) RSA_free(rsa);
+        return 0;
+        }
+#endif
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_pss.c b/src/lib/libssl/src/crypto/rsa/rsa_pss.c
new file mode 100644
index 0000000000..e19d18c5b9
--- /dev/null
+++ b/src/lib/libssl/src/crypto/rsa/rsa_pss.c
@@ -0,0 +1,269 @@
+/* rsa_pss.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2005.
+ */
+/* ====================================================================
+ * Copyright (c) 2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include <openssl/sha.h>
+
+static const unsigned char zeroes[] = {0,0,0,0,0,0,0,0};
+
+#if defined(_MSC_VER) && defined(_ARM_)
+#pragma optimize("g", off)
+#endif
+
+int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
+                        const EVP_MD *Hash, const unsigned char *EM, int sLen)
+        {
+        int i;
+        int ret = 0;
+        int hLen, maskedDBLen, MSBits, emLen;
+        const unsigned char *H;
+        unsigned char *DB = NULL;
+        EVP_MD_CTX ctx;
+        unsigned char H_[EVP_MAX_MD_SIZE];
+
+        hLen = EVP_MD_size(Hash);
+        /*
+         * Negative sLen has special meanings:
+         *      -1      sLen == hLen
+         *      -2      salt length is autorecovered from signature
+         *      -N      reserved
+         */
+        if      (sLen == -1)    sLen = hLen;
+        else if (sLen == -2)    sLen = -2;
+        else if (sLen < -2)
+                {
+                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, RSA_R_SLEN_CHECK_FAILED);
+                goto err;
+                }
+
+        MSBits = (BN_num_bits(rsa->n) - 1) & 0x7;
+        emLen = RSA_size(rsa);
+        if (EM[0] & (0xFF << MSBits))
+                {
+                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, RSA_R_FIRST_OCTET_INVALID);
+                goto err;
+                }
+        if (MSBits == 0)
+                {
+                EM++;
+                emLen--;
+                }
+        if (emLen < (hLen + sLen + 2)) /* sLen can be small negative */
+                {
+                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, RSA_R_DATA_TOO_LARGE);
+                goto err;
+                }
+        if (EM[emLen - 1] != 0xbc)
+                {
+                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, RSA_R_LAST_OCTET_INVALID);
+                goto err;
+                }
+        maskedDBLen = emLen - hLen - 1;
+        H = EM + maskedDBLen;
+        DB = OPENSSL_malloc(maskedDBLen);
+        if (!DB)
+                {
+                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, ERR_R_MALLOC_FAILURE);
+                goto err;
+                }
+        PKCS1_MGF1(DB, maskedDBLen, H, hLen, Hash);
+        for (i = 0; i < maskedDBLen; i++)
+                DB[i] ^= EM[i];
+        if (MSBits)
+                DB[0] &= 0xFF >> (8 - MSBits);
+        for (i = 0; DB[i] == 0 && i < (maskedDBLen-1); i++) ;
+        if (DB[i++] != 0x1)
+                {
+                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, RSA_R_SLEN_RECOVERY_FAILED);
+                goto err;
+                }
+        if (sLen >= 0 && (maskedDBLen - i) != sLen)
+                {
+                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, RSA_R_SLEN_CHECK_FAILED);
+                goto err;
+                }
+        EVP_MD_CTX_init(&ctx);
+        EVP_DigestInit_ex(&ctx, Hash, NULL);
+        EVP_DigestUpdate(&ctx, zeroes, sizeof zeroes);
+        EVP_DigestUpdate(&ctx, mHash, hLen);
+        if (maskedDBLen - i)
+                EVP_DigestUpdate(&ctx, DB + i, maskedDBLen - i);
+        EVP_DigestFinal(&ctx, H_, NULL);
+        EVP_MD_CTX_cleanup(&ctx);
+        if (memcmp(H_, H, hLen))
+                {
+                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, RSA_R_BAD_SIGNATURE);
+                ret = 0;
+                }
+        else 
+                ret = 1;
+
+        err:
+        if (DB)
+                OPENSSL_free(DB);
+
+        return ret;
+
+        }
+
+int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
+                        const unsigned char *mHash,
+                        const EVP_MD *Hash, int sLen)
+        {
+        int i;
+        int ret = 0;
+        int hLen, maskedDBLen, MSBits, emLen;
+        unsigned char *H, *salt = NULL, *p;
+        EVP_MD_CTX ctx;
+
+        hLen = EVP_MD_size(Hash);
+        /*
+         * Negative sLen has special meanings:
+         *      -1      sLen == hLen
+         *      -2      salt length is maximized
+         *      -N      reserved
+         */
+        if      (sLen == -1)    sLen = hLen;
+        else if (sLen == -2)    sLen = -2;
+        else if (sLen < -2)
+                {
+                RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_PSS, RSA_R_SLEN_CHECK_FAILED);
+                goto err;
+                }
+
+        MSBits = (BN_num_bits(rsa->n) - 1) & 0x7;
+        emLen = RSA_size(rsa);
+        if (MSBits == 0)
+                {
+                *EM++ = 0;
+                emLen--;
+                }
+        if (sLen == -2)
+                {
+                sLen = emLen - hLen - 2;
+                }
+        else if (emLen < (hLen + sLen + 2))
+                {
+                RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_PSS,
+                   RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
+                goto err;
+                }
+        if (sLen > 0)
+                {
+                salt = OPENSSL_malloc(sLen);
+                if (!salt)
+                        {
+                        RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_PSS,
+                                ERR_R_MALLOC_FAILURE);
+                        goto err;
+                        }
+                if (!RAND_bytes(salt, sLen))
+                        goto err;
+                }
+        maskedDBLen = emLen - hLen - 1;
+        H = EM + maskedDBLen;
+        EVP_MD_CTX_init(&ctx);
+        EVP_DigestInit_ex(&ctx, Hash, NULL);
+        EVP_DigestUpdate(&ctx, zeroes, sizeof zeroes);
+        EVP_DigestUpdate(&ctx, mHash, hLen);
+        if (sLen)
+                EVP_DigestUpdate(&ctx, salt, sLen);
+        EVP_DigestFinal(&ctx, H, NULL);
+        EVP_MD_CTX_cleanup(&ctx);
+
+        /* Generate dbMask in place then perform XOR on it */
+        PKCS1_MGF1(EM, maskedDBLen, H, hLen, Hash);
+
+        p = EM;
+
+        /* Initial PS XORs with all zeroes which is a NOP so just update
+         * pointer. Note from a test above this value is guaranteed to
+         * be non-negative.
+         */
+        p += emLen - sLen - hLen - 2;
+        *p++ ^= 0x1;
+        if (sLen > 0)
+                {
+                for (i = 0; i < sLen; i++)
+                        *p++ ^= salt[i];
+                }
+        if (MSBits)
+                EM[0] &= 0xFF >> (8 - MSBits);
+
+        /* H is already in place so just set final 0xbc */
+
+        EM[emLen - 1] = 0xbc;
+
+        ret = 1;
+
+        err:
+        if (salt)
+                OPENSSL_free(salt);
+
+        return ret;
+
+        }
+
+#if defined(_MSC_VER)
+#pragma optimize("",on)
+#endif
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_x931.c b/src/lib/libssl/src/crypto/rsa/rsa_x931.c
new file mode 100644
index 0000000000..e918654176
--- /dev/null
+++ b/src/lib/libssl/src/crypto/rsa/rsa_x931.c
@@ -0,0 +1,177 @@
+/* rsa_x931.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2005.
+ */
+/* ====================================================================
+ * Copyright (c) 2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+
+int RSA_padding_add_X931(unsigned char *to, int tlen,
+             const unsigned char *from, int flen)
+        {
+        int j;
+        unsigned char *p;
+
+        /* Absolute minimum amount of padding is 1 header nibble, 1 padding
+         * nibble and 2 trailer bytes: but 1 hash if is already in 'from'.
+         */
+
+        j = tlen - flen - 2;
+
+        if (j < 0)
+                {
+                RSAerr(RSA_F_RSA_PADDING_ADD_X931,RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
+                return -1;
+                }
+        
+        p=(unsigned char *)to;
+
+        /* If no padding start and end nibbles are in one byte */
+        if (j == 0)
+                *p++ = 0x6A;
+        else
+                {
+                *p++ = 0x6B;
+                if (j > 1)
+                        {
+                        memset(p, 0xBB, j - 1);
+                        p += j - 1;
+                        }
+                *p++ = 0xBA;
+                }
+        memcpy(p,from,(unsigned int)flen);
+        p += flen;
+        *p = 0xCC;
+        return(1);
+        }
+
+int RSA_padding_check_X931(unsigned char *to, int tlen,
+             const unsigned char *from, int flen, int num)
+        {
+        int i = 0,j;
+        const unsigned char *p;
+
+        p=from;
+        if ((num != flen) || ((*p != 0x6A) && (*p != 0x6B)))
+                {
+                RSAerr(RSA_F_RSA_PADDING_CHECK_X931,RSA_R_INVALID_HEADER);
+                return -1;
+                }
+
+        if (*p++ == 0x6B)
+                {
+                j=flen-3;
+                for (i = 0; i < j; i++)
+                        {
+                        unsigned char c = *p++;
+                        if (c == 0xBA)
+                                break;
+                        if (c != 0xBB)
+                                {
+                                RSAerr(RSA_F_RSA_PADDING_CHECK_X931,
+                                        RSA_R_INVALID_PADDING);
+                                return -1;
+                                }
+                        }
+
+                j -= i;
+
+                if (i == 0)
+                        {
+                        RSAerr(RSA_F_RSA_PADDING_CHECK_X931, RSA_R_INVALID_PADDING);
+                        return -1;
+                        }
+
+                }
+        else j = flen - 2;
+
+        if (p[j] != 0xCC)
+                {
+                RSAerr(RSA_F_RSA_PADDING_CHECK_X931, RSA_R_INVALID_TRAILER);
+                return -1;
+                }
+
+        memcpy(to,p,(unsigned int)j);
+
+        return(j);
+        }
+
+/* Translate between X931 hash ids and NIDs */
+
+int RSA_X931_hash_id(int nid)
+        {
+        switch (nid)
+                {
+                case NID_sha1:
+                return 0x33;
+
+                case NID_sha256:
+                return 0x34;
+
+                case NID_sha384:
+                return 0x36;
+
+                case NID_sha512:
+                return 0x35;
+
+                }
+        return -1;
+        }
+
diff --git a/src/lib/libssl/src/crypto/seed/Makefile b/src/lib/libssl/src/crypto/seed/Makefile
new file mode 100644
index 0000000000..f9de27b288
--- /dev/null
+++ b/src/lib/libssl/src/crypto/seed/Makefile
@@ -0,0 +1,87 @@
+#
+# crypto/seed/Makefile
+#
+
+DIR=    seed
+TOP=    ../..
+CC=     cc
+CPP=    $(CC) -E
+INCLUDES=
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC=seed.c seed_ecb.c seed_cbc.c seed_cfb.c seed_ofb.c
+LIBOBJ=seed.o seed_ecb.o seed_cbc.o seed_cfb.o seed_ofb.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= seed.h
+HEADER= seed_locl.h $(EXHEADER)
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist ; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+seed.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+seed.o: ../../include/openssl/seed.h seed.c seed_locl.h
+seed_cbc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+seed_cbc.o: ../../include/openssl/seed.h seed_cbc.c seed_locl.h
+seed_cfb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+seed_cfb.o: ../../include/openssl/seed.h seed_cfb.c seed_locl.h
+seed_ecb.o: ../../include/openssl/opensslconf.h ../../include/openssl/seed.h
+seed_ecb.o: seed_ecb.c
+seed_ofb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+seed_ofb.o: ../../include/openssl/seed.h seed_locl.h seed_ofb.c
diff --git a/src/lib/libssl/src/crypto/seed/seed.c b/src/lib/libssl/src/crypto/seed/seed.c
new file mode 100644
index 0000000000..125dd7d66f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/seed/seed.c
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.  
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of author nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+#ifndef OPENSSL_NO_SEED
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef WIN32
+#include <memory.h>
+#endif
+
+#include <openssl/seed.h>
+#include "seed_locl.h"
+
+static seed_word SS[4][256] = { {
+        0x2989a1a8, 0x05858184, 0x16c6d2d4, 0x13c3d3d0, 0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124,
+        0x1d4d515c, 0x03434340, 0x18081018, 0x1e0e121c, 0x11415150, 0x3cccf0fc, 0x0acac2c8, 0x23436360,
+        0x28082028, 0x04444044, 0x20002020, 0x1d8d919c, 0x20c0e0e0, 0x22c2e2e0, 0x08c8c0c8, 0x17071314,
+        0x2585a1a4, 0x0f8f838c, 0x03030300, 0x3b4b7378, 0x3b8bb3b8, 0x13031310, 0x12c2d2d0, 0x2ecee2ec,
+        0x30407070, 0x0c8c808c, 0x3f0f333c, 0x2888a0a8, 0x32023230, 0x1dcdd1dc, 0x36c6f2f4, 0x34447074,
+        0x2ccce0ec, 0x15859194, 0x0b0b0308, 0x17475354, 0x1c4c505c, 0x1b4b5358, 0x3d8db1bc, 0x01010100,
+        0x24042024, 0x1c0c101c, 0x33437370, 0x18889098, 0x10001010, 0x0cccc0cc, 0x32c2f2f0, 0x19c9d1d8,
+        0x2c0c202c, 0x27c7e3e4, 0x32427270, 0x03838380, 0x1b8b9398, 0x11c1d1d0, 0x06868284, 0x09c9c1c8,
+        0x20406060, 0x10405050, 0x2383a3a0, 0x2bcbe3e8, 0x0d0d010c, 0x3686b2b4, 0x1e8e929c, 0x0f4f434c,
+        0x3787b3b4, 0x1a4a5258, 0x06c6c2c4, 0x38487078, 0x2686a2a4, 0x12021210, 0x2f8fa3ac, 0x15c5d1d4,
+        0x21416160, 0x03c3c3c0, 0x3484b0b4, 0x01414140, 0x12425250, 0x3d4d717c, 0x0d8d818c, 0x08080008,
+        0x1f0f131c, 0x19899198, 0x00000000, 0x19091118, 0x04040004, 0x13435350, 0x37c7f3f4, 0x21c1e1e0,
+        0x3dcdf1fc, 0x36467274, 0x2f0f232c, 0x27072324, 0x3080b0b0, 0x0b8b8388, 0x0e0e020c, 0x2b8ba3a8,
+        0x2282a2a0, 0x2e4e626c, 0x13839390, 0x0d4d414c, 0x29496168, 0x3c4c707c, 0x09090108, 0x0a0a0208,
+        0x3f8fb3bc, 0x2fcfe3ec, 0x33c3f3f0, 0x05c5c1c4, 0x07878384, 0x14041014, 0x3ecef2fc, 0x24446064,
+        0x1eced2dc, 0x2e0e222c, 0x0b4b4348, 0x1a0a1218, 0x06060204, 0x21012120, 0x2b4b6368, 0x26466264,
+        0x02020200, 0x35c5f1f4, 0x12829290, 0x0a8a8288, 0x0c0c000c, 0x3383b3b0, 0x3e4e727c, 0x10c0d0d0,
+        0x3a4a7278, 0x07474344, 0x16869294, 0x25c5e1e4, 0x26062224, 0x00808080, 0x2d8da1ac, 0x1fcfd3dc,
+        0x2181a1a0, 0x30003030, 0x37073334, 0x2e8ea2ac, 0x36063234, 0x15051114, 0x22022220, 0x38083038,
+        0x34c4f0f4, 0x2787a3a4, 0x05454144, 0x0c4c404c, 0x01818180, 0x29c9e1e8, 0x04848084, 0x17879394,
+        0x35053134, 0x0bcbc3c8, 0x0ecec2cc, 0x3c0c303c, 0x31417170, 0x11011110, 0x07c7c3c4, 0x09898188,
+        0x35457174, 0x3bcbf3f8, 0x1acad2d8, 0x38c8f0f8, 0x14849094, 0x19495158, 0x02828280, 0x04c4c0c4,
+        0x3fcff3fc, 0x09494148, 0x39093138, 0x27476364, 0x00c0c0c0, 0x0fcfc3cc, 0x17c7d3d4, 0x3888b0b8,
+        0x0f0f030c, 0x0e8e828c, 0x02424240, 0x23032320, 0x11819190, 0x2c4c606c, 0x1bcbd3d8, 0x2484a0a4,
+        0x34043034, 0x31c1f1f0, 0x08484048, 0x02c2c2c0, 0x2f4f636c, 0x3d0d313c, 0x2d0d212c, 0x00404040,
+        0x3e8eb2bc, 0x3e0e323c, 0x3c8cb0bc, 0x01c1c1c0, 0x2a8aa2a8, 0x3a8ab2b8, 0x0e4e424c, 0x15455154,
+        0x3b0b3338, 0x1cccd0dc, 0x28486068, 0x3f4f737c, 0x1c8c909c, 0x18c8d0d8, 0x0a4a4248, 0x16465254,
+        0x37477374, 0x2080a0a0, 0x2dcde1ec, 0x06464244, 0x3585b1b4, 0x2b0b2328, 0x25456164, 0x3acaf2f8,
+        0x23c3e3e0, 0x3989b1b8, 0x3181b1b0, 0x1f8f939c, 0x1e4e525c, 0x39c9f1f8, 0x26c6e2e4, 0x3282b2b0,
+        0x31013130, 0x2acae2e8, 0x2d4d616c, 0x1f4f535c, 0x24c4e0e4, 0x30c0f0f0, 0x0dcdc1cc, 0x08888088,
+        0x16061214, 0x3a0a3238, 0x18485058, 0x14c4d0d4, 0x22426260, 0x29092128, 0x07070304, 0x33033330,
+        0x28c8e0e8, 0x1b0b1318, 0x05050104, 0x39497178, 0x10809090, 0x2a4a6268, 0x2a0a2228, 0x1a8a9298
+},      {
+        0x38380830, 0xe828c8e0, 0x2c2d0d21, 0xa42686a2, 0xcc0fcfc3, 0xdc1eced2, 0xb03383b3, 0xb83888b0,
+        0xac2f8fa3, 0x60204060, 0x54154551, 0xc407c7c3, 0x44044440, 0x6c2f4f63, 0x682b4b63, 0x581b4b53,
+        0xc003c3c3, 0x60224262, 0x30330333, 0xb43585b1, 0x28290921, 0xa02080a0, 0xe022c2e2, 0xa42787a3,
+        0xd013c3d3, 0x90118191, 0x10110111, 0x04060602, 0x1c1c0c10, 0xbc3c8cb0, 0x34360632, 0x480b4b43,
+        0xec2fcfe3, 0x88088880, 0x6c2c4c60, 0xa82888a0, 0x14170713, 0xc404c4c0, 0x14160612, 0xf434c4f0,
+        0xc002c2c2, 0x44054541, 0xe021c1e1, 0xd416c6d2, 0x3c3f0f33, 0x3c3d0d31, 0x8c0e8e82, 0x98188890,
+        0x28280820, 0x4c0e4e42, 0xf436c6f2, 0x3c3e0e32, 0xa42585a1, 0xf839c9f1, 0x0c0d0d01, 0xdc1fcfd3,
+        0xd818c8d0, 0x282b0b23, 0x64264662, 0x783a4a72, 0x24270723, 0x2c2f0f23, 0xf031c1f1, 0x70324272,
+        0x40024242, 0xd414c4d0, 0x40014141, 0xc000c0c0, 0x70334373, 0x64274763, 0xac2c8ca0, 0x880b8b83,
+        0xf437c7f3, 0xac2d8da1, 0x80008080, 0x1c1f0f13, 0xc80acac2, 0x2c2c0c20, 0xa82a8aa2, 0x34340430,
+        0xd012c2d2, 0x080b0b03, 0xec2ecee2, 0xe829c9e1, 0x5c1d4d51, 0x94148490, 0x18180810, 0xf838c8f0,
+        0x54174753, 0xac2e8ea2, 0x08080800, 0xc405c5c1, 0x10130313, 0xcc0dcdc1, 0x84068682, 0xb83989b1,
+        0xfc3fcff3, 0x7c3d4d71, 0xc001c1c1, 0x30310131, 0xf435c5f1, 0x880a8a82, 0x682a4a62, 0xb03181b1,
+        0xd011c1d1, 0x20200020, 0xd417c7d3, 0x00020202, 0x20220222, 0x04040400, 0x68284860, 0x70314171,
+        0x04070703, 0xd81bcbd3, 0x9c1d8d91, 0x98198991, 0x60214161, 0xbc3e8eb2, 0xe426c6e2, 0x58194951,
+        0xdc1dcdd1, 0x50114151, 0x90108090, 0xdc1cccd0, 0x981a8a92, 0xa02383a3, 0xa82b8ba3, 0xd010c0d0,
+        0x80018181, 0x0c0f0f03, 0x44074743, 0x181a0a12, 0xe023c3e3, 0xec2ccce0, 0x8c0d8d81, 0xbc3f8fb3,
+        0x94168692, 0x783b4b73, 0x5c1c4c50, 0xa02282a2, 0xa02181a1, 0x60234363, 0x20230323, 0x4c0d4d41,
+        0xc808c8c0, 0x9c1e8e92, 0x9c1c8c90, 0x383a0a32, 0x0c0c0c00, 0x2c2e0e22, 0xb83a8ab2, 0x6c2e4e62,
+        0x9c1f8f93, 0x581a4a52, 0xf032c2f2, 0x90128292, 0xf033c3f3, 0x48094941, 0x78384870, 0xcc0cccc0,
+        0x14150511, 0xf83bcbf3, 0x70304070, 0x74354571, 0x7c3f4f73, 0x34350531, 0x10100010, 0x00030303,
+        0x64244460, 0x6c2d4d61, 0xc406c6c2, 0x74344470, 0xd415c5d1, 0xb43484b0, 0xe82acae2, 0x08090901,
+        0x74364672, 0x18190911, 0xfc3ecef2, 0x40004040, 0x10120212, 0xe020c0e0, 0xbc3d8db1, 0x04050501,
+        0xf83acaf2, 0x00010101, 0xf030c0f0, 0x282a0a22, 0x5c1e4e52, 0xa82989a1, 0x54164652, 0x40034343,
+        0x84058581, 0x14140410, 0x88098981, 0x981b8b93, 0xb03080b0, 0xe425c5e1, 0x48084840, 0x78394971,
+        0x94178793, 0xfc3cccf0, 0x1c1e0e12, 0x80028282, 0x20210121, 0x8c0c8c80, 0x181b0b13, 0x5c1f4f53,
+        0x74374773, 0x54144450, 0xb03282b2, 0x1c1d0d11, 0x24250521, 0x4c0f4f43, 0x00000000, 0x44064642,
+        0xec2dcde1, 0x58184850, 0x50124252, 0xe82bcbe3, 0x7c3e4e72, 0xd81acad2, 0xc809c9c1, 0xfc3dcdf1,
+        0x30300030, 0x94158591, 0x64254561, 0x3c3c0c30, 0xb43686b2, 0xe424c4e0, 0xb83b8bb3, 0x7c3c4c70,
+        0x0c0e0e02, 0x50104050, 0x38390931, 0x24260622, 0x30320232, 0x84048480, 0x68294961, 0x90138393,
+        0x34370733, 0xe427c7e3, 0x24240420, 0xa42484a0, 0xc80bcbc3, 0x50134353, 0x080a0a02, 0x84078783,
+        0xd819c9d1, 0x4c0c4c40, 0x80038383, 0x8c0f8f83, 0xcc0ecec2, 0x383b0b33, 0x480a4a42, 0xb43787b3
+},      {
+        0xa1a82989, 0x81840585, 0xd2d416c6, 0xd3d013c3, 0x50541444, 0x111c1d0d, 0xa0ac2c8c, 0x21242505,
+        0x515c1d4d, 0x43400343, 0x10181808, 0x121c1e0e, 0x51501141, 0xf0fc3ccc, 0xc2c80aca, 0x63602343,
+        0x20282808, 0x40440444, 0x20202000, 0x919c1d8d, 0xe0e020c0, 0xe2e022c2, 0xc0c808c8, 0x13141707,
+        0xa1a42585, 0x838c0f8f, 0x03000303, 0x73783b4b, 0xb3b83b8b, 0x13101303, 0xd2d012c2, 0xe2ec2ece,
+        0x70703040, 0x808c0c8c, 0x333c3f0f, 0xa0a82888, 0x32303202, 0xd1dc1dcd, 0xf2f436c6, 0x70743444,
+        0xe0ec2ccc, 0x91941585, 0x03080b0b, 0x53541747, 0x505c1c4c, 0x53581b4b, 0xb1bc3d8d, 0x01000101,
+        0x20242404, 0x101c1c0c, 0x73703343, 0x90981888, 0x10101000, 0xc0cc0ccc, 0xf2f032c2, 0xd1d819c9,
+        0x202c2c0c, 0xe3e427c7, 0x72703242, 0x83800383, 0x93981b8b, 0xd1d011c1, 0x82840686, 0xc1c809c9,
+        0x60602040, 0x50501040, 0xa3a02383, 0xe3e82bcb, 0x010c0d0d, 0xb2b43686, 0x929c1e8e, 0x434c0f4f,
+        0xb3b43787, 0x52581a4a, 0xc2c406c6, 0x70783848, 0xa2a42686, 0x12101202, 0xa3ac2f8f, 0xd1d415c5,
+        0x61602141, 0xc3c003c3, 0xb0b43484, 0x41400141, 0x52501242, 0x717c3d4d, 0x818c0d8d, 0x00080808,
+        0x131c1f0f, 0x91981989, 0x00000000, 0x11181909, 0x00040404, 0x53501343, 0xf3f437c7, 0xe1e021c1,
+        0xf1fc3dcd, 0x72743646, 0x232c2f0f, 0x23242707, 0xb0b03080, 0x83880b8b, 0x020c0e0e, 0xa3a82b8b,
+        0xa2a02282, 0x626c2e4e, 0x93901383, 0x414c0d4d, 0x61682949, 0x707c3c4c, 0x01080909, 0x02080a0a,
+        0xb3bc3f8f, 0xe3ec2fcf, 0xf3f033c3, 0xc1c405c5, 0x83840787, 0x10141404, 0xf2fc3ece, 0x60642444,
+        0xd2dc1ece, 0x222c2e0e, 0x43480b4b, 0x12181a0a, 0x02040606, 0x21202101, 0x63682b4b, 0x62642646,
+        0x02000202, 0xf1f435c5, 0x92901282, 0x82880a8a, 0x000c0c0c, 0xb3b03383, 0x727c3e4e, 0xd0d010c0,
+        0x72783a4a, 0x43440747, 0x92941686, 0xe1e425c5, 0x22242606, 0x80800080, 0xa1ac2d8d, 0xd3dc1fcf,
+        0xa1a02181, 0x30303000, 0x33343707, 0xa2ac2e8e, 0x32343606, 0x11141505, 0x22202202, 0x30383808,
+        0xf0f434c4, 0xa3a42787, 0x41440545, 0x404c0c4c, 0x81800181, 0xe1e829c9, 0x80840484, 0x93941787,
+        0x31343505, 0xc3c80bcb, 0xc2cc0ece, 0x303c3c0c, 0x71703141, 0x11101101, 0xc3c407c7, 0x81880989,
+        0x71743545, 0xf3f83bcb, 0xd2d81aca, 0xf0f838c8, 0x90941484, 0x51581949, 0x82800282, 0xc0c404c4,
+        0xf3fc3fcf, 0x41480949, 0x31383909, 0x63642747, 0xc0c000c0, 0xc3cc0fcf, 0xd3d417c7, 0xb0b83888,
+        0x030c0f0f, 0x828c0e8e, 0x42400242, 0x23202303, 0x91901181, 0x606c2c4c, 0xd3d81bcb, 0xa0a42484,
+        0x30343404, 0xf1f031c1, 0x40480848, 0xc2c002c2, 0x636c2f4f, 0x313c3d0d, 0x212c2d0d, 0x40400040,
+        0xb2bc3e8e, 0x323c3e0e, 0xb0bc3c8c, 0xc1c001c1, 0xa2a82a8a, 0xb2b83a8a, 0x424c0e4e, 0x51541545,
+        0x33383b0b, 0xd0dc1ccc, 0x60682848, 0x737c3f4f, 0x909c1c8c, 0xd0d818c8, 0x42480a4a, 0x52541646,
+        0x73743747, 0xa0a02080, 0xe1ec2dcd, 0x42440646, 0xb1b43585, 0x23282b0b, 0x61642545, 0xf2f83aca,
+        0xe3e023c3, 0xb1b83989, 0xb1b03181, 0x939c1f8f, 0x525c1e4e, 0xf1f839c9, 0xe2e426c6, 0xb2b03282,
+        0x31303101, 0xe2e82aca, 0x616c2d4d, 0x535c1f4f, 0xe0e424c4, 0xf0f030c0, 0xc1cc0dcd, 0x80880888,
+        0x12141606, 0x32383a0a, 0x50581848, 0xd0d414c4, 0x62602242, 0x21282909, 0x03040707, 0x33303303,
+        0xe0e828c8, 0x13181b0b, 0x01040505, 0x71783949, 0x90901080, 0x62682a4a, 0x22282a0a, 0x92981a8a
+},      {
+        0x08303838, 0xc8e0e828, 0x0d212c2d, 0x86a2a426, 0xcfc3cc0f, 0xced2dc1e, 0x83b3b033, 0x88b0b838,
+        0x8fa3ac2f, 0x40606020, 0x45515415, 0xc7c3c407, 0x44404404, 0x4f636c2f, 0x4b63682b, 0x4b53581b,
+        0xc3c3c003, 0x42626022, 0x03333033, 0x85b1b435, 0x09212829, 0x80a0a020, 0xc2e2e022, 0x87a3a427,
+        0xc3d3d013, 0x81919011, 0x01111011, 0x06020406, 0x0c101c1c, 0x8cb0bc3c, 0x06323436, 0x4b43480b,
+        0xcfe3ec2f, 0x88808808, 0x4c606c2c, 0x88a0a828, 0x07131417, 0xc4c0c404, 0x06121416, 0xc4f0f434,
+        0xc2c2c002, 0x45414405, 0xc1e1e021, 0xc6d2d416, 0x0f333c3f, 0x0d313c3d, 0x8e828c0e, 0x88909818,
+        0x08202828, 0x4e424c0e, 0xc6f2f436, 0x0e323c3e, 0x85a1a425, 0xc9f1f839, 0x0d010c0d, 0xcfd3dc1f,
+        0xc8d0d818, 0x0b23282b, 0x46626426, 0x4a72783a, 0x07232427, 0x0f232c2f, 0xc1f1f031, 0x42727032,
+        0x42424002, 0xc4d0d414, 0x41414001, 0xc0c0c000, 0x43737033, 0x47636427, 0x8ca0ac2c, 0x8b83880b,
+        0xc7f3f437, 0x8da1ac2d, 0x80808000, 0x0f131c1f, 0xcac2c80a, 0x0c202c2c, 0x8aa2a82a, 0x04303434,
+        0xc2d2d012, 0x0b03080b, 0xcee2ec2e, 0xc9e1e829, 0x4d515c1d, 0x84909414, 0x08101818, 0xc8f0f838,
+        0x47535417, 0x8ea2ac2e, 0x08000808, 0xc5c1c405, 0x03131013, 0xcdc1cc0d, 0x86828406, 0x89b1b839,
+        0xcff3fc3f, 0x4d717c3d, 0xc1c1c001, 0x01313031, 0xc5f1f435, 0x8a82880a, 0x4a62682a, 0x81b1b031,
+        0xc1d1d011, 0x00202020, 0xc7d3d417, 0x02020002, 0x02222022, 0x04000404, 0x48606828, 0x41717031,
+        0x07030407, 0xcbd3d81b, 0x8d919c1d, 0x89919819, 0x41616021, 0x8eb2bc3e, 0xc6e2e426, 0x49515819,
+        0xcdd1dc1d, 0x41515011, 0x80909010, 0xccd0dc1c, 0x8a92981a, 0x83a3a023, 0x8ba3a82b, 0xc0d0d010,
+        0x81818001, 0x0f030c0f, 0x47434407, 0x0a12181a, 0xc3e3e023, 0xcce0ec2c, 0x8d818c0d, 0x8fb3bc3f,
+        0x86929416, 0x4b73783b, 0x4c505c1c, 0x82a2a022, 0x81a1a021, 0x43636023, 0x03232023, 0x4d414c0d,
+        0xc8c0c808, 0x8e929c1e, 0x8c909c1c, 0x0a32383a, 0x0c000c0c, 0x0e222c2e, 0x8ab2b83a, 0x4e626c2e,
+        0x8f939c1f, 0x4a52581a, 0xc2f2f032, 0x82929012, 0xc3f3f033, 0x49414809, 0x48707838, 0xccc0cc0c,
+        0x05111415, 0xcbf3f83b, 0x40707030, 0x45717435, 0x4f737c3f, 0x05313435, 0x00101010, 0x03030003,
+        0x44606424, 0x4d616c2d, 0xc6c2c406, 0x44707434, 0xc5d1d415, 0x84b0b434, 0xcae2e82a, 0x09010809,
+        0x46727436, 0x09111819, 0xcef2fc3e, 0x40404000, 0x02121012, 0xc0e0e020, 0x8db1bc3d, 0x05010405,
+        0xcaf2f83a, 0x01010001, 0xc0f0f030, 0x0a22282a, 0x4e525c1e, 0x89a1a829, 0x46525416, 0x43434003,
+        0x85818405, 0x04101414, 0x89818809, 0x8b93981b, 0x80b0b030, 0xc5e1e425, 0x48404808, 0x49717839,
+        0x87939417, 0xccf0fc3c, 0x0e121c1e, 0x82828002, 0x01212021, 0x8c808c0c, 0x0b13181b, 0x4f535c1f,
+        0x47737437, 0x44505414, 0x82b2b032, 0x0d111c1d, 0x05212425, 0x4f434c0f, 0x00000000, 0x46424406,
+        0xcde1ec2d, 0x48505818, 0x42525012, 0xcbe3e82b, 0x4e727c3e, 0xcad2d81a, 0xc9c1c809, 0xcdf1fc3d,
+        0x00303030, 0x85919415, 0x45616425, 0x0c303c3c, 0x86b2b436, 0xc4e0e424, 0x8bb3b83b, 0x4c707c3c,
+        0x0e020c0e, 0x40505010, 0x09313839, 0x06222426, 0x02323032, 0x84808404, 0x49616829, 0x83939013,
+        0x07333437, 0xc7e3e427, 0x04202424, 0x84a0a424, 0xcbc3c80b, 0x43535013, 0x0a02080a, 0x87838407,
+        0xc9d1d819, 0x4c404c0c, 0x83838003, 0x8f838c0f, 0xcec2cc0e, 0x0b33383b, 0x4a42480a, 0x87b3b437
+}       };
+
+/* key schedule constants - golden ratio */
+#define KC0     0x9e3779b9
+#define KC1     0x3c6ef373
+#define KC2     0x78dde6e6
+#define KC3     0xf1bbcdcc
+#define KC4     0xe3779b99
+#define KC5     0xc6ef3733
+#define KC6     0x8dde6e67
+#define KC7     0x1bbcdccf
+#define KC8     0x3779b99e
+#define KC9     0x6ef3733c
+#define KC10    0xdde6e678
+#define KC11    0xbbcdccf1
+#define KC12    0x779b99e3
+#define KC13    0xef3733c6
+#define KC14    0xde6e678d
+#define KC15    0xbcdccf1b
+
+
+void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks)
+{
+        seed_word x1, x2, x3, x4;
+        seed_word t0, t1;
+
+        char2word(rawkey   , x1);
+        char2word(rawkey+4 , x2);
+        char2word(rawkey+8 , x3);
+        char2word(rawkey+12, x4);
+
+        t0 = (x1 + x3 - KC0) & 0xffffffff;
+        t1 = (x2 - x4 + KC0) & 0xffffffff;                     KEYUPDATE_TEMP(t0, t1, &ks->data[0]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC1);      KEYUPDATE_TEMP(t0, t1, &ks->data[2]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC2);      KEYUPDATE_TEMP(t0, t1, &ks->data[4]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC3);      KEYUPDATE_TEMP(t0, t1, &ks->data[6]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC4);      KEYUPDATE_TEMP(t0, t1, &ks->data[8]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC5);      KEYUPDATE_TEMP(t0, t1, &ks->data[10]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC6);      KEYUPDATE_TEMP(t0, t1, &ks->data[12]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC7);      KEYUPDATE_TEMP(t0, t1, &ks->data[14]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC8);      KEYUPDATE_TEMP(t0, t1, &ks->data[16]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC9);      KEYUPDATE_TEMP(t0, t1, &ks->data[18]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC10);     KEYUPDATE_TEMP(t0, t1, &ks->data[20]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC11);     KEYUPDATE_TEMP(t0, t1, &ks->data[22]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC12);     KEYUPDATE_TEMP(t0, t1, &ks->data[24]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC13);     KEYUPDATE_TEMP(t0, t1, &ks->data[26]);
+        KEYSCHEDULE_UPDATE0(t0, t1, x1, x2, x3, x4, KC14);     KEYUPDATE_TEMP(t0, t1, &ks->data[28]);
+        KEYSCHEDULE_UPDATE1(t0, t1, x1, x2, x3, x4, KC15);     KEYUPDATE_TEMP(t0, t1, &ks->data[30]);
+}
+
+void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks)
+{
+        seed_word x1, x2, x3, x4;
+        seed_word t0, t1;
+
+        char2word(s,    x1);
+        char2word(s+4,  x2);
+        char2word(s+8,  x3);
+        char2word(s+12, x4);
+        
+        E_SEED(t0, t1, x1, x2, x3, x4, 0);
+        E_SEED(t0, t1, x3, x4, x1, x2, 2);
+        E_SEED(t0, t1, x1, x2, x3, x4, 4);
+        E_SEED(t0, t1, x3, x4, x1, x2, 6);
+        E_SEED(t0, t1, x1, x2, x3, x4, 8);
+        E_SEED(t0, t1, x3, x4, x1, x2, 10);
+        E_SEED(t0, t1, x1, x2, x3, x4, 12);
+        E_SEED(t0, t1, x3, x4, x1, x2, 14);
+        E_SEED(t0, t1, x1, x2, x3, x4, 16);
+        E_SEED(t0, t1, x3, x4, x1, x2, 18);
+        E_SEED(t0, t1, x1, x2, x3, x4, 20);
+        E_SEED(t0, t1, x3, x4, x1, x2, 22);
+        E_SEED(t0, t1, x1, x2, x3, x4, 24);
+        E_SEED(t0, t1, x3, x4, x1, x2, 26);
+        E_SEED(t0, t1, x1, x2, x3, x4, 28);
+        E_SEED(t0, t1, x3, x4, x1, x2, 30);
+
+        word2char(x3, d);
+        word2char(x4, d+4);
+        word2char(x1, d+8);
+        word2char(x2, d+12);
+}
+
+void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks)
+{
+        seed_word x1, x2, x3, x4;
+        seed_word t0, t1;
+
+        char2word(s,    x1);
+        char2word(s+4,  x2);
+        char2word(s+8,  x3);
+        char2word(s+12, x4);
+        
+        E_SEED(t0, t1, x1, x2, x3, x4, 30);
+        E_SEED(t0, t1, x3, x4, x1, x2, 28);
+        E_SEED(t0, t1, x1, x2, x3, x4, 26);
+        E_SEED(t0, t1, x3, x4, x1, x2, 24);
+        E_SEED(t0, t1, x1, x2, x3, x4, 22);
+        E_SEED(t0, t1, x3, x4, x1, x2, 20);
+        E_SEED(t0, t1, x1, x2, x3, x4, 18);
+        E_SEED(t0, t1, x3, x4, x1, x2, 16);
+        E_SEED(t0, t1, x1, x2, x3, x4, 14);
+        E_SEED(t0, t1, x3, x4, x1, x2, 12);
+        E_SEED(t0, t1, x1, x2, x3, x4, 10);
+        E_SEED(t0, t1, x3, x4, x1, x2, 8);
+        E_SEED(t0, t1, x1, x2, x3, x4, 6);
+        E_SEED(t0, t1, x3, x4, x1, x2, 4);
+        E_SEED(t0, t1, x1, x2, x3, x4, 2);
+        E_SEED(t0, t1, x3, x4, x1, x2, 0);
+
+        word2char(x3, d);
+        word2char(x4, d+4);
+        word2char(x1, d+8);
+        word2char(x2, d+12);
+}
+
+#endif /* OPENSSL_NO_SEED */
diff --git a/src/lib/libssl/src/crypto/seed/seed.h b/src/lib/libssl/src/crypto/seed/seed.h
new file mode 100644
index 0000000000..427915ed9a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/seed/seed.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.  
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of author nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2007 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#ifndef HEADER_SEED_H
+#define HEADER_SEED_H
+
+#include <openssl/opensslconf.h>
+
+#ifdef OPENSSL_NO_SEED
+#error SEED is disabled.
+#endif
+
+#ifdef AES_LONG /* look whether we need 'long' to get 32 bits */
+# ifndef SEED_LONG
+#  define SEED_LONG 1
+# endif
+#endif
+
+#if !defined(NO_SYS_TYPES_H)
+# include <sys/types.h>
+#endif
+
+#define SEED_BLOCK_SIZE 16
+#define SEED_KEY_LENGTH 16
+
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+
+typedef struct seed_key_st {
+#ifdef SEED_LONG
+    unsigned long data[32];
+#else
+    unsigned int data[32];
+#endif
+} SEED_KEY_SCHEDULE;
+
+
+void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH], SEED_KEY_SCHEDULE *ks);
+
+void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks);
+void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE], unsigned char d[SEED_BLOCK_SIZE], const SEED_KEY_SCHEDULE *ks);
+
+void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc);
+void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out,
+        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int enc);
+void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int *num, int enc);
+void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
+        size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int *num);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* HEADER_SEED_H */
diff --git a/src/lib/libssl/src/crypto/seed/seed_cbc.c b/src/lib/libssl/src/crypto/seed/seed_cbc.c
new file mode 100644
index 0000000000..4f718ccb44
--- /dev/null
+++ b/src/lib/libssl/src/crypto/seed/seed_cbc.c
@@ -0,0 +1,129 @@
+/* crypto/seed/seed_cbc.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 1998-2007 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#include "seed_locl.h"
+#include <string.h>
+
+void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out,
+                      size_t len, const SEED_KEY_SCHEDULE *ks,
+                      unsigned char ivec[SEED_BLOCK_SIZE], int enc)
+        {
+        size_t n;
+        unsigned char tmp[SEED_BLOCK_SIZE];
+        const unsigned char *iv = ivec;
+
+        if (enc)
+                {
+                while (len >= SEED_BLOCK_SIZE)
+                        {
+                        for (n = 0; n < SEED_BLOCK_SIZE; ++n)
+                                out[n] = in[n] ^ iv[n];
+                        SEED_encrypt(out, out, ks);
+                        iv = out;
+                        len -= SEED_BLOCK_SIZE;
+                        in  += SEED_BLOCK_SIZE;
+                        out += SEED_BLOCK_SIZE;
+                        }
+                if (len)
+                        {
+                        for (n = 0; n < len; ++n)
+                                out[n] = in[n] ^ iv[n];
+                        for (n = len; n < SEED_BLOCK_SIZE; ++n)
+                                out[n] = iv[n];
+                        SEED_encrypt(out, out, ks);
+                        iv = out;
+                        }
+                memcpy(ivec, iv, SEED_BLOCK_SIZE);
+                }
+        else if (in != out) /* decrypt */
+                {
+                while (len >= SEED_BLOCK_SIZE)
+                        {
+                        SEED_decrypt(in, out, ks);
+                        for (n = 0; n < SEED_BLOCK_SIZE; ++n)
+                                out[n] ^= iv[n];
+                        iv = in;
+                        len -= SEED_BLOCK_SIZE;
+                        in  += SEED_BLOCK_SIZE;
+                        out += SEED_BLOCK_SIZE;
+                        }
+                if (len)
+                        {
+                        SEED_decrypt(in, tmp, ks);
+                        for (n = 0; n < len; ++n)
+                                out[n] = tmp[n] ^ iv[n];
+                        iv = in;
+                        }
+                memcpy(ivec, iv, SEED_BLOCK_SIZE);
+                }
+        else /* decrypt, overlap */
+                {
+                while (len >= SEED_BLOCK_SIZE)
+                        {
+                        memcpy(tmp, in, SEED_BLOCK_SIZE);
+                        SEED_decrypt(in, out, ks);
+                        for (n = 0; n < SEED_BLOCK_SIZE; ++n)
+                                out[n] ^= ivec[n];
+                        memcpy(ivec, tmp, SEED_BLOCK_SIZE);
+                        len -= SEED_BLOCK_SIZE;
+                        in  += SEED_BLOCK_SIZE;
+                        out += SEED_BLOCK_SIZE;
+                        }
+                if (len)
+                        {
+                        memcpy(tmp, in, SEED_BLOCK_SIZE);
+                        SEED_decrypt(tmp, tmp, ks);
+                        for (n = 0; n < len; ++n)
+                                out[n] = tmp[n] ^ ivec[n];
+                        memcpy(ivec, tmp, SEED_BLOCK_SIZE);
+                        }
+                }
+        }
diff --git a/src/lib/libssl/src/fips-1.0/hmac/fips_hmac.c b/src/lib/libssl/src/crypto/seed/seed_cfb.c
index b36f163748..07d878a788 100644
--- a/src/lib/libssl/src/fips-1.0/hmac/fips_hmac.c
+++ b/src/lib/libssl/src/crypto/seed/seed_cfb.c
@@ -1,4 +1,53 @@
-/* crypto/hmac/hmac.c */
+/* crypto/seed/seed_cfb.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 1998-2007 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -55,136 +104,41 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/hmac.h>
 
-#ifdef OPENSSL_FIPS
+#include "seed_locl.h"
+#include <string.h>
 
-void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-                  const EVP_MD *md, ENGINE *impl)
+void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
+                         size_t len, const SEED_KEY_SCHEDULE *ks,
+                         unsigned char ivec[SEED_BLOCK_SIZE], int *num, int enc)
         {
-        int i,j,reset=0;
-        unsigned char pad[HMAC_MAX_MD_CBLOCK];
+        int n;
+        unsigned char c;
 
-        if (md != NULL)
-                {
-                reset=1;
-                ctx->md=md;
-                }
-        else
-                md=ctx->md;
+        n = *num;
 
-        if (key != NULL)
+        if (enc)
                 {
-                if (FIPS_mode() && !(md->flags & EVP_MD_FLAG_FIPS)
-                && (!(ctx->md_ctx.flags & EVP_MD_CTX_FLAG_NON_FIPS_ALLOW)
-                 || !(ctx->i_ctx.flags & EVP_MD_CTX_FLAG_NON_FIPS_ALLOW)
-                 || !(ctx->o_ctx.flags & EVP_MD_CTX_FLAG_NON_FIPS_ALLOW)))
-                OpenSSLDie(__FILE__,__LINE__,
-                        "HMAC: digest not allowed in FIPS mode");
-                
-                reset=1;
-                j=EVP_MD_block_size(md);
-                OPENSSL_assert(j <= sizeof ctx->key);
-                if (j < len)
+                while (len--)
                         {
-                        EVP_DigestInit_ex(&ctx->md_ctx,md, impl);
-                        EVP_DigestUpdate(&ctx->md_ctx,key,len);
-                        EVP_DigestFinal_ex(&(ctx->md_ctx),ctx->key,
-                                &ctx->key_length);
+                        if (n == 0)
+                                SEED_encrypt(ivec, ivec, ks);
+                        ivec[n] = *(out++) = *(in++) ^ ivec[n];
+                        n = (n+1) % SEED_BLOCK_SIZE;
                         }
-                else
+                }
+        else
+                {
+                while (len--)
                         {
-                        OPENSSL_assert(len <= sizeof ctx->key);
-                        memcpy(ctx->key,key,len);
-                        ctx->key_length=len;
+                        if (n == 0)
+                                SEED_encrypt(ivec, ivec, ks);
+                        c = *(in);
+                        *(out++) = *(in++) ^ ivec[n];
+                        ivec[n] = c;
+                        n = (n+1) % SEED_BLOCK_SIZE;
                         }
-                if(ctx->key_length != HMAC_MAX_MD_CBLOCK)
-                        memset(&ctx->key[ctx->key_length], 0,
-                                HMAC_MAX_MD_CBLOCK - ctx->key_length);
                 }
 
-        if (reset)      
-                {
-                for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
-                        pad[i]=0x36^ctx->key[i];
-                EVP_DigestInit_ex(&ctx->i_ctx,md, impl);
-                EVP_DigestUpdate(&ctx->i_ctx,pad,EVP_MD_block_size(md));
-
-                for (i=0; i<HMAC_MAX_MD_CBLOCK; i++)
-                        pad[i]=0x5c^ctx->key[i];
-                EVP_DigestInit_ex(&ctx->o_ctx,md, impl);
-                EVP_DigestUpdate(&ctx->o_ctx,pad,EVP_MD_block_size(md));
-                }
-        EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->i_ctx);
+        *num = n;
         }
-
-void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,
-               const EVP_MD *md)
-        {
-        if(key && md)
-            HMAC_CTX_init(ctx);
-        HMAC_Init_ex(ctx,key,len,md, NULL);
-        }
-
-void HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, int len)
-        {
-        EVP_DigestUpdate(&ctx->md_ctx,data,len);
-        }
-
-void HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
-        {
-        int j;
-        unsigned int i;
-        unsigned char buf[EVP_MAX_MD_SIZE];
-
-        j=EVP_MD_block_size(ctx->md);
-
-        EVP_DigestFinal_ex(&ctx->md_ctx,buf,&i);
-        EVP_MD_CTX_copy_ex(&ctx->md_ctx,&ctx->o_ctx);
-        EVP_DigestUpdate(&ctx->md_ctx,buf,i);
-        EVP_DigestFinal_ex(&ctx->md_ctx,md,len);
-        }
-
-void HMAC_CTX_init(HMAC_CTX *ctx)
-        {
-        EVP_MD_CTX_init(&ctx->i_ctx);
-        EVP_MD_CTX_init(&ctx->o_ctx);
-        EVP_MD_CTX_init(&ctx->md_ctx);
-        }
-
-void HMAC_CTX_cleanup(HMAC_CTX *ctx)
-        {
-        EVP_MD_CTX_cleanup(&ctx->i_ctx);
-        EVP_MD_CTX_cleanup(&ctx->o_ctx);
-        EVP_MD_CTX_cleanup(&ctx->md_ctx);
-        memset(ctx,0,sizeof *ctx);
-        }
-
-unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    const unsigned char *d, int n, unsigned char *md,
-                    unsigned int *md_len)
-        {
-        HMAC_CTX c;
-        static unsigned char m[EVP_MAX_MD_SIZE];
-
-        if (md == NULL) md=m;
-        HMAC_CTX_init(&c);
-        HMAC_Init(&c,key,key_len,evp_md);
-        HMAC_Update(&c,d,n);
-        HMAC_Final(&c,md,md_len);
-        HMAC_CTX_cleanup(&c);
-        return(md);
-        }
-
-void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags)
-        {
-        EVP_MD_CTX_set_flags(&ctx->i_ctx, flags);
-        EVP_MD_CTX_set_flags(&ctx->o_ctx, flags);
-        EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
-        }
-
-#endif
-
diff --git a/src/lib/libssl/src/fips/fips_locl.h b/src/lib/libssl/src/crypto/seed/seed_ecb.c
index 215e382549..e63f5ae14e 100644
--- a/src/lib/libssl/src/fips/fips_locl.h
+++ b/src/lib/libssl/src/crypto/seed/seed_ecb.c
@@ -1,5 +1,6 @@
+/* crypto/seed/seed_ecb.c -*- mode:C; c-file-style: "eay" -*- */
 /* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2007 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
@@ -44,24 +45,16 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
  *
  */
 
-#ifdef OPENSSL_FIPS
+#include <openssl/seed.h>
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* These are really defined in crypto/cryptlib.c */
-void fips_set_started(void);
-int fips_is_started(void);
-int fips_is_owning_thread(void);
-int fips_set_owning_thread(void);
-int fips_clear_owning_thread(void);
-void fips_set_rand_check(void *rand_check);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
+void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out, const SEED_KEY_SCHEDULE *ks, int enc) 
+        {
+        if (enc)
+                SEED_encrypt(in, out, ks);
+        else
+                SEED_decrypt(in, out, ks);
+        }
diff --git a/src/lib/libssl/src/crypto/seed/seed_locl.h b/src/lib/libssl/src/crypto/seed/seed_locl.h
new file mode 100644
index 0000000000..fd456b6422
--- /dev/null
+++ b/src/lib/libssl/src/crypto/seed/seed_locl.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.  
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of author nor the names of its contributors may
+ *    be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+#ifndef HEADER_SEED_LOCL_H
+#define HEADER_SEED_LOCL_H
+
+#include "openssl/e_os2.h"
+#include <openssl/seed.h>
+
+
+#ifdef SEED_LONG /* need 32-bit type */
+typedef unsigned long seed_word;
+#else
+typedef unsigned int seed_word;
+#endif
+
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define G_FUNC(v)       \
+        SS[0][(unsigned char)      (v) & 0xff] ^ SS[1][(unsigned char) ((v)>>8) & 0xff] ^ \
+        SS[2][(unsigned char)((v)>>16) & 0xff] ^ SS[3][(unsigned char)((v)>>24) & 0xff]
+
+#define char2word(c, i)  \
+        (i) = ((((seed_word)(c)[0]) << 24) | (((seed_word)(c)[1]) << 16) | (((seed_word)(c)[2]) << 8) | ((seed_word)(c)[3]))
+
+#define word2char(l, c)  \
+        *((c)+0) = (unsigned char)((l)>>24) & 0xff; \
+        *((c)+1) = (unsigned char)((l)>>16) & 0xff; \
+        *((c)+2) = (unsigned char)((l)>> 8) & 0xff; \
+        *((c)+3) = (unsigned char)((l))     & 0xff
+
+#define KEYSCHEDULE_UPDATE0(T0, T1, X1, X2, X3, X4, KC)  \
+        (T0) = (X3);                                     \
+        (X3) = (((X3)<<8) ^ ((X4)>>24)) & 0xffffffff;    \
+        (X4) = (((X4)<<8) ^ ((T0)>>24)) & 0xffffffff;    \
+        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;    \
+        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff
+
+#define KEYSCHEDULE_UPDATE1(T0, T1, X1, X2, X3, X4, KC)  \
+        (T0) = (X1);                                     \
+        (X1) = (((X1)>>8) ^ ((X2)<<24)) & 0xffffffff;    \
+        (X2) = (((X2)>>8) ^ ((T0)<<24)) & 0xffffffff;    \
+        (T0) = ((X1) + (X3) - (KC))     & 0xffffffff;     \
+        (T1) = ((X2) + (KC) - (X4))     & 0xffffffff
+
+#define KEYUPDATE_TEMP(T0, T1, K)   \
+        (K)[0] = G_FUNC((T0));      \
+        (K)[1] = G_FUNC((T1))
+
+#define XOR_SEEDBLOCK(DST, SRC)      \
+        ((DST))[0] ^= ((SRC))[0];    \
+        ((DST))[1] ^= ((SRC))[1];    \
+        ((DST))[2] ^= ((SRC))[2];    \
+        ((DST))[3] ^= ((SRC))[3]
+
+#define MOV_SEEDBLOCK(DST, SRC)      \
+        ((DST))[0] = ((SRC))[0];     \
+        ((DST))[1] = ((SRC))[1];     \
+        ((DST))[2] = ((SRC))[2];     \
+        ((DST))[3] = ((SRC))[3]
+
+# define CHAR2WORD(C, I)              \
+        char2word((C),    (I)[0]);    \
+        char2word((C+4),  (I)[1]);    \
+        char2word((C+8),  (I)[2]);    \
+        char2word((C+12), (I)[3])
+
+# define WORD2CHAR(I, C)              \
+        word2char((I)[0], (C));       \
+        word2char((I)[1], (C+4));     \
+        word2char((I)[2], (C+8));     \
+        word2char((I)[3], (C+12))
+
+# define E_SEED(T0, T1, X1, X2, X3, X4, rbase)   \
+        (T0) = (X3) ^ (ks->data)[(rbase)];       \
+        (T1) = (X4) ^ (ks->data)[(rbase)+1];     \
+        (T1) ^= (T0);                            \
+        (T1) = G_FUNC((T1));                     \
+        (T0) = ((T0) + (T1)) & 0xffffffff;       \
+        (T0) = G_FUNC((T0));                     \
+        (T1) = ((T1) + (T0)) & 0xffffffff;       \
+        (T1) = G_FUNC((T1));                     \
+        (T0) = ((T0) + (T1)) & 0xffffffff;       \
+        (X1) ^= (T0);                            \
+        (X2) ^= (T1)
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* HEADER_SEED_LOCL_H */
diff --git a/src/lib/libssl/src/fips/dsa/fips_dsa_selftest.c b/src/lib/libssl/src/crypto/seed/seed_ofb.c
index 2c88f0af44..e2f3f57a38 100644
--- a/src/lib/libssl/src/fips/dsa/fips_dsa_selftest.c
+++ b/src/lib/libssl/src/crypto/seed/seed_ofb.c
@@ -1,4 +1,53 @@
-/* crypto/dsa/dsatest.c */
+/* crypto/seed/seed_ofb.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 1998-2007 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,113 +105,24 @@
  * [including the GNU Public Licence.]
  */
 
+#include "seed_locl.h"
 #include <string.h>
-#include <openssl/crypto.h>
-#include <openssl/dsa.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-
-#ifdef OPENSSL_FIPS
-
-/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
- * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
-static unsigned char seed[20]={
-        0xd5,0x01,0x4e,0x4b,0x60,0xef,0x2b,0xa8,0xb6,0x21,0x1b,0x40,
-        0x62,0xba,0x32,0x24,0xe0,0x42,0x7d,0xd3,
-        };
-
-static unsigned char out_p[]={
-        0x8d,0xf2,0xa4,0x94,0x49,0x22,0x76,0xaa,
-        0x3d,0x25,0x75,0x9b,0xb0,0x68,0x69,0xcb,
-        0xea,0xc0,0xd8,0x3a,0xfb,0x8d,0x0c,0xf7,
-        0xcb,0xb8,0x32,0x4f,0x0d,0x78,0x82,0xe5,
-        0xd0,0x76,0x2f,0xc5,0xb7,0x21,0x0e,0xaf,
-        0xc2,0xe9,0xad,0xac,0x32,0xab,0x7a,0xac,
-        0x49,0x69,0x3d,0xfb,0xf8,0x37,0x24,0xc2,
-        0xec,0x07,0x36,0xee,0x31,0xc8,0x02,0x91,
-        };
-
-static unsigned char out_q[]={
-        0xc7,0x73,0x21,0x8c,0x73,0x7e,0xc8,0xee,
-        0x99,0x3b,0x4f,0x2d,0xed,0x30,0xf4,0x8e,
-        0xda,0xce,0x91,0x5f,
-        };
 
-static unsigned char out_g[]={
-        0x62,0x6d,0x02,0x78,0x39,0xea,0x0a,0x13,
-        0x41,0x31,0x63,0xa5,0x5b,0x4c,0xb5,0x00,
-        0x29,0x9d,0x55,0x22,0x95,0x6c,0xef,0xcb,
-        0x3b,0xff,0x10,0xf3,0x99,0xce,0x2c,0x2e,
-        0x71,0xcb,0x9d,0xe5,0xfa,0x24,0xba,0xbf,
-        0x58,0xe5,0xb7,0x95,0x21,0x92,0x5c,0x9c,
-        0xc4,0x2e,0x9f,0x6f,0x46,0x4b,0x08,0x8c,
-        0xc5,0x72,0xaf,0x53,0xe6,0xd7,0x88,0x02,
-        };
-
-static const unsigned char str1[]="12345678901234567890";
-
-void FIPS_corrupt_dsa()
-    {
-    ++seed[0];
-    }
-
-int FIPS_selftest_dsa()
-    {
-    DSA *dsa=NULL;
-    int counter,i,j;
-    unsigned char buf[256];
-    unsigned long h;
-    unsigned char sig[256];
-    unsigned int siglen;
-
-    dsa=DSA_generate_parameters(512,seed,20,&counter,&h,NULL,NULL);
-
-    if(dsa == NULL)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    if (counter != 105) 
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    if (h != 2)
+void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
+                         size_t len, const SEED_KEY_SCHEDULE *ks,
+                         unsigned char ivec[SEED_BLOCK_SIZE], int *num)
         {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    i=BN_bn2bin(dsa->q,buf);
-    j=sizeof(out_q);
-    if (i != j || memcmp(buf,out_q,i) != 0)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
+        int n;
 
-    i=BN_bn2bin(dsa->p,buf);
-    j=sizeof(out_p);
-    if (i != j || memcmp(buf,out_p,i) != 0)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
+        n = *num;
+        
+        while (len--)
+                {
+                if (n == 0)
+                        SEED_encrypt(ivec, ivec, ks);
+                *(out++) = *(in++) ^ ivec[n];
+                n = (n+1) % SEED_BLOCK_SIZE;
+                }
 
-    i=BN_bn2bin(dsa->g,buf);
-    j=sizeof(out_g);
-    if (i != j || memcmp(buf,out_g,i) != 0)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    DSA_generate_key(dsa);
-    DSA_sign(0, str1, 20, sig, &siglen, dsa);
-    if(DSA_verify(0, str1, 20, sig, siglen, dsa) != 1)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
+        *num = n;
         }
-    DSA_free(dsa);
-    return 1;
-    }
-#endif
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha1-x86_64.pl b/src/lib/libssl/src/crypto/sha/asm/sha1-x86_64.pl
new file mode 100755
index 0000000000..f7ed67a726
--- /dev/null
+++ b/src/lib/libssl/src/crypto/sha/asm/sha1-x86_64.pl
@@ -0,0 +1,242 @@
+#!/usr/bin/env perl
+#
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. The module is, however, dual licensed under OpenSSL and
+# CRYPTOGAMS licenses depending on where you obtain it. For further
+# details see http://www.openssl.org/~appro/cryptogams/.
+# ====================================================================
+#
+# sha1_block procedure for x86_64.
+#
+# It was brought to my attention that on EM64T compiler-generated code
+# was far behind 32-bit assembler implementation. This is unlike on
+# Opteron where compiler-generated code was only 15% behind 32-bit
+# assembler, which originally made it hard to motivate the effort.
+# There was suggestion to mechanically translate 32-bit code, but I
+# dismissed it, reasoning that x86_64 offers enough register bank
+# capacity to fully utilize SHA-1 parallelism. Therefore this fresh
+# implementation:-) However! While 64-bit code does performs better
+# on Opteron, I failed to beat 32-bit assembler on EM64T core. Well,
+# x86_64 does offer larger *addressable* bank, but out-of-order core
+# reaches for even more registers through dynamic aliasing, and EM64T
+# core must have managed to run-time optimize even 32-bit code just as
+# good as 64-bit one. Performance improvement is summarized in the
+# following table:
+#
+#               gcc 3.4         32-bit asm      cycles/byte
+# Opteron       +45%            +20%            6.8
+# Xeon P4       +65%            +0%             9.9
+# Core2         +60%            +10%            7.0
+
+$output=shift;
+
+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
+( $xlate="${dir}x86_64-xlate.pl" and -f $xlate ) or
+( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
+die "can't locate x86_64-xlate.pl";
+
+open STDOUT,"| $^X $xlate $output";
+
+$ctx="%rdi";    # 1st arg
+$inp="%rsi";    # 2nd arg
+$num="%rdx";    # 3rd arg
+
+# reassign arguments in order to produce more compact code
+$ctx="%r8";
+$inp="%r9";
+$num="%r10";
+
+$xi="%eax";
+$t0="%ebx";
+$t1="%ecx";
+$A="%edx";
+$B="%esi";
+$C="%edi";
+$D="%ebp";
+$E="%r11d";
+$T="%r12d";
+
+@V=($A,$B,$C,$D,$E,$T);
+
+sub PROLOGUE {
+my $func=shift;
+$code.=<<___;
+.globl  $func
+.type   $func,\@function,3
+.align  16
+$func:
+        push    %rbx
+        push    %rbp
+        push    %r12
+        mov     %rsp,%rax
+        mov     %rdi,$ctx       # reassigned argument
+        sub     \$`8+16*4`,%rsp
+        mov     %rsi,$inp       # reassigned argument
+        and     \$-64,%rsp
+        mov     %rdx,$num       # reassigned argument
+        mov     %rax,`16*4`(%rsp)
+
+        mov     0($ctx),$A
+        mov     4($ctx),$B
+        mov     8($ctx),$C
+        mov     12($ctx),$D
+        mov     16($ctx),$E
+___
+}
+
+sub EPILOGUE {
+my $func=shift;
+$code.=<<___;
+        mov     `16*4`(%rsp),%rsp
+        pop     %r12
+        pop     %rbp
+        pop     %rbx
+        ret
+.size   $func,.-$func
+___
+}
+
+sub BODY_00_19 {
+my ($i,$a,$b,$c,$d,$e,$f,$host)=@_;
+my $j=$i+1;
+$code.=<<___ if ($i==0);
+        mov     `4*$i`($inp),$xi        
+        `"bswap $xi"    if(!defined($host))`
+        mov     $xi,`4*$i`(%rsp)
+___
+$code.=<<___ if ($i<15);
+        lea     0x5a827999($xi,$e),$f
+        mov     $c,$t0
+        mov     `4*$j`($inp),$xi
+        mov     $a,$e
+        xor     $d,$t0
+        `"bswap $xi"    if(!defined($host))`    
+        rol     \$5,$e
+        and     $b,$t0
+        mov     $xi,`4*$j`(%rsp)
+        add     $e,$f
+        xor     $d,$t0
+        rol     \$30,$b
+        add     $t0,$f
+___
+$code.=<<___ if ($i>=15);
+        lea     0x5a827999($xi,$e),$f
+        mov     `4*($j%16)`(%rsp),$xi
+        mov     $c,$t0
+        mov     $a,$e
+        xor     `4*(($j+2)%16)`(%rsp),$xi
+        xor     $d,$t0
+        rol     \$5,$e
+        xor     `4*(($j+8)%16)`(%rsp),$xi
+        and     $b,$t0
+        add     $e,$f
+        xor     `4*(($j+13)%16)`(%rsp),$xi
+        xor     $d,$t0
+        rol     \$30,$b
+        add     $t0,$f
+        rol     \$1,$xi
+        mov     $xi,`4*($j%16)`(%rsp)
+___
+}
+
+sub BODY_20_39 {
+my ($i,$a,$b,$c,$d,$e,$f)=@_;
+my $j=$i+1;
+my $K=($i<40)?0x6ed9eba1:0xca62c1d6;
+$code.=<<___ if ($i<79);
+        lea     $K($xi,$e),$f
+        mov     `4*($j%16)`(%rsp),$xi
+        mov     $c,$t0
+        mov     $a,$e
+        xor     `4*(($j+2)%16)`(%rsp),$xi
+        xor     $b,$t0
+        rol     \$5,$e
+        xor     `4*(($j+8)%16)`(%rsp),$xi
+        xor     $d,$t0
+        add     $e,$f
+        xor     `4*(($j+13)%16)`(%rsp),$xi
+        rol     \$30,$b
+        add     $t0,$f
+        rol     \$1,$xi
+___
+$code.=<<___ if ($i<76);
+        mov     $xi,`4*($j%16)`(%rsp)
+___
+$code.=<<___ if ($i==79);
+        lea     $K($xi,$e),$f
+        mov     $c,$t0
+        mov     $a,$e
+        xor     $b,$t0
+        rol     \$5,$e
+        xor     $d,$t0
+        add     $e,$f
+        rol     \$30,$b
+        add     $t0,$f
+___
+}
+
+sub BODY_40_59 {
+my ($i,$a,$b,$c,$d,$e,$f)=@_;
+my $j=$i+1;
+$code.=<<___;
+        lea     0x8f1bbcdc($xi,$e),$f
+        mov     `4*($j%16)`(%rsp),$xi
+        mov     $b,$t0
+        mov     $b,$t1
+        xor     `4*(($j+2)%16)`(%rsp),$xi
+        mov     $a,$e
+        and     $c,$t0
+        xor     `4*(($j+8)%16)`(%rsp),$xi
+        or      $c,$t1
+        rol     \$5,$e
+        xor     `4*(($j+13)%16)`(%rsp),$xi
+        and     $d,$t1
+        add     $e,$f
+        rol     \$1,$xi
+        or      $t1,$t0
+        rol     \$30,$b
+        mov     $xi,`4*($j%16)`(%rsp)
+        add     $t0,$f
+___
+}
+
+$code=".text\n";
+
+&PROLOGUE("sha1_block_data_order");
+$code.=".align  4\n.Lloop:\n";
+for($i=0;$i<20;$i++)    { &BODY_00_19($i,@V); unshift(@V,pop(@V)); }
+for(;$i<40;$i++)        { &BODY_20_39($i,@V); unshift(@V,pop(@V)); }
+for(;$i<60;$i++)        { &BODY_40_59($i,@V); unshift(@V,pop(@V)); }
+for(;$i<80;$i++)        { &BODY_20_39($i,@V); unshift(@V,pop(@V)); }
+$code.=<<___;
+        add     0($ctx),$E
+        add     4($ctx),$T
+        add     8($ctx),$A
+        add     12($ctx),$B
+        add     16($ctx),$C
+        mov     $E,0($ctx)
+        mov     $T,4($ctx)
+        mov     $A,8($ctx)
+        mov     $B,12($ctx)
+        mov     $C,16($ctx)
+
+        xchg    $E,$A   # mov   $E,$A
+        xchg    $T,$B   # mov   $T,$B
+        xchg    $E,$C   # mov   $A,$C
+        xchg    $T,$D   # mov   $B,$D
+                        # mov   $C,$E
+        lea     `16*4`($inp),$inp
+        sub     \$1,$num
+        jnz     .Lloop
+___
+&EPILOGUE("sha1_block_data_order");
+$code.=<<___;
+.asciz  "SHA1 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
+___
+
+####################################################################
+
+$code =~ s/\`([^\`]*)\`/eval $1/gem;
+print $code;
+close STDOUT;
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha512-ia64.pl b/src/lib/libssl/src/crypto/sha/asm/sha512-ia64.pl
new file mode 100755
index 0000000000..1c6ce56522
--- /dev/null
+++ b/src/lib/libssl/src/crypto/sha/asm/sha512-ia64.pl
@@ -0,0 +1,672 @@
+#!/usr/bin/env perl
+#
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. The module is, however, dual licensed under OpenSSL and
+# CRYPTOGAMS licenses depending on where you obtain it. For further
+# details see http://www.openssl.org/~appro/cryptogams/.
+# ====================================================================
+#
+# SHA256/512_Transform for Itanium.
+#
+# sha512_block runs in 1003 cycles on Itanium 2, which is almost 50%
+# faster than gcc and >60%(!) faster than code generated by HP-UX
+# compiler (yes, HP-UX is generating slower code, because unlike gcc,
+# it failed to deploy "shift right pair," 'shrp' instruction, which
+# substitutes for 64-bit rotate).
+#
+# 924 cycles long sha256_block outperforms gcc by over factor of 2(!)
+# and HP-UX compiler - by >40% (yes, gcc won sha512_block, but lost
+# this one big time). Note that "formally" 924 is about 100 cycles
+# too much. I mean it's 64 32-bit rounds vs. 80 virtually identical
+# 64-bit ones and 1003*64/80 gives 802. Extra cycles, 2 per round,
+# are spent on extra work to provide for 32-bit rotations. 32-bit
+# rotations are still handled by 'shrp' instruction and for this
+# reason lower 32 bits are deposited to upper half of 64-bit register
+# prior 'shrp' issue. And in order to minimize the amount of such
+# operations, X[16] values are *maintained* with copies of lower
+# halves in upper halves, which is why you'll spot such instructions
+# as custom 'mux2', "parallel 32-bit add," 'padd4' and "parallel
+# 32-bit unsigned right shift," 'pshr4.u' instructions here.
+#
+# Rules of engagement.
+#
+# There is only one integer shifter meaning that if I have two rotate,
+# deposit or extract instructions in adjacent bundles, they shall
+# split [at run-time if they have to]. But note that variable and
+# parallel shifts are performed by multi-media ALU and *are* pairable
+# with rotates [and alike]. On the backside MMALU is rather slow: it
+# takes 2 extra cycles before the result of integer operation is
+# available *to* MMALU and 2(*) extra cycles before the result of MM
+# operation is available "back" *to* integer ALU, not to mention that
+# MMALU itself has 2 cycles latency. However! I explicitly scheduled
+# these MM instructions to avoid MM stalls, so that all these extra
+# latencies get "hidden" in instruction-level parallelism.
+#
+# (*) 2 cycles on Itanium 1 and 1 cycle on Itanium 2. But I schedule
+#     for 2 in order to provide for best *overall* performance,
+#     because on Itanium 1 stall on MM result is accompanied by
+#     pipeline flush, which takes 6 cycles:-(
+#
+# Resulting performance numbers for 900MHz Itanium 2 system:
+#
+# The 'numbers' are in 1000s of bytes per second processed.
+# type     16 bytes    64 bytes   256 bytes  1024 bytes  8192 bytes
+# sha1(*)   6210.14k   20376.30k   52447.83k   85870.05k  105478.12k
+# sha256    7476.45k   20572.05k   41538.34k   56062.29k   62093.18k
+# sha512    4996.56k   20026.28k   47597.20k   85278.79k  111501.31k
+#
+# (*) SHA1 numbers are for HP-UX compiler and are presented purely
+#     for reference purposes. I bet it can improved too...
+#
+# To generate code, pass the file name with either 256 or 512 in its
+# name and compiler flags.
+
+$output=shift;
+
+if ($output =~ /512.*\.[s|asm]/) {
+        $SZ=8;
+        $BITS=8*$SZ;
+        $LDW="ld8";
+        $STW="st8";
+        $ADD="add";
+        $SHRU="shr.u";
+        $TABLE="K512";
+        $func="sha512_block_data_order";
+        @Sigma0=(28,34,39);
+        @Sigma1=(14,18,41);
+        @sigma0=(1,  8, 7);
+        @sigma1=(19,61, 6);
+        $rounds=80;
+} elsif ($output =~ /256.*\.[s|asm]/) {
+        $SZ=4;
+        $BITS=8*$SZ;
+        $LDW="ld4";
+        $STW="st4";
+        $ADD="padd4";
+        $SHRU="pshr4.u";
+        $TABLE="K256";
+        $func="sha256_block_data_order";
+        @Sigma0=( 2,13,22);
+        @Sigma1=( 6,11,25);
+        @sigma0=( 7,18, 3);
+        @sigma1=(17,19,10);
+        $rounds=64;
+} else { die "nonsense $output"; }
+
+open STDOUT,">$output" || die "can't open $output: $!";
+
+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);  }
+
+$code=<<___;
+.ident  \"$output, version 1.1\"
+.ident  \"IA-64 ISA artwork by Andy Polyakov <appro\@fy.chalmers.se>\"
+.explicit
+.text
+
+pfssave=r2;
+lcsave=r3;
+prsave=r14;
+K=r15;
+A=r16;  B=r17;  C=r18;  D=r19;
+E=r20;  F=r21;  G=r22;  H=r23;
+T1=r24; T2=r25;
+s0=r26; s1=r27; t0=r28; t1=r29;
+Ktbl=r30;
+ctx=r31;        // 1st arg
+input=r48;      // 2nd arg
+num=r49;        // 3rd arg
+sgm0=r50;       sgm1=r51;       // small constants
+A_=r54; B_=r55; C_=r56; D_=r57;
+E_=r58; F_=r59; G_=r60; H_=r61;
+
+// void $func (SHA_CTX *ctx, const void *in,size_t num[,int host])
+.global $func#
+.proc   $func#
+.align  32
+$func:
+        .prologue
+        .save   ar.pfs,pfssave
+{ .mmi; alloc   pfssave=ar.pfs,3,27,0,16
+        $ADDP   ctx=0,r32               // 1st arg
+        .save   ar.lc,lcsave
+        mov     lcsave=ar.lc    }
+{ .mmi; $ADDP   input=0,r33             // 2nd arg
+        mov     num=r34                 // 3rd arg
+        .save   pr,prsave
+        mov     prsave=pr       };;
+
+        .body
+{ .mib; add     r8=0*$SZ,ctx
+        add     r9=1*$SZ,ctx
+        brp.loop.imp    .L_first16,.L_first16_end-16    }
+{ .mib; add     r10=2*$SZ,ctx
+        add     r11=3*$SZ,ctx
+        brp.loop.imp    .L_rest,.L_rest_end-16          };;
+
+// load A-H
+.Lpic_point:
+{ .mmi; $LDW    A_=[r8],4*$SZ
+        $LDW    B_=[r9],4*$SZ
+        mov     Ktbl=ip         }
+{ .mmi; $LDW    C_=[r10],4*$SZ
+        $LDW    D_=[r11],4*$SZ
+        mov     sgm0=$sigma0[2] };;
+{ .mmi; $LDW    E_=[r8]
+        $LDW    F_=[r9]
+        add     Ktbl=($TABLE#-.Lpic_point),Ktbl         }
+{ .mmi; $LDW    G_=[r10]
+        $LDW    H_=[r11]
+        cmp.ne  p0,p16=0,r0     };;     // used in sha256_block
+___
+$code.=<<___ if ($BITS==64);
+{ .mii; and     r8=7,input
+        and     input=~7,input;;
+        cmp.eq  p9,p0=1,r8      }
+{ .mmi; cmp.eq  p10,p0=2,r8
+        cmp.eq  p11,p0=3,r8
+        cmp.eq  p12,p0=4,r8     }
+{ .mmi; cmp.eq  p13,p0=5,r8
+        cmp.eq  p14,p0=6,r8
+        cmp.eq  p15,p0=7,r8     };;
+___
+$code.=<<___;
+.L_outer:
+.rotr   X[16]
+{ .mmi; mov     A=A_
+        mov     B=B_
+        mov     ar.lc=14        }
+{ .mmi; mov     C=C_
+        mov     D=D_
+        mov     E=E_            }
+{ .mmi; mov     F=F_
+        mov     G=G_
+        mov     ar.ec=2         }
+{ .mmi; ld1     X[15]=[input],$SZ               // eliminated in 64-bit
+        mov     H=H_
+        mov     sgm1=$sigma1[2] };;
+
+___
+$t0="t0", $t1="t1", $code.=<<___ if ($BITS==32);
+.align  32
+.L_first16:
+{ .mmi;         add     r9=1-$SZ,input
+                add     r10=2-$SZ,input
+                add     r11=3-$SZ,input };;
+{ .mmi;         ld1     r9=[r9]
+                ld1     r10=[r10]
+                dep.z   $t1=E,32,32     }
+{ .mmi;         $LDW    K=[Ktbl],$SZ
+                ld1     r11=[r11]
+                zxt4    E=E             };;
+{ .mii;         or      $t1=$t1,E
+                dep     X[15]=X[15],r9,8,8
+                dep     r11=r10,r11,8,8 };;
+{ .mmi;         and     T1=F,E
+                and     T2=A,B
+                dep     X[15]=X[15],r11,16,16   }
+{ .mmi;         andcm   r8=G,E
+                and     r9=A,C
+                mux2    $t0=A,0x44      };;     // copy lower half to upper
+{ .mmi; (p16)   ld1     X[15-1]=[input],$SZ     // prefetch
+                xor     T1=T1,r8                // T1=((e & f) ^ (~e & g))
+                _rotr   r11=$t1,$Sigma1[0] }    // ROTR(e,14)
+{ .mib;         and     r10=B,C
+                xor     T2=T2,r9        };;
+___
+$t0="A", $t1="E", $code.=<<___ if ($BITS==64);
+// in 64-bit mode I load whole X[16] at once and take care of alignment...
+{ .mmi; add     r8=1*$SZ,input
+        add     r9=2*$SZ,input
+        add     r10=3*$SZ,input         };;
+{ .mmb; $LDW    X[15]=[input],4*$SZ
+        $LDW    X[14]=[r8],4*$SZ
+(p9)    br.cond.dpnt.many       .L1byte };;
+{ .mmb; $LDW    X[13]=[r9],4*$SZ
+        $LDW    X[12]=[r10],4*$SZ
+(p10)   br.cond.dpnt.many       .L2byte };;
+{ .mmb; $LDW    X[11]=[input],4*$SZ
+        $LDW    X[10]=[r8],4*$SZ
+(p11)   br.cond.dpnt.many       .L3byte };;
+{ .mmb; $LDW    X[ 9]=[r9],4*$SZ
+        $LDW    X[ 8]=[r10],4*$SZ
+(p12)   br.cond.dpnt.many       .L4byte };;
+{ .mmb; $LDW    X[ 7]=[input],4*$SZ
+        $LDW    X[ 6]=[r8],4*$SZ
+(p13)   br.cond.dpnt.many       .L5byte };;
+{ .mmb; $LDW    X[ 5]=[r9],4*$SZ
+        $LDW    X[ 4]=[r10],4*$SZ
+(p14)   br.cond.dpnt.many       .L6byte };;
+{ .mmb; $LDW    X[ 3]=[input],4*$SZ
+        $LDW    X[ 2]=[r8],4*$SZ
+(p15)   br.cond.dpnt.many       .L7byte };;
+{ .mmb; $LDW    X[ 1]=[r9],4*$SZ
+        $LDW    X[ 0]=[r10],4*$SZ
+        br.many .L_first16              };;
+.L1byte:
+{ .mmi; $LDW    X[13]=[r9],4*$SZ
+        $LDW    X[12]=[r10],4*$SZ
+        shrp    X[15]=X[15],X[14],56    };;
+{ .mmi; $LDW    X[11]=[input],4*$SZ
+        $LDW    X[10]=[r8],4*$SZ
+        shrp    X[14]=X[14],X[13],56    }
+{ .mmi; $LDW    X[ 9]=[r9],4*$SZ
+        $LDW    X[ 8]=[r10],4*$SZ
+        shrp    X[13]=X[13],X[12],56    };;
+{ .mmi; $LDW    X[ 7]=[input],4*$SZ
+        $LDW    X[ 6]=[r8],4*$SZ
+        shrp    X[12]=X[12],X[11],56    }
+{ .mmi; $LDW    X[ 5]=[r9],4*$SZ
+        $LDW    X[ 4]=[r10],4*$SZ
+        shrp    X[11]=X[11],X[10],56    };;
+{ .mmi; $LDW    X[ 3]=[input],4*$SZ
+        $LDW    X[ 2]=[r8],4*$SZ
+        shrp    X[10]=X[10],X[ 9],56    }
+{ .mmi; $LDW    X[ 1]=[r9],4*$SZ
+        $LDW    X[ 0]=[r10],4*$SZ
+        shrp    X[ 9]=X[ 9],X[ 8],56    };;
+{ .mii; $LDW    T1=[input]
+        shrp    X[ 8]=X[ 8],X[ 7],56
+        shrp    X[ 7]=X[ 7],X[ 6],56    }
+{ .mii; shrp    X[ 6]=X[ 6],X[ 5],56
+        shrp    X[ 5]=X[ 5],X[ 4],56    };;
+{ .mii; shrp    X[ 4]=X[ 4],X[ 3],56
+        shrp    X[ 3]=X[ 3],X[ 2],56    }
+{ .mii; shrp    X[ 2]=X[ 2],X[ 1],56
+        shrp    X[ 1]=X[ 1],X[ 0],56    }
+{ .mib; shrp    X[ 0]=X[ 0],T1,56
+        br.many .L_first16              };;
+.L2byte:
+{ .mmi; $LDW    X[11]=[input],4*$SZ
+        $LDW    X[10]=[r8],4*$SZ
+        shrp    X[15]=X[15],X[14],48    }
+{ .mmi; $LDW    X[ 9]=[r9],4*$SZ
+        $LDW    X[ 8]=[r10],4*$SZ
+        shrp    X[14]=X[14],X[13],48    };;
+{ .mmi; $LDW    X[ 7]=[input],4*$SZ
+        $LDW    X[ 6]=[r8],4*$SZ
+        shrp    X[13]=X[13],X[12],48    }
+{ .mmi; $LDW    X[ 5]=[r9],4*$SZ
+        $LDW    X[ 4]=[r10],4*$SZ
+        shrp    X[12]=X[12],X[11],48    };;
+{ .mmi; $LDW    X[ 3]=[input],4*$SZ
+        $LDW    X[ 2]=[r8],4*$SZ
+        shrp    X[11]=X[11],X[10],48    }
+{ .mmi; $LDW    X[ 1]=[r9],4*$SZ
+        $LDW    X[ 0]=[r10],4*$SZ
+        shrp    X[10]=X[10],X[ 9],48    };;
+{ .mii; $LDW    T1=[input]
+        shrp    X[ 9]=X[ 9],X[ 8],48
+        shrp    X[ 8]=X[ 8],X[ 7],48    }
+{ .mii; shrp    X[ 7]=X[ 7],X[ 6],48
+        shrp    X[ 6]=X[ 6],X[ 5],48    };;
+{ .mii; shrp    X[ 5]=X[ 5],X[ 4],48
+        shrp    X[ 4]=X[ 4],X[ 3],48    }
+{ .mii; shrp    X[ 3]=X[ 3],X[ 2],48
+        shrp    X[ 2]=X[ 2],X[ 1],48    }
+{ .mii; shrp    X[ 1]=X[ 1],X[ 0],48
+        shrp    X[ 0]=X[ 0],T1,48       }
+{ .mfb; br.many .L_first16              };;
+.L3byte:
+{ .mmi; $LDW    X[ 9]=[r9],4*$SZ
+        $LDW    X[ 8]=[r10],4*$SZ
+        shrp    X[15]=X[15],X[14],40    };;
+{ .mmi; $LDW    X[ 7]=[input],4*$SZ
+        $LDW    X[ 6]=[r8],4*$SZ
+        shrp    X[14]=X[14],X[13],40    }
+{ .mmi; $LDW    X[ 5]=[r9],4*$SZ
+        $LDW    X[ 4]=[r10],4*$SZ
+        shrp    X[13]=X[13],X[12],40    };;
+{ .mmi; $LDW    X[ 3]=[input],4*$SZ
+        $LDW    X[ 2]=[r8],4*$SZ
+        shrp    X[12]=X[12],X[11],40    }
+{ .mmi; $LDW    X[ 1]=[r9],4*$SZ
+        $LDW    X[ 0]=[r10],4*$SZ
+        shrp    X[11]=X[11],X[10],40    };;
+{ .mii; $LDW    T1=[input]
+        shrp    X[10]=X[10],X[ 9],40
+        shrp    X[ 9]=X[ 9],X[ 8],40    }
+{ .mii; shrp    X[ 8]=X[ 8],X[ 7],40
+        shrp    X[ 7]=X[ 7],X[ 6],40    };;
+{ .mii; shrp    X[ 6]=X[ 6],X[ 5],40
+        shrp    X[ 5]=X[ 5],X[ 4],40    }
+{ .mii; shrp    X[ 4]=X[ 4],X[ 3],40
+        shrp    X[ 3]=X[ 3],X[ 2],40    }
+{ .mii; shrp    X[ 2]=X[ 2],X[ 1],40
+        shrp    X[ 1]=X[ 1],X[ 0],40    }
+{ .mib; shrp    X[ 0]=X[ 0],T1,40
+        br.many .L_first16              };;
+.L4byte:
+{ .mmi; $LDW    X[ 7]=[input],4*$SZ
+        $LDW    X[ 6]=[r8],4*$SZ
+        shrp    X[15]=X[15],X[14],32    }
+{ .mmi; $LDW    X[ 5]=[r9],4*$SZ
+        $LDW    X[ 4]=[r10],4*$SZ
+        shrp    X[14]=X[14],X[13],32    };;
+{ .mmi; $LDW    X[ 3]=[input],4*$SZ
+        $LDW    X[ 2]=[r8],4*$SZ
+        shrp    X[13]=X[13],X[12],32    }
+{ .mmi; $LDW    X[ 1]=[r9],4*$SZ
+        $LDW    X[ 0]=[r10],4*$SZ
+        shrp    X[12]=X[12],X[11],32    };;
+{ .mii; $LDW    T1=[input]
+        shrp    X[11]=X[11],X[10],32
+        shrp    X[10]=X[10],X[ 9],32    }
+{ .mii; shrp    X[ 9]=X[ 9],X[ 8],32
+        shrp    X[ 8]=X[ 8],X[ 7],32    };;
+{ .mii; shrp    X[ 7]=X[ 7],X[ 6],32
+        shrp    X[ 6]=X[ 6],X[ 5],32    }
+{ .mii; shrp    X[ 5]=X[ 5],X[ 4],32
+        shrp    X[ 4]=X[ 4],X[ 3],32    }
+{ .mii; shrp    X[ 3]=X[ 3],X[ 2],32
+        shrp    X[ 2]=X[ 2],X[ 1],32    }
+{ .mii; shrp    X[ 1]=X[ 1],X[ 0],32
+        shrp    X[ 0]=X[ 0],T1,32       }
+{ .mfb; br.many .L_first16              };;
+.L5byte:
+{ .mmi; $LDW    X[ 5]=[r9],4*$SZ
+        $LDW    X[ 4]=[r10],4*$SZ
+        shrp    X[15]=X[15],X[14],24    };;
+{ .mmi; $LDW    X[ 3]=[input],4*$SZ
+        $LDW    X[ 2]=[r8],4*$SZ
+        shrp    X[14]=X[14],X[13],24    }
+{ .mmi; $LDW    X[ 1]=[r9],4*$SZ
+        $LDW    X[ 0]=[r10],4*$SZ
+        shrp    X[13]=X[13],X[12],24    };;
+{ .mii; $LDW    T1=[input]
+        shrp    X[12]=X[12],X[11],24
+        shrp    X[11]=X[11],X[10],24    }
+{ .mii; shrp    X[10]=X[10],X[ 9],24
+        shrp    X[ 9]=X[ 9],X[ 8],24    };;
+{ .mii; shrp    X[ 8]=X[ 8],X[ 7],24
+        shrp    X[ 7]=X[ 7],X[ 6],24    }
+{ .mii; shrp    X[ 6]=X[ 6],X[ 5],24
+        shrp    X[ 5]=X[ 5],X[ 4],24    }
+{ .mii; shrp    X[ 4]=X[ 4],X[ 3],24
+        shrp    X[ 3]=X[ 3],X[ 2],24    }
+{ .mii; shrp    X[ 2]=X[ 2],X[ 1],24
+        shrp    X[ 1]=X[ 1],X[ 0],24    }
+{ .mib; shrp    X[ 0]=X[ 0],T1,24
+        br.many .L_first16              };;
+.L6byte:
+{ .mmi; $LDW    X[ 3]=[input],4*$SZ
+        $LDW    X[ 2]=[r8],4*$SZ
+        shrp    X[15]=X[15],X[14],16    }
+{ .mmi; $LDW    X[ 1]=[r9],4*$SZ
+        $LDW    X[ 0]=[r10],4*$SZ
+        shrp    X[14]=X[14],X[13],16    };;
+{ .mii; $LDW    T1=[input]
+        shrp    X[13]=X[13],X[12],16
+        shrp    X[12]=X[12],X[11],16    }
+{ .mii; shrp    X[11]=X[11],X[10],16
+        shrp    X[10]=X[10],X[ 9],16    };;
+{ .mii; shrp    X[ 9]=X[ 9],X[ 8],16
+        shrp    X[ 8]=X[ 8],X[ 7],16    }
+{ .mii; shrp    X[ 7]=X[ 7],X[ 6],16
+        shrp    X[ 6]=X[ 6],X[ 5],16    }
+{ .mii; shrp    X[ 5]=X[ 5],X[ 4],16
+        shrp    X[ 4]=X[ 4],X[ 3],16    }
+{ .mii; shrp    X[ 3]=X[ 3],X[ 2],16
+        shrp    X[ 2]=X[ 2],X[ 1],16    }
+{ .mii; shrp    X[ 1]=X[ 1],X[ 0],16
+        shrp    X[ 0]=X[ 0],T1,16       }
+{ .mfb; br.many .L_first16              };;
+.L7byte:
+{ .mmi; $LDW    X[ 1]=[r9],4*$SZ
+        $LDW    X[ 0]=[r10],4*$SZ
+        shrp    X[15]=X[15],X[14],8     };;
+{ .mii; $LDW    T1=[input]
+        shrp    X[14]=X[14],X[13],8
+        shrp    X[13]=X[13],X[12],8     }
+{ .mii; shrp    X[12]=X[12],X[11],8
+        shrp    X[11]=X[11],X[10],8     };;
+{ .mii; shrp    X[10]=X[10],X[ 9],8
+        shrp    X[ 9]=X[ 9],X[ 8],8     }
+{ .mii; shrp    X[ 8]=X[ 8],X[ 7],8
+        shrp    X[ 7]=X[ 7],X[ 6],8     }
+{ .mii; shrp    X[ 6]=X[ 6],X[ 5],8
+        shrp    X[ 5]=X[ 5],X[ 4],8     }
+{ .mii; shrp    X[ 4]=X[ 4],X[ 3],8
+        shrp    X[ 3]=X[ 3],X[ 2],8     }
+{ .mii; shrp    X[ 2]=X[ 2],X[ 1],8
+        shrp    X[ 1]=X[ 1],X[ 0],8     }
+{ .mib; shrp    X[ 0]=X[ 0],T1,8
+        br.many .L_first16              };;
+
+.align  32
+.L_first16:
+{ .mmi;         $LDW    K=[Ktbl],$SZ
+                and     T1=F,E
+                and     T2=A,B          }
+{ .mmi;         //$LDW  X[15]=[input],$SZ       // X[i]=*input++
+                andcm   r8=G,E
+                and     r9=A,C          };;
+{ .mmi;         xor     T1=T1,r8                //T1=((e & f) ^ (~e & g))
+                and     r10=B,C
+                _rotr   r11=$t1,$Sigma1[0] }    // ROTR(e,14)
+{ .mmi;         xor     T2=T2,r9
+                mux1    X[15]=X[15],\@rev };;   // eliminated in big-endian
+___
+$code.=<<___;
+{ .mib;         add     T1=T1,H                 // T1=Ch(e,f,g)+h
+                _rotr   r8=$t1,$Sigma1[1] }     // ROTR(e,18)
+{ .mib;         xor     T2=T2,r10               // T2=((a & b) ^ (a & c) ^ (b & c))
+                mov     H=G             };;
+{ .mib;         xor     r11=r8,r11
+                _rotr   r9=$t1,$Sigma1[2] }     // ROTR(e,41)
+{ .mib;         mov     G=F
+                mov     F=E             };;
+{ .mib;         xor     r9=r9,r11               // r9=Sigma1(e)
+                _rotr   r10=$t0,$Sigma0[0] }    // ROTR(a,28)
+{ .mib;         add     T1=T1,K                 // T1=Ch(e,f,g)+h+K512[i]
+                mov     E=D             };;
+{ .mib;         add     T1=T1,r9                // T1+=Sigma1(e)
+                _rotr   r11=$t0,$Sigma0[1] }    // ROTR(a,34)
+{ .mib;         mov     D=C
+                mov     C=B             };;
+{ .mib;         add     T1=T1,X[15]             // T1+=X[i]
+                _rotr   r8=$t0,$Sigma0[2] }     // ROTR(a,39)
+{ .mib;         xor     r10=r10,r11
+                mux2    X[15]=X[15],0x44 };;    // eliminated in 64-bit
+{ .mmi;         xor     r10=r8,r10              // r10=Sigma0(a)
+                mov     B=A
+                add     A=T1,T2         };;
+{ .mib;         add     E=E,T1
+                add     A=A,r10                 // T2=Maj(a,b,c)+Sigma0(a)
+        br.ctop.sptk    .L_first16      };;
+.L_first16_end:
+
+{ .mii; mov     ar.lc=$rounds-17
+        mov     ar.ec=1                 };;
+
+.align  32
+.L_rest:
+.rotr   X[16]
+{ .mib;         $LDW    K=[Ktbl],$SZ
+                _rotr   r8=X[15-1],$sigma0[0] } // ROTR(s0,1)
+{ .mib;         $ADD    X[15]=X[15],X[15-9]     // X[i&0xF]+=X[(i+9)&0xF]
+                $SHRU   s0=X[15-1],sgm0 };;     // s0=X[(i+1)&0xF]>>7
+{ .mib;         and     T1=F,E
+                _rotr   r9=X[15-1],$sigma0[1] } // ROTR(s0,8)
+{ .mib;         andcm   r10=G,E
+                $SHRU   s1=X[15-14],sgm1 };;    // s1=X[(i+14)&0xF]>>6
+{ .mmi;         xor     T1=T1,r10               // T1=((e & f) ^ (~e & g))
+                xor     r9=r8,r9
+                _rotr   r10=X[15-14],$sigma1[0] };;// ROTR(s1,19)
+{ .mib;         and     T2=A,B          
+                _rotr   r11=X[15-14],$sigma1[1] }// ROTR(s1,61)
+{ .mib;         and     r8=A,C          };;
+___
+$t0="t0", $t1="t1", $code.=<<___ if ($BITS==32);
+// I adhere to mmi; in order to hold Itanium 1 back and avoid 6 cycle
+// pipeline flush in last bundle. Note that even on Itanium2 the
+// latter stalls for one clock cycle...
+{ .mmi;         xor     s0=s0,r9                // s0=sigma0(X[(i+1)&0xF])
+                dep.z   $t1=E,32,32     }
+{ .mmi;         xor     r10=r11,r10
+                zxt4    E=E             };;
+{ .mmi;         or      $t1=$t1,E
+                xor     s1=s1,r10               // s1=sigma1(X[(i+14)&0xF])
+                mux2    $t0=A,0x44      };;     // copy lower half to upper
+{ .mmi;         xor     T2=T2,r8
+                _rotr   r9=$t1,$Sigma1[0] }     // ROTR(e,14)
+{ .mmi;         and     r10=B,C
+                add     T1=T1,H                 // T1=Ch(e,f,g)+h
+                $ADD    X[15]=X[15],s0  };;     // X[i&0xF]+=sigma0(X[(i+1)&0xF])
+___
+$t0="A", $t1="E", $code.=<<___ if ($BITS==64);
+{ .mib;         xor     s0=s0,r9                // s0=sigma0(X[(i+1)&0xF])
+                _rotr   r9=$t1,$Sigma1[0] }     // ROTR(e,14)
+{ .mib;         xor     r10=r11,r10
+                xor     T2=T2,r8        };;
+{ .mib;         xor     s1=s1,r10               // s1=sigma1(X[(i+14)&0xF])
+                add     T1=T1,H         }
+{ .mib;         and     r10=B,C
+                $ADD    X[15]=X[15],s0  };;     // X[i&0xF]+=sigma0(X[(i+1)&0xF])
+___
+$code.=<<___;
+{ .mmi;         xor     T2=T2,r10               // T2=((a & b) ^ (a & c) ^ (b & c))
+                mov     H=G
+                _rotr   r8=$t1,$Sigma1[1] };;   // ROTR(e,18)
+{ .mmi;         xor     r11=r8,r9
+                $ADD    X[15]=X[15],s1          // X[i&0xF]+=sigma1(X[(i+14)&0xF])
+                _rotr   r9=$t1,$Sigma1[2] }     // ROTR(e,41)
+{ .mmi;         mov     G=F
+                mov     F=E             };;
+{ .mib;         xor     r9=r9,r11               // r9=Sigma1(e)
+                _rotr   r10=$t0,$Sigma0[0] }    // ROTR(a,28)
+{ .mib;         add     T1=T1,K                 // T1=Ch(e,f,g)+h+K512[i]
+                mov     E=D             };;
+{ .mib;         add     T1=T1,r9                // T1+=Sigma1(e)
+                _rotr   r11=$t0,$Sigma0[1] }    // ROTR(a,34)
+{ .mib;         mov     D=C
+                mov     C=B             };;
+{ .mmi;         add     T1=T1,X[15]             // T1+=X[i]
+                xor     r10=r10,r11
+                _rotr   r8=$t0,$Sigma0[2] };;   // ROTR(a,39)
+{ .mmi;         xor     r10=r8,r10              // r10=Sigma0(a)
+                mov     B=A
+                add     A=T1,T2         };;
+{ .mib;         add     E=E,T1
+                add     A=A,r10                 // T2=Maj(a,b,c)+Sigma0(a)
+        br.ctop.sptk    .L_rest };;
+.L_rest_end:
+
+{ .mmi; add     A_=A_,A
+        add     B_=B_,B
+        add     C_=C_,C                 }
+{ .mmi; add     D_=D_,D
+        add     E_=E_,E
+        cmp.ltu p16,p0=1,num            };;
+{ .mmi; add     F_=F_,F
+        add     G_=G_,G
+        add     H_=H_,H                 }
+{ .mmb; add     Ktbl=-$SZ*$rounds,Ktbl
+(p16)   add     num=-1,num
+(p16)   br.dptk.many    .L_outer        };;
+
+{ .mib; add     r8=0*$SZ,ctx
+        add     r9=1*$SZ,ctx            }
+{ .mib; add     r10=2*$SZ,ctx
+        add     r11=3*$SZ,ctx           };;
+{ .mmi; $STW    [r8]=A_,4*$SZ
+        $STW    [r9]=B_,4*$SZ
+        mov     ar.lc=lcsave            }
+{ .mmi; $STW    [r10]=C_,4*$SZ
+        $STW    [r11]=D_,4*$SZ
+        mov     pr=prsave,0x1ffff       };;
+{ .mmb; $STW    [r8]=E_
+        $STW    [r9]=F_                 }
+{ .mmb; $STW    [r10]=G_
+        $STW    [r11]=H_
+        br.ret.sptk.many        b0      };;
+.endp   $func#
+___
+
+$code =~ s/\`([^\`]*)\`/eval $1/gem;
+$code =~ s/_rotr(\s+)([^=]+)=([^,]+),([0-9]+)/shrp$1$2=$3,$3,$4/gm;
+if ($BITS==64) {
+    $code =~ s/mux2(\s+)\S+/nop.i$1 0x0/gm;
+    $code =~ s/mux1(\s+)\S+/nop.i$1 0x0/gm      if ($big_endian);
+    $code =~ s/(shrp\s+X\[[^=]+)=([^,]+),([^,]+),([1-9]+)/$1=$3,$2,64-$4/gm
+                                                if (!$big_endian);
+    $code =~ s/ld1(\s+)X\[\S+/nop.m$1 0x0/gm;
+}
+
+print $code;
+
+print<<___ if ($BITS==32);
+.align  64
+.type   K256#,\@object
+K256:   data4   0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
+        data4   0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
+        data4   0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
+        data4   0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
+        data4   0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
+        data4   0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
+        data4   0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
+        data4   0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
+        data4   0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
+        data4   0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
+        data4   0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
+        data4   0xd192e819,0xd6990624,0xf40e3585,0x106aa070
+        data4   0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
+        data4   0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
+        data4   0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
+        data4   0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+.size   K256#,$SZ*$rounds
+stringz "SHA256 block transform for IA64, CRYPTOGAMS by <appro\@openssl.org>"
+___
+print<<___ if ($BITS==64);
+.align  64
+.type   K512#,\@object
+K512:   data8   0x428a2f98d728ae22,0x7137449123ef65cd
+        data8   0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc
+        data8   0x3956c25bf348b538,0x59f111f1b605d019
+        data8   0x923f82a4af194f9b,0xab1c5ed5da6d8118
+        data8   0xd807aa98a3030242,0x12835b0145706fbe
+        data8   0x243185be4ee4b28c,0x550c7dc3d5ffb4e2
+        data8   0x72be5d74f27b896f,0x80deb1fe3b1696b1
+        data8   0x9bdc06a725c71235,0xc19bf174cf692694
+        data8   0xe49b69c19ef14ad2,0xefbe4786384f25e3
+        data8   0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65
+        data8   0x2de92c6f592b0275,0x4a7484aa6ea6e483
+        data8   0x5cb0a9dcbd41fbd4,0x76f988da831153b5
+        data8   0x983e5152ee66dfab,0xa831c66d2db43210
+        data8   0xb00327c898fb213f,0xbf597fc7beef0ee4
+        data8   0xc6e00bf33da88fc2,0xd5a79147930aa725
+        data8   0x06ca6351e003826f,0x142929670a0e6e70
+        data8   0x27b70a8546d22ffc,0x2e1b21385c26c926
+        data8   0x4d2c6dfc5ac42aed,0x53380d139d95b3df
+        data8   0x650a73548baf63de,0x766a0abb3c77b2a8
+        data8   0x81c2c92e47edaee6,0x92722c851482353b
+        data8   0xa2bfe8a14cf10364,0xa81a664bbc423001
+        data8   0xc24b8b70d0f89791,0xc76c51a30654be30
+        data8   0xd192e819d6ef5218,0xd69906245565a910
+        data8   0xf40e35855771202a,0x106aa07032bbd1b8
+        data8   0x19a4c116b8d2d0c8,0x1e376c085141ab53
+        data8   0x2748774cdf8eeb99,0x34b0bcb5e19b48a8
+        data8   0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb
+        data8   0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3
+        data8   0x748f82ee5defb2fc,0x78a5636f43172f60
+        data8   0x84c87814a1f0ab72,0x8cc702081a6439ec
+        data8   0x90befffa23631e28,0xa4506cebde82bde9
+        data8   0xbef9a3f7b2c67915,0xc67178f2e372532b
+        data8   0xca273eceea26619c,0xd186b8c721c0c207
+        data8   0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178
+        data8   0x06f067aa72176fba,0x0a637dc5a2c898a6
+        data8   0x113f9804bef90dae,0x1b710b35131c471b
+        data8   0x28db77f523047d84,0x32caab7b40c72493
+        data8   0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
+        data8   0x4cc5d4becb3e42b6,0x597f299cfc657e2a
+        data8   0x5fcb6fab3ad6faec,0x6c44198c4a475817
+.size   K512#,$SZ*$rounds
+stringz "SHA512 block transform for IA64, CRYPTOGAMS by <appro\@openssl.org>"
+___
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha512-x86_64.pl b/src/lib/libssl/src/crypto/sha/asm/sha512-x86_64.pl
new file mode 100755
index 0000000000..b6252d31ec
--- /dev/null
+++ b/src/lib/libssl/src/crypto/sha/asm/sha512-x86_64.pl
@@ -0,0 +1,344 @@
+#!/usr/bin/env perl
+#
+# ====================================================================
+# Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+# project. Rights for redistribution and usage in source and binary
+# forms are granted according to the OpenSSL license.
+# ====================================================================
+#
+# sha256/512_block procedure for x86_64.
+#
+# 40% improvement over compiler-generated code on Opteron. On EM64T
+# sha256 was observed to run >80% faster and sha512 - >40%. No magical
+# tricks, just straight implementation... I really wonder why gcc
+# [being armed with inline assembler] fails to generate as fast code.
+# The only thing which is cool about this module is that it's very
+# same instruction sequence used for both SHA-256 and SHA-512. In
+# former case the instructions operate on 32-bit operands, while in
+# latter - on 64-bit ones. All I had to do is to get one flavor right,
+# the other one passed the test right away:-)
+#
+# sha256_block runs in ~1005 cycles on Opteron, which gives you
+# asymptotic performance of 64*1000/1005=63.7MBps times CPU clock
+# frequency in GHz. sha512_block runs in ~1275 cycles, which results
+# in 128*1000/1275=100MBps per GHz. Is there room for improvement?
+# Well, if you compare it to IA-64 implementation, which maintains
+# X[16] in register bank[!], tends to 4 instructions per CPU clock
+# cycle and runs in 1003 cycles, 1275 is very good result for 3-way
+# issue Opteron pipeline and X[16] maintained in memory. So that *if*
+# there is a way to improve it, *then* the only way would be to try to
+# offload X[16] updates to SSE unit, but that would require "deeper"
+# loop unroll, which in turn would naturally cause size blow-up, not
+# to mention increased complexity! And once again, only *if* it's
+# actually possible to noticeably improve overall ILP, instruction
+# level parallelism, on a given CPU implementation in this case.
+#
+# Special note on Intel EM64T. While Opteron CPU exhibits perfect
+# perfromance ratio of 1.5 between 64- and 32-bit flavors [see above],
+# [currently available] EM64T CPUs apparently are far from it. On the
+# contrary, 64-bit version, sha512_block, is ~30% *slower* than 32-bit
+# sha256_block:-( This is presumably because 64-bit shifts/rotates
+# apparently are not atomic instructions, but implemented in microcode.
+
+$output=shift;
+
+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
+( $xlate="${dir}x86_64-xlate.pl" and -f $xlate ) or
+( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
+die "can't locate x86_64-xlate.pl";
+
+open STDOUT,"| $^X $xlate $output";
+
+if ($output =~ /512/) {
+        $func="sha512_block_data_order";
+        $TABLE="K512";
+        $SZ=8;
+        @ROT=($A,$B,$C,$D,$E,$F,$G,$H)=("%rax","%rbx","%rcx","%rdx",
+                                        "%r8", "%r9", "%r10","%r11");
+        ($T1,$a0,$a1,$a2)=("%r12","%r13","%r14","%r15");
+        @Sigma0=(28,34,39);
+        @Sigma1=(14,18,41);
+        @sigma0=(1,  8, 7);
+        @sigma1=(19,61, 6);
+        $rounds=80;
+} else {
+        $func="sha256_block_data_order";
+        $TABLE="K256";
+        $SZ=4;
+        @ROT=($A,$B,$C,$D,$E,$F,$G,$H)=("%eax","%ebx","%ecx","%edx",
+                                        "%r8d","%r9d","%r10d","%r11d");
+        ($T1,$a0,$a1,$a2)=("%r12d","%r13d","%r14d","%r15d");
+        @Sigma0=( 2,13,22);
+        @Sigma1=( 6,11,25);
+        @sigma0=( 7,18, 3);
+        @sigma1=(17,19,10);
+        $rounds=64;
+}
+
+$ctx="%rdi";    # 1st arg
+$round="%rdi";  # zaps $ctx
+$inp="%rsi";    # 2nd arg
+$Tbl="%rbp";
+
+$_ctx="16*$SZ+0*8(%rsp)";
+$_inp="16*$SZ+1*8(%rsp)";
+$_end="16*$SZ+2*8(%rsp)";
+$_rsp="16*$SZ+3*8(%rsp)";
+$framesz="16*$SZ+4*8";
+
+
+sub ROUND_00_15()
+{ my ($i,$a,$b,$c,$d,$e,$f,$g,$h) = @_;
+
+$code.=<<___;
+        mov     $e,$a0
+        mov     $e,$a1
+        mov     $f,$a2
+
+        ror     \$$Sigma1[0],$a0
+        ror     \$$Sigma1[1],$a1
+        xor     $g,$a2                  # f^g
+
+        xor     $a1,$a0
+        ror     \$`$Sigma1[2]-$Sigma1[1]`,$a1
+        and     $e,$a2                  # (f^g)&e
+        mov     $T1,`$SZ*($i&0xf)`(%rsp)
+
+        xor     $a1,$a0                 # Sigma1(e)
+        xor     $g,$a2                  # Ch(e,f,g)=((f^g)&e)^g
+        add     $h,$T1                  # T1+=h
+
+        mov     $a,$h
+        add     $a0,$T1                 # T1+=Sigma1(e)
+
+        add     $a2,$T1                 # T1+=Ch(e,f,g)
+        mov     $a,$a0
+        mov     $a,$a1
+
+        ror     \$$Sigma0[0],$h
+        ror     \$$Sigma0[1],$a0
+        mov     $a,$a2
+        add     ($Tbl,$round,$SZ),$T1   # T1+=K[round]
+
+        xor     $a0,$h
+        ror     \$`$Sigma0[2]-$Sigma0[1]`,$a0
+        or      $c,$a1                  # a|c
+
+        xor     $a0,$h                  # h=Sigma0(a)
+        and     $c,$a2                  # a&c
+        add     $T1,$d                  # d+=T1
+
+        and     $b,$a1                  # (a|c)&b
+        add     $T1,$h                  # h+=T1
+
+        or      $a2,$a1                 # Maj(a,b,c)=((a|c)&b)|(a&c)
+        lea     1($round),$round        # round++
+
+        add     $a1,$h                  # h+=Maj(a,b,c)
+___
+}
+
+sub ROUND_16_XX()
+{ my ($i,$a,$b,$c,$d,$e,$f,$g,$h) = @_;
+
+$code.=<<___;
+        mov     `$SZ*(($i+1)&0xf)`(%rsp),$a0
+        mov     `$SZ*(($i+14)&0xf)`(%rsp),$T1
+
+        mov     $a0,$a2
+
+        shr     \$$sigma0[2],$a0
+        ror     \$$sigma0[0],$a2
+
+        xor     $a2,$a0
+        ror     \$`$sigma0[1]-$sigma0[0]`,$a2
+
+        xor     $a2,$a0                 # sigma0(X[(i+1)&0xf])
+        mov     $T1,$a1
+
+        shr     \$$sigma1[2],$T1
+        ror     \$$sigma1[0],$a1
+
+        xor     $a1,$T1
+        ror     \$`$sigma1[1]-$sigma1[0]`,$a1
+
+        xor     $a1,$T1                 # sigma1(X[(i+14)&0xf])
+
+        add     $a0,$T1
+
+        add     `$SZ*(($i+9)&0xf)`(%rsp),$T1
+
+        add     `$SZ*($i&0xf)`(%rsp),$T1
+___
+        &ROUND_00_15(@_);
+}
+
+$code=<<___;
+.text
+
+.globl  $func
+.type   $func,\@function,4
+.align  16
+$func:
+        push    %rbx
+        push    %rbp
+        push    %r12
+        push    %r13
+        push    %r14
+        push    %r15
+        mov     %rsp,%rbp               # copy %rsp
+        shl     \$4,%rdx                # num*16
+        sub     \$$framesz,%rsp
+        lea     ($inp,%rdx,$SZ),%rdx    # inp+num*16*$SZ
+        and     \$-64,%rsp              # align stack frame
+        mov     $ctx,$_ctx              # save ctx, 1st arg
+        mov     $inp,$_inp              # save inp, 2nd arh
+        mov     %rdx,$_end              # save end pointer, "3rd" arg
+        mov     %rbp,$_rsp              # save copy of %rsp
+
+        .picmeup $Tbl
+        lea     $TABLE-.($Tbl),$Tbl
+
+        mov     $SZ*0($ctx),$A
+        mov     $SZ*1($ctx),$B
+        mov     $SZ*2($ctx),$C
+        mov     $SZ*3($ctx),$D
+        mov     $SZ*4($ctx),$E
+        mov     $SZ*5($ctx),$F
+        mov     $SZ*6($ctx),$G
+        mov     $SZ*7($ctx),$H
+        jmp     .Lloop
+
+.align  16
+.Lloop:
+        xor     $round,$round
+___
+        for($i=0;$i<16;$i++) {
+                $code.="        mov     $SZ*$i($inp),$T1\n";
+                $code.="        bswap   $T1\n";
+                &ROUND_00_15($i,@ROT);
+                unshift(@ROT,pop(@ROT));
+        }
+$code.=<<___;
+        jmp     .Lrounds_16_xx
+.align  16
+.Lrounds_16_xx:
+___
+        for(;$i<32;$i++) {
+                &ROUND_16_XX($i,@ROT);
+                unshift(@ROT,pop(@ROT));
+        }
+
+$code.=<<___;
+        cmp     \$$rounds,$round
+        jb      .Lrounds_16_xx
+
+        mov     $_ctx,$ctx
+        lea     16*$SZ($inp),$inp
+
+        add     $SZ*0($ctx),$A
+        add     $SZ*1($ctx),$B
+        add     $SZ*2($ctx),$C
+        add     $SZ*3($ctx),$D
+        add     $SZ*4($ctx),$E
+        add     $SZ*5($ctx),$F
+        add     $SZ*6($ctx),$G
+        add     $SZ*7($ctx),$H
+
+        cmp     $_end,$inp
+
+        mov     $A,$SZ*0($ctx)
+        mov     $B,$SZ*1($ctx)
+        mov     $C,$SZ*2($ctx)
+        mov     $D,$SZ*3($ctx)
+        mov     $E,$SZ*4($ctx)
+        mov     $F,$SZ*5($ctx)
+        mov     $G,$SZ*6($ctx)
+        mov     $H,$SZ*7($ctx)
+        jb      .Lloop
+
+        mov     $_rsp,%rsp
+        pop     %r15
+        pop     %r14
+        pop     %r13
+        pop     %r12
+        pop     %rbp
+        pop     %rbx
+
+        ret
+.size   $func,.-$func
+___
+
+if ($SZ==4) {
+$code.=<<___;
+.align  64
+.type   $TABLE,\@object
+$TABLE:
+        .long   0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
+        .long   0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
+        .long   0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
+        .long   0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
+        .long   0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
+        .long   0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da
+        .long   0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7
+        .long   0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967
+        .long   0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13
+        .long   0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85
+        .long   0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3
+        .long   0xd192e819,0xd6990624,0xf40e3585,0x106aa070
+        .long   0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5
+        .long   0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
+        .long   0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
+        .long   0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+___
+} else {
+$code.=<<___;
+.align  64
+.type   $TABLE,\@object
+$TABLE:
+        .quad   0x428a2f98d728ae22,0x7137449123ef65cd
+        .quad   0xb5c0fbcfec4d3b2f,0xe9b5dba58189dbbc
+        .quad   0x3956c25bf348b538,0x59f111f1b605d019
+        .quad   0x923f82a4af194f9b,0xab1c5ed5da6d8118
+        .quad   0xd807aa98a3030242,0x12835b0145706fbe
+        .quad   0x243185be4ee4b28c,0x550c7dc3d5ffb4e2
+        .quad   0x72be5d74f27b896f,0x80deb1fe3b1696b1
+        .quad   0x9bdc06a725c71235,0xc19bf174cf692694
+        .quad   0xe49b69c19ef14ad2,0xefbe4786384f25e3
+        .quad   0x0fc19dc68b8cd5b5,0x240ca1cc77ac9c65
+        .quad   0x2de92c6f592b0275,0x4a7484aa6ea6e483
+        .quad   0x5cb0a9dcbd41fbd4,0x76f988da831153b5
+        .quad   0x983e5152ee66dfab,0xa831c66d2db43210
+        .quad   0xb00327c898fb213f,0xbf597fc7beef0ee4
+        .quad   0xc6e00bf33da88fc2,0xd5a79147930aa725
+        .quad   0x06ca6351e003826f,0x142929670a0e6e70
+        .quad   0x27b70a8546d22ffc,0x2e1b21385c26c926
+        .quad   0x4d2c6dfc5ac42aed,0x53380d139d95b3df
+        .quad   0x650a73548baf63de,0x766a0abb3c77b2a8
+        .quad   0x81c2c92e47edaee6,0x92722c851482353b
+        .quad   0xa2bfe8a14cf10364,0xa81a664bbc423001
+        .quad   0xc24b8b70d0f89791,0xc76c51a30654be30
+        .quad   0xd192e819d6ef5218,0xd69906245565a910
+        .quad   0xf40e35855771202a,0x106aa07032bbd1b8
+        .quad   0x19a4c116b8d2d0c8,0x1e376c085141ab53
+        .quad   0x2748774cdf8eeb99,0x34b0bcb5e19b48a8
+        .quad   0x391c0cb3c5c95a63,0x4ed8aa4ae3418acb
+        .quad   0x5b9cca4f7763e373,0x682e6ff3d6b2b8a3
+        .quad   0x748f82ee5defb2fc,0x78a5636f43172f60
+        .quad   0x84c87814a1f0ab72,0x8cc702081a6439ec
+        .quad   0x90befffa23631e28,0xa4506cebde82bde9
+        .quad   0xbef9a3f7b2c67915,0xc67178f2e372532b
+        .quad   0xca273eceea26619c,0xd186b8c721c0c207
+        .quad   0xeada7dd6cde0eb1e,0xf57d4f7fee6ed178
+        .quad   0x06f067aa72176fba,0x0a637dc5a2c898a6
+        .quad   0x113f9804bef90dae,0x1b710b35131c471b
+        .quad   0x28db77f523047d84,0x32caab7b40c72493
+        .quad   0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
+        .quad   0x4cc5d4becb3e42b6,0x597f299cfc657e2a
+        .quad   0x5fcb6fab3ad6faec,0x6c44198c4a475817
+___
+}
+
+$code =~ s/\`([^\`]*)\`/eval $1/gem;
+print $code;
+close STDOUT;
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_sha256.c b/src/lib/libssl/src/crypto/sha/sha256.c
index b5a1ca0cac..867f90cc97 100644
--- a/src/lib/libssl/src/fips-1.0/sha/fips_sha256.c
+++ b/src/lib/libssl/src/crypto/sha/sha256.c
@@ -4,19 +4,16 @@
  * according to the OpenSSL license [found in ../../LICENSE].
  * ====================================================================
  */
+#include <openssl/opensslconf.h>
 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256)
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/opensslconf.h>
 #include <openssl/crypto.h>
-#include <openssl/fips_sha.h>
-#include <openssl/fips.h>
+#include <openssl/sha.h>
 #include <openssl/opensslv.h>
 
-#ifdef OPENSSL_FIPS
-
 const char SHA256_version[]="SHA-256" OPENSSL_VERSION_PTEXT;
 
 int SHA224_Init (SHA256_CTX *c)
@@ -72,17 +69,11 @@ int SHA224_Update(SHA256_CTX *c, const void *data, size_t len)
 int SHA224_Final (unsigned char *md, SHA256_CTX *c)
 {   return SHA256_Final (md,c);   }
 
-#ifndef SHA_LONG_LOG2
-#define SHA_LONG_LOG2   2       /* default to 32 bits */
-#endif
-
 #define DATA_ORDER_IS_BIG_ENDIAN
 
 #define HASH_LONG               SHA_LONG
-#define HASH_LONG_LOG2          SHA_LONG_LOG2
 #define HASH_CTX                SHA256_CTX
 #define HASH_CBLOCK             SHA_CBLOCK
-#define HASH_LBLOCK             SHA_LBLOCK
 /*
  * Note that FIPS180-2 discusses "Truncation of the Hash Function Output."
  * default: case below covers for it. It's not clear however if it's
@@ -93,21 +84,21 @@ int SHA224_Final (unsigned char *md, SHA256_CTX *c)
  */
 #define HASH_MAKE_STRING(c,s)   do {    \
         unsigned long ll;               \
-        unsigned int  n;                \
+        unsigned int  xn;               \
         switch ((c)->md_len)            \
         {   case SHA224_DIGEST_LENGTH:  \
-                for (n=0;n<SHA224_DIGEST_LENGTH/4;n++)  \
-                {   ll=(c)->h[n]; HOST_l2c(ll,(s));   } \
+                for (xn=0;xn<SHA224_DIGEST_LENGTH/4;xn++)       \
+                {   ll=(c)->h[xn]; HOST_l2c(ll,(s));   }        \
                 break;                  \
             case SHA256_DIGEST_LENGTH:  \
-                for (n=0;n<SHA256_DIGEST_LENGTH/4;n++)  \
-                {   ll=(c)->h[n]; HOST_l2c(ll,(s));   } \
+                for (xn=0;xn<SHA256_DIGEST_LENGTH/4;xn++)       \
+                {   ll=(c)->h[xn]; HOST_l2c(ll,(s));   }        \
                 break;                  \
             default:                    \
                 if ((c)->md_len > SHA256_DIGEST_LENGTH) \
                     return 0;                           \
-                for (n=0;n<(c)->md_len/4;n++)           \
-                {   ll=(c)->h[n]; HOST_l2c(ll,(s));   } \
+                for (xn=0;xn<(c)->md_len/4;xn++)                \
+                {   ll=(c)->h[xn]; HOST_l2c(ll,(s));   }        \
                 break;                  \
         }                               \
         } while (0)
@@ -115,16 +106,15 @@ int SHA224_Final (unsigned char *md, SHA256_CTX *c)
 #define HASH_UPDATE             SHA256_Update
 #define HASH_TRANSFORM          SHA256_Transform
 #define HASH_FINAL              SHA256_Final
-#define HASH_BLOCK_HOST_ORDER   sha256_block_host_order
 #define HASH_BLOCK_DATA_ORDER   sha256_block_data_order
-void sha256_block_host_order (SHA256_CTX *ctx, const void *in, size_t num);
+#ifndef SHA256_ASM
+static
+#endif
 void sha256_block_data_order (SHA256_CTX *ctx, const void *in, size_t num);
 
-#include "fips_md32_common.h"
+#include "md32_common.h"
 
-#ifdef SHA256_ASM
-void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host);
-#else
+#ifndef SHA256_ASM
 static const SHA_LONG K256[64] = {
         0x428a2f98UL,0x71374491UL,0xb5c0fbcfUL,0xe9b5dba5UL,
         0x3956c25bUL,0x59f111f1UL,0x923f82a4UL,0xab1c5ed5UL,
@@ -158,10 +148,10 @@ static const SHA_LONG K256[64] = {
 
 #ifdef OPENSSL_SMALL_FOOTPRINT
 
-static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
+static void sha256_block_data_order (SHA256_CTX *ctx, const void *in, size_t num)
         {
         unsigned MD32_REG_T a,b,c,d,e,f,g,h,s0,s1,T1,T2;
-        SHA_LONG        X[16];
+        SHA_LONG        X[16],l;
         int i;
         const unsigned char *data=in;
 
@@ -170,33 +160,13 @@ static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
         a = ctx->h[0];  b = ctx->h[1];  c = ctx->h[2];  d = ctx->h[3];
         e = ctx->h[4];  f = ctx->h[5];  g = ctx->h[6];  h = ctx->h[7];
 
-        if (host)
-                {
-                const SHA_LONG *W=(const SHA_LONG *)data;
-
-                for (i=0;i<16;i++)
-                        {
-                        T1 = X[i] = W[i];
-                        T1 += h + Sigma1(e) + Ch(e,f,g) + K256[i];
-                        T2 = Sigma0(a) + Maj(a,b,c);
-                        h = g;  g = f;  f = e;  e = d + T1;
-                        d = c;  c = b;  b = a;  a = T1 + T2;
-                        }
-
-                data += SHA256_CBLOCK;
-                }
-        else
+        for (i=0;i<16;i++)
                 {
-                SHA_LONG l;
-
-                for (i=0;i<16;i++)
-                        {
-                        HOST_c2l(data,l); T1 = X[i] = l;
-                        T1 += h + Sigma1(e) + Ch(e,f,g) + K256[i];
-                        T2 = Sigma0(a) + Maj(a,b,c);
-                        h = g;  g = f;  f = e;  e = d + T1;
-                        d = c;  c = b;  b = a;  a = T1 + T2;
-                        }
+                HOST_c2l(data,l); T1 = X[i] = l;
+                T1 += h + Sigma1(e) + Ch(e,f,g) + K256[i];
+                T2 = Sigma0(a) + Maj(a,b,c);
+                h = g;  g = f;  f = e;  e = d + T1;
+                d = c;  c = b;  b = a;  a = T1 + T2;
                 }
 
         for (;i<64;i++)
@@ -230,19 +200,20 @@ static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
         T1 = X[(i)&0x0f] += s0 + s1 + X[(i+9)&0x0f];    \
         ROUND_00_15(i,a,b,c,d,e,f,g,h);         } while (0)
 
-static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
+static void sha256_block_data_order (SHA256_CTX *ctx, const void *in, size_t num)
         {
         unsigned MD32_REG_T a,b,c,d,e,f,g,h,s0,s1,T1;
         SHA_LONG        X[16];
         int i;
         const unsigned char *data=in;
+        const union { long one; char little; } is_endian = {1};
 
                         while (num--) {
 
         a = ctx->h[0];  b = ctx->h[1];  c = ctx->h[2];  d = ctx->h[3];
         e = ctx->h[4];  f = ctx->h[5];  g = ctx->h[6];  h = ctx->h[7];
 
-        if (host)
+        if (!is_endian.little && sizeof(SHA_LONG)==4 && ((size_t)in%4)==0)
                 {
                 const SHA_LONG *W=(const SHA_LONG *)data;
 
@@ -308,18 +279,4 @@ static void sha256_block (SHA256_CTX *ctx, const void *in, size_t num, int host)
 #endif
 #endif /* SHA256_ASM */
 
-/*
- * Idea is to trade couple of cycles for some space. On IA-32 we save
- * about 4K in "big footprint" case. In "small footprint" case any gain
- * is appreciated:-)
- */
-void HASH_BLOCK_HOST_ORDER (SHA256_CTX *ctx, const void *in, size_t num)
-{   sha256_block (ctx,in,num,1);   }
-
-void HASH_BLOCK_DATA_ORDER (SHA256_CTX *ctx, const void *in, size_t num)
-{   sha256_block (ctx,in,num,0);   }
-
-#endif
-
 #endif /* OPENSSL_NO_SHA256 */
-
diff --git a/src/lib/libssl/src/crypto/sha/sha256t.c b/src/lib/libssl/src/crypto/sha/sha256t.c
new file mode 100644
index 0000000000..6b4a3bd001
--- /dev/null
+++ b/src/lib/libssl/src/crypto/sha/sha256t.c
@@ -0,0 +1,147 @@
+/* crypto/sha/sha256t.c */
+/* ====================================================================
+ * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
+ * ====================================================================
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <openssl/sha.h>
+#include <openssl/evp.h>
+
+#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA256)
+int main(int argc, char *argv[])
+{
+    printf("No SHA256 support\n");
+    return(0);
+}
+#else
+
+unsigned char app_b1[SHA256_DIGEST_LENGTH] = {
+        0xba,0x78,0x16,0xbf,0x8f,0x01,0xcf,0xea,
+        0x41,0x41,0x40,0xde,0x5d,0xae,0x22,0x23,
+        0xb0,0x03,0x61,0xa3,0x96,0x17,0x7a,0x9c,
+        0xb4,0x10,0xff,0x61,0xf2,0x00,0x15,0xad };
+
+unsigned char app_b2[SHA256_DIGEST_LENGTH] = {
+        0x24,0x8d,0x6a,0x61,0xd2,0x06,0x38,0xb8,
+        0xe5,0xc0,0x26,0x93,0x0c,0x3e,0x60,0x39,
+        0xa3,0x3c,0xe4,0x59,0x64,0xff,0x21,0x67,
+        0xf6,0xec,0xed,0xd4,0x19,0xdb,0x06,0xc1 };
+
+unsigned char app_b3[SHA256_DIGEST_LENGTH] = {
+        0xcd,0xc7,0x6e,0x5c,0x99,0x14,0xfb,0x92,
+        0x81,0xa1,0xc7,0xe2,0x84,0xd7,0x3e,0x67,
+        0xf1,0x80,0x9a,0x48,0xa4,0x97,0x20,0x0e,
+        0x04,0x6d,0x39,0xcc,0xc7,0x11,0x2c,0xd0 };
+
+unsigned char addenum_1[SHA224_DIGEST_LENGTH] = {
+        0x23,0x09,0x7d,0x22,0x34,0x05,0xd8,0x22,
+        0x86,0x42,0xa4,0x77,0xbd,0xa2,0x55,0xb3,
+        0x2a,0xad,0xbc,0xe4,0xbd,0xa0,0xb3,0xf7,
+        0xe3,0x6c,0x9d,0xa7 };
+
+unsigned char addenum_2[SHA224_DIGEST_LENGTH] = {
+        0x75,0x38,0x8b,0x16,0x51,0x27,0x76,0xcc,
+        0x5d,0xba,0x5d,0xa1,0xfd,0x89,0x01,0x50,
+        0xb0,0xc6,0x45,0x5c,0xb4,0xf5,0x8b,0x19,
+        0x52,0x52,0x25,0x25 };
+
+unsigned char addenum_3[SHA224_DIGEST_LENGTH] = {
+        0x20,0x79,0x46,0x55,0x98,0x0c,0x91,0xd8,
+        0xbb,0xb4,0xc1,0xea,0x97,0x61,0x8a,0x4b,
+        0xf0,0x3f,0x42,0x58,0x19,0x48,0xb2,0xee,
+        0x4e,0xe7,0xad,0x67 };
+
+int main (int argc,char **argv)
+{ unsigned char md[SHA256_DIGEST_LENGTH];
+  int           i;
+  EVP_MD_CTX    evp;
+
+    fprintf(stdout,"Testing SHA-256 ");
+
+    EVP_Digest ("abc",3,md,NULL,EVP_sha256(),NULL);
+    if (memcmp(md,app_b1,sizeof(app_b1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_Digest ("abcdbcde""cdefdefg""efghfghi""ghijhijk"
+                "ijkljklm""klmnlmno""mnopnopq",56,md,NULL,EVP_sha256(),NULL);
+    if (memcmp(md,app_b2,sizeof(app_b2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_MD_CTX_init (&evp);
+    EVP_DigestInit_ex (&evp,EVP_sha256(),NULL);
+    for (i=0;i<1000000;i+=160)
+        EVP_DigestUpdate (&evp, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<160?1000000-i:160);
+    EVP_DigestFinal_ex (&evp,md,NULL);
+    EVP_MD_CTX_cleanup (&evp);
+
+    if (memcmp(md,app_b3,sizeof(app_b3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+    fprintf(stdout,"Testing SHA-224 ");
+
+    EVP_Digest ("abc",3,md,NULL,EVP_sha224(),NULL);
+    if (memcmp(md,addenum_1,sizeof(addenum_1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_Digest ("abcdbcde""cdefdefg""efghfghi""ghijhijk"
+                "ijkljklm""klmnlmno""mnopnopq",56,md,NULL,EVP_sha224(),NULL);
+    if (memcmp(md,addenum_2,sizeof(addenum_2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_MD_CTX_init (&evp);
+    EVP_DigestInit_ex (&evp,EVP_sha224(),NULL);
+    for (i=0;i<1000000;i+=64)
+        EVP_DigestUpdate (&evp, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<64?1000000-i:64);
+    EVP_DigestFinal_ex (&evp,md,NULL);
+    EVP_MD_CTX_cleanup (&evp);
+
+    if (memcmp(md,addenum_3,sizeof(addenum_3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+  return 0;
+}
+#endif
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_sha512.c b/src/lib/libssl/src/crypto/sha/sha512.c
index 9e906af315..987fc07c99 100644
--- a/src/lib/libssl/src/fips-1.0/sha/fips_sha512.c
+++ b/src/lib/libssl/src/crypto/sha/sha512.c
@@ -4,6 +4,7 @@
  * according to the OpenSSL license [found in ../../LICENSE].
  * ====================================================================
  */
+#include <openssl/opensslconf.h>
 #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA512)
 /*
  * IMPLEMENTATION NOTES.
@@ -43,17 +44,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <openssl/opensslconf.h>
 #include <openssl/crypto.h>
-#include <openssl/fips_sha.h>
-#include <openssl/fips.h>
+#include <openssl/sha.h>
 #include <openssl/opensslv.h>
 
-#ifdef OPENSSL_FIPS
+#include "cryptlib.h"
 
 const char SHA512_version[]="SHA-512" OPENSSL_VERSION_PTEXT;
 
-#if defined(_M_IX86) || defined(_M_AMD64) || defined(__i386) || defined(__x86_64)
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
+    defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \
+    defined(__s390__) || defined(__s390x__) || \
+    defined(SHA512_ASM)
 #define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
 #endif
 
@@ -90,7 +92,7 @@ int SHA512_Init (SHA512_CTX *c)
 #ifndef SHA512_ASM
 static
 #endif
-void sha512_block (SHA512_CTX *ctx, const void *in, size_t num);
+void sha512_block_data_order (SHA512_CTX *ctx, const void *in, size_t num);
 
 int SHA512_Final (unsigned char *md, SHA512_CTX *c)
         {
@@ -101,7 +103,7 @@ int SHA512_Final (unsigned char *md, SHA512_CTX *c)
         n++;
         if (n > (sizeof(c->u)-16))
                 memset (p+n,0,sizeof(c->u)-n), n=0,
-                sha512_block (c,p,1);
+                sha512_block_data_order (c,p,1);
 
         memset (p+n,0,sizeof(c->u)-16-n);
 #ifdef  B_ENDIAN
@@ -126,7 +128,7 @@ int SHA512_Final (unsigned char *md, SHA512_CTX *c)
         p[sizeof(c->u)-16] = (unsigned char)(c->Nh>>56);
 #endif
 
-        sha512_block (c,p,1);
+        sha512_block_data_order (c,p,1);
 
         if (md==0) return 0;
 
@@ -179,9 +181,6 @@ int SHA512_Update (SHA512_CTX *c, const void *_data, size_t len)
         unsigned char  *p=c->u.p;
         const unsigned char *data=(const unsigned char *)_data;
 
-        if(FIPS_selftest_failed())
-                return 0;
-
         if (len==0) return  1;
 
         l = (c->Nl+(((SHA_LONG64)len)<<3))&U64(0xffffffffffffffff);
@@ -201,7 +200,7 @@ int SHA512_Update (SHA512_CTX *c, const void *_data, size_t len)
                 else    {
                         memcpy (p+c->num,data,n), c->num = 0;
                         len-=n, data+=n;
-                        sha512_block (c,p,1);
+                        sha512_block_data_order (c,p,1);
                         }
                 }
 
@@ -211,12 +210,12 @@ int SHA512_Update (SHA512_CTX *c, const void *_data, size_t len)
                 if ((size_t)data%sizeof(c->u.d[0]) != 0)
                         while (len >= sizeof(c->u))
                                 memcpy (p,data,sizeof(c->u)),
-                                sha512_block (c,p,1),
+                                sha512_block_data_order (c,p,1),
                                 len  -= sizeof(c->u),
                                 data += sizeof(c->u);
                 else
 #endif
-                        sha512_block (c,data,len/sizeof(c->u)),
+                        sha512_block_data_order (c,data,len/sizeof(c->u)),
                         data += len,
                         len  %= sizeof(c->u),
                         data -= len;
@@ -231,7 +230,7 @@ int SHA384_Update (SHA512_CTX *c, const void *data, size_t len)
 {   return SHA512_Update (c,data,len);   }
 
 void SHA512_Transform (SHA512_CTX *c, const unsigned char *data)
-{   sha512_block (c,data,1);  }
+{   sha512_block_data_order (c,data,1);  }
 
 unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md)
         {
@@ -305,40 +304,78 @@ static const SHA_LONG64 K512[80] = {
 #ifndef PEDANTIC
 # if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
 #  if defined(__x86_64) || defined(__x86_64__)
-#   define PULL64(x) ({ SHA_LONG64 ret=*((const SHA_LONG64 *)(&(x)));   \
-                                asm ("bswapq    %0"             \
-                                : "=r"(ret)                     \
-                                : "0"(ret)); ret;               })
-#  endif
-# endif
-#endif
-
-#ifndef PULL64
-#define B(x,j)    (((SHA_LONG64)(*(((const unsigned char *)(&x))+j)))<<((7-j)*8))
-#define PULL64(x) (B(x,0)|B(x,1)|B(x,2)|B(x,3)|B(x,4)|B(x,5)|B(x,6)|B(x,7))
-#endif
-
-#ifndef PEDANTIC
-# if defined(_MSC_VER)
-#  if defined(_WIN64)   /* applies to both IA-64 and AMD64 */
-#   define ROTR(a,n)    _rotr64((a),n)
-#  endif
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#  if defined(__x86_64) || defined(__x86_64__)
 #   define ROTR(a,n)    ({ unsigned long ret;           \
                                 asm ("rorq %1,%0"       \
                                 : "=r"(ret)             \
                                 : "J"(n),"0"(a)         \
                                 : "cc"); ret;           })
-#  elif defined(_ARCH_PPC) && defined(__64BIT__)
+#   if !defined(B_ENDIAN)
+#    define PULL64(x) ({ SHA_LONG64 ret=*((const SHA_LONG64 *)(&(x)));  \
+                                asm ("bswapq    %0"             \
+                                : "=r"(ret)                     \
+                                : "0"(ret)); ret;               })
+#   endif
+#  elif (defined(__i386) || defined(__i386__)) && !defined(B_ENDIAN)
+#   if defined(I386_ONLY)
+#    define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
+                         unsigned int hi=p[0],lo=p[1];          \
+                                asm("xchgb %%ah,%%al;xchgb %%dh,%%dl;"\
+                                    "roll $16,%%eax; roll $16,%%edx; "\
+                                    "xchgb %%ah,%%al;xchgb %%dh,%%dl;" \
+                                : "=a"(lo),"=d"(hi)             \
+                                : "0"(lo),"1"(hi) : "cc");      \
+                                ((SHA_LONG64)hi)<<32|lo;        })
+#   else
+#    define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\
+                         unsigned int hi=p[0],lo=p[1];          \
+                                asm ("bswapl %0; bswapl %1;"    \
+                                : "=r"(lo),"=r"(hi)             \
+                                : "0"(lo),"1"(hi));             \
+                                ((SHA_LONG64)hi)<<32|lo;        })
+#   endif
+#  elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64)
 #   define ROTR(a,n)    ({ unsigned long ret;           \
                                 asm ("rotrdi %0,%1,%2"  \
                                 : "=r"(ret)             \
                                 : "r"(a),"K"(n)); ret;  })
 #  endif
+# elif defined(_MSC_VER)
+#  if defined(_WIN64)   /* applies to both IA-64 and AMD64 */
+#   define ROTR(a,n)    _rotr64((a),n)
+#  endif
+#  if defined(_M_IX86) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#   if defined(I386_ONLY)
+    static SHA_LONG64 __fastcall __pull64be(const void *x)
+    {   _asm    mov     edx, [ecx + 0]
+        _asm    mov     eax, [ecx + 4]
+        _asm    xchg    dh,dl
+        _asm    xchg    ah,al
+        _asm    rol     edx,16
+        _asm    rol     eax,16
+        _asm    xchg    dh,dl
+        _asm    xchg    ah,al
+    }
+#   else
+    static SHA_LONG64 __fastcall __pull64be(const void *x)
+    {   _asm    mov     edx, [ecx + 0]
+        _asm    mov     eax, [ecx + 4]
+        _asm    bswap   edx
+        _asm    bswap   eax
+    }
+#   endif
+#   define PULL64(x) __pull64be(&(x))
+#   if _MSC_VER<=1200
+#    pragma inline_depth(0)
+#   endif
+#  endif
 # endif
 #endif
 
+#ifndef PULL64
+#define B(x,j)    (((SHA_LONG64)(*(((const unsigned char *)(&x))+j)))<<((7-j)*8))
+#define PULL64(x) (B(x,0)|B(x,1)|B(x,2)|B(x,3)|B(x,4)|B(x,5)|B(x,6)|B(x,7))
+#endif
+
 #ifndef ROTR
 #define ROTR(x,s)       (((x)>>s) | (x)<<(64-s))
 #endif
@@ -351,15 +388,27 @@ static const SHA_LONG64 K512[80] = {
 #define Ch(x,y,z)       (((x) & (y)) ^ ((~(x)) & (z)))
 #define Maj(x,y,z)      (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
 
+#if defined(OPENSSL_IA32_SSE2) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
+#define GO_FOR_SSE2(ctx,in,num)         do {            \
+        void    sha512_block_sse2(void *,const void *,size_t);  \
+        if (!(OPENSSL_ia32cap_P & (1<<26))) break;      \
+        sha512_block_sse2(ctx->h,in,num); return;       \
+                                        } while (0)
+#endif
+
 #ifdef OPENSSL_SMALL_FOOTPRINT
 
-static void sha512_block (SHA512_CTX *ctx, const void *in, size_t num)
+static void sha512_block_data_order (SHA512_CTX *ctx, const void *in, size_t num)
         {
         const SHA_LONG64 *W=in;
         SHA_LONG64      a,b,c,d,e,f,g,h,s0,s1,T1,T2;
         SHA_LONG64      X[16];
         int i;
 
+#ifdef GO_FOR_SSE2
+        GO_FOR_SSE2(ctx,in,num);
+#endif
+
                         while (num--) {
 
         a = ctx->h[0];  b = ctx->h[1];  c = ctx->h[2];  d = ctx->h[3];
@@ -410,13 +459,17 @@ static void sha512_block (SHA512_CTX *ctx, const void *in, size_t num)
         T1 = X[(i)&0x0f] += s0 + s1 + X[(i+9)&0x0f];    \
         ROUND_00_15(i,a,b,c,d,e,f,g,h);         } while (0)
 
-static void sha512_block (SHA512_CTX *ctx, const void *in, size_t num)
+static void sha512_block_data_order (SHA512_CTX *ctx, const void *in, size_t num)
         {
         const SHA_LONG64 *W=in;
         SHA_LONG64      a,b,c,d,e,f,g,h,s0,s1,T1;
         SHA_LONG64      X[16];
         int i;
 
+#ifdef GO_FOR_SSE2
+        GO_FOR_SSE2(ctx,in,num);
+#endif
+
                         while (num--) {
 
         a = ctx->h[0];  b = ctx->h[1];  c = ctx->h[2];  d = ctx->h[3];
@@ -481,7 +534,4 @@ static void sha512_block (SHA512_CTX *ctx, const void *in, size_t num)
 
 #endif /* SHA512_ASM */
 
-#endif
-
 #endif /* OPENSSL_NO_SHA512 */
-
diff --git a/src/lib/libssl/src/crypto/sha/sha512t.c b/src/lib/libssl/src/crypto/sha/sha512t.c
new file mode 100644
index 0000000000..210041d435
--- /dev/null
+++ b/src/lib/libssl/src/crypto/sha/sha512t.c
@@ -0,0 +1,184 @@
+/* crypto/sha/sha512t.c */
+/* ====================================================================
+ * Copyright (c) 2004 The OpenSSL Project.  All rights reserved.
+ * ====================================================================
+ */
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <openssl/sha.h>
+#include <openssl/evp.h>
+#include <openssl/crypto.h>
+
+#if defined(OPENSSL_NO_SHA) || defined(OPENSSL_NO_SHA512)
+int main(int argc, char *argv[])
+{
+    printf("No SHA512 support\n");
+    return(0);
+}
+#else
+
+unsigned char app_c1[SHA512_DIGEST_LENGTH] = {
+        0xdd,0xaf,0x35,0xa1,0x93,0x61,0x7a,0xba,
+        0xcc,0x41,0x73,0x49,0xae,0x20,0x41,0x31,
+        0x12,0xe6,0xfa,0x4e,0x89,0xa9,0x7e,0xa2,
+        0x0a,0x9e,0xee,0xe6,0x4b,0x55,0xd3,0x9a,
+        0x21,0x92,0x99,0x2a,0x27,0x4f,0xc1,0xa8,
+        0x36,0xba,0x3c,0x23,0xa3,0xfe,0xeb,0xbd,
+        0x45,0x4d,0x44,0x23,0x64,0x3c,0xe8,0x0e,
+        0x2a,0x9a,0xc9,0x4f,0xa5,0x4c,0xa4,0x9f };
+
+unsigned char app_c2[SHA512_DIGEST_LENGTH] = {
+        0x8e,0x95,0x9b,0x75,0xda,0xe3,0x13,0xda,
+        0x8c,0xf4,0xf7,0x28,0x14,0xfc,0x14,0x3f,
+        0x8f,0x77,0x79,0xc6,0xeb,0x9f,0x7f,0xa1,
+        0x72,0x99,0xae,0xad,0xb6,0x88,0x90,0x18,
+        0x50,0x1d,0x28,0x9e,0x49,0x00,0xf7,0xe4,
+        0x33,0x1b,0x99,0xde,0xc4,0xb5,0x43,0x3a,
+        0xc7,0xd3,0x29,0xee,0xb6,0xdd,0x26,0x54,
+        0x5e,0x96,0xe5,0x5b,0x87,0x4b,0xe9,0x09 };
+
+unsigned char app_c3[SHA512_DIGEST_LENGTH] = {
+        0xe7,0x18,0x48,0x3d,0x0c,0xe7,0x69,0x64,
+        0x4e,0x2e,0x42,0xc7,0xbc,0x15,0xb4,0x63,
+        0x8e,0x1f,0x98,0xb1,0x3b,0x20,0x44,0x28,
+        0x56,0x32,0xa8,0x03,0xaf,0xa9,0x73,0xeb,
+        0xde,0x0f,0xf2,0x44,0x87,0x7e,0xa6,0x0a,
+        0x4c,0xb0,0x43,0x2c,0xe5,0x77,0xc3,0x1b,
+        0xeb,0x00,0x9c,0x5c,0x2c,0x49,0xaa,0x2e,
+        0x4e,0xad,0xb2,0x17,0xad,0x8c,0xc0,0x9b };
+
+unsigned char app_d1[SHA384_DIGEST_LENGTH] = {
+        0xcb,0x00,0x75,0x3f,0x45,0xa3,0x5e,0x8b,
+        0xb5,0xa0,0x3d,0x69,0x9a,0xc6,0x50,0x07,
+        0x27,0x2c,0x32,0xab,0x0e,0xde,0xd1,0x63,
+        0x1a,0x8b,0x60,0x5a,0x43,0xff,0x5b,0xed,
+        0x80,0x86,0x07,0x2b,0xa1,0xe7,0xcc,0x23,
+        0x58,0xba,0xec,0xa1,0x34,0xc8,0x25,0xa7 };
+
+unsigned char app_d2[SHA384_DIGEST_LENGTH] = {
+        0x09,0x33,0x0c,0x33,0xf7,0x11,0x47,0xe8,
+        0x3d,0x19,0x2f,0xc7,0x82,0xcd,0x1b,0x47,
+        0x53,0x11,0x1b,0x17,0x3b,0x3b,0x05,0xd2,
+        0x2f,0xa0,0x80,0x86,0xe3,0xb0,0xf7,0x12,
+        0xfc,0xc7,0xc7,0x1a,0x55,0x7e,0x2d,0xb9,
+        0x66,0xc3,0xe9,0xfa,0x91,0x74,0x60,0x39 };
+
+unsigned char app_d3[SHA384_DIGEST_LENGTH] = {
+        0x9d,0x0e,0x18,0x09,0x71,0x64,0x74,0xcb,
+        0x08,0x6e,0x83,0x4e,0x31,0x0a,0x4a,0x1c,
+        0xed,0x14,0x9e,0x9c,0x00,0xf2,0x48,0x52,
+        0x79,0x72,0xce,0xc5,0x70,0x4c,0x2a,0x5b,
+        0x07,0xb8,0xb3,0xdc,0x38,0xec,0xc4,0xeb,
+        0xae,0x97,0xdd,0xd8,0x7f,0x3d,0x89,0x85 };
+
+int main (int argc,char **argv)
+{ unsigned char md[SHA512_DIGEST_LENGTH];
+  int           i;
+  EVP_MD_CTX    evp;
+
+#ifdef OPENSSL_IA32_SSE2
+    /* Alternative to this is to call OpenSSL_add_all_algorithms...
+     * The below code is retained exclusively for debugging purposes. */
+    { char      *env;
+
+        if ((env=getenv("OPENSSL_ia32cap")))
+            OPENSSL_ia32cap = strtoul (env,NULL,0);
+    }
+#endif
+
+    fprintf(stdout,"Testing SHA-512 ");
+
+    EVP_Digest ("abc",3,md,NULL,EVP_sha512(),NULL);
+    if (memcmp(md,app_c1,sizeof(app_c1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_Digest ("abcdefgh""bcdefghi""cdefghij""defghijk"
+                "efghijkl""fghijklm""ghijklmn""hijklmno"
+                "ijklmnop""jklmnopq""klmnopqr""lmnopqrs"
+                "mnopqrst""nopqrstu",112,md,NULL,EVP_sha512(),NULL);
+    if (memcmp(md,app_c2,sizeof(app_c2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_MD_CTX_init (&evp);
+    EVP_DigestInit_ex (&evp,EVP_sha512(),NULL);
+    for (i=0;i<1000000;i+=288)
+        EVP_DigestUpdate (&evp, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<288?1000000-i:288);
+    EVP_DigestFinal_ex (&evp,md,NULL);
+    EVP_MD_CTX_cleanup (&evp);
+
+    if (memcmp(md,app_c3,sizeof(app_c3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+    fprintf(stdout,"Testing SHA-384 ");
+
+    EVP_Digest ("abc",3,md,NULL,EVP_sha384(),NULL);
+    if (memcmp(md,app_d1,sizeof(app_d1)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 1 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_Digest ("abcdefgh""bcdefghi""cdefghij""defghijk"
+                "efghijkl""fghijklm""ghijklmn""hijklmno"
+                "ijklmnop""jklmnopq""klmnopqr""lmnopqrs"
+                "mnopqrst""nopqrstu",112,md,NULL,EVP_sha384(),NULL);
+    if (memcmp(md,app_d2,sizeof(app_d2)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 2 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    EVP_MD_CTX_init (&evp);
+    EVP_DigestInit_ex (&evp,EVP_sha384(),NULL);
+    for (i=0;i<1000000;i+=64)
+        EVP_DigestUpdate (&evp, "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa"
+                                "aaaaaaaa""aaaaaaaa""aaaaaaaa""aaaaaaaa",
+                                (1000000-i)<64?1000000-i:64);
+    EVP_DigestFinal_ex (&evp,md,NULL);
+    EVP_MD_CTX_cleanup (&evp);
+
+    if (memcmp(md,app_d3,sizeof(app_d3)))
+    {   fflush(stdout);
+        fprintf(stderr,"\nTEST 3 of 3 failed.\n");
+        return 1;
+    }
+    else
+        fprintf(stdout,"."); fflush(stdout);
+
+    fprintf(stdout," passed.\n"); fflush(stdout);
+
+  return 0;
+}
+#endif
diff --git a/src/lib/libssl/src/crypto/sparccpuid.S b/src/lib/libssl/src/crypto/sparccpuid.S
new file mode 100644
index 0000000000..c17350fc89
--- /dev/null
+++ b/src/lib/libssl/src/crypto/sparccpuid.S
@@ -0,0 +1,239 @@
+#if defined(__SUNPRO_C) && defined(__sparcv9)
+# define ABI64  /* They've said -xarch=v9 at command line */
+#elif defined(__GNUC__) && defined(__arch64__)
+# define ABI64  /* They've said -m64 at command line */
+#endif
+
+#ifdef ABI64
+  .register     %g2,#scratch
+  .register     %g3,#scratch
+# define        FRAME   -192
+# define        BIAS    2047
+#else
+# define        FRAME   -96
+# define        BIAS    0
+#endif
+
+.text
+.align  32
+.global OPENSSL_wipe_cpu
+.type   OPENSSL_wipe_cpu,#function
+! Keep in mind that this does not excuse us from wiping the stack!
+! This routine wipes registers, but not the backing store [which
+! resides on the stack, toward lower addresses]. To facilitate for
+! stack wiping I return pointer to the top of stack of the *caller*.
+OPENSSL_wipe_cpu:
+        save    %sp,FRAME,%sp
+        nop
+#ifdef __sun
+#include <sys/trap.h>
+        ta      ST_CLEAN_WINDOWS
+#else
+        call    .walk.reg.wins
+#endif
+        nop
+        call    .PIC.zero.up
+        mov     .zero-(.-4),%o0
+        ldd     [%o0],%f0
+
+        subcc   %g0,1,%o0
+        ! Following is V9 "rd %ccr,%o0" instruction. However! V8
+        ! specification says that it ("rd %asr2,%o0" in V8 terms) does
+        ! not cause illegal_instruction trap. It therefore can be used
+        ! to determine if the CPU the code is executing on is V8- or
+        ! V9-compliant, as V9 returns a distinct value of 0x99,
+        ! "negative" and "borrow" bits set in both %icc and %xcc.
+        .word   0x91408000      !rd     %ccr,%o0
+        cmp     %o0,0x99
+        bne     .v8
+        nop
+                        ! Even though we do not use %fp register bank,
+                        ! we wipe it as memcpy might have used it...
+                        .word   0xbfa00040      !fmovd  %f0,%f62
+                        .word   0xbba00040      !...
+                        .word   0xb7a00040
+                        .word   0xb3a00040
+                        .word   0xafa00040
+                        .word   0xaba00040
+                        .word   0xa7a00040
+                        .word   0xa3a00040
+                        .word   0x9fa00040
+                        .word   0x9ba00040
+                        .word   0x97a00040
+                        .word   0x93a00040
+                        .word   0x8fa00040
+                        .word   0x8ba00040
+                        .word   0x87a00040
+                        .word   0x83a00040      !fmovd  %f0,%f32
+.v8:                    fmovs   %f1,%f31
+        clr     %o0
+                        fmovs   %f0,%f30
+        clr     %o1
+                        fmovs   %f1,%f29
+        clr     %o2
+                        fmovs   %f0,%f28
+        clr     %o3
+                        fmovs   %f1,%f27
+        clr     %o4
+                        fmovs   %f0,%f26
+        clr     %o5
+                        fmovs   %f1,%f25
+        clr     %o7
+                        fmovs   %f0,%f24
+        clr     %l0
+                        fmovs   %f1,%f23
+        clr     %l1
+                        fmovs   %f0,%f22
+        clr     %l2
+                        fmovs   %f1,%f21
+        clr     %l3
+                        fmovs   %f0,%f20
+        clr     %l4
+                        fmovs   %f1,%f19
+        clr     %l5
+                        fmovs   %f0,%f18
+        clr     %l6
+                        fmovs   %f1,%f17
+        clr     %l7
+                        fmovs   %f0,%f16
+        clr     %i0
+                        fmovs   %f1,%f15
+        clr     %i1
+                        fmovs   %f0,%f14
+        clr     %i2
+                        fmovs   %f1,%f13
+        clr     %i3
+                        fmovs   %f0,%f12
+        clr     %i4
+                        fmovs   %f1,%f11
+        clr     %i5
+                        fmovs   %f0,%f10
+        clr     %g1
+                        fmovs   %f1,%f9
+        clr     %g2
+                        fmovs   %f0,%f8
+        clr     %g3
+                        fmovs   %f1,%f7
+        clr     %g4
+                        fmovs   %f0,%f6
+        clr     %g5
+                        fmovs   %f1,%f5
+                        fmovs   %f0,%f4
+                        fmovs   %f1,%f3
+                        fmovs   %f0,%f2
+
+        add     %fp,BIAS,%i0    ! return pointer to caller´s top of stack
+
+        ret
+        restore
+
+.zero:  .long   0x0,0x0
+.PIC.zero.up:
+        retl
+        add     %o0,%o7,%o0
+#ifdef DEBUG
+.global walk_reg_wins
+.type   walk_reg_wins,#function
+walk_reg_wins:
+#endif
+.walk.reg.wins:
+        save    %sp,FRAME,%sp
+        cmp     %i7,%o7
+        be      2f
+        clr     %o0
+        cmp     %o7,0   ! compiler never cleans %o7...
+        be      1f      ! could have been a leaf function...
+        clr     %o1
+        call    .walk.reg.wins
+        nop
+1:      clr     %o2
+        clr     %o3
+        clr     %o4
+        clr     %o5
+        clr     %o7
+        clr     %l0
+        clr     %l1
+        clr     %l2
+        clr     %l3
+        clr     %l4
+        clr     %l5
+        clr     %l6
+        clr     %l7
+        add     %o0,1,%i0       ! used for debugging
+2:      ret
+        restore
+.size   OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
+
+.global OPENSSL_atomic_add
+.type   OPENSSL_atomic_add,#function
+OPENSSL_atomic_add:
+#ifndef ABI64
+        subcc   %g0,1,%o2
+        .word   0x95408000      !rd     %ccr,%o2, see comment above
+        cmp     %o2,0x99
+        be      .v9
+        nop
+        save    %sp,FRAME,%sp
+        ba      .enter
+        nop
+#ifdef __sun
+! Note that you don't have to link with libthread to call thr_yield,
+! as libc provides a stub, which is overloaded the moment you link
+! with *either* libpthread or libthread...
+#define YIELD_CPU       thr_yield
+#else
+! applies at least to Linux and FreeBSD... Feedback expected...
+#define YIELD_CPU       sched_yield
+#endif
+.spin:  call    YIELD_CPU
+        nop
+.enter: ld      [%i0],%i2
+        cmp     %i2,-4096
+        be      .spin
+        mov     -1,%i2
+        swap    [%i0],%i2
+        cmp     %i2,-1
+        be      .spin
+        add     %i2,%i1,%i2
+        stbar
+        st      %i2,[%i0]
+        sra     %i2,%g0,%i0
+        ret
+        restore
+.v9:
+#endif
+        ld      [%o0],%o2
+1:      add     %o1,%o2,%o3
+        .word   0xd7e2100a      !cas [%o0],%o2,%o3, compare [%o0] with %o2 and swap %o3
+        cmp     %o2,%o3
+        bne     1b
+        mov     %o3,%o2         ! cas is always fetching to dest. register
+        add     %o1,%o2,%o0     ! OpenSSL expects the new value
+        retl
+        sra     %o0,%g0,%o0     ! we return signed int, remember?
+.size   OPENSSL_atomic_add,.-OPENSSL_atomic_add
+
+.global OPENSSL_rdtsc
+        subcc   %g0,1,%o0
+        .word   0x91408000      !rd     %ccr,%o0
+        cmp     %o0,0x99
+        bne     .notsc
+        xor     %o0,%o0,%o0
+        save    %sp,FRAME-16,%sp
+        mov     513,%o0         !SI_PLATFORM
+        add     %sp,BIAS+16,%o1
+        call    sysinfo
+        mov     256,%o2
+
+        add     %sp,BIAS-16,%o1
+        ld      [%o1],%l0
+        ld      [%o1+4],%l1
+        ld      [%o1+8],%l2
+        mov     %lo('SUNW'),%l3
+        ret
+        restore
+.notsc:
+        retl
+        nop
+.type   OPENSSL_rdtsc,#function
+.size   OPENSSL_rdtsc,.-OPENSSL_atomic_add
diff --git a/src/lib/libssl/src/crypto/store/Makefile b/src/lib/libssl/src/crypto/store/Makefile
new file mode 100644
index 0000000000..0dcfd7857a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/store/Makefile
@@ -0,0 +1,112 @@
+#
+# OpenSSL/crypto/store/Makefile
+#
+
+DIR=    store
+TOP=    ../..
+CC=     cc
+INCLUDES= -I.. -I$(TOP) -I../../include
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile
+#TEST= storetest.c
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBSRC= str_err.c str_lib.c str_meth.c str_mem.c
+LIBOBJ= str_err.o str_lib.o str_meth.o str_mem.o
+
+SRC= $(LIBSRC)
+
+#EXHEADER= store.h str_compat.h
+EXHEADER= store.h
+HEADER= $(EXHEADER) str_locl.h
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        $(AR) $(LIB) $(LIBOBJ)
+        $(RANLIB) $(LIB) || echo Never mind.
+        @touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
+
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
+        do  \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+        done;
+
+tags:
+        ctags $(SRC)
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
+        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+str_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+str_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+str_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+str_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+str_err.o: ../../include/openssl/store.h ../../include/openssl/symhacks.h
+str_err.o: str_err.c
+str_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
+str_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
+str_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+str_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+str_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+str_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h
+str_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
+str_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
+str_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
+str_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+str_lib.o: ../../include/openssl/store.h ../../include/openssl/symhacks.h
+str_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+str_lib.o: str_lib.c str_locl.h
+str_mem.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
+str_mem.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+str_mem.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
+str_mem.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str_mem.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+str_mem.o: ../../include/openssl/store.h ../../include/openssl/symhacks.h
+str_mem.o: str_locl.h str_mem.c
+str_meth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
+str_meth.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+str_meth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+str_meth.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+str_meth.o: ../../include/openssl/store.h ../../include/openssl/symhacks.h
+str_meth.o: str_locl.h str_meth.c
diff --git a/src/lib/libssl/src/crypto/store/README b/src/lib/libssl/src/crypto/store/README
new file mode 100644
index 0000000000..966168f6a5
--- /dev/null
+++ b/src/lib/libssl/src/crypto/store/README
@@ -0,0 +1,95 @@
+The STORE type
+==============
+
+A STORE, as defined in this code section, is really a rather simple
+thing which stores objects and per-object associations to a number
+of attributes.  What attributes are supported entirely depends on
+the particular implementation of a STORE.  It has some support for
+generation of certain objects (for example, keys and CRLs).
+
+
+Supported object types
+----------------------
+
+For now, the objects that are supported are the following:
+
+X.509 certificate
+X.509 CRL
+private key
+public key
+number
+arbitrary (application) data
+
+The intention is that a STORE should be able to store everything
+needed by an application that wants a cert/key store, as well as
+the data a CA might need to store (this includes the serial number
+counter, which explains the support for numbers).
+
+
+Supported attribute types
+-------------------------
+
+For now, the following attributes are supported:
+
+Friendly Name           - the value is a normal C string
+Key ID                  - the value is a 160 bit SHA1 hash
+Issuer Key ID           - the value is a 160 bit SHA1 hash
+Subject Key ID          - the value is a 160 bit SHA1 hash
+Issuer/Serial Hash      - the value is a 160 bit SHA1 hash
+Issuer                  - the value is a X509_NAME
+Serial                  - the value is a BIGNUM
+Subject                 - the value is a X509_NAME
+Certificate Hash        - the value is a 160 bit SHA1 hash
+Email                   - the value is a normal C string
+Filename                - the value is a normal C string
+
+It is expected that these attributes should be enough to support
+the need from most, if not all, current applications.  Applications
+that need to do certificate verification would typically use Subject
+Key ID, Issuer/Serial Hash or Subject to look up issuer certificates.
+S/MIME applications would typically use Email to look up recipient
+and signer certificates.
+
+There's added support for combined sets of attributes to search for,
+with the special OR attribute.
+
+
+Supported basic functionality
+-----------------------------
+
+The functions that are supported through the STORE type are these:
+
+generate_object         - for example to generate keys and CRLs
+get_object              - to look up one object
+                          NOTE: this function is really rather
+                          redundant and probably of lesser usage
+                          than the list functions
+store_object            - store an object and the attributes
+                          associated with it
+modify_object           - modify the attributes associated with
+                          a specific object
+revoke_object           - revoke an object
+                          NOTE: this only marks an object as
+                          invalid, it doesn't remove the object
+                          from the database
+delete_object           - remove an object from the database
+list_object             - list objects associated with a given
+                          set of attributes
+                          NOTE: this is really four functions:
+                          list_start, list_next, list_end and
+                          list_endp
+update_store            - update the internal data of the store
+lock_store              - lock the store
+unlock_store            - unlock the store
+
+The list functions need some extra explanation: list_start is
+used to set up a lookup.  That's where the attributes to use in
+the search are set up.  It returns a search context.  list_next
+returns the next object searched for.  list_end closes the search.
+list_endp is used to check if we have reached the end.
+
+A few words on the store functions as well: update_store is
+typically used by a CA application to update the internal
+structure of a database.  This may for example involve automatic
+removal of expired certificates.  lock_store and unlock_store
+are used for locking a store to allow exclusive writes.
diff --git a/src/lib/libssl/src/crypto/store/store.h b/src/lib/libssl/src/crypto/store/store.h
new file mode 100644
index 0000000000..64583377a9
--- /dev/null
+++ b/src/lib/libssl/src/crypto/store/store.h
@@ -0,0 +1,554 @@
+/* crypto/store/store.h -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_STORE_H
+#define HEADER_STORE_H
+
+#include <openssl/ossl_typ.h>
+#ifndef OPENSSL_NO_DEPRECATED
+#include <openssl/evp.h>
+#include <openssl/bn.h>
+#include <openssl/x509.h>
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Already defined in ossl_typ.h */
+/* typedef struct store_st STORE; */
+/* typedef struct store_method_st STORE_METHOD; */
+
+
+/* All the following functions return 0, a negative number or NULL on error.
+   When everything is fine, they return a positive value or a non-NULL
+   pointer, all depending on their purpose. */
+
+/* Creators and destructor.   */
+STORE *STORE_new_method(const STORE_METHOD *method);
+STORE *STORE_new_engine(ENGINE *engine);
+void STORE_free(STORE *ui);
+
+
+/* Give a user interface parametrised control commands.  This can be used to
+   send down an integer, a data pointer or a function pointer, as well as
+   be used to get information from a STORE. */
+int STORE_ctrl(STORE *store, int cmd, long i, void *p, void (*f)(void));
+
+/* A control to set the directory with keys and certificates.  Used by the
+   built-in directory level method. */
+#define STORE_CTRL_SET_DIRECTORY        0x0001
+/* A control to set a file to load.  Used by the built-in file level method. */
+#define STORE_CTRL_SET_FILE             0x0002
+/* A control to set a configuration file to load.  Can be used by any method
+   that wishes to load a configuration file. */
+#define STORE_CTRL_SET_CONF_FILE        0x0003
+/* A control to set a the section of the loaded configuration file.  Can be
+   used by any method that wishes to load a configuration file. */
+#define STORE_CTRL_SET_CONF_SECTION     0x0004
+
+
+/* Some methods may use extra data */
+#define STORE_set_app_data(s,arg)       STORE_set_ex_data(s,0,arg)
+#define STORE_get_app_data(s)           STORE_get_ex_data(s,0)
+int STORE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+int STORE_set_ex_data(STORE *r,int idx,void *arg);
+void *STORE_get_ex_data(STORE *r, int idx);
+
+/* Use specific methods instead of the built-in one */
+const STORE_METHOD *STORE_get_method(STORE *store);
+const STORE_METHOD *STORE_set_method(STORE *store, const STORE_METHOD *meth);
+
+/* The standard OpenSSL methods. */
+/* This is the in-memory method.  It does everything except revoking and updating,
+   and is of course volatile.  It's used by other methods that have an in-memory
+   cache. */
+const STORE_METHOD *STORE_Memory(void);
+#if 0 /* Not yet implemented */
+/* This is the directory store.  It does everything except revoking and updating,
+   and uses STORE_Memory() to cache things in memory. */
+const STORE_METHOD *STORE_Directory(void);
+/* This is the file store.  It does everything except revoking and updating,
+   and uses STORE_Memory() to cache things in memory.  Certificates are added
+   to it with the store operation, and it will only get cached certificates. */
+const STORE_METHOD *STORE_File(void);
+#endif
+
+/* Store functions take a type code for the type of data they should store
+   or fetch */
+typedef enum STORE_object_types
+        {
+        STORE_OBJECT_TYPE_X509_CERTIFICATE=     0x01, /* X509 * */
+        STORE_OBJECT_TYPE_X509_CRL=             0x02, /* X509_CRL * */
+        STORE_OBJECT_TYPE_PRIVATE_KEY=          0x03, /* EVP_PKEY * */
+        STORE_OBJECT_TYPE_PUBLIC_KEY=           0x04, /* EVP_PKEY * */
+        STORE_OBJECT_TYPE_NUMBER=               0x05, /* BIGNUM * */
+        STORE_OBJECT_TYPE_ARBITRARY=            0x06, /* BUF_MEM * */
+        STORE_OBJECT_TYPE_NUM=                  0x06  /* The amount of known
+                                                         object types */
+        } STORE_OBJECT_TYPES;
+/* List of text strings corresponding to the object types. */
+extern const char * const STORE_object_type_string[STORE_OBJECT_TYPE_NUM+1];
+
+/* Some store functions take a parameter list.  Those parameters come with
+   one of the following codes. The comments following the codes below indicate
+   what type the value should be a pointer to. */
+typedef enum STORE_params
+        {
+        STORE_PARAM_EVP_TYPE=                   0x01, /* int */
+        STORE_PARAM_BITS=                       0x02, /* size_t */
+        STORE_PARAM_KEY_PARAMETERS=             0x03, /* ??? */
+        STORE_PARAM_KEY_NO_PARAMETERS=          0x04, /* N/A */
+        STORE_PARAM_AUTH_PASSPHRASE=            0x05, /* char * */
+        STORE_PARAM_AUTH_KRB5_TICKET=           0x06, /* void * */
+        STORE_PARAM_TYPE_NUM=                   0x06  /* The amount of known
+                                                         parameter types */
+        } STORE_PARAM_TYPES;
+/* Parameter value sizes.  -1 means unknown, anything else is the required size. */
+extern const int STORE_param_sizes[STORE_PARAM_TYPE_NUM+1];
+
+/* Store functions take attribute lists.  Those attributes come with codes.
+   The comments following the codes below indicate what type the value should
+   be a pointer to. */
+typedef enum STORE_attribs
+        {
+        STORE_ATTR_END=                         0x00,
+        STORE_ATTR_FRIENDLYNAME=                0x01, /* C string */
+        STORE_ATTR_KEYID=                       0x02, /* 160 bit string (SHA1) */
+        STORE_ATTR_ISSUERKEYID=                 0x03, /* 160 bit string (SHA1) */
+        STORE_ATTR_SUBJECTKEYID=                0x04, /* 160 bit string (SHA1) */
+        STORE_ATTR_ISSUERSERIALHASH=            0x05, /* 160 bit string (SHA1) */
+        STORE_ATTR_ISSUER=                      0x06, /* X509_NAME * */
+        STORE_ATTR_SERIAL=                      0x07, /* BIGNUM * */
+        STORE_ATTR_SUBJECT=                     0x08, /* X509_NAME * */
+        STORE_ATTR_CERTHASH=                    0x09, /* 160 bit string (SHA1) */
+        STORE_ATTR_EMAIL=                       0x0a, /* C string */
+        STORE_ATTR_FILENAME=                    0x0b, /* C string */
+        STORE_ATTR_TYPE_NUM=                    0x0b, /* The amount of known
+                                                         attribute types */
+        STORE_ATTR_OR=                          0xff  /* This is a special
+                                                         separator, which
+                                                         expresses the OR
+                                                         operation.  */
+        } STORE_ATTR_TYPES;
+/* Attribute value sizes.  -1 means unknown, anything else is the required size. */
+extern const int STORE_attr_sizes[STORE_ATTR_TYPE_NUM+1];
+
+typedef enum STORE_certificate_status
+        {
+        STORE_X509_VALID=                       0x00,
+        STORE_X509_EXPIRED=                     0x01,
+        STORE_X509_SUSPENDED=                   0x02,
+        STORE_X509_REVOKED=                     0x03
+        } STORE_CERTIFICATE_STATUS;
+
+/* Engine store functions will return a structure that contains all the necessary
+ * information, including revokation status for certificates.  This is really not
+ * needed for application authors, as the ENGINE framework functions will extract
+ * the OpenSSL-specific information when at all possible.  However, for engine
+ * authors, it's crucial to know this structure.  */
+typedef struct STORE_OBJECT_st
+        {
+        STORE_OBJECT_TYPES type;
+        union
+                {
+                struct
+                        {
+                        STORE_CERTIFICATE_STATUS status;
+                        X509 *certificate;
+                        } x509;
+                X509_CRL *crl;
+                EVP_PKEY *key;
+                BIGNUM *number;
+                BUF_MEM *arbitrary;
+                } data;
+        } STORE_OBJECT;
+DECLARE_STACK_OF(STORE_OBJECT)
+STORE_OBJECT *STORE_OBJECT_new(void);
+void STORE_OBJECT_free(STORE_OBJECT *data);
+
+
+
+/* The following functions handle the storage. They return 0, a negative number
+   or NULL on error, anything else on success. */
+X509 *STORE_get_certificate(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_certificate(STORE *e, X509 *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_certificate(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+int STORE_revoke_certificate(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_certificate(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+void *STORE_list_certificate_start(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+X509 *STORE_list_certificate_next(STORE *e, void *handle);
+int STORE_list_certificate_end(STORE *e, void *handle);
+int STORE_list_certificate_endp(STORE *e, void *handle);
+EVP_PKEY *STORE_generate_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+EVP_PKEY *STORE_get_private_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_private_key(STORE *e, EVP_PKEY *data,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+int STORE_modify_private_key(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+int STORE_revoke_private_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_private_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+void *STORE_list_private_key_start(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+EVP_PKEY *STORE_list_private_key_next(STORE *e, void *handle);
+int STORE_list_private_key_end(STORE *e, void *handle);
+int STORE_list_private_key_endp(STORE *e, void *handle);
+EVP_PKEY *STORE_get_public_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_public_key(STORE *e, EVP_PKEY *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_public_key(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+int STORE_revoke_public_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_public_key(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+void *STORE_list_public_key_start(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+EVP_PKEY *STORE_list_public_key_next(STORE *e, void *handle);
+int STORE_list_public_key_end(STORE *e, void *handle);
+int STORE_list_public_key_endp(STORE *e, void *handle);
+X509_CRL *STORE_generate_crl(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+X509_CRL *STORE_get_crl(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_crl(STORE *e, X509_CRL *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_crl(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+int STORE_delete_crl(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+void *STORE_list_crl_start(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+X509_CRL *STORE_list_crl_next(STORE *e, void *handle);
+int STORE_list_crl_end(STORE *e, void *handle);
+int STORE_list_crl_endp(STORE *e, void *handle);
+int STORE_store_number(STORE *e, BIGNUM *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_number(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+BIGNUM *STORE_get_number(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_number(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_store_arbitrary(STORE *e, BUF_MEM *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_modify_arbitrary(STORE *e, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_sttributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+BUF_MEM *STORE_get_arbitrary(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+int STORE_delete_arbitrary(STORE *e, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+
+
+/* Create and manipulate methods */
+STORE_METHOD *STORE_create_method(char *name);
+void STORE_destroy_method(STORE_METHOD *store_method);
+
+/* These callback types are use for store handlers */
+typedef int (*STORE_INITIALISE_FUNC_PTR)(STORE *);
+typedef void (*STORE_CLEANUP_FUNC_PTR)(STORE *);
+typedef STORE_OBJECT *(*STORE_GENERATE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef STORE_OBJECT *(*STORE_GET_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef void *(*STORE_START_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef STORE_OBJECT *(*STORE_NEXT_OBJECT_FUNC_PTR)(STORE *, void *handle);
+typedef int (*STORE_END_OBJECT_FUNC_PTR)(STORE *, void *handle);
+typedef int (*STORE_HANDLE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef int (*STORE_STORE_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, STORE_OBJECT *data, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef int (*STORE_MODIFY_OBJECT_FUNC_PTR)(STORE *, STORE_OBJECT_TYPES type, OPENSSL_ITEM search_attributes[], OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[], OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[]);
+typedef int (*STORE_GENERIC_FUNC_PTR)(STORE *, OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+typedef int (*STORE_CTRL_FUNC_PTR)(STORE *, int cmd, long l, void *p, void (*f)(void));
+
+int STORE_method_set_initialise_function(STORE_METHOD *sm, STORE_INITIALISE_FUNC_PTR init_f);
+int STORE_method_set_cleanup_function(STORE_METHOD *sm, STORE_CLEANUP_FUNC_PTR clean_f);
+int STORE_method_set_generate_function(STORE_METHOD *sm, STORE_GENERATE_OBJECT_FUNC_PTR generate_f);
+int STORE_method_set_get_function(STORE_METHOD *sm, STORE_GET_OBJECT_FUNC_PTR get_f);
+int STORE_method_set_store_function(STORE_METHOD *sm, STORE_STORE_OBJECT_FUNC_PTR store_f);
+int STORE_method_set_modify_function(STORE_METHOD *sm, STORE_MODIFY_OBJECT_FUNC_PTR store_f);
+int STORE_method_set_revoke_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR revoke_f);
+int STORE_method_set_delete_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR delete_f);
+int STORE_method_set_list_start_function(STORE_METHOD *sm, STORE_START_OBJECT_FUNC_PTR list_start_f);
+int STORE_method_set_list_next_function(STORE_METHOD *sm, STORE_NEXT_OBJECT_FUNC_PTR list_next_f);
+int STORE_method_set_list_end_function(STORE_METHOD *sm, STORE_END_OBJECT_FUNC_PTR list_end_f);
+int STORE_method_set_update_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR);
+int STORE_method_set_lock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR);
+int STORE_method_set_unlock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR);
+int STORE_method_set_ctrl_function(STORE_METHOD *sm, STORE_CTRL_FUNC_PTR ctrl_f);
+
+STORE_INITIALISE_FUNC_PTR STORE_method_get_initialise_function(STORE_METHOD *sm);
+STORE_CLEANUP_FUNC_PTR STORE_method_get_cleanup_function(STORE_METHOD *sm);
+STORE_GENERATE_OBJECT_FUNC_PTR STORE_method_get_generate_function(STORE_METHOD *sm);
+STORE_GET_OBJECT_FUNC_PTR STORE_method_get_get_function(STORE_METHOD *sm);
+STORE_STORE_OBJECT_FUNC_PTR STORE_method_get_store_function(STORE_METHOD *sm);
+STORE_MODIFY_OBJECT_FUNC_PTR STORE_method_get_modify_function(STORE_METHOD *sm);
+STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_revoke_function(STORE_METHOD *sm);
+STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_delete_function(STORE_METHOD *sm);
+STORE_START_OBJECT_FUNC_PTR STORE_method_get_list_start_function(STORE_METHOD *sm);
+STORE_NEXT_OBJECT_FUNC_PTR STORE_method_get_list_next_function(STORE_METHOD *sm);
+STORE_END_OBJECT_FUNC_PTR STORE_method_get_list_end_function(STORE_METHOD *sm);
+STORE_GENERIC_FUNC_PTR STORE_method_get_update_store_function(STORE_METHOD *sm);
+STORE_GENERIC_FUNC_PTR STORE_method_get_lock_store_function(STORE_METHOD *sm);
+STORE_GENERIC_FUNC_PTR STORE_method_get_unlock_store_function(STORE_METHOD *sm);
+STORE_CTRL_FUNC_PTR STORE_method_get_ctrl_function(STORE_METHOD *sm);
+
+/* Method helper structures and functions. */
+
+/* This structure is the result of parsing through the information in a list
+   of OPENSSL_ITEMs.  It stores all the necessary information in a structured
+   way.*/
+typedef struct STORE_attr_info_st STORE_ATTR_INFO;
+
+/* Parse a list of OPENSSL_ITEMs and return a pointer to a STORE_ATTR_INFO.
+   Note that we do this in the list form, since the list of OPENSSL_ITEMs can
+   come in blocks separated with STORE_ATTR_OR.  Note that the value returned
+   by STORE_parse_attrs_next() must be freed with STORE_ATTR_INFO_free(). */
+void *STORE_parse_attrs_start(OPENSSL_ITEM *attributes);
+STORE_ATTR_INFO *STORE_parse_attrs_next(void *handle);
+int STORE_parse_attrs_end(void *handle);
+int STORE_parse_attrs_endp(void *handle);
+
+/* Creator and destructor */
+STORE_ATTR_INFO *STORE_ATTR_INFO_new(void);
+int STORE_ATTR_INFO_free(STORE_ATTR_INFO *attrs);
+
+/* Manipulators */
+char *STORE_ATTR_INFO_get0_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code);
+unsigned char *STORE_ATTR_INFO_get0_sha1str(STORE_ATTR_INFO *attrs,
+        STORE_ATTR_TYPES code);
+X509_NAME *STORE_ATTR_INFO_get0_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code);
+BIGNUM *STORE_ATTR_INFO_get0_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code);
+int STORE_ATTR_INFO_set_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        char *cstr, size_t cstr_size);
+int STORE_ATTR_INFO_set_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        unsigned char *sha1str, size_t sha1str_size);
+int STORE_ATTR_INFO_set_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        X509_NAME *dn);
+int STORE_ATTR_INFO_set_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        BIGNUM *number);
+int STORE_ATTR_INFO_modify_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        char *cstr, size_t cstr_size);
+int STORE_ATTR_INFO_modify_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        unsigned char *sha1str, size_t sha1str_size);
+int STORE_ATTR_INFO_modify_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        X509_NAME *dn);
+int STORE_ATTR_INFO_modify_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        BIGNUM *number);
+
+/* Compare on basis of a bit pattern formed by the STORE_ATTR_TYPES values
+   in each contained attribute. */
+int STORE_ATTR_INFO_compare(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b);
+/* Check if the set of attributes in a is within the range of attributes
+   set in b. */
+int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b);
+/* Check if the set of attributes in a are also set in b. */
+int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b);
+/* Same as STORE_ATTR_INFO_in(), but also checks the attribute values. */
+int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b);
+
+
+/* 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.
+ */
+void ERR_load_STORE_strings(void);
+
+/* Error codes for the STORE functions. */
+
+/* Function codes. */
+#define STORE_F_MEM_DELETE                               134
+#define STORE_F_MEM_GENERATE                             135
+#define STORE_F_MEM_LIST_END                             168
+#define STORE_F_MEM_LIST_NEXT                            136
+#define STORE_F_MEM_LIST_START                           137
+#define STORE_F_MEM_MODIFY                               169
+#define STORE_F_MEM_STORE                                138
+#define STORE_F_STORE_ATTR_INFO_GET0_CSTR                139
+#define STORE_F_STORE_ATTR_INFO_GET0_DN                  140
+#define STORE_F_STORE_ATTR_INFO_GET0_NUMBER              141
+#define STORE_F_STORE_ATTR_INFO_GET0_SHA1STR             142
+#define STORE_F_STORE_ATTR_INFO_MODIFY_CSTR              143
+#define STORE_F_STORE_ATTR_INFO_MODIFY_DN                144
+#define STORE_F_STORE_ATTR_INFO_MODIFY_NUMBER            145
+#define STORE_F_STORE_ATTR_INFO_MODIFY_SHA1STR           146
+#define STORE_F_STORE_ATTR_INFO_SET_CSTR                 147
+#define STORE_F_STORE_ATTR_INFO_SET_DN                   148
+#define STORE_F_STORE_ATTR_INFO_SET_NUMBER               149
+#define STORE_F_STORE_ATTR_INFO_SET_SHA1STR              150
+#define STORE_F_STORE_CERTIFICATE                        170
+#define STORE_F_STORE_CTRL                               161
+#define STORE_F_STORE_DELETE_ARBITRARY                   158
+#define STORE_F_STORE_DELETE_CERTIFICATE                 102
+#define STORE_F_STORE_DELETE_CRL                         103
+#define STORE_F_STORE_DELETE_NUMBER                      104
+#define STORE_F_STORE_DELETE_PRIVATE_KEY                 105
+#define STORE_F_STORE_DELETE_PUBLIC_KEY                  106
+#define STORE_F_STORE_GENERATE_CRL                       107
+#define STORE_F_STORE_GENERATE_KEY                       108
+#define STORE_F_STORE_GET_ARBITRARY                      159
+#define STORE_F_STORE_GET_CERTIFICATE                    109
+#define STORE_F_STORE_GET_CRL                            110
+#define STORE_F_STORE_GET_NUMBER                         111
+#define STORE_F_STORE_GET_PRIVATE_KEY                    112
+#define STORE_F_STORE_GET_PUBLIC_KEY                     113
+#define STORE_F_STORE_LIST_CERTIFICATE_END               114
+#define STORE_F_STORE_LIST_CERTIFICATE_ENDP              153
+#define STORE_F_STORE_LIST_CERTIFICATE_NEXT              115
+#define STORE_F_STORE_LIST_CERTIFICATE_START             116
+#define STORE_F_STORE_LIST_CRL_END                       117
+#define STORE_F_STORE_LIST_CRL_ENDP                      154
+#define STORE_F_STORE_LIST_CRL_NEXT                      118
+#define STORE_F_STORE_LIST_CRL_START                     119
+#define STORE_F_STORE_LIST_PRIVATE_KEY_END               120
+#define STORE_F_STORE_LIST_PRIVATE_KEY_ENDP              155
+#define STORE_F_STORE_LIST_PRIVATE_KEY_NEXT              121
+#define STORE_F_STORE_LIST_PRIVATE_KEY_START             122
+#define STORE_F_STORE_LIST_PUBLIC_KEY_END                123
+#define STORE_F_STORE_LIST_PUBLIC_KEY_ENDP               156
+#define STORE_F_STORE_LIST_PUBLIC_KEY_NEXT               124
+#define STORE_F_STORE_LIST_PUBLIC_KEY_START              125
+#define STORE_F_STORE_MODIFY_ARBITRARY                   162
+#define STORE_F_STORE_MODIFY_CERTIFICATE                 163
+#define STORE_F_STORE_MODIFY_CRL                         164
+#define STORE_F_STORE_MODIFY_NUMBER                      165
+#define STORE_F_STORE_MODIFY_PRIVATE_KEY                 166
+#define STORE_F_STORE_MODIFY_PUBLIC_KEY                  167
+#define STORE_F_STORE_NEW_ENGINE                         133
+#define STORE_F_STORE_NEW_METHOD                         132
+#define STORE_F_STORE_PARSE_ATTRS_END                    151
+#define STORE_F_STORE_PARSE_ATTRS_ENDP                   172
+#define STORE_F_STORE_PARSE_ATTRS_NEXT                   152
+#define STORE_F_STORE_PARSE_ATTRS_START                  171
+#define STORE_F_STORE_REVOKE_CERTIFICATE                 129
+#define STORE_F_STORE_REVOKE_PRIVATE_KEY                 130
+#define STORE_F_STORE_REVOKE_PUBLIC_KEY                  131
+#define STORE_F_STORE_STORE_ARBITRARY                    157
+#define STORE_F_STORE_STORE_CERTIFICATE                  100
+#define STORE_F_STORE_STORE_CRL                          101
+#define STORE_F_STORE_STORE_NUMBER                       126
+#define STORE_F_STORE_STORE_PRIVATE_KEY                  127
+#define STORE_F_STORE_STORE_PUBLIC_KEY                   128
+
+/* Reason codes. */
+#define STORE_R_ALREADY_HAS_A_VALUE                      127
+#define STORE_R_FAILED_DELETING_ARBITRARY                132
+#define STORE_R_FAILED_DELETING_CERTIFICATE              100
+#define STORE_R_FAILED_DELETING_KEY                      101
+#define STORE_R_FAILED_DELETING_NUMBER                   102
+#define STORE_R_FAILED_GENERATING_CRL                    103
+#define STORE_R_FAILED_GENERATING_KEY                    104
+#define STORE_R_FAILED_GETTING_ARBITRARY                 133
+#define STORE_R_FAILED_GETTING_CERTIFICATE               105
+#define STORE_R_FAILED_GETTING_KEY                       106
+#define STORE_R_FAILED_GETTING_NUMBER                    107
+#define STORE_R_FAILED_LISTING_CERTIFICATES              108
+#define STORE_R_FAILED_LISTING_KEYS                      109
+#define STORE_R_FAILED_MODIFYING_ARBITRARY               138
+#define STORE_R_FAILED_MODIFYING_CERTIFICATE             139
+#define STORE_R_FAILED_MODIFYING_CRL                     140
+#define STORE_R_FAILED_MODIFYING_NUMBER                  141
+#define STORE_R_FAILED_MODIFYING_PRIVATE_KEY             142
+#define STORE_R_FAILED_MODIFYING_PUBLIC_KEY              143
+#define STORE_R_FAILED_REVOKING_CERTIFICATE              110
+#define STORE_R_FAILED_REVOKING_KEY                      111
+#define STORE_R_FAILED_STORING_ARBITRARY                 134
+#define STORE_R_FAILED_STORING_CERTIFICATE               112
+#define STORE_R_FAILED_STORING_KEY                       113
+#define STORE_R_FAILED_STORING_NUMBER                    114
+#define STORE_R_NOT_IMPLEMENTED                          128
+#define STORE_R_NO_CONTROL_FUNCTION                      144
+#define STORE_R_NO_DELETE_ARBITRARY_FUNCTION             135
+#define STORE_R_NO_DELETE_NUMBER_FUNCTION                115
+#define STORE_R_NO_DELETE_OBJECT_FUNCTION                116
+#define STORE_R_NO_GENERATE_CRL_FUNCTION                 117
+#define STORE_R_NO_GENERATE_OBJECT_FUNCTION              118
+#define STORE_R_NO_GET_OBJECT_ARBITRARY_FUNCTION         136
+#define STORE_R_NO_GET_OBJECT_FUNCTION                   119
+#define STORE_R_NO_GET_OBJECT_NUMBER_FUNCTION            120
+#define STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION             131
+#define STORE_R_NO_LIST_OBJECT_END_FUNCTION              121
+#define STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION             122
+#define STORE_R_NO_LIST_OBJECT_START_FUNCTION            123
+#define STORE_R_NO_MODIFY_OBJECT_FUNCTION                145
+#define STORE_R_NO_REVOKE_OBJECT_FUNCTION                124
+#define STORE_R_NO_STORE                                 129
+#define STORE_R_NO_STORE_OBJECT_ARBITRARY_FUNCTION       137
+#define STORE_R_NO_STORE_OBJECT_FUNCTION                 125
+#define STORE_R_NO_STORE_OBJECT_NUMBER_FUNCTION          126
+#define STORE_R_NO_VALUE                                 130
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
diff --git a/src/lib/libssl/src/crypto/store/str_err.c b/src/lib/libssl/src/crypto/store/str_err.c
new file mode 100644
index 0000000000..6fee649822
--- /dev/null
+++ b/src/lib/libssl/src/crypto/store/str_err.c
@@ -0,0 +1,211 @@
+/* crypto/store/str_err.c */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
+ */
+
+#include <stdio.h>
+#include <openssl/err.h>
+#include <openssl/store.h>
+
+/* BEGIN ERROR CODES */
+#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(ERR_LIB_STORE,func,0)
+#define ERR_REASON(reason) ERR_PACK(ERR_LIB_STORE,0,reason)
+
+static ERR_STRING_DATA STORE_str_functs[]=
+        {
+{ERR_FUNC(STORE_F_MEM_DELETE),  "MEM_DELETE"},
+{ERR_FUNC(STORE_F_MEM_GENERATE),        "MEM_GENERATE"},
+{ERR_FUNC(STORE_F_MEM_LIST_END),        "MEM_LIST_END"},
+{ERR_FUNC(STORE_F_MEM_LIST_NEXT),       "MEM_LIST_NEXT"},
+{ERR_FUNC(STORE_F_MEM_LIST_START),      "MEM_LIST_START"},
+{ERR_FUNC(STORE_F_MEM_MODIFY),  "MEM_MODIFY"},
+{ERR_FUNC(STORE_F_MEM_STORE),   "MEM_STORE"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_GET0_CSTR),   "STORE_ATTR_INFO_get0_cstr"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_GET0_DN),     "STORE_ATTR_INFO_get0_dn"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_GET0_NUMBER), "STORE_ATTR_INFO_get0_number"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_GET0_SHA1STR),        "STORE_ATTR_INFO_get0_sha1str"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_MODIFY_CSTR), "STORE_ATTR_INFO_modify_cstr"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_MODIFY_DN),   "STORE_ATTR_INFO_modify_dn"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_MODIFY_NUMBER),       "STORE_ATTR_INFO_modify_number"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_MODIFY_SHA1STR),      "STORE_ATTR_INFO_modify_sha1str"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_SET_CSTR),    "STORE_ATTR_INFO_set_cstr"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_SET_DN),      "STORE_ATTR_INFO_set_dn"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_SET_NUMBER),  "STORE_ATTR_INFO_set_number"},
+{ERR_FUNC(STORE_F_STORE_ATTR_INFO_SET_SHA1STR), "STORE_ATTR_INFO_set_sha1str"},
+{ERR_FUNC(STORE_F_STORE_CERTIFICATE),   "STORE_CERTIFICATE"},
+{ERR_FUNC(STORE_F_STORE_CTRL),  "STORE_ctrl"},
+{ERR_FUNC(STORE_F_STORE_DELETE_ARBITRARY),      "STORE_delete_arbitrary"},
+{ERR_FUNC(STORE_F_STORE_DELETE_CERTIFICATE),    "STORE_delete_certificate"},
+{ERR_FUNC(STORE_F_STORE_DELETE_CRL),    "STORE_delete_crl"},
+{ERR_FUNC(STORE_F_STORE_DELETE_NUMBER), "STORE_delete_number"},
+{ERR_FUNC(STORE_F_STORE_DELETE_PRIVATE_KEY),    "STORE_delete_private_key"},
+{ERR_FUNC(STORE_F_STORE_DELETE_PUBLIC_KEY),     "STORE_delete_public_key"},
+{ERR_FUNC(STORE_F_STORE_GENERATE_CRL),  "STORE_generate_crl"},
+{ERR_FUNC(STORE_F_STORE_GENERATE_KEY),  "STORE_generate_key"},
+{ERR_FUNC(STORE_F_STORE_GET_ARBITRARY), "STORE_get_arbitrary"},
+{ERR_FUNC(STORE_F_STORE_GET_CERTIFICATE),       "STORE_get_certificate"},
+{ERR_FUNC(STORE_F_STORE_GET_CRL),       "STORE_get_crl"},
+{ERR_FUNC(STORE_F_STORE_GET_NUMBER),    "STORE_get_number"},
+{ERR_FUNC(STORE_F_STORE_GET_PRIVATE_KEY),       "STORE_get_private_key"},
+{ERR_FUNC(STORE_F_STORE_GET_PUBLIC_KEY),        "STORE_get_public_key"},
+{ERR_FUNC(STORE_F_STORE_LIST_CERTIFICATE_END),  "STORE_list_certificate_end"},
+{ERR_FUNC(STORE_F_STORE_LIST_CERTIFICATE_ENDP), "STORE_list_certificate_endp"},
+{ERR_FUNC(STORE_F_STORE_LIST_CERTIFICATE_NEXT), "STORE_list_certificate_next"},
+{ERR_FUNC(STORE_F_STORE_LIST_CERTIFICATE_START),        "STORE_list_certificate_start"},
+{ERR_FUNC(STORE_F_STORE_LIST_CRL_END),  "STORE_list_crl_end"},
+{ERR_FUNC(STORE_F_STORE_LIST_CRL_ENDP), "STORE_list_crl_endp"},
+{ERR_FUNC(STORE_F_STORE_LIST_CRL_NEXT), "STORE_list_crl_next"},
+{ERR_FUNC(STORE_F_STORE_LIST_CRL_START),        "STORE_list_crl_start"},
+{ERR_FUNC(STORE_F_STORE_LIST_PRIVATE_KEY_END),  "STORE_list_private_key_end"},
+{ERR_FUNC(STORE_F_STORE_LIST_PRIVATE_KEY_ENDP), "STORE_list_private_key_endp"},
+{ERR_FUNC(STORE_F_STORE_LIST_PRIVATE_KEY_NEXT), "STORE_list_private_key_next"},
+{ERR_FUNC(STORE_F_STORE_LIST_PRIVATE_KEY_START),        "STORE_list_private_key_start"},
+{ERR_FUNC(STORE_F_STORE_LIST_PUBLIC_KEY_END),   "STORE_list_public_key_end"},
+{ERR_FUNC(STORE_F_STORE_LIST_PUBLIC_KEY_ENDP),  "STORE_list_public_key_endp"},
+{ERR_FUNC(STORE_F_STORE_LIST_PUBLIC_KEY_NEXT),  "STORE_list_public_key_next"},
+{ERR_FUNC(STORE_F_STORE_LIST_PUBLIC_KEY_START), "STORE_list_public_key_start"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_ARBITRARY),      "STORE_modify_arbitrary"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_CERTIFICATE),    "STORE_modify_certificate"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_CRL),    "STORE_modify_crl"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_NUMBER), "STORE_modify_number"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_PRIVATE_KEY),    "STORE_modify_private_key"},
+{ERR_FUNC(STORE_F_STORE_MODIFY_PUBLIC_KEY),     "STORE_modify_public_key"},
+{ERR_FUNC(STORE_F_STORE_NEW_ENGINE),    "STORE_new_engine"},
+{ERR_FUNC(STORE_F_STORE_NEW_METHOD),    "STORE_new_method"},
+{ERR_FUNC(STORE_F_STORE_PARSE_ATTRS_END),       "STORE_parse_attrs_end"},
+{ERR_FUNC(STORE_F_STORE_PARSE_ATTRS_ENDP),      "STORE_parse_attrs_endp"},
+{ERR_FUNC(STORE_F_STORE_PARSE_ATTRS_NEXT),      "STORE_parse_attrs_next"},
+{ERR_FUNC(STORE_F_STORE_PARSE_ATTRS_START),     "STORE_parse_attrs_start"},
+{ERR_FUNC(STORE_F_STORE_REVOKE_CERTIFICATE),    "STORE_revoke_certificate"},
+{ERR_FUNC(STORE_F_STORE_REVOKE_PRIVATE_KEY),    "STORE_revoke_private_key"},
+{ERR_FUNC(STORE_F_STORE_REVOKE_PUBLIC_KEY),     "STORE_revoke_public_key"},
+{ERR_FUNC(STORE_F_STORE_STORE_ARBITRARY),       "STORE_store_arbitrary"},
+{ERR_FUNC(STORE_F_STORE_STORE_CERTIFICATE),     "STORE_store_certificate"},
+{ERR_FUNC(STORE_F_STORE_STORE_CRL),     "STORE_store_crl"},
+{ERR_FUNC(STORE_F_STORE_STORE_NUMBER),  "STORE_store_number"},
+{ERR_FUNC(STORE_F_STORE_STORE_PRIVATE_KEY),     "STORE_store_private_key"},
+{ERR_FUNC(STORE_F_STORE_STORE_PUBLIC_KEY),      "STORE_store_public_key"},
+{0,NULL}
+        };
+
+static ERR_STRING_DATA STORE_str_reasons[]=
+        {
+{ERR_REASON(STORE_R_ALREADY_HAS_A_VALUE) ,"already has a value"},
+{ERR_REASON(STORE_R_FAILED_DELETING_ARBITRARY),"failed deleting arbitrary"},
+{ERR_REASON(STORE_R_FAILED_DELETING_CERTIFICATE),"failed deleting certificate"},
+{ERR_REASON(STORE_R_FAILED_DELETING_KEY) ,"failed deleting key"},
+{ERR_REASON(STORE_R_FAILED_DELETING_NUMBER),"failed deleting number"},
+{ERR_REASON(STORE_R_FAILED_GENERATING_CRL),"failed generating crl"},
+{ERR_REASON(STORE_R_FAILED_GENERATING_KEY),"failed generating key"},
+{ERR_REASON(STORE_R_FAILED_GETTING_ARBITRARY),"failed getting arbitrary"},
+{ERR_REASON(STORE_R_FAILED_GETTING_CERTIFICATE),"failed getting certificate"},
+{ERR_REASON(STORE_R_FAILED_GETTING_KEY)  ,"failed getting key"},
+{ERR_REASON(STORE_R_FAILED_GETTING_NUMBER),"failed getting number"},
+{ERR_REASON(STORE_R_FAILED_LISTING_CERTIFICATES),"failed listing certificates"},
+{ERR_REASON(STORE_R_FAILED_LISTING_KEYS) ,"failed listing keys"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_ARBITRARY),"failed modifying arbitrary"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_CERTIFICATE),"failed modifying certificate"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_CRL),"failed modifying crl"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_NUMBER),"failed modifying number"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_PRIVATE_KEY),"failed modifying private key"},
+{ERR_REASON(STORE_R_FAILED_MODIFYING_PUBLIC_KEY),"failed modifying public key"},
+{ERR_REASON(STORE_R_FAILED_REVOKING_CERTIFICATE),"failed revoking certificate"},
+{ERR_REASON(STORE_R_FAILED_REVOKING_KEY) ,"failed revoking key"},
+{ERR_REASON(STORE_R_FAILED_STORING_ARBITRARY),"failed storing arbitrary"},
+{ERR_REASON(STORE_R_FAILED_STORING_CERTIFICATE),"failed storing certificate"},
+{ERR_REASON(STORE_R_FAILED_STORING_KEY)  ,"failed storing key"},
+{ERR_REASON(STORE_R_FAILED_STORING_NUMBER),"failed storing number"},
+{ERR_REASON(STORE_R_NOT_IMPLEMENTED)     ,"not implemented"},
+{ERR_REASON(STORE_R_NO_CONTROL_FUNCTION) ,"no control function"},
+{ERR_REASON(STORE_R_NO_DELETE_ARBITRARY_FUNCTION),"no delete arbitrary function"},
+{ERR_REASON(STORE_R_NO_DELETE_NUMBER_FUNCTION),"no delete number function"},
+{ERR_REASON(STORE_R_NO_DELETE_OBJECT_FUNCTION),"no delete object function"},
+{ERR_REASON(STORE_R_NO_GENERATE_CRL_FUNCTION),"no generate crl function"},
+{ERR_REASON(STORE_R_NO_GENERATE_OBJECT_FUNCTION),"no generate object function"},
+{ERR_REASON(STORE_R_NO_GET_OBJECT_ARBITRARY_FUNCTION),"no get object arbitrary function"},
+{ERR_REASON(STORE_R_NO_GET_OBJECT_FUNCTION),"no get object function"},
+{ERR_REASON(STORE_R_NO_GET_OBJECT_NUMBER_FUNCTION),"no get object number function"},
+{ERR_REASON(STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION),"no list object endp function"},
+{ERR_REASON(STORE_R_NO_LIST_OBJECT_END_FUNCTION),"no list object end function"},
+{ERR_REASON(STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION),"no list object next function"},
+{ERR_REASON(STORE_R_NO_LIST_OBJECT_START_FUNCTION),"no list object start function"},
+{ERR_REASON(STORE_R_NO_MODIFY_OBJECT_FUNCTION),"no modify object function"},
+{ERR_REASON(STORE_R_NO_REVOKE_OBJECT_FUNCTION),"no revoke object function"},
+{ERR_REASON(STORE_R_NO_STORE)            ,"no store"},
+{ERR_REASON(STORE_R_NO_STORE_OBJECT_ARBITRARY_FUNCTION),"no store object arbitrary function"},
+{ERR_REASON(STORE_R_NO_STORE_OBJECT_FUNCTION),"no store object function"},
+{ERR_REASON(STORE_R_NO_STORE_OBJECT_NUMBER_FUNCTION),"no store object number function"},
+{ERR_REASON(STORE_R_NO_VALUE)            ,"no value"},
+{0,NULL}
+        };
+
+#endif
+
+void ERR_load_STORE_strings(void)
+        {
+#ifndef OPENSSL_NO_ERR
+
+        if (ERR_func_error_string(STORE_str_functs[0].error) == NULL)
+                {
+                ERR_load_strings(0,STORE_str_functs);
+                ERR_load_strings(0,STORE_str_reasons);
+                }
+#endif
+        }
diff --git a/src/lib/libssl/src/crypto/store/str_lib.c b/src/lib/libssl/src/crypto/store/str_lib.c
new file mode 100644
index 0000000000..32ae5bd395
--- /dev/null
+++ b/src/lib/libssl/src/crypto/store/str_lib.c
@@ -0,0 +1,1824 @@
+/* crypto/store/str_lib.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include <openssl/bn.h>
+#include <openssl/err.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#include <openssl/sha.h>
+#include <openssl/x509.h>
+#include "str_locl.h"
+
+const char * const STORE_object_type_string[STORE_OBJECT_TYPE_NUM+1] =
+        {
+        0,
+        "X.509 Certificate",
+        "X.509 CRL",
+        "Private Key",
+        "Public Key",
+        "Number",
+        "Arbitrary Data"
+        };
+
+const int STORE_param_sizes[STORE_PARAM_TYPE_NUM+1] =
+        {
+        0,
+        sizeof(int),            /* EVP_TYPE */
+        sizeof(size_t),         /* BITS */
+        -1,                     /* KEY_PARAMETERS */
+        0                       /* KEY_NO_PARAMETERS */
+        };      
+
+const int STORE_attr_sizes[STORE_ATTR_TYPE_NUM+1] =
+        {
+        0,
+        -1,                     /* FRIENDLYNAME:        C string */
+        SHA_DIGEST_LENGTH,      /* KEYID:               SHA1 digest, 160 bits */
+        SHA_DIGEST_LENGTH,      /* ISSUERKEYID:         SHA1 digest, 160 bits */
+        SHA_DIGEST_LENGTH,      /* SUBJECTKEYID:        SHA1 digest, 160 bits */
+        SHA_DIGEST_LENGTH,      /* ISSUERSERIALHASH:    SHA1 digest, 160 bits */
+        sizeof(X509_NAME *),    /* ISSUER:              X509_NAME * */
+        sizeof(BIGNUM *),       /* SERIAL:              BIGNUM * */
+        sizeof(X509_NAME *),    /* SUBJECT:             X509_NAME * */
+        SHA_DIGEST_LENGTH,      /* CERTHASH:            SHA1 digest, 160 bits */
+        -1,                     /* EMAIL:               C string */
+        -1,                     /* FILENAME:            C string */
+        };      
+
+STORE *STORE_new_method(const STORE_METHOD *method)
+        {
+        STORE *ret;
+
+        if (method == NULL)
+                {
+                STOREerr(STORE_F_STORE_NEW_METHOD,ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+
+        ret=(STORE *)OPENSSL_malloc(sizeof(STORE));
+        if (ret == NULL)
+                {
+                STOREerr(STORE_F_STORE_NEW_METHOD,ERR_R_MALLOC_FAILURE);
+                return NULL;
+                }
+
+        ret->meth=method;
+
+        CRYPTO_new_ex_data(CRYPTO_EX_INDEX_STORE, ret, &ret->ex_data);
+        if (ret->meth->init && !ret->meth->init(ret))
+                {
+                STORE_free(ret);
+                ret = NULL;
+                }
+        return ret;
+        }
+
+STORE *STORE_new_engine(ENGINE *engine)
+        {
+        STORE *ret = NULL;
+        ENGINE *e = engine;
+        const STORE_METHOD *meth = 0;
+
+#ifdef OPENSSL_NO_ENGINE
+        e = NULL;
+#else
+        if (engine)
+                {
+                if (!ENGINE_init(engine))
+                        {
+                        STOREerr(STORE_F_STORE_NEW_ENGINE, ERR_R_ENGINE_LIB);
+                        return NULL;
+                        }
+                e = engine;
+                }
+        else
+                {
+                STOREerr(STORE_F_STORE_NEW_ENGINE,ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if(e)
+                {
+                meth = ENGINE_get_STORE(e);
+                if(!meth)
+                        {
+                        STOREerr(STORE_F_STORE_NEW_ENGINE,
+                                ERR_R_ENGINE_LIB);
+                        ENGINE_finish(e);
+                        return NULL;
+                        }
+                }
+#endif
+
+        ret = STORE_new_method(meth);
+        if (ret == NULL)
+                {
+                STOREerr(STORE_F_STORE_NEW_ENGINE,ERR_R_STORE_LIB);
+                return NULL;
+                }
+
+        ret->engine = e;
+
+        return(ret);
+        }
+
+void STORE_free(STORE *store)
+        {
+        if (store == NULL)
+                return;
+        if (store->meth->clean)
+                store->meth->clean(store);
+        CRYPTO_free_ex_data(CRYPTO_EX_INDEX_STORE, store, &store->ex_data);
+        OPENSSL_free(store);
+        }
+
+int STORE_ctrl(STORE *store, int cmd, long i, void *p, void (*f)(void))
+        {
+        if (store == NULL)
+                {
+                STOREerr(STORE_F_STORE_CTRL,ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (store->meth->ctrl)
+                return store->meth->ctrl(store, cmd, i, p, f);
+        STOREerr(STORE_F_STORE_CTRL,STORE_R_NO_CONTROL_FUNCTION);
+        return 0;
+        }
+
+
+int STORE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
+             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
+        {
+        return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_STORE, argl, argp,
+                                new_func, dup_func, free_func);
+        }
+
+int STORE_set_ex_data(STORE *r, int idx, void *arg)
+        {
+        return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
+        }
+
+void *STORE_get_ex_data(STORE *r, int idx)
+        {
+        return(CRYPTO_get_ex_data(&r->ex_data,idx));
+        }
+
+const STORE_METHOD *STORE_get_method(STORE *store)
+        {
+        return store->meth;
+        }
+
+const STORE_METHOD *STORE_set_method(STORE *store, const STORE_METHOD *meth)
+        {
+        store->meth=meth;
+        return store->meth;
+        }
+
+
+/* API helpers */
+
+#define check_store(s,fncode,fnname,fnerrcode) \
+        do \
+                { \
+                if ((s) == NULL || (s)->meth == NULL) \
+                        { \
+                        STOREerr((fncode), ERR_R_PASSED_NULL_PARAMETER); \
+                        return 0; \
+                        } \
+                if ((s)->meth->fnname == NULL) \
+                        { \
+                        STOREerr((fncode), (fnerrcode)); \
+                        return 0; \
+                        } \
+                } \
+        while(0)
+
+/* API functions */
+
+X509 *STORE_get_certificate(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        X509 *x;
+
+        check_store(s,STORE_F_STORE_GET_CERTIFICATE,
+                get_object,STORE_R_NO_GET_OBJECT_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                attributes, parameters);
+        if (!object || !object->data.x509.certificate)
+                {
+                STOREerr(STORE_F_STORE_GET_CERTIFICATE,
+                        STORE_R_FAILED_GETTING_CERTIFICATE);
+                return 0;
+                }
+        CRYPTO_add(&object->data.x509.certificate->references,1,CRYPTO_LOCK_X509);
+#ifdef REF_PRINT
+        REF_PRINT("X509",data);
+#endif
+        x = object->data.x509.certificate;
+        STORE_OBJECT_free(object);
+        return x;
+        }
+
+int STORE_store_certificate(STORE *s, X509 *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_CERTIFICATE,
+                store_object,STORE_R_NO_STORE_OBJECT_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_CERTIFICATE,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        CRYPTO_add(&data->references,1,CRYPTO_LOCK_X509);
+#ifdef REF_PRINT
+        REF_PRINT("X509",data);
+#endif
+        object->data.x509.certificate = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                object, attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_CERTIFICATE,
+                        STORE_R_FAILED_STORING_CERTIFICATE);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_modify_certificate(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_CERTIFICATE,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_CERTIFICATE,
+                        STORE_R_FAILED_MODIFYING_CERTIFICATE);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_revoke_certificate(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_REVOKE_CERTIFICATE,
+                revoke_object,STORE_R_NO_REVOKE_OBJECT_FUNCTION);
+
+        if (!s->meth->revoke_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_REVOKE_CERTIFICATE,
+                        STORE_R_FAILED_REVOKING_CERTIFICATE);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_delete_certificate(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_CERTIFICATE,
+                delete_object,STORE_R_NO_DELETE_OBJECT_FUNCTION);
+
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_X509_CERTIFICATE,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_CERTIFICATE,
+                        STORE_R_FAILED_DELETING_CERTIFICATE);
+                return 0;
+                }
+        return 1;
+        }
+
+void *STORE_list_certificate_start(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        void *handle;
+
+        check_store(s,STORE_F_STORE_LIST_CERTIFICATE_START,
+                list_object_start,STORE_R_NO_LIST_OBJECT_START_FUNCTION);
+
+        handle = s->meth->list_object_start(s,
+                STORE_OBJECT_TYPE_X509_CERTIFICATE, attributes, parameters);
+        if (!handle)
+                {
+                STOREerr(STORE_F_STORE_LIST_CERTIFICATE_START,
+                        STORE_R_FAILED_LISTING_CERTIFICATES);
+                return 0;
+                }
+        return handle;
+        }
+
+X509 *STORE_list_certificate_next(STORE *s, void *handle)
+        {
+        STORE_OBJECT *object;
+        X509 *x;
+
+        check_store(s,STORE_F_STORE_LIST_CERTIFICATE_NEXT,
+                list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION);
+
+        object = s->meth->list_object_next(s, handle);
+        if (!object || !object->data.x509.certificate)
+                {
+                STOREerr(STORE_F_STORE_LIST_CERTIFICATE_NEXT,
+                        STORE_R_FAILED_LISTING_CERTIFICATES);
+                return 0;
+                }
+        CRYPTO_add(&object->data.x509.certificate->references,1,CRYPTO_LOCK_X509);
+#ifdef REF_PRINT
+        REF_PRINT("X509",data);
+#endif
+        x = object->data.x509.certificate;
+        STORE_OBJECT_free(object);
+        return x;
+        }
+
+int STORE_list_certificate_end(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_CERTIFICATE_END,
+                list_object_end,STORE_R_NO_LIST_OBJECT_END_FUNCTION);
+
+        if (!s->meth->list_object_end(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_CERTIFICATE_END,
+                        STORE_R_FAILED_LISTING_CERTIFICATES);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_list_certificate_endp(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_CERTIFICATE_ENDP,
+                list_object_endp,STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION);
+
+        if (!s->meth->list_object_endp(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_CERTIFICATE_ENDP,
+                        STORE_R_FAILED_LISTING_CERTIFICATES);
+                return 0;
+                }
+        return 1;
+        }
+
+EVP_PKEY *STORE_generate_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_GENERATE_KEY,
+                generate_object,STORE_R_NO_GENERATE_OBJECT_FUNCTION);
+
+        object = s->meth->generate_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                attributes, parameters);
+        if (!object || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_GENERATE_KEY,
+                        STORE_R_FAILED_GENERATING_KEY);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+EVP_PKEY *STORE_get_private_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_GET_PRIVATE_KEY,
+                get_object,STORE_R_NO_GET_OBJECT_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                attributes, parameters);
+        if (!object || !object->data.key || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_GET_PRIVATE_KEY,
+                        STORE_R_FAILED_GETTING_KEY);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+int STORE_store_private_key(STORE *s, EVP_PKEY *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_PRIVATE_KEY,
+                store_object,STORE_R_NO_STORE_OBJECT_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_PRIVATE_KEY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        object->data.key = EVP_PKEY_new();
+        if (!object->data.key)
+                {
+                STOREerr(STORE_F_STORE_STORE_PRIVATE_KEY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        CRYPTO_add(&data->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        object->data.key = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_PRIVATE_KEY,
+                        STORE_R_FAILED_STORING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_modify_private_key(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_PRIVATE_KEY,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_PRIVATE_KEY,
+                        STORE_R_FAILED_MODIFYING_PRIVATE_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_revoke_private_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        int i;
+
+        check_store(s,STORE_F_STORE_REVOKE_PRIVATE_KEY,
+                revoke_object,STORE_R_NO_REVOKE_OBJECT_FUNCTION);
+
+        i = s->meth->revoke_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                attributes, parameters);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_REVOKE_PRIVATE_KEY,
+                        STORE_R_FAILED_REVOKING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_delete_private_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_PRIVATE_KEY,
+                delete_object,STORE_R_NO_DELETE_OBJECT_FUNCTION);
+        
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_PRIVATE_KEY,
+                        STORE_R_FAILED_DELETING_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+void *STORE_list_private_key_start(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        void *handle;
+
+        check_store(s,STORE_F_STORE_LIST_PRIVATE_KEY_START,
+                list_object_start,STORE_R_NO_LIST_OBJECT_START_FUNCTION);
+
+        handle = s->meth->list_object_start(s, STORE_OBJECT_TYPE_PRIVATE_KEY,
+                attributes, parameters);
+        if (!handle)
+                {
+                STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_START,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return handle;
+        }
+
+EVP_PKEY *STORE_list_private_key_next(STORE *s, void *handle)
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_LIST_PRIVATE_KEY_NEXT,
+                list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION);
+
+        object = s->meth->list_object_next(s, handle);
+        if (!object || !object->data.key || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_NEXT,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+int STORE_list_private_key_end(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_PRIVATE_KEY_END,
+                list_object_end,STORE_R_NO_LIST_OBJECT_END_FUNCTION);
+
+        if (!s->meth->list_object_end(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_END,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_list_private_key_endp(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_PRIVATE_KEY_ENDP,
+                list_object_endp,STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION);
+
+        if (!s->meth->list_object_endp(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_PRIVATE_KEY_ENDP,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+EVP_PKEY *STORE_get_public_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_GET_PUBLIC_KEY,
+                get_object,STORE_R_NO_GET_OBJECT_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                attributes, parameters);
+        if (!object || !object->data.key || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_GET_PUBLIC_KEY,
+                        STORE_R_FAILED_GETTING_KEY);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+int STORE_store_public_key(STORE *s, EVP_PKEY *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_PUBLIC_KEY,
+                store_object,STORE_R_NO_STORE_OBJECT_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_PUBLIC_KEY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        object->data.key = EVP_PKEY_new();
+        if (!object->data.key)
+                {
+                STOREerr(STORE_F_STORE_STORE_PUBLIC_KEY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        CRYPTO_add(&data->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        object->data.key = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_PUBLIC_KEY,
+                        STORE_R_FAILED_STORING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_modify_public_key(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_PUBLIC_KEY,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_PUBLIC_KEY,
+                        STORE_R_FAILED_MODIFYING_PUBLIC_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_revoke_public_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        int i;
+
+        check_store(s,STORE_F_STORE_REVOKE_PUBLIC_KEY,
+                revoke_object,STORE_R_NO_REVOKE_OBJECT_FUNCTION);
+
+        i = s->meth->revoke_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                attributes, parameters);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_REVOKE_PUBLIC_KEY,
+                        STORE_R_FAILED_REVOKING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_delete_public_key(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_PUBLIC_KEY,
+                delete_object,STORE_R_NO_DELETE_OBJECT_FUNCTION);
+        
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_PUBLIC_KEY,
+                        STORE_R_FAILED_DELETING_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+void *STORE_list_public_key_start(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        void *handle;
+
+        check_store(s,STORE_F_STORE_LIST_PUBLIC_KEY_START,
+                list_object_start,STORE_R_NO_LIST_OBJECT_START_FUNCTION);
+
+        handle = s->meth->list_object_start(s, STORE_OBJECT_TYPE_PUBLIC_KEY,
+                attributes, parameters);
+        if (!handle)
+                {
+                STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_START,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return handle;
+        }
+
+EVP_PKEY *STORE_list_public_key_next(STORE *s, void *handle)
+        {
+        STORE_OBJECT *object;
+        EVP_PKEY *pkey;
+
+        check_store(s,STORE_F_STORE_LIST_PUBLIC_KEY_NEXT,
+                list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION);
+
+        object = s->meth->list_object_next(s, handle);
+        if (!object || !object->data.key || !object->data.key)
+                {
+                STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_NEXT,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        CRYPTO_add(&object->data.key->references,1,CRYPTO_LOCK_EVP_PKEY);
+#ifdef REF_PRINT
+        REF_PRINT("EVP_PKEY",data);
+#endif
+        pkey = object->data.key;
+        STORE_OBJECT_free(object);
+        return pkey;
+        }
+
+int STORE_list_public_key_end(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_PUBLIC_KEY_END,
+                list_object_end,STORE_R_NO_LIST_OBJECT_END_FUNCTION);
+
+        if (!s->meth->list_object_end(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_END,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_list_public_key_endp(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_PUBLIC_KEY_ENDP,
+                list_object_endp,STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION);
+
+        if (!s->meth->list_object_endp(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_PUBLIC_KEY_ENDP,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+X509_CRL *STORE_generate_crl(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        X509_CRL *crl;
+
+        check_store(s,STORE_F_STORE_GENERATE_CRL,
+                generate_object,STORE_R_NO_GENERATE_CRL_FUNCTION);
+
+        object = s->meth->generate_object(s, STORE_OBJECT_TYPE_X509_CRL,
+                attributes, parameters);
+        if (!object || !object->data.crl)
+                {
+                STOREerr(STORE_F_STORE_GENERATE_CRL,
+                        STORE_R_FAILED_GENERATING_CRL);
+                return 0;
+                }
+        CRYPTO_add(&object->data.crl->references,1,CRYPTO_LOCK_X509_CRL);
+#ifdef REF_PRINT
+        REF_PRINT("X509_CRL",data);
+#endif
+        crl = object->data.crl;
+        STORE_OBJECT_free(object);
+        return crl;
+        }
+
+X509_CRL *STORE_get_crl(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        X509_CRL *crl;
+
+        check_store(s,STORE_F_STORE_GET_CRL,
+                get_object,STORE_R_NO_GET_OBJECT_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_X509_CRL,
+                attributes, parameters);
+        if (!object || !object->data.crl)
+                {
+                STOREerr(STORE_F_STORE_GET_CRL,
+                        STORE_R_FAILED_GETTING_KEY);
+                return 0;
+                }
+        CRYPTO_add(&object->data.crl->references,1,CRYPTO_LOCK_X509_CRL);
+#ifdef REF_PRINT
+        REF_PRINT("X509_CRL",data);
+#endif
+        crl = object->data.crl;
+        STORE_OBJECT_free(object);
+        return crl;
+        }
+
+int STORE_store_crl(STORE *s, X509_CRL *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_CRL,
+                store_object,STORE_R_NO_STORE_OBJECT_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_CRL,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        CRYPTO_add(&data->references,1,CRYPTO_LOCK_X509_CRL);
+#ifdef REF_PRINT
+        REF_PRINT("X509_CRL",data);
+#endif
+        object->data.crl = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_X509_CRL, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_CRL,
+                        STORE_R_FAILED_STORING_KEY);
+                return 0;
+                }
+        return i;
+        }
+
+int STORE_modify_crl(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_CRL,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_X509_CRL,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_CRL,
+                        STORE_R_FAILED_MODIFYING_CRL);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_delete_crl(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_CRL,
+                delete_object,STORE_R_NO_DELETE_OBJECT_FUNCTION);
+        
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_X509_CRL,
+                    attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_CRL,
+                        STORE_R_FAILED_DELETING_KEY);
+                return 0;
+                }
+        return 1;
+        }
+
+void *STORE_list_crl_start(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        void *handle;
+
+        check_store(s,STORE_F_STORE_LIST_CRL_START,
+                list_object_start,STORE_R_NO_LIST_OBJECT_START_FUNCTION);
+
+        handle = s->meth->list_object_start(s, STORE_OBJECT_TYPE_X509_CRL,
+                attributes, parameters);
+        if (!handle)
+                {
+                STOREerr(STORE_F_STORE_LIST_CRL_START,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return handle;
+        }
+
+X509_CRL *STORE_list_crl_next(STORE *s, void *handle)
+        {
+        STORE_OBJECT *object;
+        X509_CRL *crl;
+
+        check_store(s,STORE_F_STORE_LIST_CRL_NEXT,
+                list_object_next,STORE_R_NO_LIST_OBJECT_NEXT_FUNCTION);
+
+        object = s->meth->list_object_next(s, handle);
+        if (!object || !object->data.crl)
+                {
+                STOREerr(STORE_F_STORE_LIST_CRL_NEXT,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        CRYPTO_add(&object->data.crl->references,1,CRYPTO_LOCK_X509_CRL);
+#ifdef REF_PRINT
+        REF_PRINT("X509_CRL",data);
+#endif
+        crl = object->data.crl;
+        STORE_OBJECT_free(object);
+        return crl;
+        }
+
+int STORE_list_crl_end(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_CRL_END,
+                list_object_end,STORE_R_NO_LIST_OBJECT_END_FUNCTION);
+
+        if (!s->meth->list_object_end(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_CRL_END,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_list_crl_endp(STORE *s, void *handle)
+        {
+        check_store(s,STORE_F_STORE_LIST_CRL_ENDP,
+                list_object_endp,STORE_R_NO_LIST_OBJECT_ENDP_FUNCTION);
+
+        if (!s->meth->list_object_endp(s, handle))
+                {
+                STOREerr(STORE_F_STORE_LIST_CRL_ENDP,
+                        STORE_R_FAILED_LISTING_KEYS);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_store_number(STORE *s, BIGNUM *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_NUMBER,
+                store_object,STORE_R_NO_STORE_OBJECT_NUMBER_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_NUMBER,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        object->data.number = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_NUMBER, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_NUMBER,
+                        STORE_R_FAILED_STORING_NUMBER);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_modify_number(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_NUMBER,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_NUMBER,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_NUMBER,
+                        STORE_R_FAILED_MODIFYING_NUMBER);
+                return 0;
+                }
+        return 1;
+        }
+
+BIGNUM *STORE_get_number(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        BIGNUM *n;
+
+        check_store(s,STORE_F_STORE_GET_NUMBER,
+                get_object,STORE_R_NO_GET_OBJECT_NUMBER_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_NUMBER, attributes,
+                parameters);
+        if (!object || !object->data.number)
+                {
+                STOREerr(STORE_F_STORE_GET_NUMBER,
+                        STORE_R_FAILED_GETTING_NUMBER);
+                return 0;
+                }
+        n = object->data.number;
+        object->data.number = NULL;
+        STORE_OBJECT_free(object);
+        return n;
+        }
+
+int STORE_delete_number(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_NUMBER,
+                delete_object,STORE_R_NO_DELETE_NUMBER_FUNCTION);
+
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_NUMBER, attributes,
+                    parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_NUMBER,
+                        STORE_R_FAILED_DELETING_NUMBER);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_store_arbitrary(STORE *s, BUF_MEM *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        int i;
+
+        check_store(s,STORE_F_STORE_STORE_ARBITRARY,
+                store_object,STORE_R_NO_STORE_OBJECT_ARBITRARY_FUNCTION);
+
+        object = STORE_OBJECT_new();
+        if (!object)
+                {
+                STOREerr(STORE_F_STORE_STORE_ARBITRARY,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        
+        object->data.arbitrary = data;
+
+        i = s->meth->store_object(s, STORE_OBJECT_TYPE_ARBITRARY, object,
+                attributes, parameters);
+
+        STORE_OBJECT_free(object);
+
+        if (!i)
+                {
+                STOREerr(STORE_F_STORE_STORE_ARBITRARY,
+                        STORE_R_FAILED_STORING_ARBITRARY);
+                return 0;
+                }
+        return 1;
+        }
+
+int STORE_modify_arbitrary(STORE *s, OPENSSL_ITEM search_attributes[],
+        OPENSSL_ITEM add_attributes[], OPENSSL_ITEM modify_attributes[],
+        OPENSSL_ITEM delete_attributes[], OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_MODIFY_ARBITRARY,
+                modify_object,STORE_R_NO_MODIFY_OBJECT_FUNCTION);
+
+        if (!s->meth->modify_object(s, STORE_OBJECT_TYPE_ARBITRARY,
+                    search_attributes, add_attributes, modify_attributes,
+                    delete_attributes, parameters))
+                {
+                STOREerr(STORE_F_STORE_MODIFY_ARBITRARY,
+                        STORE_R_FAILED_MODIFYING_ARBITRARY);
+                return 0;
+                }
+        return 1;
+        }
+
+BUF_MEM *STORE_get_arbitrary(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STORE_OBJECT *object;
+        BUF_MEM *b;
+
+        check_store(s,STORE_F_STORE_GET_ARBITRARY,
+                get_object,STORE_R_NO_GET_OBJECT_ARBITRARY_FUNCTION);
+
+        object = s->meth->get_object(s, STORE_OBJECT_TYPE_ARBITRARY,
+                attributes, parameters);
+        if (!object || !object->data.arbitrary)
+                {
+                STOREerr(STORE_F_STORE_GET_ARBITRARY,
+                        STORE_R_FAILED_GETTING_ARBITRARY);
+                return 0;
+                }
+        b = object->data.arbitrary;
+        object->data.arbitrary = NULL;
+        STORE_OBJECT_free(object);
+        return b;
+        }
+
+int STORE_delete_arbitrary(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        check_store(s,STORE_F_STORE_DELETE_ARBITRARY,
+                delete_object,STORE_R_NO_DELETE_ARBITRARY_FUNCTION);
+
+        if (!s->meth->delete_object(s, STORE_OBJECT_TYPE_ARBITRARY, attributes,
+                    parameters))
+                {
+                STOREerr(STORE_F_STORE_DELETE_ARBITRARY,
+                        STORE_R_FAILED_DELETING_ARBITRARY);
+                return 0;
+                }
+        return 1;
+        }
+
+STORE_OBJECT *STORE_OBJECT_new(void)
+        {
+        STORE_OBJECT *object = OPENSSL_malloc(sizeof(STORE_OBJECT));
+        if (object) memset(object, 0, sizeof(STORE_OBJECT));
+        return object;
+        }
+void STORE_OBJECT_free(STORE_OBJECT *data)
+        {
+        if (!data) return;
+        switch (data->type)
+                {
+        case STORE_OBJECT_TYPE_X509_CERTIFICATE:
+                X509_free(data->data.x509.certificate);
+                break;
+        case STORE_OBJECT_TYPE_X509_CRL:
+                X509_CRL_free(data->data.crl);
+                break;
+        case STORE_OBJECT_TYPE_PRIVATE_KEY:
+        case STORE_OBJECT_TYPE_PUBLIC_KEY:
+                EVP_PKEY_free(data->data.key);
+                break;
+        case STORE_OBJECT_TYPE_NUMBER:
+                BN_free(data->data.number);
+                break;
+        case STORE_OBJECT_TYPE_ARBITRARY:
+                BUF_MEM_free(data->data.arbitrary);
+                break;
+                }
+        OPENSSL_free(data);
+        }
+
+IMPLEMENT_STACK_OF(STORE_OBJECT*)
+
+
+struct STORE_attr_info_st
+        {
+        unsigned char set[(STORE_ATTR_TYPE_NUM + 8) / 8];
+        union
+                {
+                char *cstring;
+                unsigned char *sha1string;
+                X509_NAME *dn;
+                BIGNUM *number;
+                void *any;
+                } values[STORE_ATTR_TYPE_NUM+1];
+        size_t value_sizes[STORE_ATTR_TYPE_NUM+1];
+        };
+
+#define ATTR_IS_SET(a,i)        ((i) > 0 && (i) < STORE_ATTR_TYPE_NUM \
+                                && ((a)->set[(i) / 8] & (1 << ((i) % 8))))
+#define SET_ATTRBIT(a,i)        ((a)->set[(i) / 8] |= (1 << ((i) % 8)))
+#define CLEAR_ATTRBIT(a,i)      ((a)->set[(i) / 8] &= ~(1 << ((i) % 8)))
+
+STORE_ATTR_INFO *STORE_ATTR_INFO_new(void)
+        {
+        return (STORE_ATTR_INFO *)OPENSSL_malloc(sizeof(STORE_ATTR_INFO));
+        }
+static void STORE_ATTR_INFO_attr_free(STORE_ATTR_INFO *attrs,
+        STORE_ATTR_TYPES code)
+        {
+        if (ATTR_IS_SET(attrs,code))
+                {
+                switch(code)
+                        {
+                case STORE_ATTR_FRIENDLYNAME:
+                case STORE_ATTR_EMAIL:
+                case STORE_ATTR_FILENAME:
+                        STORE_ATTR_INFO_modify_cstr(attrs, code, NULL, 0);
+                        break;
+                case STORE_ATTR_KEYID:
+                case STORE_ATTR_ISSUERKEYID:
+                case STORE_ATTR_SUBJECTKEYID:
+                case STORE_ATTR_ISSUERSERIALHASH:
+                case STORE_ATTR_CERTHASH:
+                        STORE_ATTR_INFO_modify_sha1str(attrs, code, NULL, 0);
+                        break;
+                case STORE_ATTR_ISSUER:
+                case STORE_ATTR_SUBJECT:
+                        STORE_ATTR_INFO_modify_dn(attrs, code, NULL);
+                        break;
+                case STORE_ATTR_SERIAL:
+                        STORE_ATTR_INFO_modify_number(attrs, code, NULL);
+                        break;
+                default:
+                        break;
+                        }
+                }
+        }
+int STORE_ATTR_INFO_free(STORE_ATTR_INFO *attrs)
+        {
+        if (attrs)
+                {
+                STORE_ATTR_TYPES i;
+                for(i = 0; i++ < STORE_ATTR_TYPE_NUM;)
+                        STORE_ATTR_INFO_attr_free(attrs, i);
+                OPENSSL_free(attrs);
+                }
+        return 1;
+        }
+char *STORE_ATTR_INFO_get0_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_GET0_CSTR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                return attrs->values[code].cstring;
+        STOREerr(STORE_F_STORE_ATTR_INFO_GET0_CSTR,
+                STORE_R_NO_VALUE);
+        return NULL;
+        }
+unsigned char *STORE_ATTR_INFO_get0_sha1str(STORE_ATTR_INFO *attrs,
+        STORE_ATTR_TYPES code)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_GET0_SHA1STR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                return attrs->values[code].sha1string;
+        STOREerr(STORE_F_STORE_ATTR_INFO_GET0_SHA1STR,
+                STORE_R_NO_VALUE);
+        return NULL;
+        }
+X509_NAME *STORE_ATTR_INFO_get0_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_GET0_DN,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                return attrs->values[code].dn;
+        STOREerr(STORE_F_STORE_ATTR_INFO_GET0_DN,
+                STORE_R_NO_VALUE);
+        return NULL;
+        }
+BIGNUM *STORE_ATTR_INFO_get0_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_GET0_NUMBER,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                return attrs->values[code].number;
+        STOREerr(STORE_F_STORE_ATTR_INFO_GET0_NUMBER,
+                STORE_R_NO_VALUE);
+        return NULL;
+        }
+int STORE_ATTR_INFO_set_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        char *cstr, size_t cstr_size)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (!ATTR_IS_SET(attrs,code))
+                {
+                if ((attrs->values[code].cstring = BUF_strndup(cstr, cstr_size)))
+                        return 1;
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR, STORE_R_ALREADY_HAS_A_VALUE);
+        return 0;
+        }
+int STORE_ATTR_INFO_set_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        unsigned char *sha1str, size_t sha1str_size)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_SHA1STR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (!ATTR_IS_SET(attrs,code))
+                {
+                if ((attrs->values[code].sha1string =
+                            (unsigned char *)BUF_memdup(sha1str,
+                                    sha1str_size)))
+                        return 1;
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_SHA1STR,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        STOREerr(STORE_F_STORE_ATTR_INFO_SET_SHA1STR, STORE_R_ALREADY_HAS_A_VALUE);
+        return 0;
+        }
+int STORE_ATTR_INFO_set_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        X509_NAME *dn)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_DN,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (!ATTR_IS_SET(attrs,code))
+                {
+                if ((attrs->values[code].dn = X509_NAME_dup(dn)))
+                        return 1;
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_DN,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        STOREerr(STORE_F_STORE_ATTR_INFO_SET_DN, STORE_R_ALREADY_HAS_A_VALUE);
+        return 0;
+        }
+int STORE_ATTR_INFO_set_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        BIGNUM *number)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_NUMBER,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (!ATTR_IS_SET(attrs,code))
+                {
+                if ((attrs->values[code].number = BN_dup(number)))
+                        return 1;
+                STOREerr(STORE_F_STORE_ATTR_INFO_SET_NUMBER,
+                        ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        STOREerr(STORE_F_STORE_ATTR_INFO_SET_NUMBER, STORE_R_ALREADY_HAS_A_VALUE);
+        return 0;
+        }
+int STORE_ATTR_INFO_modify_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        char *cstr, size_t cstr_size)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_MODIFY_CSTR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                {
+                OPENSSL_free(attrs->values[code].cstring);
+                attrs->values[code].cstring = NULL;
+                CLEAR_ATTRBIT(attrs, code);
+                }
+        return STORE_ATTR_INFO_set_cstr(attrs, code, cstr, cstr_size);
+        }
+int STORE_ATTR_INFO_modify_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        unsigned char *sha1str, size_t sha1str_size)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_MODIFY_SHA1STR,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                {
+                OPENSSL_free(attrs->values[code].sha1string);
+                attrs->values[code].sha1string = NULL;
+                CLEAR_ATTRBIT(attrs, code);
+                }
+        return STORE_ATTR_INFO_set_sha1str(attrs, code, sha1str, sha1str_size);
+        }
+int STORE_ATTR_INFO_modify_dn(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        X509_NAME *dn)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_MODIFY_DN,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                {
+                OPENSSL_free(attrs->values[code].dn);
+                attrs->values[code].dn = NULL;
+                CLEAR_ATTRBIT(attrs, code);
+                }
+        return STORE_ATTR_INFO_set_dn(attrs, code, dn);
+        }
+int STORE_ATTR_INFO_modify_number(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code,
+        BIGNUM *number)
+        {
+        if (!attrs)
+                {
+                STOREerr(STORE_F_STORE_ATTR_INFO_MODIFY_NUMBER,
+                        ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (ATTR_IS_SET(attrs,code))
+                {
+                OPENSSL_free(attrs->values[code].number);
+                attrs->values[code].number = NULL;
+                CLEAR_ATTRBIT(attrs, code);
+                }
+        return STORE_ATTR_INFO_set_number(attrs, code, number);
+        }
+
+struct attr_list_ctx_st
+        {
+        OPENSSL_ITEM *attributes;
+        };
+void *STORE_parse_attrs_start(OPENSSL_ITEM *attributes)
+        {
+        if (attributes)
+                {
+                struct attr_list_ctx_st *context =
+                        (struct attr_list_ctx_st *)OPENSSL_malloc(sizeof(struct attr_list_ctx_st));
+                if (context)
+                        context->attributes = attributes;
+                else
+                        STOREerr(STORE_F_STORE_PARSE_ATTRS_START,
+                                ERR_R_MALLOC_FAILURE);
+                return context;
+                }
+        STOREerr(STORE_F_STORE_PARSE_ATTRS_START, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+        }
+STORE_ATTR_INFO *STORE_parse_attrs_next(void *handle)
+        {
+        struct attr_list_ctx_st *context = (struct attr_list_ctx_st *)handle;
+
+        if (context && context->attributes)
+                {
+                STORE_ATTR_INFO *attrs = NULL;
+
+                while(context->attributes
+                        && context->attributes->code != STORE_ATTR_OR
+                        && context->attributes->code != STORE_ATTR_END)
+                        {
+                        switch(context->attributes->code)
+                                {
+                        case STORE_ATTR_FRIENDLYNAME:
+                        case STORE_ATTR_EMAIL:
+                        case STORE_ATTR_FILENAME:
+                                if (!attrs) attrs = STORE_ATTR_INFO_new();
+                                if (attrs == NULL)
+                                        {
+                                        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT,
+                                                ERR_R_MALLOC_FAILURE);
+                                        goto err;
+                                        }
+                                STORE_ATTR_INFO_set_cstr(attrs,
+                                        context->attributes->code,
+                                        context->attributes->value,
+                                        context->attributes->value_size);
+                                break;
+                        case STORE_ATTR_KEYID:
+                        case STORE_ATTR_ISSUERKEYID:
+                        case STORE_ATTR_SUBJECTKEYID:
+                        case STORE_ATTR_ISSUERSERIALHASH:
+                        case STORE_ATTR_CERTHASH:
+                                if (!attrs) attrs = STORE_ATTR_INFO_new();
+                                if (attrs == NULL)
+                                        {
+                                        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT,
+                                                ERR_R_MALLOC_FAILURE);
+                                        goto err;
+                                        }
+                                STORE_ATTR_INFO_set_sha1str(attrs,
+                                        context->attributes->code,
+                                        context->attributes->value,
+                                        context->attributes->value_size);
+                                break;
+                        case STORE_ATTR_ISSUER:
+                        case STORE_ATTR_SUBJECT:
+                                if (!attrs) attrs = STORE_ATTR_INFO_new();
+                                if (attrs == NULL)
+                                        {
+                                        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT,
+                                                ERR_R_MALLOC_FAILURE);
+                                        goto err;
+                                        }
+                                STORE_ATTR_INFO_modify_dn(attrs,
+                                        context->attributes->code,
+                                        context->attributes->value);
+                                break;
+                        case STORE_ATTR_SERIAL:
+                                if (!attrs) attrs = STORE_ATTR_INFO_new();
+                                if (attrs == NULL)
+                                        {
+                                        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT,
+                                                ERR_R_MALLOC_FAILURE);
+                                        goto err;
+                                        }
+                                STORE_ATTR_INFO_modify_number(attrs,
+                                        context->attributes->code,
+                                        context->attributes->value);
+                                break;
+                                }
+                        context->attributes++;
+                        }
+                if (context->attributes->code == STORE_ATTR_OR)
+                        context->attributes++;
+                return attrs;
+        err:
+                while(context->attributes
+                        && context->attributes->code != STORE_ATTR_OR
+                        && context->attributes->code != STORE_ATTR_END)
+                        context->attributes++;
+                if (context->attributes->code == STORE_ATTR_OR)
+                        context->attributes++;
+                return NULL;
+                }
+        STOREerr(STORE_F_STORE_PARSE_ATTRS_NEXT, ERR_R_PASSED_NULL_PARAMETER);
+        return NULL;
+        }
+int STORE_parse_attrs_end(void *handle)
+        {
+        struct attr_list_ctx_st *context = (struct attr_list_ctx_st *)handle;
+
+        if (context && context->attributes)
+                {
+#if 0
+                OPENSSL_ITEM *attributes = context->attributes;
+#endif
+                OPENSSL_free(context);
+                return 1;
+                }
+        STOREerr(STORE_F_STORE_PARSE_ATTRS_END, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+        }
+
+int STORE_parse_attrs_endp(void *handle)
+        {
+        struct attr_list_ctx_st *context = (struct attr_list_ctx_st *)handle;
+
+        if (context && context->attributes)
+                {
+                return context->attributes->code == STORE_ATTR_END;
+                }
+        STOREerr(STORE_F_STORE_PARSE_ATTRS_ENDP, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+        }
+
+static int attr_info_compare_compute_range(
+        unsigned char *abits, unsigned char *bbits,
+        unsigned int *alowp, unsigned int *ahighp,
+        unsigned int *blowp, unsigned int *bhighp)
+        {
+        unsigned int alow = (unsigned int)-1, ahigh = 0;
+        unsigned int blow = (unsigned int)-1, bhigh = 0;
+        int i, res = 0;
+
+        for (i = 0; i < (STORE_ATTR_TYPE_NUM + 8) / 8; i++, abits++, bbits++)
+                {
+                if (res == 0)
+                        {
+                        if (*abits < *bbits) res = -1;
+                        if (*abits > *bbits) res = 1;
+                        }
+                if (*abits)
+                        {
+                        if (alow == (unsigned int)-1)
+                                {
+                                alow = i * 8;
+                                if (!(*abits & 0x01)) alow++;
+                                if (!(*abits & 0x02)) alow++;
+                                if (!(*abits & 0x04)) alow++;
+                                if (!(*abits & 0x08)) alow++;
+                                if (!(*abits & 0x10)) alow++;
+                                if (!(*abits & 0x20)) alow++;
+                                if (!(*abits & 0x40)) alow++;
+                                }
+                        ahigh = i * 8 + 7;
+                        if (!(*abits & 0x80)) ahigh++;
+                        if (!(*abits & 0x40)) ahigh++;
+                        if (!(*abits & 0x20)) ahigh++;
+                        if (!(*abits & 0x10)) ahigh++;
+                        if (!(*abits & 0x08)) ahigh++;
+                        if (!(*abits & 0x04)) ahigh++;
+                        if (!(*abits & 0x02)) ahigh++;
+                        }
+                if (*bbits)
+                        {
+                        if (blow == (unsigned int)-1)
+                                {
+                                blow = i * 8;
+                                if (!(*bbits & 0x01)) blow++;
+                                if (!(*bbits & 0x02)) blow++;
+                                if (!(*bbits & 0x04)) blow++;
+                                if (!(*bbits & 0x08)) blow++;
+                                if (!(*bbits & 0x10)) blow++;
+                                if (!(*bbits & 0x20)) blow++;
+                                if (!(*bbits & 0x40)) blow++;
+                                }
+                        bhigh = i * 8 + 7;
+                        if (!(*bbits & 0x80)) bhigh++;
+                        if (!(*bbits & 0x40)) bhigh++;
+                        if (!(*bbits & 0x20)) bhigh++;
+                        if (!(*bbits & 0x10)) bhigh++;
+                        if (!(*bbits & 0x08)) bhigh++;
+                        if (!(*bbits & 0x04)) bhigh++;
+                        if (!(*bbits & 0x02)) bhigh++;
+                        }
+                }
+        if (ahigh + alow < bhigh + blow) res = -1;
+        if (ahigh + alow > bhigh + blow) res = 1;
+        if (alowp) *alowp = alow;
+        if (ahighp) *ahighp = ahigh;
+        if (blowp) *blowp = blow;
+        if (bhighp) *bhighp = bhigh;
+        return res;
+        }
+
+int STORE_ATTR_INFO_compare(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
+        {
+        if (a == b) return 0;
+        if (!a) return -1;
+        if (!b) return 1;
+        return attr_info_compare_compute_range(a->set, b->set, 0, 0, 0, 0);
+        }
+int STORE_ATTR_INFO_in_range(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
+        {
+        unsigned int alow, ahigh, blow, bhigh;
+
+        if (a == b) return 1;
+        if (!a) return 0;
+        if (!b) return 0;
+        attr_info_compare_compute_range(a->set, b->set,
+                &alow, &ahigh, &blow, &bhigh);
+        if (alow >= blow && ahigh <= bhigh)
+                return 1;
+        return 0;
+        }
+int STORE_ATTR_INFO_in(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
+        {
+        unsigned char *abits, *bbits;
+        int i;
+
+        if (a == b) return 1;
+        if (!a) return 0;
+        if (!b) return 0;
+        abits = a->set;
+        bbits = b->set;
+        for (i = 0; i < (STORE_ATTR_TYPE_NUM + 8) / 8; i++, abits++, bbits++)
+                {
+                if (*abits && (*bbits & *abits) != *abits)
+                        return 0;
+                }
+        return 1;
+        }
+int STORE_ATTR_INFO_in_ex(STORE_ATTR_INFO *a, STORE_ATTR_INFO *b)
+        {
+        STORE_ATTR_TYPES i;
+
+        if (a == b) return 1;
+        if (!STORE_ATTR_INFO_in(a, b)) return 0;
+        for (i = 1; i < STORE_ATTR_TYPE_NUM; i++)
+                if (ATTR_IS_SET(a, i))
+                        {
+                        switch(i)
+                                {
+                        case STORE_ATTR_FRIENDLYNAME:
+                        case STORE_ATTR_EMAIL:
+                        case STORE_ATTR_FILENAME:
+                                if (strcmp(a->values[i].cstring,
+                                            b->values[i].cstring))
+                                        return 0;
+                                break;
+                        case STORE_ATTR_KEYID:
+                        case STORE_ATTR_ISSUERKEYID:
+                        case STORE_ATTR_SUBJECTKEYID:
+                        case STORE_ATTR_ISSUERSERIALHASH:
+                        case STORE_ATTR_CERTHASH:
+                                if (memcmp(a->values[i].sha1string,
+                                            b->values[i].sha1string,
+                                            a->value_sizes[i]))
+                                        return 0;
+                                break;
+                        case STORE_ATTR_ISSUER:
+                        case STORE_ATTR_SUBJECT:
+                                if (X509_NAME_cmp(a->values[i].dn,
+                                            b->values[i].dn))
+                                        return 0;
+                                break;
+                        case STORE_ATTR_SERIAL:
+                                if (BN_cmp(a->values[i].number,
+                                            b->values[i].number))
+                                        return 0;
+                                break;
+                        default:
+                                break;
+                                }
+                        }
+
+        return 1;
+        }
diff --git a/src/lib/libssl/src/crypto/store/str_locl.h b/src/lib/libssl/src/crypto/store/str_locl.h
new file mode 100644
index 0000000000..3f8cb75619
--- /dev/null
+++ b/src/lib/libssl/src/crypto/store/str_locl.h
@@ -0,0 +1,124 @@
+/* crypto/store/str_locl.h -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_STORE_LOCL_H
+#define HEADER_STORE_LOCL_H
+
+#include <openssl/crypto.h>
+#include <openssl/store.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct store_method_st
+        {
+        char *name;
+
+        /* All the functions return a positive integer or non-NULL for success
+           and 0, a negative integer or NULL for failure */
+
+        /* Initialise the STORE with private data */
+        STORE_INITIALISE_FUNC_PTR init;
+        /* Initialise the STORE with private data */
+        STORE_CLEANUP_FUNC_PTR clean;
+        /* Generate an object of a given type */
+        STORE_GENERATE_OBJECT_FUNC_PTR generate_object;
+        /* Get an object of a given type.  This function isn't really very
+           useful since the listing functions (below) can be used for the
+           same purpose and are much more general. */
+        STORE_GET_OBJECT_FUNC_PTR get_object;
+        /* Store an object of a given type. */
+        STORE_STORE_OBJECT_FUNC_PTR store_object;
+        /* Modify the attributes bound to an object of a given type. */
+        STORE_MODIFY_OBJECT_FUNC_PTR modify_object;
+        /* Revoke an object of a given type. */
+        STORE_HANDLE_OBJECT_FUNC_PTR revoke_object;
+        /* Delete an object of a given type. */
+        STORE_HANDLE_OBJECT_FUNC_PTR delete_object;
+        /* List a bunch of objects of a given type and with the associated
+           attributes. */
+        STORE_START_OBJECT_FUNC_PTR list_object_start;
+        STORE_NEXT_OBJECT_FUNC_PTR list_object_next;
+        STORE_END_OBJECT_FUNC_PTR list_object_end;
+        STORE_END_OBJECT_FUNC_PTR list_object_endp;
+        /* Store-level function to make any necessary update operations. */
+        STORE_GENERIC_FUNC_PTR update_store;
+        /* Store-level function to get exclusive access to the store. */
+        STORE_GENERIC_FUNC_PTR lock_store;
+        /* Store-level function to release exclusive access to the store. */
+        STORE_GENERIC_FUNC_PTR unlock_store;
+
+        /* Generic control function */
+        STORE_CTRL_FUNC_PTR ctrl;
+        };
+
+struct store_st
+        {
+        const STORE_METHOD *meth;
+        /* functional reference if 'meth' is ENGINE-provided */
+        ENGINE *engine;
+
+        CRYPTO_EX_DATA ex_data;
+        int references;
+        };
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/lib/libssl/src/crypto/store/str_mem.c b/src/lib/libssl/src/crypto/store/str_mem.c
new file mode 100644
index 0000000000..527757ae09
--- /dev/null
+++ b/src/lib/libssl/src/crypto/store/str_mem.c
@@ -0,0 +1,357 @@
+/* crypto/store/str_mem.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include <openssl/err.h>
+#include "str_locl.h"
+
+/* The memory store is currently highly experimental.  It's meant to become
+   a base store used by other stores for internal caching (for full caching
+   support, aging needs to be added).
+
+   The database use is meant to support as much attribute association as
+   possible, while providing for as small search ranges as possible.
+   This is currently provided for by sorting the entries by numbers that
+   are composed of bits set at the positions indicated by attribute type
+   codes.  This provides for ranges determined by the highest attribute
+   type code value.  A better idea might be to sort by values computed
+   from the range of attributes associated with the object (basically,
+   the difference between the highest and lowest attribute type code)
+   and it's distance from a base (basically, the lowest associated
+   attribute type code).
+*/
+
+struct mem_object_data_st
+        {
+        STORE_OBJECT *object;
+        STORE_ATTR_INFO *attr_info;
+        int references;
+        };
+
+struct mem_data_st
+        {
+        STACK *data;            /* A stack of mem_object_data_st,
+                                   sorted with STORE_ATTR_INFO_compare(). */
+        unsigned int compute_components : 1; /* Currently unused, but can
+                                                be used to add attributes
+                                                from parts of the data. */
+        };
+
+struct mem_ctx_st
+        {
+        int type;               /* The type we're searching for */
+        STACK *search_attributes; /* Sets of attributes to search for.
+                                     Each element is a STORE_ATTR_INFO. */
+        int search_index;       /* which of the search attributes we found a match
+                                   for, -1 when we still haven't found any */
+        int index;              /* -1 as long as we're searching for the first */
+        };
+
+static int mem_init(STORE *s);
+static void mem_clean(STORE *s);
+static STORE_OBJECT *mem_generate(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+static STORE_OBJECT *mem_get(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+static int mem_store(STORE *s, STORE_OBJECT_TYPES type,
+        STORE_OBJECT *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+static int mem_modify(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM search_attributes[], OPENSSL_ITEM add_attributes[],
+        OPENSSL_ITEM modify_attributes[], OPENSSL_ITEM delete_attributes[],
+        OPENSSL_ITEM parameters[]);
+static int mem_delete(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+static void *mem_list_start(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[]);
+static STORE_OBJECT *mem_list_next(STORE *s, void *handle);
+static int mem_list_end(STORE *s, void *handle);
+static int mem_list_endp(STORE *s, void *handle);
+static int mem_lock(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+static int mem_unlock(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[]);
+static int mem_ctrl(STORE *s, int cmd, long l, void *p, void (*f)(void));
+
+static STORE_METHOD store_memory =
+        {
+        "OpenSSL memory store interface",
+        mem_init,
+        mem_clean,
+        mem_generate,
+        mem_get,
+        mem_store,
+        mem_modify,
+        NULL, /* revoke */
+        mem_delete,
+        mem_list_start,
+        mem_list_next,
+        mem_list_end,
+        mem_list_endp,
+        NULL, /* update */
+        mem_lock,
+        mem_unlock,
+        mem_ctrl
+        };
+
+const STORE_METHOD *STORE_Memory(void)
+        {
+        return &store_memory;
+        }
+
+static int mem_init(STORE *s)
+        {
+        return 1;
+        }
+
+static void mem_clean(STORE *s)
+        {
+        return;
+        }
+
+static STORE_OBJECT *mem_generate(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[])
+        {
+        STOREerr(STORE_F_MEM_GENERATE, STORE_R_NOT_IMPLEMENTED);
+        return 0;
+        }
+static STORE_OBJECT *mem_get(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[])
+        {
+        void *context = mem_list_start(s, type, attributes, parameters);
+        
+        if (context)
+                {
+                STORE_OBJECT *object = mem_list_next(s, context);
+
+                if (mem_list_end(s, context))
+                        return object;
+                }
+        return NULL;
+        }
+static int mem_store(STORE *s, STORE_OBJECT_TYPES type,
+        STORE_OBJECT *data, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STOREerr(STORE_F_MEM_STORE, STORE_R_NOT_IMPLEMENTED);
+        return 0;
+        }
+static int mem_modify(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM search_attributes[], OPENSSL_ITEM add_attributes[],
+        OPENSSL_ITEM modify_attributes[], OPENSSL_ITEM delete_attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        STOREerr(STORE_F_MEM_MODIFY, STORE_R_NOT_IMPLEMENTED);
+        return 0;
+        }
+static int mem_delete(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[])
+        {
+        STOREerr(STORE_F_MEM_DELETE, STORE_R_NOT_IMPLEMENTED);
+        return 0;
+        }
+
+/* The list functions may be the hardest to understand.  Basically,
+   mem_list_start compiles a stack of attribute info elements, and
+   puts that stack into the context to be returned.  mem_list_next
+   will then find the first matching element in the store, and then
+   walk all the way to the end of the store (since any combination
+   of attribute bits above the starting point may match the searched
+   for bit pattern...). */
+static void *mem_list_start(STORE *s, STORE_OBJECT_TYPES type,
+        OPENSSL_ITEM attributes[], OPENSSL_ITEM parameters[])
+        {
+        struct mem_ctx_st *context =
+                (struct mem_ctx_st *)OPENSSL_malloc(sizeof(struct mem_ctx_st));
+        void *attribute_context = NULL;
+        STORE_ATTR_INFO *attrs = NULL;
+
+        if (!context)
+                {
+                STOREerr(STORE_F_MEM_LIST_START, ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        memset(context, 0, sizeof(struct mem_ctx_st));
+
+        attribute_context = STORE_parse_attrs_start(attributes);
+        if (!attribute_context)
+                {
+                STOREerr(STORE_F_MEM_LIST_START, ERR_R_STORE_LIB);
+                goto err;
+                }
+
+        while((attrs = STORE_parse_attrs_next(attribute_context)))
+                {
+                if (context->search_attributes == NULL)
+                        {
+                        context->search_attributes =
+                                sk_new((int (*)(const char * const *, const char * const *))STORE_ATTR_INFO_compare);
+                        if (!context->search_attributes)
+                                {
+                                STOREerr(STORE_F_MEM_LIST_START,
+                                        ERR_R_MALLOC_FAILURE);
+                                goto err;
+                                }
+                        }
+                sk_push(context->search_attributes,(char *)attrs);
+                }
+        if (!STORE_parse_attrs_endp(attribute_context))
+                goto err;
+        STORE_parse_attrs_end(attribute_context);
+        context->search_index = -1;
+        context->index = -1;
+        return context;
+ err:
+        if (attribute_context) STORE_parse_attrs_end(attribute_context);
+        mem_list_end(s, context);
+        return NULL;
+        }
+static STORE_OBJECT *mem_list_next(STORE *s, void *handle)
+        {
+        int i;
+        struct mem_ctx_st *context = (struct mem_ctx_st *)handle;
+        struct mem_object_data_st key = { 0, 0, 1 };
+        struct mem_data_st *store =
+                (struct mem_data_st *)STORE_get_ex_data(s, 1);
+        int srch;
+        int cres = 0;
+
+        if (!context)
+                {
+                STOREerr(STORE_F_MEM_LIST_NEXT, ERR_R_PASSED_NULL_PARAMETER);
+                return NULL;
+                }
+        if (!store)
+                {
+                STOREerr(STORE_F_MEM_LIST_NEXT, STORE_R_NO_STORE);
+                return NULL;
+                }
+
+        if (context->search_index == -1)
+                {
+                for (i = 0; i < sk_num(context->search_attributes); i++)
+                        {
+                        key.attr_info =
+                                (STORE_ATTR_INFO *)sk_value(context->search_attributes, i);
+                        srch = sk_find_ex(store->data, (char *)&key);
+
+                        if (srch >= 0)
+                                {
+                                context->search_index = srch;
+                                break;
+                                }
+                        }
+                }
+        if (context->search_index < 0)
+                return NULL;
+        
+        key.attr_info =
+                (STORE_ATTR_INFO *)sk_value(context->search_attributes,
+                        context->search_index);
+        for(srch = context->search_index;
+            srch < sk_num(store->data)
+                    && STORE_ATTR_INFO_in_range(key.attr_info,
+                            (STORE_ATTR_INFO *)sk_value(store->data, srch))
+                    && !(cres = STORE_ATTR_INFO_in_ex(key.attr_info,
+                                 (STORE_ATTR_INFO *)sk_value(store->data, srch)));
+            srch++)
+                ;
+
+        context->search_index = srch;
+        if (cres)
+                return ((struct mem_object_data_st *)sk_value(store->data,
+                                srch))->object;
+        return NULL;
+        }
+static int mem_list_end(STORE *s, void *handle)
+        {
+        struct mem_ctx_st *context = (struct mem_ctx_st *)handle;
+
+        if (!context)
+                {
+                STOREerr(STORE_F_MEM_LIST_END, ERR_R_PASSED_NULL_PARAMETER);
+                return 0;
+                }
+        if (context && context->search_attributes)
+                sk_free(context->search_attributes);
+        if (context) OPENSSL_free(context);
+        return 1;
+        }
+static int mem_list_endp(STORE *s, void *handle)
+        {
+        struct mem_ctx_st *context = (struct mem_ctx_st *)handle;
+
+        if (!context
+                || context->search_index == sk_num(context->search_attributes))
+                return 1;
+        return 0;
+        }
+static int mem_lock(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        return 1;
+        }
+static int mem_unlock(STORE *s, OPENSSL_ITEM attributes[],
+        OPENSSL_ITEM parameters[])
+        {
+        return 1;
+        }
+static int mem_ctrl(STORE *s, int cmd, long l, void *p, void (*f)(void))
+        {
+        return 1;
+        }
diff --git a/src/lib/libssl/src/crypto/store/str_meth.c b/src/lib/libssl/src/crypto/store/str_meth.c
new file mode 100644
index 0000000000..a46de03a26
--- /dev/null
+++ b/src/lib/libssl/src/crypto/store/str_meth.c
@@ -0,0 +1,250 @@
+/* crypto/store/str_meth.c -*- mode:C; c-file-style: "eay" -*- */
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <string.h>
+#include <openssl/buffer.h>
+#include "str_locl.h"
+
+STORE_METHOD *STORE_create_method(char *name)
+        {
+        STORE_METHOD *store_method = (STORE_METHOD *)OPENSSL_malloc(sizeof(STORE_METHOD));
+
+        if (store_method)
+                {
+                memset(store_method, 0, sizeof(*store_method));
+                store_method->name = BUF_strdup(name);
+                }
+        return store_method;
+        }
+
+/* BIG FSCKING WARNING!!!!  If you use this on a statically allocated method
+   (that is, it hasn't been allocated using STORE_create_method(), you deserve
+   anything Murphy can throw at you and more!  You have been warned. */
+void STORE_destroy_method(STORE_METHOD *store_method)
+        {
+        if (!store_method) return;
+        OPENSSL_free(store_method->name);
+        store_method->name = NULL;
+        OPENSSL_free(store_method);
+        }
+
+int STORE_method_set_initialise_function(STORE_METHOD *sm, STORE_INITIALISE_FUNC_PTR init_f)
+        {
+        sm->init = init_f;
+        return 1;
+        }
+
+int STORE_method_set_cleanup_function(STORE_METHOD *sm, STORE_CLEANUP_FUNC_PTR clean_f)
+        {
+        sm->clean = clean_f;
+        return 1;
+        }
+
+int STORE_method_set_generate_function(STORE_METHOD *sm, STORE_GENERATE_OBJECT_FUNC_PTR generate_f)
+        {
+        sm->generate_object = generate_f;
+        return 1;
+        }
+
+int STORE_method_set_get_function(STORE_METHOD *sm, STORE_GET_OBJECT_FUNC_PTR get_f)
+        {
+        sm->get_object = get_f;
+        return 1;
+        }
+
+int STORE_method_set_store_function(STORE_METHOD *sm, STORE_STORE_OBJECT_FUNC_PTR store_f)
+        {
+        sm->store_object = store_f;
+        return 1;
+        }
+
+int STORE_method_set_modify_function(STORE_METHOD *sm, STORE_MODIFY_OBJECT_FUNC_PTR modify_f)
+        {
+        sm->modify_object = modify_f;
+        return 1;
+        }
+
+int STORE_method_set_revoke_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR revoke_f)
+        {
+        sm->revoke_object = revoke_f;
+        return 1;
+        }
+
+int STORE_method_set_delete_function(STORE_METHOD *sm, STORE_HANDLE_OBJECT_FUNC_PTR delete_f)
+        {
+        sm->delete_object = delete_f;
+        return 1;
+        }
+
+int STORE_method_set_list_start_function(STORE_METHOD *sm, STORE_START_OBJECT_FUNC_PTR list_start_f)
+        {
+        sm->list_object_start = list_start_f;
+        return 1;
+        }
+
+int STORE_method_set_list_next_function(STORE_METHOD *sm, STORE_NEXT_OBJECT_FUNC_PTR list_next_f)
+        {
+        sm->list_object_next = list_next_f;
+        return 1;
+        }
+
+int STORE_method_set_list_end_function(STORE_METHOD *sm, STORE_END_OBJECT_FUNC_PTR list_end_f)
+        {
+        sm->list_object_end = list_end_f;
+        return 1;
+        }
+
+int STORE_method_set_update_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR update_f)
+        {
+        sm->update_store = update_f;
+        return 1;
+        }
+
+int STORE_method_set_lock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR lock_f)
+        {
+        sm->lock_store = lock_f;
+        return 1;
+        }
+
+int STORE_method_set_unlock_store_function(STORE_METHOD *sm, STORE_GENERIC_FUNC_PTR unlock_f)
+        {
+        sm->unlock_store = unlock_f;
+        return 1;
+        }
+
+int STORE_method_set_ctrl_function(STORE_METHOD *sm, STORE_CTRL_FUNC_PTR ctrl_f)
+        {
+        sm->ctrl = ctrl_f;
+        return 1;
+        }
+
+STORE_INITIALISE_FUNC_PTR STORE_method_get_initialise_function(STORE_METHOD *sm)
+        {
+        return sm->init;
+        }
+
+STORE_CLEANUP_FUNC_PTR STORE_method_get_cleanup_function(STORE_METHOD *sm)
+        {
+        return sm->clean;
+        }
+
+STORE_GENERATE_OBJECT_FUNC_PTR STORE_method_get_generate_function(STORE_METHOD *sm)
+        {
+        return sm->generate_object;
+        }
+
+STORE_GET_OBJECT_FUNC_PTR STORE_method_get_get_function(STORE_METHOD *sm)
+        {
+        return sm->get_object;
+        }
+
+STORE_STORE_OBJECT_FUNC_PTR STORE_method_get_store_function(STORE_METHOD *sm)
+        {
+        return sm->store_object;
+        }
+
+STORE_MODIFY_OBJECT_FUNC_PTR STORE_method_get_modify_function(STORE_METHOD *sm)
+        {
+        return sm->modify_object;
+        }
+
+STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_revoke_function(STORE_METHOD *sm)
+        {
+        return sm->revoke_object;
+        }
+
+STORE_HANDLE_OBJECT_FUNC_PTR STORE_method_get_delete_function(STORE_METHOD *sm)
+        {
+        return sm->delete_object;
+        }
+
+STORE_START_OBJECT_FUNC_PTR STORE_method_get_list_start_function(STORE_METHOD *sm)
+        {
+        return sm->list_object_start;
+        }
+
+STORE_NEXT_OBJECT_FUNC_PTR STORE_method_get_list_next_function(STORE_METHOD *sm)
+        {
+        return sm->list_object_next;
+        }
+
+STORE_END_OBJECT_FUNC_PTR STORE_method_get_list_end_function(STORE_METHOD *sm)
+        {
+        return sm->list_object_end;
+        }
+
+STORE_GENERIC_FUNC_PTR STORE_method_get_update_store_function(STORE_METHOD *sm)
+        {
+        return sm->update_store;
+        }
+
+STORE_GENERIC_FUNC_PTR STORE_method_get_lock_store_function(STORE_METHOD *sm)
+        {
+        return sm->lock_store;
+        }
+
+STORE_GENERIC_FUNC_PTR STORE_method_get_unlock_store_function(STORE_METHOD *sm)
+        {
+        return sm->unlock_store;
+        }
+
+STORE_CTRL_FUNC_PTR STORE_method_get_ctrl_function(STORE_METHOD *sm)
+        {
+        return sm->ctrl;
+        }
+
diff --git a/src/lib/libssl/src/crypto/threads/netware.bat b/src/lib/libssl/src/crypto/threads/netware.bat
new file mode 100644
index 0000000000..0b3eca3caf
--- /dev/null
+++ b/src/lib/libssl/src/crypto/threads/netware.bat
@@ -0,0 +1,79 @@
+@echo off
+rem batch file to build multi-thread test ( mttest.nlm )
+
+rem command line arguments:
+rem      debug => build using debug settings
+
+rem
+rem After building, copy mttest.nlm to the server and run it, you'll probably
+rem want to redirect stdout and stderr.  An example command line would be
+rem "mttest.nlm -thread 20 -loops 10 -CAfile \openssl\apps\server.pem >mttest.out 2>mttest.err"
+rem 
+
+del mttest.nlm
+
+set BLD_DEBUG=
+set CFLAGS=
+set LFLAGS=
+set LIBS=
+
+if "%1" == "DEBUG" set BLD_DEBUG=YES
+if "%1" == "debug" set BLD_DEBUG=YES
+
+if "%MWCIncludes%" == "" goto inc_error
+if "%PRELUDE%" == "" goto prelude_error
+if "%IMPORTS%" == "" goto imports_error
+
+set CFLAGS=-c -I..\..\outinc_nw -nosyspath -DOPENSSL_SYS_NETWARE -opt off -g -sym internal -maxerrors 20
+
+if "%BLD_DEBUG%" == "YES" set LIBS=..\..\out_nw.dbg\ssl.lib ..\..\out_nw.dbg\crypto.lib
+if "%BLD_DEBUG%" == ""  set LIBS=..\..\out_nw\ssl.lib ..\..\out_nw\crypto.lib
+
+set LFLAGS=-msgstyle gcc -zerobss -stacksize 32768 -nostdlib -sym internal 
+  
+rem generate command file for metrowerks
+echo.
+echo Generating Metrowerks command file: mttest.def
+echo # dynamically generated command file for metrowerks build > mttest.def
+echo IMPORT @%IMPORTS%\clib.imp              >> mttest.def 
+echo IMPORT @%IMPORTS%\threads.imp           >> mttest.def 
+echo IMPORT @%IMPORTS%\ws2nlm.imp            >> mttest.def 
+echo IMPORT GetProcessSwitchCount            >> mttest.def
+echo MODULE clib                             >> mttest.def 
+
+rem compile
+echo.
+echo Compiling mttest.c
+mwccnlm.exe mttest.c %CFLAGS% 
+if errorlevel 1 goto end
+
+rem link               
+echo.
+echo Linking mttest.nlm
+mwldnlm.exe %LFLAGS% -screenname mttest -commandfile mttest.def mttest.o "%PRELUDE%" %LIBS% -o mttest.nlm
+if errorlevel 1 goto end
+
+goto end
+
+:inc_error
+echo.
+echo Environment variable MWCIncludes is not set - see install.nw
+goto end
+
+:prelude_error
+echo.
+echo Environment variable PRELUDE is not set - see install.nw
+goto end
+
+:imports_error
+echo.
+echo Environment variable IMPORTS is not set - see install.nw
+goto end
+    
+    
+:end
+set BLD_DEBUG=
+set CFLAGS=
+set LFLAGS=
+set LIBS=
+
diff --git a/src/lib/libssl/src/crypto/x509/x509_vpm.c b/src/lib/libssl/src/crypto/x509/x509_vpm.c
new file mode 100644
index 0000000000..e9db6d62a7
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509/x509_vpm.c
@@ -0,0 +1,420 @@
+/* x509_vpm.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+
+#include "cryptlib.h"
+#include <openssl/crypto.h>
+#include <openssl/lhash.h>
+#include <openssl/buffer.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+/* X509_VERIFY_PARAM functions */
+
+static void x509_verify_param_zero(X509_VERIFY_PARAM *param)
+        {
+        if (!param)
+                return;
+        param->name = NULL;
+        param->purpose = 0;
+        param->trust = 0;
+        param->inh_flags = X509_VP_FLAG_DEFAULT;
+        param->flags = 0;
+        param->depth = -1;
+        if (param->policies)
+                {
+                sk_ASN1_OBJECT_pop_free(param->policies, ASN1_OBJECT_free);
+                param->policies = NULL;
+                }
+        }
+
+X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void)
+        {
+        X509_VERIFY_PARAM *param;
+        param = OPENSSL_malloc(sizeof(X509_VERIFY_PARAM));
+        memset(param, 0, sizeof(X509_VERIFY_PARAM));
+        x509_verify_param_zero(param);
+        return param;
+        }
+
+void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param)
+        {
+        x509_verify_param_zero(param);
+        OPENSSL_free(param);
+        }
+
+/* This function determines how parameters are "inherited" from one structure
+ * to another. There are several different ways this can happen.
+ *
+ * 1. If a child structure needs to have its values initialized from a parent
+ *    they are simply copied across. For example SSL_CTX copied to SSL.
+ * 2. If the structure should take on values only if they are currently unset.
+ *    For example the values in an SSL structure will take appropriate value
+ *    for SSL servers or clients but only if the application has not set new
+ *    ones.
+ *
+ * The "inh_flags" field determines how this function behaves. 
+ *
+ * Normally any values which are set in the default are not copied from the
+ * destination and verify flags are ORed together.
+ *
+ * If X509_VP_FLAG_DEFAULT is set then anything set in the source is copied
+ * to the destination. Effectively the values in "to" become default values
+ * which will be used only if nothing new is set in "from".
+ *
+ * If X509_VP_FLAG_OVERWRITE is set then all value are copied across whether
+ * they are set or not. Flags is still Ored though.
+ *
+ * If X509_VP_FLAG_RESET_FLAGS is set then the flags value is copied instead
+ * of ORed.
+ *
+ * If X509_VP_FLAG_LOCKED is set then no values are copied.
+ *
+ * If X509_VP_FLAG_ONCE is set then the current inh_flags setting is zeroed
+ * after the next call.
+ */
+
+/* Macro to test if a field should be copied from src to dest */
+
+#define test_x509_verify_param_copy(field, def) \
+        (to_overwrite || \
+                ((src->field != def) && (to_default || (dest->field == def))))
+
+/* Macro to test and copy a field if necessary */
+
+#define x509_verify_param_copy(field, def) \
+        if (test_x509_verify_param_copy(field, def)) \
+                dest->field = src->field
+                
+
+int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest,
+                                                const X509_VERIFY_PARAM *src)
+        {
+        unsigned long inh_flags;
+        int to_default, to_overwrite;
+        if (!src)
+                return 1;
+        inh_flags = dest->inh_flags | src->inh_flags;
+
+        if (inh_flags & X509_VP_FLAG_ONCE)
+                dest->inh_flags = 0;
+
+        if (inh_flags & X509_VP_FLAG_LOCKED)
+                return 1;
+
+        if (inh_flags & X509_VP_FLAG_DEFAULT)
+                to_default = 1;
+        else
+                to_default = 0;
+
+        if (inh_flags & X509_VP_FLAG_OVERWRITE)
+                to_overwrite = 1;
+        else
+                to_overwrite = 0;
+
+        x509_verify_param_copy(purpose, 0);
+        x509_verify_param_copy(trust, 0);
+        x509_verify_param_copy(depth, -1);
+
+        /* If overwrite or check time not set, copy across */
+
+        if (to_overwrite || !(dest->flags & X509_V_FLAG_USE_CHECK_TIME))
+                {
+                dest->check_time = src->check_time;
+                dest->flags &= ~X509_V_FLAG_USE_CHECK_TIME;
+                /* Don't need to copy flag: that is done below */
+                }
+
+        if (inh_flags & X509_VP_FLAG_RESET_FLAGS)
+                dest->flags = 0;
+
+        dest->flags |= src->flags;
+
+        if (test_x509_verify_param_copy(policies, NULL))
+                {
+                if (!X509_VERIFY_PARAM_set1_policies(dest, src->policies))
+                        return 0;
+                }
+
+        return 1;
+        }
+
+int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
+                                                const X509_VERIFY_PARAM *from)
+        {
+        to->inh_flags |= X509_VP_FLAG_DEFAULT;
+        return X509_VERIFY_PARAM_inherit(to, from);
+        }
+
+int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name)
+        {
+        if (param->name)
+                OPENSSL_free(param->name);
+        param->name = BUF_strdup(name);
+        if (param->name)
+                return 1;
+        return 0;
+        }
+
+int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param, unsigned long flags)
+        {
+        param->flags |= flags;
+        if (flags & X509_V_FLAG_POLICY_MASK)
+                param->flags |= X509_V_FLAG_POLICY_CHECK;
+        return 1;
+        }
+
+int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param, unsigned long flags)
+        {
+        param->flags &= ~flags;
+        return 1;
+        }
+
+unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param)
+        {
+        return param->flags;
+        }
+
+int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose)
+        {
+        return X509_PURPOSE_set(&param->purpose, purpose);
+        }
+
+int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust)
+        {
+        return X509_TRUST_set(&param->trust, trust);
+        }
+
+void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth)
+        {
+        param->depth = depth;
+        }
+
+void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t)
+        {
+        param->check_time = t;
+        param->flags |= X509_V_FLAG_USE_CHECK_TIME;
+        }
+
+int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, ASN1_OBJECT *policy)
+        {
+        if (!param->policies)
+                {
+                param->policies = sk_ASN1_OBJECT_new_null();
+                if (!param->policies)
+                        return 0;
+                }
+        if (!sk_ASN1_OBJECT_push(param->policies, policy))
+                return 0;
+        return 1;
+        }
+
+int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, 
+                                        STACK_OF(ASN1_OBJECT) *policies)
+        {
+        int i;
+        ASN1_OBJECT *oid, *doid;
+        if (!param)
+                return 0;
+        if (param->policies)
+                sk_ASN1_OBJECT_pop_free(param->policies, ASN1_OBJECT_free);
+
+        if (!policies)
+                {
+                param->policies = NULL;
+                return 1;
+                }
+
+        param->policies = sk_ASN1_OBJECT_new_null();
+        if (!param->policies)
+                return 0;
+
+        for (i = 0; i < sk_ASN1_OBJECT_num(policies); i++)
+                {
+                oid = sk_ASN1_OBJECT_value(policies, i);
+                doid = OBJ_dup(oid);
+                if (!doid)
+                        return 0;
+                if (!sk_ASN1_OBJECT_push(param->policies, doid))
+                        {
+                        ASN1_OBJECT_free(doid);
+                        return 0;
+                        }
+                }
+        param->flags |= X509_V_FLAG_POLICY_CHECK;
+        return 1;
+        }
+
+int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param)
+        {
+        return param->depth;
+        }
+
+/* Default verify parameters: these are used for various
+ * applications and can be overridden by the user specified table.
+ * NB: the 'name' field *must* be in alphabetical order because it
+ * will be searched using OBJ_search.
+ */
+
+static const X509_VERIFY_PARAM default_table[] = {
+        {
+        "default",      /* X509 default parameters */
+        0,              /* Check time */
+        0,              /* internal flags */
+        0,              /* flags */
+        0,              /* purpose */
+        0,              /* trust */
+        9,              /* depth */
+        NULL            /* policies */
+        },
+        {
+        "pkcs7",                        /* SSL/TLS client parameters */
+        0,                              /* Check time */
+        0,                              /* internal flags */
+        0,                              /* flags */
+        X509_PURPOSE_SMIME_SIGN,        /* purpose */
+        X509_TRUST_EMAIL,               /* trust */
+        -1,                             /* depth */
+        NULL                            /* policies */
+        },
+        {
+        "ssl_client",                   /* SSL/TLS client parameters */
+        0,                              /* Check time */
+        0,                              /* internal flags */
+        0,                              /* flags */
+        X509_PURPOSE_SSL_CLIENT,        /* purpose */
+        X509_TRUST_SSL_CLIENT,          /* trust */
+        -1,                             /* depth */
+        NULL                            /* policies */
+        },
+        {
+        "ssl_server",                   /* SSL/TLS server parameters */
+        0,                              /* Check time */
+        0,                              /* internal flags */
+        0,                              /* flags */
+        X509_PURPOSE_SSL_SERVER,        /* purpose */
+        X509_TRUST_SSL_SERVER,          /* trust */
+        -1,                             /* depth */
+        NULL                            /* policies */
+        }};
+
+static STACK_OF(X509_VERIFY_PARAM) *param_table = NULL;
+
+static int table_cmp(const void *pa, const void *pb)
+        {
+        const X509_VERIFY_PARAM *a = pa, *b = pb;
+        return strcmp(a->name, b->name);
+        }
+
+static int param_cmp(const X509_VERIFY_PARAM * const *a,
+                        const X509_VERIFY_PARAM * const *b)
+        {
+        return strcmp((*a)->name, (*b)->name);
+        }
+
+int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param)
+        {
+        int idx;
+        X509_VERIFY_PARAM *ptmp;
+        if (!param_table)
+                {
+                param_table = sk_X509_VERIFY_PARAM_new(param_cmp);
+                if (!param_table)
+                        return 0;
+                }
+        else
+                {
+                idx = sk_X509_VERIFY_PARAM_find(param_table, param);
+                if (idx != -1)
+                        {
+                        ptmp = sk_X509_VERIFY_PARAM_value(param_table, idx);
+                        X509_VERIFY_PARAM_free(ptmp);
+                        (void)sk_X509_VERIFY_PARAM_delete(param_table, idx);
+                        }
+                }
+        if (!sk_X509_VERIFY_PARAM_push(param_table, param))
+                return 0;
+        return 1;
+        }
+
+const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name)
+        {
+        int idx;
+        X509_VERIFY_PARAM pm;
+        pm.name = (char *)name;
+        if (param_table)
+                {
+                idx = sk_X509_VERIFY_PARAM_find(param_table, &pm);
+                if (idx != -1)
+                        return sk_X509_VERIFY_PARAM_value(param_table, idx);
+                }
+        return (const X509_VERIFY_PARAM *) OBJ_bsearch((char *)&pm,
+                                (char *)&default_table,
+                                sizeof(default_table)/sizeof(X509_VERIFY_PARAM),
+                                sizeof(X509_VERIFY_PARAM),
+                                table_cmp);
+        }
+
+void X509_VERIFY_PARAM_table_cleanup(void)
+        {
+        if (param_table)
+                sk_X509_VERIFY_PARAM_pop_free(param_table,
+                                                X509_VERIFY_PARAM_free);
+        param_table = NULL;
+        }
diff --git a/src/lib/libssl/src/crypto/x509v3/pcy_cache.c b/src/lib/libssl/src/crypto/x509v3/pcy_cache.c
new file mode 100644
index 0000000000..c18beb89f5
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/pcy_cache.c
@@ -0,0 +1,287 @@
+/* pcy_cache.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+#include "pcy_int.h"
+
+static int policy_data_cmp(const X509_POLICY_DATA * const *a,
+                                const X509_POLICY_DATA * const *b);
+static int policy_cache_set_int(long *out, ASN1_INTEGER *value);
+
+/* Set cache entry according to CertificatePolicies extension.
+ * Note: this destroys the passed CERTIFICATEPOLICIES structure.
+ */
+
+static int policy_cache_create(X509 *x,
+                        CERTIFICATEPOLICIES *policies, int crit)
+        {
+        int i;
+        int ret = 0;
+        X509_POLICY_CACHE *cache = x->policy_cache;
+        X509_POLICY_DATA *data = NULL;
+        POLICYINFO *policy;
+        if (sk_POLICYINFO_num(policies) == 0)
+                goto bad_policy;
+        cache->data = sk_X509_POLICY_DATA_new(policy_data_cmp);
+        if (!cache->data)
+                goto bad_policy;
+        for (i = 0; i < sk_POLICYINFO_num(policies); i++)
+                {
+                policy = sk_POLICYINFO_value(policies, i);
+                data = policy_data_new(policy, NULL, crit);
+                if (!data)
+                        goto bad_policy;
+                /* Duplicate policy OIDs are illegal: reject if matches
+                 * found.
+                 */
+                if (OBJ_obj2nid(data->valid_policy) == NID_any_policy)
+                        {
+                        if (cache->anyPolicy)
+                                {
+                                ret = -1;
+                                goto bad_policy;
+                                }
+                        cache->anyPolicy = data;
+                        }
+                else if (sk_X509_POLICY_DATA_find(cache->data, data) != -1)
+                        {
+                        ret = -1;
+                        goto bad_policy;
+                        }
+                else if (!sk_X509_POLICY_DATA_push(cache->data, data))
+                        goto bad_policy;
+                data = NULL;
+                }
+        ret = 1;
+        bad_policy:
+        if (ret == -1)
+                x->ex_flags |= EXFLAG_INVALID_POLICY;
+        if (data)
+                policy_data_free(data);
+        sk_POLICYINFO_pop_free(policies, POLICYINFO_free);
+        if (ret <= 0)
+                {
+                sk_X509_POLICY_DATA_pop_free(cache->data, policy_data_free);
+                cache->data = NULL;
+                }
+        return ret;
+        }
+
+        
+static int policy_cache_new(X509 *x)
+        {
+        X509_POLICY_CACHE *cache;
+        ASN1_INTEGER *ext_any = NULL;
+        POLICY_CONSTRAINTS *ext_pcons = NULL;
+        CERTIFICATEPOLICIES *ext_cpols = NULL;
+        POLICY_MAPPINGS *ext_pmaps = NULL;
+        int i;
+        cache = OPENSSL_malloc(sizeof(X509_POLICY_CACHE));
+        if (!cache)
+                return 0;
+        cache->anyPolicy = NULL;
+        cache->data = NULL;
+        cache->maps = NULL;
+        cache->any_skip = -1;
+        cache->explicit_skip = -1;
+        cache->map_skip = -1;
+
+        x->policy_cache = cache;
+
+        /* Handle requireExplicitPolicy *first*. Need to process this
+         * even if we don't have any policies.
+         */
+        ext_pcons = X509_get_ext_d2i(x, NID_policy_constraints, &i, NULL);
+
+        if (!ext_pcons)
+                {
+                if (i != -1)
+                        goto bad_cache;
+                }
+        else
+                {
+                if (!ext_pcons->requireExplicitPolicy
+                        && !ext_pcons->inhibitPolicyMapping)
+                        goto bad_cache;
+                if (!policy_cache_set_int(&cache->explicit_skip,
+                        ext_pcons->requireExplicitPolicy))
+                        goto bad_cache;
+                if (!policy_cache_set_int(&cache->map_skip,
+                        ext_pcons->inhibitPolicyMapping))
+                        goto bad_cache;
+                }
+
+        /* Process CertificatePolicies */
+
+        ext_cpols = X509_get_ext_d2i(x, NID_certificate_policies, &i, NULL);
+        /* If no CertificatePolicies extension or problem decoding then
+         * there is no point continuing because the valid policies will be
+         * NULL.
+         */
+        if (!ext_cpols)
+                {
+                /* If not absent some problem with extension */
+                if (i != -1)
+                        goto bad_cache;
+                return 1;
+                }
+
+        i = policy_cache_create(x, ext_cpols, i);
+
+        /* NB: ext_cpols freed by policy_cache_set_policies */
+
+        if (i <= 0)
+                return i;
+
+        ext_pmaps = X509_get_ext_d2i(x, NID_policy_mappings, &i, NULL);
+
+        if (!ext_pmaps)
+                {
+                /* If not absent some problem with extension */
+                if (i != -1)
+                        goto bad_cache;
+                }
+        else
+                {
+                i = policy_cache_set_mapping(x, ext_pmaps);
+                if (i <= 0)
+                        goto bad_cache;
+                }
+
+        ext_any = X509_get_ext_d2i(x, NID_inhibit_any_policy, &i, NULL);
+
+        if (!ext_any)
+                {
+                if (i != -1)
+                        goto bad_cache;
+                }
+        else if (!policy_cache_set_int(&cache->any_skip, ext_any))
+                        goto bad_cache;
+
+        if (0)
+                {
+                bad_cache:
+                x->ex_flags |= EXFLAG_INVALID_POLICY;
+                }
+
+        if(ext_pcons)
+                POLICY_CONSTRAINTS_free(ext_pcons);
+
+        if (ext_any)
+                ASN1_INTEGER_free(ext_any);
+
+        return 1;
+
+        
+}
+
+void policy_cache_free(X509_POLICY_CACHE *cache)
+        {
+        if (!cache)
+                return;
+        if (cache->anyPolicy)
+                policy_data_free(cache->anyPolicy);
+        if (cache->data)
+                sk_X509_POLICY_DATA_pop_free(cache->data, policy_data_free);
+        OPENSSL_free(cache);
+        }
+
+const X509_POLICY_CACHE *policy_cache_set(X509 *x)
+        {
+
+        if (x->policy_cache == NULL)
+                {
+                CRYPTO_w_lock(CRYPTO_LOCK_X509);
+                        policy_cache_new(x);
+                CRYPTO_w_unlock(CRYPTO_LOCK_X509);
+                }
+
+        return x->policy_cache;
+
+        }
+
+X509_POLICY_DATA *policy_cache_find_data(const X509_POLICY_CACHE *cache,
+                                                const ASN1_OBJECT *id)
+        {
+        int idx;
+        X509_POLICY_DATA tmp;
+        tmp.valid_policy = (ASN1_OBJECT *)id;
+        idx = sk_X509_POLICY_DATA_find(cache->data, &tmp);
+        if (idx == -1)
+                return NULL;
+        return sk_X509_POLICY_DATA_value(cache->data, idx);
+        }
+
+static int policy_data_cmp(const X509_POLICY_DATA * const *a,
+                                const X509_POLICY_DATA * const *b)
+        {
+        return OBJ_cmp((*a)->valid_policy, (*b)->valid_policy);
+        }
+
+static int policy_cache_set_int(long *out, ASN1_INTEGER *value)
+        {
+        if (value == NULL)
+                return 1;
+        if (value->type == V_ASN1_NEG_INTEGER)
+                return 0;
+        *out = ASN1_INTEGER_get(value);
+        return 1;
+        }
diff --git a/src/lib/libssl/src/crypto/x509v3/pcy_data.c b/src/lib/libssl/src/crypto/x509v3/pcy_data.c
new file mode 100644
index 0000000000..614d2b4935
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/pcy_data.c
@@ -0,0 +1,123 @@
+/* pcy_data.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+#include "pcy_int.h"
+
+/* Policy Node routines */
+
+void policy_data_free(X509_POLICY_DATA *data)
+        {
+        ASN1_OBJECT_free(data->valid_policy);
+        /* Don't free qualifiers if shared */
+        if (!(data->flags & POLICY_DATA_FLAG_SHARED_QUALIFIERS))
+                sk_POLICYQUALINFO_pop_free(data->qualifier_set,
+                                        POLICYQUALINFO_free);
+        sk_ASN1_OBJECT_pop_free(data->expected_policy_set, ASN1_OBJECT_free);
+        OPENSSL_free(data);
+        }
+
+/* Create a data based on an existing policy. If 'id' is NULL use the
+ * oid in the policy, otherwise use 'id'. This behaviour covers the two
+ * types of data in RFC3280: data with from a CertificatePolcies extension
+ * and additional data with just the qualifiers of anyPolicy and ID from
+ * another source.
+ */
+
+X509_POLICY_DATA *policy_data_new(POLICYINFO *policy, ASN1_OBJECT *id, int crit)
+        {
+        X509_POLICY_DATA *ret;
+        if (!policy && !id)
+                return NULL;
+        ret = OPENSSL_malloc(sizeof(X509_POLICY_DATA));
+        if (!ret)
+                return NULL;
+        ret->expected_policy_set = sk_ASN1_OBJECT_new_null();
+        if (!ret->expected_policy_set)
+                {
+                OPENSSL_free(ret);
+                return NULL;
+                }
+
+        if (crit)
+                ret->flags = POLICY_DATA_FLAG_CRITICAL;
+        else
+                ret->flags = 0;
+
+        if (id)
+                ret->valid_policy = id;
+        else
+                {
+                ret->valid_policy = policy->policyid;
+                policy->policyid = NULL;
+                }
+
+        if (policy)
+                {
+                ret->qualifier_set = policy->qualifiers;
+                policy->qualifiers = NULL;
+                }
+        else
+                ret->qualifier_set = NULL;
+
+        return ret;
+        }
+
diff --git a/src/lib/libssl/src/crypto/x509v3/pcy_int.h b/src/lib/libssl/src/crypto/x509v3/pcy_int.h
new file mode 100644
index 0000000000..ba62a209da
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/pcy_int.h
@@ -0,0 +1,223 @@
+/* pcy_int.h */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+DECLARE_STACK_OF(X509_POLICY_DATA)
+DECLARE_STACK_OF(X509_POLICY_REF)
+DECLARE_STACK_OF(X509_POLICY_NODE)
+
+typedef struct X509_POLICY_DATA_st X509_POLICY_DATA;
+typedef struct X509_POLICY_REF_st X509_POLICY_REF;
+
+/* Internal structures */
+
+/* This structure and the field names correspond to the Policy 'node' of
+ * RFC3280. NB this structure contains no pointers to parent or child
+ * data: X509_POLICY_NODE contains that. This means that the main policy data
+ * can be kept static and cached with the certificate.
+ */
+
+struct X509_POLICY_DATA_st
+        {
+        unsigned int flags;
+        /* Policy OID and qualifiers for this data */
+        ASN1_OBJECT *valid_policy;
+        STACK_OF(POLICYQUALINFO) *qualifier_set;
+        STACK_OF(ASN1_OBJECT) *expected_policy_set;
+        };
+
+/* X509_POLICY_DATA flags values */
+
+/* This flag indicates the structure has been mapped using a policy mapping
+ * extension. If policy mapping is not active its references get deleted. 
+ */
+
+#define POLICY_DATA_FLAG_MAPPED                 0x1
+
+/* This flag indicates the data doesn't correspond to a policy in Certificate
+ * Policies: it has been mapped to any policy.
+ */
+
+#define POLICY_DATA_FLAG_MAPPED_ANY             0x2
+
+/* AND with flags to see if any mapping has occurred */
+
+#define POLICY_DATA_FLAG_MAP_MASK               0x3
+
+/* qualifiers are shared and shouldn't be freed */
+
+#define POLICY_DATA_FLAG_SHARED_QUALIFIERS      0x4
+
+/* Parent node is an extra node and should be freed */
+
+#define POLICY_DATA_FLAG_EXTRA_NODE             0x8
+
+/* Corresponding CertificatePolicies is critical */
+
+#define POLICY_DATA_FLAG_CRITICAL               0x10
+
+/* This structure is an entry from a table of mapped policies which
+ * cross reference the policy it refers to.
+ */
+
+struct X509_POLICY_REF_st
+        {
+        ASN1_OBJECT *subjectDomainPolicy;
+        const X509_POLICY_DATA *data;
+        };
+
+/* This structure is cached with a certificate */
+
+struct X509_POLICY_CACHE_st {
+        /* anyPolicy data or NULL if no anyPolicy */
+        X509_POLICY_DATA *anyPolicy;
+        /* other policy data */
+        STACK_OF(X509_POLICY_DATA) *data;
+        /* If policyMappings extension present a table of mapped policies */
+        STACK_OF(X509_POLICY_REF) *maps;
+        /* If InhibitAnyPolicy present this is its value or -1 if absent. */
+        long any_skip;
+        /* If policyConstraints and requireExplicitPolicy present this is its
+         * value or -1 if absent.
+         */
+        long explicit_skip;
+        /* If policyConstraints and policyMapping present this is its
+         * value or -1 if absent.
+         */
+        long map_skip;
+        };
+
+/*#define POLICY_CACHE_FLAG_CRITICAL            POLICY_DATA_FLAG_CRITICAL*/
+
+/* This structure represents the relationship between nodes */
+
+struct X509_POLICY_NODE_st
+        {
+        /* node data this refers to */
+        const X509_POLICY_DATA *data;
+        /* Parent node */
+        X509_POLICY_NODE *parent;
+        /* Number of child nodes */
+        int nchild;
+        };
+
+struct X509_POLICY_LEVEL_st
+        {
+        /* Cert for this level */
+        X509 *cert;
+        /* nodes at this level */
+        STACK_OF(X509_POLICY_NODE) *nodes;
+        /* anyPolicy node */
+        X509_POLICY_NODE *anyPolicy;
+        /* Extra data */
+        /*STACK_OF(X509_POLICY_DATA) *extra_data;*/
+        unsigned int flags;
+        };
+
+struct X509_POLICY_TREE_st
+        {
+        /* This is the tree 'level' data */
+        X509_POLICY_LEVEL *levels;
+        int nlevel;
+        /* Extra policy data when additional nodes (not from the certificate)
+         * are required.
+         */
+        STACK_OF(X509_POLICY_DATA) *extra_data;
+        /* This is the authority constained policy set */
+        STACK_OF(X509_POLICY_NODE) *auth_policies;
+        STACK_OF(X509_POLICY_NODE) *user_policies;
+        unsigned int flags;
+        };
+
+/* Set if anyPolicy present in user policies */
+#define POLICY_FLAG_ANY_POLICY          0x2
+
+/* Useful macros */
+
+#define node_data_critical(data) (data->flags & POLICY_DATA_FLAG_CRITICAL)
+#define node_critical(node) node_data_critical(node->data)
+
+/* Internal functions */
+
+X509_POLICY_DATA *policy_data_new(POLICYINFO *policy, ASN1_OBJECT *id,
+                                                                int crit);
+void policy_data_free(X509_POLICY_DATA *data);
+
+X509_POLICY_DATA *policy_cache_find_data(const X509_POLICY_CACHE *cache,
+                                                        const ASN1_OBJECT *id);
+int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps);
+
+
+STACK_OF(X509_POLICY_NODE) *policy_node_cmp_new(void);
+
+void policy_cache_init(void);
+
+void policy_cache_free(X509_POLICY_CACHE *cache);
+
+X509_POLICY_NODE *level_find_node(const X509_POLICY_LEVEL *level,
+                                        const ASN1_OBJECT *id);
+
+X509_POLICY_NODE *tree_find_sk(STACK_OF(X509_POLICY_NODE) *sk,
+                                                const ASN1_OBJECT *id);
+
+X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
+                        X509_POLICY_DATA *data,
+                        X509_POLICY_NODE *parent,
+                        X509_POLICY_TREE *tree);
+void policy_node_free(X509_POLICY_NODE *node);
+
+const X509_POLICY_CACHE *policy_cache_set(X509 *x);
diff --git a/src/lib/libssl/src/crypto/x509v3/pcy_lib.c b/src/lib/libssl/src/crypto/x509v3/pcy_lib.c
new file mode 100644
index 0000000000..dae4840bc5
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/pcy_lib.c
@@ -0,0 +1,167 @@
+/* pcy_lib.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#include "cryptlib.h"
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+#include "pcy_int.h"
+
+/* accessor functions */
+
+/* X509_POLICY_TREE stuff */
+
+int X509_policy_tree_level_count(const X509_POLICY_TREE *tree)
+        {
+        if (!tree)
+                return 0;
+        return tree->nlevel;
+        }
+
+X509_POLICY_LEVEL *
+        X509_policy_tree_get0_level(const X509_POLICY_TREE *tree, int i)
+        {
+        if (!tree || (i < 0) || (i >= tree->nlevel))
+                return NULL;
+        return tree->levels + i;
+        }
+
+STACK_OF(X509_POLICY_NODE) *
+                X509_policy_tree_get0_policies(const X509_POLICY_TREE *tree)
+        {
+        if (!tree)
+                return NULL;
+        return tree->auth_policies;
+        }
+
+STACK_OF(X509_POLICY_NODE) *
+        X509_policy_tree_get0_user_policies(const X509_POLICY_TREE *tree)
+        {
+        if (!tree)
+                return NULL;
+        if (tree->flags & POLICY_FLAG_ANY_POLICY)
+                return tree->auth_policies;
+        else
+                return tree->user_policies;
+        }
+
+/* X509_POLICY_LEVEL stuff */
+
+int X509_policy_level_node_count(X509_POLICY_LEVEL *level)
+        {
+        int n;
+        if (!level)
+                return 0;
+        if (level->anyPolicy)
+                n = 1;
+        else
+                n = 0;
+        if (level->nodes)
+                n += sk_X509_POLICY_NODE_num(level->nodes);
+        return n;
+        }
+
+X509_POLICY_NODE *X509_policy_level_get0_node(X509_POLICY_LEVEL *level, int i)
+        {
+        if (!level)
+                return NULL;
+        if (level->anyPolicy)
+                {
+                if (i == 0)
+                        return level->anyPolicy;
+                i--;
+                }
+        return sk_X509_POLICY_NODE_value(level->nodes, i);
+        }
+
+/* X509_POLICY_NODE stuff */
+
+const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node)
+        {
+        if (!node)
+                return NULL;
+        return node->data->valid_policy;
+        }
+
+#if 0
+int X509_policy_node_get_critical(const X509_POLICY_NODE *node)
+        {
+        if (node_critical(node))
+                return 1;
+        return 0;
+        }
+#endif
+
+STACK_OF(POLICYQUALINFO) *
+                X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node)
+        {
+        if (!node)
+                return NULL;
+        return node->data->qualifier_set;
+        }
+
+const X509_POLICY_NODE *
+                X509_policy_node_get0_parent(const X509_POLICY_NODE *node)
+        {
+        if (!node)
+                return NULL;
+        return node->parent;
+        }
+
+
diff --git a/src/lib/libssl/src/crypto/x509v3/pcy_map.c b/src/lib/libssl/src/crypto/x509v3/pcy_map.c
new file mode 100644
index 0000000000..35221e8ba8
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/pcy_map.c
@@ -0,0 +1,186 @@
+/* pcy_map.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+#include "pcy_int.h"
+
+static int ref_cmp(const X509_POLICY_REF * const *a,
+                        const X509_POLICY_REF * const *b)
+        {
+        return OBJ_cmp((*a)->subjectDomainPolicy, (*b)->subjectDomainPolicy);
+        }
+
+static void policy_map_free(X509_POLICY_REF *map)
+        {
+        if (map->subjectDomainPolicy)
+                ASN1_OBJECT_free(map->subjectDomainPolicy);
+        OPENSSL_free(map);
+        }
+
+static X509_POLICY_REF *policy_map_find(X509_POLICY_CACHE *cache, ASN1_OBJECT *id)
+        {
+        X509_POLICY_REF tmp;
+        int idx;
+        tmp.subjectDomainPolicy = id;
+
+        idx = sk_X509_POLICY_REF_find(cache->maps, &tmp);
+        if (idx == -1)
+                return NULL;
+        return sk_X509_POLICY_REF_value(cache->maps, idx);
+        }
+
+/* Set policy mapping entries in cache.
+ * Note: this modifies the passed POLICY_MAPPINGS structure
+ */
+
+int policy_cache_set_mapping(X509 *x, POLICY_MAPPINGS *maps)
+        {
+        POLICY_MAPPING *map;
+        X509_POLICY_REF *ref = NULL;
+        X509_POLICY_DATA *data;
+        X509_POLICY_CACHE *cache = x->policy_cache;
+        int i;
+        int ret = 0;
+        if (sk_POLICY_MAPPING_num(maps) == 0)
+                {
+                ret = -1;
+                goto bad_mapping;
+                }
+        cache->maps = sk_X509_POLICY_REF_new(ref_cmp);
+        for (i = 0; i < sk_POLICY_MAPPING_num(maps); i++)
+                {
+                map = sk_POLICY_MAPPING_value(maps, i);
+                /* Reject if map to or from anyPolicy */
+                if ((OBJ_obj2nid(map->subjectDomainPolicy) == NID_any_policy)
+                   || (OBJ_obj2nid(map->issuerDomainPolicy) == NID_any_policy))
+                        {
+                        ret = -1;
+                        goto bad_mapping;
+                        }
+
+                /* If we've already mapped from this OID bad mapping */
+                if (policy_map_find(cache, map->subjectDomainPolicy) != NULL)
+                        {
+                        ret = -1;
+                        goto bad_mapping;
+                        }
+
+                /* Attempt to find matching policy data */
+                data = policy_cache_find_data(cache, map->issuerDomainPolicy);
+                /* If we don't have anyPolicy can't map */
+                if (!data && !cache->anyPolicy)
+                        continue;
+
+                /* Create a NODE from anyPolicy */
+                if (!data)
+                        {
+                        data = policy_data_new(NULL, map->issuerDomainPolicy,
+                                        cache->anyPolicy->flags
+                                                & POLICY_DATA_FLAG_CRITICAL);
+                        if (!data)
+                                goto bad_mapping;
+                        data->qualifier_set = cache->anyPolicy->qualifier_set;
+                        map->issuerDomainPolicy = NULL;
+                        data->flags |= POLICY_DATA_FLAG_MAPPED_ANY;
+                        data->flags |= POLICY_DATA_FLAG_SHARED_QUALIFIERS;
+                        if (!sk_X509_POLICY_DATA_push(cache->data, data))
+                                {
+                                policy_data_free(data);
+                                goto bad_mapping;
+                                }
+                        }
+                else
+                        data->flags |= POLICY_DATA_FLAG_MAPPED;
+
+                if (!sk_ASN1_OBJECT_push(data->expected_policy_set, 
+                                                map->subjectDomainPolicy))
+                        goto bad_mapping;
+                
+                ref = OPENSSL_malloc(sizeof(X509_POLICY_REF));
+                if (!ref)
+                        goto bad_mapping;
+
+                ref->subjectDomainPolicy = map->subjectDomainPolicy;
+                map->subjectDomainPolicy = NULL;
+                ref->data = data;
+
+                if (!sk_X509_POLICY_REF_push(cache->maps, ref))
+                        goto bad_mapping;
+
+                ref = NULL;
+
+                }
+
+        ret = 1;
+        bad_mapping:
+        if (ret == -1)
+                x->ex_flags |= EXFLAG_INVALID_POLICY;
+        if (ref)
+                policy_map_free(ref);
+        if (ret <= 0)
+                {
+                sk_X509_POLICY_REF_pop_free(cache->maps, policy_map_free);
+                cache->maps = NULL;
+                }
+        sk_POLICY_MAPPING_pop_free(maps, POLICY_MAPPING_free);
+        return ret;
+
+        }
diff --git a/src/lib/libssl/src/crypto/ec/ecp_recp.c b/src/lib/libssl/src/crypto/x509v3/pcy_node.c
index fec843b5c8..dcc1554e29 100644
--- a/src/lib/libssl/src/crypto/ec/ecp_recp.c
+++ b/src/lib/libssl/src/crypto/x509v3/pcy_node.c
@@ -1,6 +1,9 @@
-/* crypto/ec/ecp_recp.c */
+/* pcy_node.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2004.
+ */
 /* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2004 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
@@ -17,12 +20,12 @@
  * 3. All advertising materials mentioning features or use of this
  *    software must display the following acknowledgment:
  *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
  *
  * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
+ *    licensing@OpenSSL.org.
  *
  * 5. Products derived from this software may not be called "OpenSSL"
  *    nor may "OpenSSL" appear in their names without prior written
@@ -31,7 +34,7 @@
  * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
  *
  * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
  * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -53,81 +56,103 @@
  *
  */
 
-#include "ec_lcl.h"
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+#include "pcy_int.h"
 
-#if 0
-const EC_METHOD *EC_GFp_recp_method(void)
+static int node_cmp(const X509_POLICY_NODE * const *a,
+                        const X509_POLICY_NODE * const *b)
         {
-        static const EC_METHOD ret = {
-                ec_GFp_recp_group_init,
-                ec_GFp_recp_group_finish,
-                ec_GFp_recp_group_clear_finish,
-                ec_GFp_recp_group_copy,
-                ec_GFp_recp_group_set_curve_GFp,
-                ec_GFp_simple_group_get_curve_GFp,
-                ec_GFp_simple_group_set_generator,
-                ec_GFp_simple_group_get0_generator,
-                ec_GFp_simple_group_get_order,
-                ec_GFp_simple_group_get_cofactor,
-                ec_GFp_simple_point_init,
-                ec_GFp_simple_point_finish,
-                ec_GFp_simple_point_clear_finish,
-                ec_GFp_simple_point_copy,
-                ec_GFp_simple_point_set_to_infinity,
-                ec_GFp_simple_set_Jprojective_coordinates_GFp,
-                ec_GFp_simple_get_Jprojective_coordinates_GFp,
-                ec_GFp_simple_point_set_affine_coordinates_GFp,
-                ec_GFp_simple_point_get_affine_coordinates_GFp,
-                ec_GFp_simple_set_compressed_coordinates_GFp,
-                ec_GFp_simple_point2oct,
-                ec_GFp_simple_oct2point,
-                ec_GFp_simple_add,
-                ec_GFp_simple_dbl,
-                ec_GFp_simple_invert,
-                ec_GFp_simple_is_at_infinity,
-                ec_GFp_simple_is_on_curve,
-                ec_GFp_simple_cmp,
-                ec_GFp_simple_make_affine,
-                ec_GFp_simple_points_make_affine,
-                ec_GFp_recp_field_mul,
-                ec_GFp_recp_field_sqr,
-                0 /* field_encode */,
-                0 /* field_decode */,
-                0 /* field_set_to_one */ };
-
-        return &ret;
+        return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy);
         }
-#endif
 
-int ec_GFp_recp_group_init(EC_GROUP *group)
+STACK_OF(X509_POLICY_NODE) *policy_node_cmp_new(void)
         {
-        int ok;
-
-        ok = ec_GFp_simple_group_init(group);
-        group->field_data1 = NULL;
-        return ok;
+        return sk_X509_POLICY_NODE_new(node_cmp);
         }
 
+X509_POLICY_NODE *tree_find_sk(STACK_OF(X509_POLICY_NODE) *nodes,
+                                        const ASN1_OBJECT *id)
+        {
+        X509_POLICY_DATA n;
+        X509_POLICY_NODE l;
+        int idx;
 
-int ec_GFp_recp_group_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-/* TODO */
-
+        n.valid_policy = (ASN1_OBJECT *)id;
+        l.data = &n;
 
-void ec_GFp_recp_group_finish(EC_GROUP *group);
-/* TODO */
+        idx = sk_X509_POLICY_NODE_find(nodes, &l);
+        if (idx == -1)
+                return NULL;
 
+        return sk_X509_POLICY_NODE_value(nodes, idx);
 
-void ec_GFp_recp_group_clear_finish(EC_GROUP *group);
-/* TODO */
+        }
 
+X509_POLICY_NODE *level_find_node(const X509_POLICY_LEVEL *level,
+                                        const ASN1_OBJECT *id)
+        {
+        return tree_find_sk(level->nodes, id);
+        }
 
-int ec_GFp_recp_group_copy(EC_GROUP *dest, const EC_GROUP *src);
-/* TODO */
+X509_POLICY_NODE *level_add_node(X509_POLICY_LEVEL *level,
+                        X509_POLICY_DATA *data,
+                        X509_POLICY_NODE *parent,
+                        X509_POLICY_TREE *tree)
+        {
+        X509_POLICY_NODE *node;
+        node = OPENSSL_malloc(sizeof(X509_POLICY_NODE));
+        if (!node)
+                return NULL;
+        node->data = data;
+        node->parent = parent;
+        node->nchild = 0;
+        if (level)
+                {
+                if (OBJ_obj2nid(data->valid_policy) == NID_any_policy)
+                        {
+                        if (level->anyPolicy)
+                                goto node_error;
+                        level->anyPolicy = node;
+                        }
+                else
+                        {
+
+                        if (!level->nodes)
+                                level->nodes = policy_node_cmp_new();
+                        if (!level->nodes)
+                                goto node_error;
+                        if (!sk_X509_POLICY_NODE_push(level->nodes, node))
+                                goto node_error;
+                        }
+                }
+
+        if (tree)
+                {
+                if (!tree->extra_data)
+                         tree->extra_data = sk_X509_POLICY_DATA_new_null();
+                if (!tree->extra_data)
+                        goto node_error;
+                if (!sk_X509_POLICY_DATA_push(tree->extra_data, data))
+                        goto node_error;
+                }
+
+        if (parent)
+                parent->nchild++;
+
+        return node;
+
+        node_error:
+        policy_node_free(node);
+        return 0;
 
+        }
 
-int ec_GFp_recp_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-/* TODO */
+void policy_node_free(X509_POLICY_NODE *node)
+        {
+        OPENSSL_free(node);
+        }
 
 
-int ec_GFp_recp_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/* TODO */
diff --git a/src/lib/libssl/src/crypto/x509v3/pcy_tree.c b/src/lib/libssl/src/crypto/x509v3/pcy_tree.c
new file mode 100644
index 0000000000..4fda1d419a
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/pcy_tree.c
@@ -0,0 +1,692 @@
+/* pcy_tree.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project 2004.
+ */
+/* ====================================================================
+ * Copyright (c) 2004 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include "cryptlib.h"
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+
+#include "pcy_int.h"
+
+/* Initialize policy tree. Return values:
+ *  0 Some internal error occured.
+ * -1 Inconsistent or invalid extensions in certificates.
+ *  1 Tree initialized OK.
+ *  2 Policy tree is empty.
+ *  5 Tree OK and requireExplicitPolicy true.
+ *  6 Tree empty and requireExplicitPolicy true.
+ */
+
+static int tree_init(X509_POLICY_TREE **ptree, STACK_OF(X509) *certs,
+                        unsigned int flags)
+        {
+        X509_POLICY_TREE *tree;
+        X509_POLICY_LEVEL *level;
+        const X509_POLICY_CACHE *cache;
+        X509_POLICY_DATA *data = NULL;
+        X509 *x;
+        int ret = 1;
+        int i, n;
+        int explicit_policy;
+        int any_skip;
+        int map_skip;
+        *ptree = NULL;
+        n = sk_X509_num(certs);
+
+        /* Disable policy mapping for now... */
+        flags |= X509_V_FLAG_INHIBIT_MAP;
+
+        if (flags & X509_V_FLAG_EXPLICIT_POLICY)
+                explicit_policy = 0;
+        else
+                explicit_policy = n + 1;
+
+        if (flags & X509_V_FLAG_INHIBIT_ANY)
+                any_skip = 0;
+        else
+                any_skip = n + 1;
+
+        if (flags & X509_V_FLAG_INHIBIT_MAP)
+                map_skip = 0;
+        else
+                map_skip = n + 1;
+
+        /* Can't do anything with just a trust anchor */
+        if (n == 1)
+                return 1;
+        /* First setup policy cache in all certificates apart from the
+         * trust anchor. Note any bad cache results on the way. Also can
+         * calculate explicit_policy value at this point.
+         */
+        for (i = n - 2; i >= 0; i--)
+                {
+                x = sk_X509_value(certs, i);
+                X509_check_purpose(x, -1, -1);
+                cache = policy_cache_set(x);
+                /* If cache NULL something bad happened: return immediately */
+                if (cache == NULL)
+                        return 0;
+                /* If inconsistent extensions keep a note of it but continue */
+                if (x->ex_flags & EXFLAG_INVALID_POLICY)
+                        ret = -1;
+                /* Otherwise if we have no data (hence no CertificatePolicies)
+                 * and haven't already set an inconsistent code note it.
+                 */
+                else if ((ret == 1) && !cache->data)
+                        ret = 2;
+                if (explicit_policy > 0)
+                        {
+                        explicit_policy--;
+                        if (!(x->ex_flags & EXFLAG_SS)
+                                && (cache->explicit_skip != -1)
+                                && (cache->explicit_skip < explicit_policy))
+                                explicit_policy = cache->explicit_skip;
+                        }
+                }
+
+        if (ret != 1)
+                {
+                if (ret == 2 && !explicit_policy)
+                        return 6;
+                return ret;
+                }
+
+
+        /* If we get this far initialize the tree */
+
+        tree = OPENSSL_malloc(sizeof(X509_POLICY_TREE));
+
+        if (!tree)
+                return 0;
+
+        tree->flags = 0;
+        tree->levels = OPENSSL_malloc(sizeof(X509_POLICY_LEVEL) * n);
+        tree->nlevel = 0;
+        tree->extra_data = NULL;
+        tree->auth_policies = NULL;
+        tree->user_policies = NULL;
+
+        if (!tree)
+                {
+                OPENSSL_free(tree);
+                return 0;
+                }
+
+        memset(tree->levels, 0, n * sizeof(X509_POLICY_LEVEL));
+
+        tree->nlevel = n;
+
+        level = tree->levels;
+
+        /* Root data: initialize to anyPolicy */
+
+        data = policy_data_new(NULL, OBJ_nid2obj(NID_any_policy), 0);
+
+        if (!data || !level_add_node(level, data, NULL, tree))
+                goto bad_tree;
+
+        for (i = n - 2; i >= 0; i--)
+                {
+                level++;
+                x = sk_X509_value(certs, i);
+                cache = policy_cache_set(x);
+
+                CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
+                level->cert = x;
+
+                if (!cache->anyPolicy)
+                                level->flags |= X509_V_FLAG_INHIBIT_ANY;
+
+                /* Determine inhibit any and inhibit map flags */
+                if (any_skip == 0)
+                        {
+                        /* Any matching allowed if certificate is self
+                         * issued and not the last in the chain.
+                         */
+                        if (!(x->ex_flags & EXFLAG_SS) || (i == 0))
+                                level->flags |= X509_V_FLAG_INHIBIT_ANY;
+                        }
+                else
+                        {
+                        any_skip--;
+                        if ((cache->any_skip > 0)
+                                && (cache->any_skip < any_skip))
+                                any_skip = cache->any_skip;
+                        }
+
+                if (map_skip == 0)
+                        level->flags |= X509_V_FLAG_INHIBIT_MAP;
+                else
+                        {
+                        map_skip--;
+                        if ((cache->map_skip > 0)
+                                && (cache->map_skip < map_skip))
+                                map_skip = cache->map_skip;
+                        }
+
+
+                }
+
+        *ptree = tree;
+
+        if (explicit_policy)
+                return 1;
+        else
+                return 5;
+
+        bad_tree:
+
+        X509_policy_tree_free(tree);
+
+        return 0;
+
+        }
+
+/* This corresponds to RFC3280 XXXX XXXXX:
+ * link any data from CertificatePolicies onto matching parent
+ * or anyPolicy if no match.
+ */
+
+static int tree_link_nodes(X509_POLICY_LEVEL *curr,
+                                const X509_POLICY_CACHE *cache)
+        {
+        int i;
+        X509_POLICY_LEVEL *last;
+        X509_POLICY_DATA *data;
+        X509_POLICY_NODE *parent;
+        last = curr - 1;
+        for (i = 0; i < sk_X509_POLICY_DATA_num(cache->data); i++)
+                {
+                data = sk_X509_POLICY_DATA_value(cache->data, i);
+                /* If a node is mapped any it doesn't have a corresponding
+                 * CertificatePolicies entry. 
+                 * However such an identical node would be created
+                 * if anyPolicy matching is enabled because there would be
+                 * no match with the parent valid_policy_set. So we create
+                 * link because then it will have the mapping flags
+                 * right and we can prune it later.
+                 */
+                if ((data->flags & POLICY_DATA_FLAG_MAPPED_ANY)
+                        && !(curr->flags & X509_V_FLAG_INHIBIT_ANY))
+                        continue;
+                /* Look for matching node in parent */
+                parent = level_find_node(last, data->valid_policy);
+                /* If no match link to anyPolicy */
+                if (!parent)
+                        parent = last->anyPolicy;
+                if (parent && !level_add_node(curr, data, parent, NULL))
+                                return 0;
+                }
+        return 1;
+        }
+
+/* This corresponds to RFC3280 XXXX XXXXX:
+ * Create new data for any unmatched policies in the parent and link
+ * to anyPolicy.
+ */
+
+static int tree_link_any(X509_POLICY_LEVEL *curr,
+                        const X509_POLICY_CACHE *cache,
+                        X509_POLICY_TREE *tree)
+        {
+        int i;
+        X509_POLICY_DATA *data;
+        X509_POLICY_NODE *node;
+        X509_POLICY_LEVEL *last;
+
+        last = curr - 1;
+
+        for (i = 0; i < sk_X509_POLICY_NODE_num(last->nodes); i++)
+                {
+                node = sk_X509_POLICY_NODE_value(last->nodes, i);
+
+                /* Skip any node with any children: we only want unmathced
+                 * nodes.
+                 *
+                 * Note: need something better for policy mapping
+                 * because each node may have multiple children 
+                 */
+                if (node->nchild)
+                        continue;
+                /* Create a new node with qualifiers from anyPolicy and
+                 * id from unmatched node.
+                 */
+                data = policy_data_new(NULL, node->data->valid_policy, 
+                                                node_critical(node));
+
+                if (data == NULL)
+                        return 0;
+                data->qualifier_set = curr->anyPolicy->data->qualifier_set;
+                data->flags |= POLICY_DATA_FLAG_SHARED_QUALIFIERS;
+                if (!level_add_node(curr, data, node, tree))
+                        {
+                        policy_data_free(data);
+                        return 0;
+                        }
+                }
+        /* Finally add link to anyPolicy */
+        if (last->anyPolicy)
+                {
+                if (!level_add_node(curr, cache->anyPolicy,
+                                                last->anyPolicy, NULL))
+                        return 0;
+                }
+        return 1;
+        }
+
+/* Prune the tree: delete any child mapped child data on the current level
+ * then proceed up the tree deleting any data with no children. If we ever
+ * have no data on a level we can halt because the tree will be empty.
+ */
+
+static int tree_prune(X509_POLICY_TREE *tree, X509_POLICY_LEVEL *curr)
+        {
+        X509_POLICY_NODE *node;
+        int i;
+        for (i = sk_X509_POLICY_NODE_num(curr->nodes) - 1; i >= 0; i--)
+                {
+                node = sk_X509_POLICY_NODE_value(curr->nodes, i);
+                /* Delete any mapped data: see RFC3280 XXXX */
+                if (node->data->flags & POLICY_DATA_FLAG_MAP_MASK)
+                        {
+                        node->parent->nchild--;
+                        OPENSSL_free(node);
+                        (void)sk_X509_POLICY_NODE_delete(curr->nodes, i);
+                        }
+                }
+
+        for(;;) {
+                --curr;
+                for (i = sk_X509_POLICY_NODE_num(curr->nodes) - 1; i >= 0; i--)
+                        {
+                        node = sk_X509_POLICY_NODE_value(curr->nodes, i);
+                        if (node->nchild == 0)
+                                {
+                                node->parent->nchild--;
+                                OPENSSL_free(node);
+                                (void)sk_X509_POLICY_NODE_delete(curr->nodes, i);
+                                }
+                        }
+                if (curr->anyPolicy && !curr->anyPolicy->nchild)
+                        {
+                        if (curr->anyPolicy->parent)
+                                curr->anyPolicy->parent->nchild--;
+                        OPENSSL_free(curr->anyPolicy);
+                        curr->anyPolicy = NULL;
+                        }
+                if (curr == tree->levels)
+                        {
+                        /* If we zapped anyPolicy at top then tree is empty */
+                        if (!curr->anyPolicy)
+                                        return 2;
+                        return 1;
+                        }
+                }
+
+        return 1;
+
+        }
+
+static int tree_add_auth_node(STACK_OF(X509_POLICY_NODE) **pnodes,
+                                                 X509_POLICY_NODE *pcy)
+        {
+        if (!*pnodes)
+                {
+                *pnodes = policy_node_cmp_new();
+                if (!*pnodes)
+                        return 0;
+                }
+        else if (sk_X509_POLICY_NODE_find(*pnodes, pcy) != -1)
+                return 1;
+
+        if (!sk_X509_POLICY_NODE_push(*pnodes, pcy))
+                return 0;
+
+        return 1;
+
+        }
+
+/* Calculate the authority set based on policy tree.
+ * The 'pnodes' parameter is used as a store for the set of policy nodes
+ * used to calculate the user set. If the authority set is not anyPolicy
+ * then pnodes will just point to the authority set. If however the authority
+ * set is anyPolicy then the set of valid policies (other than anyPolicy)
+ * is store in pnodes. The return value of '2' is used in this case to indicate
+ * that pnodes should be freed.
+ */
+
+static int tree_calculate_authority_set(X509_POLICY_TREE *tree,
+                                        STACK_OF(X509_POLICY_NODE) **pnodes)
+        {
+        X509_POLICY_LEVEL *curr;
+        X509_POLICY_NODE *node, *anyptr;
+        STACK_OF(X509_POLICY_NODE) **addnodes;
+        int i, j;
+        curr = tree->levels + tree->nlevel - 1;
+
+        /* If last level contains anyPolicy set is anyPolicy */
+        if (curr->anyPolicy)
+                {
+                if (!tree_add_auth_node(&tree->auth_policies, curr->anyPolicy))
+                        return 0;
+                addnodes = pnodes;
+                }
+        else
+                /* Add policies to authority set */
+                addnodes = &tree->auth_policies;
+
+        curr = tree->levels;
+        for (i = 1; i < tree->nlevel; i++)
+                {
+                /* If no anyPolicy node on this this level it can't
+                 * appear on lower levels so end search.
+                 */
+                if (!(anyptr = curr->anyPolicy))
+                        break;
+                curr++;
+                for (j = 0; j < sk_X509_POLICY_NODE_num(curr->nodes); j++)
+                        {
+                        node = sk_X509_POLICY_NODE_value(curr->nodes, j);
+                        if ((node->parent == anyptr)
+                                && !tree_add_auth_node(addnodes, node))
+                                        return 0;
+                        }
+                }
+
+        if (addnodes == pnodes)
+                return 2;
+
+        *pnodes = tree->auth_policies;
+
+        return 1;
+        }
+
+static int tree_calculate_user_set(X509_POLICY_TREE *tree,
+                                STACK_OF(ASN1_OBJECT) *policy_oids,
+                                STACK_OF(X509_POLICY_NODE) *auth_nodes)
+        {
+        int i;
+        X509_POLICY_NODE *node;
+        ASN1_OBJECT *oid;
+
+        X509_POLICY_NODE *anyPolicy;
+        X509_POLICY_DATA *extra;
+
+        /* Check if anyPolicy present in authority constrained policy set:
+         * this will happen if it is a leaf node.
+         */
+
+        if (sk_ASN1_OBJECT_num(policy_oids) <= 0)
+                return 1;
+
+        anyPolicy = tree->levels[tree->nlevel - 1].anyPolicy;
+
+        for (i = 0; i < sk_ASN1_OBJECT_num(policy_oids); i++)
+                {
+                oid = sk_ASN1_OBJECT_value(policy_oids, i);
+                if (OBJ_obj2nid(oid) == NID_any_policy)
+                        {
+                        tree->flags |= POLICY_FLAG_ANY_POLICY;
+                        return 1;
+                        }
+                }
+
+        for (i = 0; i < sk_ASN1_OBJECT_num(policy_oids); i++)
+                {
+                oid = sk_ASN1_OBJECT_value(policy_oids, i);
+                node = tree_find_sk(auth_nodes, oid);
+                if (!node)
+                        {
+                        if (!anyPolicy)
+                                continue;
+                        /* Create a new node with policy ID from user set
+                         * and qualifiers from anyPolicy.
+                         */
+                        extra = policy_data_new(NULL, oid,
+                                                node_critical(anyPolicy));
+                        if (!extra)
+                                return 0;
+                        extra->qualifier_set = anyPolicy->data->qualifier_set;
+                        extra->flags = POLICY_DATA_FLAG_SHARED_QUALIFIERS
+                                                | POLICY_DATA_FLAG_EXTRA_NODE;
+                        node = level_add_node(NULL, extra, anyPolicy->parent,
+                                                tree);
+                        }
+                if (!tree->user_policies)
+                        {
+                        tree->user_policies = sk_X509_POLICY_NODE_new_null();
+                        if (!tree->user_policies)
+                                return 1;
+                        }
+                if (!sk_X509_POLICY_NODE_push(tree->user_policies, node))
+                        return 0;
+                }
+        return 1;
+
+        }
+
+static int tree_evaluate(X509_POLICY_TREE *tree)
+        {
+        int ret, i;
+        X509_POLICY_LEVEL *curr = tree->levels + 1;
+        const X509_POLICY_CACHE *cache;
+
+        for(i = 1; i < tree->nlevel; i++, curr++)
+                {
+                cache = policy_cache_set(curr->cert);
+                if (!tree_link_nodes(curr, cache))
+                        return 0;
+
+                if (!(curr->flags & X509_V_FLAG_INHIBIT_ANY)
+                        && !tree_link_any(curr, cache, tree))
+                        return 0;
+                ret = tree_prune(tree, curr);
+                if (ret != 1)
+                        return ret;
+                }
+
+        return 1;
+
+        }
+
+static void exnode_free(X509_POLICY_NODE *node)
+        {
+        if (node->data && (node->data->flags & POLICY_DATA_FLAG_EXTRA_NODE))
+                OPENSSL_free(node);
+        }
+
+
+void X509_policy_tree_free(X509_POLICY_TREE *tree)
+        {
+        X509_POLICY_LEVEL *curr;
+        int i;
+
+        if (!tree)
+                return;
+
+        sk_X509_POLICY_NODE_free(tree->auth_policies);
+        sk_X509_POLICY_NODE_pop_free(tree->user_policies, exnode_free);
+
+        for(i = 0, curr = tree->levels; i < tree->nlevel; i++, curr++)
+                {
+                if (curr->cert)
+                        X509_free(curr->cert);
+                if (curr->nodes)
+                        sk_X509_POLICY_NODE_pop_free(curr->nodes,
+                                                policy_node_free);
+                if (curr->anyPolicy)
+                        policy_node_free(curr->anyPolicy);
+                }
+
+        if (tree->extra_data)
+                sk_X509_POLICY_DATA_pop_free(tree->extra_data,
+                                                policy_data_free);
+
+        OPENSSL_free(tree->levels);
+        OPENSSL_free(tree);
+
+        }
+
+/* Application policy checking function.
+ * Return codes:
+ *  0   Internal Error.
+ *  1   Successful.
+ * -1   One or more certificates contain invalid or inconsistent extensions
+ * -2   User constrained policy set empty and requireExplicit true.
+ */
+
+int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
+                        STACK_OF(X509) *certs,
+                        STACK_OF(ASN1_OBJECT) *policy_oids,
+                        unsigned int flags)
+        {
+        int ret;
+        X509_POLICY_TREE *tree = NULL;
+        STACK_OF(X509_POLICY_NODE) *nodes, *auth_nodes = NULL;
+        *ptree = NULL;
+
+        *pexplicit_policy = 0;
+        ret = tree_init(&tree, certs, flags);
+
+
+        switch (ret)
+                {
+
+                /* Tree empty requireExplicit False: OK */
+                case 2:
+                return 1;
+
+                /* Some internal error */
+                case 0:
+                return 0;
+
+                /* Tree empty requireExplicit True: Error */
+
+                case 6:
+                *pexplicit_policy = 1;
+                return -2;
+
+                /* Tree OK requireExplicit True: OK and continue */
+                case 5:
+                *pexplicit_policy = 1;
+                break;
+
+                /* Tree OK: continue */
+
+                case 1:
+                if (!tree)
+                        /*
+                         * tree_init() returns success and a null tree
+                         * if it's just looking at a trust anchor.
+                         * I'm not sure that returning success here is
+                         * correct, but I'm sure that reporting this
+                         * as an internal error which our caller
+                         * interprets as a malloc failure is wrong.
+                         */
+                        return 1;
+                break;
+                }
+
+        if (!tree) goto error;
+        ret = tree_evaluate(tree);
+
+        if (ret <= 0)
+                goto error;
+
+        /* Return value 2 means tree empty */
+        if (ret == 2)
+                {
+                X509_policy_tree_free(tree);
+                if (*pexplicit_policy)
+                        return -2;
+                else
+                        return 1;
+                }
+
+        /* Tree is not empty: continue */
+
+        ret = tree_calculate_authority_set(tree, &auth_nodes);
+
+        if (!ret)
+                goto error;
+
+        if (!tree_calculate_user_set(tree, policy_oids, auth_nodes))
+                goto error;
+        
+        if (ret == 2)
+                sk_X509_POLICY_NODE_free(auth_nodes);
+
+        if (tree)
+                *ptree = tree;
+
+        if (*pexplicit_policy)
+                {
+                nodes = X509_policy_tree_get0_user_policies(tree);
+                if (sk_X509_POLICY_NODE_num(nodes) <= 0)
+                        return -2;
+                }
+
+        return 1;
+
+        error:
+
+        X509_policy_tree_free(tree);
+
+        return 0;
+
+        }
+
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_addr.c b/src/lib/libssl/src/crypto/x509v3/v3_addr.c
new file mode 100644
index 0000000000..ed9847b307
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/v3_addr.c
@@ -0,0 +1,1280 @@
+/*
+ * Contributed to the OpenSSL Project by the American Registry for
+ * Internet Numbers ("ARIN").
+ */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ */
+
+/*
+ * Implementation of RFC 3779 section 2.2.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include "cryptlib.h"
+#include <openssl/conf.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
+#include <openssl/buffer.h>
+#include <openssl/x509v3.h>
+
+#ifndef OPENSSL_NO_RFC3779
+
+/*
+ * OpenSSL ASN.1 template translation of RFC 3779 2.2.3.
+ */
+
+ASN1_SEQUENCE(IPAddressRange) = {
+  ASN1_SIMPLE(IPAddressRange, min, ASN1_BIT_STRING),
+  ASN1_SIMPLE(IPAddressRange, max, ASN1_BIT_STRING)
+} ASN1_SEQUENCE_END(IPAddressRange)
+
+ASN1_CHOICE(IPAddressOrRange) = {
+  ASN1_SIMPLE(IPAddressOrRange, u.addressPrefix, ASN1_BIT_STRING),
+  ASN1_SIMPLE(IPAddressOrRange, u.addressRange,  IPAddressRange)
+} ASN1_CHOICE_END(IPAddressOrRange)
+
+ASN1_CHOICE(IPAddressChoice) = {
+  ASN1_SIMPLE(IPAddressChoice,      u.inherit,           ASN1_NULL),
+  ASN1_SEQUENCE_OF(IPAddressChoice, u.addressesOrRanges, IPAddressOrRange)
+} ASN1_CHOICE_END(IPAddressChoice)
+
+ASN1_SEQUENCE(IPAddressFamily) = {
+  ASN1_SIMPLE(IPAddressFamily, addressFamily,   ASN1_OCTET_STRING),
+  ASN1_SIMPLE(IPAddressFamily, ipAddressChoice, IPAddressChoice)
+} ASN1_SEQUENCE_END(IPAddressFamily)
+
+ASN1_ITEM_TEMPLATE(IPAddrBlocks) = 
+  ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0,
+                        IPAddrBlocks, IPAddressFamily)
+ASN1_ITEM_TEMPLATE_END(IPAddrBlocks)
+
+IMPLEMENT_ASN1_FUNCTIONS(IPAddressRange)
+IMPLEMENT_ASN1_FUNCTIONS(IPAddressOrRange)
+IMPLEMENT_ASN1_FUNCTIONS(IPAddressChoice)
+IMPLEMENT_ASN1_FUNCTIONS(IPAddressFamily)
+
+/*
+ * How much buffer space do we need for a raw address?
+ */
+#define ADDR_RAW_BUF_LEN        16
+
+/*
+ * What's the address length associated with this AFI?
+ */
+static int length_from_afi(const unsigned afi)
+{
+  switch (afi) {
+  case IANA_AFI_IPV4:
+    return 4;
+  case IANA_AFI_IPV6:
+    return 16;
+  default:
+    return 0;
+  }
+}
+
+/*
+ * Extract the AFI from an IPAddressFamily.
+ */
+unsigned v3_addr_get_afi(const IPAddressFamily *f)
+{
+  return ((f != NULL &&
+           f->addressFamily != NULL &&
+           f->addressFamily->data != NULL)
+          ? ((f->addressFamily->data[0] << 8) |
+             (f->addressFamily->data[1]))
+          : 0);
+}
+
+/*
+ * Expand the bitstring form of an address into a raw byte array.
+ * At the moment this is coded for simplicity, not speed.
+ */
+static void addr_expand(unsigned char *addr,
+                        const ASN1_BIT_STRING *bs,
+                        const int length,
+                        const unsigned char fill)
+{
+  assert(bs->length >= 0 && bs->length <= length);
+  if (bs->length > 0) {
+    memcpy(addr, bs->data, bs->length);
+    if ((bs->flags & 7) != 0) {
+      unsigned char mask = 0xFF >> (8 - (bs->flags & 7));
+      if (fill == 0)
+        addr[bs->length - 1] &= ~mask;
+      else
+        addr[bs->length - 1] |= mask;
+    }
+  }
+  memset(addr + bs->length, fill, length - bs->length);
+}
+
+/*
+ * Extract the prefix length from a bitstring.
+ */
+#define addr_prefixlen(bs) ((int) ((bs)->length * 8 - ((bs)->flags & 7)))
+
+/*
+ * i2r handler for one address bitstring.
+ */
+static int i2r_address(BIO *out,
+                       const unsigned afi,
+                       const unsigned char fill,
+                       const ASN1_BIT_STRING *bs)
+{
+  unsigned char addr[ADDR_RAW_BUF_LEN];
+  int i, n;
+
+  switch (afi) {
+  case IANA_AFI_IPV4:
+    addr_expand(addr, bs, 4, fill);
+    BIO_printf(out, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
+    break;
+  case IANA_AFI_IPV6:
+    addr_expand(addr, bs, 16, fill);
+    for (n = 16; n > 1 && addr[n-1] == 0x00 && addr[n-2] == 0x00; n -= 2)
+      ;
+    for (i = 0; i < n; i += 2)
+      BIO_printf(out, "%x%s", (addr[i] << 8) | addr[i+1], (i < 14 ? ":" : ""));
+    if (i < 16)
+      BIO_puts(out, ":");
+    break;
+  default:
+    for (i = 0; i < bs->length; i++)
+      BIO_printf(out, "%s%02x", (i > 0 ? ":" : ""), bs->data[i]);
+    BIO_printf(out, "[%d]", (int) (bs->flags & 7));
+    break;
+  }
+  return 1;
+}
+
+/*
+ * i2r handler for a sequence of addresses and ranges.
+ */
+static int i2r_IPAddressOrRanges(BIO *out,
+                                 const int indent,
+                                 const IPAddressOrRanges *aors,
+                                 const unsigned afi)
+{
+  int i;
+  for (i = 0; i < sk_IPAddressOrRange_num(aors); i++) {
+    const IPAddressOrRange *aor = sk_IPAddressOrRange_value(aors, i);
+    BIO_printf(out, "%*s", indent, "");
+    switch (aor->type) {
+    case IPAddressOrRange_addressPrefix:
+      if (!i2r_address(out, afi, 0x00, aor->u.addressPrefix))
+        return 0;
+      BIO_printf(out, "/%d\n", addr_prefixlen(aor->u.addressPrefix));
+      continue;
+    case IPAddressOrRange_addressRange:
+      if (!i2r_address(out, afi, 0x00, aor->u.addressRange->min))
+        return 0;
+      BIO_puts(out, "-");
+      if (!i2r_address(out, afi, 0xFF, aor->u.addressRange->max))
+        return 0;
+      BIO_puts(out, "\n");
+      continue;
+    }
+  }
+  return 1;
+}
+
+/*
+ * i2r handler for an IPAddrBlocks extension.
+ */
+static int i2r_IPAddrBlocks(X509V3_EXT_METHOD *method,
+                            void *ext,
+                            BIO *out,
+                            int indent)
+{
+  const IPAddrBlocks *addr = ext;
+  int i;
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
+    const unsigned afi = v3_addr_get_afi(f);
+    switch (afi) {
+    case IANA_AFI_IPV4:
+      BIO_printf(out, "%*sIPv4", indent, "");
+      break;
+    case IANA_AFI_IPV6:
+      BIO_printf(out, "%*sIPv6", indent, "");
+      break;
+    default:
+      BIO_printf(out, "%*sUnknown AFI %u", indent, "", afi);
+      break;
+    }
+    if (f->addressFamily->length > 2) {
+      switch (f->addressFamily->data[2]) {
+      case   1:
+        BIO_puts(out, " (Unicast)");
+        break;
+      case   2:
+        BIO_puts(out, " (Multicast)");
+        break;
+      case   3:
+        BIO_puts(out, " (Unicast/Multicast)");
+        break;
+      case   4:
+        BIO_puts(out, " (MPLS)");
+        break;
+      case  64:
+        BIO_puts(out, " (Tunnel)");
+        break;
+      case  65:
+        BIO_puts(out, " (VPLS)");
+        break;
+      case  66:
+        BIO_puts(out, " (BGP MDT)");
+        break;
+      case 128:
+        BIO_puts(out, " (MPLS-labeled VPN)");
+        break;
+      default:  
+        BIO_printf(out, " (Unknown SAFI %u)",
+                   (unsigned) f->addressFamily->data[2]);
+        break;
+      }
+    }
+    switch (f->ipAddressChoice->type) {
+    case IPAddressChoice_inherit:
+      BIO_puts(out, ": inherit\n");
+      break;
+    case IPAddressChoice_addressesOrRanges:
+      BIO_puts(out, ":\n");
+      if (!i2r_IPAddressOrRanges(out,
+                                 indent + 2,
+                                 f->ipAddressChoice->u.addressesOrRanges,
+                                 afi))
+        return 0;
+      break;
+    }
+  }
+  return 1;
+}
+
+/*
+ * Sort comparison function for a sequence of IPAddressOrRange
+ * elements.
+ */
+static int IPAddressOrRange_cmp(const IPAddressOrRange *a,
+                                const IPAddressOrRange *b,
+                                const int length)
+{
+  unsigned char addr_a[ADDR_RAW_BUF_LEN], addr_b[ADDR_RAW_BUF_LEN];
+  int prefixlen_a = 0;
+  int prefixlen_b = 0;
+  int r;
+
+  switch (a->type) {
+  case IPAddressOrRange_addressPrefix:
+    addr_expand(addr_a, a->u.addressPrefix, length, 0x00);
+    prefixlen_a = addr_prefixlen(a->u.addressPrefix);
+    break;
+  case IPAddressOrRange_addressRange:
+    addr_expand(addr_a, a->u.addressRange->min, length, 0x00);
+    prefixlen_a = length * 8;
+    break;
+  }
+
+  switch (b->type) {
+  case IPAddressOrRange_addressPrefix:
+    addr_expand(addr_b, b->u.addressPrefix, length, 0x00);
+    prefixlen_b = addr_prefixlen(b->u.addressPrefix);
+    break;
+  case IPAddressOrRange_addressRange:
+    addr_expand(addr_b, b->u.addressRange->min, length, 0x00);
+    prefixlen_b = length * 8;
+    break;
+  }
+
+  if ((r = memcmp(addr_a, addr_b, length)) != 0)
+    return r;
+  else
+    return prefixlen_a - prefixlen_b;
+}
+
+/*
+ * IPv4-specific closure over IPAddressOrRange_cmp, since sk_sort()
+ * comparision routines are only allowed two arguments.
+ */
+static int v4IPAddressOrRange_cmp(const IPAddressOrRange * const *a,
+                                  const IPAddressOrRange * const *b)
+{
+  return IPAddressOrRange_cmp(*a, *b, 4);
+}
+
+/*
+ * IPv6-specific closure over IPAddressOrRange_cmp, since sk_sort()
+ * comparision routines are only allowed two arguments.
+ */
+static int v6IPAddressOrRange_cmp(const IPAddressOrRange * const *a,
+                                  const IPAddressOrRange * const *b)
+{
+  return IPAddressOrRange_cmp(*a, *b, 16);
+}
+
+/*
+ * Calculate whether a range collapses to a prefix.
+ * See last paragraph of RFC 3779 2.2.3.7.
+ */
+static int range_should_be_prefix(const unsigned char *min,
+                                  const unsigned char *max,
+                                  const int length)
+{
+  unsigned char mask;
+  int i, j;
+
+  for (i = 0; i < length && min[i] == max[i]; i++)
+    ;
+  for (j = length - 1; j >= 0 && min[j] == 0x00 && max[j] == 0xFF; j--)
+    ;
+  if (i < j)
+    return -1;
+  if (i > j)
+    return i * 8;
+  mask = min[i] ^ max[i];
+  switch (mask) {
+  case 0x01: j = 7; break;
+  case 0x03: j = 6; break;
+  case 0x07: j = 5; break;
+  case 0x0F: j = 4; break;
+  case 0x1F: j = 3; break;
+  case 0x3F: j = 2; break;
+  case 0x7F: j = 1; break;
+  default:   return -1;
+  }
+  if ((min[i] & mask) != 0 || (max[i] & mask) != mask)
+    return -1;
+  else
+    return i * 8 + j;
+}
+
+/*
+ * Construct a prefix.
+ */
+static int make_addressPrefix(IPAddressOrRange **result,
+                              unsigned char *addr,
+                              const int prefixlen)
+{
+  int bytelen = (prefixlen + 7) / 8, bitlen = prefixlen % 8;
+  IPAddressOrRange *aor = IPAddressOrRange_new();
+
+  if (aor == NULL)
+    return 0;
+  aor->type = IPAddressOrRange_addressPrefix;
+  if (aor->u.addressPrefix == NULL &&
+      (aor->u.addressPrefix = ASN1_BIT_STRING_new()) == NULL)
+    goto err;
+  if (!ASN1_BIT_STRING_set(aor->u.addressPrefix, addr, bytelen))
+    goto err;
+  aor->u.addressPrefix->flags &= ~7;
+  aor->u.addressPrefix->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+  if (bitlen > 0) {
+    aor->u.addressPrefix->data[bytelen - 1] &= ~(0xFF >> bitlen);
+    aor->u.addressPrefix->flags |= 8 - bitlen;
+  }
+  
+  *result = aor;
+  return 1;
+
+ err:
+  IPAddressOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Construct a range.  If it can be expressed as a prefix,
+ * return a prefix instead.  Doing this here simplifies
+ * the rest of the code considerably.
+ */
+static int make_addressRange(IPAddressOrRange **result,
+                             unsigned char *min,
+                             unsigned char *max,
+                             const int length)
+{
+  IPAddressOrRange *aor;
+  int i, prefixlen;
+
+  if ((prefixlen = range_should_be_prefix(min, max, length)) >= 0)
+    return make_addressPrefix(result, min, prefixlen);
+
+  if ((aor = IPAddressOrRange_new()) == NULL)
+    return 0;
+  aor->type = IPAddressOrRange_addressRange;
+  assert(aor->u.addressRange == NULL);
+  if ((aor->u.addressRange = IPAddressRange_new()) == NULL)
+    goto err;
+  if (aor->u.addressRange->min == NULL &&
+      (aor->u.addressRange->min = ASN1_BIT_STRING_new()) == NULL)
+    goto err;
+  if (aor->u.addressRange->max == NULL &&
+      (aor->u.addressRange->max = ASN1_BIT_STRING_new()) == NULL)
+    goto err;
+
+  for (i = length; i > 0 && min[i - 1] == 0x00; --i)
+    ;
+  if (!ASN1_BIT_STRING_set(aor->u.addressRange->min, min, i))
+    goto err;
+  aor->u.addressRange->min->flags &= ~7;
+  aor->u.addressRange->min->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+  if (i > 0) {
+    unsigned char b = min[i - 1];
+    int j = 1;
+    while ((b & (0xFFU >> j)) != 0) 
+      ++j;
+    aor->u.addressRange->min->flags |= 8 - j;
+  }
+
+  for (i = length; i > 0 && max[i - 1] == 0xFF; --i)
+    ;
+  if (!ASN1_BIT_STRING_set(aor->u.addressRange->max, max, i))
+    goto err;
+  aor->u.addressRange->max->flags &= ~7;
+  aor->u.addressRange->max->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+  if (i > 0) {
+    unsigned char b = max[i - 1];
+    int j = 1;
+    while ((b & (0xFFU >> j)) != (0xFFU >> j))
+      ++j;
+    aor->u.addressRange->max->flags |= 8 - j;
+  }
+
+  *result = aor;
+  return 1;
+
+ err:
+  IPAddressOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Construct a new address family or find an existing one.
+ */
+static IPAddressFamily *make_IPAddressFamily(IPAddrBlocks *addr,
+                                             const unsigned afi,
+                                             const unsigned *safi)
+{
+  IPAddressFamily *f;
+  unsigned char key[3];
+  unsigned keylen;
+  int i;
+
+  key[0] = (afi >> 8) & 0xFF;
+  key[1] = afi & 0xFF;
+  if (safi != NULL) {
+    key[2] = *safi & 0xFF;
+    keylen = 3;
+  } else {
+    keylen = 2;
+  }
+
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    f = sk_IPAddressFamily_value(addr, i);
+    assert(f->addressFamily->data != NULL);
+    if (f->addressFamily->length == keylen &&
+        !memcmp(f->addressFamily->data, key, keylen))
+      return f;
+  }
+
+  if ((f = IPAddressFamily_new()) == NULL)
+    goto err;
+  if (f->ipAddressChoice == NULL &&
+      (f->ipAddressChoice = IPAddressChoice_new()) == NULL)
+    goto err;
+  if (f->addressFamily == NULL && 
+      (f->addressFamily = ASN1_OCTET_STRING_new()) == NULL)
+    goto err;
+  if (!ASN1_OCTET_STRING_set(f->addressFamily, key, keylen))
+    goto err;
+  if (!sk_IPAddressFamily_push(addr, f))
+    goto err;
+
+  return f;
+
+ err:
+  IPAddressFamily_free(f);
+  return NULL;
+}
+
+/*
+ * Add an inheritance element.
+ */
+int v3_addr_add_inherit(IPAddrBlocks *addr,
+                        const unsigned afi,
+                        const unsigned *safi)
+{
+  IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
+  if (f == NULL ||
+      f->ipAddressChoice == NULL ||
+      (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
+       f->ipAddressChoice->u.addressesOrRanges != NULL))
+    return 0;
+  if (f->ipAddressChoice->type == IPAddressChoice_inherit &&
+      f->ipAddressChoice->u.inherit != NULL)
+    return 1;
+  if (f->ipAddressChoice->u.inherit == NULL &&
+      (f->ipAddressChoice->u.inherit = ASN1_NULL_new()) == NULL)
+    return 0;
+  f->ipAddressChoice->type = IPAddressChoice_inherit;
+  return 1;
+}
+
+/*
+ * Construct an IPAddressOrRange sequence, or return an existing one.
+ */
+static IPAddressOrRanges *make_prefix_or_range(IPAddrBlocks *addr,
+                                               const unsigned afi,
+                                               const unsigned *safi)
+{
+  IPAddressFamily *f = make_IPAddressFamily(addr, afi, safi);
+  IPAddressOrRanges *aors = NULL;
+
+  if (f == NULL ||
+      f->ipAddressChoice == NULL ||
+      (f->ipAddressChoice->type == IPAddressChoice_inherit &&
+       f->ipAddressChoice->u.inherit != NULL))
+    return NULL;
+  if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges)
+    aors = f->ipAddressChoice->u.addressesOrRanges;
+  if (aors != NULL)
+    return aors;
+  if ((aors = sk_IPAddressOrRange_new_null()) == NULL)
+    return NULL;
+  switch (afi) {
+  case IANA_AFI_IPV4:
+    sk_IPAddressOrRange_set_cmp_func(aors, v4IPAddressOrRange_cmp);
+    break;
+  case IANA_AFI_IPV6:
+    sk_IPAddressOrRange_set_cmp_func(aors, v6IPAddressOrRange_cmp);
+    break;
+  }
+  f->ipAddressChoice->type = IPAddressChoice_addressesOrRanges;
+  f->ipAddressChoice->u.addressesOrRanges = aors;
+  return aors;
+}
+
+/*
+ * Add a prefix.
+ */
+int v3_addr_add_prefix(IPAddrBlocks *addr,
+                       const unsigned afi,
+                       const unsigned *safi,
+                       unsigned char *a,
+                       const int prefixlen)
+{
+  IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
+  IPAddressOrRange *aor;
+  if (aors == NULL || !make_addressPrefix(&aor, a, prefixlen))
+    return 0;
+  if (sk_IPAddressOrRange_push(aors, aor))
+    return 1;
+  IPAddressOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Add a range.
+ */
+int v3_addr_add_range(IPAddrBlocks *addr,
+                      const unsigned afi,
+                      const unsigned *safi,
+                      unsigned char *min,
+                      unsigned char *max)
+{
+  IPAddressOrRanges *aors = make_prefix_or_range(addr, afi, safi);
+  IPAddressOrRange *aor;
+  int length = length_from_afi(afi);
+  if (aors == NULL)
+    return 0;
+  if (!make_addressRange(&aor, min, max, length))
+    return 0;
+  if (sk_IPAddressOrRange_push(aors, aor))
+    return 1;
+  IPAddressOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Extract min and max values from an IPAddressOrRange.
+ */
+static void extract_min_max(IPAddressOrRange *aor,
+                            unsigned char *min,
+                            unsigned char *max,
+                            int length)
+{
+  assert(aor != NULL && min != NULL && max != NULL);
+  switch (aor->type) {
+  case IPAddressOrRange_addressPrefix:
+    addr_expand(min, aor->u.addressPrefix, length, 0x00);
+    addr_expand(max, aor->u.addressPrefix, length, 0xFF);
+    return;
+  case IPAddressOrRange_addressRange:
+    addr_expand(min, aor->u.addressRange->min, length, 0x00);
+    addr_expand(max, aor->u.addressRange->max, length, 0xFF);
+    return;
+  }
+}
+
+/*
+ * Public wrapper for extract_min_max().
+ */
+int v3_addr_get_range(IPAddressOrRange *aor,
+                      const unsigned afi,
+                      unsigned char *min,
+                      unsigned char *max,
+                      const int length)
+{
+  int afi_length = length_from_afi(afi);
+  if (aor == NULL || min == NULL || max == NULL ||
+      afi_length == 0 || length < afi_length ||
+      (aor->type != IPAddressOrRange_addressPrefix &&
+       aor->type != IPAddressOrRange_addressRange))
+    return 0;
+  extract_min_max(aor, min, max, afi_length);
+  return afi_length;
+}
+
+/*
+ * Sort comparision function for a sequence of IPAddressFamily.
+ *
+ * The last paragraph of RFC 3779 2.2.3.3 is slightly ambiguous about
+ * the ordering: I can read it as meaning that IPv6 without a SAFI
+ * comes before IPv4 with a SAFI, which seems pretty weird.  The
+ * examples in appendix B suggest that the author intended the
+ * null-SAFI rule to apply only within a single AFI, which is what I
+ * would have expected and is what the following code implements.
+ */
+static int IPAddressFamily_cmp(const IPAddressFamily * const *a_,
+                               const IPAddressFamily * const *b_)
+{
+  const ASN1_OCTET_STRING *a = (*a_)->addressFamily;
+  const ASN1_OCTET_STRING *b = (*b_)->addressFamily;
+  int len = ((a->length <= b->length) ? a->length : b->length);
+  int cmp = memcmp(a->data, b->data, len);
+  return cmp ? cmp : a->length - b->length;
+}
+
+/*
+ * Check whether an IPAddrBLocks is in canonical form.
+ */
+int v3_addr_is_canonical(IPAddrBlocks *addr)
+{
+  unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];
+  unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];
+  IPAddressOrRanges *aors;
+  int i, j, k;
+
+  /*
+   * Empty extension is cannonical.
+   */
+  if (addr == NULL)
+    return 1;
+
+  /*
+   * Check whether the top-level list is in order.
+   */
+  for (i = 0; i < sk_IPAddressFamily_num(addr) - 1; i++) {
+    const IPAddressFamily *a = sk_IPAddressFamily_value(addr, i);
+    const IPAddressFamily *b = sk_IPAddressFamily_value(addr, i + 1);
+    if (IPAddressFamily_cmp(&a, &b) >= 0)
+      return 0;
+  }
+
+  /*
+   * Top level's ok, now check each address family.
+   */
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
+    int length = length_from_afi(v3_addr_get_afi(f));
+
+    /*
+     * Inheritance is canonical.  Anything other than inheritance or
+     * a SEQUENCE OF IPAddressOrRange is an ASN.1 error or something.
+     */
+    if (f == NULL || f->ipAddressChoice == NULL)
+      return 0;
+    switch (f->ipAddressChoice->type) {
+    case IPAddressChoice_inherit:
+      continue;
+    case IPAddressChoice_addressesOrRanges:
+      break;
+    default:
+      return 0;
+    }
+
+    /*
+     * It's an IPAddressOrRanges sequence, check it.
+     */
+    aors = f->ipAddressChoice->u.addressesOrRanges;
+    if (sk_IPAddressOrRange_num(aors) == 0)
+      return 0;
+    for (j = 0; j < sk_IPAddressOrRange_num(aors) - 1; j++) {
+      IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);
+      IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, j + 1);
+
+      extract_min_max(a, a_min, a_max, length);
+      extract_min_max(b, b_min, b_max, length);
+
+      /*
+       * Punt misordered list, overlapping start, or inverted range.
+       */
+      if (memcmp(a_min, b_min, length) >= 0 ||
+          memcmp(a_min, a_max, length) > 0 ||
+          memcmp(b_min, b_max, length) > 0)
+        return 0;
+
+      /*
+       * Punt if adjacent or overlapping.  Check for adjacency by
+       * subtracting one from b_min first.
+       */
+      for (k = length - 1; k >= 0 && b_min[k]-- == 0x00; k--)
+        ;
+      if (memcmp(a_max, b_min, length) >= 0)
+        return 0;
+
+      /*
+       * Check for range that should be expressed as a prefix.
+       */
+      if (a->type == IPAddressOrRange_addressRange &&
+          range_should_be_prefix(a_min, a_max, length) >= 0)
+        return 0;
+    }
+
+    /*
+     * Check final range to see if it should be a prefix.
+     */
+    j = sk_IPAddressOrRange_num(aors) - 1;
+    {
+      IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, j);
+      if (a->type == IPAddressOrRange_addressRange) {
+        extract_min_max(a, a_min, a_max, length);
+        if (range_should_be_prefix(a_min, a_max, length) >= 0)
+          return 0;
+      }
+    }
+  }
+
+  /*
+   * If we made it through all that, we're happy.
+   */
+  return 1;
+}
+
+/*
+ * Whack an IPAddressOrRanges into canonical form.
+ */
+static int IPAddressOrRanges_canonize(IPAddressOrRanges *aors,
+                                      const unsigned afi)
+{
+  int i, j, length = length_from_afi(afi);
+
+  /*
+   * Sort the IPAddressOrRanges sequence.
+   */
+  sk_IPAddressOrRange_sort(aors);
+
+  /*
+   * Clean up representation issues, punt on duplicates or overlaps.
+   */
+  for (i = 0; i < sk_IPAddressOrRange_num(aors) - 1; i++) {
+    IPAddressOrRange *a = sk_IPAddressOrRange_value(aors, i);
+    IPAddressOrRange *b = sk_IPAddressOrRange_value(aors, i + 1);
+    unsigned char a_min[ADDR_RAW_BUF_LEN], a_max[ADDR_RAW_BUF_LEN];
+    unsigned char b_min[ADDR_RAW_BUF_LEN], b_max[ADDR_RAW_BUF_LEN];
+
+    extract_min_max(a, a_min, a_max, length);
+    extract_min_max(b, b_min, b_max, length);
+
+    /*
+     * Punt overlaps.
+     */
+    if (memcmp(a_max, b_min, length) >= 0)
+      return 0;
+
+    /*
+     * Merge if a and b are adjacent.  We check for
+     * adjacency by subtracting one from b_min first.
+     */
+    for (j = length - 1; j >= 0 && b_min[j]-- == 0x00; j--)
+      ;
+    if (memcmp(a_max, b_min, length) == 0) {
+      IPAddressOrRange *merged;
+      if (!make_addressRange(&merged, a_min, b_max, length))
+        return 0;
+      sk_IPAddressOrRange_set(aors, i, merged);
+      sk_IPAddressOrRange_delete(aors, i + 1);
+      IPAddressOrRange_free(a);
+      IPAddressOrRange_free(b);
+      --i;
+      continue;
+    }
+  }
+
+  return 1;
+}
+
+/*
+ * Whack an IPAddrBlocks extension into canonical form.
+ */
+int v3_addr_canonize(IPAddrBlocks *addr)
+{
+  int i;
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
+    if (f->ipAddressChoice->type == IPAddressChoice_addressesOrRanges &&
+        !IPAddressOrRanges_canonize(f->ipAddressChoice->u.addressesOrRanges,
+                                    v3_addr_get_afi(f)))
+      return 0;
+  }
+  sk_IPAddressFamily_sort(addr);
+  assert(v3_addr_is_canonical(addr));
+  return 1;
+}
+
+/*
+ * v2i handler for the IPAddrBlocks extension.
+ */
+static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
+                              struct v3_ext_ctx *ctx,
+                              STACK_OF(CONF_VALUE) *values)
+{
+  static const char v4addr_chars[] = "0123456789.";
+  static const char v6addr_chars[] = "0123456789.:abcdefABCDEF";
+  IPAddrBlocks *addr = NULL;
+  char *s = NULL, *t;
+  int i;
+  
+  if ((addr = sk_IPAddressFamily_new(IPAddressFamily_cmp)) == NULL) {
+    X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+    return NULL;
+  }
+
+  for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
+    CONF_VALUE *val = sk_CONF_VALUE_value(values, i);
+    unsigned char min[ADDR_RAW_BUF_LEN], max[ADDR_RAW_BUF_LEN];
+    unsigned afi, *safi = NULL, safi_;
+    const char *addr_chars;
+    int prefixlen, i1, i2, delim, length;
+
+    if (       !name_cmp(val->name, "IPv4")) {
+      afi = IANA_AFI_IPV4;
+    } else if (!name_cmp(val->name, "IPv6")) {
+      afi = IANA_AFI_IPV6;
+    } else if (!name_cmp(val->name, "IPv4-SAFI")) {
+      afi = IANA_AFI_IPV4;
+      safi = &safi_;
+    } else if (!name_cmp(val->name, "IPv6-SAFI")) {
+      afi = IANA_AFI_IPV6;
+      safi = &safi_;
+    } else {
+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_NAME_ERROR);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    switch (afi) {
+    case IANA_AFI_IPV4:
+      addr_chars = v4addr_chars;
+      break;
+    case IANA_AFI_IPV6:
+      addr_chars = v6addr_chars;
+      break;
+    }
+
+    length = length_from_afi(afi);
+
+    /*
+     * Handle SAFI, if any, and BUF_strdup() so we can null-terminate
+     * the other input values.
+     */
+    if (safi != NULL) {
+      *safi = strtoul(val->value, &t, 0);
+      t += strspn(t, " \t");
+      if (*safi > 0xFF || *t++ != ':') {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_SAFI);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      t += strspn(t, " \t");
+      s = BUF_strdup(t);
+    } else {
+      s = BUF_strdup(val->value);
+    }
+    if (s == NULL) {
+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+      goto err;
+    }
+
+    /*
+     * Check for inheritance.  Not worth additional complexity to
+     * optimize this (seldom-used) case.
+     */
+    if (!strcmp(s, "inherit")) {
+      if (!v3_addr_add_inherit(addr, afi, safi)) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_INHERITANCE);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      OPENSSL_free(s);
+      s = NULL;
+      continue;
+    }
+
+    i1 = strspn(s, addr_chars);
+    i2 = i1 + strspn(s + i1, " \t");
+    delim = s[i2++];
+    s[i1] = '\0';
+
+    if (a2i_ipadd(min, s) != length) {
+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    switch (delim) {
+    case '/':
+      prefixlen = (int) strtoul(s + i2, &t, 10);
+      if (t == s + i2 || *t != '\0') {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      if (!v3_addr_add_prefix(addr, afi, safi, min, prefixlen)) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+      break;
+    case '-':
+      i1 = i2 + strspn(s + i2, " \t");
+      i2 = i1 + strspn(s + i1, addr_chars);
+      if (i1 == i2 || s[i2] != '\0') {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      if (a2i_ipadd(max, s + i1) != length) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_INVALID_IPADDRESS);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      if (!v3_addr_add_range(addr, afi, safi, min, max)) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+      break;
+    case '\0':
+      if (!v3_addr_add_prefix(addr, afi, safi, min, length * 8)) {
+        X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+      break;
+    default:
+      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, X509V3_R_EXTENSION_VALUE_ERROR);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    OPENSSL_free(s);
+    s = NULL;
+  }
+
+  /*
+   * Canonize the result, then we're done.
+   */
+  if (!v3_addr_canonize(addr))
+    goto err;    
+  return addr;
+
+ err:
+  OPENSSL_free(s);
+  sk_IPAddressFamily_pop_free(addr, IPAddressFamily_free);
+  return NULL;
+}
+
+/*
+ * OpenSSL dispatch
+ */
+const X509V3_EXT_METHOD v3_addr = {
+  NID_sbgp_ipAddrBlock,         /* nid */
+  0,                            /* flags */
+  ASN1_ITEM_ref(IPAddrBlocks),  /* template */
+  0, 0, 0, 0,                   /* old functions, ignored */
+  0,                            /* i2s */
+  0,                            /* s2i */
+  0,                            /* i2v */
+  v2i_IPAddrBlocks,             /* v2i */
+  i2r_IPAddrBlocks,             /* i2r */
+  0,                            /* r2i */
+  NULL                          /* extension-specific data */
+};
+
+/*
+ * Figure out whether extension sues inheritance.
+ */
+int v3_addr_inherits(IPAddrBlocks *addr)
+{
+  int i;
+  if (addr == NULL)
+    return 0;
+  for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
+    IPAddressFamily *f = sk_IPAddressFamily_value(addr, i);
+    if (f->ipAddressChoice->type == IPAddressChoice_inherit)
+      return 1;
+  }
+  return 0;
+}
+
+/*
+ * Figure out whether parent contains child.
+ */
+static int addr_contains(IPAddressOrRanges *parent,
+                         IPAddressOrRanges *child,
+                         int length)
+{
+  unsigned char p_min[ADDR_RAW_BUF_LEN], p_max[ADDR_RAW_BUF_LEN];
+  unsigned char c_min[ADDR_RAW_BUF_LEN], c_max[ADDR_RAW_BUF_LEN];
+  int p, c;
+
+  if (child == NULL || parent == child)
+    return 1;
+  if (parent == NULL)
+    return 0;
+
+  p = 0;
+  for (c = 0; c < sk_IPAddressOrRange_num(child); c++) {
+    extract_min_max(sk_IPAddressOrRange_value(child, c),
+                    c_min, c_max, length);
+    for (;; p++) {
+      if (p >= sk_IPAddressOrRange_num(parent))
+        return 0;
+      extract_min_max(sk_IPAddressOrRange_value(parent, p),
+                      p_min, p_max, length);
+      if (memcmp(p_max, c_max, length) < 0)
+        continue;
+      if (memcmp(p_min, c_min, length) > 0)
+        return 0;
+      break;
+    }
+  }
+
+  return 1;
+}
+
+/*
+ * Test whether a is a subset of b.
+ */
+int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b)
+{
+  int i;
+  if (a == NULL || a == b)
+    return 1;
+  if (b == NULL || v3_addr_inherits(a) || v3_addr_inherits(b))
+    return 0;
+  sk_IPAddressFamily_set_cmp_func(b, IPAddressFamily_cmp);
+  for (i = 0; i < sk_IPAddressFamily_num(a); i++) {
+    IPAddressFamily *fa = sk_IPAddressFamily_value(a, i);
+    int j = sk_IPAddressFamily_find(b, fa);
+    IPAddressFamily *fb = sk_IPAddressFamily_value(b, j);
+    if (!addr_contains(fb->ipAddressChoice->u.addressesOrRanges, 
+                       fa->ipAddressChoice->u.addressesOrRanges,
+                       length_from_afi(v3_addr_get_afi(fb))))
+      return 0;
+  }
+  return 1;
+}
+
+/*
+ * Validation error handling via callback.
+ */
+#define validation_err(_err_)           \
+  do {                                  \
+    if (ctx != NULL) {                  \
+      ctx->error = _err_;               \
+      ctx->error_depth = i;             \
+      ctx->current_cert = x;            \
+      ret = ctx->verify_cb(0, ctx);     \
+    } else {                            \
+      ret = 0;                          \
+    }                                   \
+    if (!ret)                           \
+      goto done;                        \
+  } while (0)
+
+/*
+ * Core code for RFC 3779 2.3 path validation.
+ */
+static int v3_addr_validate_path_internal(X509_STORE_CTX *ctx,
+                                          STACK_OF(X509) *chain,
+                                          IPAddrBlocks *ext)
+{
+  IPAddrBlocks *child = NULL;
+  int i, j, ret = 1;
+  X509 *x = NULL;
+
+  assert(chain != NULL && sk_X509_num(chain) > 0);
+  assert(ctx != NULL || ext != NULL);
+  assert(ctx == NULL || ctx->verify_cb != NULL);
+
+  /*
+   * Figure out where to start.  If we don't have an extension to
+   * check, we're done.  Otherwise, check canonical form and
+   * set up for walking up the chain.
+   */
+  if (ext != NULL) {
+    i = -1;
+  } else {
+    i = 0;
+    x = sk_X509_value(chain, i);
+    assert(x != NULL);
+    if ((ext = x->rfc3779_addr) == NULL)
+      goto done;
+  }
+  if (!v3_addr_is_canonical(ext))
+    validation_err(X509_V_ERR_INVALID_EXTENSION);
+  sk_IPAddressFamily_set_cmp_func(ext, IPAddressFamily_cmp);
+  if ((child = sk_IPAddressFamily_dup(ext)) == NULL) {
+    X509V3err(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL, ERR_R_MALLOC_FAILURE);
+    ret = 0;
+    goto done;
+  }
+
+  /*
+   * Now walk up the chain.  No cert may list resources that its
+   * parent doesn't list.
+   */
+  for (i++; i < sk_X509_num(chain); i++) {
+    x = sk_X509_value(chain, i);
+    assert(x != NULL);
+    if (!v3_addr_is_canonical(x->rfc3779_addr))
+      validation_err(X509_V_ERR_INVALID_EXTENSION);
+    if (x->rfc3779_addr == NULL) {
+      for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
+        IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
+        if (fc->ipAddressChoice->type != IPAddressChoice_inherit) {
+          validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+          break;
+        }
+      }
+      continue;
+    }
+    sk_IPAddressFamily_set_cmp_func(x->rfc3779_addr, IPAddressFamily_cmp);
+    for (j = 0; j < sk_IPAddressFamily_num(child); j++) {
+      IPAddressFamily *fc = sk_IPAddressFamily_value(child, j);
+      int k = sk_IPAddressFamily_find(x->rfc3779_addr, fc);
+      IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, k);
+      if (fp == NULL) {
+        if (fc->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
+          validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+          break;
+        }
+        continue;
+      }
+      if (fp->ipAddressChoice->type == IPAddressChoice_addressesOrRanges) {
+        if (fc->ipAddressChoice->type == IPAddressChoice_inherit ||
+            addr_contains(fp->ipAddressChoice->u.addressesOrRanges, 
+                          fc->ipAddressChoice->u.addressesOrRanges,
+                          length_from_afi(v3_addr_get_afi(fc))))
+          sk_IPAddressFamily_set(child, j, fp);
+        else
+          validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      }
+    }
+  }
+
+  /*
+   * Trust anchor can't inherit.
+   */
+  if (x->rfc3779_addr != NULL) {
+    for (j = 0; j < sk_IPAddressFamily_num(x->rfc3779_addr); j++) {
+      IPAddressFamily *fp = sk_IPAddressFamily_value(x->rfc3779_addr, j);
+      if (fp->ipAddressChoice->type == IPAddressChoice_inherit &&
+          sk_IPAddressFamily_find(child, fp) >= 0)
+        validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+    }
+  }
+
+ done:
+  sk_IPAddressFamily_free(child);
+  return ret;
+}
+
+#undef validation_err
+
+/*
+ * RFC 3779 2.3 path validation -- called from X509_verify_cert().
+ */
+int v3_addr_validate_path(X509_STORE_CTX *ctx)
+{
+  return v3_addr_validate_path_internal(ctx, ctx->chain, NULL);
+}
+
+/*
+ * RFC 3779 2.3 path validation of an extension.
+ * Test whether chain covers extension.
+ */
+int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
+                                  IPAddrBlocks *ext,
+                                  int allow_inheritance)
+{
+  if (ext == NULL)
+    return 1;
+  if (chain == NULL || sk_X509_num(chain) == 0)
+    return 0;
+  if (!allow_inheritance && v3_addr_inherits(ext))
+    return 0;
+  return v3_addr_validate_path_internal(NULL, chain, ext);
+}
+
+#endif /* OPENSSL_NO_RFC3779 */
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_asid.c b/src/lib/libssl/src/crypto/x509v3/v3_asid.c
new file mode 100644
index 0000000000..271930f967
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/v3_asid.c
@@ -0,0 +1,842 @@
+/*
+ * Contributed to the OpenSSL Project by the American Registry for
+ * Internet Numbers ("ARIN").
+ */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ */
+
+/*
+ * Implementation of RFC 3779 section 3.2.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "cryptlib.h"
+#include <openssl/conf.h>
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
+#include <openssl/x509v3.h>
+#include <openssl/x509.h>
+#include <openssl/bn.h>
+
+#ifndef OPENSSL_NO_RFC3779
+
+/*
+ * OpenSSL ASN.1 template translation of RFC 3779 3.2.3.
+ */
+
+ASN1_SEQUENCE(ASRange) = {
+  ASN1_SIMPLE(ASRange, min, ASN1_INTEGER),
+  ASN1_SIMPLE(ASRange, max, ASN1_INTEGER)
+} ASN1_SEQUENCE_END(ASRange)
+
+ASN1_CHOICE(ASIdOrRange) = {
+  ASN1_SIMPLE(ASIdOrRange, u.id,    ASN1_INTEGER),
+  ASN1_SIMPLE(ASIdOrRange, u.range, ASRange)
+} ASN1_CHOICE_END(ASIdOrRange)
+
+ASN1_CHOICE(ASIdentifierChoice) = {
+  ASN1_SIMPLE(ASIdentifierChoice,      u.inherit,       ASN1_NULL),
+  ASN1_SEQUENCE_OF(ASIdentifierChoice, u.asIdsOrRanges, ASIdOrRange)
+} ASN1_CHOICE_END(ASIdentifierChoice)
+
+ASN1_SEQUENCE(ASIdentifiers) = {
+  ASN1_EXP_OPT(ASIdentifiers, asnum, ASIdentifierChoice, 0),
+  ASN1_EXP_OPT(ASIdentifiers, rdi,   ASIdentifierChoice, 1)
+} ASN1_SEQUENCE_END(ASIdentifiers)
+
+IMPLEMENT_ASN1_FUNCTIONS(ASRange)
+IMPLEMENT_ASN1_FUNCTIONS(ASIdOrRange)
+IMPLEMENT_ASN1_FUNCTIONS(ASIdentifierChoice)
+IMPLEMENT_ASN1_FUNCTIONS(ASIdentifiers)
+
+/*
+ * i2r method for an ASIdentifierChoice.
+ */
+static int i2r_ASIdentifierChoice(BIO *out,
+                                  ASIdentifierChoice *choice,
+                                  int indent,
+                                  const char *msg)
+{
+  int i;
+  char *s;
+  if (choice == NULL)
+    return 1;
+  BIO_printf(out, "%*s%s:\n", indent, "", msg);
+  switch (choice->type) {
+  case ASIdentifierChoice_inherit:
+    BIO_printf(out, "%*sinherit\n", indent + 2, "");
+    break;
+  case ASIdentifierChoice_asIdsOrRanges:
+    for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges); i++) {
+      ASIdOrRange *aor = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
+      switch (aor->type) {
+      case ASIdOrRange_id:
+        if ((s = i2s_ASN1_INTEGER(NULL, aor->u.id)) == NULL)
+          return 0;
+        BIO_printf(out, "%*s%s\n", indent + 2, "", s);
+        OPENSSL_free(s);
+        break;
+      case ASIdOrRange_range:
+        if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->min)) == NULL)
+          return 0;
+        BIO_printf(out, "%*s%s-", indent + 2, "", s);
+        OPENSSL_free(s);
+        if ((s = i2s_ASN1_INTEGER(NULL, aor->u.range->max)) == NULL)
+          return 0;
+        BIO_printf(out, "%s\n", s);
+        OPENSSL_free(s);
+        break;
+      default:
+        return 0;
+      }
+    }
+    break;
+  default:
+    return 0;
+  }
+  return 1;
+}
+
+/*
+ * i2r method for an ASIdentifier extension.
+ */
+static int i2r_ASIdentifiers(X509V3_EXT_METHOD *method,
+                             void *ext,
+                             BIO *out,
+                             int indent)
+{
+  ASIdentifiers *asid = ext;
+  return (i2r_ASIdentifierChoice(out, asid->asnum, indent,
+                                 "Autonomous System Numbers") &&
+          i2r_ASIdentifierChoice(out, asid->rdi, indent,
+                                 "Routing Domain Identifiers"));
+}
+
+/*
+ * Sort comparision function for a sequence of ASIdOrRange elements.
+ */
+static int ASIdOrRange_cmp(const ASIdOrRange * const *a_,
+                           const ASIdOrRange * const *b_)
+{
+  const ASIdOrRange *a = *a_, *b = *b_;
+
+  assert((a->type == ASIdOrRange_id && a->u.id != NULL) ||
+         (a->type == ASIdOrRange_range && a->u.range != NULL &&
+          a->u.range->min != NULL && a->u.range->max != NULL));
+
+  assert((b->type == ASIdOrRange_id && b->u.id != NULL) ||
+         (b->type == ASIdOrRange_range && b->u.range != NULL &&
+          b->u.range->min != NULL && b->u.range->max != NULL));
+
+  if (a->type == ASIdOrRange_id && b->type == ASIdOrRange_id)
+    return ASN1_INTEGER_cmp(a->u.id, b->u.id);
+
+  if (a->type == ASIdOrRange_range && b->type == ASIdOrRange_range) {
+    int r = ASN1_INTEGER_cmp(a->u.range->min, b->u.range->min);
+    return r != 0 ? r : ASN1_INTEGER_cmp(a->u.range->max, b->u.range->max);
+  }
+
+  if (a->type == ASIdOrRange_id)
+    return ASN1_INTEGER_cmp(a->u.id, b->u.range->min);
+  else
+    return ASN1_INTEGER_cmp(a->u.range->min, b->u.id);
+}
+
+/*
+ * Add an inherit element.
+ */
+int v3_asid_add_inherit(ASIdentifiers *asid, int which)
+{
+  ASIdentifierChoice **choice;
+  if (asid == NULL)
+    return 0;
+  switch (which) {
+  case V3_ASID_ASNUM:
+    choice = &asid->asnum;
+    break;
+  case V3_ASID_RDI:
+    choice = &asid->rdi;
+    break;
+  default:
+    return 0;
+  }
+  if (*choice == NULL) {
+    if ((*choice = ASIdentifierChoice_new()) == NULL)
+      return 0;
+    assert((*choice)->u.inherit == NULL);
+    if (((*choice)->u.inherit = ASN1_NULL_new()) == NULL)
+      return 0;
+    (*choice)->type = ASIdentifierChoice_inherit;
+  }
+  return (*choice)->type == ASIdentifierChoice_inherit;
+}
+
+/*
+ * Add an ID or range to an ASIdentifierChoice.
+ */
+int v3_asid_add_id_or_range(ASIdentifiers *asid,
+                            int which,
+                            ASN1_INTEGER *min,
+                            ASN1_INTEGER *max)
+{
+  ASIdentifierChoice **choice;
+  ASIdOrRange *aor;
+  if (asid == NULL)
+    return 0;
+  switch (which) {
+  case V3_ASID_ASNUM:
+    choice = &asid->asnum;
+    break;
+  case V3_ASID_RDI:
+    choice = &asid->rdi;
+    break;
+  default:
+    return 0;
+  }
+  if (*choice != NULL && (*choice)->type == ASIdentifierChoice_inherit)
+    return 0;
+  if (*choice == NULL) {
+    if ((*choice = ASIdentifierChoice_new()) == NULL)
+      return 0;
+    assert((*choice)->u.asIdsOrRanges == NULL);
+    (*choice)->u.asIdsOrRanges = sk_ASIdOrRange_new(ASIdOrRange_cmp);
+    if ((*choice)->u.asIdsOrRanges == NULL)
+      return 0;
+    (*choice)->type = ASIdentifierChoice_asIdsOrRanges;
+  }
+  if ((aor = ASIdOrRange_new()) == NULL)
+    return 0;
+  if (max == NULL) {
+    aor->type = ASIdOrRange_id;
+    aor->u.id = min;
+  } else {
+    aor->type = ASIdOrRange_range;
+    if ((aor->u.range = ASRange_new()) == NULL)
+      goto err;
+    ASN1_INTEGER_free(aor->u.range->min);
+    aor->u.range->min = min;
+    ASN1_INTEGER_free(aor->u.range->max);
+    aor->u.range->max = max;
+  }
+  if (!(sk_ASIdOrRange_push((*choice)->u.asIdsOrRanges, aor)))
+    goto err;
+  return 1;
+
+ err:
+  ASIdOrRange_free(aor);
+  return 0;
+}
+
+/*
+ * Extract min and max values from an ASIdOrRange.
+ */
+static void extract_min_max(ASIdOrRange *aor,
+                            ASN1_INTEGER **min,
+                            ASN1_INTEGER **max)
+{
+  assert(aor != NULL && min != NULL && max != NULL);
+  switch (aor->type) {
+  case ASIdOrRange_id:
+    *min = aor->u.id;
+    *max = aor->u.id;
+    return;
+  case ASIdOrRange_range:
+    *min = aor->u.range->min;
+    *max = aor->u.range->max;
+    return;
+  }
+}
+
+/*
+ * Check whether an ASIdentifierChoice is in canonical form.
+ */
+static int ASIdentifierChoice_is_canonical(ASIdentifierChoice *choice)
+{
+  ASN1_INTEGER *a_max_plus_one = NULL;
+  BIGNUM *bn = NULL;
+  int i, ret = 0;
+
+  /*
+   * Empty element or inheritance is canonical.
+   */
+  if (choice == NULL || choice->type == ASIdentifierChoice_inherit)
+    return 1;
+
+  /*
+   * If not a list, or if empty list, it's broken.
+   */
+  if (choice->type != ASIdentifierChoice_asIdsOrRanges ||
+      sk_ASIdOrRange_num(choice->u.asIdsOrRanges) == 0)
+    return 0;
+
+  /*
+   * It's a list, check it.
+   */
+  for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
+    ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
+    ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
+    ASN1_INTEGER *a_min, *a_max, *b_min, *b_max;
+
+    extract_min_max(a, &a_min, &a_max);
+    extract_min_max(b, &b_min, &b_max);
+
+    /*
+     * Punt misordered list, overlapping start, or inverted range.
+     */
+    if (ASN1_INTEGER_cmp(a_min, b_min) >= 0 ||
+        ASN1_INTEGER_cmp(a_min, a_max) > 0 ||
+        ASN1_INTEGER_cmp(b_min, b_max) > 0)
+      goto done;
+
+    /*
+     * Calculate a_max + 1 to check for adjacency.
+     */
+    if ((bn == NULL && (bn = BN_new()) == NULL) ||
+        ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
+        !BN_add_word(bn, 1) ||
+        (a_max_plus_one = BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL,
+                ERR_R_MALLOC_FAILURE);
+      goto done;
+    }
+    
+    /*
+     * Punt if adjacent or overlapping.
+     */
+    if (ASN1_INTEGER_cmp(a_max_plus_one, b_min) >= 0)
+      goto done;
+  }
+
+  ret = 1;
+
+ done:
+  ASN1_INTEGER_free(a_max_plus_one);
+  BN_free(bn);
+  return ret;
+}
+
+/*
+ * Check whether an ASIdentifier extension is in canonical form.
+ */
+int v3_asid_is_canonical(ASIdentifiers *asid)
+{
+  return (asid == NULL ||
+          (ASIdentifierChoice_is_canonical(asid->asnum) ||
+           ASIdentifierChoice_is_canonical(asid->rdi)));
+}
+
+/*
+ * Whack an ASIdentifierChoice into canonical form.
+ */
+static int ASIdentifierChoice_canonize(ASIdentifierChoice *choice)
+{
+  ASN1_INTEGER *a_max_plus_one = NULL;
+  BIGNUM *bn = NULL;
+  int i, ret = 0;
+
+  /*
+   * Nothing to do for empty element or inheritance.
+   */
+  if (choice == NULL || choice->type == ASIdentifierChoice_inherit)
+    return 1;
+
+  /*
+   * We have a list.  Sort it.
+   */
+  assert(choice->type == ASIdentifierChoice_asIdsOrRanges);
+  sk_ASIdOrRange_sort(choice->u.asIdsOrRanges);
+
+  /*
+   * Now check for errors and suboptimal encoding, rejecting the
+   * former and fixing the latter.
+   */
+  for (i = 0; i < sk_ASIdOrRange_num(choice->u.asIdsOrRanges) - 1; i++) {
+    ASIdOrRange *a = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i);
+    ASIdOrRange *b = sk_ASIdOrRange_value(choice->u.asIdsOrRanges, i + 1);
+    ASN1_INTEGER *a_min, *a_max, *b_min, *b_max;
+
+    extract_min_max(a, &a_min, &a_max);
+    extract_min_max(b, &b_min, &b_max);
+
+    /*
+     * Make sure we're properly sorted (paranoia).
+     */
+    assert(ASN1_INTEGER_cmp(a_min, b_min) <= 0);
+
+    /*
+     * Check for overlaps.
+     */
+    if (ASN1_INTEGER_cmp(a_max, b_min) >= 0) {
+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
+                X509V3_R_EXTENSION_VALUE_ERROR);
+      goto done;
+    }
+
+    /*
+     * Calculate a_max + 1 to check for adjacency.
+     */
+    if ((bn == NULL && (bn = BN_new()) == NULL) ||
+        ASN1_INTEGER_to_BN(a_max, bn) == NULL ||
+        !BN_add_word(bn, 1) ||
+        (a_max_plus_one = BN_to_ASN1_INTEGER(bn, a_max_plus_one)) == NULL) {
+      X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE, ERR_R_MALLOC_FAILURE);
+      goto done;
+    }
+    
+    /*
+     * If a and b are adjacent, merge them.
+     */
+    if (ASN1_INTEGER_cmp(a_max_plus_one, b_min) == 0) {
+      ASRange *r;
+      switch (a->type) {
+      case ASIdOrRange_id:
+        if ((r = OPENSSL_malloc(sizeof(ASRange))) == NULL) {
+          X509V3err(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE,
+                    ERR_R_MALLOC_FAILURE);
+          goto done;
+        }
+        r->min = a_min;
+        r->max = b_max;
+        a->type = ASIdOrRange_range;
+        a->u.range = r;
+        break;
+      case ASIdOrRange_range:
+        ASN1_INTEGER_free(a->u.range->max);
+        a->u.range->max = b_max;
+        break;
+      }
+      switch (b->type) {
+      case ASIdOrRange_id:
+        b->u.id = NULL;
+        break;
+      case ASIdOrRange_range:
+        b->u.range->max = NULL;
+        break;
+      }
+      ASIdOrRange_free(b);
+      sk_ASIdOrRange_delete(choice->u.asIdsOrRanges, i + 1);
+      i--;
+      continue;
+    }
+  }
+
+  assert(ASIdentifierChoice_is_canonical(choice)); /* Paranoia */
+
+  ret = 1;
+
+ done:
+  ASN1_INTEGER_free(a_max_plus_one);
+  BN_free(bn);
+  return ret;
+}
+
+/*
+ * Whack an ASIdentifier extension into canonical form.
+ */
+int v3_asid_canonize(ASIdentifiers *asid)
+{
+  return (asid == NULL ||
+          (ASIdentifierChoice_canonize(asid->asnum) &&
+           ASIdentifierChoice_canonize(asid->rdi)));
+}
+
+/*
+ * v2i method for an ASIdentifier extension.
+ */
+static void *v2i_ASIdentifiers(struct v3_ext_method *method,
+                               struct v3_ext_ctx *ctx,
+                               STACK_OF(CONF_VALUE) *values)
+{
+  ASIdentifiers *asid = NULL;
+  int i;
+
+  if ((asid = ASIdentifiers_new()) == NULL) {
+    X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+    return NULL;
+  }
+
+  for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
+    CONF_VALUE *val = sk_CONF_VALUE_value(values, i);
+    ASN1_INTEGER *min = NULL, *max = NULL;
+    int i1, i2, i3, is_range, which;
+
+    /*
+     * Figure out whether this is an AS or an RDI.
+     */
+    if (       !name_cmp(val->name, "AS")) {
+      which = V3_ASID_ASNUM;
+    } else if (!name_cmp(val->name, "RDI")) {
+      which = V3_ASID_RDI;
+    } else {
+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_EXTENSION_NAME_ERROR);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    /*
+     * Handle inheritance.
+     */
+    if (!strcmp(val->value, "inherit")) {
+      if (v3_asid_add_inherit(asid, which))
+        continue;
+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_INHERITANCE);
+      X509V3_conf_err(val);
+      goto err;
+    }
+
+    /*
+     * Number, range, or mistake, pick it apart and figure out which.
+     */
+    i1 = strspn(val->value, "0123456789");
+    if (val->value[i1] == '\0') {
+      is_range = 0;
+    } else {
+      is_range = 1;
+      i2 = i1 + strspn(val->value + i1, " \t");
+      if (val->value[i2] != '-') {
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASNUMBER);
+        X509V3_conf_err(val);
+        goto err;
+      }
+      i2++;
+      i2 = i2 + strspn(val->value + i2, " \t");
+      i3 = i2 + strspn(val->value + i2, "0123456789");
+      if (val->value[i3] != '\0') {
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, X509V3_R_INVALID_ASRANGE);
+        X509V3_conf_err(val);
+        goto err;
+      }
+    }
+
+    /*
+     * Syntax is ok, read and add it.
+     */
+    if (!is_range) {
+      if (!X509V3_get_value_int(val, &min)) {
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+    } else {
+      char *s = BUF_strdup(val->value);
+      if (s == NULL) {
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+      s[i1] = '\0';
+      min = s2i_ASN1_INTEGER(NULL, s);
+      max = s2i_ASN1_INTEGER(NULL, s + i2);
+      OPENSSL_free(s);
+      if (min == NULL || max == NULL) {
+        ASN1_INTEGER_free(min);
+        ASN1_INTEGER_free(max);
+        X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+        goto err;
+      }
+    }
+    if (!v3_asid_add_id_or_range(asid, which, min, max)) {
+      ASN1_INTEGER_free(min);
+      ASN1_INTEGER_free(max);
+      X509V3err(X509V3_F_V2I_ASIDENTIFIERS, ERR_R_MALLOC_FAILURE);
+      goto err;
+    }
+  }
+
+  /*
+   * Canonize the result, then we're done.
+   */
+  if (!v3_asid_canonize(asid))
+    goto err;
+  return asid;
+
+ err:
+  ASIdentifiers_free(asid);
+  return NULL;
+}
+
+/*
+ * OpenSSL dispatch.
+ */
+const X509V3_EXT_METHOD v3_asid = {
+  NID_sbgp_autonomousSysNum,    /* nid */
+  0,                            /* flags */
+  ASN1_ITEM_ref(ASIdentifiers), /* template */
+  0, 0, 0, 0,                   /* old functions, ignored */
+  0,                            /* i2s */
+  0,                            /* s2i */
+  0,                            /* i2v */
+  v2i_ASIdentifiers,            /* v2i */
+  i2r_ASIdentifiers,            /* i2r */
+  0,                            /* r2i */
+  NULL                          /* extension-specific data */
+};
+
+/*
+ * Figure out whether extension uses inheritance.
+ */
+int v3_asid_inherits(ASIdentifiers *asid)
+{
+  return (asid != NULL &&
+          ((asid->asnum != NULL &&
+            asid->asnum->type == ASIdentifierChoice_inherit) ||
+           (asid->rdi != NULL &&
+            asid->rdi->type == ASIdentifierChoice_inherit)));
+}
+
+/*
+ * Figure out whether parent contains child.
+ */
+static int asid_contains(ASIdOrRanges *parent, ASIdOrRanges *child)
+{
+  ASN1_INTEGER *p_min, *p_max, *c_min, *c_max;
+  int p, c;
+
+  if (child == NULL || parent == child)
+    return 1;
+  if (parent == NULL)
+    return 0;
+
+  p = 0;
+  for (c = 0; c < sk_ASIdOrRange_num(child); c++) {
+    extract_min_max(sk_ASIdOrRange_value(child, c), &c_min, &c_max);
+    for (;; p++) {
+      if (p >= sk_ASIdOrRange_num(parent))
+        return 0;
+      extract_min_max(sk_ASIdOrRange_value(parent, p), &p_min, &p_max);
+      if (ASN1_INTEGER_cmp(p_max, c_max) < 0)
+        continue;
+      if (ASN1_INTEGER_cmp(p_min, c_min) > 0)
+        return 0;
+      break;
+    }
+  }
+
+  return 1;
+}
+
+/*
+ * Test whether a is a subet of b.
+ */
+int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b)
+{
+  return (a == NULL ||
+          a == b ||
+          (b != NULL &&
+           !v3_asid_inherits(a) &&
+           !v3_asid_inherits(b) &&
+           asid_contains(b->asnum->u.asIdsOrRanges,
+                         a->asnum->u.asIdsOrRanges) &&
+           asid_contains(b->rdi->u.asIdsOrRanges,
+                         a->rdi->u.asIdsOrRanges)));
+}
+
+/*
+ * Validation error handling via callback.
+ */
+#define validation_err(_err_)           \
+  do {                                  \
+    if (ctx != NULL) {                  \
+      ctx->error = _err_;               \
+      ctx->error_depth = i;             \
+      ctx->current_cert = x;            \
+      ret = ctx->verify_cb(0, ctx);     \
+    } else {                            \
+      ret = 0;                          \
+    }                                   \
+    if (!ret)                           \
+      goto done;                        \
+  } while (0)
+
+/*
+ * Core code for RFC 3779 3.3 path validation.
+ */
+static int v3_asid_validate_path_internal(X509_STORE_CTX *ctx,
+                                          STACK_OF(X509) *chain,
+                                          ASIdentifiers *ext)
+{
+  ASIdOrRanges *child_as = NULL, *child_rdi = NULL;
+  int i, ret = 1, inherit_as = 0, inherit_rdi = 0;
+  X509 *x = NULL;
+
+  assert(chain != NULL && sk_X509_num(chain) > 0);
+  assert(ctx != NULL || ext != NULL);
+  assert(ctx == NULL || ctx->verify_cb != NULL);
+
+  /*
+   * Figure out where to start.  If we don't have an extension to
+   * check, we're done.  Otherwise, check canonical form and
+   * set up for walking up the chain.
+   */
+  if (ext != NULL) {
+    i = -1;
+  } else {
+    i = 0;
+    x = sk_X509_value(chain, i);
+    assert(x != NULL);
+    if ((ext = x->rfc3779_asid) == NULL)
+      goto done;
+  }
+  if (!v3_asid_is_canonical(ext))
+    validation_err(X509_V_ERR_INVALID_EXTENSION);
+  if (ext->asnum != NULL)  {
+    switch (ext->asnum->type) {
+    case ASIdentifierChoice_inherit:
+      inherit_as = 1;
+      break;
+    case ASIdentifierChoice_asIdsOrRanges:
+      child_as = ext->asnum->u.asIdsOrRanges;
+      break;
+    }
+  }
+  if (ext->rdi != NULL) {
+    switch (ext->rdi->type) {
+    case ASIdentifierChoice_inherit:
+      inherit_rdi = 1;
+      break;
+    case ASIdentifierChoice_asIdsOrRanges:
+      child_rdi = ext->rdi->u.asIdsOrRanges;
+      break;
+    }
+  }
+
+  /*
+   * Now walk up the chain.  Extensions must be in canonical form, no
+   * cert may list resources that its parent doesn't list.
+   */
+  for (i++; i < sk_X509_num(chain); i++) {
+    x = sk_X509_value(chain, i);
+    assert(x != NULL);
+    if (x->rfc3779_asid == NULL) {
+      if (child_as != NULL || child_rdi != NULL)
+        validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      continue;
+    }
+    if (!v3_asid_is_canonical(x->rfc3779_asid))
+      validation_err(X509_V_ERR_INVALID_EXTENSION);
+    if (x->rfc3779_asid->asnum == NULL && child_as != NULL) {
+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      child_as = NULL;
+      inherit_as = 0;
+    }
+    if (x->rfc3779_asid->asnum != NULL &&
+        x->rfc3779_asid->asnum->type == ASIdentifierChoice_asIdsOrRanges) {
+      if (inherit_as ||
+          asid_contains(x->rfc3779_asid->asnum->u.asIdsOrRanges, child_as)) {
+        child_as = x->rfc3779_asid->asnum->u.asIdsOrRanges;
+        inherit_as = 0;
+      } else {
+        validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      }
+    }
+    if (x->rfc3779_asid->rdi == NULL && child_rdi != NULL) {
+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      child_rdi = NULL;
+      inherit_rdi = 0;
+    }
+    if (x->rfc3779_asid->rdi != NULL &&
+        x->rfc3779_asid->rdi->type == ASIdentifierChoice_asIdsOrRanges) {
+      if (inherit_rdi ||
+          asid_contains(x->rfc3779_asid->rdi->u.asIdsOrRanges, child_rdi)) {
+        child_rdi = x->rfc3779_asid->rdi->u.asIdsOrRanges;
+        inherit_rdi = 0;
+      } else {
+        validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+      }
+    }
+  }
+
+  /*
+   * Trust anchor can't inherit.
+   */
+  if (x->rfc3779_asid != NULL) {
+    if (x->rfc3779_asid->asnum != NULL &&
+        x->rfc3779_asid->asnum->type == ASIdentifierChoice_inherit)
+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+    if (x->rfc3779_asid->rdi != NULL &&
+        x->rfc3779_asid->rdi->type == ASIdentifierChoice_inherit)
+      validation_err(X509_V_ERR_UNNESTED_RESOURCE);
+  }
+
+ done:
+  return ret;
+}
+
+#undef validation_err
+
+/*
+ * RFC 3779 3.3 path validation -- called from X509_verify_cert().
+ */
+int v3_asid_validate_path(X509_STORE_CTX *ctx)
+{
+  return v3_asid_validate_path_internal(ctx, ctx->chain, NULL);
+}
+
+/*
+ * RFC 3779 3.3 path validation of an extension.
+ * Test whether chain covers extension.
+ */
+int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
+                                  ASIdentifiers *ext,
+                                  int allow_inheritance)
+{
+  if (ext == NULL)
+    return 1;
+  if (chain == NULL || sk_X509_num(chain) == 0)
+    return 0;
+  if (!allow_inheritance && v3_asid_inherits(ext))
+    return 0;
+  return v3_asid_validate_path_internal(NULL, chain, ext);
+}
+
+#endif /* OPENSSL_NO_RFC3779 */
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_ncons.c b/src/lib/libssl/src/crypto/x509v3/v3_ncons.c
new file mode 100644
index 0000000000..42e7f5a879
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/v3_ncons.c
@@ -0,0 +1,220 @@
+/* v3_ncons.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
+
+static void *v2i_NAME_CONSTRAINTS(X509V3_EXT_METHOD *method,
+                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+static int i2r_NAME_CONSTRAINTS(X509V3_EXT_METHOD *method, 
+                                void *a, BIO *bp, int ind);
+static int do_i2r_name_constraints(X509V3_EXT_METHOD *method,
+                                STACK_OF(GENERAL_SUBTREE) *trees,
+                                        BIO *bp, int ind, char *name);
+static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip);
+
+const X509V3_EXT_METHOD v3_name_constraints = {
+        NID_name_constraints, 0,
+        ASN1_ITEM_ref(NAME_CONSTRAINTS),
+        0,0,0,0,
+        0,0,
+        0, v2i_NAME_CONSTRAINTS,
+        i2r_NAME_CONSTRAINTS,0,
+        NULL
+};
+
+ASN1_SEQUENCE(GENERAL_SUBTREE) = {
+        ASN1_SIMPLE(GENERAL_SUBTREE, base, GENERAL_NAME),
+        ASN1_IMP_OPT(GENERAL_SUBTREE, minimum, ASN1_INTEGER, 0),
+        ASN1_IMP_OPT(GENERAL_SUBTREE, maximum, ASN1_INTEGER, 1)
+} ASN1_SEQUENCE_END(GENERAL_SUBTREE)
+
+ASN1_SEQUENCE(NAME_CONSTRAINTS) = {
+        ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, permittedSubtrees,
+                                                        GENERAL_SUBTREE, 0),
+        ASN1_IMP_SEQUENCE_OF_OPT(NAME_CONSTRAINTS, excludedSubtrees,
+                                                        GENERAL_SUBTREE, 1),
+} ASN1_SEQUENCE_END(NAME_CONSTRAINTS)
+        
+
+IMPLEMENT_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
+IMPLEMENT_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
+
+static void *v2i_NAME_CONSTRAINTS(X509V3_EXT_METHOD *method,
+                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+        {
+        int i;
+        CONF_VALUE tval, *val;
+        STACK_OF(GENERAL_SUBTREE) **ptree = NULL;
+        NAME_CONSTRAINTS *ncons = NULL;
+        GENERAL_SUBTREE *sub = NULL;
+        ncons = NAME_CONSTRAINTS_new();
+        if (!ncons)
+                goto memerr;
+        for(i = 0; i < sk_CONF_VALUE_num(nval); i++)
+                {
+                val = sk_CONF_VALUE_value(nval, i);
+                if (!strncmp(val->name, "permitted", 9) && val->name[9])
+                        {
+                        ptree = &ncons->permittedSubtrees;
+                        tval.name = val->name + 10;
+                        }
+                else if (!strncmp(val->name, "excluded", 8) && val->name[8])
+                        {
+                        ptree = &ncons->excludedSubtrees;
+                        tval.name = val->name + 9;
+                        }
+                else
+                        {
+                        X509V3err(X509V3_F_V2I_NAME_CONSTRAINTS, X509V3_R_INVALID_SYNTAX);
+                        goto err;
+                        }
+                tval.value = val->value;
+                sub = GENERAL_SUBTREE_new();
+                if (!v2i_GENERAL_NAME_ex(sub->base, method, ctx, &tval, 1))
+                        goto err;
+                if (!*ptree)
+                        *ptree = sk_GENERAL_SUBTREE_new_null();
+                if (!*ptree || !sk_GENERAL_SUBTREE_push(*ptree, sub))
+                        goto memerr;
+                sub = NULL;
+                }
+
+        return ncons;
+
+        memerr:
+        X509V3err(X509V3_F_V2I_NAME_CONSTRAINTS, ERR_R_MALLOC_FAILURE);
+        err:
+        if (ncons)
+                NAME_CONSTRAINTS_free(ncons);
+        if (sub)
+                GENERAL_SUBTREE_free(sub);
+
+        return NULL;
+        }
+                        
+
+        
+
+static int i2r_NAME_CONSTRAINTS(X509V3_EXT_METHOD *method,
+                                void *a, BIO *bp, int ind)
+        {
+        NAME_CONSTRAINTS *ncons = a;
+        do_i2r_name_constraints(method, ncons->permittedSubtrees,
+                                        bp, ind, "Permitted");
+        do_i2r_name_constraints(method, ncons->excludedSubtrees,
+                                        bp, ind, "Excluded");
+        return 1;
+        }
+
+static int do_i2r_name_constraints(X509V3_EXT_METHOD *method,
+                                STACK_OF(GENERAL_SUBTREE) *trees,
+                                        BIO *bp, int ind, char *name)
+        {
+        GENERAL_SUBTREE *tree;
+        int i;
+        if (sk_GENERAL_SUBTREE_num(trees) > 0)
+                BIO_printf(bp, "%*s%s:\n", ind, "", name);
+        for(i = 0; i < sk_GENERAL_SUBTREE_num(trees); i++)
+                {
+                tree = sk_GENERAL_SUBTREE_value(trees, i);
+                BIO_printf(bp, "%*s", ind + 2, "");
+                if (tree->base->type == GEN_IPADD)
+                        print_nc_ipadd(bp, tree->base->d.ip);
+                else
+                        GENERAL_NAME_print(bp, tree->base);
+                tree = sk_GENERAL_SUBTREE_value(trees, i);
+                BIO_puts(bp, "\n");
+                }
+        return 1;
+        }
+
+static int print_nc_ipadd(BIO *bp, ASN1_OCTET_STRING *ip)
+        {
+        int i, len;
+        unsigned char *p;
+        p = ip->data;
+        len = ip->length;
+        BIO_puts(bp, "IP:");
+        if(len == 8)
+                {
+                BIO_printf(bp, "%d.%d.%d.%d/%d.%d.%d.%d",
+                                p[0], p[1], p[2], p[3],
+                                p[4], p[5], p[6], p[7]);
+                }
+        else if(len == 32)
+                {
+                for (i = 0; i < 16; i++)
+                        {
+                        BIO_printf(bp, "%X", p[0] << 8 | p[1]);
+                        p += 2;
+                        if (i == 7)
+                                BIO_puts(bp, "/");
+                        else if (i != 15)
+                                BIO_puts(bp, ":");
+                        }
+                }
+        else
+                BIO_printf(bp, "IP Address:<invalid>");
+        return 1;
+        }
+
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_pcons.c b/src/lib/libssl/src/crypto/x509v3/v3_pcons.c
new file mode 100644
index 0000000000..13248c2ada
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/v3_pcons.c
@@ -0,0 +1,136 @@
+/* v3_pcons.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/asn1.h>
+#include <openssl/asn1t.h>
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
+
+static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(X509V3_EXT_METHOD *method,
+                                void *bcons, STACK_OF(CONF_VALUE) *extlist);
+static void *v2i_POLICY_CONSTRAINTS(X509V3_EXT_METHOD *method,
+                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values);
+
+const X509V3_EXT_METHOD v3_policy_constraints = {
+NID_policy_constraints, 0,
+ASN1_ITEM_ref(POLICY_CONSTRAINTS),
+0,0,0,0,
+0,0,
+i2v_POLICY_CONSTRAINTS,
+v2i_POLICY_CONSTRAINTS,
+NULL,NULL,
+NULL
+};
+
+ASN1_SEQUENCE(POLICY_CONSTRAINTS) = {
+        ASN1_IMP_OPT(POLICY_CONSTRAINTS, requireExplicitPolicy, ASN1_INTEGER,0),
+        ASN1_IMP_OPT(POLICY_CONSTRAINTS, inhibitPolicyMapping, ASN1_INTEGER,1)
+} ASN1_SEQUENCE_END(POLICY_CONSTRAINTS)
+
+IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
+
+
+static STACK_OF(CONF_VALUE) *i2v_POLICY_CONSTRAINTS(X509V3_EXT_METHOD *method,
+             void *a, STACK_OF(CONF_VALUE) *extlist)
+{
+        POLICY_CONSTRAINTS *pcons = a;
+        X509V3_add_value_int("Require Explicit Policy",
+                        pcons->requireExplicitPolicy, &extlist);
+        X509V3_add_value_int("Inhibit Policy Mapping",
+                        pcons->inhibitPolicyMapping, &extlist);
+        return extlist;
+}
+
+static void *v2i_POLICY_CONSTRAINTS(X509V3_EXT_METHOD *method,
+             X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values)
+{
+        POLICY_CONSTRAINTS *pcons=NULL;
+        CONF_VALUE *val;
+        int i;
+        if(!(pcons = POLICY_CONSTRAINTS_new())) {
+                X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, ERR_R_MALLOC_FAILURE);
+                return NULL;
+        }
+        for(i = 0; i < sk_CONF_VALUE_num(values); i++) {
+                val = sk_CONF_VALUE_value(values, i);
+                if(!strcmp(val->name, "requireExplicitPolicy")) {
+                        if(!X509V3_get_value_int(val,
+                                &pcons->requireExplicitPolicy)) goto err;
+                } else if(!strcmp(val->name, "inhibitPolicyMapping")) {
+                        if(!X509V3_get_value_int(val,
+                                &pcons->inhibitPolicyMapping)) goto err;
+                } else {
+                        X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, X509V3_R_INVALID_NAME);
+                        X509V3_conf_err(val);
+                        goto err;
+                }
+        }
+        if (!pcons->inhibitPolicyMapping && !pcons->requireExplicitPolicy) {
+                X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, X509V3_R_ILLEGAL_EMPTY_EXTENSION);
+                goto err;
+        }
+
+        return pcons;
+        err:
+        POLICY_CONSTRAINTS_free(pcons);
+        return NULL;
+}
+
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_pmaps.c b/src/lib/libssl/src/crypto/x509v3/v3_pmaps.c
new file mode 100644
index 0000000000..626303264f
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x509v3/v3_pmaps.c
@@ -0,0 +1,153 @@
+/* v3_pmaps.c */
+/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2003 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+
+#include <stdio.h>
+#include "cryptlib.h"
+#include <openssl/asn1t.h>
+#include <openssl/conf.h>
+#include <openssl/x509v3.h>
+
+static void *v2i_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
+                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
+                                void *pmps, STACK_OF(CONF_VALUE) *extlist);
+
+const X509V3_EXT_METHOD v3_policy_mappings = {
+        NID_policy_mappings, 0,
+        ASN1_ITEM_ref(POLICY_MAPPINGS),
+        0,0,0,0,
+        0,0,
+        i2v_POLICY_MAPPINGS,
+        v2i_POLICY_MAPPINGS,
+        0,0,
+        NULL
+};
+
+ASN1_SEQUENCE(POLICY_MAPPING) = {
+        ASN1_SIMPLE(POLICY_MAPPING, issuerDomainPolicy, ASN1_OBJECT),
+        ASN1_SIMPLE(POLICY_MAPPING, subjectDomainPolicy, ASN1_OBJECT)
+} ASN1_SEQUENCE_END(POLICY_MAPPING)
+
+ASN1_ITEM_TEMPLATE(POLICY_MAPPINGS) = 
+        ASN1_EX_TEMPLATE_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, POLICY_MAPPINGS,
+                                                                POLICY_MAPPING)
+ASN1_ITEM_TEMPLATE_END(POLICY_MAPPINGS)
+
+IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
+
+
+static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
+                void *a, STACK_OF(CONF_VALUE) *ext_list)
+{
+        POLICY_MAPPINGS *pmaps = a;
+        POLICY_MAPPING *pmap;
+        int i;
+        char obj_tmp1[80];
+        char obj_tmp2[80];
+        for(i = 0; i < sk_POLICY_MAPPING_num(pmaps); i++) {
+                pmap = sk_POLICY_MAPPING_value(pmaps, i);
+                i2t_ASN1_OBJECT(obj_tmp1, 80, pmap->issuerDomainPolicy);
+                i2t_ASN1_OBJECT(obj_tmp2, 80, pmap->subjectDomainPolicy);
+                X509V3_add_value(obj_tmp1, obj_tmp2, &ext_list);
+        }
+        return ext_list;
+}
+
+static void *v2i_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
+                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
+{
+        POLICY_MAPPINGS *pmaps;
+        POLICY_MAPPING *pmap;
+        ASN1_OBJECT *obj1, *obj2;
+        CONF_VALUE *val;
+        int i;
+
+        if(!(pmaps = sk_POLICY_MAPPING_new_null())) {
+                X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,ERR_R_MALLOC_FAILURE);
+                return NULL;
+        }
+
+        for(i = 0; i < sk_CONF_VALUE_num(nval); i++) {
+                val = sk_CONF_VALUE_value(nval, i);
+                if(!val->value || !val->name) {
+                        sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free);
+                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,X509V3_R_INVALID_OBJECT_IDENTIFIER);
+                        X509V3_conf_err(val);
+                        return NULL;
+                }
+                obj1 = OBJ_txt2obj(val->name, 0);
+                obj2 = OBJ_txt2obj(val->value, 0);
+                if(!obj1 || !obj2) {
+                        sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free);
+                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,X509V3_R_INVALID_OBJECT_IDENTIFIER);
+                        X509V3_conf_err(val);
+                        return NULL;
+                }
+                pmap = POLICY_MAPPING_new();
+                if (!pmap) {
+                        sk_POLICY_MAPPING_pop_free(pmaps, POLICY_MAPPING_free);
+                        X509V3err(X509V3_F_V2I_POLICY_MAPPINGS,ERR_R_MALLOC_FAILURE);
+                        return NULL;
+                }
+                pmap->issuerDomainPolicy = obj1;
+                pmap->subjectDomainPolicy = obj2;
+                sk_POLICY_MAPPING_push(pmaps, pmap);
+        }
+        return pmaps;
+}
diff --git a/src/lib/libssl/src/crypto/x86_64cpuid.pl b/src/lib/libssl/src/crypto/x86_64cpuid.pl
new file mode 100644
index 0000000000..2616a03da6
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x86_64cpuid.pl
@@ -0,0 +1,159 @@
+#!/usr/bin/env perl
+
+$output=shift;
+$masm=1 if ($output =~ /\.asm/);
+open STDOUT,">$output" || die "can't open $output: $!";
+
+print<<___ if(defined($masm));
+_TEXT   SEGMENT
+PUBLIC  OPENSSL_rdtsc
+
+PUBLIC  OPENSSL_atomic_add
+ALIGN   16
+OPENSSL_atomic_add      PROC
+        mov     eax,DWORD PTR[rcx]
+\$Lspin:        lea     r8,DWORD PTR[rdx+rax]
+lock    cmpxchg DWORD PTR[rcx],r8d
+        jne     \$Lspin
+        mov     eax,r8d
+        cdqe    
+        ret
+OPENSSL_atomic_add      ENDP
+
+PUBLIC  OPENSSL_wipe_cpu
+ALIGN   16
+OPENSSL_wipe_cpu        PROC
+        pxor    xmm0,xmm0
+        pxor    xmm1,xmm1
+        pxor    xmm2,xmm2
+        pxor    xmm3,xmm3
+        pxor    xmm4,xmm4
+        pxor    xmm5,xmm5
+        xor     rcx,rcx
+        xor     rdx,rdx
+        xor     r8,r8
+        xor     r9,r9
+        xor     r10,r10
+        xor     r11,r11
+        lea     rax,QWORD PTR[rsp+8]
+        ret
+OPENSSL_wipe_cpu        ENDP
+_TEXT   ENDS
+
+CRT\$XIU        SEGMENT
+EXTRN   OPENSSL_cpuid_setup:PROC
+DQ      OPENSSL_cpuid_setup
+CRT\$XIU        ENDS
+
+___
+print<<___ if(!defined($masm));
+.text
+
+.globl  OPENSSL_atomic_add
+.type   OPENSSL_atomic_add,\@function
+.align  16
+OPENSSL_atomic_add:
+        movl    (%rdi),%eax
+.Lspin: leaq    (%rsi,%rax),%r8
+lock;   cmpxchgl        %r8d,(%rdi)
+        jne     .Lspin
+        movl    %r8d,%eax
+        .byte   0x48,0x98
+        ret
+.size   OPENSSL_atomic_add,.-OPENSSL_atomic_add
+
+.globl  OPENSSL_wipe_cpu
+.type   OPENSSL_wipe_cpu,\@function
+.align  16
+OPENSSL_wipe_cpu:
+        pxor    %xmm0,%xmm0
+        pxor    %xmm1,%xmm1
+        pxor    %xmm2,%xmm2
+        pxor    %xmm3,%xmm3
+        pxor    %xmm4,%xmm4
+        pxor    %xmm5,%xmm5
+        pxor    %xmm6,%xmm6
+        pxor    %xmm7,%xmm7
+        pxor    %xmm8,%xmm8
+        pxor    %xmm9,%xmm9
+        pxor    %xmm10,%xmm10
+        pxor    %xmm11,%xmm11
+        pxor    %xmm12,%xmm12
+        pxor    %xmm13,%xmm13
+        pxor    %xmm14,%xmm14
+        pxor    %xmm15,%xmm15
+        xorq    %rcx,%rcx
+        xorq    %rdx,%rdx
+        xorq    %rsi,%rsi
+        xorq    %rdi,%rdi
+        xorq    %r8,%r8
+        xorq    %r9,%r9
+        xorq    %r10,%r10
+        xorq    %r11,%r11
+        leaq    8(%rsp),%rax
+        ret
+.size   OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
+
+.section        .init
+        call    OPENSSL_cpuid_setup
+
+___
+
+open STDOUT,"| $^X perlasm/x86_64-xlate.pl $output";
+print<<___;
+.text
+
+.globl  OPENSSL_rdtsc
+.type   OPENSSL_rdtsc,\@abi-omnipotent
+.align  16
+OPENSSL_rdtsc:
+        rdtsc
+        shl     \$32,%rdx
+        or      %rdx,%rax
+        ret
+.size   OPENSSL_rdtsc,.-OPENSSL_rdtsc
+
+.globl  OPENSSL_ia32_cpuid
+.type   OPENSSL_ia32_cpuid,\@abi-omnipotent
+.align  16
+OPENSSL_ia32_cpuid:
+        mov     %rbx,%r8
+
+        xor     %eax,%eax
+        cpuid
+        xor     %eax,%eax
+        cmp     \$0x756e6547,%ebx       # "Genu"
+        setne   %al
+        mov     %eax,%r9d
+        cmp     \$0x49656e69,%edx       # "ineI"
+        setne   %al
+        or      %eax,%r9d
+        cmp     \$0x6c65746e,%ecx       # "ntel"
+        setne   %al
+        or      %eax,%r9d
+
+        mov     \$1,%eax
+        cpuid
+        cmp     \$0,%r9d
+        jne     .Lnotintel
+        or      \$0x00100000,%edx       # use reserved 20th bit to engage RC4_CHAR
+        and     \$15,%ah
+        cmp     \$15,%ah                # examine Family ID
+        je      .Lnotintel
+        or      \$0x40000000,%edx       # use reserved bit to skip unrolled loop
+.Lnotintel:
+        bt      \$28,%edx               # test hyper-threading bit
+        jnc     .Ldone
+        shr     \$16,%ebx
+        cmp     \$1,%bl                 # see if cache is shared
+        ja      .Ldone
+        and     \$0xefffffff,%edx       # ~(1<<28)
+.Ldone:
+        shl     \$32,%rcx
+        mov     %edx,%eax
+        mov     %r8,%rbx
+        or      %rcx,%rax
+        ret
+.size   OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid
+___
+close STDOUT;   # flush
diff --git a/src/lib/libssl/src/crypto/x86cpuid.pl b/src/lib/libssl/src/crypto/x86cpuid.pl
new file mode 100644
index 0000000000..4408ef2936
--- /dev/null
+++ b/src/lib/libssl/src/crypto/x86cpuid.pl
@@ -0,0 +1,225 @@
+#!/usr/bin/env perl
+
+push(@INC,"perlasm");
+require "x86asm.pl";
+
+&asm_init($ARGV[0],"x86cpuid");
+
+for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+
+&function_begin("OPENSSL_ia32_cpuid");
+        &xor    ("edx","edx");
+        &pushf  ();
+        &pop    ("eax");
+        &mov    ("ecx","eax");
+        &xor    ("eax",1<<21);
+        &push   ("eax");
+        &popf   ();
+        &pushf  ();
+        &pop    ("eax");
+        &xor    ("ecx","eax");
+        &bt     ("ecx",21);
+        &jnc    (&label("done"));
+        &xor    ("eax","eax");
+        &cpuid  ();
+        &xor    ("eax","eax");
+        &cmp    ("ebx",0x756e6547);     # "Genu"
+        &data_byte(0x0f,0x95,0xc0);     #&setne (&LB("eax"));
+        &mov    ("ebp","eax");
+        &cmp    ("edx",0x49656e69);     # "ineI"
+        &data_byte(0x0f,0x95,0xc0);     #&setne (&LB("eax"));
+        &or     ("ebp","eax");
+        &cmp    ("ecx",0x6c65746e);     # "ntel"
+        &data_byte(0x0f,0x95,0xc0);     #&setne (&LB("eax"));
+        &or     ("ebp","eax");
+        &mov    ("eax",1);
+        &cpuid  ();
+        &cmp    ("ebp",0);
+        &jne    (&label("notP4"));
+        &and    ("eax",15<<8);          # familiy ID
+        &cmp    ("eax",15<<8);          # P4?
+        &jne    (&label("notP4"));
+        &or     ("edx",1<<20);          # use reserved bit to engage RC4_CHAR
+&set_label("notP4");
+        &bt     ("edx",28);             # test hyper-threading bit
+        &jnc    (&label("done"));
+        &shr    ("ebx",16);
+        &and    ("ebx",0xff);
+        &cmp    ("ebx",1);              # see if cache is shared(*)
+        &ja     (&label("done"));
+        &and    ("edx",0xefffffff);     # clear hyper-threading bit if not
+&set_label("done");
+        &mov    ("eax","edx");
+        &mov    ("edx","ecx");
+&function_end("OPENSSL_ia32_cpuid");
+# (*)   on Core2 this value is set to 2 denoting the fact that L2
+#       cache is shared between cores.
+
+&external_label("OPENSSL_ia32cap_P");
+
+&function_begin_B("OPENSSL_rdtsc","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
+        &xor    ("eax","eax");
+        &xor    ("edx","edx");
+        &picmeup("ecx","OPENSSL_ia32cap_P");
+        &bt     (&DWP(0,"ecx"),4);
+        &jnc    (&label("notsc"));
+        &rdtsc  ();
+&set_label("notsc");
+        &ret    ();
+&function_end_B("OPENSSL_rdtsc");
+
+# This works in Ring 0 only [read DJGPP+MS-DOS+privileged DPMI host],
+# but it's safe to call it on any [supported] 32-bit platform...
+# Just check for [non-]zero return value...
+&function_begin_B("OPENSSL_instrument_halt","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
+        &picmeup("ecx","OPENSSL_ia32cap_P");
+        &bt     (&DWP(0,"ecx"),4);
+        &jnc    (&label("nohalt"));     # no TSC
+
+        &data_word(0x9058900e);         # push %cs; pop %eax
+        &and    ("eax",3);
+        &jnz    (&label("nohalt"));     # not enough privileges
+
+        &pushf  ();
+        &pop    ("eax")
+        &bt     ("eax",9);
+        &jnc    (&label("nohalt"));     # interrupts are disabled
+
+        &rdtsc  ();
+        &push   ("edx");
+        &push   ("eax");
+        &halt   ();
+        &rdtsc  ();
+
+        &sub    ("eax",&DWP(0,"esp"));
+        &sbb    ("edx",&DWP(4,"esp"));
+        &add    ("esp",8);
+        &ret    ();
+
+&set_label("nohalt");
+        &xor    ("eax","eax");
+        &xor    ("edx","edx");
+        &ret    ();
+&function_end_B("OPENSSL_instrument_halt");
+
+# Essentially there is only one use for this function. Under DJGPP:
+#
+#       #include <go32.h>
+#       ...
+#       i=OPENSSL_far_spin(_dos_ds,0x46c);
+#       ...
+# to obtain the number of spins till closest timer interrupt.
+
+&function_begin_B("OPENSSL_far_spin");
+        &pushf  ();
+        &pop    ("eax")
+        &bt     ("eax",9);
+        &jnc    (&label("nospin"));     # interrupts are disabled
+
+        &mov    ("eax",&DWP(4,"esp"));
+        &mov    ("ecx",&DWP(8,"esp"));
+        &data_word (0x90d88e1e);        # push %ds, mov %eax,%ds
+        &xor    ("eax","eax");
+        &mov    ("edx",&DWP(0,"ecx"));
+        &jmp    (&label("spin"));
+
+        &align  (16);
+&set_label("spin");
+        &inc    ("eax");
+        &cmp    ("edx",&DWP(0,"ecx"));
+        &je     (&label("spin"));
+
+        &data_word (0x1f909090);        # pop   %ds
+        &ret    ();
+
+&set_label("nospin");
+        &xor    ("eax","eax");
+        &xor    ("edx","edx");
+        &ret    ();
+&function_end_B("OPENSSL_far_spin");
+
+&function_begin_B("OPENSSL_wipe_cpu","EXTRN\t_OPENSSL_ia32cap_P:DWORD");
+        &xor    ("eax","eax");
+        &xor    ("edx","edx");
+        &picmeup("ecx","OPENSSL_ia32cap_P");
+        &mov    ("ecx",&DWP(0,"ecx"));
+        &bt     (&DWP(0,"ecx"),1);
+        &jnc    (&label("no_x87"));
+        if ($sse2) {
+                &bt     (&DWP(0,"ecx"),26);
+                &jnc    (&label("no_sse2"));
+                &pxor   ("xmm0","xmm0");
+                &pxor   ("xmm1","xmm1");
+                &pxor   ("xmm2","xmm2");
+                &pxor   ("xmm3","xmm3");
+                &pxor   ("xmm4","xmm4");
+                &pxor   ("xmm5","xmm5");
+                &pxor   ("xmm6","xmm6");
+                &pxor   ("xmm7","xmm7");
+        &set_label("no_sse2");
+        }
+        # just a bunch of fldz to zap the fp/mm bank followed by finit...
+        &data_word(0xeed9eed9,0xeed9eed9,0xeed9eed9,0xeed9eed9,0x90e3db9b);
+&set_label("no_x87");
+        &lea    ("eax",&DWP(4,"esp"));
+        &ret    ();
+&function_end_B("OPENSSL_wipe_cpu");
+
+&function_begin_B("OPENSSL_atomic_add");
+        &mov    ("edx",&DWP(4,"esp"));  # fetch the pointer, 1st arg
+        &mov    ("ecx",&DWP(8,"esp"));  # fetch the increment, 2nd arg
+        &push   ("ebx");
+        &nop    ();
+        &mov    ("eax",&DWP(0,"edx"));
+&set_label("spin");
+        &lea    ("ebx",&DWP(0,"eax","ecx"));
+        &nop    ();
+        &data_word(0x1ab10ff0); # lock; cmpxchg %ebx,(%edx)     # %eax is envolved and is always reloaded
+        &jne    (&label("spin"));
+        &mov    ("eax","ebx");  # OpenSSL expects the new value
+        &pop    ("ebx");
+        &ret    ();
+&function_end_B("OPENSSL_atomic_add");
+
+# This function can become handy under Win32 in situations when
+# we don't know which calling convention, __stdcall or __cdecl(*),
+# indirect callee is using. In C it can be deployed as
+#
+#ifdef OPENSSL_CPUID_OBJ
+#       type OPENSSL_indirect_call(void *f,...);
+#       ...
+#       OPENSSL_indirect_call(func,[up to $max arguments]);
+#endif
+#
+# (*)   it's designed to work even for __fastcall if number of
+#       arguments is 1 or 2!
+&function_begin_B("OPENSSL_indirect_call");
+        {
+        my $i,$max=7;           # $max has to be chosen as 4*n-1
+                                # in order to preserve eventual
+                                # stack alignment
+        &push   ("ebp");
+        &mov    ("ebp","esp");
+        &sub    ("esp",$max*4);
+        &mov    ("ecx",&DWP(12,"ebp"));
+        &mov    (&DWP(0,"esp"),"ecx");
+        &mov    ("edx",&DWP(16,"ebp"));
+        &mov    (&DWP(4,"esp"),"edx");
+        for($i=2;$i<$max;$i++)
+                {
+                # Some copies will be redundant/bogus...
+                &mov    ("eax",&DWP(12+$i*4,"ebp"));
+                &mov    (&DWP(0+$i*4,"esp"),"eax");
+                }
+        &call_ptr       (&DWP(8,"ebp"));# make the call...
+        &mov    ("esp","ebp");  # ... and just restore the stack pointer
+                                # without paying attention to what we called,
+                                # (__cdecl *func) or (__stdcall *one).
+        &pop    ("ebp");
+        &ret    ();
+        }
+&function_end_B("OPENSSL_indirect_call");
+
+&initseg("OPENSSL_cpuid_setup");
+
+&asm_finish();
diff --git a/src/lib/libssl/src/demos/ssltest-ecc/ECC-RSAcertgen.sh b/src/lib/libssl/src/demos/ssltest-ecc/ECC-RSAcertgen.sh
new file mode 100755
index 0000000000..b31a4f1ee0
--- /dev/null
+++ b/src/lib/libssl/src/demos/ssltest-ecc/ECC-RSAcertgen.sh
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# For a list of supported curves, use "apps/openssl ecparam -list_curves".
+
+# Path to the openssl distribution
+OPENSSL_DIR=../..
+# Path to the openssl program
+OPENSSL_CMD=$OPENSSL_DIR/apps/openssl
+# Option to find configuration file
+OPENSSL_CNF="-config $OPENSSL_DIR/apps/openssl.cnf"
+# Directory where certificates are stored
+CERTS_DIR=./Certs
+# Directory where private key files are stored
+KEYS_DIR=$CERTS_DIR
+# Directory where combo files (containing a certificate and corresponding
+# private key together) are stored
+COMBO_DIR=$CERTS_DIR
+# cat command
+CAT=/bin/cat
+# rm command
+RM=/bin/rm
+# mkdir command
+MKDIR=/bin/mkdir
+# The certificate will expire these many days after the issue date.
+DAYS=1500
+TEST_CA_FILE=rsa1024TestCA
+
+TEST_SERVER_CURVE=sect163r1
+TEST_SERVER_FILE=sect163r1-rsaTestServer
+TEST_SERVER_DN="/C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test Server (sect163r1 key signed with RSA)"
+
+TEST_CLIENT_CURVE=sect163r1
+TEST_CLIENT_FILE=sect163r1-rsaTestClient
+TEST_CLIENT_DN="/C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test Client (sect163r1 key signed with RSA)"
+
+# Generating an EC certificate involves the following main steps
+# 1. Generating curve parameters (if needed)
+# 2. Generating a certificate request
+# 3. Signing the certificate request 
+# 4. [Optional] One can combine the cert and private key into a single
+#    file and also delete the certificate request
+
+$MKDIR -p $CERTS_DIR
+$MKDIR -p $KEYS_DIR
+$MKDIR -p $COMBO_DIR
+
+echo "GENERATING A TEST SERVER CERTIFICATE (ECC key signed with RSA)"
+echo "=============================================================="
+$OPENSSL_CMD ecparam -name $TEST_SERVER_CURVE -out $TEST_SERVER_CURVE.pem
+
+$OPENSSL_CMD req $OPENSSL_CNF -nodes -subj "$TEST_SERVER_DN" \
+    -keyout $KEYS_DIR/$TEST_SERVER_FILE.key.pem \
+    -newkey ec:$TEST_SERVER_CURVE.pem -new \
+    -out $CERTS_DIR/$TEST_SERVER_FILE.req.pem
+
+$OPENSSL_CMD x509 -req -days $DAYS \
+    -in $CERTS_DIR/$TEST_SERVER_FILE.req.pem \
+    -CA $CERTS_DIR/$TEST_CA_FILE.cert.pem \
+    -CAkey $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -out $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -CAcreateserial
+
+# Display the certificate 
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -text
+
+# Place the certificate and key in a common file
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -issuer -subject \
+         > $COMBO_DIR/$TEST_SERVER_FILE.pem
+$CAT $KEYS_DIR/$TEST_SERVER_FILE.key.pem >> $COMBO_DIR/$TEST_SERVER_FILE.pem
+
+# Remove the cert request file (no longer needed)
+$RM $CERTS_DIR/$TEST_SERVER_FILE.req.pem
+
+echo "GENERATING A TEST CLIENT CERTIFICATE (ECC key signed with RSA)"
+echo "=============================================================="
+$OPENSSL_CMD ecparam -name $TEST_CLIENT_CURVE -out $TEST_CLIENT_CURVE.pem
+
+$OPENSSL_CMD req $OPENSSL_CNF -nodes -subj "$TEST_CLIENT_DN" \
+             -keyout $KEYS_DIR/$TEST_CLIENT_FILE.key.pem \
+             -newkey ec:$TEST_CLIENT_CURVE.pem -new \
+             -out $CERTS_DIR/$TEST_CLIENT_FILE.req.pem
+
+$OPENSSL_CMD x509 -req -days $DAYS \
+    -in $CERTS_DIR/$TEST_CLIENT_FILE.req.pem \
+    -CA $CERTS_DIR/$TEST_CA_FILE.cert.pem \
+    -CAkey $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -out $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -CAcreateserial
+
+# Display the certificate 
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -text
+
+# Place the certificate and key in a common file
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -issuer -subject \
+         > $COMBO_DIR/$TEST_CLIENT_FILE.pem
+$CAT $KEYS_DIR/$TEST_CLIENT_FILE.key.pem >> $COMBO_DIR/$TEST_CLIENT_FILE.pem
+
+# Remove the cert request file (no longer needed)
+$RM $CERTS_DIR/$TEST_CLIENT_FILE.req.pem
+
diff --git a/src/lib/libssl/src/demos/ssltest-ecc/ECCcertgen.sh b/src/lib/libssl/src/demos/ssltest-ecc/ECCcertgen.sh
new file mode 100755
index 0000000000..a47b8bb0b5
--- /dev/null
+++ b/src/lib/libssl/src/demos/ssltest-ecc/ECCcertgen.sh
@@ -0,0 +1,164 @@
+#!/bin/sh
+
+# For a list of supported curves, use "apps/openssl ecparam -list_curves".
+
+# Path to the openssl distribution
+OPENSSL_DIR=../..
+# Path to the openssl program
+OPENSSL_CMD=$OPENSSL_DIR/apps/openssl
+# Option to find configuration file
+OPENSSL_CNF="-config $OPENSSL_DIR/apps/openssl.cnf"
+# Directory where certificates are stored
+CERTS_DIR=./Certs
+# Directory where private key files are stored
+KEYS_DIR=$CERTS_DIR
+# Directory where combo files (containing a certificate and corresponding
+# private key together) are stored
+COMBO_DIR=$CERTS_DIR
+# cat command
+CAT=/bin/cat
+# rm command
+RM=/bin/rm
+# mkdir command
+MKDIR=/bin/mkdir
+# The certificate will expire these many days after the issue date.
+DAYS=1500
+TEST_CA_CURVE=secp160r1
+TEST_CA_FILE=secp160r1TestCA
+TEST_CA_DN="/C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test CA (Elliptic curve secp160r1)"
+
+TEST_SERVER_CURVE=secp160r2
+TEST_SERVER_FILE=secp160r2TestServer
+TEST_SERVER_DN="/C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test Server (Elliptic curve secp160r2)"
+
+TEST_CLIENT_CURVE=secp160r2
+TEST_CLIENT_FILE=secp160r2TestClient
+TEST_CLIENT_DN="/C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test Client (Elliptic curve secp160r2)"
+
+# Generating an EC certificate involves the following main steps
+# 1. Generating curve parameters (if needed)
+# 2. Generating a certificate request
+# 3. Signing the certificate request 
+# 4. [Optional] One can combine the cert and private key into a single
+#    file and also delete the certificate request
+
+$MKDIR -p $CERTS_DIR
+$MKDIR -p $KEYS_DIR
+$MKDIR -p $COMBO_DIR
+
+echo "Generating self-signed CA certificate (on curve $TEST_CA_CURVE)"
+echo "==============================================================="
+$OPENSSL_CMD ecparam -name $TEST_CA_CURVE -out $TEST_CA_CURVE.pem
+
+# Generate a new certificate request in $TEST_CA_FILE.req.pem. A 
+# new ecdsa (actually ECC) key pair is generated on the parameters in
+# $TEST_CA_CURVE.pem and the private key is saved in $TEST_CA_FILE.key.pem
+# WARNING: By using the -nodes option, we force the private key to be 
+# stored in the clear (rather than encrypted with a password).
+$OPENSSL_CMD req $OPENSSL_CNF -nodes -subj "$TEST_CA_DN" \
+    -keyout $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -newkey ec:$TEST_CA_CURVE.pem -new \
+    -out $CERTS_DIR/$TEST_CA_FILE.req.pem
+
+# Sign the certificate request in $TEST_CA_FILE.req.pem using the
+# private key in $TEST_CA_FILE.key.pem and include the CA extension.
+# Make the certificate valid for 1500 days from the time of signing.
+# The certificate is written into $TEST_CA_FILE.cert.pem
+$OPENSSL_CMD x509 -req -days $DAYS \
+    -in $CERTS_DIR/$TEST_CA_FILE.req.pem \
+    -extfile $OPENSSL_DIR/apps/openssl.cnf \
+    -extensions v3_ca \
+    -signkey $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -out $CERTS_DIR/$TEST_CA_FILE.cert.pem
+
+# Display the certificate
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CA_FILE.cert.pem -text
+
+# Place the certificate and key in a common file
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CA_FILE.cert.pem -issuer -subject \
+         > $COMBO_DIR/$TEST_CA_FILE.pem
+$CAT $KEYS_DIR/$TEST_CA_FILE.key.pem >> $COMBO_DIR/$TEST_CA_FILE.pem
+
+# Remove the cert request file (no longer needed)
+$RM $CERTS_DIR/$TEST_CA_FILE.req.pem
+
+echo "GENERATING A TEST SERVER CERTIFICATE (on elliptic curve $TEST_SERVER_CURVE)"
+echo "=========================================================================="
+# Generate parameters for curve $TEST_SERVER_CURVE, if needed
+$OPENSSL_CMD ecparam -name $TEST_SERVER_CURVE -out $TEST_SERVER_CURVE.pem
+
+# Generate a new certificate request in $TEST_SERVER_FILE.req.pem. A 
+# new ecdsa (actually ECC) key pair is generated on the parameters in
+# $TEST_SERVER_CURVE.pem and the private key is saved in 
+# $TEST_SERVER_FILE.key.pem
+# WARNING: By using the -nodes option, we force the private key to be 
+# stored in the clear (rather than encrypted with a password).
+$OPENSSL_CMD req $OPENSSL_CNF -nodes -subj "$TEST_SERVER_DN" \
+    -keyout $KEYS_DIR/$TEST_SERVER_FILE.key.pem \
+    -newkey ec:$TEST_SERVER_CURVE.pem -new \
+    -out $CERTS_DIR/$TEST_SERVER_FILE.req.pem
+
+# Sign the certificate request in $TEST_SERVER_FILE.req.pem using the
+# CA certificate in $TEST_CA_FILE.cert.pem and the CA private key in
+# $TEST_CA_FILE.key.pem. Since we do not have an existing serial number
+# file for this CA, create one. Make the certificate valid for $DAYS days
+# from the time of signing. The certificate is written into 
+# $TEST_SERVER_FILE.cert.pem
+$OPENSSL_CMD x509 -req -days $DAYS \
+    -in $CERTS_DIR/$TEST_SERVER_FILE.req.pem \
+    -CA $CERTS_DIR/$TEST_CA_FILE.cert.pem \
+    -CAkey $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -out $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -CAcreateserial
+
+# Display the certificate 
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -text
+
+# Place the certificate and key in a common file
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -issuer -subject \
+         > $COMBO_DIR/$TEST_SERVER_FILE.pem
+$CAT $KEYS_DIR/$TEST_SERVER_FILE.key.pem >> $COMBO_DIR/$TEST_SERVER_FILE.pem
+
+# Remove the cert request file (no longer needed)
+$RM $CERTS_DIR/$TEST_SERVER_FILE.req.pem
+
+echo "GENERATING A TEST CLIENT CERTIFICATE (on elliptic curve $TEST_CLIENT_CURVE)"
+echo "=========================================================================="
+# Generate parameters for curve $TEST_CLIENT_CURVE, if needed
+$OPENSSL_CMD ecparam -name $TEST_CLIENT_CURVE -out $TEST_CLIENT_CURVE.pem
+
+# Generate a new certificate request in $TEST_CLIENT_FILE.req.pem. A 
+# new ecdsa (actually ECC) key pair is generated on the parameters in
+# $TEST_CLIENT_CURVE.pem and the private key is saved in 
+# $TEST_CLIENT_FILE.key.pem
+# WARNING: By using the -nodes option, we force the private key to be 
+# stored in the clear (rather than encrypted with a password).
+$OPENSSL_CMD req $OPENSSL_CNF -nodes -subj "$TEST_CLIENT_DN" \
+             -keyout $KEYS_DIR/$TEST_CLIENT_FILE.key.pem \
+             -newkey ec:$TEST_CLIENT_CURVE.pem -new \
+             -out $CERTS_DIR/$TEST_CLIENT_FILE.req.pem
+
+# Sign the certificate request in $TEST_CLIENT_FILE.req.pem using the
+# CA certificate in $TEST_CA_FILE.cert.pem and the CA private key in
+# $TEST_CA_FILE.key.pem. Since we do not have an existing serial number
+# file for this CA, create one. Make the certificate valid for $DAYS days
+# from the time of signing. The certificate is written into 
+# $TEST_CLIENT_FILE.cert.pem
+$OPENSSL_CMD x509 -req -days $DAYS \
+    -in $CERTS_DIR/$TEST_CLIENT_FILE.req.pem \
+    -CA $CERTS_DIR/$TEST_CA_FILE.cert.pem \
+    -CAkey $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -out $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -CAcreateserial
+
+# Display the certificate 
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -text
+
+# Place the certificate and key in a common file
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -issuer -subject \
+         > $COMBO_DIR/$TEST_CLIENT_FILE.pem
+$CAT $KEYS_DIR/$TEST_CLIENT_FILE.key.pem >> $COMBO_DIR/$TEST_CLIENT_FILE.pem
+
+# Remove the cert request file (no longer needed)
+$RM $CERTS_DIR/$TEST_CLIENT_FILE.req.pem
+
+
+
diff --git a/src/lib/libssl/src/demos/ssltest-ecc/README b/src/lib/libssl/src/demos/ssltest-ecc/README
new file mode 100644
index 0000000000..71c070af16
--- /dev/null
+++ b/src/lib/libssl/src/demos/ssltest-ecc/README
@@ -0,0 +1,15 @@
+Scripts for using ECC ciphersuites with test/testssl
+(these ciphersuites are described in the Internet Draft available at
+http://www.ietf.org/internet-drafts/draft-ietf-tls-ecc-03.txt).
+
+Use ECCcertgen.sh, RSAcertgen.sh, ECC-RSAcertgen.sh to generate
+root, client and server certs of the following types:
+
+     ECC certs signed with ECDSA
+     RSA certs signed with RSA
+     ECC certs signed with RSA
+
+Afterwards, you can use ssltest.sh to run the various tests;
+specify one of the following options:
+
+     aecdh, ecdh-ecdsa, ecdhe-ecdsa, ecdh-rsa, ecdhe-rsa
diff --git a/src/lib/libssl/src/demos/ssltest-ecc/RSAcertgen.sh b/src/lib/libssl/src/demos/ssltest-ecc/RSAcertgen.sh
new file mode 100755
index 0000000000..0cb0153596
--- /dev/null
+++ b/src/lib/libssl/src/demos/ssltest-ecc/RSAcertgen.sh
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+# For a list of supported curves, use "apps/openssl ecparam -list_curves".
+
+# Path to the openssl distribution
+OPENSSL_DIR=../..
+# Path to the openssl program
+OPENSSL_CMD=$OPENSSL_DIR/apps/openssl
+# Option to find configuration file
+OPENSSL_CNF="-config $OPENSSL_DIR/apps/openssl.cnf"
+# Directory where certificates are stored
+CERTS_DIR=./Certs
+# Directory where private key files are stored
+KEYS_DIR=$CERTS_DIR
+# Directory where combo files (containing a certificate and corresponding
+# private key together) are stored
+COMBO_DIR=$CERTS_DIR
+# cat command
+CAT=/bin/cat
+# rm command
+RM=/bin/rm
+# mkdir command
+MKDIR=/bin/mkdir
+# The certificate will expire these many days after the issue date.
+DAYS=1500
+TEST_CA_FILE=rsa1024TestCA
+TEST_CA_DN="/C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test CA (1024 bit RSA)"
+
+TEST_SERVER_FILE=rsa1024TestServer
+TEST_SERVER_DN="/C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test Server (1024 bit RSA)"
+
+TEST_CLIENT_FILE=rsa1024TestClient
+TEST_CLIENT_DN="/C=US/ST=CA/L=Mountain View/O=Sun Microsystems, Inc./OU=Sun Microsystems Laboratories/CN=Test Client (1024 bit RSA)"
+
+# Generating an EC certificate involves the following main steps
+# 1. Generating curve parameters (if needed)
+# 2. Generating a certificate request
+# 3. Signing the certificate request 
+# 4. [Optional] One can combine the cert and private key into a single
+#    file and also delete the certificate request
+
+$MKDIR -p $CERTS_DIR
+$MKDIR -p $KEYS_DIR
+$MKDIR -p $COMBO_DIR
+
+echo "Generating self-signed CA certificate (RSA)"
+echo "==========================================="
+
+$OPENSSL_CMD req $OPENSSL_CNF -nodes -subj "$TEST_CA_DN" \
+    -keyout $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -newkey rsa:1024 -new \
+    -out $CERTS_DIR/$TEST_CA_FILE.req.pem
+
+$OPENSSL_CMD x509 -req -days $DAYS \
+    -in $CERTS_DIR/$TEST_CA_FILE.req.pem \
+    -extfile $OPENSSL_DIR/apps/openssl.cnf \
+    -extensions v3_ca \
+    -signkey $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -out $CERTS_DIR/$TEST_CA_FILE.cert.pem
+
+# Display the certificate
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CA_FILE.cert.pem -text
+
+# Place the certificate and key in a common file
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CA_FILE.cert.pem -issuer -subject \
+         > $COMBO_DIR/$TEST_CA_FILE.pem
+$CAT $KEYS_DIR/$TEST_CA_FILE.key.pem >> $COMBO_DIR/$TEST_CA_FILE.pem
+
+# Remove the cert request file (no longer needed)
+$RM $CERTS_DIR/$TEST_CA_FILE.req.pem
+
+echo "GENERATING A TEST SERVER CERTIFICATE (RSA)"
+echo "=========================================="
+
+$OPENSSL_CMD req $OPENSSL_CNF -nodes -subj "$TEST_SERVER_DN" \
+    -keyout $KEYS_DIR/$TEST_SERVER_FILE.key.pem \
+    -newkey rsa:1024 -new \
+    -out $CERTS_DIR/$TEST_SERVER_FILE.req.pem
+
+$OPENSSL_CMD x509 -req -days $DAYS \
+    -in $CERTS_DIR/$TEST_SERVER_FILE.req.pem \
+    -CA $CERTS_DIR/$TEST_CA_FILE.cert.pem \
+    -CAkey $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -out $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -CAcreateserial
+
+# Display the certificate 
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -text
+
+# Place the certificate and key in a common file
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_SERVER_FILE.cert.pem -issuer -subject \
+         > $COMBO_DIR/$TEST_SERVER_FILE.pem
+$CAT $KEYS_DIR/$TEST_SERVER_FILE.key.pem >> $COMBO_DIR/$TEST_SERVER_FILE.pem
+
+# Remove the cert request file (no longer needed)
+$RM $CERTS_DIR/$TEST_SERVER_FILE.req.pem
+
+echo "GENERATING A TEST CLIENT CERTIFICATE (RSA)"
+echo "=========================================="
+
+$OPENSSL_CMD req $OPENSSL_CNF -nodes -subj "$TEST_CLIENT_DN" \
+             -keyout $KEYS_DIR/$TEST_CLIENT_FILE.key.pem \
+             -newkey rsa:1024 -new \
+             -out $CERTS_DIR/$TEST_CLIENT_FILE.req.pem
+
+$OPENSSL_CMD x509 -req -days $DAYS \
+    -in $CERTS_DIR/$TEST_CLIENT_FILE.req.pem \
+    -CA $CERTS_DIR/$TEST_CA_FILE.cert.pem \
+    -CAkey $KEYS_DIR/$TEST_CA_FILE.key.pem \
+    -out $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -CAcreateserial
+
+# Display the certificate 
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -text
+
+# Place the certificate and key in a common file
+$OPENSSL_CMD x509 -in $CERTS_DIR/$TEST_CLIENT_FILE.cert.pem -issuer -subject \
+         > $COMBO_DIR/$TEST_CLIENT_FILE.pem
+$CAT $KEYS_DIR/$TEST_CLIENT_FILE.key.pem >> $COMBO_DIR/$TEST_CLIENT_FILE.pem
+
+# Remove the cert request file (no longer needed)
+$RM $CERTS_DIR/$TEST_CLIENT_FILE.req.pem
+
diff --git a/src/lib/libssl/src/demos/ssltest-ecc/ssltest.sh b/src/lib/libssl/src/demos/ssltest-ecc/ssltest.sh
new file mode 100755
index 0000000000..923ca43824
--- /dev/null
+++ b/src/lib/libssl/src/demos/ssltest-ecc/ssltest.sh
@@ -0,0 +1,188 @@
+#! /bin/sh
+# Tests ECC cipher suites using ssltest. Requires one argument which could
+# be aecdh or ecdh-ecdsa or ecdhe-ecdsa or ecdh-rsa or ecdhe-rsa.
+# A second optional argument can be one of ssl2 ssl3 or tls1
+
+if [ "$1" = "" ]; then
+  (echo "Usage: $0 test [ protocol ]"
+   echo "   where test is one of aecdh, ecdh-ecdsa, ecdhe-ecdsa, ecdh-rsa, ecdhe-rsa"
+   echo "   and protocol (optional) is one of ssl2, ssl3, tls1"
+   echo "Run RSAcertgen.sh, ECC-RSAcertgen.sh, ECCcertgen.sh first."
+  ) >&2
+  exit 1
+fi
+
+
+OPENSSL_DIR=../..
+CERTS_DIR=./Certs
+SSLTEST=$OPENSSL_DIR/test/ssltest
+# SSL protocol version to test (one of ssl2 ssl3 or tls1)"
+SSLVERSION=
+
+# These don't really require any certificates
+AECDH_CIPHER_LIST="AECDH-AES256-SHA AECDH-AES128-SHA AECDH-DES-CBC3-SHA AECDH-RC4-SHA AECDH-NULL-SHA"
+
+# These require ECC certificates signed with ECDSA
+# The EC public key must be authorized for key agreement.
+ECDH_ECDSA_CIPHER_LIST="ECDH-ECDSA-AES256-SHA ECDH-ECDSA-AES128-SHA ECDH-ECDSA-DES-CBC3-SHA ECDH-ECDSA-RC4-SHA ECDH-ECDSA-NULL-SHA"
+
+# These require ECC certificates.
+# The EC public key must be authorized for digital signature.
+ECDHE_ECDSA_CIPHER_LIST="ECDHE-ECDSA-AES256-SHA ECDHE-ECDSA-AES128-SHA ECDHE-ECDSA-DES-CBC3-SHA ECDHE-ECDSA-RC4-SHA ECDHE-ECDSA-NULL-SHA"
+
+# These require ECC certificates signed with RSA.
+# The EC public key must be authorized for key agreement.
+ECDH_RSA_CIPHER_LIST="ECDH-RSA-AES256-SHA ECDH-RSA-AES128-SHA ECDH-RSA-DES-CBC3-SHA ECDH-RSA-RC4-SHA ECDH-RSA-NULL-SHA"
+
+# These require RSA certificates.
+# The RSA public key must be authorized for digital signature.
+ECDHE_RSA_CIPHER_LIST="ECDHE-RSA-AES256-SHA ECDHE-RSA-AES128-SHA ECDHE-RSA-DES-CBC3-SHA ECDHE-RSA-RC4-SHA ECDHE-RSA-NULL-SHA"
+
+# List of Elliptic curves over which we wish to test generation of
+# ephemeral ECDH keys when using AECDH or ECDHE ciphers
+# NOTE: secp192r1 = prime192v1 and secp256r1 = prime256v1
+#ELLIPTIC_CURVE_LIST="secp112r1 sect113r2 secp128r1 sect131r1 secp160k1 sect163r2 wap-wsg-idm-ecid-wtls7 c2pnb163v3 c2pnb176v3 c2tnb191v3 secp192r1 prime192v3 sect193r2 secp224r1 wap-wsg-idm-ecid-wtls10 sect239k1 prime239v2 secp256r1 prime256v1 sect283k1 secp384r1 sect409r1 secp521r1 sect571r1"
+ELLIPTIC_CURVE_LIST="sect163k1 sect163r1 sect163r2 sect193r1 sect193r2 sect233k1 sect233r1 sect239k1 sect283k1 sect283r1 sect409k1 sect409r1 sect571k1 sect571r1 secp160k1 secp160r1 secp160r2 secp192k1 prime192v1 secp224k1 secp224r1 secp256k1 prime256v1 secp384r1 secp521r1"
+
+DEFAULT_CURVE="sect163r2"
+
+if [ "$2" = "" ]; then
+    if [ "$SSL_VERSION" = "" ]; then
+        SSL_VERSION=""
+    else
+        SSL_VERSION="-$SSL_VERSION"
+    fi
+else
+    SSL_VERSION="-$2"
+fi
+
+#==============================================================
+# Anonymous cipher suites do not require key or certificate files
+# but ssltest expects a cert file and complains if it can't
+# open the default one.
+SERVER_PEM=$OPENSSL_DIR/apps/server.pem
+
+if [ "$1" = "aecdh" ]; then
+for cipher in $AECDH_CIPHER_LIST
+do
+    echo "Testing $cipher"
+    $SSLTEST $SSL_VERSION -cert $SERVER_PEM -cipher $cipher 
+done
+#--------------------------------------------------------------
+for curve in $ELLIPTIC_CURVE_LIST
+do
+    echo "Testing AECDH-NULL-SHA (with $curve)"
+    $SSLTEST $SSL_VERSION -cert $SERVER_PEM \
+        -named_curve $curve -cipher AECDH-NULL-SHA
+done
+
+for curve in $ELLIPTIC_CURVE_LIST
+do
+    echo "Testing AECDH-RC4-SHA (with $curve)"
+    $SSLTEST $SSL_VERSION -cert $SERVER_PEM \
+        -named_curve $curve -cipher AECDH-RC4-SHA
+done
+fi
+
+#==============================================================
+# Both ECDH-ECDSA and ECDHE-ECDSA cipher suites require 
+# the server to have an ECC certificate signed with ECDSA.
+CA_PEM=$CERTS_DIR/secp160r1TestCA.pem
+SERVER_PEM=$CERTS_DIR/secp160r2TestServer.pem
+CLIENT_PEM=$CERTS_DIR/secp160r2TestClient.pem
+
+if [ "$1" = "ecdh-ecdsa" ]; then
+for cipher in $ECDH_ECDSA_CIPHER_LIST
+do
+    echo "Testing $cipher (with server authentication)"
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -cipher $cipher
+
+    echo "Testing $cipher (with server and client authentication)"
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -c_cert $CLIENT_PEM -client_auth \
+        -cipher $cipher
+done
+fi
+
+#==============================================================
+if [ "$1" = "ecdhe-ecdsa" ]; then
+for cipher in $ECDHE_ECDSA_CIPHER_LIST
+do
+    echo "Testing $cipher (with server authentication)"
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -cipher $cipher -named_curve $DEFAULT_CURVE
+
+    echo "Testing $cipher (with server and client authentication)"
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -c_cert $CLIENT_PEM -client_auth \
+        -cipher $cipher -named_curve $DEFAULT_CURVE
+done
+
+#--------------------------------------------------------------
+for curve in $ELLIPTIC_CURVE_LIST
+do
+    echo "Testing ECDHE-ECDSA-AES128-SHA (2-way auth with $curve)"
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -c_cert $CLIENT_PEM -client_auth \
+        -cipher ECDHE-ECDSA-AES128-SHA -named_curve $curve 
+done
+fi
+
+#==============================================================
+# ECDH-RSA cipher suites require the server to have an ECC
+# certificate signed with RSA.
+CA_PEM=$CERTS_DIR/rsa1024TestCA.pem
+SERVER_PEM=$CERTS_DIR/sect163r1-rsaTestServer.pem
+CLIENT_PEM=$CERTS_DIR/sect163r1-rsaTestClient.pem
+
+if [ "$1" = "ecdh-rsa" ]; then
+for cipher in $ECDH_RSA_CIPHER_LIST
+do
+    echo "Testing $cipher (with server authentication)"
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -cipher $cipher
+
+    echo "Testing $cipher (with server and client authentication)"
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -c_cert $CLIENT_PEM -client_auth \
+        -cipher $cipher
+done
+fi
+
+#==============================================================
+# ECDHE-RSA cipher suites require the server to have an RSA cert.
+CA_PEM=$CERTS_DIR/rsa1024TestCA.pem
+SERVER_PEM=$CERTS_DIR/rsa1024TestServer.pem
+CLIENT_PEM=$CERTS_DIR/rsa1024TestClient.pem
+
+if [ "$1" = "ecdhe-rsa" ]; then
+for cipher in $ECDHE_RSA_CIPHER_LIST
+do
+    echo "Testing $cipher (with server authentication)"
+    echo $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -cipher $cipher -named_curve $DEFAULT_CURVE
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -cipher $cipher -named_curve $DEFAULT_CURVE
+
+    echo "Testing $cipher (with server and client authentication)"
+    $SSLTEST $SSL_VERSION -CAfile $CA_PEM \
+        -cert $SERVER_PEM -server_auth \
+        -c_cert $CLIENT_PEM -client_auth \
+        -cipher $cipher -named_curve $DEFAULT_CURVE
+done
+fi
+#==============================================================
+
+
+
+
diff --git a/src/lib/libssl/src/demos/tunala/test.sh b/src/lib/libssl/src/demos/tunala/test.sh
new file mode 100755
index 0000000000..105b447333
--- /dev/null
+++ b/src/lib/libssl/src/demos/tunala/test.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+HTTP="localhost:8080"
+CLIENT_PORT="9020"
+SERVER_PORT="9021"
+
+sub_test ()
+{
+        echo "STARTING - $VER $CIPHER"
+        ./tunala -listen localhost:$CLIENT_PORT -proxy localhost:$SERVER_PORT \
+                -cacert CA.pem -cert A-client.pem -server 0 \
+                -dh_special standard -v_peer -v_strict \
+                $VER -cipher $CIPHER 1> tc1.txt 2> tc2.txt &
+        ./tunala -listen localhost:$SERVER_PORT -proxy $HTTP \
+                -cacert CA.pem -cert A-server.pem -server 1 \
+                -dh_special standard -v_peer -v_strict \
+                $VER -cipher $CIPHER 1> ts1.txt 2> ts2.txt &
+        # Wait for the servers to be listening before starting the wget test
+        DONE="no"
+        while [ "$DONE" != "yes" ]; do
+                L1=`netstat -a | egrep "LISTEN[\t ]*$" | grep ":$CLIENT_PORT"`
+                L2=`netstat -a | egrep "LISTEN[\t ]*$" | grep ":$SERVER_PORT"`
+                if [ "x$L1" != "x" ]; then
+                        DONE="yes"
+                elif [ "x$L2" != "x" ]; then
+                        DONE="yes"
+                else
+                        sleep 1
+                fi
+        done
+        HTML=`wget -O - -T 1 http://localhost:$CLIENT_PORT 2> /dev/null | grep "<HTML>"`
+        if [ "x$HTML" != "x" ]; then
+                echo "OK - $CIPHER ($VER)"
+        else
+                echo "FAIL - $CIPHER ($VER)"
+                killall tunala
+                exit 1
+        fi
+        killall tunala
+        # Wait for the servers to stop before returning - otherwise the next
+        # test my fail to start ... (fscking race conditions)
+        DONE="yes"
+        while [ "$DONE" != "no" ]; do
+                L1=`netstat -a | egrep "LISTEN[\t ]*$" | grep ":$CLIENT_PORT"`
+                L2=`netstat -a | egrep "LISTEN[\t ]*$" | grep ":$SERVER_PORT"`
+                if [ "x$L1" != "x" ]; then
+                        DONE="yes"
+                elif [ "x$L2" != "x" ]; then
+                        DONE="yes"
+                else
+                        DONE="no"
+                fi
+        done
+        exit 0
+}
+
+run_test ()
+{
+        (sub_test 1> /dev/null) || exit 1
+}
+
+run_ssl_test ()
+{
+killall tunala 1> /dev/null 2> /dev/null
+echo ""
+echo "Starting all $PRETTY tests"
+if [ "$PRETTY" != "SSLv2" ]; then
+        if [ "$PRETTY" != "SSLv3" ]; then
+                export VER="-no_ssl2 -no_ssl3"
+                export OSSL="-tls1"
+        else
+                export VER="-no_ssl2 -no_tls1"
+                export OSSL="-ssl3"
+        fi
+else
+        export VER="-no_ssl3 -no_tls1"
+        export OSSL="-ssl2"
+fi
+LIST="`../../apps/openssl ciphers $OSSL | sed -e 's/:/ /g'`"
+#echo "$LIST"
+for i in $LIST; do \
+        DSS=`echo "$i" | grep "DSS"`
+        if [ "x$DSS" != "x" ]; then
+                echo "---- skipping $i (no DSA cert/keys) ----"
+        else
+                export CIPHER=$i
+                run_test
+                echo "SUCCESS: $i"
+        fi
+done;
+}
+
+# Welcome the user
+echo "Tests will assume an http server running at $HTTP"
+
+# TLSv1 test
+export PRETTY="TLSv1"
+run_ssl_test
+
+# SSLv3 test
+export PRETTY="SSLv3"
+run_ssl_test
+
+# SSLv2 test
+export PRETTY="SSLv2"
+run_ssl_test
+
diff --git a/src/lib/libssl/src/doc/apps/ec.pod b/src/lib/libssl/src/doc/apps/ec.pod
new file mode 100644
index 0000000000..1d4a36dbf4
--- /dev/null
+++ b/src/lib/libssl/src/doc/apps/ec.pod
@@ -0,0 +1,190 @@
+=pod
+
+=head1 NAME
+
+ec - EC key processing
+
+=head1 SYNOPSIS
+
+B<openssl> B<ec>
+[B<-inform PEM|DER>]
+[B<-outform PEM|DER>]
+[B<-in filename>]
+[B<-passin arg>]
+[B<-out filename>]
+[B<-passout arg>]
+[B<-des>]
+[B<-des3>]
+[B<-idea>]
+[B<-text>]
+[B<-noout>]
+[B<-param_out>]
+[B<-pubin>]
+[B<-pubout>]
+[B<-conv_form arg>]
+[B<-param_enc arg>]
+[B<-engine id>]
+
+=head1 DESCRIPTION
+
+The B<ec> command processes EC keys. They can be converted between various
+forms and their components printed out. B<Note> OpenSSL uses the 
+private key format specified in 'SEC 1: Elliptic Curve Cryptography'
+(http://www.secg.org/). To convert a OpenSSL EC private key into the
+PKCS#8 private key format use the B<pkcs8> command.
+
+=head1 COMMAND OPTIONS
+
+=over 4
+
+=item B<-inform DER|PEM>
+
+This specifies the input format. The B<DER> option with a private key uses
+an ASN.1 DER encoded SEC1 private key. When used with a public key it
+uses the SubjectPublicKeyInfo structur as specified in RFC 3280.
+The B<PEM> form is the default format: it consists of the B<DER> format base64
+encoded with additional header and footer lines. In the case of a private key
+PKCS#8 format is also accepted.
+
+=item B<-outform DER|PEM>
+
+This specifies the output format, the options have the same meaning as the 
+B<-inform> option.
+
+=item B<-in filename>
+
+This specifies the input filename to read a key from or standard input if this
+option is not specified. If the key is encrypted a pass phrase will be
+prompted for.
+
+=item B<-passin arg>
+
+the input file password source. For more information about the format of B<arg>
+see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
+
+=item B<-out filename>
+
+This specifies the output filename to write a key to or standard output by
+is not specified. If any encryption options are set then a pass phrase will be
+prompted for. The output filename should B<not> be the same as the input
+filename.
+
+=item B<-passout arg>
+
+the output file password source. For more information about the format of B<arg>
+see the B<PASS PHRASE ARGUMENTS> section in L<openssl(1)|openssl(1)>.
+
+=item B<-des|-des3|-idea>
+
+These options encrypt the private key with the DES, triple DES, IDEA or 
+any other cipher supported by OpenSSL before outputting it. A pass phrase is
+prompted for.
+If none of these options is specified the key is written in plain text. This
+means that using the B<ec> utility to read in an encrypted key with no
+encryption option can be used to remove the pass phrase from a key, or by
+setting the encryption options it can be use to add or change the pass phrase.
+These options can only be used with PEM format output files.
+
+=item B<-text>
+
+prints out the public, private key components and parameters.
+
+=item B<-noout>
+
+this option prevents output of the encoded version of the key.
+
+=item B<-modulus>
+
+this option prints out the value of the public key component of the key.
+
+=item B<-pubin>
+
+by default a private key is read from the input file: with this option a
+public key is read instead.
+
+=item B<-pubout>
+
+by default a private key is output. With this option a public
+key will be output instead. This option is automatically set if the input is
+a public key.
+
+=item B<-conv_form>
+
+This specifies how the points on the elliptic curve are converted
+into octet strings. Possible values are: B<compressed> (the default
+value), B<uncompressed> and B<hybrid>. For more information regarding
+the point conversion forms please read the X9.62 standard.
+B<Note> Due to patent issues the B<compressed> option is disabled
+by default for binary curves and can be enabled by defining
+the preprocessor macro B<OPENSSL_EC_BIN_PT_COMP> at compile time.
+
+=item B<-param_enc arg>
+
+This specifies how the elliptic curve parameters are encoded.
+Possible value are: B<named_curve>, i.e. the ec parameters are
+specified by a OID, or B<explicit> where the ec parameters are
+explicitly given (see RFC 3279 for the definition of the 
+EC parameters structures). The default value is B<named_curve>.
+B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279,
+is currently not implemented in OpenSSL.
+
+=item B<-engine id>
+
+specifying an engine (by it's unique B<id> string) will cause B<req>
+to attempt to obtain a functional reference to the specified engine,
+thus initialising it if needed. The engine will then be set as the default
+for all available algorithms.
+
+=back
+
+=head1 NOTES
+
+The PEM private key format uses the header and footer lines:
+
+ -----BEGIN EC PRIVATE KEY-----
+ -----END EC PRIVATE KEY-----
+
+The PEM public key format uses the header and footer lines:
+
+ -----BEGIN PUBLIC KEY-----
+ -----END PUBLIC KEY-----
+
+=head1 EXAMPLES
+
+To encrypt a private key using triple DES:
+
+ openssl ec -in key.pem -des3 -out keyout.pem
+
+To convert a private key from PEM to DER format: 
+
+ openssl ec -in key.pem -outform DER -out keyout.der
+
+To print out the components of a private key to standard output:
+
+ openssl ec -in key.pem -text -noout
+
+To just output the public part of a private key:
+
+ openssl ec -in key.pem -pubout -out pubkey.pem
+
+To change the parameters encoding to B<explicit>:
+
+ openssl ec -in key.pem -param_enc explicit -out keyout.pem
+
+To change the point conversion form to B<compressed>:
+
+ openssl ec -in key.pem -conv_form compressed -out keyout.pem
+
+=head1 SEE ALSO
+
+L<ecparam(1)|ecparam(1)>, L<dsa(1)|dsa(1)>, L<rsa(1)|rsa(1)>
+
+=head1 HISTORY
+
+The ec command was first introduced in OpenSSL 0.9.8.
+
+=head1 AUTHOR
+
+Nils Larsch for the OpenSSL project (http://www.openssl.org).
+
+=cut
diff --git a/src/lib/libssl/src/doc/apps/ecparam.pod b/src/lib/libssl/src/doc/apps/ecparam.pod
new file mode 100644
index 0000000000..1a12105da7
--- /dev/null
+++ b/src/lib/libssl/src/doc/apps/ecparam.pod
@@ -0,0 +1,179 @@
+=pod
+
+=head1 NAME
+
+ecparam - EC parameter manipulation and generation
+
+=head1 SYNOPSIS
+
+B<openssl ecparam>
+[B<-inform DER|PEM>]
+[B<-outform DER|PEM>]
+[B<-in filename>]
+[B<-out filename>]
+[B<-noout>]
+[B<-text>]
+[B<-C>]
+[B<-check>]
+[B<-name arg>]
+[B<-list_curve>]
+[B<-conv_form arg>]
+[B<-param_enc arg>]
+[B<-no_seed>]
+[B<-rand file(s)>]
+[B<-genkey>]
+[B<-engine id>]
+
+=head1 DESCRIPTION
+
+This command is used to manipulate or generate EC parameter files.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-inform DER|PEM>
+
+This specifies the input format. The B<DER> option uses an ASN.1 DER encoded
+form compatible with RFC 3279 EcpkParameters. The PEM form is the default
+format: it consists of the B<DER> format base64 encoded with additional 
+header and footer lines.
+
+=item B<-outform DER|PEM>
+
+This specifies the output format, the options have the same meaning as the 
+B<-inform> option.
+
+=item B<-in filename>
+
+This specifies the input filename to read parameters from or standard input if
+this option is not specified.
+
+=item B<-out filename>
+
+This specifies the output filename parameters to. Standard output is used
+if this option is not present. The output filename should B<not> be the same
+as the input filename.
+
+=item B<-noout>
+
+This option inhibits the output of the encoded version of the parameters.
+
+=item B<-text>
+
+This option prints out the EC parameters in human readable form.
+
+=item B<-C>
+
+This option converts the EC parameters into C code. The parameters can then
+be loaded by calling the B<get_ec_group_XXX()> function.
+
+=item B<-check>
+
+Validate the elliptic curve parameters.
+
+=item B<-name arg>
+
+Use the EC parameters with the specified 'short' name. Use B<-list_curves>
+to get a list of all currently implemented EC parameters.
+
+=item B<-list_curves>
+
+If this options is specified B<ecparam> will print out a list of all
+currently implemented EC parameters names and exit.
+
+=item B<-conv_form>
+
+This specifies how the points on the elliptic curve are converted
+into octet strings. Possible values are: B<compressed> (the default
+value), B<uncompressed> and B<hybrid>. For more information regarding
+the point conversion forms please read the X9.62 standard.
+B<Note> Due to patent issues the B<compressed> option is disabled
+by default for binary curves and can be enabled by defining
+the preprocessor macro B<OPENSSL_EC_BIN_PT_COMP> at compile time.
+
+=item B<-param_enc arg>
+
+This specifies how the elliptic curve parameters are encoded.
+Possible value are: B<named_curve>, i.e. the ec parameters are
+specified by a OID, or B<explicit> where the ec parameters are
+explicitly given (see RFC 3279 for the definition of the 
+EC parameters structures). The default value is B<named_curve>.
+B<Note> the B<implicitlyCA> alternative ,as specified in RFC 3279,
+is currently not implemented in OpenSSL.
+
+=item B<-no_seed>
+
+This option inhibits that the 'seed' for the parameter generation
+is included in the ECParameters structure (see RFC 3279).
+
+=item B<-genkey>
+
+This option will generate a EC private key using the specified parameters.
+
+=item B<-rand file(s)>
+
+a file or files containing random data used to seed the random number
+generator, or an EGD socket (see L<RAND_egd(3)|RAND_egd(3)>).
+Multiple files can be specified separated by a OS-dependent character.
+The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
+all others.
+
+=item B<-engine id>
+
+specifying an engine (by it's unique B<id> string) will cause B<req>
+to attempt to obtain a functional reference to the specified engine,
+thus initialising it if needed. The engine will then be set as the default
+for all available algorithms.
+
+=back
+
+=head1 NOTES
+
+PEM format EC parameters use the header and footer lines:
+
+ -----BEGIN EC PARAMETERS-----
+ -----END EC PARAMETERS-----
+
+OpenSSL is currently not able to generate new groups and therefore
+B<ecparam> can only create EC parameters from known (named) curves. 
+
+=head1 EXAMPLES
+
+To create EC parameters with the group 'prime192v1':
+
+  openssl ecparam -out ec_param.pem -name prime192v1
+
+To create EC parameters with explicit parameters:
+
+  openssl ecparam -out ec_param.pem -name prime192v1 -param_enc explicit
+
+To validate given EC parameters:
+
+  openssl ecparam -in ec_param.pem -check
+
+To create EC parameters and a private key:
+
+  openssl ecparam -out ec_key.pem -name prime192v1 -genkey
+
+To change the point encoding to 'compressed':
+
+  openssl ecparam -in ec_in.pem -out ec_out.pem -conv_form compressed
+
+To print out the EC parameters to standard output:
+
+  openssl ecparam -in ec_param.pem -noout -text
+
+=head1 SEE ALSO
+
+L<ec(1)|ec(1)>, L<dsaparam(1)|dsaparam(1)>
+
+=head1 HISTORY
+
+The ecparam command was first introduced in OpenSSL 0.9.8.
+
+=head1 AUTHOR
+
+Nils Larsch for the OpenSSL project (http://www.openssl.org)
+
+=cut
diff --git a/src/lib/libssl/src/doc/apps/x509v3_config.pod b/src/lib/libssl/src/doc/apps/x509v3_config.pod
new file mode 100644
index 0000000000..38c46e85c4
--- /dev/null
+++ b/src/lib/libssl/src/doc/apps/x509v3_config.pod
@@ -0,0 +1,456 @@
+=pod
+
+=for comment openssl_manual_section:5
+
+=head1 NAME
+
+x509v3_config - X509 V3 certificate extension configuration format
+
+=head1 DESCRIPTION
+
+Several of the OpenSSL utilities can add extensions to a certificate or
+certificate request based on the contents of a configuration file.
+
+Typically the application will contain an option to point to an extension
+section. Each line of the extension section takes the form:
+
+ extension_name=[critical,] extension_options
+
+If B<critical> is present then the extension will be critical.
+
+The format of B<extension_options> depends on the value of B<extension_name>.
+
+There are four main types of extension: I<string> extensions, I<multi-valued>
+extensions, I<raw> and I<arbitrary> extensions.
+
+String extensions simply have a string which contains either the value itself
+or how it is obtained.
+
+For example:
+
+ nsComment="This is a Comment"
+
+Multi-valued extensions have a short form and a long form. The short form
+is a list of names and values:
+
+ basicConstraints=critical,CA:true,pathlen:1
+
+The long form allows the values to be placed in a separate section:
+
+ basicConstraints=critical,@bs_section
+
+ [bs_section]
+
+ CA=true
+ pathlen=1
+
+Both forms are equivalent.
+
+The syntax of raw extensions is governed by the extension code: it can
+for example contain data in multiple sections. The correct syntax to
+use is defined by the extension code itself: check out the certificate
+policies extension for an example.
+
+If an extension type is unsupported then the I<arbitrary> extension syntax
+must be used, see the L<ARBITRART EXTENSIONS|/"ARBITRARY EXTENSIONS"> section for more details.
+
+=head1 STANDARD EXTENSIONS
+
+The following sections describe each supported extension in detail.
+
+=head2 Basic Constraints.
+
+This is a multi valued extension which indicates whether a certificate is
+a CA certificate. The first (mandatory) name is B<CA> followed by B<TRUE> or
+B<FALSE>. If B<CA> is B<TRUE> then an optional B<pathlen> name followed by an
+non-negative value can be included.
+
+For example:
+
+ basicConstraints=CA:TRUE
+
+ basicConstraints=CA:FALSE
+
+ basicConstraints=critical,CA:TRUE, pathlen:0
+
+A CA certificate B<must> include the basicConstraints value with the CA field
+set to TRUE. An end user certificate must either set CA to FALSE or exclude the
+extension entirely. Some software may require the inclusion of basicConstraints
+with CA set to FALSE for end entity certificates.
+
+The pathlen parameter indicates the maximum number of CAs that can appear
+below this one in a chain. So if you have a CA with a pathlen of zero it can
+only be used to sign end user certificates and not further CAs.
+
+
+=head2 Key Usage.
+
+Key usage is a multi valued extension consisting of a list of names of the
+permitted key usages.
+
+The supporte names are: digitalSignature, nonRepudiation, keyEncipherment,
+dataEncipherment, keyAgreement, keyCertSign, cRLSign, encipherOnly
+and decipherOnly.
+
+Examples:
+
+ keyUsage=digitalSignature, nonRepudiation
+
+ keyUsage=critical, keyCertSign
+
+
+=head2 Extended Key Usage.
+
+This extensions consists of a list of usages indicating purposes for which
+the certificate public key can be used for,
+
+These can either be object short names of the dotted numerical form of OIDs.
+While any OID can be used only certain values make sense. In particular the
+following PKIX, NS and MS values are meaningful:
+
+ Value                  Meaning
+ -----                  -------
+ serverAuth             SSL/TLS Web Server Authentication.
+ clientAuth             SSL/TLS Web Client Authentication.
+ codeSigning            Code signing.
+ emailProtection        E-mail Protection (S/MIME).
+ timeStamping           Trusted Timestamping
+ msCodeInd              Microsoft Individual Code Signing (authenticode)
+ msCodeCom              Microsoft Commercial Code Signing (authenticode)
+ msCTLSign              Microsoft Trust List Signing
+ msSGC                  Microsoft Server Gated Crypto
+ msEFS                  Microsoft Encrypted File System
+ nsSGC                  Netscape Server Gated Crypto
+
+Examples:
+
+ extendedKeyUsage=critical,codeSigning,1.2.3.4
+ extendedKeyUsage=nsSGC,msSGC
+
+
+=head2 Subject Key Identifier.
+
+This is really a string extension and can take two possible values. Either
+the word B<hash> which will automatically follow the guidelines in RFC3280
+or a hex string giving the extension value to include. The use of the hex
+string is strongly discouraged.
+
+Example:
+
+ subjectKeyIdentifier=hash
+
+
+=head2 Authority Key Identifier.
+
+The authority key identifier extension permits two options. keyid and issuer:
+both can take the optional value "always".
+
+If the keyid option is present an attempt is made to copy the subject key
+identifier from the parent certificate. If the value "always" is present
+then an error is returned if the option fails.
+
+The issuer option copies the issuer and serial number from the issuer
+certificate. This will only be done if the keyid option fails or
+is not included unless the "always" flag will always include the value.
+
+Example:
+
+ authorityKeyIdentifier=keyid,issuer
+
+
+=head2 Subject Alternative Name.
+
+The subject alternative name extension allows various literal values to be
+included in the configuration file. These include B<email> (an email address)
+B<URI> a uniform resource indicator, B<DNS> (a DNS domain name), B<RID> (a
+registered ID: OBJECT IDENTIFIER), B<IP> (an IP address), B<dirName>
+(a distinguished name) and otherName.
+
+The email option include a special 'copy' value. This will automatically
+include and email addresses contained in the certificate subject name in
+the extension.
+
+The IP address used in the B<IP> options can be in either IPv4 or IPv6 format.
+
+The value of B<dirName> should point to a section containing the distinguished
+name to use as a set of name value pairs. Multi values AVAs can be formed by
+preceeding the name with a B<+> character.
+
+otherName can include arbitrary data associated with an OID: the value
+should be the OID followed by a semicolon and the content in standard
+ASN1_generate_nconf() format.
+
+Examples:
+
+ subjectAltName=email:copy,email:my@other.address,URI:http://my.url.here/
+ subjectAltName=IP:192.168.7.1
+ subjectAltName=IP:13::17
+ subjectAltName=email:my@other.address,RID:1.2.3.4
+ subjectAltName=otherName:1.2.3.4;UTF8:some other identifier
+
+ subjectAltName=dirName:dir_sect
+
+ [dir_sect]
+ C=UK
+ O=My Organization
+ OU=My Unit
+ CN=My Name
+
+
+=head2 Issuer Alternative Name.
+
+The issuer alternative name option supports all the literal options of
+subject alternative name. It does B<not> support the email:copy option because
+that would not make sense. It does support an additional issuer:copy option
+that will copy all the subject alternative name values from the issuer 
+certificate (if possible).
+
+Example:
+
+ issuserAltName = issuer:copy
+
+
+=head2 Authority Info Access.
+
+The authority information access extension gives details about how to access
+certain information relating to the CA. Its syntax is accessOID;location
+where I<location> has the same syntax as subject alternative name (except
+that email:copy is not supported). accessOID can be any valid OID but only
+certain values are meaningful, for example OCSP and caIssuers.
+
+Example:
+
+ authorityInfoAccess = OCSP;URI:http://ocsp.my.host/
+ authorityInfoAccess = caIssuers;URI:http://my.ca/ca.html
+
+
+=head2 CRL distribution points.
+
+This is a multi-valued extension that supports all the literal options of
+subject alternative name. Of the few software packages that currently interpret
+this extension most only interpret the URI option.
+
+Currently each option will set a new DistributionPoint with the fullName
+field set to the given value.
+
+Other fields like cRLissuer and reasons cannot currently be set or displayed:
+at this time no examples were available that used these fields.
+
+Examples:
+
+ crlDistributionPoints=URI:http://myhost.com/myca.crl
+ crlDistributionPoints=URI:http://my.com/my.crl,URI:http://oth.com/my.crl
+
+=head2 Certificate Policies.
+
+This is a I<raw> extension. All the fields of this extension can be set by
+using the appropriate syntax.
+
+If you follow the PKIX recommendations and just using one OID then you just
+include the value of that OID. Multiple OIDs can be set separated by commas,
+for example:
+
+ certificatePolicies= 1.2.4.5, 1.1.3.4
+
+If you wish to include qualifiers then the policy OID and qualifiers need to
+be specified in a separate section: this is done by using the @section syntax
+instead of a literal OID value.
+
+The section referred to must include the policy OID using the name
+policyIdentifier, cPSuri qualifiers can be included using the syntax:
+
+ CPS.nnn=value
+
+userNotice qualifiers can be set using the syntax:
+
+ userNotice.nnn=@notice
+
+The value of the userNotice qualifier is specified in the relevant section.
+This section can include explicitText, organization and noticeNumbers
+options. explicitText and organization are text strings, noticeNumbers is a
+comma separated list of numbers. The organization and noticeNumbers options
+(if included) must BOTH be present. If you use the userNotice option with IE5
+then you need the 'ia5org' option at the top level to modify the encoding:
+otherwise it will not be interpreted properly.
+
+Example:
+
+ certificatePolicies=ia5org,1.2.3.4,1.5.6.7.8,@polsect
+
+ [polsect]
+
+ policyIdentifier = 1.3.5.8
+ CPS.1="http://my.host.name/"
+ CPS.2="http://my.your.name/"
+ userNotice.1=@notice
+
+ [notice]
+
+ explicitText="Explicit Text Here"
+ organization="Organisation Name"
+ noticeNumbers=1,2,3,4
+
+The B<ia5org> option changes the type of the I<organization> field. In RFC2459
+it can only be of type DisplayText. In RFC3280 IA5Strring is also permissible.
+Some software (for example some versions of MSIE) may require ia5org.
+
+=head2 Policy Constraints
+
+This is a multi-valued extension which consisting of the names
+B<requireExplicitPolicy> or B<inhibitPolicyMapping> and a non negative intger
+value. At least one component must be present.
+
+Example:
+
+ policyConstraints = requireExplicitPolicy:3
+
+
+=head2 Inhibit Any Policy
+
+This is a string extension whose value must be a non negative integer.
+
+Example:
+
+ inhibitAnyPolicy = 2
+
+
+=head2 Name Constraints
+
+The name constraints extension is a multi-valued extension. The name should
+begin with the word B<permitted> or B<excluded> followed by a B<;>. The rest of
+the name and the value follows the syntax of subjectAltName except email:copy
+is not supported and the B<IP> form should consist of an IP addresses and 
+subnet mask separated by a B</>.
+
+Examples:
+
+ nameConstraints=permitted;IP:192.168.0.0/255.255.0.0
+
+ nameConstraints=permitted;email:.somedomain.com
+
+ nameConstraints=excluded;email:.com
+
+=head1 DEPRECATED EXTENSIONS
+
+The following extensions are non standard, Netscape specific and largely
+obsolete. Their use in new applications is discouraged.
+
+=head2 Netscape String extensions.
+
+Netscape Comment (B<nsComment>) is a string extension containing a comment
+which will be displayed when the certificate is viewed in some browsers.
+
+Example:
+
+ nsComment = "Some Random Comment"
+
+Other supported extensions in this category are: B<nsBaseUrl>,
+B<nsRevocationUrl>, B<nsCaRevocationUrl>, B<nsRenewalUrl>, B<nsCaPolicyUrl>
+and B<nsSslServerName>.
+
+
+=head2 Netscape Certificate Type
+
+This is a multi-valued extensions which consists of a list of flags to be
+included. It was used to indicate the purposes for which a certificate could
+be used. The basicConstraints, keyUsage and extended key usage extensions are
+now used instead.
+
+Acceptable values for nsCertType are: B<client>, B<server>, B<email>,
+B<objsign>, B<reserved>, B<sslCA>, B<emailCA>, B<objCA>.
+
+
+=head1 ARBITRARY EXTENSIONS
+
+If an extension is not supported by the OpenSSL code then it must be encoded
+using the arbitrary extension format. It is also possible to use the arbitrary
+format for supported extensions. Extreme care should be taken to ensure that
+the data is formatted correctly for the given extension type.
+
+There are two ways to encode arbitrary extensions.
+
+The first way is to use the word ASN1 followed by the extension content
+using the same syntax as ASN1_generate_nconf(). For example:
+
+ 1.2.3.4=critical,ASN1:UTF8String:Some random data
+
+ 1.2.3.4=ASN1:SEQUENCE:seq_sect
+
+ [seq_sect]
+
+ field1 = UTF8:field1
+ field2 = UTF8:field2
+
+It is also possible to use the word DER to include the raw encoded data in any
+extension.
+
+ 1.2.3.4=critical,DER:01:02:03:04
+ 1.2.3.4=DER:01020304
+
+The value following DER is a hex dump of the DER encoding of the extension
+Any extension can be placed in this form to override the default behaviour.
+For example:
+
+ basicConstraints=critical,DER:00:01:02:03
+
+=head1 WARNING
+
+There is no guarantee that a specific implementation will process a given
+extension. It may therefore be sometimes possible to use certificates for
+purposes prohibited by their extensions because a specific application does
+not recognize or honour the values of the relevant extensions.
+
+The DER and ASN1 options should be used with caution. It is possible to create
+totally invalid extensions if they are not used carefully.
+
+
+=head1 NOTES
+
+If an extension is multi-value and a field value must contain a comma the long
+form must be used otherwise the comma would be misinterpreted as a field
+separator. For example:
+
+ subjectAltName=URI:ldap://somehost.com/CN=foo,OU=bar
+
+will produce an error but the equivalent form:
+
+ subjectAltName=@subject_alt_section
+
+ [subject_alt_section]
+ subjectAltName=URI:ldap://somehost.com/CN=foo,OU=bar
+
+is valid. 
+
+Due to the behaviour of the OpenSSL B<conf> library the same field name
+can only occur once in a section. This means that:
+
+ subjectAltName=@alt_section
+
+ [alt_section]
+
+ email=steve@here
+ email=steve@there
+
+will only recognize the last value. This can be worked around by using the form:
+
+ [alt_section]
+
+ email.1=steve@here
+ email.2=steve@there
+
+=head1 HISTORY
+
+The X509v3 extension code was first added to OpenSSL 0.9.2.
+
+Policy mappings, inhibit any policy and name constraints support was added in
+OpenSSL 0.9.8
+
+The B<directoryName> and B<otherName> option as well as the B<ASN1> option
+for arbitrary extensions was added in OpenSSL 0.9.8
+
+=head1 SEE ALSO
+
+L<req(1)|req(1)>, L<ca(1)|ca(1)>, L<x509(1)|x509(1)>
+
+
+=cut
diff --git a/src/lib/libssl/src/doc/crypto/ASN1_generate_nconf.pod b/src/lib/libssl/src/doc/crypto/ASN1_generate_nconf.pod
new file mode 100644
index 0000000000..1157cff510
--- /dev/null
+++ b/src/lib/libssl/src/doc/crypto/ASN1_generate_nconf.pod
@@ -0,0 +1,262 @@
+=pod
+
+=head1 NAME
+
+ASN1_generate_nconf, ASN1_generate_v3 - ASN1 generation functions
+
+=head1 SYNOPSIS
+
+ ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf);
+ ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);
+
+=head1 DESCRIPTION
+
+These functions generate the ASN1 encoding of a string
+in an B<ASN1_TYPE> structure.
+
+B<str> contains the string to encode B<nconf> or B<cnf> contains
+the optional configuration information where additional strings
+will be read from. B<nconf> will typically come from a config
+file wherease B<cnf> is obtained from an B<X509V3_CTX> structure
+which will typically be used by X509 v3 certificate extension
+functions. B<cnf> or B<nconf> can be set to B<NULL> if no additional
+configuration will be used.
+
+=head1 GENERATION STRING FORMAT
+
+The actual data encoded is determined by the string B<str> and
+the configuration information. The general format of the string
+is:
+
+=over 2
+
+=item B<[modifier,]type[:value]>
+
+=back
+
+That is zero or more comma separated modifiers followed by a type
+followed by an optional colon and a value. The formats of B<type>,
+B<value> and B<modifier> are explained below.
+
+=head2 SUPPORTED TYPES
+
+The supported types are listed below. Unless otherwise specified
+only the B<ASCII> format is permissible.
+
+=over 2
+
+=item B<BOOLEAN>, B<BOOL>
+
+This encodes a boolean type. The B<value> string is mandatory and
+should be B<TRUE> or B<FALSE>. Additionally B<TRUE>, B<true>, B<Y>,
+B<y>, B<YES>, B<yes>, B<FALSE>, B<false>, B<N>, B<n>, B<NO> and B<no>
+are acceptable. 
+
+=item B<NULL>
+
+Encode the B<NULL> type, the B<value> string must not be present.
+
+=item B<INTEGER>, B<INT>
+
+Encodes an ASN1 B<INTEGER> type. The B<value> string represents
+the value of the integer, it can be preceeded by a minus sign and
+is normally interpreted as a decimal value unless the prefix B<0x>
+is included.
+
+=item B<ENUMERATED>, B<ENUM>
+
+Encodes the ASN1 B<ENUMERATED> type, it is otherwise identical to
+B<INTEGER>.
+
+=item B<OBJECT>, B<OID>
+
+Encodes an ASN1 B<OBJECT IDENTIFIER>, the B<value> string can be
+a short name, a long name or numerical format.
+
+=item B<UTCTIME>, B<UTC>
+
+Encodes an ASN1 B<UTCTime> structure, the value should be in
+the format B<YYMMDDHHMMSSZ>. 
+
+=item B<GENERALIZEDTIME>, B<GENTIME>
+
+Encodes an ASN1 B<GeneralizedTime> structure, the value should be in
+the format B<YYYYMMDDHHMMSSZ>. 
+
+=item B<OCTETSTRING>, B<OCT>
+
+Encodes an ASN1 B<OCTET STRING>. B<value> represents the contents
+of this structure, the format strings B<ASCII> and B<HEX> can be
+used to specify the format of B<value>.
+
+=item B<BITSTRING>, B<BITSTR>
+
+Encodes an ASN1 B<BIT STRING>. B<value> represents the contents
+of this structure, the format strings B<ASCII>, B<HEX> and B<BITLIST>
+can be used to specify the format of B<value>.
+
+If the format is anything other than B<BITLIST> the number of unused
+bits is set to zero.
+
+=item B<UNIVERSALSTRING>, B<UNIV>, B<IA5>, B<IA5STRING>, B<UTF8>,
+B<UTF8String>, B<BMP>, B<BMPSTRING>, B<VISIBLESTRING>,
+B<VISIBLE>, B<PRINTABLESTRING>, B<PRINTABLE>, B<T61>,
+B<T61STRING>, B<TELETEXSTRING>, B<GeneralString>
+
+These encode the corresponding string types. B<value> represents the
+contents of this structure. The format can be B<ASCII> or B<UTF8>.
+
+=item B<SEQUENCE>, B<SEQ>, B<SET>
+
+Formats the result as an ASN1 B<SEQUENCE> or B<SET> type. B<value>
+should be a section name which will contain the contents. The
+field names in the section are ignored and the values are in the
+generated string format. If B<value> is absent then an empty SEQUENCE
+will be encoded.
+
+=back
+
+=head2 MODIFIERS
+
+Modifiers affect the following structure, they can be used to
+add EXPLICIT or IMPLICIT tagging, add wrappers or to change
+the string format of the final type and value. The supported
+formats are documented below.
+
+=over 2
+
+=item B<EXPLICIT>, B<EXP>
+
+Add an explicit tag to the following structure. This string
+should be followed by a colon and the tag value to use as a
+decimal value.
+
+By following the number with B<U>, B<A>, B<P> or B<C> UNIVERSAL,
+APPLICATION, PRIVATE or CONTEXT SPECIFIC tagging can be used,
+the default is CONTEXT SPECIFIC.
+
+=item B<IMPLICIT>, B<IMP>
+
+This is the same as B<EXPLICIT> except IMPLICIT tagging is used
+instead.
+
+=item B<OCTWRAP>, B<SEQWRAP>, B<SETWRAP>, B<BITWRAP>
+
+The following structure is surrounded by an OCTET STRING, a SEQUENCE,
+a SET or a BIT STRING respectively. For a BIT STRING the number of unused
+bits is set to zero.
+
+=item B<FORMAT>
+
+This specifies the format of the ultimate value. It should be followed
+by a colon and one of the strings B<ASCII>, B<UTF8>, B<HEX> or B<BITLIST>.
+
+If no format specifier is included then B<ASCII> is used. If B<UTF8> is
+specified then the value string must be a valid B<UTF8> string. For B<HEX> the
+output must be a set of hex digits. B<BITLIST> (which is only valid for a BIT
+STRING) is a comma separated list of the indices of the set bits, all other
+bits are zero.
+
+=back
+
+=head1 EXAMPLES
+
+A simple IA5String:
+
+ IA5STRING:Hello World
+
+An IA5String explicitly tagged:
+
+ EXPLICIT:0,IA5STRING:Hello World
+
+An IA5String explicitly tagged using APPLICATION tagging:
+
+ EXPLICIT:0A,IA5STRING:Hello World
+
+A BITSTRING with bits 1 and 5 set and all others zero:
+
+ FORMAT=BITLIST,BITSTRING:1,5
+
+A more complex example using a config file to produce a
+SEQUENCE consiting of a BOOL an OID and a UTF8String:
+
+ asn1 = SEQUENCE:seq_section
+
+ [seq_section]
+
+ field1 = BOOLEAN:TRUE
+ field2 = OID:commonName
+ field3 = UTF8:Third field
+
+This example produces an RSAPrivateKey structure, this is the
+key contained in the file client.pem in all OpenSSL distributions
+(note: the field names such as 'coeff' are ignored and are present just
+for clarity):
+
+ asn1=SEQUENCE:private_key
+ [private_key]
+ version=INTEGER:0
+
+ n=INTEGER:0xBB6FE79432CC6EA2D8F970675A5A87BFBE1AFF0BE63E879F2AFFB93644\
+ D4D2C6D000430DEC66ABF47829E74B8C5108623A1C0EE8BE217B3AD8D36D5EB4FCA1D9
+
+ e=INTEGER:0x010001
+
+ d=INTEGER:0x6F05EAD2F27FFAEC84BEC360C4B928FD5F3A9865D0FCAAD291E2A52F4A\
+ F810DC6373278C006A0ABBA27DC8C63BF97F7E666E27C5284D7D3B1FFFE16B7A87B51D
+
+ p=INTEGER:0xF3929B9435608F8A22C208D86795271D54EBDFB09DDEF539AB083DA912\
+ D4BD57
+
+ q=INTEGER:0xC50016F89DFF2561347ED1186A46E150E28BF2D0F539A1594BBD7FE467\
+ 46EC4F
+
+ exp1=INTEGER:0x9E7D4326C924AFC1DEA40B45650134966D6F9DFA3A7F9D698CD4ABEA\
+ 9C0A39B9
+
+ exp2=INTEGER:0xBA84003BB95355AFB7C50DF140C60513D0BA51D637272E355E397779\
+ E7B2458F
+
+ coeff=INTEGER:0x30B9E4F2AFA5AC679F920FC83F1F2DF1BAF1779CF989447FABC2F5\
+ 628657053A
+
+This example is the corresponding public key in a SubjectPublicKeyInfo
+structure:
+
+ # Start with a SEQUENCE
+ asn1=SEQUENCE:pubkeyinfo
+
+ # pubkeyinfo contains an algorithm identifier and the public key wrapped
+ # in a BIT STRING
+ [pubkeyinfo]
+ algorithm=SEQUENCE:rsa_alg
+ pubkey=BITWRAP,SEQUENCE:rsapubkey
+
+ # algorithm ID for RSA is just an OID and a NULL
+ [rsa_alg]
+ algorithm=OID:rsaEncryption
+ parameter=NULL
+
+ # Actual public key: modulus and exponent
+ [rsapubkey]
+ n=INTEGER:0xBB6FE79432CC6EA2D8F970675A5A87BFBE1AFF0BE63E879F2AFFB93644\
+ D4D2C6D000430DEC66ABF47829E74B8C5108623A1C0EE8BE217B3AD8D36D5EB4FCA1D9
+
+ e=INTEGER:0x010001
+
+=head1 RETURN VALUES
+
+ASN1_generate_nconf() and ASN1_generate_v3() return the encoded
+data as an B<ASN1_TYPE> structure or B<NULL> if an error occurred.
+
+The error codes that can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>.
+
+=head1 SEE ALSO
+
+L<ERR_get_error(3)|ERR_get_error(3)>
+
+=head1 HISTORY
+
+ASN1_generate_nconf() and ASN1_generate_v3() were added to OpenSSL 0.9.8
+
+=cut
diff --git a/src/lib/libssl/src/doc/crypto/BN_BLINDING_new.pod b/src/lib/libssl/src/doc/crypto/BN_BLINDING_new.pod
new file mode 100644
index 0000000000..7b087f7288
--- /dev/null
+++ b/src/lib/libssl/src/doc/crypto/BN_BLINDING_new.pod
@@ -0,0 +1,109 @@
+=pod
+
+=head1 NAME
+
+BN_BLINDING_new, BN_BLINDING_free, BN_BLINDING_update, BN_BLINDING_convert, 
+BN_BLINDING_invert, BN_BLINDING_convert_ex, BN_BLINDING_invert_ex, 
+BN_BLINDING_get_thread_id, BN_BLINDING_set_thread_id, BN_BLINDING_get_flags,
+BN_BLINDING_set_flags, BN_BLINDING_create_param - blinding related BIGNUM
+functions.
+
+=head1 SYNOPSIS
+
+ #include <openssl/bn.h>
+
+ BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai,
+        BIGNUM *mod);
+ void BN_BLINDING_free(BN_BLINDING *b);
+ int BN_BLINDING_update(BN_BLINDING *b,BN_CTX *ctx);
+ int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
+ int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
+ int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b,
+        BN_CTX *ctx);
+ int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b,
+        BN_CTX *ctx);
+ unsigned long BN_BLINDING_get_thread_id(const BN_BLINDING *);
+ void BN_BLINDING_set_thread_id(BN_BLINDING *, unsigned long);
+ unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
+ void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
+ BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
+        const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
+        int (*bn_mod_exp)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
+                          const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx),
+        BN_MONT_CTX *m_ctx);
+
+=head1 DESCRIPTION
+
+BN_BLINDING_new() allocates a new B<BN_BLINDING> structure and copies
+the B<A> and B<Ai> values into the newly created B<BN_BLINDING> object.
+
+BN_BLINDING_free() frees the B<BN_BLINDING> structure.
+
+BN_BLINDING_update() updates the B<BN_BLINDING> parameters by squaring
+the B<A> and B<Ai> or, after specific number of uses and if the
+necessary parameters are set, by re-creating the blinding parameters.
+
+BN_BLINDING_convert_ex() multiplies B<n> with the blinding factor B<A>.
+If B<r> is not NULL a copy the inverse blinding factor B<Ai> will be
+returned in B<r> (this is useful if a B<RSA> object is shared amoung
+several threads). BN_BLINDING_invert_ex() multiplies B<n> with the
+inverse blinding factor B<Ai>. If B<r> is not NULL it will be used as
+the inverse blinding.
+
+BN_BLINDING_convert() and BN_BLINDING_invert() are wrapper
+functions for BN_BLINDING_convert_ex() and BN_BLINDING_invert_ex()
+with B<r> set to NULL.
+
+BN_BLINDING_set_thread_id() and BN_BLINDING_get_thread_id()
+set and get the "thread id" value of the B<BN_BLINDING> structure,
+a field provided to users of B<BN_BLINDING> structure to help them
+provide proper locking if needed for multi-threaded use. The 
+"thread id" of a newly allocated B<BN_BLINDING> structure is zero.
+
+BN_BLINDING_get_flags() returns the BN_BLINDING flags. Currently
+there are two supported flags: B<BN_BLINDING_NO_UPDATE> and
+B<BN_BLINDING_NO_RECREATE>. B<BN_BLINDING_NO_UPDATE> inhibits the
+automatic update of the B<BN_BLINDING> parameters after each use
+and B<BN_BLINDING_NO_RECREATE> inhibits the automatic re-creation
+of the B<BN_BLINDING> parameters after a fixed number of uses (currently
+32). In newly allocated B<BN_BLINDING> objects no flags are set.
+BN_BLINDING_set_flags() sets the B<BN_BLINDING> parameters flags.
+
+BN_BLINDING_create_param() creates new B<BN_BLINDING> parameters
+using the exponent B<e> and the modulus B<m>. B<bn_mod_exp> and
+B<m_ctx> can be used to pass special functions for exponentiation
+(normally BN_mod_exp_mont() and B<BN_MONT_CTX>).
+
+=head1 RETURN VALUES
+
+BN_BLINDING_new() returns the newly allocated B<BN_BLINDING> structure
+or NULL in case of an error.
+
+BN_BLINDING_update(), BN_BLINDING_convert(), BN_BLINDING_invert(),
+BN_BLINDING_convert_ex() and BN_BLINDING_invert_ex() return 1 on
+success and 0 if an error occured.
+
+BN_BLINDING_get_thread_id() returns the thread id (a B<unsigned long>
+value) or 0 if not set.
+
+BN_BLINDING_get_flags() returns the currently set B<BN_BLINDING> flags
+(a B<unsigned long> value).
+
+BN_BLINDING_create_param() returns the newly created B<BN_BLINDING> 
+parameters or NULL on error.
+
+=head1 SEE ALSO
+
+L<bn(3)|bn(3)>
+
+=head1 HISTORY
+
+BN_BLINDING_convert_ex, BN_BLINDIND_invert_ex, BN_BLINDING_get_thread_id,
+BN_BLINDING_set_thread_id, BN_BLINDING_set_flags, BN_BLINDING_get_flags
+and BN_BLINDING_create_param were first introduced in OpenSSL 0.9.8
+
+=head1 AUTHOR
+
+Nils Larsch for the OpenSSL project (http://www.openssl.org).
+
+=cut
diff --git a/src/lib/libssl/src/doc/crypto/ERR_set_mark.pod b/src/lib/libssl/src/doc/crypto/ERR_set_mark.pod
new file mode 100644
index 0000000000..d3ca4f2e77
--- /dev/null
+++ b/src/lib/libssl/src/doc/crypto/ERR_set_mark.pod
@@ -0,0 +1,38 @@
+=pod
+
+=head1 NAME
+
+ERR_set_mark, ERR_pop_to_mark - set marks and pop errors until mark
+
+=head1 SYNOPSIS
+
+ #include <openssl/err.h>
+
+ int ERR_set_mark(void);
+
+ int ERR_pop_to_mark(void);
+
+=head1 DESCRIPTION
+
+ERR_set_mark() sets a mark on the current topmost error record if there
+is one.
+
+ERR_pop_to_mark() will pop the top of the error stack until a mark is found.
+The mark is then removed.  If there is no mark, the whole stack is removed.
+
+=head1 RETURN VALUES
+
+ERR_set_mark() returns 0 if the error stack is empty, otherwise 1.
+
+ERR_pop_to_mark() returns 0 if there was no mark in the error stack, which
+implies that the stack became empty, otherwise 1.
+
+=head1 SEE ALSO
+
+L<err(3)|err(3)>
+
+=head1 HISTORY
+
+ERR_set_mark() and ERR_pop_to_mark() were added in OpenSSL 0.9.8.
+
+=cut
diff --git a/src/lib/libssl/src/doc/crypto/OPENSSL_Applink.pod b/src/lib/libssl/src/doc/crypto/OPENSSL_Applink.pod
new file mode 100644
index 0000000000..e54de12cc8
--- /dev/null
+++ b/src/lib/libssl/src/doc/crypto/OPENSSL_Applink.pod
@@ -0,0 +1,21 @@
+=pod
+
+=head1 NAME
+
+OPENSSL_Applink - glue between OpenSSL BIO and Win32 compiler run-time
+
+=head1 SYNOPSIS
+
+ __declspec(dllexport) void **OPENSSL_Applink();
+
+=head1 DESCRIPTION
+
+OPENSSL_Applink is application-side interface which provides a glue
+between OpenSSL BIO layer and Win32 compiler run-time environment.
+Even though it appears at application side, it's essentially OpenSSL
+private interface. For this reason application developers are not
+expected to implement it, but to compile provided module with
+compiler of their choice and link it into the target application.
+The referred module is available as <openssl>/ms/applink.c.
+
+=cut
diff --git a/src/lib/libssl/src/doc/crypto/OPENSSL_ia32cap.pod b/src/lib/libssl/src/doc/crypto/OPENSSL_ia32cap.pod
new file mode 100644
index 0000000000..2e659d34a5
--- /dev/null
+++ b/src/lib/libssl/src/doc/crypto/OPENSSL_ia32cap.pod
@@ -0,0 +1,43 @@
+=pod
+
+=head1 NAME
+
+OPENSSL_ia32cap - finding the IA-32 processor capabilities
+
+=head1 SYNOPSIS
+
+ unsigned long *OPENSSL_ia32cap_loc(void);
+ #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
+
+=head1 DESCRIPTION
+
+Value returned by OPENSSL_ia32cap_loc() is address of a variable
+containing IA-32 processor capabilities bit vector as it appears in EDX
+register after executing CPUID instruction with EAX=1 input value (see
+Intel Application Note #241618). Naturally it's meaningful on IA-32[E]
+platforms only. The variable is normally set up automatically upon
+toolkit initialization, but can be manipulated afterwards to modify
+crypto library behaviour. For the moment of this writing six bits are
+significant, namely:
+
+1. bit #28 denoting Hyperthreading, which is used to distiguish
+   cores with shared cache;
+2. bit #26 denoting SSE2 support;
+3. bit #25 denoting SSE support;
+4. bit #23 denoting MMX support;
+5. bit #20, reserved by Intel, is used to choose between RC4 code
+   pathes;
+6. bit #4 denoting presence of Time-Stamp Counter.
+
+For example, clearing bit #26 at run-time disables high-performance
+SSE2 code present in the crypto library. You might have to do this if
+target OpenSSL application is executed on SSE2 capable CPU, but under
+control of OS which does not support SSE2 extentions. Even though you
+can manipulate the value programmatically, you most likely will find it
+more appropriate to set up an environment variable with the same name
+prior starting target application, e.g. on Intel P4 processor 'env
+OPENSSL_ia32cap=0x12900010 apps/openssl', to achieve same effect
+without modifying the application source code. Alternatively you can
+reconfigure the toolkit with no-sse2 option and recompile.
+
+=cut
diff --git a/src/lib/libssl/src/doc/crypto/ecdsa.pod b/src/lib/libssl/src/doc/crypto/ecdsa.pod
new file mode 100644
index 0000000000..49b10f2249
--- /dev/null
+++ b/src/lib/libssl/src/doc/crypto/ecdsa.pod
@@ -0,0 +1,210 @@
+=pod
+
+=head1 NAME
+
+ecdsa - Elliptic Curve Digital Signature Algorithm
+
+=head1 SYNOPSIS
+
+ #include <openssl/ecdsa.h>
+
+ ECDSA_SIG*     ECDSA_SIG_new(void);
+ void           ECDSA_SIG_free(ECDSA_SIG *sig);
+ int            i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp);
+ ECDSA_SIG*     d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, 
+                long len);
+
+ ECDSA_SIG*     ECDSA_do_sign(const unsigned char *dgst, int dgst_len,
+                        EC_KEY *eckey);
+ ECDSA_SIG*     ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen, 
+                        const BIGNUM *kinv, const BIGNUM *rp,
+                        EC_KEY *eckey);
+ int            ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
+                        const ECDSA_SIG *sig, EC_KEY* eckey);
+ int            ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx,
+                        BIGNUM **kinv, BIGNUM **rp);
+ int            ECDSA_sign(int type, const unsigned char *dgst,
+                        int dgstlen, unsigned char *sig,
+                        unsigned int *siglen, EC_KEY *eckey);
+ int            ECDSA_sign_ex(int type, const unsigned char *dgst,
+                        int dgstlen, unsigned char *sig,
+                        unsigned int *siglen, const BIGNUM *kinv, 
+                        const BIGNUM *rp, EC_KEY *eckey);
+ int            ECDSA_verify(int type, const unsigned char *dgst,
+                        int dgstlen, const unsigned char *sig,
+                        int siglen, EC_KEY *eckey);
+ int            ECDSA_size(const EC_KEY *eckey);
+
+ const ECDSA_METHOD*    ECDSA_OpenSSL(void);
+ void           ECDSA_set_default_method(const ECDSA_METHOD *meth);
+ const ECDSA_METHOD*    ECDSA_get_default_method(void);
+ int            ECDSA_set_method(EC_KEY *eckey,const ECDSA_METHOD *meth);
+
+ int            ECDSA_get_ex_new_index(long argl, void *argp,
+                        CRYPTO_EX_new *new_func,
+                        CRYPTO_EX_dup *dup_func,
+                        CRYPTO_EX_free *free_func);
+ int            ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg);
+ void*          ECDSA_get_ex_data(EC_KEY *d, int idx);
+
+=head1 DESCRIPTION
+
+The B<ECDSA_SIG> structure consists of two BIGNUMs for the
+r and s value of a ECDSA signature (see X9.62 or FIPS 186-2).
+
+ struct
+        {
+        BIGNUM *r;
+        BIGNUM *s;
+ } ECDSA_SIG;
+
+ECDSA_SIG_new() allocates a new B<ECDSA_SIG> structure (note: this
+function also allocates the BIGNUMs) and initialize it.
+
+ECDSA_SIG_free() frees the B<ECDSA_SIG> structure B<sig>.
+
+i2d_ECDSA_SIG() creates the DER encoding of the ECDSA signature
+B<sig> and writes the encoded signature to B<*pp> (note: if B<pp>
+is NULL B<i2d_ECDSA_SIG> returns the expected length in bytes of 
+the DER encoded signature). B<i2d_ECDSA_SIG> returns the length
+of the DER encoded signature (or 0 on error).
+
+d2i_ECDSA_SIG() decodes a DER encoded ECDSA signature and returns
+the decoded signature in a newly allocated B<ECDSA_SIG> structure.
+B<*sig> points to the buffer containing the DER encoded signature
+of size B<len>.
+
+ECDSA_size() returns the maximum length of a DER encoded
+ECDSA signature created with the private EC key B<eckey>.
+
+ECDSA_sign_setup() may be used to precompute parts of the
+signing operation. B<eckey> is the private EC key and B<ctx>
+is a pointer to B<BN_CTX> structure (or NULL). The precomputed
+values or returned in B<kinv> and B<rp> and can be used in a
+later call to B<ECDSA_sign_ex> or B<ECDSA_do_sign_ex>.
+
+ECDSA_sign() is wrapper function for ECDSA_sign_ex with B<kinv>
+and B<rp> set to NULL.
+
+ECDSA_sign_ex() computes a digital signature of the B<dgstlen> bytes
+hash value B<dgst> using the private EC key B<eckey> and the optional
+pre-computed values B<kinv> and B<rp>. The DER encoded signatures is
+stored in B<sig> and it's length is returned in B<sig_len>. Note: B<sig>
+must point to B<ECDSA_size> bytes of memory. The parameter B<type>
+is ignored.
+
+ECDSA_verify() verifies that the signature in B<sig> of size
+B<siglen> is a valid ECDSA signature of the hash value
+value B<dgst> of size B<dgstlen> using the public key B<eckey>.
+The parameter B<type> is ignored.
+
+ECDSA_do_sign() is wrapper function for ECDSA_do_sign_ex with B<kinv>
+and B<rp> set to NULL.
+
+ECDSA_do_sign_ex() computes a digital signature of the B<dgst_len>
+bytes hash value B<dgst> using the private key B<eckey> and the
+optional pre-computed values B<kinv> and B<rp>. The signature is
+returned in a newly allocated B<ECDSA_SIG> structure (or NULL on error).
+
+ECDSA_do_verify() verifies that the signature B<sig> is a valid
+ECDSA signature of the hash value B<dgst> of size B<dgst_len>
+using the public key B<eckey>.
+
+=head1 RETURN VALUES
+
+ECDSA_size() returns the maximum length signature or 0 on error.
+
+ECDSA_sign_setup() and ECDSA_sign() return 1 if successful or -1
+on error.
+
+ECDSA_verify() and ECDSA_do_verify() return 1 for a valid
+signature, 0 for an invalid signature and -1 on error.
+The error codes can be obtained by L<ERR_get_error(3)|ERR_get_error(3)>.
+
+=head1 EXAMPLES
+
+Creating a ECDSA signature of given SHA-1 hash value using the
+named curve secp192k1.
+
+First step: create a EC_KEY object (note: this part is B<not> ECDSA
+specific)
+
+ int        ret;
+ ECDSA_SIG *sig;
+ EC_KEY    *eckey = EC_KEY_new();
+ if (eckey == NULL)
+        {
+        /* error */
+        }
+ key->group = EC_GROUP_new_by_nid(NID_secp192k1);
+ if (key->group == NULL)
+        {
+        /* error */
+        }
+ if (!EC_KEY_generate_key(eckey))
+        {
+        /* error */
+        }
+
+Second step: compute the ECDSA signature of a SHA-1 hash value 
+using B<ECDSA_do_sign> 
+
+ sig = ECDSA_do_sign(digest, 20, eckey);
+ if (sig == NULL)
+        {
+        /* error */
+        }
+
+or using B<ECDSA_sign>
+
+ unsigned char *buffer, *pp;
+ int            buf_len;
+ buf_len = ECDSA_size(eckey);
+ buffer  = OPENSSL_malloc(buf_len);
+ pp = buffer;
+ if (!ECDSA_sign(0, dgst, dgstlen, pp, &buf_len, eckey);
+        {
+        /* error */
+        }
+
+Third step: verify the created ECDSA signature using B<ECDSA_do_verify>
+
+ ret = ECDSA_do_verify(digest, 20, sig, eckey);
+
+or using B<ECDSA_verify>
+
+ ret = ECDSA_verify(0, digest, 20, buffer, buf_len, eckey);
+
+and finally evaluate the return value:
+
+ if (ret == -1)
+        {
+        /* error */
+        }
+ else if (ret == 0)
+        {
+        /* incorrect signature */
+        }
+ else   /* ret == 1 */
+        {
+        /* signature ok */
+        }
+
+=head1 CONFORMING TO
+
+ANSI X9.62, US Federal Information Processing Standard FIPS 186-2
+(Digital Signature Standard, DSS)
+
+=head1 SEE ALSO
+
+L<dsa(3)|dsa(3)>, L<rsa(3)|rsa(3)>
+
+=head1 HISTORY
+
+The ecdsa implementation was first introduced in OpenSSL 0.9.8
+
+=head1 AUTHOR
+
+Nils Larsch for the OpenSSL project (http://www.openssl.org).
+
+=cut
diff --git a/src/lib/libssl/src/doc/crypto/x509.pod b/src/lib/libssl/src/doc/crypto/x509.pod
new file mode 100644
index 0000000000..f9e58e0e41
--- /dev/null
+++ b/src/lib/libssl/src/doc/crypto/x509.pod
@@ -0,0 +1,64 @@
+=pod
+
+=head1 NAME
+
+x509 - X.509 certificate handling
+
+=head1 SYNOPSIS
+
+ #include <openssl/x509.h>
+
+=head1 DESCRIPTION
+
+A X.509 certificate is a structured grouping of information about
+an individual, a device, or anything one can imagine.  A X.509 CRL
+(certificate revocation list) is a tool to help determine if a
+certificate is still valid.  The exact definition of those can be
+found in the X.509 document from ITU-T, or in RFC3280 from PKIX.
+In OpenSSL, the type X509 is used to express such a certificate, and
+the type X509_CRL is used to express a CRL.
+
+A related structure is a certificate request, defined in PKCS#10 from
+RSA Security, Inc, also reflected in RFC2896.  In OpenSSL, the type
+X509_REQ is used to express such a certificate request.
+
+To handle some complex parts of a certificate, there are the types
+X509_NAME (to express a certificate name), X509_ATTRIBUTE (to express
+a certificate attributes), X509_EXTENSION (to express a certificate
+extension) and a few more.
+
+Finally, there's the supertype X509_INFO, which can contain a CRL, a
+certificate and a corresponding private key.
+
+B<X509_>I<...>, B<d2i_X509_>I<...> and B<i2d_X509_>I<...> handle X.509
+certificates, with some exceptions, shown below.
+
+B<X509_CRL_>I<...>, B<d2i_X509_CRL_>I<...> and B<i2d_X509_CRL_>I<...>
+handle X.509 CRLs.
+
+B<X509_REQ_>I<...>, B<d2i_X509_REQ_>I<...> and B<i2d_X509_REQ_>I<...>
+handle PKCS#10 certificate requests.
+
+B<X509_NAME_>I<...> handle certificate names.
+
+B<X509_ATTRIBUTE_>I<...> handle certificate attributes.
+
+B<X509_EXTENSION_>I<...> handle certificate extensions.
+
+=head1 SEE ALSO
+
+L<X509_NAME_ENTRY_get_object(3)|X509_NAME_ENTRY_get_object(3)>,
+L<X509_NAME_add_entry_by_txt(3)|X509_NAME_add_entry_by_txt(3)>,
+L<X509_NAME_add_entry_by_NID(3)|X509_NAME_add_entry_by_NID(3)>,
+L<X509_NAME_print_ex(3)|X509_NAME_print_ex(3)>,
+L<X509_NAME_new(3)|X509_NAME_new(3)>,
+L<d2i_X509(3)|d2i_X509(3)>,
+L<d2i_X509_ALGOR(3)|d2i_X509_ALGOR(3)>,
+L<d2i_X509_CRL(3)|d2i_X509_CRL(3)>,
+L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>,
+L<d2i_X509_REQ(3)|d2i_X509_REQ(3)>,
+L<d2i_X509_SIG(3)|d2i_X509_SIG(3)>,
+L<crypto(3)|crypto(3)>,
+L<x509v3(3)|x509v3(3)>
+
+=cut
diff --git a/src/lib/libssl/src/engines/Makefile b/src/lib/libssl/src/engines/Makefile
new file mode 100644
index 0000000000..88f8390d0e
--- /dev/null
+++ b/src/lib/libssl/src/engines/Makefile
@@ -0,0 +1,249 @@
+#
+# OpenSSL/engines/Makefile
+#
+
+DIR=    engines
+TOP=    ..
+CC=     cc
+INCLUDES= -I../include
+CFLAG=-g
+MAKEFILE=       Makefile
+AR=             ar r
+
+PEX_LIBS=
+EX_LIBS=
+
+CFLAGS= $(INCLUDES) $(CFLAG)
+
+GENERAL=Makefile engines.com install.com engine_vector.mar
+TEST=
+APPS=
+
+LIB=$(TOP)/libcrypto.a
+LIBNAMES= 4758cca aep atalla cswift gmp chil nuron sureware ubsec
+
+LIBSRC= e_4758cca.c \
+        e_aep.c \
+        e_atalla.c \
+        e_cswift.c \
+        e_gmp.c \
+        e_chil.c \
+        e_nuron.c \
+        e_sureware.c \
+        e_ubsec.c
+LIBOBJ= e_4758cca.o \
+        e_aep.o \
+        e_atalla.o \
+        e_cswift.o \
+        e_gmp.o \
+        e_chil.o \
+        e_nuron.o \
+        e_sureware.o \
+        e_ubsec.o
+
+SRC= $(LIBSRC)
+
+EXHEADER= 
+HEADER= e_4758cca_err.c e_4758cca_err.h \
+        e_aep_err.c e_aep_err.h \
+        e_atalla_err.c e_atalla_err.h \
+        e_cswift_err.c e_cswift_err.h \
+        e_gmp_err.c e_gmp_err.h \
+        e_chil_err.c e_chil_err.h \
+        e_nuron_err.c e_nuron_err.h \
+        e_sureware_err.c e_sureware_err.h \
+        e_ubsec_err.c e_ubsec_err.h
+
+ALL=    $(GENERAL) $(SRC) $(HEADER)
+
+top:
+        (cd ..; $(MAKE) DIRS=$(DIR) all)
+
+all:    lib
+
+lib:    $(LIBOBJ)
+        @if [ -n "$(SHARED_LIBS)" ]; then \
+                set -e; \
+                for l in $(LIBNAMES); do \
+                        $(MAKE) -f ../Makefile.shared -e \
+                                LIBNAME=$$l LIBEXTRAS=e_$$l.o \
+                                LIBDEPS='-L.. -lcrypto $(EX_LIBS)' \
+                                link_o.$(SHLIB_TARGET); \
+                done; \
+        else \
+                $(AR) $(LIB) $(LIBOBJ); \
+                $(RANLIB) $(LIB) || echo Never mind.; \
+        fi; \
+        touch lib
+
+files:
+        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+
+links:
+
+# XXXXX This currently only works on systems that use .so as suffix
+# for shared libraries as well as for Cygwin which uses the
+# dlfcn_name_converter and therefore stores the engines with .so suffix, too.
+# XXXXX This was extended to HP-UX dl targets, which use .sl suffix.
+install:
+        @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+        @if [ -n "$(SHARED_LIBS)" ]; then \
+                set -e; \
+                for l in $(LIBNAMES); do \
+                        ( echo installing $$l; \
+                          if [ "$(PLATFORM)" != "Cygwin" ]; then \
+                                case "$(CFLAGS)" in \
+                                *DSO_DLFCN*)    sfx="so";;      \
+                                *DSO_DL*)       sfx="sl";;      \
+                                *)              sfx="bad";;     \
+                                esac; \
+                                cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
+                          else \
+                                sfx="so"; \
+                                cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
+                          fi; \
+                          chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
+                          mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \
+                done; \
+        fi
+
+tags:
+        ctags $(SRC)
+
+errors:
+        set -e; for l in $(LIBNAMES); do \
+                $(PERL) ../util/mkerr.pl -conf e_$$l.ec \
+                        -nostatic -staticloader -write e_$$l.c; \
+        done
+
+tests:
+
+lint:
+        lint -DLINT $(INCLUDES) $(SRC)>fluff
+
+depend:
+        @if [ -z "$(THIS)" ]; then \
+            $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \
+        else \
+            $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC); \
+        fi
+
+dclean:
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        mv -f Makefile.new $(MAKEFILE)
+
+clean:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+e_4758cca.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_4758cca.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_4758cca.o: ../include/openssl/crypto.h ../include/openssl/dso.h
+e_4758cca.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+e_4758cca.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+e_4758cca.o: ../include/openssl/engine.h ../include/openssl/err.h
+e_4758cca.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+e_4758cca.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+e_4758cca.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_4758cca.o: ../include/openssl/ossl_typ.h ../include/openssl/pkcs7.h
+e_4758cca.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+e_4758cca.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+e_4758cca.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+e_4758cca.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+e_4758cca.o: e_4758cca.c e_4758cca_err.c e_4758cca_err.h
+e_4758cca.o: vendor_defns/hw_4758_cca.h
+e_aep.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_aep.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_aep.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_aep.o: ../include/openssl/dsa.h ../include/openssl/dso.h
+e_aep.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+e_aep.o: ../include/openssl/err.h ../include/openssl/lhash.h
+e_aep.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_aep.o: ../include/openssl/ossl_typ.h ../include/openssl/rsa.h
+e_aep.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+e_aep.o: ../include/openssl/symhacks.h e_aep.c e_aep_err.c e_aep_err.h
+e_aep.o: vendor_defns/aep.h
+e_atalla.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_atalla.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_atalla.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_atalla.o: ../include/openssl/dsa.h ../include/openssl/dso.h
+e_atalla.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+e_atalla.o: ../include/openssl/err.h ../include/openssl/lhash.h
+e_atalla.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_atalla.o: ../include/openssl/ossl_typ.h ../include/openssl/rsa.h
+e_atalla.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+e_atalla.o: ../include/openssl/symhacks.h e_atalla.c e_atalla_err.c
+e_atalla.o: e_atalla_err.h vendor_defns/atalla.h
+e_chil.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_chil.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_chil.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_chil.o: ../include/openssl/dso.h ../include/openssl/e_os2.h
+e_chil.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+e_chil.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
+e_chil.o: ../include/openssl/err.h ../include/openssl/evp.h
+e_chil.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+e_chil.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+e_chil.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+e_chil.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+e_chil.o: ../include/openssl/pkcs7.h ../include/openssl/rand.h
+e_chil.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+e_chil.o: ../include/openssl/sha.h ../include/openssl/stack.h
+e_chil.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+e_chil.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h e_chil.c
+e_chil.o: e_chil_err.c e_chil_err.h vendor_defns/hwcryptohook.h
+e_cswift.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_cswift.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_cswift.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_cswift.o: ../include/openssl/dsa.h ../include/openssl/dso.h
+e_cswift.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+e_cswift.o: ../include/openssl/err.h ../include/openssl/lhash.h
+e_cswift.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_cswift.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+e_cswift.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+e_cswift.o: ../include/openssl/stack.h ../include/openssl/symhacks.h e_cswift.c
+e_cswift.o: e_cswift_err.c e_cswift_err.h vendor_defns/cswift.h
+e_gmp.o: ../include/openssl/buffer.h ../include/openssl/crypto.h
+e_gmp.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+e_gmp.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_gmp.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h
+e_gmp.o: ../include/openssl/stack.h ../include/openssl/symhacks.h e_gmp.c
+e_nuron.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_nuron.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_nuron.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_nuron.o: ../include/openssl/dsa.h ../include/openssl/dso.h
+e_nuron.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+e_nuron.o: ../include/openssl/err.h ../include/openssl/lhash.h
+e_nuron.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_nuron.o: ../include/openssl/ossl_typ.h ../include/openssl/rsa.h
+e_nuron.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+e_nuron.o: ../include/openssl/symhacks.h e_nuron.c e_nuron_err.c e_nuron_err.h
+e_sureware.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_sureware.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_sureware.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_sureware.o: ../include/openssl/dsa.h ../include/openssl/dso.h
+e_sureware.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+e_sureware.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h
+e_sureware.o: ../include/openssl/engine.h ../include/openssl/err.h
+e_sureware.o: ../include/openssl/evp.h ../include/openssl/lhash.h
+e_sureware.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+e_sureware.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_sureware.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
+e_sureware.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
+e_sureware.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+e_sureware.o: ../include/openssl/safestack.h ../include/openssl/sha.h
+e_sureware.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+e_sureware.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h
+e_sureware.o: e_sureware.c e_sureware_err.c e_sureware_err.h
+e_sureware.o: vendor_defns/sureware.h
+e_ubsec.o: ../include/openssl/asn1.h ../include/openssl/bio.h
+e_ubsec.o: ../include/openssl/bn.h ../include/openssl/buffer.h
+e_ubsec.o: ../include/openssl/crypto.h ../include/openssl/dh.h
+e_ubsec.o: ../include/openssl/dsa.h ../include/openssl/dso.h
+e_ubsec.o: ../include/openssl/e_os2.h ../include/openssl/engine.h
+e_ubsec.o: ../include/openssl/err.h ../include/openssl/lhash.h
+e_ubsec.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+e_ubsec.o: ../include/openssl/ossl_typ.h ../include/openssl/rsa.h
+e_ubsec.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+e_ubsec.o: ../include/openssl/symhacks.h e_ubsec.c e_ubsec_err.c e_ubsec_err.h
+e_ubsec.o: vendor_defns/hw_ubsec.h
diff --git a/src/lib/libssl/src/engines/axp.opt b/src/lib/libssl/src/engines/axp.opt
new file mode 100644
index 0000000000..1dc71bf4b7
--- /dev/null
+++ b/src/lib/libssl/src/engines/axp.opt
@@ -0,0 +1 @@
+SYMBOL_VECTOR=(bind_engine=PROCEDURE,v_check=PROCEDURE)
diff --git a/src/lib/libssl/src/crypto/engine/hw_4758_cca.c b/src/lib/libssl/src/engines/e_4758cca.c
index 4f5ae8a46d..0f1dae7567 100644
--- a/src/lib/libssl/src/crypto/engine/hw_4758_cca.c
+++ b/src/lib/libssl/src/engines/e_4758cca.c
@@ -54,13 +54,17 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-/* #include <openssl/pem.h> */
-#include "cryptlib.h"
 #include <openssl/dso.h>
 #include <openssl/x509.h>
 #include <openssl/objects.h>
 #include <openssl/engine.h>
+#include <openssl/rand.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_4758_CCA
@@ -71,12 +75,12 @@
 #include "vendor_defns/hw_4758_cca.h"
 #endif
 
-#include "hw_4758_cca_err.c"
+#include "e_4758cca_err.c"
 
 static int ibm_4758_cca_destroy(ENGINE *e);
 static int ibm_4758_cca_init(ENGINE *e);
 static int ibm_4758_cca_finish(ENGINE *e);
-static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 
 /* rsa functions */
 /*---------------*/
@@ -107,8 +111,10 @@ static int getModulusAndExponent(const unsigned char *token, long *exponentLengt
 static int cca_get_random_bytes(unsigned char*, int );
 static int cca_random_status(void);
 
+#ifndef OPENSSL_NO_RSA
 static void cca_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
                 int idx,long argl, void *argp);
+#endif
 
 /* Function pointers for CCA verbs */
 /*---------------------------------*/
@@ -152,7 +158,9 @@ static const char* n_pkaDecrypt = CSNDPKD;
 #endif
 static const char* n_randomNumberGenerate = CSNBRNG;
 
+#ifndef OPENSSL_NO_RSA
 static int hndidx = -1;
+#endif
 static DSO *dso = NULL;
 
 /* openssl engine initialization structures */
@@ -182,7 +190,8 @@ static RSA_METHOD ibm_4758_cca_rsa =
         RSA_FLAG_SIGN_VER,        /* flags */
         NULL, /* app_data */
         cca_rsa_sign, /* rsa_sign */
-        cca_rsa_verify  /* rsa_verify */
+        cca_rsa_verify, /* rsa_verify */
+        NULL /* rsa_keygen */
         };
 #endif
 
@@ -199,6 +208,10 @@ static RAND_METHOD ibm_4758_cca_rand =
 
 static const char *engine_4758_cca_id = "4758cca";
 static const char *engine_4758_cca_name = "IBM 4758 CCA hardware engine support";
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE 
+/* Compatibility hack, the dynamic library uses this form in the path */
+static const char *engine_4758_cca_id_alt = "4758_cca";
+#endif
 
 /* engine implementation */
 /*-----------------------*/
@@ -214,8 +227,10 @@ static int bind_helper(ENGINE *e)
                         !ENGINE_set_init_function(e, ibm_4758_cca_init) ||
                         !ENGINE_set_finish_function(e, ibm_4758_cca_finish) ||
                         !ENGINE_set_ctrl_function(e, ibm_4758_cca_ctrl) ||
+#ifndef OPENSSL_NO_RSA
                         !ENGINE_set_load_privkey_function(e, ibm_4758_load_privkey) ||
                         !ENGINE_set_load_pubkey_function(e, ibm_4758_load_pubkey) ||
+#endif
                         !ENGINE_set_cmd_defns(e, cca4758_cmd_defns))
                 return 0;
         /* Ensure the error handling is set up */
@@ -223,7 +238,7 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_4758_cca(void)
         {
         ENGINE *ret = ENGINE_new();
@@ -297,8 +312,10 @@ static int ibm_4758_cca_init(ENGINE *e)
                 }
 #endif
 
+#ifndef OPENSSL_NO_RSA
         hndidx = RSA_get_ex_new_index(0, "IBM 4758 CCA RSA key handle",
                 NULL, NULL, cca_ex_free);
+#endif
 
         return 1;
 err:
@@ -306,13 +323,15 @@ err:
                 DSO_free(dso);
         dso = NULL;
 
+#ifndef OPENSSL_NO_RSA
         keyRecordRead = (F_KEYRECORDREAD)0;
-        randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
         digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
         digitalSignatureVerify = (F_DIGITALSIGNATUREVERIFY)0;
         publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
         pkaEncrypt = (F_PKAENCRYPT)0;
         pkaDecrypt = (F_PKADECRYPT)0;
+#endif
+        randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
         return 0;
         }
 
@@ -332,6 +351,7 @@ static int ibm_4758_cca_finish(ENGINE *e)
                 return 0;
                 }
         dso = NULL;
+#ifndef OPENSSL_NO_RSA
         keyRecordRead = (F_KEYRECORDREAD)0;
         randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
         digitalSignatureGenerate = (F_DIGITALSIGNATUREGENERATE)0;
@@ -339,10 +359,12 @@ static int ibm_4758_cca_finish(ENGINE *e)
         publicKeyExtract = (F_PUBLICKEYEXTRACT)0;
         pkaEncrypt = (F_PKAENCRYPT)0;
         pkaDecrypt = (F_PKADECRYPT)0;
+#endif
+        randomNumberGenerate = (F_RANDOMNUMBERGENERATE)0;
         return 1;
         }
 
-static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int ibm_4758_cca_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((dso == NULL) ? 0 : 1);
         switch(cmd)
@@ -389,7 +411,7 @@ static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id,
         unsigned char exitData[8];
         unsigned char ruleArray[8];
         unsigned char keyLabel[64];
-        long keyLabelLength = strlen(key_id);
+        unsigned long keyLabelLength = strlen(key_id);
         unsigned char modulus[256];
         long modulusFieldLength = sizeof(modulus);
         long modulusLength = 0;
@@ -398,7 +420,7 @@ static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id,
 
         if (keyLabelLength > sizeof(keyLabel))
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PRIVKEY,
                 CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
                 return NULL;
                 }
@@ -409,7 +431,7 @@ static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id,
         keyToken = OPENSSL_malloc(MAX_CCA_PKA_TOKEN_SIZE + sizeof(long));
         if (!keyToken)
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PRIVKEY,
                                 ERR_R_MALLOC_FAILURE);
                 goto err;
                 }
@@ -420,7 +442,7 @@ static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id,
 
         if (returnCode)
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PRIVKEY,
                         CCA4758_R_FAILED_LOADING_PRIVATE_KEY);
                 goto err;
                 }
@@ -431,7 +453,7 @@ static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id,
 
         if (returnCode)
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PRIVKEY,
                         CCA4758_R_FAILED_LOADING_PRIVATE_KEY);
                 goto err;
                 }
@@ -440,7 +462,7 @@ static EVP_PKEY *ibm_4758_load_privkey(ENGINE* e, const char* key_id,
                         exponent, &modulusLength, &modulusFieldLength,
                         modulus))
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PRIVKEY,
                         CCA4758_R_FAILED_LOADING_PRIVATE_KEY);
                 goto err;
                 }
@@ -481,7 +503,7 @@ static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id,
         unsigned char exitData[8];
         unsigned char ruleArray[8];
         unsigned char keyLabel[64];
-        long keyLabelLength = strlen(key_id);
+        unsigned long keyLabelLength = strlen(key_id);
         unsigned char modulus[512];
         long modulusFieldLength = sizeof(modulus);
         long modulusLength = 0;
@@ -490,7 +512,7 @@ static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id,
 
         if (keyLabelLength > sizeof(keyLabel))
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PUBKEY,
                         CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
                 return NULL;
                 }
@@ -501,7 +523,7 @@ static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id,
         keyToken = OPENSSL_malloc(MAX_CCA_PKA_TOKEN_SIZE + sizeof(long));
         if (!keyToken)
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PUBKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PUBKEY,
                                 ERR_R_MALLOC_FAILURE);
                 goto err;
                 }
@@ -512,7 +534,7 @@ static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id,
 
         if (returnCode)
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PUBKEY,
                                 ERR_R_MALLOC_FAILURE);
                 goto err;
                 }
@@ -520,7 +542,7 @@ static EVP_PKEY *ibm_4758_load_pubkey(ENGINE* e, const char* key_id,
         if (!getModulusAndExponent(keyToken+sizeof(long), &exponentLength,
                         exponent, &modulusLength, &modulusFieldLength, modulus))
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,
+                CCA4758err(CCA4758_F_IBM_4758_LOAD_PUBKEY,
                         CCA4758_R_FAILED_LOADING_PUBLIC_KEY);
                 goto err;
                 }
@@ -633,14 +655,14 @@ static int cca_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
 
                 if (!algorithm.algorithm)
                         {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
+                        CCA4758err(CCA4758_F_CCA_RSA_VERIFY,
                                 CCA4758_R_UNKNOWN_ALGORITHM_TYPE);
                         return 0;
                         }
 
                 if (!algorithm.algorithm->length)
                         {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
+                        CCA4758err(CCA4758_F_CCA_RSA_VERIFY,
                                 CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD);
                         return 0;
                         }
@@ -660,7 +682,7 @@ static int cca_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
 
         if (length - RSA_PKCS1_PADDING > keyLength)
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
+                CCA4758err(CCA4758_F_CCA_RSA_VERIFY,
                         CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
                 return 0;
                 }
@@ -670,7 +692,7 @@ static int cca_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
                 case NID_md5_sha1 :
                         if (m_len != SSL_SIG_LEN)
                                 {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
+                                CCA4758err(CCA4758_F_CCA_RSA_VERIFY,
                                 CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
                                 return 0;
                                 }
@@ -685,7 +707,7 @@ static int cca_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
                                         (unsigned int)keyLength+1);
                         if (!hashBuffer)
                                 {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
+                                CCA4758err(CCA4758_F_CCA_RSA_VERIFY,
                                                 ERR_R_MALLOC_FAILURE);
                                 return 0;
                                 }
@@ -700,7 +722,7 @@ static int cca_rsa_verify(int type, const unsigned char *m, unsigned int m_len,
                                         (unsigned int)keyLength+1);
                         if (!hashBuffer)
                                 {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
+                                CCA4758err(CCA4758_F_CCA_RSA_VERIFY,
                                                 ERR_R_MALLOC_FAILURE);
                                 return 0;
                                 }
@@ -757,14 +779,14 @@ static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
 
                 if (!algorithm.algorithm)
                         {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_SIGN,
+                        CCA4758err(CCA4758_F_CCA_RSA_SIGN,
                                 CCA4758_R_UNKNOWN_ALGORITHM_TYPE);
                         return 0;
                         }
 
                 if (!algorithm.algorithm->length)
                         {
-                        CCA4758err(CCA4758_F_IBM_4758_CCA_SIGN,
+                        CCA4758err(CCA4758_F_CCA_RSA_SIGN,
                                 CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD);
                         return 0;
                         }
@@ -784,7 +806,7 @@ static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
 
         if (length - RSA_PKCS1_PADDING > keyLength)
                 {
-                CCA4758err(CCA4758_F_IBM_4758_CCA_SIGN,
+                CCA4758err(CCA4758_F_CCA_RSA_SIGN,
                         CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
                 return 0;
                 }
@@ -794,7 +816,7 @@ static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
                 case NID_md5_sha1 :
                         if (m_len != SSL_SIG_LEN)
                                 {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_SIGN,
+                                CCA4758err(CCA4758_F_CCA_RSA_SIGN,
                                 CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
                                 return 0;
                                 }
@@ -808,7 +830,7 @@ static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
                                         (unsigned int)keyLength+1);
                         if (!hashBuffer)
                                 {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
+                                CCA4758err(CCA4758_F_CCA_RSA_SIGN,
                                                 ERR_R_MALLOC_FAILURE);
                                 return 0;
                                 }
@@ -822,7 +844,7 @@ static int cca_rsa_sign(int type, const unsigned char *m, unsigned int m_len,
                                         (unsigned int)keyLength+1);
                         if (!hashBuffer)
                                 {
-                                CCA4758err(CCA4758_F_IBM_4758_CCA_VERIFY,
+                                CCA4758err(CCA4758_F_CCA_RSA_SIGN,
                                                 ERR_R_MALLOC_FAILURE);
                                 return 0;
                                 }
@@ -921,7 +943,7 @@ static int cca_get_random_bytes(unsigned char* buf, int num)
         unsigned char form[] = "RANDOM  ";
         unsigned char rand_buf[8];
 
-        while(num >= sizeof(rand_buf))
+        while(num >= (int)sizeof(rand_buf))
                 {
                 randomNumberGenerate(&ret_code, &reason_code, &exit_data_length,
                         exit_data, form, rand_buf);
@@ -944,18 +966,21 @@ static int cca_get_random_bytes(unsigned char* buf, int num)
         return 1;
         }
 
+#ifndef OPENSSL_NO_RSA
 static void cca_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad, int idx,
                 long argl, void *argp)
         {
         if (item)
                 OPENSSL_free(item);
         }
+#endif
 
 /* Goo to handle building as a dynamic engine */
-#ifdef ENGINE_DYNAMIC_SUPPORT 
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE 
 static int bind_fn(ENGINE *e, const char *id)
         {
-        if(id && (strcmp(id, engine_4758_cca_id) != 0))
+        if(id && (strcmp(id, engine_4758_cca_id) != 0) &&
+                        (strcmp(id, engine_4758_cca_id_alt) != 0))
                 return 0;
         if(!bind_helper(e))
                 return 0;
@@ -963,7 +988,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_4758_CCA */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libssl/src/engines/e_4758cca.ec b/src/lib/libssl/src/engines/e_4758cca.ec
new file mode 100644
index 0000000000..f30ed02c05
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_4758cca.ec
@@ -0,0 +1 @@
+L CCA4758       e_4758cca_err.h         e_4758cca_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_4758_cca_err.c b/src/lib/libssl/src/engines/e_4758cca_err.c
index 7ea5c63707..6ecdc6e627 100644
--- a/src/lib/libssl/src/crypto/engine/hw_4758_cca_err.c
+++ b/src/lib/libssl/src/engines/e_4758cca_err.c
@@ -1,6 +1,6 @@
-/* hw_4758_cca_err.c */
+/* e_4758cca_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -60,34 +60,38 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_4758_cca_err.h"
+#include "e_4758cca_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA CCA4758_str_functs[]=
         {
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_CTRL,0),     "IBM_4758_CCA_CTRL"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_FINISH,0),   "IBM_4758_CCA_FINISH"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_INIT,0),     "IBM_4758_CCA_INIT"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY,0),     "IBM_4758_CCA_LOAD_PRIVKEY"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_LOAD_PUBKEY,0),      "IBM_4758_CCA_LOAD_PUBKEY"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_SIGN,0),     "IBM_4758_CCA_SIGN"},
-{ERR_PACK(0,CCA4758_F_IBM_4758_CCA_VERIFY,0),   "IBM_4758_CCA_VERIFY"},
+{ERR_FUNC(CCA4758_F_CCA_RSA_SIGN),      "CCA_RSA_SIGN"},
+{ERR_FUNC(CCA4758_F_CCA_RSA_VERIFY),    "CCA_RSA_VERIFY"},
+{ERR_FUNC(CCA4758_F_IBM_4758_CCA_CTRL), "IBM_4758_CCA_CTRL"},
+{ERR_FUNC(CCA4758_F_IBM_4758_CCA_FINISH),       "IBM_4758_CCA_FINISH"},
+{ERR_FUNC(CCA4758_F_IBM_4758_CCA_INIT), "IBM_4758_CCA_INIT"},
+{ERR_FUNC(CCA4758_F_IBM_4758_LOAD_PRIVKEY),     "IBM_4758_LOAD_PRIVKEY"},
+{ERR_FUNC(CCA4758_F_IBM_4758_LOAD_PUBKEY),      "IBM_4758_LOAD_PUBKEY"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA CCA4758_str_reasons[]=
         {
-{CCA4758_R_ALREADY_LOADED                ,"already loaded"},
-{CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD       ,"asn1 oid unknown for md"},
-{CCA4758_R_COMMAND_NOT_IMPLEMENTED       ,"command not implemented"},
-{CCA4758_R_DSO_FAILURE                   ,"dso failure"},
-{CCA4758_R_FAILED_LOADING_PRIVATE_KEY    ,"failed loading private key"},
-{CCA4758_R_FAILED_LOADING_PUBLIC_KEY     ,"failed loading public key"},
-{CCA4758_R_NOT_LOADED                    ,"not loaded"},
-{CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL   ,"size too large or too small"},
-{CCA4758_R_UNIT_FAILURE                  ,"unit failure"},
-{CCA4758_R_UNKNOWN_ALGORITHM_TYPE        ,"unknown algorithm type"},
+{ERR_REASON(CCA4758_R_ALREADY_LOADED)    ,"already loaded"},
+{ERR_REASON(CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD),"asn1 oid unknown for md"},
+{ERR_REASON(CCA4758_R_COMMAND_NOT_IMPLEMENTED),"command not implemented"},
+{ERR_REASON(CCA4758_R_DSO_FAILURE)       ,"dso failure"},
+{ERR_REASON(CCA4758_R_FAILED_LOADING_PRIVATE_KEY),"failed loading private key"},
+{ERR_REASON(CCA4758_R_FAILED_LOADING_PUBLIC_KEY),"failed loading public key"},
+{ERR_REASON(CCA4758_R_NOT_LOADED)        ,"not loaded"},
+{ERR_REASON(CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL),"size too large or too small"},
+{ERR_REASON(CCA4758_R_UNIT_FAILURE)      ,"unit failure"},
+{ERR_REASON(CCA4758_R_UNKNOWN_ALGORITHM_TYPE),"unknown algorithm type"},
 {0,NULL}
         };
 
diff --git a/src/lib/libssl/src/crypto/engine/hw_4758_cca_err.h b/src/lib/libssl/src/engines/e_4758cca_err.h
index 2fc563ab11..26087edbfa 100644
--- a/src/lib/libssl/src/crypto/engine/hw_4758_cca_err.h
+++ b/src/lib/libssl/src/engines/e_4758cca_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_CCA4758_ERR_H
 #define HEADER_CCA4758_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#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.
@@ -67,13 +71,13 @@ static void ERR_CCA4758_error(int function, int reason, char *file, int line);
 /* Error codes for the CCA4758 functions. */
 
 /* Function codes. */
+#define CCA4758_F_CCA_RSA_SIGN                           105
+#define CCA4758_F_CCA_RSA_VERIFY                         106
 #define CCA4758_F_IBM_4758_CCA_CTRL                      100
 #define CCA4758_F_IBM_4758_CCA_FINISH                    101
 #define CCA4758_F_IBM_4758_CCA_INIT                      102
-#define CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY              103
-#define CCA4758_F_IBM_4758_CCA_LOAD_PUBKEY               104
-#define CCA4758_F_IBM_4758_CCA_SIGN                      105
-#define CCA4758_F_IBM_4758_CCA_VERIFY                    106
+#define CCA4758_F_IBM_4758_LOAD_PRIVKEY                  103
+#define CCA4758_F_IBM_4758_LOAD_PUBKEY                   104
 
 /* Reason codes. */
 #define CCA4758_R_ALREADY_LOADED                         100
diff --git a/src/lib/libssl/src/crypto/engine/hw_aep.c b/src/lib/libssl/src/engines/e_aep.c
index 5f1772ea99..ffdc354cdc 100644
--- a/src/lib/libssl/src/crypto/engine/hw_aep.c
+++ b/src/lib/libssl/src/engines/e_aep.c
@@ -1,6 +1,3 @@
-/* crypto/engine/hw_aep.c */
-/*
- */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -68,10 +65,25 @@
 typedef int pid_t;
 #endif
 
+#if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
+#define getpid GetThreadID
+extern int GetThreadID(void);
+#endif
+
 #include <openssl/crypto.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 #include <openssl/buffer.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_AEP
@@ -84,11 +96,11 @@ typedef int pid_t;
 #define AEP_LIB_NAME "aep engine"
 #define FAIL_TO_SW 0x10101010
 
-#include "hw_aep_err.c"
+#include "e_aep_err.c"
 
 static int aep_init(ENGINE *e);
 static int aep_finish(ENGINE *e);
-static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 static int aep_destroy(ENGINE *e);
 
 static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR hConnection);
@@ -97,21 +109,25 @@ static AEP_RV aep_close_connection(AEP_CONNECTION_HNDL hConnection);
 static AEP_RV aep_close_all_connections(int use_engine_lock, int *in_use);
 
 /* BIGNUM stuff */
+#ifndef OPENSSL_NO_RSA
 static int aep_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         const BIGNUM *m, BN_CTX *ctx);
 
 static AEP_RV aep_mod_exp_crt(BIGNUM *r,const  BIGNUM *a, const BIGNUM *p,
         const BIGNUM *q, const BIGNUM *dmp1,const BIGNUM *dmq1,
         const BIGNUM *iqmp, BN_CTX *ctx);
+#endif
 
 /* RSA stuff */
 #ifndef OPENSSL_NO_RSA
-static int aep_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
+static int aep_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
 #endif
 
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
+#ifndef OPENSSL_NO_RSA
 static int aep_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+#endif
 
 /* DSA stuff */
 #ifndef OPENSSL_NO_DSA
@@ -172,7 +188,8 @@ static RSA_METHOD aep_rsa =
         0,                   /*flags*/
         NULL,                /*app_data*/
         NULL,                /*rsa_sign*/
-        NULL                 /*rsa_verify*/
+        NULL,                /*rsa_verify*/
+        NULL                 /*rsa_keygen*/
         };
 #endif
 
@@ -189,7 +206,9 @@ static DSA_METHOD aep_dsa =
         NULL,                /* init */
         NULL,                /* finish */
         0,                   /* flags */
-        NULL                 /* app_data */
+        NULL,                /* app_data */
+        NULL,                /* dsa_paramgen */
+        NULL                 /* dsa_keygen */
         };
 #endif
 
@@ -204,6 +223,7 @@ static DH_METHOD aep_dh =
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
@@ -318,7 +338,7 @@ static int bind_aep(ENGINE *e)
         return 1;
 }
 
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_helper(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_aep_id) != 0))
@@ -551,7 +571,7 @@ static int aep_finish(ENGINE *e)
         return to_return;
         }
 
-static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int aep_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((aep_dso == NULL) ? 0 : 1);
         switch(cmd)
@@ -616,7 +636,7 @@ static int aep_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         rv = aep_return_connection(hConnection);
         if (rv != AEP_R_OK)
                 {
-                AEPHKerr(AEPHK_F_AEP_RAND,AEPHK_R_RETURN_CONNECTION_FAILED); 
+                AEPHKerr(AEPHK_F_AEP_MOD_EXP,AEPHK_R_RETURN_CONNECTION_FAILED); 
                 goto err;
                 }
 
@@ -625,6 +645,7 @@ static int aep_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         return to_return;
         }
         
+#ifndef OPENSSL_NO_RSA
 static AEP_RV aep_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         const BIGNUM *q, const BIGNUM *dmp1,
         const BIGNUM *dmq1,const BIGNUM *iqmp, BN_CTX *ctx)
@@ -654,13 +675,14 @@ static AEP_RV aep_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         rv = aep_return_connection(hConnection);
         if (rv != AEP_R_OK)
                 {
-                AEPHKerr(AEPHK_F_AEP_RAND,AEPHK_R_RETURN_CONNECTION_FAILED); 
+                AEPHKerr(AEPHK_F_AEP_MOD_EXP_CRT,AEPHK_R_RETURN_CONNECTION_FAILED); 
                 goto err;
                 }
  
  err:
         return rv;
         }
+#endif
         
 
 #ifdef AEPRAND
@@ -742,15 +764,11 @@ static int aep_rand_status(void)
 #endif
 
 #ifndef OPENSSL_NO_RSA
-static int aep_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+static int aep_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
-        BN_CTX *ctx = NULL;
         int to_return = 0;
         AEP_RV rv = AEP_R_OK;
 
-        if ((ctx = BN_CTX_new()) == NULL)
-                goto err;
-
         if (!aep_dso)
                 {
                 AEPHKerr(AEPHK_F_AEP_RSA_MOD_EXP,AEPHK_R_NOT_LOADED);
@@ -764,7 +782,7 @@ static int aep_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
 
                 if (rv == FAIL_TO_SW){
                         const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-                        to_return = (*meth->rsa_mod_exp)(r0, I, rsa);
+                        to_return = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
                         goto err;
                 }
                 else if (rv != AEP_R_OK)
@@ -787,8 +805,6 @@ static int aep_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
         to_return = 1;
 
  err:
-        if(ctx)
-                BN_CTX_free(ctx);
         return to_return;
 }
 #endif
@@ -822,12 +838,14 @@ static int aep_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
         }
 #endif
 
+#ifndef OPENSSL_NO_RSA
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int aep_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
         {
         return aep_mod_exp(r, a, p, m, ctx);
         }
+#endif
 
 #ifndef OPENSSL_NO_DH
 /* This function is aliased to mod_exp (with the dh and mont dropped). */
@@ -849,7 +867,11 @@ static AEP_RV aep_get_connection(AEP_CONNECTION_HNDL_PTR phConnection)
 
         CRYPTO_w_lock(CRYPTO_LOCK_ENGINE);
 
+#ifndef NETWARE_CLIB
         curr_pid = getpid();
+#else
+        curr_pid = GetThreadID();
+#endif
 
         /*Check if this is the first time this is being called from the current
           process*/
diff --git a/src/lib/libssl/src/engines/e_aep.ec b/src/lib/libssl/src/engines/e_aep.ec
new file mode 100644
index 0000000000..8eae642e06
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_aep.ec
@@ -0,0 +1 @@
+L AEPHK         e_aep_err.h                     e_aep_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_aep_err.c b/src/lib/libssl/src/engines/e_aep_err.c
index 092f532946..3f95881cab 100644
--- a/src/lib/libssl/src/crypto/engine/hw_aep_err.c
+++ b/src/lib/libssl/src/engines/e_aep_err.c
@@ -1,6 +1,6 @@
-/* hw_aep_err.c */
+/* e_aep_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -60,42 +60,46 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_aep_err.h"
+#include "e_aep_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA AEPHK_str_functs[]=
         {
-{ERR_PACK(0,AEPHK_F_AEP_CTRL,0),        "AEP_CTRL"},
-{ERR_PACK(0,AEPHK_F_AEP_FINISH,0),      "AEP_FINISH"},
-{ERR_PACK(0,AEPHK_F_AEP_GET_CONNECTION,0),      "AEP_GET_CONNECTION"},
-{ERR_PACK(0,AEPHK_F_AEP_INIT,0),        "AEP_INIT"},
-{ERR_PACK(0,AEPHK_F_AEP_MOD_EXP,0),     "AEP_MOD_EXP"},
-{ERR_PACK(0,AEPHK_F_AEP_MOD_EXP_CRT,0), "AEP_MOD_EXP_CRT"},
-{ERR_PACK(0,AEPHK_F_AEP_RAND,0),        "AEP_RAND"},
-{ERR_PACK(0,AEPHK_F_AEP_RSA_MOD_EXP,0), "AEP_RSA_MOD_EXP"},
+{ERR_FUNC(AEPHK_F_AEP_CTRL),    "AEP_CTRL"},
+{ERR_FUNC(AEPHK_F_AEP_FINISH),  "AEP_FINISH"},
+{ERR_FUNC(AEPHK_F_AEP_GET_CONNECTION),  "AEP_GET_CONNECTION"},
+{ERR_FUNC(AEPHK_F_AEP_INIT),    "AEP_INIT"},
+{ERR_FUNC(AEPHK_F_AEP_MOD_EXP), "AEP_MOD_EXP"},
+{ERR_FUNC(AEPHK_F_AEP_MOD_EXP_CRT),     "AEP_MOD_EXP_CRT"},
+{ERR_FUNC(AEPHK_F_AEP_RAND),    "AEP_RAND"},
+{ERR_FUNC(AEPHK_F_AEP_RSA_MOD_EXP),     "AEP_RSA_MOD_EXP"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA AEPHK_str_reasons[]=
         {
-{AEPHK_R_ALREADY_LOADED                  ,"already loaded"},
-{AEPHK_R_CLOSE_HANDLES_FAILED            ,"close handles failed"},
-{AEPHK_R_CONNECTIONS_IN_USE              ,"connections in use"},
-{AEPHK_R_CTRL_COMMAND_NOT_IMPLEMENTED    ,"ctrl command not implemented"},
-{AEPHK_R_FINALIZE_FAILED                 ,"finalize failed"},
-{AEPHK_R_GET_HANDLE_FAILED               ,"get handle failed"},
-{AEPHK_R_GET_RANDOM_FAILED               ,"get random failed"},
-{AEPHK_R_INIT_FAILURE                    ,"init failure"},
-{AEPHK_R_MISSING_KEY_COMPONENTS          ,"missing key components"},
-{AEPHK_R_MOD_EXP_CRT_FAILED              ,"mod exp crt failed"},
-{AEPHK_R_MOD_EXP_FAILED                  ,"mod exp failed"},
-{AEPHK_R_NOT_LOADED                      ,"not loaded"},
-{AEPHK_R_OK                              ,"ok"},
-{AEPHK_R_RETURN_CONNECTION_FAILED        ,"return connection failed"},
-{AEPHK_R_SETBNCALLBACK_FAILURE           ,"setbncallback failure"},
-{AEPHK_R_SIZE_TOO_LARGE_OR_TOO_SMALL     ,"size too large or too small"},
-{AEPHK_R_UNIT_FAILURE                    ,"unit failure"},
+{ERR_REASON(AEPHK_R_ALREADY_LOADED)      ,"already loaded"},
+{ERR_REASON(AEPHK_R_CLOSE_HANDLES_FAILED),"close handles failed"},
+{ERR_REASON(AEPHK_R_CONNECTIONS_IN_USE)  ,"connections in use"},
+{ERR_REASON(AEPHK_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(AEPHK_R_FINALIZE_FAILED)     ,"finalize failed"},
+{ERR_REASON(AEPHK_R_GET_HANDLE_FAILED)   ,"get handle failed"},
+{ERR_REASON(AEPHK_R_GET_RANDOM_FAILED)   ,"get random failed"},
+{ERR_REASON(AEPHK_R_INIT_FAILURE)        ,"init failure"},
+{ERR_REASON(AEPHK_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(AEPHK_R_MOD_EXP_CRT_FAILED)  ,"mod exp crt failed"},
+{ERR_REASON(AEPHK_R_MOD_EXP_FAILED)      ,"mod exp failed"},
+{ERR_REASON(AEPHK_R_NOT_LOADED)          ,"not loaded"},
+{ERR_REASON(AEPHK_R_OK)                  ,"ok"},
+{ERR_REASON(AEPHK_R_RETURN_CONNECTION_FAILED),"return connection failed"},
+{ERR_REASON(AEPHK_R_SETBNCALLBACK_FAILURE),"setbncallback failure"},
+{ERR_REASON(AEPHK_R_SIZE_TOO_LARGE_OR_TOO_SMALL),"size too large or too small"},
+{ERR_REASON(AEPHK_R_UNIT_FAILURE)        ,"unit failure"},
 {0,NULL}
         };
 
diff --git a/src/lib/libssl/src/crypto/engine/hw_aep_err.h b/src/lib/libssl/src/engines/e_aep_err.h
index 8fe4cf921f..35b2e74260 100644
--- a/src/lib/libssl/src/crypto/engine/hw_aep_err.h
+++ b/src/lib/libssl/src/engines/e_aep_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_AEPHK_ERR_H
 #define HEADER_AEPHK_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#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.
diff --git a/src/lib/libssl/src/crypto/engine/hw_atalla.c b/src/lib/libssl/src/engines/e_atalla.c
index 2b8342bbdd..fabaa86a52 100644
--- a/src/lib/libssl/src/crypto/engine/hw_atalla.c
+++ b/src/lib/libssl/src/engines/e_atalla.c
@@ -57,10 +57,21 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_ATALLA
@@ -72,12 +83,12 @@
 #endif
 
 #define ATALLA_LIB_NAME "atalla engine"
-#include "hw_atalla_err.c"
+#include "e_atalla_err.c"
 
 static int atalla_destroy(ENGINE *e);
 static int atalla_init(ENGINE *e);
 static int atalla_finish(ENGINE *e);
-static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 
 /* BIGNUM stuff */
 static int atalla_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
@@ -85,11 +96,11 @@ static int atalla_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 
 #ifndef OPENSSL_NO_RSA
 /* RSA stuff */
-static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
-#endif
+static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int atalla_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+#endif
 
 #ifndef OPENSSL_NO_DSA
 /* DSA stuff */
@@ -135,6 +146,7 @@ static RSA_METHOD atalla_rsa =
         0,
         NULL,
         NULL,
+        NULL,
         NULL
         };
 #endif
@@ -152,7 +164,9 @@ static DSA_METHOD atalla_dsa =
         NULL, /* init */
         NULL, /* finish */
         0, /* flags */
-        NULL /* app_data */
+        NULL, /* app_data */
+        NULL, /* dsa_paramgen */
+        NULL /* dsa_keygen */
         };
 #endif
 
@@ -167,6 +181,7 @@ static DH_METHOD atalla_dh =
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
@@ -242,7 +257,7 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_atalla(void)
         {
         ENGINE *ret = ENGINE_new();
@@ -402,7 +417,7 @@ static int atalla_finish(ENGINE *e)
         return 1;
         }
 
-static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int atalla_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((atalla_dso == NULL) ? 0 : 1);
         switch(cmd)
@@ -498,9 +513,8 @@ err:
         }
 
 #ifndef OPENSSL_NO_RSA
-static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
-        BN_CTX *ctx = NULL;
         int to_return = 0;
 
         if(!atalla_dso)
@@ -508,8 +522,6 @@ static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
                 ATALLAerr(ATALLA_F_ATALLA_RSA_MOD_EXP,ATALLA_R_NOT_LOADED);
                 goto err;
                 }
-        if((ctx = BN_CTX_new()) == NULL)
-                goto err;
         if(!rsa->d || !rsa->n)
                 {
                 ATALLAerr(ATALLA_F_ATALLA_RSA_MOD_EXP,ATALLA_R_MISSING_KEY_COMPONENTS);
@@ -517,8 +529,6 @@ static int atalla_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
                 }
         to_return = atalla_mod_exp(r0, I, rsa->d, rsa->n, ctx);
 err:
-        if(ctx)
-                BN_CTX_free(ctx);
         return to_return;
         }
 #endif
@@ -559,12 +569,14 @@ static int atalla_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
         }
 #endif
 
+#ifndef OPENSSL_NO_RSA
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int atalla_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
         {
         return atalla_mod_exp(r, a, p, m, ctx);
         }
+#endif
 
 #ifndef OPENSSL_NO_DH
 /* This function is aliased to mod_exp (with the dh and mont dropped). */
@@ -578,7 +590,7 @@ static int atalla_mod_exp_dh(const DH *dh, BIGNUM *r,
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_atalla_id) != 0))
@@ -589,7 +601,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_ATALLA */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libssl/src/engines/e_atalla.ec b/src/lib/libssl/src/engines/e_atalla.ec
new file mode 100644
index 0000000000..1d735e1b20
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_atalla.ec
@@ -0,0 +1 @@
+L ATALLA        e_atalla_err.h                  e_atalla_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_atalla_err.c b/src/lib/libssl/src/engines/e_atalla_err.c
index 1df9c4570c..fd3e0049ce 100644
--- a/src/lib/libssl/src/crypto/engine/hw_atalla_err.c
+++ b/src/lib/libssl/src/engines/e_atalla_err.c
@@ -1,6 +1,6 @@
-/* hw_atalla_err.c */
+/* e_atalla_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -60,30 +60,34 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_atalla_err.h"
+#include "e_atalla_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA ATALLA_str_functs[]=
         {
-{ERR_PACK(0,ATALLA_F_ATALLA_CTRL,0),    "ATALLA_CTRL"},
-{ERR_PACK(0,ATALLA_F_ATALLA_FINISH,0),  "ATALLA_FINISH"},
-{ERR_PACK(0,ATALLA_F_ATALLA_INIT,0),    "ATALLA_INIT"},
-{ERR_PACK(0,ATALLA_F_ATALLA_MOD_EXP,0), "ATALLA_MOD_EXP"},
-{ERR_PACK(0,ATALLA_F_ATALLA_RSA_MOD_EXP,0),     "ATALLA_RSA_MOD_EXP"},
+{ERR_FUNC(ATALLA_F_ATALLA_CTRL),        "ATALLA_CTRL"},
+{ERR_FUNC(ATALLA_F_ATALLA_FINISH),      "ATALLA_FINISH"},
+{ERR_FUNC(ATALLA_F_ATALLA_INIT),        "ATALLA_INIT"},
+{ERR_FUNC(ATALLA_F_ATALLA_MOD_EXP),     "ATALLA_MOD_EXP"},
+{ERR_FUNC(ATALLA_F_ATALLA_RSA_MOD_EXP), "ATALLA_RSA_MOD_EXP"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA ATALLA_str_reasons[]=
         {
-{ATALLA_R_ALREADY_LOADED                 ,"already loaded"},
-{ATALLA_R_BN_CTX_FULL                    ,"bn ctx full"},
-{ATALLA_R_BN_EXPAND_FAIL                 ,"bn expand fail"},
-{ATALLA_R_CTRL_COMMAND_NOT_IMPLEMENTED   ,"ctrl command not implemented"},
-{ATALLA_R_MISSING_KEY_COMPONENTS         ,"missing key components"},
-{ATALLA_R_NOT_LOADED                     ,"not loaded"},
-{ATALLA_R_REQUEST_FAILED                 ,"request failed"},
-{ATALLA_R_UNIT_FAILURE                   ,"unit failure"},
+{ERR_REASON(ATALLA_R_ALREADY_LOADED)     ,"already loaded"},
+{ERR_REASON(ATALLA_R_BN_CTX_FULL)        ,"bn ctx full"},
+{ERR_REASON(ATALLA_R_BN_EXPAND_FAIL)     ,"bn expand fail"},
+{ERR_REASON(ATALLA_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(ATALLA_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(ATALLA_R_NOT_LOADED)         ,"not loaded"},
+{ERR_REASON(ATALLA_R_REQUEST_FAILED)     ,"request failed"},
+{ERR_REASON(ATALLA_R_UNIT_FAILURE)       ,"unit failure"},
 {0,NULL}
         };
 
diff --git a/src/lib/libssl/src/crypto/engine/hw_atalla_err.h b/src/lib/libssl/src/engines/e_atalla_err.h
index cdac052d8c..36e09bf42f 100644
--- a/src/lib/libssl/src/crypto/engine/hw_atalla_err.h
+++ b/src/lib/libssl/src/engines/e_atalla_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_ATALLA_ERR_H
 #define HEADER_ATALLA_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#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.
diff --git a/src/lib/libssl/src/crypto/engine/hw_ncipher.c b/src/lib/libssl/src/engines/e_chil.c
index 0d1c6b8df0..26108caa64 100644
--- a/src/lib/libssl/src/crypto/engine/hw_ncipher.c
+++ b/src/lib/libssl/src/engines/e_chil.c
@@ -1,4 +1,4 @@
-/* crypto/engine/hw_ncipher.c -*- mode: C; c-file-style: "eay" -*- */
+/* crypto/engine/e_chil.c -*- mode: C; c-file-style: "eay" -*- */
 /* Written by Richard Levitte (richard@levitte.org), Geoff Thorpe
  * (geoff@geoffthorpe.net) and Dr Stephen N Henson (shenson@bigfoot.com)
  * for the OpenSSL project 2000.
@@ -59,15 +59,22 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "cryptlib.h"
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
 #include <openssl/ui.h>
+#include <openssl/rand.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_NCIPHER
+#ifndef OPENSSL_NO_HW_CHIL
 
 /* Attribution notice: nCipher have said several times that it's OK for
  * us to implement a general interface to their boxes, and recently declared
@@ -83,27 +90,19 @@
 #include "vendor_defns/hwcryptohook.h"
 #endif
 
-#define HWCRHK_LIB_NAME "hwcrhk engine"
-#include "hw_ncipher_err.c"
+#define HWCRHK_LIB_NAME "CHIL engine"
+#include "e_chil_err.c"
 
 static int hwcrhk_destroy(ENGINE *e);
 static int hwcrhk_init(ENGINE *e);
 static int hwcrhk_finish(ENGINE *e);
-static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()); 
+static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void)); 
 
-/* Functions to handle mutexes if have dynamic locks */
+/* Functions to handle mutexes */
 static int hwcrhk_mutex_init(HWCryptoHook_Mutex*, HWCryptoHook_CallerContext*);
 static int hwcrhk_mutex_lock(HWCryptoHook_Mutex*);
 static void hwcrhk_mutex_unlock(HWCryptoHook_Mutex*);
 static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex*);
-#if 1 /* This is a HACK which will disappear in 0.9.8 */
-/* Functions to handle mutexes if only have static locks */
-static int hwcrhk_static_mutex_init(HWCryptoHook_Mutex *m,
-                                    HWCryptoHook_CallerContext *c);
-static int hwcrhk_static_mutex_lock(HWCryptoHook_Mutex *m);
-static void hwcrhk_static_mutex_unlock(HWCryptoHook_Mutex *m);
-static void hwcrhk_static_mutex_destroy(HWCryptoHook_Mutex *m);
-#endif
 
 /* BIGNUM stuff */
 static int hwcrhk_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
@@ -111,11 +110,13 @@ static int hwcrhk_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 
 #ifndef OPENSSL_NO_RSA
 /* RSA stuff */
-static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa);
+static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
 #endif
+#ifndef OPENSSL_NO_RSA
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+#endif
 
 #ifndef OPENSSL_NO_DH
 /* DH stuff */
@@ -134,8 +135,10 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
         UI_METHOD *ui_method, void *callback_data);
 static EVP_PKEY *hwcrhk_load_pubkey(ENGINE *eng, const char *key_id,
         UI_METHOD *ui_method, void *callback_data);
+#ifndef OPENSSL_NO_RSA
 static void hwcrhk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
         int ind,long argl, void *argp);
+#endif
 
 /* Interaction stuff */
 static int hwcrhk_insert_card(const char *prompt_info,
@@ -182,7 +185,7 @@ static const ENGINE_CMD_DEFN hwcrhk_cmd_defns[] = {
 /* Our internal RSA_METHOD that we provide pointers to */
 static RSA_METHOD hwcrhk_rsa =
         {
-        "nCipher RSA method",
+        "CHIL RSA method",
         NULL,
         NULL,
         NULL,
@@ -194,6 +197,7 @@ static RSA_METHOD hwcrhk_rsa =
         0,
         NULL,
         NULL,
+        NULL,
         NULL
         };
 #endif
@@ -202,20 +206,21 @@ static RSA_METHOD hwcrhk_rsa =
 /* Our internal DH_METHOD that we provide pointers to */
 static DH_METHOD hwcrhk_dh =
         {
-        "nCipher DH method",
+        "CHIL DH method",
         NULL,
         NULL,
         hwcrhk_mod_exp_dh,
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
 
 static RAND_METHOD hwcrhk_rand =
         {
-        /* "nCipher RAND method", */
+        /* "CHIL RAND method", */
         NULL,
         hwcrhk_rand_bytes,
         NULL,
@@ -226,7 +231,12 @@ static RAND_METHOD hwcrhk_rand =
 
 /* Constants used when creating the ENGINE */
 static const char *engine_hwcrhk_id = "chil";
-static const char *engine_hwcrhk_name = "nCipher hardware engine support";
+static const char *engine_hwcrhk_name = "CHIL hardware engine support";
+
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE 
+/* Compatibility hack, the dynamic library uses this form in the path */
+static const char *engine_hwcrhk_id_alt = "ncipher";
+#endif
 
 /* Internal stuff for HWCryptoHook */
 
@@ -326,7 +336,7 @@ static HWCryptoHook_InitInfo hwcrhk_globals = {
 
 /* Now, to our own code */
 
-/* This internal function is used by ENGINE_ncipher() and possibly by the
+/* This internal function is used by ENGINE_chil() and possibly by the
  * "dynamic" ENGINE support too */
 static int bind_helper(ENGINE *e)
         {
@@ -381,8 +391,8 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
-static ENGINE *engine_ncipher(void)
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
+static ENGINE *engine_chil(void)
         {
         ENGINE *ret = ENGINE_new();
         if(!ret)
@@ -398,7 +408,7 @@ static ENGINE *engine_ncipher(void)
 void ENGINE_load_chil(void)
         {
         /* Copied from eng_[openssl|dyn].c */
-        ENGINE *toadd = engine_ncipher();
+        ENGINE *toadd = engine_chil();
         if(!toadd) return;
         ENGINE_add(toadd);
         ENGINE_free(toadd);
@@ -494,7 +504,7 @@ static void release_context(HWCryptoHook_ContextHandle hac)
         p_hwcrhk_Finish(hac);
         }
 
-/* Destructor (complements the "ENGINE_ncipher()" constructor) */
+/* Destructor (complements the "ENGINE_chil()" constructor) */
 static int hwcrhk_destroy(ENGINE *e)
         {
         free_HWCRHK_LIBNAME();
@@ -581,17 +591,9 @@ static int hwcrhk_init(ENGINE *e)
                         }
                 else if (CRYPTO_get_locking_callback() != NULL)
                         {
-                        HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_DYNAMIC_LOCKING_MISSING);
+                        HWCRHKerr(HWCRHK_F_HWCRHK_INIT,HWCRHK_R_LOCKING_MISSING);
                         ERR_add_error_data(1,"You HAVE to add dynamic locking callbacks via CRYPTO_set_dynlock_{create,lock,destroy}_callback()");
-#if 1 /* This is a HACK which will disappear in 0.9.8 */
-                        hwcrhk_globals.maxmutexes    = 1; /* Only have one lock */
-                        hwcrhk_globals.mutex_init    = hwcrhk_static_mutex_init;
-                        hwcrhk_globals.mutex_acquire = hwcrhk_static_mutex_lock;
-                        hwcrhk_globals.mutex_release = hwcrhk_static_mutex_unlock;
-                        hwcrhk_globals.mutex_destroy = hwcrhk_static_mutex_destroy;
-#else
                         goto err;
-#endif
                         }
                 }
 
@@ -663,7 +665,7 @@ static int hwcrhk_finish(ENGINE *e)
         return to_return;
         }
 
-static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int to_return = 1;
 
@@ -769,8 +771,8 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
 #if !defined(OPENSSL_NO_RSA)
         char tempbuf[1024];
         HWCryptoHook_ErrMsgBuf rmsg;
-#endif
         HWCryptoHook_PassphraseContext ppctx;
+#endif
 
 #if !defined(OPENSSL_NO_RSA)
         rmsg.buf = tempbuf;
@@ -819,7 +821,7 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
         if (p_hwcrhk_RSAGetPublicKey(*hptr, &n, &e, &rmsg)
                 != HWCRYPTOHOOK_ERROR_MPISIZE)
                 {
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PUBKEY,HWCRHK_R_CHIL_ERROR);
+                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY,HWCRHK_R_CHIL_ERROR);
                 ERR_add_error_data(1,rmsg.buf);
                 goto err;
                 }
@@ -831,7 +833,7 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
 
         if (p_hwcrhk_RSAGetPublicKey(*hptr, &n, &e, &rmsg))
                 {
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PUBKEY,
+                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY,
                         HWCRHK_R_CHIL_ERROR);
                 ERR_add_error_data(1,rmsg.buf);
                 goto err;
@@ -846,7 +848,7 @@ static EVP_PKEY *hwcrhk_load_privkey(ENGINE *eng, const char *key_id,
 #endif
 
         if (!res)
-                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PUBKEY,
+                HWCRHKerr(HWCRHK_F_HWCRHK_LOAD_PRIVKEY,
                         HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED);
 
         return res;
@@ -961,7 +963,7 @@ err:
         }
 
 #ifndef OPENSSL_NO_RSA 
-static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa)
+static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
         char tempbuf[1024];
         HWCryptoHook_ErrMsgBuf rmsg;
@@ -973,7 +975,7 @@ static int hwcrhk_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa)
 
         if(!hwcrhk_context)
                 {
-                HWCRHKerr(HWCRHK_F_HWCRHK_MOD_EXP,HWCRHK_R_NOT_INITIALISED);
+                HWCRHKerr(HWCRHK_F_HWCRHK_RSA_MOD_EXP,HWCRHK_R_NOT_INITIALISED);
                 goto err;
                 }
 
@@ -1078,12 +1080,14 @@ err:
         }
 #endif
 
+#ifndef OPENSSL_NO_RSA
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
         {
         return hwcrhk_mod_exp(r, a, p, m, ctx);
         }
+#endif
 
 #ifndef OPENSSL_NO_DH
 /* This function is aliased to mod_exp (with the dh and mont dropped). */
@@ -1142,7 +1146,7 @@ static int hwcrhk_rand_status(void)
         }
 
 /* This cleans up an RSA KM key, called when ex_data is freed */
-
+#ifndef OPENSSL_NO_RSA
 static void hwcrhk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
         int ind,long argl, void *argp)
 {
@@ -1167,6 +1171,7 @@ static void hwcrhk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
                 }
 #endif
 }
+#endif
 
 /* Mutex calls: since the HWCryptoHook model closely follows the POSIX model
  * these just wrap the POSIX functions and add some logging.
@@ -1197,26 +1202,6 @@ static void hwcrhk_mutex_destroy(HWCryptoHook_Mutex *mt)
         CRYPTO_destroy_dynlockid(mt->lockid);
         }
 
-/* Mutex upcalls to use if the application does not support dynamic locks */
-
-static int hwcrhk_static_mutex_init(HWCryptoHook_Mutex *m,
-        HWCryptoHook_CallerContext *c)
-        {
-        return 0;
-        }
-static int hwcrhk_static_mutex_lock(HWCryptoHook_Mutex *m)
-        {
-        CRYPTO_w_lock(CRYPTO_LOCK_HWCRHK);
-        return 0;
-        }
-static void hwcrhk_static_mutex_unlock(HWCryptoHook_Mutex *m)
-        {
-        CRYPTO_w_unlock(CRYPTO_LOCK_HWCRHK);
-        }
-static void hwcrhk_static_mutex_destroy(HWCryptoHook_Mutex *m)
-        {
-        }
-
 static int hwcrhk_get_pass(const char *prompt_info,
         int *len_io, char *buf,
         HWCryptoHook_PassphraseContext *ppctx,
@@ -1371,10 +1356,11 @@ static void hwcrhk_log_message(void *logstr, const char *message)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */      
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
         {
-        if(id && (strcmp(id, engine_hwcrhk_id) != 0))
+        if(id && (strcmp(id, engine_hwcrhk_id) != 0) &&
+                        (strcmp(id, engine_hwcrhk_id_alt) != 0))
                 return 0;
         if(!bind_helper(e))
                 return 0;
@@ -1382,7 +1368,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
-#endif /* !OPENSSL_NO_HW_NCIPHER */
+#endif /* !OPENSSL_NO_HW_CHIL */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libssl/src/engines/e_chil.ec b/src/lib/libssl/src/engines/e_chil.ec
new file mode 100644
index 0000000000..b5a76e17df
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_chil.ec
@@ -0,0 +1 @@
+L HWCRHK        e_chil_err.h                    e_chil_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_ncipher_err.c b/src/lib/libssl/src/engines/e_chil_err.c
index 5bc94581b7..3fec95a272 100644
--- a/src/lib/libssl/src/crypto/engine/hw_ncipher_err.c
+++ b/src/lib/libssl/src/engines/e_chil_err.c
@@ -1,6 +1,6 @@
-/* hw_ncipher_err.c */
+/* e_chil_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -60,42 +60,46 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_ncipher_err.h"
+#include "e_chil_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA HWCRHK_str_functs[]=
         {
-{ERR_PACK(0,HWCRHK_F_HWCRHK_CTRL,0),    "HWCRHK_CTRL"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_FINISH,0),  "HWCRHK_FINISH"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_GET_PASS,0),        "HWCRHK_GET_PASS"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_INIT,0),    "HWCRHK_INIT"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_INSERT_CARD,0),     "HWCRHK_INSERT_CARD"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_LOAD_PRIVKEY,0),    "HWCRHK_LOAD_PRIVKEY"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_LOAD_PUBKEY,0),     "HWCRHK_LOAD_PUBKEY"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_MOD_EXP,0), "HWCRHK_MOD_EXP"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_RAND_BYTES,0),      "HWCRHK_RAND_BYTES"},
-{ERR_PACK(0,HWCRHK_F_HWCRHK_RSA_MOD_EXP,0),     "HWCRHK_RSA_MOD_EXP"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_CTRL),        "HWCRHK_CTRL"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_FINISH),      "HWCRHK_FINISH"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_GET_PASS),    "HWCRHK_GET_PASS"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_INIT),        "HWCRHK_INIT"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_INSERT_CARD), "HWCRHK_INSERT_CARD"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_LOAD_PRIVKEY),        "HWCRHK_LOAD_PRIVKEY"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_LOAD_PUBKEY), "HWCRHK_LOAD_PUBKEY"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_MOD_EXP),     "HWCRHK_MOD_EXP"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_RAND_BYTES),  "HWCRHK_RAND_BYTES"},
+{ERR_FUNC(HWCRHK_F_HWCRHK_RSA_MOD_EXP), "HWCRHK_RSA_MOD_EXP"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA HWCRHK_str_reasons[]=
         {
-{HWCRHK_R_ALREADY_LOADED                 ,"already loaded"},
-{HWCRHK_R_BIO_WAS_FREED                  ,"bio was freed"},
-{HWCRHK_R_CHIL_ERROR                     ,"chil error"},
-{HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED   ,"ctrl command not implemented"},
-{HWCRHK_R_DSO_FAILURE                    ,"dso failure"},
-{HWCRHK_R_DYNAMIC_LOCKING_MISSING        ,"dynamic locking missing"},
-{HWCRHK_R_MISSING_KEY_COMPONENTS         ,"missing key components"},
-{HWCRHK_R_NOT_INITIALISED                ,"not initialised"},
-{HWCRHK_R_NOT_LOADED                     ,"not loaded"},
-{HWCRHK_R_NO_CALLBACK                    ,"no callback"},
-{HWCRHK_R_NO_KEY                         ,"no key"},
-{HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED,"private key algorithms disabled"},
-{HWCRHK_R_REQUEST_FAILED                 ,"request failed"},
-{HWCRHK_R_REQUEST_FALLBACK               ,"request fallback"},
-{HWCRHK_R_UNIT_FAILURE                   ,"unit failure"},
+{ERR_REASON(HWCRHK_R_ALREADY_LOADED)     ,"already loaded"},
+{ERR_REASON(HWCRHK_R_BIO_WAS_FREED)      ,"bio was freed"},
+{ERR_REASON(HWCRHK_R_CHIL_ERROR)         ,"chil error"},
+{ERR_REASON(HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(HWCRHK_R_DSO_FAILURE)        ,"dso failure"},
+{ERR_REASON(HWCRHK_R_LOCKING_MISSING)    ,"locking missing"},
+{ERR_REASON(HWCRHK_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(HWCRHK_R_NOT_INITIALISED)    ,"not initialised"},
+{ERR_REASON(HWCRHK_R_NOT_LOADED)         ,"not loaded"},
+{ERR_REASON(HWCRHK_R_NO_CALLBACK)        ,"no callback"},
+{ERR_REASON(HWCRHK_R_NO_KEY)             ,"no key"},
+{ERR_REASON(HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED),"private key algorithms disabled"},
+{ERR_REASON(HWCRHK_R_REQUEST_FAILED)     ,"request failed"},
+{ERR_REASON(HWCRHK_R_REQUEST_FALLBACK)   ,"request fallback"},
+{ERR_REASON(HWCRHK_R_UNIT_FAILURE)       ,"unit failure"},
 {0,NULL}
         };
 
diff --git a/src/lib/libssl/src/crypto/engine/hw_ncipher_err.h b/src/lib/libssl/src/engines/e_chil_err.h
index d232d02319..051854950a 100644
--- a/src/lib/libssl/src/crypto/engine/hw_ncipher_err.h
+++ b/src/lib/libssl/src/engines/e_chil_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_HWCRHK_ERR_H
 #define HEADER_HWCRHK_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#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.
@@ -84,7 +88,7 @@ static void ERR_HWCRHK_error(int function, int reason, char *file, int line);
 #define HWCRHK_R_CHIL_ERROR                              102
 #define HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED            103
 #define HWCRHK_R_DSO_FAILURE                             104
-#define HWCRHK_R_DYNAMIC_LOCKING_MISSING                 114
+#define HWCRHK_R_LOCKING_MISSING                         114
 #define HWCRHK_R_MISSING_KEY_COMPONENTS                  105
 #define HWCRHK_R_NOT_INITIALISED                         106
 #define HWCRHK_R_NOT_LOADED                              107
diff --git a/src/lib/libssl/src/crypto/engine/hw_cswift.c b/src/lib/libssl/src/engines/e_cswift.c
index 1411fd8333..bc65179846 100644
--- a/src/lib/libssl/src/crypto/engine/hw_cswift.c
+++ b/src/lib/libssl/src/engines/e_cswift.c
@@ -57,10 +57,22 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/rand.h>
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_CSWIFT
@@ -84,28 +96,34 @@
 #endif
 
 #define CSWIFT_LIB_NAME "cswift engine"
-#include "hw_cswift_err.c"
+#include "e_cswift_err.c"
+
+#define DECIMAL_SIZE(type)      ((sizeof(type)*8+2)/3+1)
 
 static int cswift_destroy(ENGINE *e);
 static int cswift_init(ENGINE *e);
 static int cswift_finish(ENGINE *e);
-static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
+#ifndef OPENSSL_NO_RSA
 static int cswift_bn_32copy(SW_LARGENUMBER * out, const BIGNUM * in);
+#endif
 
 /* BIGNUM stuff */
 static int cswift_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx);
+#ifndef OPENSSL_NO_RSA
 static int cswift_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *q, const BIGNUM *dmp1, const BIGNUM *dmq1,
                 const BIGNUM *iqmp, BN_CTX *ctx);
+#endif
 
 #ifndef OPENSSL_NO_RSA
 /* RSA stuff */
-static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
-#endif
+static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int cswift_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+#endif
 
 #ifndef OPENSSL_NO_DSA
 /* DSA stuff */
@@ -152,6 +170,7 @@ static RSA_METHOD cswift_rsa =
         0,
         NULL,
         NULL,
+        NULL,
         NULL
         };
 #endif
@@ -169,7 +188,9 @@ static DSA_METHOD cswift_dsa =
         NULL, /* init */
         NULL, /* finish */
         0, /* flags */
-        NULL /* app_data */
+        NULL, /* app_data */
+        NULL, /* dsa_paramgen */
+        NULL /* dsa_keygen */
         };
 #endif
 
@@ -184,6 +205,7 @@ static DH_METHOD cswift_dh =
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
@@ -260,7 +282,7 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_cswift(void)
         {
         ENGINE *ret = ENGINE_new();
@@ -436,7 +458,7 @@ static int cswift_finish(ENGINE *e)
         return 1;
         }
 
-static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int cswift_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((cswift_dso == NULL) ? 0 : 1);
         switch(cmd)
@@ -558,6 +580,7 @@ err:
         }
 
 
+#ifndef OPENSSL_NO_RSA
 int cswift_bn_32copy(SW_LARGENUMBER * out, const BIGNUM * in)
 {
         int mod;
@@ -579,7 +602,9 @@ int cswift_bn_32copy(SW_LARGENUMBER * out, const BIGNUM * in)
 
         return 1;
 }
+#endif
 
+#ifndef OPENSSL_NO_RSA
 /* Un petit mod_exp chinois */
 static int cswift_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                         const BIGNUM *q, const BIGNUM *dmp1,
@@ -711,14 +736,20 @@ err:
                 release_context(hac);
         return to_return;
         }
+#endif
  
 #ifndef OPENSSL_NO_RSA
-static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
-        BN_CTX *ctx;
         int to_return = 0;
         const RSA_METHOD * def_rsa_method;
 
+        if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
+                {
+                CSWIFTerr(CSWIFT_F_CSWIFT_RSA_MOD_EXP,CSWIFT_R_MISSING_KEY_COMPONENTS);
+                goto err;
+                }
+
         /* Try the limits of RSA (2048 bits) */
         if(BN_num_bytes(rsa->p) > 128 ||
                 BN_num_bytes(rsa->q) > 128 ||
@@ -736,24 +767,14 @@ static int cswift_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
 #endif
 #endif
                 if(def_rsa_method)
-                        return def_rsa_method->rsa_mod_exp(r0, I, rsa);
+                        return def_rsa_method->rsa_mod_exp(r0, I, rsa, ctx);
         }
 
-        if((ctx = BN_CTX_new()) == NULL)
-                goto err;
-        if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
-                {
-                CSWIFTerr(CSWIFT_F_CSWIFT_RSA_MOD_EXP,CSWIFT_R_MISSING_KEY_COMPONENTS);
-                goto err;
-                }
         to_return = cswift_mod_exp_crt(r0, I, rsa->p, rsa->q, rsa->dmp1,
                 rsa->dmq1, rsa->iqmp, ctx);
 err:
-        if(ctx)
-                BN_CTX_free(ctx);
         return to_return;
         }
-#endif
 
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
 static int cswift_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
@@ -781,6 +802,7 @@ static int cswift_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 
         return cswift_mod_exp(r, a, p, m, ctx);
         }
+#endif  /* OPENSSL_NO_RSA */
 
 #ifndef OPENSSL_NO_DSA
 static DSA_SIG *cswift_dsa_sign(const unsigned char *dgst, int dlen, DSA *dsa)
@@ -1030,7 +1052,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
 
         if (!get_context(&hac))
         {
-                CSWIFTerr(CSWIFT_F_CSWIFT_CTRL, CSWIFT_R_UNIT_FAILURE);
+                CSWIFTerr(CSWIFT_F_CSWIFT_RAND_BYTES, CSWIFT_R_UNIT_FAILURE);
                 goto err;
         }
         acquired = 1;
@@ -1041,7 +1063,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
         /* limitation of cswift with values not a multiple of 32                */
         /************************************************************************/
 
-        while(num >= sizeof(buf32))
+        while(num >= (int)sizeof(buf32))
         {
                 largenum.value = buf;
                 largenum.nbytes = sizeof(buf32);
@@ -1052,7 +1074,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
                 if (swrc != SW_OK)
                 {
                         char tmpbuf[20];
-                        CSWIFTerr(CSWIFT_F_CSWIFT_CTRL, CSWIFT_R_REQUEST_FAILED);
+                        CSWIFTerr(CSWIFT_F_CSWIFT_RAND_BYTES, CSWIFT_R_REQUEST_FAILED);
                         sprintf(tmpbuf, "%ld", swrc);
                         ERR_add_error_data(2, "CryptoSwift error number is ", tmpbuf);
                         goto err;
@@ -1068,7 +1090,7 @@ static int cswift_rand_bytes(unsigned char *buf, int num)
                 if (swrc != SW_OK)
                 {
                         char tmpbuf[20];
-                        CSWIFTerr(CSWIFT_F_CSWIFT_CTRL, CSWIFT_R_REQUEST_FAILED);
+                        CSWIFTerr(CSWIFT_F_CSWIFT_RAND_BYTES, CSWIFT_R_REQUEST_FAILED);
                         sprintf(tmpbuf, "%ld", swrc);
                         ERR_add_error_data(2, "CryptoSwift error number is ", tmpbuf);
                         goto err;
@@ -1092,7 +1114,7 @@ static int cswift_rand_status(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_cswift_id) != 0))
@@ -1103,7 +1125,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_CSWIFT */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libssl/src/engines/e_cswift.ec b/src/lib/libssl/src/engines/e_cswift.ec
new file mode 100644
index 0000000000..a7f9d11434
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_cswift.ec
@@ -0,0 +1 @@
+L CSWIFT        e_cswift_err.h                  e_cswift_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_cswift_err.c b/src/lib/libssl/src/engines/e_cswift_err.c
index 684f53bf27..c7942a31fc 100644
--- a/src/lib/libssl/src/crypto/engine/hw_cswift_err.c
+++ b/src/lib/libssl/src/engines/e_cswift_err.c
@@ -1,6 +1,6 @@
-/* hw_cswift_err.c */
+/* e_cswift_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -60,34 +60,39 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_cswift_err.h"
+#include "e_cswift_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA CSWIFT_str_functs[]=
         {
-{ERR_PACK(0,CSWIFT_F_CSWIFT_CTRL,0),    "CSWIFT_CTRL"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_DSA_SIGN,0),        "CSWIFT_DSA_SIGN"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_DSA_VERIFY,0),      "CSWIFT_DSA_VERIFY"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_FINISH,0),  "CSWIFT_FINISH"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_INIT,0),    "CSWIFT_INIT"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_MOD_EXP,0), "CSWIFT_MOD_EXP"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_MOD_EXP_CRT,0),     "CSWIFT_MOD_EXP_CRT"},
-{ERR_PACK(0,CSWIFT_F_CSWIFT_RSA_MOD_EXP,0),     "CSWIFT_RSA_MOD_EXP"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_CTRL),        "CSWIFT_CTRL"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_DSA_SIGN),    "CSWIFT_DSA_SIGN"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_DSA_VERIFY),  "CSWIFT_DSA_VERIFY"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_FINISH),      "CSWIFT_FINISH"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_INIT),        "CSWIFT_INIT"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_MOD_EXP),     "CSWIFT_MOD_EXP"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_MOD_EXP_CRT), "CSWIFT_MOD_EXP_CRT"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_RAND_BYTES),  "CSWIFT_RAND_BYTES"},
+{ERR_FUNC(CSWIFT_F_CSWIFT_RSA_MOD_EXP), "CSWIFT_RSA_MOD_EXP"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA CSWIFT_str_reasons[]=
         {
-{CSWIFT_R_ALREADY_LOADED                 ,"already loaded"},
-{CSWIFT_R_BAD_KEY_SIZE                   ,"bad key size"},
-{CSWIFT_R_BN_CTX_FULL                    ,"bn ctx full"},
-{CSWIFT_R_BN_EXPAND_FAIL                 ,"bn expand fail"},
-{CSWIFT_R_CTRL_COMMAND_NOT_IMPLEMENTED   ,"ctrl command not implemented"},
-{CSWIFT_R_MISSING_KEY_COMPONENTS         ,"missing key components"},
-{CSWIFT_R_NOT_LOADED                     ,"not loaded"},
-{CSWIFT_R_REQUEST_FAILED                 ,"request failed"},
-{CSWIFT_R_UNIT_FAILURE                   ,"unit failure"},
+{ERR_REASON(CSWIFT_R_ALREADY_LOADED)     ,"already loaded"},
+{ERR_REASON(CSWIFT_R_BAD_KEY_SIZE)       ,"bad key size"},
+{ERR_REASON(CSWIFT_R_BN_CTX_FULL)        ,"bn ctx full"},
+{ERR_REASON(CSWIFT_R_BN_EXPAND_FAIL)     ,"bn expand fail"},
+{ERR_REASON(CSWIFT_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(CSWIFT_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(CSWIFT_R_NOT_LOADED)         ,"not loaded"},
+{ERR_REASON(CSWIFT_R_REQUEST_FAILED)     ,"request failed"},
+{ERR_REASON(CSWIFT_R_UNIT_FAILURE)       ,"unit failure"},
 {0,NULL}
         };
 
diff --git a/src/lib/libssl/src/crypto/engine/hw_cswift_err.h b/src/lib/libssl/src/engines/e_cswift_err.h
index 7120c3216f..69c2a9f874 100644
--- a/src/lib/libssl/src/crypto/engine/hw_cswift_err.h
+++ b/src/lib/libssl/src/engines/e_cswift_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_CSWIFT_ERR_H
 #define HEADER_CSWIFT_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#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.
@@ -74,6 +78,7 @@ static void ERR_CSWIFT_error(int function, int reason, char *file, int line);
 #define CSWIFT_F_CSWIFT_INIT                             104
 #define CSWIFT_F_CSWIFT_MOD_EXP                          105
 #define CSWIFT_F_CSWIFT_MOD_EXP_CRT                      106
+#define CSWIFT_F_CSWIFT_RAND_BYTES                       108
 #define CSWIFT_F_CSWIFT_RSA_MOD_EXP                      107
 
 /* Reason codes. */
diff --git a/src/lib/libssl/src/engines/e_gmp.c b/src/lib/libssl/src/engines/e_gmp.c
new file mode 100644
index 0000000000..e62e6fcd07
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_gmp.c
@@ -0,0 +1,471 @@
+/* crypto/engine/e_gmp.c */
+/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
+ * project 2003.
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2001 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* This engine is not (currently) compiled in by default. Do enable it,
+ * reconfigure OpenSSL with "enable-gmp -lgmp". The GMP libraries and
+ * headers must reside in one of the paths searched by the compiler/linker,
+ * otherwise paths must be specified - eg. try configuring with
+ * "enable-gmp -I<includepath> -L<libpath> -lgmp". YMMV. */
+
+/* As for what this does - it's a largely unoptimised implementation of an
+ * ENGINE that uses the GMP library to perform RSA private key operations. To
+ * obtain more information about what "unoptimised" means, see my original mail
+ * on the subject (though ignore the build instructions which have since
+ * changed);
+ *
+ *    http://www.mail-archive.com/openssl-dev@openssl.org/msg12227.html
+ *
+ * On my athlon system at least, it appears the builtin OpenSSL code is now
+ * slightly faster, which is to say that the RSA-related MPI performance
+ * between OpenSSL's BIGNUM and GMP's mpz implementations is probably pretty
+ * balanced for this chip, and so the performance degradation in this ENGINE by
+ * having to convert to/from GMP formats (and not being able to cache
+ * montgomery forms) is probably the difference. However, if some unconfirmed
+ * reports from users is anything to go by, the situation on some other
+ * chipsets might be a good deal more favourable to the GMP version (eg. PPC).
+ * Feedback welcome. */
+
+#include <stdio.h>
+#include <string.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h>
+#include <openssl/engine.h>
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
+
+#ifndef OPENSSL_NO_HW
+#ifndef OPENSSL_NO_GMP
+
+#include <gmp.h>
+
+#define E_GMP_LIB_NAME "gmp engine"
+#include "e_gmp_err.c"
+
+static int e_gmp_destroy(ENGINE *e);
+static int e_gmp_init(ENGINE *e);
+static int e_gmp_finish(ENGINE *e);
+static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void)); 
+
+#ifndef OPENSSL_NO_RSA
+/* RSA stuff */
+static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
+static int e_gmp_rsa_finish(RSA *r);
+#endif
+
+/* The definitions for control commands specific to this engine */
+/* #define E_GMP_CMD_SO_PATH            ENGINE_CMD_BASE */
+static const ENGINE_CMD_DEFN e_gmp_cmd_defns[] = {
+#if 0
+        {E_GMP_CMD_SO_PATH,
+                "SO_PATH",
+                "Specifies the path to the 'e_gmp' shared library",
+                ENGINE_CMD_FLAG_STRING},
+#endif
+        {0, NULL, NULL, 0}
+        };
+
+#ifndef OPENSSL_NO_RSA
+/* Our internal RSA_METHOD that we provide pointers to */
+static RSA_METHOD e_gmp_rsa =
+        {
+        "GMP RSA method",
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        e_gmp_rsa_mod_exp,
+        NULL,
+        NULL,
+        e_gmp_rsa_finish,
+        /* These flags initialise montgomery crud that GMP ignores, however it
+         * makes sure the public key ops (which are done in openssl) don't seem
+         * *slower* than usual :-) */
+        RSA_FLAG_CACHE_PUBLIC|RSA_FLAG_CACHE_PRIVATE,
+        NULL,
+        NULL,
+        NULL
+        };
+#endif
+
+/* Constants used when creating the ENGINE */
+static const char *engine_e_gmp_id = "gmp";
+static const char *engine_e_gmp_name = "GMP engine support";
+
+/* This internal function is used by ENGINE_gmp() and possibly by the
+ * "dynamic" ENGINE support too */
+static int bind_helper(ENGINE *e)
+        {
+#ifndef OPENSSL_NO_RSA
+        const RSA_METHOD *meth1;
+#endif
+        if(!ENGINE_set_id(e, engine_e_gmp_id) ||
+                        !ENGINE_set_name(e, engine_e_gmp_name) ||
+#ifndef OPENSSL_NO_RSA
+                        !ENGINE_set_RSA(e, &e_gmp_rsa) ||
+#endif
+                        !ENGINE_set_destroy_function(e, e_gmp_destroy) ||
+                        !ENGINE_set_init_function(e, e_gmp_init) ||
+                        !ENGINE_set_finish_function(e, e_gmp_finish) ||
+                        !ENGINE_set_ctrl_function(e, e_gmp_ctrl) ||
+                        !ENGINE_set_cmd_defns(e, e_gmp_cmd_defns))
+                return 0;
+
+#ifndef OPENSSL_NO_RSA
+        meth1 = RSA_PKCS1_SSLeay();
+        e_gmp_rsa.rsa_pub_enc = meth1->rsa_pub_enc;
+        e_gmp_rsa.rsa_pub_dec = meth1->rsa_pub_dec;
+        e_gmp_rsa.rsa_priv_enc = meth1->rsa_priv_enc;
+        e_gmp_rsa.rsa_priv_dec = meth1->rsa_priv_dec;
+        e_gmp_rsa.bn_mod_exp = meth1->bn_mod_exp;
+#endif
+
+        /* Ensure the e_gmp error handling is set up */
+        ERR_load_GMP_strings();
+        return 1;
+        }
+
+static ENGINE *engine_gmp(void)
+        {
+        ENGINE *ret = ENGINE_new();
+        if(!ret)
+                return NULL;
+        if(!bind_helper(ret))
+                {
+                ENGINE_free(ret);
+                return NULL;
+                }
+        return ret;
+        }
+
+void ENGINE_load_gmp(void)
+        {
+        /* Copied from eng_[openssl|dyn].c */
+        ENGINE *toadd = engine_gmp();
+        if(!toadd) return;
+        ENGINE_add(toadd);
+        ENGINE_free(toadd);
+        ERR_clear_error();
+        }
+
+#ifndef OPENSSL_NO_RSA
+/* Used to attach our own key-data to an RSA structure */
+static int hndidx_rsa = -1;
+#endif
+
+static int e_gmp_destroy(ENGINE *e)
+        {
+        ERR_unload_GMP_strings();
+        return 1;
+        }
+
+/* (de)initialisation functions. */
+static int e_gmp_init(ENGINE *e)
+        {
+#ifndef OPENSSL_NO_RSA
+        if (hndidx_rsa == -1)
+                hndidx_rsa = RSA_get_ex_new_index(0,
+                        "GMP-based RSA key handle",
+                        NULL, NULL, NULL);
+#endif
+        if (hndidx_rsa == -1)
+                return 0;
+        return 1;
+        }
+
+static int e_gmp_finish(ENGINE *e)
+        {
+        return 1;
+        }
+
+static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
+        {
+        int to_return = 1;
+
+        switch(cmd)
+                {
+#if 0
+        case E_GMP_CMD_SO_PATH:
+                /* ... */
+#endif
+        /* The command isn't understood by this engine */
+        default:
+                GMPerr(GMP_F_E_GMP_CTRL,
+                        GMP_R_CTRL_COMMAND_NOT_IMPLEMENTED);
+                to_return = 0;
+                break;
+                }
+
+        return to_return;
+        }
+
+
+/* Most often limb sizes will be the same. If not, we use hex conversion
+ * which is neat, but extremely inefficient. */
+static int bn2gmp(const BIGNUM *bn, mpz_t g)
+        {
+        bn_check_top(bn);
+        if(((sizeof(bn->d[0]) * 8) == GMP_NUMB_BITS) &&
+                        (BN_BITS2 == GMP_NUMB_BITS)) 
+                {
+                /* The common case */
+                if(!_mpz_realloc (g, bn->top))
+                        return 0;
+                memcpy(&g->_mp_d[0], &bn->d[0], bn->top * sizeof(bn->d[0]));
+                g->_mp_size = bn->top;
+                if(bn->neg)
+                        g->_mp_size = -g->_mp_size;
+                return 1;
+                }
+        else
+                {
+                int toret;
+                char *tmpchar = BN_bn2hex(bn);
+                if(!tmpchar) return 0;
+                toret = (mpz_set_str(g, tmpchar, 16) == 0 ? 1 : 0);
+                OPENSSL_free(tmpchar);
+                return toret;
+                }
+        }
+
+static int gmp2bn(mpz_t g, BIGNUM *bn)
+        {
+        if(((sizeof(bn->d[0]) * 8) == GMP_NUMB_BITS) &&
+                        (BN_BITS2 == GMP_NUMB_BITS))
+                {
+                /* The common case */
+                int s = (g->_mp_size >= 0) ? g->_mp_size : -g->_mp_size;
+                BN_zero(bn);
+                if(bn_expand2 (bn, s) == NULL)
+                        return 0;
+                bn->top = s;
+                memcpy(&bn->d[0], &g->_mp_d[0], s * sizeof(bn->d[0]));
+                bn_correct_top(bn);
+                bn->neg = g->_mp_size >= 0 ? 0 : 1;
+                return 1;
+                }
+        else
+                {
+                int toret;
+                char *tmpchar = OPENSSL_malloc(mpz_sizeinbase(g, 16) + 10);
+                if(!tmpchar) return 0;
+                mpz_get_str(tmpchar, 16, g);
+                toret = BN_hex2bn(&bn, tmpchar);
+                OPENSSL_free(tmpchar);
+                return toret;
+                }
+        }
+
+#ifndef OPENSSL_NO_RSA 
+typedef struct st_e_gmp_rsa_ctx
+        {
+        int public_only;
+        mpz_t n;
+        mpz_t d;
+        mpz_t e;
+        mpz_t p;
+        mpz_t q;
+        mpz_t dmp1;
+        mpz_t dmq1;
+        mpz_t iqmp;
+        mpz_t r0, r1, I0, m1;
+        } E_GMP_RSA_CTX;
+
+static E_GMP_RSA_CTX *e_gmp_get_rsa(RSA *rsa)
+        {
+        E_GMP_RSA_CTX *hptr = RSA_get_ex_data(rsa, hndidx_rsa);
+        if(hptr) return hptr;
+        hptr = OPENSSL_malloc(sizeof(E_GMP_RSA_CTX));
+        if(!hptr) return NULL;
+        /* These inits could probably be replaced by more intelligent
+         * mpz_init2() versions, to reduce malloc-thrashing. */
+        mpz_init(hptr->n);
+        mpz_init(hptr->d);
+        mpz_init(hptr->e);
+        mpz_init(hptr->p);
+        mpz_init(hptr->q);
+        mpz_init(hptr->dmp1);
+        mpz_init(hptr->dmq1);
+        mpz_init(hptr->iqmp);
+        mpz_init(hptr->r0);
+        mpz_init(hptr->r1);
+        mpz_init(hptr->I0);
+        mpz_init(hptr->m1);
+        if(!bn2gmp(rsa->n, hptr->n) || !bn2gmp(rsa->e, hptr->e))
+                goto err;
+        if(!rsa->p || !rsa->q || !rsa->d || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
+                {
+                hptr->public_only = 1;
+                return hptr;
+                }
+        if(!bn2gmp(rsa->d, hptr->d) || !bn2gmp(rsa->p, hptr->p) ||
+                        !bn2gmp(rsa->q, hptr->q) || !bn2gmp(rsa->dmp1, hptr->dmp1) ||
+                        !bn2gmp(rsa->dmq1, hptr->dmq1) || !bn2gmp(rsa->iqmp, hptr->iqmp))
+                goto err;
+        hptr->public_only = 0;
+        RSA_set_ex_data(rsa, hndidx_rsa, hptr);
+        return hptr;
+err:
+        mpz_clear(hptr->n);
+        mpz_clear(hptr->d);
+        mpz_clear(hptr->e);
+        mpz_clear(hptr->p);
+        mpz_clear(hptr->q);
+        mpz_clear(hptr->dmp1);
+        mpz_clear(hptr->dmq1);
+        mpz_clear(hptr->iqmp);
+        mpz_clear(hptr->r0);
+        mpz_clear(hptr->r1);
+        mpz_clear(hptr->I0);
+        mpz_clear(hptr->m1);
+        OPENSSL_free(hptr);
+        return NULL;
+        }
+
+static int e_gmp_rsa_finish(RSA *rsa)
+        {
+        E_GMP_RSA_CTX *hptr = RSA_get_ex_data(rsa, hndidx_rsa);
+        if(!hptr) return 0;
+        mpz_clear(hptr->n);
+        mpz_clear(hptr->d);
+        mpz_clear(hptr->e);
+        mpz_clear(hptr->p);
+        mpz_clear(hptr->q);
+        mpz_clear(hptr->dmp1);
+        mpz_clear(hptr->dmq1);
+        mpz_clear(hptr->iqmp);
+        mpz_clear(hptr->r0);
+        mpz_clear(hptr->r1);
+        mpz_clear(hptr->I0);
+        mpz_clear(hptr->m1);
+        OPENSSL_free(hptr);
+        RSA_set_ex_data(rsa, hndidx_rsa, NULL);
+        return 1;
+        }
+
+static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
+        {
+        E_GMP_RSA_CTX *hptr;
+        int to_return = 0;
+
+        hptr = e_gmp_get_rsa(rsa);
+        if(!hptr)
+                {
+                GMPerr(GMP_F_E_GMP_RSA_MOD_EXP,
+                                GMP_R_KEY_CONTEXT_ERROR);
+                return 0;
+                }
+        if(hptr->public_only)
+                {
+                GMPerr(GMP_F_E_GMP_RSA_MOD_EXP,
+                                GMP_R_MISSING_KEY_COMPONENTS);
+                return 0;
+                }
+
+        /* ugh!!! */
+        if(!bn2gmp(I, hptr->I0))
+                return 0;
+
+        /* This is basically the CRT logic in crypto/rsa/rsa_eay.c reworded into
+         * GMP-speak. It may be that GMP's API facilitates cleaner formulations
+         * of this stuff, eg. better handling of negatives, or functions that
+         * combine operations. */
+
+        mpz_mod(hptr->r1, hptr->I0, hptr->q);
+        mpz_powm(hptr->m1, hptr->r1, hptr->dmq1, hptr->q);
+
+        mpz_mod(hptr->r1, hptr->I0, hptr->p);
+        mpz_powm(hptr->r0, hptr->r1, hptr->dmp1, hptr->p);
+
+        mpz_sub(hptr->r0, hptr->r0, hptr->m1);
+
+        if(mpz_sgn(hptr->r0) < 0)
+                mpz_add(hptr->r0, hptr->r0, hptr->p);
+        mpz_mul(hptr->r1, hptr->r0, hptr->iqmp);
+        mpz_mod(hptr->r0, hptr->r1, hptr->p);
+
+        if(mpz_sgn(hptr->r0) < 0)
+                mpz_add(hptr->r0, hptr->r0, hptr->p);
+        mpz_mul(hptr->r1, hptr->r0, hptr->q);
+        mpz_add(hptr->r0, hptr->r1, hptr->m1);
+
+        /* ugh!!! */
+        if(gmp2bn(hptr->r0, r))
+                to_return = 1;
+
+        return 1;
+        }
+#endif
+
+/* This stuff is needed if this ENGINE is being compiled into a self-contained
+ * shared-library. */      
+#ifndef ENGINE_NO_DYNAMIC_SUPPORT
+static int bind_fn(ENGINE *e, const char *id)
+        {
+        if(id && (strcmp(id, engine_e_gmp_id) != 0))
+                return 0;
+        if(!bind_helper(e))
+                return 0;
+        return 1;
+        }       
+IMPLEMENT_DYNAMIC_CHECK_FN()
+IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
+#endif /* ENGINE_DYNAMIC_SUPPORT */
+
+#endif /* !OPENSSL_NO_GMP */
+#endif /* !OPENSSL_NO_HW */
+
diff --git a/src/lib/libssl/src/engines/e_gmp.ec b/src/lib/libssl/src/engines/e_gmp.ec
new file mode 100644
index 0000000000..72ec447fb7
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_gmp.ec
@@ -0,0 +1 @@
+L GMP           e_gmp_err.h                     e_gmp_err.c
diff --git a/src/lib/libssl/src/engines/e_gmp_err.c b/src/lib/libssl/src/engines/e_gmp_err.c
new file mode 100644
index 0000000000..61db956796
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_gmp_err.c
@@ -0,0 +1,141 @@
+/* e_gmp_err.c */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+/* NOTE: this file was auto generated by the mkerr.pl script: any changes
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
+ */
+
+#include <stdio.h>
+#include <openssl/err.h>
+#include "e_gmp_err.h"
+
+/* BEGIN ERROR CODES */
+#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
+static ERR_STRING_DATA GMP_str_functs[]=
+        {
+{ERR_FUNC(GMP_F_E_GMP_CTRL),    "E_GMP_CTRL"},
+{ERR_FUNC(GMP_F_E_GMP_RSA_MOD_EXP),     "E_GMP_RSA_MOD_EXP"},
+{0,NULL}
+        };
+
+static ERR_STRING_DATA GMP_str_reasons[]=
+        {
+{ERR_REASON(GMP_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(GMP_R_KEY_CONTEXT_ERROR)     ,"key context error"},
+{ERR_REASON(GMP_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{0,NULL}
+        };
+
+#endif
+
+#ifdef GMP_LIB_NAME
+static ERR_STRING_DATA GMP_lib_name[]=
+        {
+{0      ,GMP_LIB_NAME},
+{0,NULL}
+        };
+#endif
+
+
+static int GMP_lib_error_code=0;
+static int GMP_error_init=1;
+
+static void ERR_load_GMP_strings(void)
+        {
+        if (GMP_lib_error_code == 0)
+                GMP_lib_error_code=ERR_get_next_error_library();
+
+        if (GMP_error_init)
+                {
+                GMP_error_init=0;
+#ifndef OPENSSL_NO_ERR
+                ERR_load_strings(GMP_lib_error_code,GMP_str_functs);
+                ERR_load_strings(GMP_lib_error_code,GMP_str_reasons);
+#endif
+
+#ifdef GMP_LIB_NAME
+                GMP_lib_name->error = ERR_PACK(GMP_lib_error_code,0,0);
+                ERR_load_strings(0,GMP_lib_name);
+#endif
+                }
+        }
+
+static void ERR_unload_GMP_strings(void)
+        {
+        if (GMP_error_init == 0)
+                {
+#ifndef OPENSSL_NO_ERR
+                ERR_unload_strings(GMP_lib_error_code,GMP_str_functs);
+                ERR_unload_strings(GMP_lib_error_code,GMP_str_reasons);
+#endif
+
+#ifdef GMP_LIB_NAME
+                ERR_unload_strings(0,GMP_lib_name);
+#endif
+                GMP_error_init=1;
+                }
+        }
+
+static void ERR_GMP_error(int function, int reason, char *file, int line)
+        {
+        if (GMP_lib_error_code == 0)
+                GMP_lib_error_code=ERR_get_next_error_library();
+        ERR_PUT_error(GMP_lib_error_code,function,reason,file,line);
+        }
diff --git a/src/lib/libssl/src/engines/e_gmp_err.h b/src/lib/libssl/src/engines/e_gmp_err.h
new file mode 100644
index 0000000000..dd05dfd800
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_gmp_err.h
@@ -0,0 +1,85 @@
+/* ====================================================================
+ * Copyright (c) 2001-2002 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_GMP_ERR_H
+#define HEADER_GMP_ERR_H
+
+#ifdef  __cplusplus
+extern "C" {
+#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.
+ */
+static void ERR_load_GMP_strings(void);
+static void ERR_unload_GMP_strings(void);
+static void ERR_GMP_error(int function, int reason, char *file, int line);
+#define GMPerr(f,r) ERR_GMP_error((f),(r),__FILE__,__LINE__)
+
+/* Error codes for the GMP functions. */
+
+/* Function codes. */
+#define GMP_F_E_GMP_CTRL                                 100
+#define GMP_F_E_GMP_RSA_MOD_EXP                          101
+
+/* Reason codes. */
+#define GMP_R_CTRL_COMMAND_NOT_IMPLEMENTED               100
+#define GMP_R_KEY_CONTEXT_ERROR                          101
+#define GMP_R_MISSING_KEY_COMPONENTS                     102
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
diff --git a/src/lib/libssl/src/crypto/engine/hw_nuron.c b/src/lib/libssl/src/engines/e_nuron.c
index fb9188bfe5..4c2537cbc3 100644
--- a/src/lib/libssl/src/crypto/engine/hw_nuron.c
+++ b/src/lib/libssl/src/engines/e_nuron.c
@@ -57,17 +57,27 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
-
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_NURON
 
 #define NURON_LIB_NAME "nuron engine"
-#include "hw_nuron_err.c"
+#include "e_nuron_err.c"
 
 static const char *NURON_LIBNAME = NULL;
 static const char *get_NURON_LIBNAME(void)
@@ -155,7 +165,7 @@ static int nuron_finish(ENGINE *e)
         return 1;
         }
 
-static int nuron_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int nuron_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((pvDSOHandle == NULL) ? 0 : 1);
         switch(cmd)
@@ -191,9 +201,9 @@ static int nuron_mod_exp(BIGNUM *r,const BIGNUM *a,const BIGNUM *p,
         }
 
 #ifndef OPENSSL_NO_RSA
-static int nuron_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+static int nuron_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
-        return nuron_mod_exp(r0,I,rsa->d,rsa->n,NULL);
+        return nuron_mod_exp(r0,I,rsa->d,rsa->n,ctx);
         }
 #endif
 
@@ -238,11 +248,13 @@ static int nuron_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
 #endif
 
 /* This function is aliased to mod_exp (with the mont stuff dropped). */
+#ifndef OPENSSL_NO_RSA
 static int nuron_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                               const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
         {
         return nuron_mod_exp(r, a, p, m, ctx);
         }
+#endif
 
 #ifndef OPENSSL_NO_DH
 /* This function is aliased to mod_exp (with the dh and mont dropped). */
@@ -269,6 +281,7 @@ static RSA_METHOD nuron_rsa =
         0,
         NULL,
         NULL,
+        NULL,
         NULL
         };
 #endif
@@ -285,7 +298,9 @@ static DSA_METHOD nuron_dsa =
         NULL, /* init */
         NULL, /* finish */
         0, /* flags */
-        NULL /* app_data */
+        NULL, /* app_data */
+        NULL, /* dsa_paramgen */
+        NULL /* dsa_keygen */
         };
 #endif
 
@@ -299,6 +314,7 @@ static DH_METHOD nuron_dh =
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
@@ -374,7 +390,7 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_nuron(void)
         {
         ENGINE *ret = ENGINE_new();
@@ -401,7 +417,7 @@ void ENGINE_load_nuron(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */      
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_nuron_id) != 0))
@@ -412,7 +428,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }       
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_NURON */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libssl/src/engines/e_nuron.ec b/src/lib/libssl/src/engines/e_nuron.ec
new file mode 100644
index 0000000000..cfa430dfcd
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_nuron.ec
@@ -0,0 +1 @@
+L NURON         e_nuron_err.h                   e_nuron_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_nuron_err.c b/src/lib/libssl/src/engines/e_nuron_err.c
index df9d7bde76..9a7864f42f 100644
--- a/src/lib/libssl/src/crypto/engine/hw_nuron_err.c
+++ b/src/lib/libssl/src/engines/e_nuron_err.c
@@ -1,6 +1,6 @@
-/* hw_nuron_err.c */
+/* e_nuron_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -60,27 +60,31 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_nuron_err.h"
+#include "e_nuron_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA NURON_str_functs[]=
         {
-{ERR_PACK(0,NURON_F_NURON_CTRL,0),      "NURON_CTRL"},
-{ERR_PACK(0,NURON_F_NURON_FINISH,0),    "NURON_FINISH"},
-{ERR_PACK(0,NURON_F_NURON_INIT,0),      "NURON_INIT"},
-{ERR_PACK(0,NURON_F_NURON_MOD_EXP,0),   "NURON_MOD_EXP"},
+{ERR_FUNC(NURON_F_NURON_CTRL),  "NURON_CTRL"},
+{ERR_FUNC(NURON_F_NURON_FINISH),        "NURON_FINISH"},
+{ERR_FUNC(NURON_F_NURON_INIT),  "NURON_INIT"},
+{ERR_FUNC(NURON_F_NURON_MOD_EXP),       "NURON_MOD_EXP"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA NURON_str_reasons[]=
         {
-{NURON_R_ALREADY_LOADED                  ,"already loaded"},
-{NURON_R_CTRL_COMMAND_NOT_IMPLEMENTED    ,"ctrl command not implemented"},
-{NURON_R_DSO_FAILURE                     ,"dso failure"},
-{NURON_R_DSO_FUNCTION_NOT_FOUND          ,"dso function not found"},
-{NURON_R_DSO_NOT_FOUND                   ,"dso not found"},
-{NURON_R_NOT_LOADED                      ,"not loaded"},
+{ERR_REASON(NURON_R_ALREADY_LOADED)      ,"already loaded"},
+{ERR_REASON(NURON_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(NURON_R_DSO_FAILURE)         ,"dso failure"},
+{ERR_REASON(NURON_R_DSO_FUNCTION_NOT_FOUND),"dso function not found"},
+{ERR_REASON(NURON_R_DSO_NOT_FOUND)       ,"dso not found"},
+{ERR_REASON(NURON_R_NOT_LOADED)          ,"not loaded"},
 {0,NULL}
         };
 
diff --git a/src/lib/libssl/src/crypto/engine/hw_nuron_err.h b/src/lib/libssl/src/engines/e_nuron_err.h
index a56bfdf303..219babbb45 100644
--- a/src/lib/libssl/src/crypto/engine/hw_nuron_err.h
+++ b/src/lib/libssl/src/engines/e_nuron_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_NURON_ERR_H
 #define HEADER_NURON_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#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.
diff --git a/src/lib/libssl/src/crypto/engine/hw_sureware.c b/src/lib/libssl/src/engines/e_sureware.c
index fca467e690..58fa9a98ee 100644
--- a/src/lib/libssl/src/crypto/engine/hw_sureware.c
+++ b/src/lib/libssl/src/engines/e_sureware.c
@@ -51,13 +51,22 @@
 ====================================================================*/
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/pem.h>
 #include <openssl/dso.h>
-#include "eng_int.h"
-#include "engine.h"
 #include <openssl/engine.h>
+#include <openssl/rand.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_SUREWARE
@@ -69,9 +78,9 @@
 #endif
 
 #define SUREWARE_LIB_NAME "sureware engine"
-#include "hw_sureware_err.c"
+#include "e_sureware_err.c"
 
-static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 static int surewarehk_destroy(ENGINE *e);
 static int surewarehk_init(ENGINE *e);
 static int surewarehk_finish(ENGINE *e);
@@ -79,10 +88,12 @@ static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         const BIGNUM *m, BN_CTX *ctx);
 
 /* RSA stuff */
+#ifndef OPENSSL_NO_RSA
 static int surewarehk_rsa_priv_dec(int flen,const unsigned char *from,unsigned char *to,
                         RSA *rsa,int padding);
 static int surewarehk_rsa_sign(int flen,const unsigned char *from,unsigned char *to,
                             RSA *rsa,int padding);
+#endif
 
 /* RAND stuff */
 static int surewarehk_rand_bytes(unsigned char *buf, int num);
@@ -124,7 +135,8 @@ static RSA_METHOD surewarehk_rsa =
         0,      /* RSA flag*/
         NULL, 
         NULL, /* OpenSSL sign*/
-        NULL  /* OpenSSL verify*/
+        NULL, /* OpenSSL verify*/
+        NULL  /* keygen */
         };
 #endif
 
@@ -146,7 +158,8 @@ static DH_METHOD surewarehk_dh =
         NULL, /* init*/
         NULL, /* finish*/
         0,    /* flags*/
-        NULL 
+        NULL,
+        NULL
         };
 #endif
 
@@ -195,6 +208,8 @@ static DSA_METHOD surewarehk_dsa =
         NULL,/*finish*/
         0,
         NULL,
+        NULL,
+        NULL
         };
 #endif
 
@@ -278,7 +293,7 @@ static int bind_sureware(ENGINE *e)
         return 1;
 }
 
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_helper(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_sureware_id) != 0))
@@ -366,7 +381,7 @@ static BIO *logstream = NULL;
  * called, the checking and error handling is probably down there. 
 */
 static int threadsafe=1;
-static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
 {
         int to_return = 1;
 
@@ -578,7 +593,7 @@ static void surewarehk_error_handling(char *const msg,int func,int ret)
                         ENGINEerr(func,SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
                         break;
                 case SUREWAREHOOK_ERROR_INVALID_PAD:
-                        ENGINEerr(func,RSA_R_PADDING_CHECK_FAILED);
+                        ENGINEerr(func,SUREWARE_R_PADDING_CHECK_FAILED);
                         break;
                 default:
                         ENGINEerr(func,SUREWARE_R_REQUEST_FAILED);
@@ -647,7 +662,7 @@ static EVP_PKEY* sureware_load_public(ENGINE *e,const char *key_id,char *hptr,un
         int ret=0;
         if(!p_surewarehk_Load_Rsa_Pubkey || !p_surewarehk_Load_Dsa_Pubkey)
         {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ENGINE_R_NOT_INITIALISED);
+                SUREWAREerr(SUREWARE_F_SUREWARE_LOAD_PUBLIC,ENGINE_R_NOT_INITIALISED);
                 goto err;
         }
         switch (keytype)
@@ -670,10 +685,10 @@ static EVP_PKEY* sureware_load_public(ENGINE *e,const char *key_id,char *hptr,un
                 ret=p_surewarehk_Load_Rsa_Pubkey(msg,key_id,el,
                                                  (unsigned long *)rsatmp->n->d,
                                                  (unsigned long *)rsatmp->e->d);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ret);
+                surewarehk_error_handling(msg,SUREWARE_F_SUREWARE_LOAD_PUBLIC,ret);
                 if (ret!=1)
                 {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
+                        SUREWAREerr(SUREWARE_F_SUREWARE_LOAD_PUBLIC,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
                         goto err;
                 }
                 /* normalise pub e and pub n */
@@ -714,10 +729,10 @@ static EVP_PKEY* sureware_load_public(ENGINE *e,const char *key_id,char *hptr,un
                                                  (unsigned long *)dsatmp->p->d,
                                                  (unsigned long *)dsatmp->q->d,
                                                  (unsigned long *)dsatmp->g->d);
-                surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ret);
+                surewarehk_error_handling(msg,SUREWARE_F_SUREWARE_LOAD_PUBLIC,ret);
                 if (ret!=1)
                 {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
+                        SUREWAREerr(SUREWARE_F_SUREWARE_LOAD_PUBLIC,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
                         goto err;
                 }
                 /* set parameters */
@@ -738,7 +753,7 @@ static EVP_PKEY* sureware_load_public(ENGINE *e,const char *key_id,char *hptr,un
 #endif
 
         default:
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_FAILED_LOADING_PRIVATE_KEY);
+                SUREWAREerr(SUREWARE_F_SUREWARE_LOAD_PUBLIC,ENGINE_R_FAILED_LOADING_PRIVATE_KEY);
                 goto err;
         }
         return res;
@@ -768,14 +783,14 @@ static EVP_PKEY *surewarehk_load_privkey(ENGINE *e, const char *key_id,
 
         if(!p_surewarehk_Load_Privkey)
         {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_NOT_INITIALISED);
+                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVKEY,ENGINE_R_NOT_INITIALISED);
         }
         else
         {
                 ret=p_surewarehk_Load_Privkey(msg,key_id,&hptr,&el,&keytype);
                 if (ret!=1)
                 {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,ENGINE_R_FAILED_LOADING_PRIVATE_KEY);
+                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PRIVKEY,ENGINE_R_FAILED_LOADING_PRIVATE_KEY);
                         ERR_add_error_data(1,msg);              
                 }
                 else
@@ -796,7 +811,7 @@ static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
 
         if(!p_surewarehk_Info_Pubkey)
         {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ENGINE_R_NOT_INITIALISED);
+                SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PUBKEY,ENGINE_R_NOT_INITIALISED);
         }
         else
         {
@@ -804,7 +819,7 @@ static EVP_PKEY *surewarehk_load_pubkey(ENGINE *e, const char *key_id,
                 ret=p_surewarehk_Info_Pubkey(msg,key_id,&el,&keytype);
                 if (ret!=1)
                 {
-                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
+                        SUREWAREerr(SUREWARE_F_SUREWAREHK_LOAD_PUBKEY,ENGINE_R_FAILED_LOADING_PUBLIC_KEY);
                         ERR_add_error_data(1,msg);
                 }
                 else
@@ -827,6 +842,7 @@ static void surewarehk_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
 }
 
 #if 0
+/* not currently used (bug?) */
 /* This cleans up an DH KM key (destroys the key into hardware), 
 called when ex_data is freed */
 static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
@@ -834,7 +850,7 @@ static void surewarehk_dh_ex_free(void *obj, void *item, CRYPTO_EX_DATA *ad,
 {
         if(!p_surewarehk_Free)
         {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_EX_FREE,ENGINE_R_NOT_INITIALISED);
+                SUREWAREerr(SUREWARE_F_SUREWAREHK_DH_EX_FREE,ENGINE_R_NOT_INITIALISED);
         }
         else
                 p_surewarehk_Free((char *)item,1);
@@ -880,7 +896,7 @@ static int surewarehk_rsa_priv_dec(int flen,const unsigned char *from,unsigned c
                 /* intermediate buffer for padding */
                 if ((buf=OPENSSL_malloc(tlen)) == NULL)
                 {
-                        RSAerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,ERR_R_MALLOC_FAILURE);
+                        SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 memcpy(buf,to,tlen);/* transfert to into buf */
@@ -898,11 +914,11 @@ static int surewarehk_rsa_priv_dec(int flen,const unsigned char *from,unsigned c
                         ret=RSA_padding_check_none(to,tlen,(unsigned char *)buf,flen,tlen);
                         break;
                 default:
-                        RSAerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,RSA_R_UNKNOWN_PADDING_TYPE);
+                        SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,SUREWARE_R_UNKNOWN_PADDING_TYPE);
                         goto err;
                 }
                 if (ret < 0)
-                        RSAerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,RSA_R_PADDING_CHECK_FAILED);
+                        SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,SUREWARE_R_PADDING_CHECK_FAILED);
         }
 err:
         if (buf)
@@ -924,12 +940,12 @@ static int surewarehk_rsa_sign(int flen,const unsigned char *from,unsigned char
         char msg[64]="ENGINE_rsa_sign";
         if (!p_surewarehk_Rsa_Sign)
         {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,ENGINE_R_NOT_INITIALISED);
+                SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_SIGN,ENGINE_R_NOT_INITIALISED);
         }
         /* extract ref to private key */
         else if (!(hptr=RSA_get_ex_data(rsa, rsaHndidx)))
         {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,SUREWARE_R_MISSING_KEY_COMPONENTS);
+                SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_SIGN,SUREWARE_R_MISSING_KEY_COMPONENTS);
         }
         else
         {
@@ -937,11 +953,11 @@ static int surewarehk_rsa_sign(int flen,const unsigned char *from,unsigned char
                 {
                 case RSA_PKCS1_PADDING: /* do it in one shot */
                         ret=p_surewarehk_Rsa_Sign(msg,flen,(unsigned char *)from,&tlen,to,hptr,SUREWARE_PKCS1_PAD);
-                        surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,ret);
+                        surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_RSA_SIGN,ret);
                         break;
                 case RSA_NO_PADDING:
                 default:
-                        RSAerr(SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,RSA_R_UNKNOWN_PADDING_TYPE);
+                        SUREWAREerr(SUREWARE_F_SUREWAREHK_RSA_SIGN,SUREWARE_R_UNKNOWN_PADDING_TYPE);
                 }
         }
         return ret==1 ? tlen : ret;
@@ -960,11 +976,13 @@ static	DSA_SIG * surewarehk_dsa_do_sign(const unsigned char *from, int flen, DSA
         if (!p_surewarehk_Dsa_Sign)
         {
                 SUREWAREerr(SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,ENGINE_R_NOT_INITIALISED);
+                goto err;
         }
         /* extract ref to private key */
         else if (!(hptr=DSA_get_ex_data(dsa, dsaHndidx)))
         {
                 SUREWAREerr(SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,SUREWARE_R_MISSING_KEY_COMPONENTS);
+                goto err;
         }
         else
         {
@@ -1008,7 +1026,7 @@ static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         char msg[64]="ENGINE_modexp";
         if (!p_surewarehk_Mod_Exp)
         {
-                SUREWAREerr(SUREWARE_F_SUREWAREHK_MOD_EXP,ENGINE_R_NOT_INITIALISED);
+                SUREWAREerr(SUREWARE_F_SUREWAREHK_MODEXP,ENGINE_R_NOT_INITIALISED);
         }
         else
         {
@@ -1024,7 +1042,7 @@ static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                                                  a->top*sizeof(BN_ULONG),
                                                  (unsigned long *)a->d,
                                                  (unsigned long *)r->d);
-                        surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_MOD_EXP,ret);
+                        surewarehk_error_handling(msg,SUREWARE_F_SUREWAREHK_MODEXP,ret);
                         if (ret==1)
                         {
                                 /* normalise result */
diff --git a/src/lib/libssl/src/engines/e_sureware.ec b/src/lib/libssl/src/engines/e_sureware.ec
new file mode 100644
index 0000000000..3d266b8b7c
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_sureware.ec
@@ -0,0 +1 @@
+L SUREWARE      e_sureware_err.h                e_sureware_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_sureware_err.c b/src/lib/libssl/src/engines/e_sureware_err.c
index 69955dadbb..d4ca68c1db 100644
--- a/src/lib/libssl/src/crypto/engine/hw_sureware_err.c
+++ b/src/lib/libssl/src/engines/e_sureware_err.c
@@ -1,6 +1,6 @@
-/* hw_sureware_err.c */
+/* e_sureware_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -60,35 +60,43 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_sureware_err.h"
+#include "e_sureware_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA SUREWARE_str_functs[]=
         {
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_CTRL,0),      "SUREWAREHK_CTRL"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_DSA_DO_SIGN,0),       "SUREWAREHK_DSA_DO_SIGN"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_EX_FREE,0),   "SUREWAREHK_EX_FREE"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_FINISH,0),    "SUREWAREHK_FINISH"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_INIT,0),      "SUREWAREHK_INIT"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY,0),  "SUREWAREHK_LOAD_PRIVATE_KEY"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY,0),   "SUREWAREHK_LOAD_PUBLIC_KEY"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_MOD_EXP,0),   "SUREWAREHK_MOD_EXP"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_RAND_BYTES,0),        "SUREWAREHK_RAND_BYTES"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_RAND_SEED,0), "SUREWAREHK_RAND_SEED"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC,0),      "SUREWAREHK_RSA_PRIV_DEC"},
-{ERR_PACK(0,SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC,0),      "SUREWAREHK_RSA_PRIV_ENC"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_CTRL),  "SUREWAREHK_CTRL"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_DH_EX_FREE),    "SUREWAREHK_DH_EX_FREE"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_DSA_DO_SIGN),   "SUREWAREHK_DSA_DO_SIGN"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_EX_FREE),       "SUREWAREHK_EX_FREE"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_FINISH),        "SUREWAREHK_FINISH"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_INIT),  "SUREWAREHK_INIT"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_LOAD_PRIVKEY),  "SUREWAREHK_LOAD_PRIVKEY"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_LOAD_PUBKEY),   "SUREWAREHK_LOAD_PUBKEY"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_MODEXP),        "SUREWAREHK_MODEXP"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_RAND_BYTES),    "SUREWAREHK_RAND_BYTES"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_RAND_SEED),     "SUREWAREHK_RAND_SEED"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC),  "SUREWAREHK_RSA_PRIV_DEC"},
+{ERR_FUNC(SUREWARE_F_SUREWAREHK_RSA_SIGN),      "SUREWAREHK_RSA_SIGN"},
+{ERR_FUNC(SUREWARE_F_SUREWARE_LOAD_PUBLIC),     "SUREWARE_LOAD_PUBLIC"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA SUREWARE_str_reasons[]=
         {
-{SUREWARE_R_BIO_WAS_FREED                ,"bio was freed"},
-{SUREWARE_R_MISSING_KEY_COMPONENTS       ,"missing key components"},
-{SUREWARE_R_REQUEST_FAILED               ,"request failed"},
-{SUREWARE_R_REQUEST_FALLBACK             ,"request fallback"},
-{SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL  ,"size too large or too small"},
-{SUREWARE_R_UNIT_FAILURE                 ,"unit failure"},
+{ERR_REASON(SUREWARE_R_BIO_WAS_FREED)    ,"bio was freed"},
+{ERR_REASON(SUREWARE_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(SUREWARE_R_PADDING_CHECK_FAILED),"padding check failed"},
+{ERR_REASON(SUREWARE_R_REQUEST_FAILED)   ,"request failed"},
+{ERR_REASON(SUREWARE_R_REQUEST_FALLBACK) ,"request fallback"},
+{ERR_REASON(SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL),"size too large or too small"},
+{ERR_REASON(SUREWARE_R_UNIT_FAILURE)     ,"unit failure"},
+{ERR_REASON(SUREWARE_R_UNKNOWN_PADDING_TYPE),"unknown padding type"},
 {0,NULL}
         };
 
diff --git a/src/lib/libssl/src/crypto/engine/hw_sureware_err.h b/src/lib/libssl/src/engines/e_sureware_err.h
index bc52af5e05..ec8ed0c59b 100644
--- a/src/lib/libssl/src/crypto/engine/hw_sureware_err.h
+++ b/src/lib/libssl/src/engines/e_sureware_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_SUREWARE_ERR_H
 #define HEADER_SUREWARE_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#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.
@@ -68,25 +72,29 @@ static void ERR_SUREWARE_error(int function, int reason, char *file, int line);
 
 /* Function codes. */
 #define SUREWARE_F_SUREWAREHK_CTRL                       100
+#define SUREWARE_F_SUREWAREHK_DH_EX_FREE                 112
 #define SUREWARE_F_SUREWAREHK_DSA_DO_SIGN                101
 #define SUREWARE_F_SUREWAREHK_EX_FREE                    102
 #define SUREWARE_F_SUREWAREHK_FINISH                     103
 #define SUREWARE_F_SUREWAREHK_INIT                       104
-#define SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY           105
-#define SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY            106
-#define SUREWARE_F_SUREWAREHK_MOD_EXP                    107
+#define SUREWARE_F_SUREWAREHK_LOAD_PRIVKEY               105
+#define SUREWARE_F_SUREWAREHK_LOAD_PUBKEY                113
+#define SUREWARE_F_SUREWAREHK_MODEXP                     107
 #define SUREWARE_F_SUREWAREHK_RAND_BYTES                 108
 #define SUREWARE_F_SUREWAREHK_RAND_SEED                  109
 #define SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC               110
-#define SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC               111
+#define SUREWARE_F_SUREWAREHK_RSA_SIGN                   111
+#define SUREWARE_F_SUREWARE_LOAD_PUBLIC                  106
 
 /* Reason codes. */
 #define SUREWARE_R_BIO_WAS_FREED                         100
 #define SUREWARE_R_MISSING_KEY_COMPONENTS                105
+#define SUREWARE_R_PADDING_CHECK_FAILED                  106
 #define SUREWARE_R_REQUEST_FAILED                        101
 #define SUREWARE_R_REQUEST_FALLBACK                      102
 #define SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL           103
 #define SUREWARE_R_UNIT_FAILURE                          104
+#define SUREWARE_R_UNKNOWN_PADDING_TYPE                  107
 
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libssl/src/crypto/engine/hw_ubsec.c b/src/lib/libssl/src/engines/e_ubsec.c
index 8fb834af31..e8389de6a1 100644
--- a/src/lib/libssl/src/crypto/engine/hw_ubsec.c
+++ b/src/lib/libssl/src/engines/e_ubsec.c
@@ -59,10 +59,21 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include <openssl/crypto.h>
-#include "cryptlib.h"
+#include <openssl/buffer.h>
 #include <openssl/dso.h>
 #include <openssl/engine.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+#include <openssl/bn.h>
 
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_UBSEC
@@ -74,21 +85,21 @@
 #endif
 
 #define UBSEC_LIB_NAME "ubsec engine"
-#include "hw_ubsec_err.c"
+#include "e_ubsec_err.c"
 
 #define FAIL_TO_SOFTWARE -15
 
 static int ubsec_destroy(ENGINE *e);
 static int ubsec_init(ENGINE *e);
 static int ubsec_finish(ENGINE *e);
-static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)());
+static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void));
 static int ubsec_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx);
 static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                         const BIGNUM *q, const BIGNUM *dp,
                         const BIGNUM *dq, const BIGNUM *qinv, BN_CTX *ctx);
 #ifndef OPENSSL_NO_RSA
-static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);
+static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
 #endif
 static int ubsec_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
@@ -143,6 +154,7 @@ static RSA_METHOD ubsec_rsa =
         0,
         NULL,
         NULL,
+        NULL,
         NULL
         };
 #endif
@@ -160,7 +172,9 @@ static DSA_METHOD ubsec_dsa =
         NULL, /* init */
         NULL, /* finish */
         0, /* flags */
-        NULL /* app_data */
+        NULL, /* app_data */
+        NULL, /* dsa_paramgen */
+        NULL /* dsa_keygen */
         };
 #endif
 
@@ -175,6 +189,7 @@ static DH_METHOD ubsec_dh =
         NULL,
         NULL,
         0,
+        NULL,
         NULL
         };
 #endif
@@ -242,7 +257,7 @@ static int bind_helper(ENGINE *e)
         return 1;
         }
 
-#ifndef ENGINE_DYNAMIC_SUPPORT
+#ifdef OPENSSL_NO_DYNAMIC_ENGINE
 static ENGINE *engine_ubsec(void)
         {
         ENGINE *ret = ENGINE_new();
@@ -514,7 +529,7 @@ static int ubsec_finish(ENGINE *e)
         return 1;
         }
 
-static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)())
+static int ubsec_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void))
         {
         int initialised = ((ubsec_dso == NULL) ? 0 : 1);
         switch(cmd)
@@ -565,7 +580,7 @@ static int ubsec_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 
         if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
                 fd = 0;
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
+                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_UNIT_FAILURE);
                 return BN_mod_exp(r, a, p, m, ctx);
         }
 
@@ -586,14 +601,10 @@ static int ubsec_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
         }
 
 #ifndef OPENSSL_NO_RSA
-static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
+static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         {
-        BN_CTX *ctx;
         int to_return = 0;
 
-        if((ctx = BN_CTX_new()) == NULL)
-                goto err;
-
         if(!rsa->p || !rsa->q || !rsa->dmp1 || !rsa->dmq1 || !rsa->iqmp)
                 {
                 UBSECerr(UBSEC_F_UBSEC_RSA_MOD_EXP, UBSEC_R_MISSING_KEY_COMPONENTS);
@@ -608,11 +619,9 @@ static int ubsec_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
            * Do in software as hardware failed.
            */
            const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
-           to_return = (*meth->rsa_mod_exp)(r0, I, rsa);
+           to_return = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
         }
 err:
-        if(ctx)
-                BN_CTX_free(ctx);
         return to_return;
         }
 #endif
@@ -630,18 +639,18 @@ static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 
         /* Check if hardware can't handle this argument. */
         if (y_len > max_key_len) {
-                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
+                UBSECerr(UBSEC_F_UBSEC_MOD_EXP_CRT, UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL);
                 return FAIL_TO_SOFTWARE;
         } 
 
         if (!bn_wexpand(r, p->top + q->top + 1)) {
-                UBSECerr(UBSEC_F_UBSEC_RSA_MOD_EXP_CRT, UBSEC_R_BN_EXPAND_FAIL);
+                UBSECerr(UBSEC_F_UBSEC_MOD_EXP_CRT, UBSEC_R_BN_EXPAND_FAIL);
                 return 0;
         }
 
         if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
                 fd = 0;
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
+                UBSECerr(UBSEC_F_UBSEC_MOD_EXP_CRT, UBSEC_R_UNIT_FAILURE);
                 return FAIL_TO_SOFTWARE;
         }
 
@@ -653,7 +662,7 @@ static int ubsec_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
                 (unsigned char *)dq->d, BN_num_bits(dq),
                 (unsigned char *)q->d, BN_num_bits(q),
                 (unsigned char *)r->d,  &y_len) != 0) {
-                UBSECerr(UBSEC_F_UBSEC_MOD_EXP, UBSEC_R_REQUEST_FAILED);
+                UBSECerr(UBSEC_F_UBSEC_MOD_EXP_CRT, UBSEC_R_REQUEST_FAILED);
                 p_UBSEC_ubsec_close(fd);
                 return FAIL_TO_SOFTWARE;
         }
@@ -747,19 +756,19 @@ static DSA_SIG *ubsec_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
 
         if(!bn_wexpand(r, (160+BN_BITS2-1)/BN_BITS2) ||
            (!bn_wexpand(s, (160+BN_BITS2-1)/BN_BITS2))) {
-                UBSECerr(UBSEC_F_UBSEC_DSA_SIGN, UBSEC_R_BN_EXPAND_FAIL);
+                UBSECerr(UBSEC_F_UBSEC_DSA_DO_SIGN, UBSEC_R_BN_EXPAND_FAIL);
                 goto err;
         }
 
         if (BN_bin2bn(dgst,dlen,&m) == NULL) {
-                UBSECerr(UBSEC_F_UBSEC_DSA_SIGN, UBSEC_R_BN_EXPAND_FAIL);
+                UBSECerr(UBSEC_F_UBSEC_DSA_DO_SIGN, UBSEC_R_BN_EXPAND_FAIL);
                 goto err;
         } 
 
         if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
                 const DSA_METHOD *meth;
                 fd = 0;
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
+                UBSECerr(UBSEC_F_UBSEC_DSA_DO_SIGN, UBSEC_R_UNIT_FAILURE);
                 meth = DSA_OpenSSL();
                 to_return =  meth->dsa_do_sign(dgst, dlen, dsa);
                 goto err;
@@ -776,7 +785,7 @@ static DSA_SIG *ubsec_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
                 (unsigned char *)s->d, &s_len ) != 0) {
                 const DSA_METHOD *meth;
 
-                UBSECerr(UBSEC_F_UBSEC_DSA_SIGN, UBSEC_R_REQUEST_FAILED);
+                UBSECerr(UBSEC_F_UBSEC_DSA_DO_SIGN, UBSEC_R_REQUEST_FAILED);
                 p_UBSEC_ubsec_close(fd);
                 meth = DSA_OpenSSL();
                 to_return = meth->dsa_do_sign(dgst, dlen, dsa);
@@ -791,7 +800,7 @@ static DSA_SIG *ubsec_dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
 
         to_return = DSA_SIG_new();
         if(to_return == NULL) {
-                UBSECerr(UBSEC_F_UBSEC_DSA_SIGN, UBSEC_R_BN_EXPAND_FAIL);
+                UBSECerr(UBSEC_F_UBSEC_DSA_DO_SIGN, UBSEC_R_BN_EXPAND_FAIL);
                 goto err;
         }
 
@@ -813,12 +822,12 @@ static int ubsec_dsa_verify(const unsigned char *dgst, int dgst_len,
         int v_len, d_len;
         int to_return = 0;
         int fd;
-        BIGNUM v;
+        BIGNUM v, *pv = &v;
 
         BN_init(&v);
 
-        if(!bn_wexpand(&v, dsa->p->top)) {
-                UBSECerr(UBSEC_F_UBSEC_DSA_VERIFY ,UBSEC_R_BN_EXPAND_FAIL);
+        if(!bn_wexpand(pv, dsa->p->top)) {
+                UBSECerr(UBSEC_F_UBSEC_DSA_VERIFY, UBSEC_R_BN_EXPAND_FAIL);
                 goto err;
         }
 
@@ -829,7 +838,7 @@ static int ubsec_dsa_verify(const unsigned char *dgst, int dgst_len,
         if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) {
                 const DSA_METHOD *meth;
                 fd = 0;
-                UBSECerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
+                UBSECerr(UBSEC_F_UBSEC_DSA_VERIFY, UBSEC_R_UNIT_FAILURE);
                 meth = DSA_OpenSSL();
                 to_return = meth->dsa_do_verify(dgst, dgst_len, sig, dsa);
                 goto err;
@@ -845,7 +854,7 @@ static int ubsec_dsa_verify(const unsigned char *dgst, int dgst_len,
                 (unsigned char *)sig->s->d, BN_num_bits(sig->s),
                 (unsigned char *)v.d, &v_len) != 0) {
                 const DSA_METHOD *meth;
-                UBSECerr(UBSEC_F_UBSEC_DSA_VERIFY , UBSEC_R_REQUEST_FAILED);
+                UBSECerr(UBSEC_F_UBSEC_DSA_VERIFY, UBSEC_R_REQUEST_FAILED);
                 p_UBSEC_ubsec_close(fd);
 
                 meth = DSA_OpenSSL();
@@ -864,7 +873,7 @@ err:
 #endif
 
 #ifndef OPENSSL_NO_DH
-static int ubsec_dh_compute_key (unsigned char *key,const BIGNUM *pub_key,DH *dh)
+static int ubsec_dh_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh)
         {
         int      ret      = -1,
                  k_len,
@@ -875,7 +884,7 @@ static int ubsec_dh_compute_key (unsigned char *key,const BIGNUM *pub_key,DH *dh
         if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
                 {
                 const DH_METHOD *meth;
-                ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
+                UBSECerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, UBSEC_R_UNIT_FAILURE);
                 meth = DH_OpenSSL();
                 ret = meth->compute_key(key, pub_key, dh);
                 goto err;
@@ -889,7 +898,7 @@ static int ubsec_dh_compute_key (unsigned char *key,const BIGNUM *pub_key,DH *dh
                 {
                 /* Hardware's a no go, failover to software */
                 const DH_METHOD *meth;
-                ENGINEerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, UBSEC_R_REQUEST_FAILED);
+                UBSECerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, UBSEC_R_REQUEST_FAILED);
                 p_UBSEC_ubsec_close(fd);
 
                 meth = DH_OpenSSL();
@@ -905,7 +914,7 @@ err:
         return ret;
         }
 
-static int ubsec_dh_generate_key (DH *dh)
+static int ubsec_dh_generate_key(DH *dh)
         {
         int      ret               = 0,
                  random_bits       = 0,
@@ -951,7 +960,7 @@ static int ubsec_dh_generate_key (DH *dh)
         if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
                 {
                 const DH_METHOD *meth;
-                ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
+                UBSECerr(UBSEC_F_UBSEC_DH_GENERATE_KEY, UBSEC_R_UNIT_FAILURE);
                 meth = DH_OpenSSL();
                 ret = meth->generate_key(dh);
                 goto err;
@@ -967,7 +976,7 @@ static int ubsec_dh_generate_key (DH *dh)
                 /* Hardware's a no go, failover to software */
                 const DH_METHOD *meth;
 
-                ENGINEerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, UBSEC_R_REQUEST_FAILED);
+                UBSECerr(UBSEC_F_UBSEC_DH_GENERATE_KEY, UBSEC_R_REQUEST_FAILED);
                 p_UBSEC_ubsec_close(fd);
 
                 meth = DH_OpenSSL();
@@ -999,7 +1008,7 @@ static int ubsec_rand_bytes(unsigned char * buf,
         if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
                 {
                 const RAND_METHOD *meth;
-                ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
+                UBSECerr(UBSEC_F_UBSEC_RAND_BYTES, UBSEC_R_UNIT_FAILURE);
                 num = p_UBSEC_ubsec_bits_to_bytes(num);
                 meth = RAND_SSLeay();
                 meth->seed(buf, num);
@@ -1017,7 +1026,7 @@ static int ubsec_rand_bytes(unsigned char * buf,
                 /* Hardware's a no go, failover to software */
                 const RAND_METHOD *meth;
 
-                ENGINEerr(UBSEC_F_UBSEC_RNG_BYTES, UBSEC_R_REQUEST_FAILED);
+                UBSECerr(UBSEC_F_UBSEC_RAND_BYTES, UBSEC_R_REQUEST_FAILED);
                 p_UBSEC_ubsec_close(fd);
 
                 num = p_UBSEC_ubsec_bits_to_bytes(num);
@@ -1044,7 +1053,7 @@ static int ubsec_rand_status(void)
 
 /* This stuff is needed if this ENGINE is being compiled into a self-contained
  * shared-library. */
-#ifdef ENGINE_DYNAMIC_SUPPORT
+#ifndef OPENSSL_NO_DYNAMIC_ENGINE
 static int bind_fn(ENGINE *e, const char *id)
         {
         if(id && (strcmp(id, engine_ubsec_id) != 0))
@@ -1055,7 +1064,7 @@ static int bind_fn(ENGINE *e, const char *id)
         }
 IMPLEMENT_DYNAMIC_CHECK_FN()
 IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
-#endif /* ENGINE_DYNAMIC_SUPPORT */
+#endif /* OPENSSL_NO_DYNAMIC_ENGINE */
 
 #endif /* !OPENSSL_NO_HW_UBSEC */
 #endif /* !OPENSSL_NO_HW */
diff --git a/src/lib/libssl/src/engines/e_ubsec.ec b/src/lib/libssl/src/engines/e_ubsec.ec
new file mode 100644
index 0000000000..99b9233569
--- /dev/null
+++ b/src/lib/libssl/src/engines/e_ubsec.ec
@@ -0,0 +1 @@
+L UBSEC         e_ubsec_err.h                   e_ubsec_err.c
diff --git a/src/lib/libssl/src/crypto/engine/hw_ubsec_err.c b/src/lib/libssl/src/engines/e_ubsec_err.c
index d707331fc2..14c3d61e24 100644
--- a/src/lib/libssl/src/crypto/engine/hw_ubsec_err.c
+++ b/src/lib/libssl/src/engines/e_ubsec_err.c
@@ -1,6 +1,6 @@
-/* hw_ubsec_err.c */
+/* e_ubsec_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -60,36 +60,42 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include "hw_ubsec_err.h"
+#include "e_ubsec_err.h"
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(0,func,0)
+#define ERR_REASON(reason) ERR_PACK(0,0,reason)
+
 static ERR_STRING_DATA UBSEC_str_functs[]=
         {
-{ERR_PACK(0,UBSEC_F_UBSEC_CTRL,0),      "UBSEC_CTRL"},
-{ERR_PACK(0,UBSEC_F_UBSEC_DH_COMPUTE_KEY,0),    "UBSEC_DH_COMPUTE_KEY"},
-{ERR_PACK(0,UBSEC_F_UBSEC_DSA_SIGN,0),  "UBSEC_DSA_SIGN"},
-{ERR_PACK(0,UBSEC_F_UBSEC_DSA_VERIFY,0),        "UBSEC_DSA_VERIFY"},
-{ERR_PACK(0,UBSEC_F_UBSEC_FINISH,0),    "UBSEC_FINISH"},
-{ERR_PACK(0,UBSEC_F_UBSEC_INIT,0),      "UBSEC_INIT"},
-{ERR_PACK(0,UBSEC_F_UBSEC_MOD_EXP,0),   "UBSEC_MOD_EXP"},
-{ERR_PACK(0,UBSEC_F_UBSEC_RNG_BYTES,0), "UBSEC_RNG_BYTES"},
-{ERR_PACK(0,UBSEC_F_UBSEC_RSA_MOD_EXP,0),       "UBSEC_RSA_MOD_EXP"},
-{ERR_PACK(0,UBSEC_F_UBSEC_RSA_MOD_EXP_CRT,0),   "UBSEC_RSA_MOD_EXP_CRT"},
+{ERR_FUNC(UBSEC_F_UBSEC_CTRL),  "UBSEC_CTRL"},
+{ERR_FUNC(UBSEC_F_UBSEC_DH_COMPUTE_KEY),        "UBSEC_DH_COMPUTE_KEY"},
+{ERR_FUNC(UBSEC_F_UBSEC_DH_GENERATE_KEY),       "UBSEC_DH_GENERATE_KEY"},
+{ERR_FUNC(UBSEC_F_UBSEC_DSA_DO_SIGN),   "UBSEC_DSA_DO_SIGN"},
+{ERR_FUNC(UBSEC_F_UBSEC_DSA_VERIFY),    "UBSEC_DSA_VERIFY"},
+{ERR_FUNC(UBSEC_F_UBSEC_FINISH),        "UBSEC_FINISH"},
+{ERR_FUNC(UBSEC_F_UBSEC_INIT),  "UBSEC_INIT"},
+{ERR_FUNC(UBSEC_F_UBSEC_MOD_EXP),       "UBSEC_MOD_EXP"},
+{ERR_FUNC(UBSEC_F_UBSEC_MOD_EXP_CRT),   "UBSEC_MOD_EXP_CRT"},
+{ERR_FUNC(UBSEC_F_UBSEC_RAND_BYTES),    "UBSEC_RAND_BYTES"},
+{ERR_FUNC(UBSEC_F_UBSEC_RSA_MOD_EXP),   "UBSEC_RSA_MOD_EXP"},
+{ERR_FUNC(UBSEC_F_UBSEC_RSA_MOD_EXP_CRT),       "UBSEC_RSA_MOD_EXP_CRT"},
 {0,NULL}
         };
 
 static ERR_STRING_DATA UBSEC_str_reasons[]=
         {
-{UBSEC_R_ALREADY_LOADED                  ,"already loaded"},
-{UBSEC_R_BN_EXPAND_FAIL                  ,"bn expand fail"},
-{UBSEC_R_CTRL_COMMAND_NOT_IMPLEMENTED    ,"ctrl command not implemented"},
-{UBSEC_R_DSO_FAILURE                     ,"dso failure"},
-{UBSEC_R_MISSING_KEY_COMPONENTS          ,"missing key components"},
-{UBSEC_R_NOT_LOADED                      ,"not loaded"},
-{UBSEC_R_REQUEST_FAILED                  ,"request failed"},
-{UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL     ,"size too large or too small"},
-{UBSEC_R_UNIT_FAILURE                    ,"unit failure"},
+{ERR_REASON(UBSEC_R_ALREADY_LOADED)      ,"already loaded"},
+{ERR_REASON(UBSEC_R_BN_EXPAND_FAIL)      ,"bn expand fail"},
+{ERR_REASON(UBSEC_R_CTRL_COMMAND_NOT_IMPLEMENTED),"ctrl command not implemented"},
+{ERR_REASON(UBSEC_R_DSO_FAILURE)         ,"dso failure"},
+{ERR_REASON(UBSEC_R_MISSING_KEY_COMPONENTS),"missing key components"},
+{ERR_REASON(UBSEC_R_NOT_LOADED)          ,"not loaded"},
+{ERR_REASON(UBSEC_R_REQUEST_FAILED)      ,"request failed"},
+{ERR_REASON(UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL),"size too large or too small"},
+{ERR_REASON(UBSEC_R_UNIT_FAILURE)        ,"unit failure"},
 {0,NULL}
         };
 
diff --git a/src/lib/libssl/src/crypto/engine/hw_ubsec_err.h b/src/lib/libssl/src/engines/e_ubsec_err.h
index 023d3be771..b10b2387f2 100644
--- a/src/lib/libssl/src/crypto/engine/hw_ubsec_err.h
+++ b/src/lib/libssl/src/engines/e_ubsec_err.h
@@ -55,6 +55,10 @@
 #ifndef HEADER_UBSEC_ERR_H
 #define HEADER_UBSEC_ERR_H
 
+#ifdef  __cplusplus
+extern "C" {
+#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.
@@ -69,12 +73,14 @@ static void ERR_UBSEC_error(int function, int reason, char *file, int line);
 /* Function codes. */
 #define UBSEC_F_UBSEC_CTRL                               100
 #define UBSEC_F_UBSEC_DH_COMPUTE_KEY                     101
-#define UBSEC_F_UBSEC_DSA_SIGN                           102
+#define UBSEC_F_UBSEC_DH_GENERATE_KEY                    111
+#define UBSEC_F_UBSEC_DSA_DO_SIGN                        102
 #define UBSEC_F_UBSEC_DSA_VERIFY                         103
 #define UBSEC_F_UBSEC_FINISH                             104
 #define UBSEC_F_UBSEC_INIT                               105
 #define UBSEC_F_UBSEC_MOD_EXP                            106
-#define UBSEC_F_UBSEC_RNG_BYTES                          107
+#define UBSEC_F_UBSEC_MOD_EXP_CRT                        110
+#define UBSEC_F_UBSEC_RAND_BYTES                         107
 #define UBSEC_F_UBSEC_RSA_MOD_EXP                        108
 #define UBSEC_F_UBSEC_RSA_MOD_EXP_CRT                    109
 
diff --git a/src/lib/libssl/src/engines/engine_vector.mar b/src/lib/libssl/src/engines/engine_vector.mar
new file mode 100644
index 0000000000..7d968e7b40
--- /dev/null
+++ b/src/lib/libssl/src/engines/engine_vector.mar
@@ -0,0 +1,24 @@
+;
+; Transfer vector for VAX shareable image
+;
+        .TITLE ENGINE
+        .IDENT /ENGINE/
+;
+; Define macro to assist in building transfer vector entries.  Each entry
+; should take no more than 8 bytes.
+;
+        .MACRO FTRANSFER_ENTRY routine
+        .ALIGN QUAD
+        .TRANSFER routine
+        .MASK   routine
+        JMP     routine+2
+        .ENDM FTRANSFER_ENTRY
+;
+; Place entries in own program section.
+;
+        .PSECT $$ENGINE,QUAD,PIC,USR,CON,REL,LCL,SHR,EXE,RD,NOWRT
+ENGINE_xfer:
+        FTRANSFER_ENTRY bind_engine
+        FTRANSFER_ENTRY v_check
+        .BLKB 32768-<.-ENGINE_xfer>     ; 64 pages total.
+        .END
diff --git a/src/lib/libssl/src/engines/vax.opt b/src/lib/libssl/src/engines/vax.opt
new file mode 100644
index 0000000000..72e6bd895f
--- /dev/null
+++ b/src/lib/libssl/src/engines/vax.opt
@@ -0,0 +1,9 @@
+!
+! Ensure transfer vector is at beginning of image
+!
+CLUSTER=FIRST
+COLLECT=FIRST,$$ENGINE
+!
+! make psects nonshareable so image can be installed.
+!
+PSECT_ATTR=$CHAR_STRING_CONSTANTS,NOWRT
diff --git a/src/lib/libssl/src/crypto/engine/vendor_defns/aep.h b/src/lib/libssl/src/engines/vendor_defns/aep.h
index 2b2792d2d6..5e9754fe43 100644
--- a/src/lib/libssl/src/crypto/engine/vendor_defns/aep.h
+++ b/src/lib/libssl/src/engines/vendor_defns/aep.h
@@ -171,8 +171,8 @@ typedef AEP_RV t_AEP_GenRandom(AEP_CONNECTION_HNDL hConnection,
 #endif
 
 typedef AEP_RV t_AEP_Initialize(AEP_VOID_PTR pInitArgs);
-typedef AEP_RV t_AEP_Finalize();
-typedef AEP_RV t_AEP_SetBNCallBacks(AEP_RV (*GetBigNumSizeFunc)(),
-                                    AEP_RV (*MakeAEPBigNumFunc)(),
-                                    AEP_RV (*ConverAEPBigNumFunc)());
+typedef AEP_RV t_AEP_Finalize(void);
+typedef AEP_RV t_AEP_SetBNCallBacks(AEP_RV (*GetBigNumSizeFunc)(AEP_VOID_PTR ArbBigNum, AEP_U32* BigNumSize),
+                                    AEP_RV (*MakeAEPBigNumFunc)(AEP_VOID_PTR ArbBigNum, AEP_U32 BigNumSize, unsigned char* AEP_BigNum),
+                                    AEP_RV (*ConverAEPBigNumFunc)(void* ArbBigNum, AEP_U32 BigNumSize, unsigned char* AEP_BigNum));
 
diff --git a/src/lib/libssl/src/crypto/engine/vendor_defns/atalla.h b/src/lib/libssl/src/engines/vendor_defns/atalla.h
index 149970d441..149970d441 100644
--- a/src/lib/libssl/src/crypto/engine/vendor_defns/atalla.h
+++ b/src/lib/libssl/src/engines/vendor_defns/atalla.h
diff --git a/src/lib/libssl/src/crypto/engine/vendor_defns/cswift.h b/src/lib/libssl/src/engines/vendor_defns/cswift.h
index 60079326bb..60079326bb 100644
--- a/src/lib/libssl/src/crypto/engine/vendor_defns/cswift.h
+++ b/src/lib/libssl/src/engines/vendor_defns/cswift.h
diff --git a/src/lib/libssl/src/crypto/engine/vendor_defns/hw_4758_cca.h b/src/lib/libssl/src/engines/vendor_defns/hw_4758_cca.h
index 296636e81a..296636e81a 100644
--- a/src/lib/libssl/src/crypto/engine/vendor_defns/hw_4758_cca.h
+++ b/src/lib/libssl/src/engines/vendor_defns/hw_4758_cca.h
diff --git a/src/lib/libssl/src/crypto/engine/vendor_defns/hw_ubsec.h b/src/lib/libssl/src/engines/vendor_defns/hw_ubsec.h
index b6619d40f2..b6619d40f2 100644
--- a/src/lib/libssl/src/crypto/engine/vendor_defns/hw_ubsec.h
+++ b/src/lib/libssl/src/engines/vendor_defns/hw_ubsec.h
diff --git a/src/lib/libssl/src/crypto/engine/vendor_defns/hwcryptohook.h b/src/lib/libssl/src/engines/vendor_defns/hwcryptohook.h
index aaa4d4575e..3c32feda62 100644
--- a/src/lib/libssl/src/crypto/engine/vendor_defns/hwcryptohook.h
+++ b/src/lib/libssl/src/engines/vendor_defns/hwcryptohook.h
@@ -65,7 +65,7 @@
  * please contact nCipher.
  *
  *
- * $Id: hwcryptohook.h,v 1.1.1.1 2003/05/11 21:35:16 markus Exp $
+ * $Id: hwcryptohook.h,v 1.1.1.1 2008/09/06 12:15:50 djm Exp $
  */
 
 #ifndef HWCRYPTOHOOK_H
diff --git a/src/lib/libssl/src/crypto/engine/vendor_defns/sureware.h b/src/lib/libssl/src/engines/vendor_defns/sureware.h
index 4bc22027f9..e46b000ddc 100644
--- a/src/lib/libssl/src/crypto/engine/vendor_defns/sureware.h
+++ b/src/lib/libssl/src/engines/vendor_defns/sureware.h
@@ -47,7 +47,7 @@ extern SW_EXPORT SureWareHook_Init_t SureWareHook_Init;
 /*
 *       SureWare Finish function
 */
-typedef void SureWareHook_Finish_t();
+typedef void SureWareHook_Finish_t(void);
 extern SW_EXPORT SureWareHook_Finish_t SureWareHook_Finish;
 /*
 *        PRE_CONDITION:
diff --git a/src/lib/libssl/src/fips-1.0/Makefile b/src/lib/libssl/src/fips-1.0/Makefile
deleted file mode 100644
index 891a40b36a..0000000000
--- a/src/lib/libssl/src/fips-1.0/Makefile
+++ /dev/null
@@ -1,242 +0,0 @@
-#
-# OpenSSL/fips-1.0/Makefile
-#
-
-DIR=            fips-1.0
-TOP=            ..
-CC=             cc
-INCLUDE=        -I. -I$(TOP) -I../include
-INCLUDES=       -I.. -I../.. -I../../include
-CFLAG=          -g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=     /usr/local/ssl
-MAKEFILE=       Makefile
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-PERL=           perl
-RM=             rm -f
-AR=             ar r
-
-PEX_LIBS=
-EX_LIBS=
-
-CFLAGS= $(INCLUDE) $(CFLAG) -DHMAC_EXT=\"$${HMAC_EXT:-sha1}\"
-
-
-LIBS=
-
-FDIRS=sha rand des aes dsa rsa dh hmac
-
-GENERAL=Makefile README fips-lib.com install.com
-
-LIB= $(TOP)/libcrypto.a
-SHARED_LIB= libcrypto$(SHLIB_EXT)
-LIBSRC=fips.c fips_err_wrapper.c fipshashes.c
-LIBOBJ=fips.o fips_err_wrapper.o fipshashes.o
-
-FIPS_OBJ_LISTS=sha/lib hmac/lib rand/lib des/lib aes/lib dsa/lib rsa/lib dh/lib
-
-SRC= $(LIBSRC)
-
-EXHEADER=fips.h
-HEADER=$(EXHEADER) fips_err.h
-EXE=fipsld
-TEST=fips_test_suite.c
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        @(cd ..; $(MAKE) DIRS=$(DIR) all)
-
-all:
-        @if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
-                $(MAKE) -e subdirs check lib shared; \
-        fi
-
-check:
-#       $(PERL) ../util/checkhash.pl || (rm fipscanister.o* 2>/dev/null; exit 1)
-        echo FIPS module not built: no check done
-
-# Idea behind fipscanister.o is to "seize" the sequestered code between
-# known symbols for fingerprinting purposes, which would be commonly
-# done with ld -r start.o ... end.o. The latter however presents a minor
-# challenge on multi-ABI platforms. As just implied, we'd rather use ld,
-# but the trouble is that we don't generally know how ABI-selection
-# compiler flag is translated to corresponding linker flag. All compiler
-# drivers seem to recognize -r flag and pass it down to linker, but some
-# of them, including gcc, erroneously add -lc, as well as run-time
-# components, such as crt1.o and alike. Fortunately among those vendor
-# compilers which were observed to misinterpret -r flag multi-ABI ones
-# are equipped with smart linkers, which don't require any ABI-selection
-# flag and simply assume that all objects are of the same type as first
-# one in command line. So the idea is to identify gcc and deficient
-# vendor compiler drivers...
-
-fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
-        @objs="fips_start.o $(LIBOBJ)"; \
-        for i in $(FIPS_OBJ_LISTS); do \
-                dir=`dirname $$i`; script="s|^|$$dir/|;s| | $$dir/|g"; \
-                objs="$$objs `sed "$$script" $$i`"; \
-        done; \
-        objs="$$objs fips_end.o" ; \
-        if [ -n "${FIPS_SITE_LD}" ]; then \
-                set -x; ${FIPS_SITE_LD} -r -o $@ $$objs; \
-        elif $(CC) -dumpversion >/dev/null 2>&1; then \
-                set -x; $(CC) $(CFLAGS) -r -nostdlib -o $@ $$objs ; \
-        else case "`(uname -s) 2>/dev/null`" in \
-                HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \
-                *) set -x; $(CC) $(CFLAGS) -r -o $@ $$objs ;; \
-        esac fi
-        sha/fips_standalone_sha1 fipscanister.o > fipscanister.o.sha1
-
-# If another exception is immediately required, assign approprite
-# site-specific ld command to FIPS_SITE_LD environment variable.
-
-fips_start.o: fips_canister.c
-        $(CC) $(CFLAGS) -DFIPS_START -c -o $@ fips_canister.c
-fips_end.o: fips_canister.c
-        $(CC) $(CFLAGS) -DFIPS_END -c -o $@ fips_canister.c
-fips_premain_dso$(EXE_EXT): fips_premain.c
-        $(CC) $(CFLAGS) -DFINGERPRINT_PREMAIN_DSO_LOAD -o $@ fips_premain.c \
-                ../libcrypto.a $(EX_LIBS)
-
-subdirs:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making all in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' FIPS_DES_ENC='${FIPS_DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' FIPS_SHA1_ASM_OBJ='${FIPS_SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
-        done;
-
-sub_target:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making $(TARGET) in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' FIPS_DES_ENC='${FIPS_DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' FIPS_SHA1_ASM_OBJ='${FIPS_SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' $(TARGET) ) || exit 1; \
-        done;
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making 'files' in fips/$$i..." && \
-        $(MAKE) PERL='${PERL}' files ); \
-        done;
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @for i in $(FDIRS); do \
-        (cd $$i && echo "making links in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' FIPS_DES_ENC='${FIPS_DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' FIPS_SHA1_ASM_OBJ='${FIPS_SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
-        done;
-
-lib:    $(FIPSLIBDIR)/fipscanister.o
-        $(AR) $(LIB) $(FIPSLIBDIR)/fipscanister.o
-        $(RANLIB) $(LIB) || echo Never mind.
-        @touch lib
-
-shared: fips_premain_dso$(EXE_EXT)
-        if [ -n "$(SHARED_LIBS)" ]; then \
-                (cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips-1.0/fipsld $(SHARED_LIB)); \
-        fi
-
-libs:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making libs in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
-        done;
-
-tests:
-        (cd ..; make DIRS=test)
-
-fips_test: top tests
-        -cd testvectors && perl -p -i -e 's/COUNT=/COUNT = /' des[23]/req/*.req
-        @for i in dsa sha aes des hmac rand rsa; \
-        do \
-                (cd $$i && echo "making fips_test in fips/$$i..." && $(MAKE) fips_test) \
-        done;
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist ;\
-        do \
-                (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-                chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done;
-        @for i in $(FDIRS) ;\
-        do \
-                (cd $$i && echo "making install in fips/$$i..." && \
-                $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}'  INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
-        done;
-        @for i in $(EXE) ; \
-        do \
-                echo "installing $$i"; \
-                cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
-                chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
-                mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-        done
-        @cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \
-                $(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \
-        strings fipscanister.o | grep "HMAC-SHA1(fips_premain\\.c)" > \
-                $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips_premain.c.sha1; \
-        chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*
-
-lint:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making lint in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
-        done;
-
-depend:
-        if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(SRC)
-        if [ ! -s buildinf.h ]; then rm buildinf.h; fi
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making depend in fips/$$i..." && \
-        $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ); \
-        done;
-
-clean:
-        rm -f buildinf.h *.o *.obj fips_premain_dso$(EXE_EXT) lib tags core .pure .nfs* *.old *.bak fluff
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making clean in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \
-        done;
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making dclean in fips/$$i..." && \
-        $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
-        done;
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips.o: ../include/openssl/aes.h ../include/openssl/asn1.h
-fips.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
-fips.o: ../include/openssl/bn.h ../include/openssl/cast.h
-fips.o: ../include/openssl/crypto.h ../include/openssl/des.h
-fips.o: ../include/openssl/des_old.h ../include/openssl/dh.h
-fips.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-fips.o: ../include/openssl/err.h ../include/openssl/evp.h
-fips.o: ../include/openssl/fips.h ../include/openssl/fips_rand.h
-fips.o: ../include/openssl/hmac.h ../include/openssl/idea.h
-fips.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-fips.o: ../include/openssl/md4.h ../include/openssl/md5.h
-fips.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
-fips.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-fips.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-fips.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-fips.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-fips.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-fips.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-fips.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h fips.c
-fips.o: fips_locl.h
-fips_err_wrapper.o: ../include/openssl/opensslconf.h fips_err_wrapper.c
diff --git a/src/lib/libssl/src/fips-1.0/aes/Makefile b/src/lib/libssl/src/fips-1.0/aes/Makefile
deleted file mode 100644
index d2a72b3988..0000000000
--- a/src/lib/libssl/src/fips-1.0/aes/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# OpenSSL/fips-1.0/aes/Makefile
-#
-
-DIR=    aes
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-FIPS_AES_ENC=fips_aes_core.o
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=fips_aesavs.c
-TESTDATA=fips_aes_data
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_aes_core.c asm/fips-ax86-elf.s fips_aes_selftest.c
-LIBOBJ=$(FIPS_AES_ENC) fips_aes_selftest.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER) fips_aes_locl.h
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    lib
-
-lib:    $(LIBOBJ)
-        @echo $(LIBOBJ) > lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-fips_test:
-        -find ../testvectors/aes/req -name '*.req' > testlist
-        -rm -rf ../testvectors/aes/rsp
-        mkdir ../testvectors/aes/rsp
-        if [ -s testlist ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_aesavs -d testlist; fi
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) \
-                $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
-fips_aes_core.o: ../../include/openssl/fips.h
-fips_aes_core.o: ../../include/openssl/opensslconf.h fips_aes_core.c
-fips_aes_core.o: fips_aes_locl.h
-fips_aes_selftest.o: ../../include/openssl/aes.h ../../include/openssl/bio.h
-fips_aes_selftest.o: ../../include/openssl/crypto.h
-fips_aes_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_aes_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_aes_selftest.o: ../../include/openssl/opensslconf.h
-fips_aes_selftest.o: ../../include/openssl/opensslv.h
-fips_aes_selftest.o: ../../include/openssl/safestack.h
-fips_aes_selftest.o: ../../include/openssl/stack.h
-fips_aes_selftest.o: ../../include/openssl/symhacks.h fips_aes_selftest.c
-fips_aesavs.o: ../../e_os.h ../../include/openssl/aes.h
-fips_aesavs.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_aesavs.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-fips_aesavs.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-fips_aesavs.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_aesavs.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-fips_aesavs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_aesavs.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_aesavs.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-fips_aesavs.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-fips_aesavs.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-fips_aesavs.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-fips_aesavs.o: ../../include/openssl/opensslconf.h
-fips_aesavs.o: ../../include/openssl/opensslv.h
-fips_aesavs.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h
-fips_aesavs.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-fips_aesavs.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-fips_aesavs.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-fips_aesavs.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_aesavs.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_aesavs.o: fips_aesavs.c
diff --git a/src/lib/libssl/src/fips-1.0/aes/asm/fips-ax86-elf.s b/src/lib/libssl/src/fips-1.0/aes/asm/fips-ax86-elf.s
deleted file mode 100644
index a3aa8fa9d9..0000000000
--- a/src/lib/libssl/src/fips-1.0/aes/asm/fips-ax86-elf.s
+++ /dev/null
@@ -1,1711 +0,0 @@
-
-
-
-
-
-
-        .file   "aes-586.s"
-.globl  AES_Te
-.text
-.globl  _x86_AES_encrypt
-.type   _x86_AES_encrypt,@function
-.align  16
-_x86_AES_encrypt:
-        movl    %edi,           12(%esp)
-        xorl    (%edi),         %eax
-        xorl    4(%edi),        %ebx
-        xorl    8(%edi),        %ecx
-        xorl    12(%edi),       %edx
-        movl    240(%edi),      %esi
-        leal    -2(%esi,%esi),  %esi
-        leal    (%edi,%esi,8),  %esi
-        movl    %esi,           16(%esp)
-.align  4
-.L000loop:
-        movl    %eax,           %esi
-        andl    $255,           %esi
-        movl    (%ebp,%esi,8),  %esi
-        movzbl  %bh,            %edi
-        xorl    3(%ebp,%edi,8), %esi
-        movl    %ecx,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        xorl    2(%ebp,%edi,8), %esi
-        movl    %edx,           %edi
-        shrl    $24,            %edi
-        xorl    1(%ebp,%edi,8), %esi
-        movl    %esi,           4(%esp)
-
-        movl    %ebx,           %esi
-        andl    $255,           %esi
-        shrl    $16,            %ebx
-        movl    (%ebp,%esi,8),  %esi
-        movzbl  %ch,            %edi
-        xorl    3(%ebp,%edi,8), %esi
-        movl    %edx,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        xorl    2(%ebp,%edi,8), %esi
-        movl    %eax,           %edi
-        shrl    $24,            %edi
-        xorl    1(%ebp,%edi,8), %esi
-        movl    %esi,           8(%esp)
-
-        movl    %ecx,           %esi
-        andl    $255,           %esi
-        shrl    $24,            %ecx
-        movl    (%ebp,%esi,8),  %esi
-        movzbl  %dh,            %edi
-        xorl    3(%ebp,%edi,8), %esi
-        movl    %eax,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edx
-        andl    $255,           %edi
-        xorl    2(%ebp,%edi,8), %esi
-        movzbl  %bh,            %edi
-        xorl    1(%ebp,%edi,8), %esi
-
-        movl    12(%esp),       %edi
-        movl    (%ebp,%edx,8),  %edx
-        movzbl  %ah,            %eax
-        xorl    3(%ebp,%eax,8), %edx
-        movl    4(%esp),        %eax
-        andl    $255,           %ebx
-        xorl    2(%ebp,%ebx,8), %edx
-        movl    8(%esp),        %ebx
-        xorl    1(%ebp,%ecx,8), %edx
-        movl    %esi,           %ecx
-
-        addl    $16,            %edi
-        xorl    (%edi),         %eax
-        xorl    4(%edi),        %ebx
-        xorl    8(%edi),        %ecx
-        xorl    12(%edi),       %edx
-        cmpl    16(%esp),       %edi
-        movl    %edi,           12(%esp)
-        jb      .L000loop
-        movl    %eax,           %esi
-        andl    $255,           %esi
-        movl    2(%ebp,%esi,8), %esi
-        andl    $255,           %esi
-        movzbl  %bh,            %edi
-        movl    (%ebp,%edi,8),  %edi
-        andl    $65280,         %edi
-        xorl    %edi,           %esi
-        movl    %ecx,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        movl    (%ebp,%edi,8),  %edi
-        andl    $16711680,      %edi
-        xorl    %edi,           %esi
-        movl    %edx,           %edi
-        shrl    $24,            %edi
-        movl    2(%ebp,%edi,8), %edi
-        andl    $4278190080,    %edi
-        xorl    %edi,           %esi
-        movl    %esi,           4(%esp)
-        movl    %ebx,           %esi
-        andl    $255,           %esi
-        shrl    $16,            %ebx
-        movl    2(%ebp,%esi,8), %esi
-        andl    $255,           %esi
-        movzbl  %ch,            %edi
-        movl    (%ebp,%edi,8),  %edi
-        andl    $65280,         %edi
-        xorl    %edi,           %esi
-        movl    %edx,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        movl    (%ebp,%edi,8),  %edi
-        andl    $16711680,      %edi
-        xorl    %edi,           %esi
-        movl    %eax,           %edi
-        shrl    $24,            %edi
-        movl    2(%ebp,%edi,8), %edi
-        andl    $4278190080,    %edi
-        xorl    %edi,           %esi
-        movl    %esi,           8(%esp)
-        movl    %ecx,           %esi
-        andl    $255,           %esi
-        shrl    $24,            %ecx
-        movl    2(%ebp,%esi,8), %esi
-        andl    $255,           %esi
-        movzbl  %dh,            %edi
-        movl    (%ebp,%edi,8),  %edi
-        andl    $65280,         %edi
-        xorl    %edi,           %esi
-        movl    %eax,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edx
-        andl    $255,           %edi
-        movl    (%ebp,%edi,8),  %edi
-        andl    $16711680,      %edi
-        xorl    %edi,           %esi
-        movzbl  %bh,            %edi
-        movl    2(%ebp,%edi,8), %edi
-        andl    $4278190080,    %edi
-        xorl    %edi,           %esi
-        movl    12(%esp),       %edi
-        andl    $255,           %edx
-        movl    2(%ebp,%edx,8), %edx
-        andl    $255,           %edx
-        movzbl  %ah,            %eax
-        movl    (%ebp,%eax,8),  %eax
-        andl    $65280,         %eax
-        xorl    %eax,           %edx
-        movl    4(%esp),        %eax
-        andl    $255,           %ebx
-        movl    (%ebp,%ebx,8),  %ebx
-        andl    $16711680,      %ebx
-        xorl    %ebx,           %edx
-        movl    8(%esp),        %ebx
-        movl    2(%ebp,%ecx,8), %ecx
-        andl    $4278190080,    %ecx
-        xorl    %ecx,           %edx
-        movl    %esi,           %ecx
-        addl    $16,            %edi
-        xorl    (%edi),         %eax
-        xorl    4(%edi),        %ebx
-        xorl    8(%edi),        %ecx
-        xorl    12(%edi),       %edx
-        ret
-.align  64
-AES_Te:
-        .long   2774754246,2774754246
-        .long   2222750968,2222750968
-        .long   2574743534,2574743534
-        .long   2373680118,2373680118
-        .long   234025727,234025727
-        .long   3177933782,3177933782
-        .long   2976870366,2976870366
-        .long   1422247313,1422247313
-        .long   1345335392,1345335392
-        .long   50397442,50397442
-        .long   2842126286,2842126286
-        .long   2099981142,2099981142
-        .long   436141799,436141799
-        .long   1658312629,1658312629
-        .long   3870010189,3870010189
-        .long   2591454956,2591454956
-        .long   1170918031,1170918031
-        .long   2642575903,2642575903
-        .long   1086966153,1086966153
-        .long   2273148410,2273148410
-        .long   368769775,368769775
-        .long   3948501426,3948501426
-        .long   3376891790,3376891790
-        .long   200339707,200339707
-        .long   3970805057,3970805057
-        .long   1742001331,1742001331
-        .long   4255294047,4255294047
-        .long   3937382213,3937382213
-        .long   3214711843,3214711843
-        .long   4154762323,4154762323
-        .long   2524082916,2524082916
-        .long   1539358875,1539358875
-        .long   3266819957,3266819957
-        .long   486407649,486407649
-        .long   2928907069,2928907069
-        .long   1780885068,1780885068
-        .long   1513502316,1513502316
-        .long   1094664062,1094664062
-        .long   49805301,49805301
-        .long   1338821763,1338821763
-        .long   1546925160,1546925160
-        .long   4104496465,4104496465
-        .long   887481809,887481809
-        .long   150073849,150073849
-        .long   2473685474,2473685474
-        .long   1943591083,1943591083
-        .long   1395732834,1395732834
-        .long   1058346282,1058346282
-        .long   201589768,201589768
-        .long   1388824469,1388824469
-        .long   1696801606,1696801606
-        .long   1589887901,1589887901
-        .long   672667696,672667696
-        .long   2711000631,2711000631
-        .long   251987210,251987210
-        .long   3046808111,3046808111
-        .long   151455502,151455502
-        .long   907153956,907153956
-        .long   2608889883,2608889883
-        .long   1038279391,1038279391
-        .long   652995533,652995533
-        .long   1764173646,1764173646
-        .long   3451040383,3451040383
-        .long   2675275242,2675275242
-        .long   453576978,453576978
-        .long   2659418909,2659418909
-        .long   1949051992,1949051992
-        .long   773462580,773462580
-        .long   756751158,756751158
-        .long   2993581788,2993581788
-        .long   3998898868,3998898868
-        .long   4221608027,4221608027
-        .long   4132590244,4132590244
-        .long   1295727478,1295727478
-        .long   1641469623,1641469623
-        .long   3467883389,3467883389
-        .long   2066295122,2066295122
-        .long   1055122397,1055122397
-        .long   1898917726,1898917726
-        .long   2542044179,2542044179
-        .long   4115878822,4115878822
-        .long   1758581177,1758581177
-        .long   0,0
-        .long   753790401,753790401
-        .long   1612718144,1612718144
-        .long   536673507,536673507
-        .long   3367088505,3367088505
-        .long   3982187446,3982187446
-        .long   3194645204,3194645204
-        .long   1187761037,1187761037
-        .long   3653156455,3653156455
-        .long   1262041458,1262041458
-        .long   3729410708,3729410708
-        .long   3561770136,3561770136
-        .long   3898103984,3898103984
-        .long   1255133061,1255133061
-        .long   1808847035,1808847035
-        .long   720367557,720367557
-        .long   3853167183,3853167183
-        .long   385612781,385612781
-        .long   3309519750,3309519750
-        .long   3612167578,3612167578
-        .long   1429418854,1429418854
-        .long   2491778321,2491778321
-        .long   3477423498,3477423498
-        .long   284817897,284817897
-        .long   100794884,100794884
-        .long   2172616702,2172616702
-        .long   4031795360,4031795360
-        .long   1144798328,1144798328
-        .long   3131023141,3131023141
-        .long   3819481163,3819481163
-        .long   4082192802,4082192802
-        .long   4272137053,4272137053
-        .long   3225436288,3225436288
-        .long   2324664069,2324664069
-        .long   2912064063,2912064063
-        .long   3164445985,3164445985
-        .long   1211644016,1211644016
-        .long   83228145,83228145
-        .long   3753688163,3753688163
-        .long   3249976951,3249976951
-        .long   1977277103,1977277103
-        .long   1663115586,1663115586
-        .long   806359072,806359072
-        .long   452984805,452984805
-        .long   250868733,250868733
-        .long   1842533055,1842533055
-        .long   1288555905,1288555905
-        .long   336333848,336333848
-        .long   890442534,890442534
-        .long   804056259,804056259
-        .long   3781124030,3781124030
-        .long   2727843637,2727843637
-        .long   3427026056,3427026056
-        .long   957814574,957814574
-        .long   1472513171,1472513171
-        .long   4071073621,4071073621
-        .long   2189328124,2189328124
-        .long   1195195770,1195195770
-        .long   2892260552,2892260552
-        .long   3881655738,3881655738
-        .long   723065138,723065138
-        .long   2507371494,2507371494
-        .long   2690670784,2690670784
-        .long   2558624025,2558624025
-        .long   3511635870,3511635870
-        .long   2145180835,2145180835
-        .long   1713513028,1713513028
-        .long   2116692564,2116692564
-        .long   2878378043,2878378043
-        .long   2206763019,2206763019
-        .long   3393603212,3393603212
-        .long   703524551,703524551
-        .long   3552098411,3552098411
-        .long   1007948840,1007948840
-        .long   2044649127,2044649127
-        .long   3797835452,3797835452
-        .long   487262998,487262998
-        .long   1994120109,1994120109
-        .long   1004593371,1004593371
-        .long   1446130276,1446130276
-        .long   1312438900,1312438900
-        .long   503974420,503974420
-        .long   3679013266,3679013266
-        .long   168166924,168166924
-        .long   1814307912,1814307912
-        .long   3831258296,3831258296
-        .long   1573044895,1573044895
-        .long   1859376061,1859376061
-        .long   4021070915,4021070915
-        .long   2791465668,2791465668
-        .long   2828112185,2828112185
-        .long   2761266481,2761266481
-        .long   937747667,937747667
-        .long   2339994098,2339994098
-        .long   854058965,854058965
-        .long   1137232011,1137232011
-        .long   1496790894,1496790894
-        .long   3077402074,3077402074
-        .long   2358086913,2358086913
-        .long   1691735473,1691735473
-        .long   3528347292,3528347292
-        .long   3769215305,3769215305
-        .long   3027004632,3027004632
-        .long   4199962284,4199962284
-        .long   133494003,133494003
-        .long   636152527,636152527
-        .long   2942657994,2942657994
-        .long   2390391540,2390391540
-        .long   3920539207,3920539207
-        .long   403179536,403179536
-        .long   3585784431,3585784431
-        .long   2289596656,2289596656
-        .long   1864705354,1864705354
-        .long   1915629148,1915629148
-        .long   605822008,605822008
-        .long   4054230615,4054230615
-        .long   3350508659,3350508659
-        .long   1371981463,1371981463
-        .long   602466507,602466507
-        .long   2094914977,2094914977
-        .long   2624877800,2624877800
-        .long   555687742,555687742
-        .long   3712699286,3712699286
-        .long   3703422305,3703422305
-        .long   2257292045,2257292045
-        .long   2240449039,2240449039
-        .long   2423288032,2423288032
-        .long   1111375484,1111375484
-        .long   3300242801,3300242801
-        .long   2858837708,2858837708
-        .long   3628615824,3628615824
-        .long   84083462,84083462
-        .long   32962295,32962295
-        .long   302911004,302911004
-        .long   2741068226,2741068226
-        .long   1597322602,1597322602
-        .long   4183250862,4183250862
-        .long   3501832553,3501832553
-        .long   2441512471,2441512471
-        .long   1489093017,1489093017
-        .long   656219450,656219450
-        .long   3114180135,3114180135
-        .long   954327513,954327513
-        .long   335083755,335083755
-        .long   3013122091,3013122091
-        .long   856756514,856756514
-        .long   3144247762,3144247762
-        .long   1893325225,1893325225
-        .long   2307821063,2307821063
-        .long   2811532339,2811532339
-        .long   3063651117,3063651117
-        .long   572399164,572399164
-        .long   2458355477,2458355477
-        .long   552200649,552200649
-        .long   1238290055,1238290055
-        .long   4283782570,4283782570
-        .long   2015897680,2015897680
-        .long   2061492133,2061492133
-        .long   2408352771,2408352771
-        .long   4171342169,4171342169
-        .long   2156497161,2156497161
-        .long   386731290,386731290
-        .long   3669999461,3669999461
-        .long   837215959,837215959
-        .long   3326231172,3326231172
-        .long   3093850320,3093850320
-        .long   3275833730,3275833730
-        .long   2962856233,2962856233
-        .long   1999449434,1999449434
-        .long   286199582,286199582
-        .long   3417354363,3417354363
-        .long   4233385128,4233385128
-        .long   3602627437,3602627437
-        .long   974525996,974525996
-        .long   1,2,4,8
-        .long   16,32,64,128
-        .long   27,54,0,0,
-        .long   0,0,0,0
-.L__x86_AES_encrypt_end:
-.size   _x86_AES_encrypt,.L__x86_AES_encrypt_end-_x86_AES_encrypt
-.ident  "_x86_AES_encrypt"
-.globl  AES_Te
-.text
-.globl  AES_encrypt
-.type   AES_encrypt,@function
-.align  16
-AES_encrypt:
-        pushl   %ebp
-        pushl   %ebx
-        pushl   %esi
-        pushl   %edi
-
-        movl    20(%esp),       %esi
-        movl    28(%esp),       %edi
-        movl    %esp,           %eax
-        subl    $24,            %esp
-        andl    $-64,           %esp
-        addl    $4,             %esp
-        movl    %eax,           16(%esp)
-        call    .L001pic_point
-.L001pic_point:
-        popl    %ebp
-        leal    AES_Te-.L001pic_point(%ebp),%ebp
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    8(%esi),        %ecx
-        movl    12(%esi),       %edx
-        call    _x86_AES_encrypt
-        movl    16(%esp),       %esp
-        movl    24(%esp),       %esi
-        movl    %eax,           (%esi)
-        movl    %ebx,           4(%esi)
-        movl    %ecx,           8(%esi)
-        movl    %edx,           12(%esi)
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-.L_AES_encrypt_end:
-.size   AES_encrypt,.L_AES_encrypt_end-AES_encrypt
-.ident  "AES_encrypt"
-.globl  AES_Td
-.text
-.globl  _x86_AES_decrypt
-.type   _x86_AES_decrypt,@function
-.align  16
-_x86_AES_decrypt:
-        movl    %edi,           12(%esp)
-        xorl    (%edi),         %eax
-        xorl    4(%edi),        %ebx
-        xorl    8(%edi),        %ecx
-        xorl    12(%edi),       %edx
-        movl    240(%edi),      %esi
-        leal    -2(%esi,%esi),  %esi
-        leal    (%edi,%esi,8),  %esi
-        movl    %esi,           16(%esp)
-.align  4
-.L002loop:
-        movl    %eax,           %esi
-        andl    $255,           %esi
-        movl    (%ebp,%esi,8),  %esi
-        movzbl  %dh,            %edi
-        xorl    3(%ebp,%edi,8), %esi
-        movl    %ecx,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        xorl    2(%ebp,%edi,8), %esi
-        movl    %ebx,           %edi
-        shrl    $24,            %edi
-        xorl    1(%ebp,%edi,8), %esi
-        movl    %esi,           4(%esp)
-
-        movl    %ebx,           %esi
-        andl    $255,           %esi
-        movl    (%ebp,%esi,8),  %esi
-        movzbl  %ah,            %edi
-        xorl    3(%ebp,%edi,8), %esi
-        movl    %edx,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        xorl    2(%ebp,%edi,8), %esi
-        movl    %ecx,           %edi
-        shrl    $24,            %edi
-        xorl    1(%ebp,%edi,8), %esi
-        movl    %esi,           8(%esp)
-
-        movl    %ecx,           %esi
-        andl    $255,           %esi
-        movl    (%ebp,%esi,8),  %esi
-        movzbl  %bh,            %edi
-        xorl    3(%ebp,%edi,8), %esi
-        movl    %eax,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        xorl    2(%ebp,%edi,8), %esi
-        movl    %edx,           %edi
-        shrl    $24,            %edi
-        xorl    1(%ebp,%edi,8), %esi
-
-        movl    12(%esp),       %edi
-        andl    $255,           %edx
-        movl    (%ebp,%edx,8),  %edx
-        movzbl  %ch,            %ecx
-        xorl    3(%ebp,%ecx,8), %edx
-        movl    %esi,           %ecx
-        shrl    $16,            %ebx
-        andl    $255,           %ebx
-        xorl    2(%ebp,%ebx,8), %edx
-        movl    8(%esp),        %ebx
-        shrl    $24,            %eax
-        xorl    1(%ebp,%eax,8), %edx
-        movl    4(%esp),        %eax
-
-        addl    $16,            %edi
-        xorl    (%edi),         %eax
-        xorl    4(%edi),        %ebx
-        xorl    8(%edi),        %ecx
-        xorl    12(%edi),       %edx
-        cmpl    16(%esp),       %edi
-        movl    %edi,           12(%esp)
-        jb      .L002loop
-        movl    %eax,           %esi
-        andl    $255,           %esi
-        movl    2048(%ebp,%esi,4),%esi
-        andl    $255,           %esi
-        movzbl  %dh,            %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $65280,         %edi
-        xorl    %edi,           %esi
-        movl    %ecx,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $16711680,      %edi
-        xorl    %edi,           %esi
-        movl    %ebx,           %edi
-        shrl    $24,            %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $4278190080,    %edi
-        xorl    %edi,           %esi
-        movl    %esi,           4(%esp)
-        movl    %ebx,           %esi
-        andl    $255,           %esi
-        movl    2048(%ebp,%esi,4),%esi
-        andl    $255,           %esi
-        movzbl  %ah,            %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $65280,         %edi
-        xorl    %edi,           %esi
-        movl    %edx,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $16711680,      %edi
-        xorl    %edi,           %esi
-        movl    %ecx,           %edi
-        shrl    $24,            %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $4278190080,    %edi
-        xorl    %edi,           %esi
-        movl    %esi,           8(%esp)
-        movl    %ecx,           %esi
-        andl    $255,           %esi
-        movl    2048(%ebp,%esi,4),%esi
-        andl    $255,           %esi
-        movzbl  %bh,            %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $65280,         %edi
-        xorl    %edi,           %esi
-        movl    %eax,           %edi
-        shrl    $16,            %edi
-        andl    $255,           %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $16711680,      %edi
-        xorl    %edi,           %esi
-        movl    %edx,           %edi
-        shrl    $24,            %edi
-        movl    2048(%ebp,%edi,4),%edi
-        andl    $4278190080,    %edi
-        xorl    %edi,           %esi
-        movl    12(%esp),       %edi
-        andl    $255,           %edx
-        movl    2048(%ebp,%edx,4),%edx
-        andl    $255,           %edx
-        movzbl  %ch,            %ecx
-        movl    2048(%ebp,%ecx,4),%ecx
-        andl    $65280,         %ecx
-        xorl    %ecx,           %edx
-        movl    %esi,           %ecx
-        shrl    $16,            %ebx
-        andl    $255,           %ebx
-        movl    2048(%ebp,%ebx,4),%ebx
-        andl    $16711680,      %ebx
-        xorl    %ebx,           %edx
-        movl    8(%esp),        %ebx
-        shrl    $24,            %eax
-        movl    2048(%ebp,%eax,4),%eax
-        andl    $4278190080,    %eax
-        xorl    %eax,           %edx
-        movl    4(%esp),        %eax
-        addl    $16,            %edi
-        xorl    (%edi),         %eax
-        xorl    4(%edi),        %ebx
-        xorl    8(%edi),        %ecx
-        xorl    12(%edi),       %edx
-        ret
-.align  64
-AES_Td:
-        .long   1353184337,1353184337
-        .long   1399144830,1399144830
-        .long   3282310938,3282310938
-        .long   2522752826,2522752826
-        .long   3412831035,3412831035
-        .long   4047871263,4047871263
-        .long   2874735276,2874735276
-        .long   2466505547,2466505547
-        .long   1442459680,1442459680
-        .long   4134368941,4134368941
-        .long   2440481928,2440481928
-        .long   625738485,625738485
-        .long   4242007375,4242007375
-        .long   3620416197,3620416197
-        .long   2151953702,2151953702
-        .long   2409849525,2409849525
-        .long   1230680542,1230680542
-        .long   1729870373,1729870373
-        .long   2551114309,2551114309
-        .long   3787521629,3787521629
-        .long   41234371,41234371
-        .long   317738113,317738113
-        .long   2744600205,2744600205
-        .long   3338261355,3338261355
-        .long   3881799427,3881799427
-        .long   2510066197,2510066197
-        .long   3950669247,3950669247
-        .long   3663286933,3663286933
-        .long   763608788,763608788
-        .long   3542185048,3542185048
-        .long   694804553,694804553
-        .long   1154009486,1154009486
-        .long   1787413109,1787413109
-        .long   2021232372,2021232372
-        .long   1799248025,1799248025
-        .long   3715217703,3715217703
-        .long   3058688446,3058688446
-        .long   397248752,397248752
-        .long   1722556617,1722556617
-        .long   3023752829,3023752829
-        .long   407560035,407560035
-        .long   2184256229,2184256229
-        .long   1613975959,1613975959
-        .long   1165972322,1165972322
-        .long   3765920945,3765920945
-        .long   2226023355,2226023355
-        .long   480281086,480281086
-        .long   2485848313,2485848313
-        .long   1483229296,1483229296
-        .long   436028815,436028815
-        .long   2272059028,2272059028
-        .long   3086515026,3086515026
-        .long   601060267,601060267
-        .long   3791801202,3791801202
-        .long   1468997603,1468997603
-        .long   715871590,715871590
-        .long   120122290,120122290
-        .long   63092015,63092015
-        .long   2591802758,2591802758
-        .long   2768779219,2768779219
-        .long   4068943920,4068943920
-        .long   2997206819,2997206819
-        .long   3127509762,3127509762
-        .long   1552029421,1552029421
-        .long   723308426,723308426
-        .long   2461301159,2461301159
-        .long   4042393587,4042393587
-        .long   2715969870,2715969870
-        .long   3455375973,3455375973
-        .long   3586000134,3586000134
-        .long   526529745,526529745
-        .long   2331944644,2331944644
-        .long   2639474228,2639474228
-        .long   2689987490,2689987490
-        .long   853641733,853641733
-        .long   1978398372,1978398372
-        .long   971801355,971801355
-        .long   2867814464,2867814464
-        .long   111112542,111112542
-        .long   1360031421,1360031421
-        .long   4186579262,4186579262
-        .long   1023860118,1023860118
-        .long   2919579357,2919579357
-        .long   1186850381,1186850381
-        .long   3045938321,3045938321
-        .long   90031217,90031217
-        .long   1876166148,1876166148
-        .long   4279586912,4279586912
-        .long   620468249,620468249
-        .long   2548678102,2548678102
-        .long   3426959497,3426959497
-        .long   2006899047,2006899047
-        .long   3175278768,3175278768
-        .long   2290845959,2290845959
-        .long   945494503,945494503
-        .long   3689859193,3689859193
-        .long   1191869601,1191869601
-        .long   3910091388,3910091388
-        .long   3374220536,3374220536
-        .long   0,0
-        .long   2206629897,2206629897
-        .long   1223502642,1223502642
-        .long   2893025566,2893025566
-        .long   1316117100,1316117100
-        .long   4227796733,4227796733
-        .long   1446544655,1446544655
-        .long   517320253,517320253
-        .long   658058550,658058550
-        .long   1691946762,1691946762
-        .long   564550760,564550760
-        .long   3511966619,3511966619
-        .long   976107044,976107044
-        .long   2976320012,2976320012
-        .long   266819475,266819475
-        .long   3533106868,3533106868
-        .long   2660342555,2660342555
-        .long   1338359936,1338359936
-        .long   2720062561,2720062561
-        .long   1766553434,1766553434
-        .long   370807324,370807324
-        .long   179999714,179999714
-        .long   3844776128,3844776128
-        .long   1138762300,1138762300
-        .long   488053522,488053522
-        .long   185403662,185403662
-        .long   2915535858,2915535858
-        .long   3114841645,3114841645
-        .long   3366526484,3366526484
-        .long   2233069911,2233069911
-        .long   1275557295,1275557295
-        .long   3151862254,3151862254
-        .long   4250959779,4250959779
-        .long   2670068215,2670068215
-        .long   3170202204,3170202204
-        .long   3309004356,3309004356
-        .long   880737115,880737115
-        .long   1982415755,1982415755
-        .long   3703972811,3703972811
-        .long   1761406390,1761406390
-        .long   1676797112,1676797112
-        .long   3403428311,3403428311
-        .long   277177154,277177154
-        .long   1076008723,1076008723
-        .long   538035844,538035844
-        .long   2099530373,2099530373
-        .long   4164795346,4164795346
-        .long   288553390,288553390
-        .long   1839278535,1839278535
-        .long   1261411869,1261411869
-        .long   4080055004,4080055004
-        .long   3964831245,3964831245
-        .long   3504587127,3504587127
-        .long   1813426987,1813426987
-        .long   2579067049,2579067049
-        .long   4199060497,4199060497
-        .long   577038663,577038663
-        .long   3297574056,3297574056
-        .long   440397984,440397984
-        .long   3626794326,3626794326
-        .long   4019204898,4019204898
-        .long   3343796615,3343796615
-        .long   3251714265,3251714265
-        .long   4272081548,4272081548
-        .long   906744984,906744984
-        .long   3481400742,3481400742
-        .long   685669029,685669029
-        .long   646887386,646887386
-        .long   2764025151,2764025151
-        .long   3835509292,3835509292
-        .long   227702864,227702864
-        .long   2613862250,2613862250
-        .long   1648787028,1648787028
-        .long   3256061430,3256061430
-        .long   3904428176,3904428176
-        .long   1593260334,1593260334
-        .long   4121936770,4121936770
-        .long   3196083615,3196083615
-        .long   2090061929,2090061929
-        .long   2838353263,2838353263
-        .long   3004310991,3004310991
-        .long   999926984,999926984
-        .long   2809993232,2809993232
-        .long   1852021992,1852021992
-        .long   2075868123,2075868123
-        .long   158869197,158869197
-        .long   4095236462,4095236462
-        .long   28809964,28809964
-        .long   2828685187,2828685187
-        .long   1701746150,1701746150
-        .long   2129067946,2129067946
-        .long   147831841,147831841
-        .long   3873969647,3873969647
-        .long   3650873274,3650873274
-        .long   3459673930,3459673930
-        .long   3557400554,3557400554
-        .long   3598495785,3598495785
-        .long   2947720241,2947720241
-        .long   824393514,824393514
-        .long   815048134,815048134
-        .long   3227951669,3227951669
-        .long   935087732,935087732
-        .long   2798289660,2798289660
-        .long   2966458592,2966458592
-        .long   366520115,366520115
-        .long   1251476721,1251476721
-        .long   4158319681,4158319681
-        .long   240176511,240176511
-        .long   804688151,804688151
-        .long   2379631990,2379631990
-        .long   1303441219,1303441219
-        .long   1414376140,1414376140
-        .long   3741619940,3741619940
-        .long   3820343710,3820343710
-        .long   461924940,461924940
-        .long   3089050817,3089050817
-        .long   2136040774,2136040774
-        .long   82468509,82468509
-        .long   1563790337,1563790337
-        .long   1937016826,1937016826
-        .long   776014843,776014843
-        .long   1511876531,1511876531
-        .long   1389550482,1389550482
-        .long   861278441,861278441
-        .long   323475053,323475053
-        .long   2355222426,2355222426
-        .long   2047648055,2047648055
-        .long   2383738969,2383738969
-        .long   2302415851,2302415851
-        .long   3995576782,3995576782
-        .long   902390199,902390199
-        .long   3991215329,3991215329
-        .long   1018251130,1018251130
-        .long   1507840668,1507840668
-        .long   1064563285,1064563285
-        .long   2043548696,2043548696
-        .long   3208103795,3208103795
-        .long   3939366739,3939366739
-        .long   1537932639,1537932639
-        .long   342834655,342834655
-        .long   2262516856,2262516856
-        .long   2180231114,2180231114
-        .long   1053059257,1053059257
-        .long   741614648,741614648
-        .long   1598071746,1598071746
-        .long   1925389590,1925389590
-        .long   203809468,203809468
-        .long   2336832552,2336832552
-        .long   1100287487,1100287487
-        .long   1895934009,1895934009
-        .long   3736275976,3736275976
-        .long   2632234200,2632234200
-        .long   2428589668,2428589668
-        .long   1636092795,1636092795
-        .long   1890988757,1890988757
-        .long   1952214088,1952214088
-        .long   1113045200,1113045200
-        .long   1381126738,151587081,1785358954,3587560917
-        .long   808464432,909522486,2779096485,943208504
-        .long   3217014719,1077952576,2745410467,2661195422
-        .long   2172748161,4092851187,3621246935,4227595259
-        .long   2088533116,3823363043,960051513,2189591170
-        .long   2610666395,791621423,4294967295,2273806215
-        .long   875836468,2391707278,1128481603,1145324612
-        .long   3301229764,3739147998,3924421097,3419130827
-        .long   1414812756,2071690107,2492765332,842150450
-        .long   2795939494,3267543746,589505315,1027423549
-        .long   4008636142,1280068684,2509608341,185273099
-        .long   1111638594,4210752250,3284386755,1313754702
-        .long   134744072,774778414,2711724449,1717986918
-        .long   673720360,3654932953,606348324,2998055602
-        .long   1987475062,1532713819,2728567458,1229539657
-        .long   1835887981,2341178251,3520188881,623191333
-        .long   1920103026,4177066232,4143380214,1684300900
-        .long   2256963206,1751672936,2560137368,370546198
-        .long   3570717908,2762253476,1549556828,3435973836
-        .long   1566399837,1701143909,3065427638,2459079314
-        .long   1819044972,1886417008,1212696648,1347440720
-        .long   4261281277,3991793133,3115956665,3671775962
-        .long   1583242846,353703189,1179010630,1465341783
-        .long   2812782503,2374864269,2644352413,2223277188
-        .long   2425393296,3638089944,2880154539,0
-        .long   2358021260,3166485692,3553874899,168430090
-        .long   4160223223,3840206052,1482184792,84215045
-        .long   3099113656,3014898611,1162167621,101058054
-        .long   3503345872,741092396,505290270,2408550287
-        .long   3402287818,1061109567,252645135,33686018
-        .long   3250700737,2947526575,3183328701,50529027
-        .long   16843009,320017171,2324335242,1802201963
-        .long   976894522,2442236305,286331153,1094795585
-        .long   1330597711,1734829927,3705461980,3941264106
-        .long   2543294359,4076008178,3486502863,3469659854
-        .long   4042322160,3031741620,3873892070,1936946035
-        .long   2526451350,2896997548,1953789044,572662306
-        .long   3890735079,2913840557,892679477,2240120197
-        .long   3806520034,4193909241,926365495,3907578088
-        .long   471604252,1970632053,3755991007,1852730990
-        .long   1195853639,4059165169,437918234,1903260017
-        .long   488447261,690563369,3318072773,2307492233
-        .long   1869573999,3082270647,1650614882,235802126
-        .long   2863311530,404232216,3200171710,454761243
-        .long   4244438268,1448498774,1044266558,1263225675
-        .long   3334915782,3537031890,2038004089,538976288
-        .long   2593823386,3688618971,3233857728,4278124286
-        .long   2021161080,3452816845,1515870810,4109694196
-        .long   522133279,3722304989,2829625512,858993459
-        .long   2290649224,117901063,3351758791,825307441
-        .long   2981212593,303174162,269488144,1499027801
-        .long   656877351,2155905152,3974950124,1600085855
-        .long   1616928864,1364283729,2139062143,2846468521
-        .long   421075225,3048584629,1246382666,218959117
-        .long   757935405,3857049061,2054847098,2678038431
-        .long   2475922323,3385444809,2627509404,4025479151
-        .long   2694881440,3772834016,993737531,1296911693
-        .long   2930683566,707406378,4126537205,2964369584
-        .long   3368601800,3958107115,3149642683,1010580540
-        .long   2206434179,1397969747,2576980377,1633771873
-        .long   387389207,724249387,67372036,2122219134
-        .long   3132799674,2004318071,3604403926,640034342
-        .long   3789677025,1768515945,336860180,1667457891
-        .long   1431655765,555819297,202116108,2105376125
-.L__x86_AES_decrypt_end:
-.size   _x86_AES_decrypt,.L__x86_AES_decrypt_end-_x86_AES_decrypt
-.ident  "_x86_AES_decrypt"
-.globl  AES_Td
-.text
-.globl  AES_decrypt
-.type   AES_decrypt,@function
-.align  16
-AES_decrypt:
-        pushl   %ebp
-        pushl   %ebx
-        pushl   %esi
-        pushl   %edi
-
-        movl    20(%esp),       %esi
-        movl    28(%esp),       %edi
-        movl    %esp,           %eax
-        subl    $24,            %esp
-        andl    $-64,           %esp
-        addl    $4,             %esp
-        movl    %eax,           16(%esp)
-        call    .L003pic_point
-.L003pic_point:
-        popl    %ebp
-        leal    AES_Td-.L003pic_point(%ebp),%ebp
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    8(%esi),        %ecx
-        movl    12(%esi),       %edx
-        call    _x86_AES_decrypt
-        movl    16(%esp),       %esp
-        movl    24(%esp),       %esi
-        movl    %eax,           (%esi)
-        movl    %ebx,           4(%esi)
-        movl    %ecx,           8(%esi)
-        movl    %edx,           12(%esi)
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-.L_AES_decrypt_end:
-.size   AES_decrypt,.L_AES_decrypt_end-AES_decrypt
-.ident  "AES_decrypt"
-.globl  AES_Te
-.globl  AES_Td
-.text
-.globl  AES_cbc_encrypt
-.type   AES_cbc_encrypt,@function
-.align  16
-AES_cbc_encrypt:
-        pushl   %ebp
-        pushl   %ebx
-        pushl   %esi
-        pushl   %edi
-
-        movl    28(%esp),       %ecx
-        cmpl    $0,             %ecx
-        je      .L004enc_out
-        call    .L005pic_point
-.L005pic_point:
-        popl    %ebp
-        pushfl
-        cld
-        cmpl    $0,             44(%esp)
-        je      .L006DECRYPT
-        leal    AES_Te-.L005pic_point(%ebp),%ebp
-        leal    -308(%esp),     %edi
-        andl    $-64,           %edi
-        movl    %ebp,           %eax
-        leal    2048(%ebp),     %ebx
-        movl    %edi,           %edx
-        andl    $4095,          %eax
-        andl    $4095,          %ebx
-        andl    $4095,          %edx
-        cmpl    %ebx,           %edx
-        jb      .L007te_break_out
-        subl    %ebx,           %edx
-        subl    %edx,           %edi
-        jmp     .L008te_ok
-.L007te_break_out:
-        subl    %eax,           %edx
-        andl    $4095,          %edx
-        addl    $320,           %edx
-        subl    %edx,           %edi
-.align  4
-.L008te_ok:
-        movl    24(%esp),       %eax
-        movl    28(%esp),       %ebx
-        movl    36(%esp),       %edx
-        movl    40(%esp),       %esi
-        xchgl   %edi,           %esp
-        addl    $4,             %esp
-        movl    %edi,           16(%esp)
-        movl    %eax,           20(%esp)
-        movl    %ebx,           24(%esp)
-        movl    %ecx,           28(%esp)
-        movl    %edx,           32(%esp)
-        movl    %esi,           36(%esp)
-        movl    $61,            %ecx
-        movl    %edx,           %esi
-        leal    60(%esp),       %edi
-        movl    %edi,           32(%esp)
-.align  4
-        .long   4136216051
-        movl    %eax,           %esi
-        movl    $16,            %edi
-.align  4
-.L009prefetch_te:
-        movl    (%ebp),         %eax
-        movl    32(%ebp),       %ebx
-        movl    64(%ebp),       %ecx
-        movl    96(%ebp),       %edx
-        leal    128(%ebp),      %ebp
-        decl    %edi
-        jnz     .L009prefetch_te
-        subl    $2048,          %ebp
-        movl    28(%esp),       %ecx
-        movl    36(%esp),       %edi
-        testl   $4294967280,    %ecx
-        jz      .L010enc_tail
-        movl    (%edi),         %eax
-        movl    4(%edi),        %ebx
-.align  4
-.L011enc_loop:
-        movl    8(%edi),        %ecx
-        movl    12(%edi),       %edx
-        xorl    (%esi),         %eax
-        xorl    4(%esi),        %ebx
-        xorl    8(%esi),        %ecx
-        xorl    12(%esi),       %edx
-        movl    32(%esp),       %edi
-        call    _x86_AES_encrypt
-        movl    20(%esp),       %esi
-        movl    24(%esp),       %edi
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           8(%edi)
-        movl    %edx,           12(%edi)
-        movl    28(%esp),       %ecx
-        leal    16(%esi),       %esi
-        movl    %esi,           20(%esp)
-        leal    16(%edi),       %edx
-        movl    %edx,           24(%esp)
-        subl    $16,            %ecx
-        testl   $4294967280,    %ecx
-        movl    %ecx,           28(%esp)
-        jnz     .L011enc_loop
-        testl   $15,            %ecx
-        jnz     .L010enc_tail
-        movl    36(%esp),       %esi
-        movl    8(%edi),        %ecx
-        movl    12(%edi),       %edx
-        movl    %eax,           (%esi)
-        movl    %ebx,           4(%esi)
-        movl    %ecx,           8(%esi)
-        movl    %edx,           12(%esi)
-        movl    32(%esp),       %edi
-        movl    16(%esp),       %esp
-        movl    $60,            %ecx
-        xorl    %eax,           %eax
-.align  4
-        .long   4136217587
-        popfl
-.L004enc_out:
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-        pushfl
-.align  4
-.L010enc_tail:
-        pushl   %edi
-        movl    24(%esp),       %edi
-        movl    $16,            %ebx
-        subl    %ecx,           %ebx
-        cmpl    %esi,           %edi
-        je      .L012enc_in_place
-.align  4
-        .long   4136215795
-        jmp     .L013enc_skip_in_place
-.L012enc_in_place:
-        leal    (%edi,%ecx),    %edi
-.L013enc_skip_in_place:
-        movl    %ebx,           %ecx
-        xorl    %eax,           %eax
-.align  4
-        .long   4136217331
-        popl    %edi
-        movl    24(%esp),       %esi
-        movl    (%edi),         %eax
-        movl    4(%edi),        %ebx
-        movl    $16,            28(%esp)
-        jmp     .L011enc_loop
-.align  4
-.L006DECRYPT:
-        leal    AES_Td-.L005pic_point(%ebp),%ebp
-        leal    -308(%esp),     %edi
-        andl    $-64,           %edi
-        movl    %ebp,           %eax
-        leal    3072(%ebp),     %ebx
-        movl    %edi,           %edx
-        andl    $4095,          %eax
-        andl    $4095,          %ebx
-        andl    $4095,          %edx
-        cmpl    %ebx,           %edx
-        jb      .L014td_break_out
-        subl    %ebx,           %edx
-        subl    %edx,           %edi
-        jmp     .L015td_ok
-.L014td_break_out:
-        subl    %eax,           %edx
-        andl    $4095,          %edx
-        addl    $320,           %edx
-        subl    %edx,           %edi
-.align  4
-.L015td_ok:
-        movl    24(%esp),       %eax
-        movl    28(%esp),       %ebx
-        movl    36(%esp),       %edx
-        movl    40(%esp),       %esi
-        xchgl   %edi,           %esp
-        addl    $4,             %esp
-        movl    %edi,           16(%esp)
-        movl    %eax,           20(%esp)
-        movl    %ebx,           24(%esp)
-        movl    %ecx,           28(%esp)
-        movl    %edx,           32(%esp)
-        movl    %esi,           36(%esp)
-        movl    $61,            %ecx
-        movl    %edx,           %esi
-        leal    60(%esp),       %edi
-        movl    %edi,           32(%esp)
-.align  4
-        .long   4136216051
-        movl    %eax,           %esi
-        movl    $24,            %edi
-.align  4
-.L016prefetch_td:
-        movl    (%ebp),         %eax
-        movl    32(%ebp),       %ebx
-        movl    64(%ebp),       %ecx
-        movl    96(%ebp),       %edx
-        leal    128(%ebp),      %ebp
-        decl    %edi
-        jnz     .L016prefetch_td
-        subl    $3072,          %ebp
-        cmpl    24(%esp),       %esi
-        je      .L017dec_in_place
-        movl    36(%esp),       %edi
-        movl    %edi,           40(%esp)
-.align  4
-.L018dec_loop:
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    8(%esi),        %ecx
-        movl    12(%esi),       %edx
-        movl    32(%esp),       %edi
-        call    _x86_AES_decrypt
-        movl    40(%esp),       %edi
-        movl    28(%esp),       %esi
-        xorl    (%edi),         %eax
-        xorl    4(%edi),        %ebx
-        xorl    8(%edi),        %ecx
-        xorl    12(%edi),       %edx
-        subl    $16,            %esi
-        jc      .L019dec_partial
-        movl    %esi,           28(%esp)
-        movl    20(%esp),       %esi
-        movl    24(%esp),       %edi
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           8(%edi)
-        movl    %edx,           12(%edi)
-        movl    %esi,           40(%esp)
-        leal    16(%esi),       %esi
-        movl    %esi,           20(%esp)
-        leal    16(%edi),       %edi
-        movl    %edi,           24(%esp)
-        jnz     .L018dec_loop
-        movl    40(%esp),       %edi
-.L020dec_end:
-        movl    36(%esp),       %esi
-        movl    (%edi),         %eax
-        movl    4(%edi),        %ebx
-        movl    8(%edi),        %ecx
-        movl    12(%edi),       %edx
-        movl    %eax,           (%esi)
-        movl    %ebx,           4(%esi)
-        movl    %ecx,           8(%esi)
-        movl    %edx,           12(%esi)
-        jmp     .L021dec_out
-.align  4
-.L019dec_partial:
-        leal    44(%esp),       %edi
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           8(%edi)
-        movl    %edx,           12(%edi)
-        leal    16(%esi),       %ecx
-        movl    %edi,           %esi
-        movl    24(%esp),       %edi
-        .long   4136215795
-        movl    20(%esp),       %edi
-        jmp     .L020dec_end
-.align  4
-.L017dec_in_place:
-.L022dec_in_place_loop:
-        leal    44(%esp),       %edi
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    8(%esi),        %ecx
-        movl    12(%esi),       %edx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           8(%edi)
-        movl    %edx,           12(%edi)
-        movl    32(%esp),       %edi
-        call    _x86_AES_decrypt
-        movl    36(%esp),       %edi
-        movl    24(%esp),       %esi
-        xorl    (%edi),         %eax
-        xorl    4(%edi),        %ebx
-        xorl    8(%edi),        %ecx
-        xorl    12(%edi),       %edx
-        movl    %eax,           (%esi)
-        movl    %ebx,           4(%esi)
-        movl    %ecx,           8(%esi)
-        movl    %edx,           12(%esi)
-        leal    16(%esi),       %esi
-        movl    %esi,           24(%esp)
-        leal    44(%esp),       %esi
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    8(%esi),        %ecx
-        movl    12(%esi),       %edx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           8(%edi)
-        movl    %edx,           12(%edi)
-        movl    20(%esp),       %esi
-        leal    16(%esi),       %esi
-        movl    %esi,           20(%esp)
-        movl    28(%esp),       %ecx
-        subl    $16,            %ecx
-        jc      .L023dec_in_place_partial
-        movl    %ecx,           28(%esp)
-        jnz     .L022dec_in_place_loop
-        jmp     .L021dec_out
-.align  4
-.L023dec_in_place_partial:
-        movl    24(%esp),       %edi
-        leal    44(%esp),       %esi
-        leal    (%edi,%ecx),    %edi
-        leal    16(%esi,%ecx),  %esi
-        negl    %ecx
-        .long   4136215795
-.align  4
-.L021dec_out:
-        movl    32(%esp),       %edi
-        movl    16(%esp),       %esp
-        movl    $60,            %ecx
-        xorl    %eax,           %eax
-.align  4
-        .long   4136217587
-        popfl
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-.L_AES_cbc_encrypt_end:
-.size   AES_cbc_encrypt,.L_AES_cbc_encrypt_end-AES_cbc_encrypt
-.ident  "AES_cbc_encrypt"
-.globl  AES_Te
-.text
-.globl  AES_set_encrypt_key
-.type   AES_set_encrypt_key,@function
-.align  16
-AES_set_encrypt_key:
-        pushl   %ebp
-        pushl   %ebx
-        pushl   %esi
-        pushl   %edi
-
-        call    FIPS_selftest_failed
-        cmpl    $0,%eax
-        mov     $-3,%eax
-        jne     .L029exit
-
-        movl    20(%esp),       %esi
-        movl    28(%esp),       %edi
-        testl   $-1,            %esi
-        jz      .L024badpointer
-        testl   $-1,            %edi
-        jz      .L024badpointer
-        call    .L025pic_point
-.L025pic_point:
-        popl    %ebp
-        leal    AES_Te-.L025pic_point(%ebp),%ebp
-        movl    24(%esp),       %ecx
-        cmpl    $128,           %ecx
-        je      .L02610rounds
-        cmpl    $192,           %ecx
-        je      .L02712rounds
-        cmpl    $256,           %ecx
-        je      .L02814rounds
-        movl    $-2,            %eax
-        jmp     .L029exit
-.L02610rounds:
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    8(%esi),        %ecx
-        movl    12(%esi),       %edx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           8(%edi)
-        movl    %edx,           12(%edi)
-        xorl    %ecx,           %ecx
-        jmp     .L03010shortcut
-.align  4
-.L03110loop:
-        movl    (%edi),         %eax
-        movl    12(%edi),       %edx
-.L03010shortcut:
-        movzbl  %dl,            %esi
-        movl    2(%ebp,%esi,8), %ebx
-        movzbl  %dh,            %esi
-        andl    $4278190080,    %ebx
-        xorl    %ebx,           %eax
-        movl    2(%ebp,%esi,8), %ebx
-        shrl    $16,            %edx
-        andl    $255,           %ebx
-        movzbl  %dl,            %esi
-        xorl    %ebx,           %eax
-        movl    (%ebp,%esi,8),  %ebx
-        movzbl  %dh,            %esi
-        andl    $65280,         %ebx
-        xorl    %ebx,           %eax
-        movl    (%ebp,%esi,8),  %ebx
-        andl    $16711680,      %ebx
-        xorl    %ebx,           %eax
-        xorl    2048(%ebp,%ecx,4),%eax
-        movl    %eax,           16(%edi)
-        xorl    4(%edi),        %eax
-        movl    %eax,           20(%edi)
-        xorl    8(%edi),        %eax
-        movl    %eax,           24(%edi)
-        xorl    12(%edi),       %eax
-        movl    %eax,           28(%edi)
-        incl    %ecx
-        addl    $16,            %edi
-        cmpl    $10,            %ecx
-        jl      .L03110loop
-        movl    $10,            80(%edi)
-        xorl    %eax,           %eax
-        jmp     .L029exit
-.L02712rounds:
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    8(%esi),        %ecx
-        movl    12(%esi),       %edx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           8(%edi)
-        movl    %edx,           12(%edi)
-        movl    16(%esi),       %ecx
-        movl    20(%esi),       %edx
-        movl    %ecx,           16(%edi)
-        movl    %edx,           20(%edi)
-        xorl    %ecx,           %ecx
-        jmp     .L03212shortcut
-.align  4
-.L03312loop:
-        movl    (%edi),         %eax
-        movl    20(%edi),       %edx
-.L03212shortcut:
-        movzbl  %dl,            %esi
-        movl    2(%ebp,%esi,8), %ebx
-        movzbl  %dh,            %esi
-        andl    $4278190080,    %ebx
-        xorl    %ebx,           %eax
-        movl    2(%ebp,%esi,8), %ebx
-        shrl    $16,            %edx
-        andl    $255,           %ebx
-        movzbl  %dl,            %esi
-        xorl    %ebx,           %eax
-        movl    (%ebp,%esi,8),  %ebx
-        movzbl  %dh,            %esi
-        andl    $65280,         %ebx
-        xorl    %ebx,           %eax
-        movl    (%ebp,%esi,8),  %ebx
-        andl    $16711680,      %ebx
-        xorl    %ebx,           %eax
-        xorl    2048(%ebp,%ecx,4),%eax
-        movl    %eax,           24(%edi)
-        xorl    4(%edi),        %eax
-        movl    %eax,           28(%edi)
-        xorl    8(%edi),        %eax
-        movl    %eax,           32(%edi)
-        xorl    12(%edi),       %eax
-        movl    %eax,           36(%edi)
-        cmpl    $7,             %ecx
-        je      .L03412break
-        incl    %ecx
-        xorl    16(%edi),       %eax
-        movl    %eax,           40(%edi)
-        xorl    20(%edi),       %eax
-        movl    %eax,           44(%edi)
-        addl    $24,            %edi
-        jmp     .L03312loop
-.L03412break:
-        movl    $12,            72(%edi)
-        xorl    %eax,           %eax
-        jmp     .L029exit
-.L02814rounds:
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    8(%esi),        %ecx
-        movl    12(%esi),       %edx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           8(%edi)
-        movl    %edx,           12(%edi)
-        movl    16(%esi),       %eax
-        movl    20(%esi),       %ebx
-        movl    24(%esi),       %ecx
-        movl    28(%esi),       %edx
-        movl    %eax,           16(%edi)
-        movl    %ebx,           20(%edi)
-        movl    %ecx,           24(%edi)
-        movl    %edx,           28(%edi)
-        xorl    %ecx,           %ecx
-        jmp     .L03514shortcut
-.align  4
-.L03614loop:
-        movl    28(%edi),       %edx
-.L03514shortcut:
-        movl    (%edi),         %eax
-        movzbl  %dl,            %esi
-        movl    2(%ebp,%esi,8), %ebx
-        movzbl  %dh,            %esi
-        andl    $4278190080,    %ebx
-        xorl    %ebx,           %eax
-        movl    2(%ebp,%esi,8), %ebx
-        shrl    $16,            %edx
-        andl    $255,           %ebx
-        movzbl  %dl,            %esi
-        xorl    %ebx,           %eax
-        movl    (%ebp,%esi,8),  %ebx
-        movzbl  %dh,            %esi
-        andl    $65280,         %ebx
-        xorl    %ebx,           %eax
-        movl    (%ebp,%esi,8),  %ebx
-        andl    $16711680,      %ebx
-        xorl    %ebx,           %eax
-        xorl    2048(%ebp,%ecx,4),%eax
-        movl    %eax,           32(%edi)
-        xorl    4(%edi),        %eax
-        movl    %eax,           36(%edi)
-        xorl    8(%edi),        %eax
-        movl    %eax,           40(%edi)
-        xorl    12(%edi),       %eax
-        movl    %eax,           44(%edi)
-        cmpl    $6,             %ecx
-        je      .L03714break
-        incl    %ecx
-        movl    %eax,           %edx
-        movl    16(%edi),       %eax
-        movzbl  %dl,            %esi
-        movl    2(%ebp,%esi,8), %ebx
-        movzbl  %dh,            %esi
-        andl    $255,           %ebx
-        xorl    %ebx,           %eax
-        movl    (%ebp,%esi,8),  %ebx
-        shrl    $16,            %edx
-        andl    $65280,         %ebx
-        movzbl  %dl,            %esi
-        xorl    %ebx,           %eax
-        movl    (%ebp,%esi,8),  %ebx
-        movzbl  %dh,            %esi
-        andl    $16711680,      %ebx
-        xorl    %ebx,           %eax
-        movl    2(%ebp,%esi,8), %ebx
-        andl    $4278190080,    %ebx
-        xorl    %ebx,           %eax
-        movl    %eax,           48(%edi)
-        xorl    20(%edi),       %eax
-        movl    %eax,           52(%edi)
-        xorl    24(%edi),       %eax
-        movl    %eax,           56(%edi)
-        xorl    28(%edi),       %eax
-        movl    %eax,           60(%edi)
-        addl    $32,            %edi
-        jmp     .L03614loop
-.L03714break:
-        movl    $14,            48(%edi)
-        xorl    %eax,           %eax
-        jmp     .L029exit
-.L024badpointer:
-        movl    $-1,            %eax
-.L029exit:
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-.L_AES_set_encrypt_key_end:
-.size   AES_set_encrypt_key,.L_AES_set_encrypt_key_end-AES_set_encrypt_key
-.ident  "AES_set_encrypt_key"
-.globl  AES_Td
-.globl  AES_Te
-.text
-.globl  AES_set_decrypt_key
-.type   AES_set_decrypt_key,@function
-.align  16
-AES_set_decrypt_key:
-        movl    4(%esp),        %eax
-        movl    8(%esp),        %ecx
-        movl    12(%esp),       %edx
-        subl    $12,            %esp
-        movl    %eax,           (%esp)
-        movl    %ecx,           4(%esp)
-        movl    %edx,           8(%esp)
-        call    AES_set_encrypt_key
-        addl    $12,            %esp
-        cmpl    $0,             %eax
-        je      .L038proceed
-        ret
-.L038proceed:
-        pushl   %ebp
-        pushl   %ebx
-        pushl   %esi
-        pushl   %edi
-        movl    28(%esp),       %esi
-        movl    240(%esi),      %ecx
-        leal    (,%ecx,4),      %ecx
-        leal    (%esi,%ecx,4),  %edi
-.align  4
-.L039invert:
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    (%edi),         %ecx
-        movl    4(%edi),        %edx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        movl    %ecx,           (%esi)
-        movl    %edx,           4(%esi)
-        movl    8(%esi),        %eax
-        movl    12(%esi),       %ebx
-        movl    8(%edi),        %ecx
-        movl    12(%edi),       %edx
-        movl    %eax,           8(%edi)
-        movl    %ebx,           12(%edi)
-        movl    %ecx,           8(%esi)
-        movl    %edx,           12(%esi)
-        addl    $16,            %esi
-        subl    $16,            %edi
-        cmpl    %edi,           %esi
-        jne     .L039invert
-        call    .L040pic_point
-.L040pic_point:
-        popl    %ebp
-        leal    AES_Td-.L040pic_point(%ebp),%edi
-        leal    AES_Te-.L040pic_point(%ebp),%ebp
-        movl    28(%esp),       %esi
-        movl    240(%esi),      %ecx
-        decl    %ecx
-.align  4
-.L041permute:
-        addl    $16,            %esi
-        movl    (%esi),         %eax
-        movl    %eax,           %edx
-        movzbl  %ah,            %ebx
-        shrl    $16,            %edx
-        andl    $255,           %eax
-        movzbl  2(%ebp,%eax,8), %eax
-        movzbl  2(%ebp,%ebx,8), %ebx
-        movl    (%edi,%eax,8),  %eax
-        xorl    3(%edi,%ebx,8), %eax
-        movzbl  %dh,            %ebx
-        andl    $255,           %edx
-        movzbl  2(%ebp,%edx,8), %edx
-        movzbl  2(%ebp,%ebx,8), %ebx
-        xorl    2(%edi,%edx,8), %eax
-        xorl    1(%edi,%ebx,8), %eax
-        movl    %eax,           (%esi)
-        movl    4(%esi),        %eax
-        movl    %eax,           %edx
-        movzbl  %ah,            %ebx
-        shrl    $16,            %edx
-        andl    $255,           %eax
-        movzbl  2(%ebp,%eax,8), %eax
-        movzbl  2(%ebp,%ebx,8), %ebx
-        movl    (%edi,%eax,8),  %eax
-        xorl    3(%edi,%ebx,8), %eax
-        movzbl  %dh,            %ebx
-        andl    $255,           %edx
-        movzbl  2(%ebp,%edx,8), %edx
-        movzbl  2(%ebp,%ebx,8), %ebx
-        xorl    2(%edi,%edx,8), %eax
-        xorl    1(%edi,%ebx,8), %eax
-        movl    %eax,           4(%esi)
-        movl    8(%esi),        %eax
-        movl    %eax,           %edx
-        movzbl  %ah,            %ebx
-        shrl    $16,            %edx
-        andl    $255,           %eax
-        movzbl  2(%ebp,%eax,8), %eax
-        movzbl  2(%ebp,%ebx,8), %ebx
-        movl    (%edi,%eax,8),  %eax
-        xorl    3(%edi,%ebx,8), %eax
-        movzbl  %dh,            %ebx
-        andl    $255,           %edx
-        movzbl  2(%ebp,%edx,8), %edx
-        movzbl  2(%ebp,%ebx,8), %ebx
-        xorl    2(%edi,%edx,8), %eax
-        xorl    1(%edi,%ebx,8), %eax
-        movl    %eax,           8(%esi)
-        movl    12(%esi),       %eax
-        movl    %eax,           %edx
-        movzbl  %ah,            %ebx
-        shrl    $16,            %edx
-        andl    $255,           %eax
-        movzbl  2(%ebp,%eax,8), %eax
-        movzbl  2(%ebp,%ebx,8), %ebx
-        movl    (%edi,%eax,8),  %eax
-        xorl    3(%edi,%ebx,8), %eax
-        movzbl  %dh,            %ebx
-        andl    $255,           %edx
-        movzbl  2(%ebp,%edx,8), %edx
-        movzbl  2(%ebp,%ebx,8), %ebx
-        xorl    2(%edi,%edx,8), %eax
-        xorl    1(%edi,%ebx,8), %eax
-        movl    %eax,           12(%esi)
-        decl    %ecx
-        jnz     .L041permute
-        xorl    %eax,           %eax
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-.L_AES_set_decrypt_key_end:
-.size   AES_set_decrypt_key,.L_AES_set_decrypt_key_end-AES_set_decrypt_key
-.ident  "AES_set_decrypt_key"
diff --git a/src/lib/libssl/src/fips-1.0/aes/fips_aes_core.c b/src/lib/libssl/src/fips-1.0/aes/fips_aes_core.c
deleted file mode 100644
index 82199c92e6..0000000000
--- a/src/lib/libssl/src/fips-1.0/aes/fips_aes_core.c
+++ /dev/null
@@ -1,1263 +0,0 @@
-/* crypto/aes/aes_core.c -*- mode:C; c-file-style: "eay" -*- */
-/**
- * rijndael-alg-fst.c
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* Note: rewritten a little bit to provide error control and an OpenSSL-
-   compatible API */
-
-#ifndef AES_DEBUG
-# ifndef NDEBUG
-#  define NDEBUG
-# endif
-#endif
-#include <assert.h>
-
-#include <stdlib.h>
-#include <openssl/aes.h>
-#include "fips_aes_locl.h"
-#include <openssl/fips.h>
-
-#ifdef OPENSSL_FIPS
-
-/*
-Te0[x] = S [x].[02, 01, 01, 03];
-Te1[x] = S [x].[03, 02, 01, 01];
-Te2[x] = S [x].[01, 03, 02, 01];
-Te3[x] = S [x].[01, 01, 03, 02];
-Te4[x] = S [x].[01, 01, 01, 01];
-
-Td0[x] = Si[x].[0e, 09, 0d, 0b];
-Td1[x] = Si[x].[0b, 0e, 09, 0d];
-Td2[x] = Si[x].[0d, 0b, 0e, 09];
-Td3[x] = Si[x].[09, 0d, 0b, 0e];
-Td4[x] = Si[x].[01, 01, 01, 01];
-*/
-
-static const u32 Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-};
-static const u32 Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
-};
-static const u32 Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
-};
-static const u32 Te3[256] = {
-
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
-};
-static const u32 Te4[256] = {
-    0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
-    0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
-    0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
-    0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
-    0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
-    0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
-    0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
-    0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
-    0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
-    0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
-    0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
-    0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
-    0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
-    0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
-    0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
-    0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
-    0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
-    0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
-    0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
-    0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
-    0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
-    0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
-    0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
-    0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
-    0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
-    0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
-    0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
-    0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
-    0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
-    0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
-    0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
-    0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
-    0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
-    0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
-    0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
-    0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
-    0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
-    0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
-    0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
-    0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
-    0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
-    0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
-    0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
-    0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
-    0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
-    0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
-    0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
-    0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
-    0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
-    0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
-    0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
-    0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
-    0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
-    0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
-    0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
-    0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
-    0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
-    0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
-    0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
-    0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
-    0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
-    0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
-    0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
-    0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
-};
-static const u32 Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-};
-static const u32 Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
-};
-static const u32 Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
-};
-static const u32 Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
-};
-static const u32 Td4[256] = {
-    0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
-    0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
-    0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
-    0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
-    0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
-    0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
-    0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
-    0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
-    0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
-    0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
-    0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
-    0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
-    0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
-    0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
-    0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
-    0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
-    0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
-    0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
-    0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
-    0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
-    0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
-    0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
-    0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
-    0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
-    0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
-    0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
-    0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
-    0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
-    0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
-    0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
-    0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
-    0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
-    0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
-    0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
-    0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
-    0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
-    0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
-    0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
-    0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
-    0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
-    0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
-    0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
-    0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
-    0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
-    0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
-    0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
-    0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
-    0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
-    0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
-    0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
-    0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
-    0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
-    0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
-    0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
-    0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
-    0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
-    0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
-    0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
-    0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
-    0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
-    0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
-    0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
-    0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
-    0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
-};
-static const u32 rcon[] = {
-        0x01000000, 0x02000000, 0x04000000, 0x08000000,
-        0x10000000, 0x20000000, 0x40000000, 0x80000000,
-        0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-/**
- * Expand the cipher key into the encryption key schedule.
- */
-int AES_set_encrypt_key(const unsigned char *userKey,
-                        const FIPS_AES_SIZE_T bits, AES_KEY *key) {
-
-        u32 *rk;
-        int i = 0;
-        u32 temp;
-
-        if (!userKey || !key)
-                return -1;
-        if (bits != 128 && bits != 192 && bits != 256)
-                return -2;
-        if(FIPS_selftest_failed())
-                return -3;
-
-        rk = key->rd_key;
-
-        if (bits==128)
-                key->rounds = 10;
-        else if (bits==192)
-                key->rounds = 12;
-        else
-                key->rounds = 14;
-
-        rk[0] = GETU32(userKey     );
-        rk[1] = GETU32(userKey +  4);
-        rk[2] = GETU32(userKey +  8);
-        rk[3] = GETU32(userKey + 12);
-        if (bits == 128) {
-                while (1) {
-                        temp  = rk[3];
-                        rk[4] = rk[0] ^
-                                (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                                (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                                (Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                                (Te4[(temp >> 24)       ] & 0x000000ff) ^
-                                rcon[i];
-                        rk[5] = rk[1] ^ rk[4];
-                        rk[6] = rk[2] ^ rk[5];
-                        rk[7] = rk[3] ^ rk[6];
-                        if (++i == 10) {
-                                return 0;
-                        }
-                        rk += 4;
-                }
-        }
-        rk[4] = GETU32(userKey + 16);
-        rk[5] = GETU32(userKey + 20);
-        if (bits == 192) {
-                while (1) {
-                        temp = rk[ 5];
-                        rk[ 6] = rk[ 0] ^
-                                (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                                (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                                (Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                                (Te4[(temp >> 24)       ] & 0x000000ff) ^
-                                rcon[i];
-                        rk[ 7] = rk[ 1] ^ rk[ 6];
-                        rk[ 8] = rk[ 2] ^ rk[ 7];
-                        rk[ 9] = rk[ 3] ^ rk[ 8];
-                        if (++i == 8) {
-                                return 0;
-                        }
-                        rk[10] = rk[ 4] ^ rk[ 9];
-                        rk[11] = rk[ 5] ^ rk[10];
-                        rk += 6;
-                }
-        }
-        rk[6] = GETU32(userKey + 24);
-        rk[7] = GETU32(userKey + 28);
-        if (bits == 256) {
-                while (1) {
-                        temp = rk[ 7];
-                        rk[ 8] = rk[ 0] ^
-                                (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-                                (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                                (Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-                                (Te4[(temp >> 24)       ] & 0x000000ff) ^
-                                rcon[i];
-                        rk[ 9] = rk[ 1] ^ rk[ 8];
-                        rk[10] = rk[ 2] ^ rk[ 9];
-                        rk[11] = rk[ 3] ^ rk[10];
-                        if (++i == 7) {
-                                return 0;
-                        }
-                        temp = rk[11];
-                        rk[12] = rk[ 4] ^
-                                (Te4[(temp >> 24)       ] & 0xff000000) ^
-                                (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
-                                (Te4[(temp >>  8) & 0xff] & 0x0000ff00) ^
-                                (Te4[(temp      ) & 0xff] & 0x000000ff);
-                        rk[13] = rk[ 5] ^ rk[12];
-                        rk[14] = rk[ 6] ^ rk[13];
-                        rk[15] = rk[ 7] ^ rk[14];
-
-                        rk += 8;
-                }
-        }
-        return 0;
-}
-
-/**
- * Expand the cipher key into the decryption key schedule.
- */
-int AES_set_decrypt_key(const unsigned char *userKey,
-        const FIPS_AES_SIZE_T bits, AES_KEY *key) {
-
-        u32 *rk;
-        int i, j, status;
-        u32 temp;
-
-        /* first, start with an encryption schedule */
-        status = AES_set_encrypt_key(userKey, bits, key);
-        if (status < 0)
-                return status;
-
-        rk = key->rd_key;
-
-        /* invert the order of the round keys: */
-        for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-                temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-                temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-                temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-                temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-        }
-        /* apply the inverse MixColumn transform to all round keys but the first and the last: */
-        for (i = 1; i < (key->rounds); i++) {
-                rk += 4;
-                rk[0] =
-                        Td0[Te4[(rk[0] >> 24)       ] & 0xff] ^
-                        Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^
-                        Td2[Te4[(rk[0] >>  8) & 0xff] & 0xff] ^
-                        Td3[Te4[(rk[0]      ) & 0xff] & 0xff];
-                rk[1] =
-                        Td0[Te4[(rk[1] >> 24)       ] & 0xff] ^
-                        Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^
-                        Td2[Te4[(rk[1] >>  8) & 0xff] & 0xff] ^
-                        Td3[Te4[(rk[1]      ) & 0xff] & 0xff];
-                rk[2] =
-                        Td0[Te4[(rk[2] >> 24)       ] & 0xff] ^
-                        Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^
-                        Td2[Te4[(rk[2] >>  8) & 0xff] & 0xff] ^
-                        Td3[Te4[(rk[2]      ) & 0xff] & 0xff];
-                rk[3] =
-                        Td0[Te4[(rk[3] >> 24)       ] & 0xff] ^
-                        Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^
-                        Td2[Te4[(rk[3] >>  8) & 0xff] & 0xff] ^
-                        Td3[Te4[(rk[3]      ) & 0xff] & 0xff];
-        }
-        return 0;
-}
-
-/*
- * Encrypt a single block
- * in and out can overlap
- */
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key) {
-
-        const u32 *rk;
-        u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-        int r;
-#endif /* ?FULL_UNROLL */
-
-        assert(in && out && key);
-        rk = key->rd_key;
-
-        /*
-         * map byte array block to cipher state
-         * and add initial round key:
-         */
-        s0 = GETU32(in     ) ^ rk[0];
-        s1 = GETU32(in +  4) ^ rk[1];
-        s2 = GETU32(in +  8) ^ rk[2];
-        s3 = GETU32(in + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-        /* round 1: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
-        /* round 2: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
-        /* round 3: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
-        /* round 4: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
-        /* round 5: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
-        /* round 6: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
-        /* round 7: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
-        /* round 8: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
-        /* round 9: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
-            s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
-            s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
-            s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
-            t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
-            t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
-            t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
-        }
-    }
-    rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Te0[(s0 >> 24)       ] ^
-            Te1[(s1 >> 16) & 0xff] ^
-            Te2[(s2 >>  8) & 0xff] ^
-            Te3[(s3      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Te0[(s1 >> 24)       ] ^
-            Te1[(s2 >> 16) & 0xff] ^
-            Te2[(s3 >>  8) & 0xff] ^
-            Te3[(s0      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Te0[(s2 >> 24)       ] ^
-            Te1[(s3 >> 16) & 0xff] ^
-            Te2[(s0 >>  8) & 0xff] ^
-            Te3[(s1      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Te0[(s3 >> 24)       ] ^
-            Te1[(s0 >> 16) & 0xff] ^
-            Te2[(s1 >>  8) & 0xff] ^
-            Te3[(s2      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Te0[(t0 >> 24)       ] ^
-            Te1[(t1 >> 16) & 0xff] ^
-            Te2[(t2 >>  8) & 0xff] ^
-            Te3[(t3      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Te0[(t1 >> 24)       ] ^
-            Te1[(t2 >> 16) & 0xff] ^
-            Te2[(t3 >>  8) & 0xff] ^
-            Te3[(t0      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Te0[(t2 >> 24)       ] ^
-            Te1[(t3 >> 16) & 0xff] ^
-            Te2[(t0 >>  8) & 0xff] ^
-            Te3[(t1      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Te0[(t3 >> 24)       ] ^
-            Te1[(t0 >> 16) & 0xff] ^
-            Te2[(t1 >>  8) & 0xff] ^
-            Te3[(t2      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-         * apply last round and
-         * map cipher state to byte array block:
-         */
-        s0 =
-                (Te4[(t0 >> 24)       ] & 0xff000000) ^
-                (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-                (Te4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-                (Te4[(t3      ) & 0xff] & 0x000000ff) ^
-                rk[0];
-        PUTU32(out     , s0);
-        s1 =
-                (Te4[(t1 >> 24)       ] & 0xff000000) ^
-                (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-                (Te4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-                (Te4[(t0      ) & 0xff] & 0x000000ff) ^
-                rk[1];
-        PUTU32(out +  4, s1);
-        s2 =
-                (Te4[(t2 >> 24)       ] & 0xff000000) ^
-                (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-                (Te4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-                (Te4[(t1      ) & 0xff] & 0x000000ff) ^
-                rk[2];
-        PUTU32(out +  8, s2);
-        s3 =
-                (Te4[(t3 >> 24)       ] & 0xff000000) ^
-                (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-                (Te4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-                (Te4[(t2      ) & 0xff] & 0x000000ff) ^
-                rk[3];
-        PUTU32(out + 12, s3);
-}
-
-/*
- * Decrypt a single block
- * in and out can overlap
- */
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key) {
-
-        const u32 *rk;
-        u32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-        int r;
-#endif /* ?FULL_UNROLL */
-
-        assert(in && out && key);
-        rk = key->rd_key;
-
-        /*
-         * map byte array block to cipher state
-         * and add initial round key:
-         */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
-    s3 = GETU32(in + 12) ^ rk[3];
-#ifdef FULL_UNROLL
-    /* round 1: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
-    /* round 2: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
-    /* round 3: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
-    /* round 4: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
-    /* round 5: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
-    /* round 6: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
-    /* round 7: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
-    /* round 8: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
-    /* round 9: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
-        s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
-        s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
-        s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
-        t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
-        t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
-        t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
-            s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
-            s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
-            s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
-            t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
-            t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
-            t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
-        }
-    }
-        rk += key->rounds << 2;
-#else  /* !FULL_UNROLL */
-    /*
-     * Nr - 1 full rounds:
-     */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Td0[(s0 >> 24)       ] ^
-            Td1[(s3 >> 16) & 0xff] ^
-            Td2[(s2 >>  8) & 0xff] ^
-            Td3[(s1      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Td0[(s1 >> 24)       ] ^
-            Td1[(s0 >> 16) & 0xff] ^
-            Td2[(s3 >>  8) & 0xff] ^
-            Td3[(s2      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Td0[(s2 >> 24)       ] ^
-            Td1[(s1 >> 16) & 0xff] ^
-            Td2[(s0 >>  8) & 0xff] ^
-            Td3[(s3      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Td0[(s3 >> 24)       ] ^
-            Td1[(s2 >> 16) & 0xff] ^
-            Td2[(s1 >>  8) & 0xff] ^
-            Td3[(s0      ) & 0xff] ^
-            rk[7];
-
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
-
-        s0 =
-            Td0[(t0 >> 24)       ] ^
-            Td1[(t3 >> 16) & 0xff] ^
-            Td2[(t2 >>  8) & 0xff] ^
-            Td3[(t1      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Td0[(t1 >> 24)       ] ^
-            Td1[(t0 >> 16) & 0xff] ^
-            Td2[(t3 >>  8) & 0xff] ^
-            Td3[(t2      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Td0[(t2 >> 24)       ] ^
-            Td1[(t1 >> 16) & 0xff] ^
-            Td2[(t0 >>  8) & 0xff] ^
-            Td3[(t3      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Td0[(t3 >> 24)       ] ^
-            Td1[(t2 >> 16) & 0xff] ^
-            Td2[(t1 >>  8) & 0xff] ^
-            Td3[(t0      ) & 0xff] ^
-            rk[3];
-    }
-#endif /* ?FULL_UNROLL */
-    /*
-         * apply last round and
-         * map cipher state to byte array block:
-         */
-        s0 =
-                (Td4[(t0 >> 24)       ] & 0xff000000) ^
-                (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-                (Td4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-                (Td4[(t1      ) & 0xff] & 0x000000ff) ^
-                rk[0];
-        PUTU32(out     , s0);
-        s1 =
-                (Td4[(t1 >> 24)       ] & 0xff000000) ^
-                (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-                (Td4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-                (Td4[(t2      ) & 0xff] & 0x000000ff) ^
-                rk[1];
-        PUTU32(out +  4, s1);
-        s2 =
-                (Td4[(t2 >> 24)       ] & 0xff000000) ^
-                (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-                (Td4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-                (Td4[(t3      ) & 0xff] & 0x000000ff) ^
-                rk[2];
-        PUTU32(out +  8, s2);
-        s3 =
-                (Td4[(t3 >> 24)       ] & 0xff000000) ^
-                (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-                (Td4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-                (Td4[(t0      ) & 0xff] & 0x000000ff) ^
-                rk[3];
-        PUTU32(out + 12, s3);
-}
-
-#endif /* def OPENSSL_FIPS */
diff --git a/src/lib/libssl/src/fips-1.0/aes/fips_aes_selftest.c b/src/lib/libssl/src/fips-1.0/aes/fips_aes_selftest.c
deleted file mode 100644
index 0e53d21bd0..0000000000
--- a/src/lib/libssl/src/fips-1.0/aes/fips_aes_selftest.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/aes.h>
-
-#ifdef OPENSSL_FIPS
-static struct
-    {
-    unsigned char key[16];
-    unsigned char plaintext[16];
-    unsigned char ciphertext[16];
-    } tests[]=
-        {
-        {
-        { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-          0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F },
-        { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
-          0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF },
-        { 0x69,0xC4,0xE0,0xD8,0x6A,0x7B,0x04,0x30,
-          0xD8,0xCD,0xB7,0x80,0x70,0xB4,0xC5,0x5A },
-        },
-        };
-
-void FIPS_corrupt_aes()
-    {
-    tests[0].key[0]++;
-    }
-
-int FIPS_selftest_aes()
-    {
-    int n;
-
-    /* Encrypt and check against known ciphertext */
-    for(n=0 ; n < 1 ; ++n)
-        {
-        AES_KEY key;
-        unsigned char buf[16];
-
-        AES_set_encrypt_key(tests[n].key,128,&key);
-        AES_encrypt(tests[n].plaintext,buf,&key);
-        if(memcmp(buf,tests[n].ciphertext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_AES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-    /* Decrypt and check against known plaintext */
-    for(n=0 ; n < 1 ; ++n)
-        {
-        AES_KEY key;
-        unsigned char buf[16];
-
-        AES_set_decrypt_key(tests[n].key,128,&key);
-        AES_decrypt(tests[n].ciphertext,buf,&key);
-        if(memcmp(buf,tests[n].plaintext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_AES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-    return 1;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/aes/fips_aesavs.c b/src/lib/libssl/src/fips-1.0/aes/fips_aesavs.c
deleted file mode 100644
index 6bb9b899c8..0000000000
--- a/src/lib/libssl/src/fips-1.0/aes/fips_aesavs.c
+++ /dev/null
@@ -1,1005 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2004 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*---------------------------------------------
-  NIST AES Algorithm Validation Suite
-  Test Program
-
-  Donated to OpenSSL by:
-  V-ONE Corporation
-  20250 Century Blvd, Suite 300
-  Germantown, MD 20874
-  U.S.A.
-  ----------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <openssl/aes.h>
-#include <openssl/evp.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-#include "e_os.h"
-
-#define AES_BLOCK_SIZE 16
-
-#define VERBOSE 1
-
-/*-----------------------------------------------*/
-
-int AESTest(EVP_CIPHER_CTX *ctx,
-            char *amode, int akeysz, unsigned char *aKey, 
-            unsigned char *iVec, 
-            int dir,  /* 0 = decrypt, 1 = encrypt */
-            unsigned char *plaintext, unsigned char *ciphertext, int len)
-    {
-    const EVP_CIPHER *cipher = NULL;
-    int ret = 1;
-    int kt = 0;
-
-    if (ctx)
-        memset(ctx, 0, sizeof(EVP_CIPHER_CTX));
-
-    if (strcasecmp(amode, "CBC") == 0)
-        kt = 1000;
-    else if (strcasecmp(amode, "ECB") == 0)
-        kt = 2000;
-    else if (strcasecmp(amode, "CFB128") == 0)
-        kt = 3000;
-    else if (strncasecmp(amode, "OFB", 3) == 0)
-        kt = 4000;
-    else if(!strcasecmp(amode,"CFB1"))
-        kt=5000;
-    else if(!strcasecmp(amode,"CFB8"))
-        kt=6000;
-    else
-        {
-        printf("Unknown mode: %s\n", amode);
-        EXIT(1);
-        }
-    if (ret)
-        {
-        if ((akeysz != 128) && (akeysz != 192) && (akeysz != 256))
-            {
-            printf("Invalid key size: %d\n", akeysz);
-            ret = 0;
-            }
-        else
-            {
-            kt += akeysz;
-            switch (kt)
-                {
-            case 1128:  /* CBC 128 */
-                cipher = EVP_aes_128_cbc();
-                break;
-            case 1192:  /* CBC 192 */
-                cipher = EVP_aes_192_cbc();
-                break;
-            case 1256:  /* CBC 256 */
-                cipher = EVP_aes_256_cbc();
-                break;
-            case 2128:  /* ECB 128 */
-                cipher = EVP_aes_128_ecb();
-                break;
-            case 2192:  /* ECB 192 */
-                cipher = EVP_aes_192_ecb();
-                break;
-            case 2256:  /* ECB 256 */
-                cipher = EVP_aes_256_ecb();
-                break;
-            case 3128:  /* CFB 128 */
-                cipher = EVP_aes_128_cfb();
-                break;
-            case 3192:  /* CFB 192 */
-                cipher = EVP_aes_192_cfb();
-                break;
-            case 3256:  /* CFB 256 */
-                cipher = EVP_aes_256_cfb();
-                break;
-            case 4128:  /* OFB 128 */
-                cipher = EVP_aes_128_ofb();
-                break;
-            case 4192:  /* OFB 192 */
-                cipher = EVP_aes_192_ofb();
-                break;
-            case 4256:  /* OFB 256 */
-                cipher = EVP_aes_256_ofb();
-                break;
-            case 5128:
-                cipher=EVP_aes_128_cfb1();
-                break;
-            case 5192:
-                cipher=EVP_aes_192_cfb1();
-                break;
-            case 5256:
-                cipher=EVP_aes_256_cfb1();
-                break;
-            case 6128:
-                cipher=EVP_aes_128_cfb8();
-                break;
-            case 6192:
-                cipher=EVP_aes_192_cfb8();
-                break;
-            case 6256:
-                cipher=EVP_aes_256_cfb8();
-                break;
-            default:
-                printf("Didn't handle mode %d\n",kt);
-                EXIT(1);
-                }
-            if (dir)
-                { /* encrypt */
-                if(!EVP_CipherInit(ctx, cipher, aKey, iVec, AES_ENCRYPT))
-                    {
-                    ERR_print_errors_fp(stderr);
-                    EXIT(1);
-                    }
-                  
-                EVP_Cipher(ctx, ciphertext, (unsigned char*)plaintext, len);
-                }
-            else
-                { /* decrypt */
-                if(!EVP_CipherInit(ctx, cipher, aKey, iVec, AES_DECRYPT))
-                    {
-                    ERR_print_errors_fp(stderr);
-                    EXIT(1);
-                    }
-                EVP_Cipher(ctx, (unsigned char*)plaintext, ciphertext, len);
-                }
-            }
-        }
-    return ret;
-    }
-
-/*-----------------------------------------------*/
-
-int hex2bin(char *in, int len, unsigned char *out)
-{
-  int n1, n2;
-  unsigned char ch;
-
-  for (n1 = 0, n2 = 0; n1 < len; )
-    { /* first byte */
-      if ((in[n1] >= '0') && (in[n1] <= '9'))
-        ch = in[n1++] - '0';
-      else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-        ch = in[n1++] - 'A' + 10;
-      else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-        ch = in[n1++] - 'a' + 10;
-      else
-        return -1;
-      if(len == 1)
-          {
-          out[n2++]=ch;
-          break;
-          }
-      out[n2] = ch << 4;
-      /* second byte */
-      if ((in[n1] >= '0') && (in[n1] <= '9'))
-        ch = in[n1++] - '0';
-      else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-        ch = in[n1++] - 'A' + 10;
-      else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-        ch = in[n1++] - 'a' + 10;
-      else
-        return -1;
-      out[n2++] |= ch;
-    }
-  return n2;
-}
-
-/*-----------------------------------------------*/
-
-int bin2hex(unsigned char *in, int len, char *out)
-{
-  int n1, n2;
-  unsigned char ch;
-
-  for (n1 = 0, n2 = 0; n1 < len; ++n1)
-    {
-      /* first nibble */
-      ch = in[n1] >> 4;
-      if (ch <= 0x09)
-        out[n2++] = ch + '0';
-      else
-        out[n2++] = ch - 10 + 'a';
-      /* second nibble */
-      ch = in[n1] & 0x0f;
-      if (ch <= 0x09)
-        out[n2++] = ch + '0';
-      else
-        out[n2++] = ch - 10 + 'a';
-    }
-  return n2;
-}
-
-/* NB: this return the number of _bits_ read */
-int bint2bin(const char *in, int len, unsigned char *out)
-    {
-    int n;
-
-    memset(out,0,len);
-    for(n=0 ; n < len ; ++n)
-        if(in[n] == '1')
-            out[n/8]|=(0x80 >> (n%8));
-    return len;
-    }
-
-int bin2bint(const unsigned char *in,int len,char *out)
-    {
-    int n;
-
-    for(n=0 ; n < len ; ++n)
-        out[n]=(in[n/8]&(0x80 >> (n%8))) ? '1' : '0';
-    return n;
-    }
-
-/*-----------------------------------------------*/
-
-void PrintValue(char *tag, unsigned char *val, int len)
-{
-#if VERBOSE
-  char obuf[2048];
-  int olen;
-  olen = bin2hex(val, len, obuf);
-  printf("%s = %.*s\n", tag, olen, obuf);
-#endif
-}
-
-void OutputValue(char *tag, unsigned char *val, int len, FILE *rfp,int bitmode)
-    {
-    char obuf[2048];
-    int olen;
-
-    if(bitmode)
-        olen=bin2bint(val,len,obuf);
-    else
-        olen=bin2hex(val,len,obuf);
-
-    fprintf(rfp, "%s = %.*s\n", tag, olen, obuf);
-#if VERBOSE
-    printf("%s = %.*s\n", tag, olen, obuf);
-#endif
-    }
-
-/*-----------------------------------------------*/
-char *t_tag[2] = {"PLAINTEXT", "CIPHERTEXT"};
-char *t_mode[6] = {"CBC","ECB","OFB","CFB1","CFB8","CFB128"};
-enum Mode {CBC, ECB, OFB, CFB1, CFB8, CFB128};
-enum XCrypt {XDECRYPT, XENCRYPT};
-
-/*=============================*/
-/*  Monte Carlo Tests          */
-/*-----------------------------*/
-
-/*#define gb(a,b) (((a)[(b)/8] >> ((b)%8))&1)*/
-/*#define sb(a,b,v) ((a)[(b)/8]=((a)[(b)/8]&~(1 << ((b)%8)))|(!!(v) << ((b)%8)))*/
-
-#define gb(a,b) (((a)[(b)/8] >> (7-(b)%8))&1)
-#define sb(a,b,v) ((a)[(b)/8]=((a)[(b)/8]&~(1 << (7-(b)%8)))|(!!(v) << (7-(b)%8)))
-
-int do_mct(char *amode, 
-           int akeysz, unsigned char *aKey,unsigned char *iVec,
-           int dir, unsigned char *text, int len,
-           FILE *rfp)
-    {
-    int ret = 0;
-    unsigned char key[101][32];
-    unsigned char iv[101][AES_BLOCK_SIZE];
-    unsigned char ptext[1001][32];
-    unsigned char ctext[1001][32];
-    unsigned char ciphertext[64+4];
-    int i, j, n, n1, n2;
-    int imode = 0, nkeysz = akeysz/8;
-    EVP_CIPHER_CTX ctx;
-
-    if (len > 32)
-        {
-        printf("\n>>>> Length exceeds 32 for %s %d <<<<\n\n", 
-               amode, akeysz);
-        return -1;
-        }
-    for (imode = 0; imode < 6; ++imode)
-        if (strcmp(amode, t_mode[imode]) == 0)
-            break;
-    if (imode == 6)
-        { 
-        printf("Unrecognized mode: %s\n", amode);
-        return -1;
-        }
-
-    memcpy(key[0], aKey, nkeysz);
-    if (iVec)
-        memcpy(iv[0], iVec, AES_BLOCK_SIZE);
-    if (dir == XENCRYPT)
-        memcpy(ptext[0], text, len);
-    else
-        memcpy(ctext[0], text, len);
-    for (i = 0; i < 100; ++i)
-        {
-        /* printf("Iteration %d\n", i); */
-        if (i > 0)
-            {
-            fprintf(rfp,"COUNT = %d\n",i);
-            OutputValue("KEY",key[i],nkeysz,rfp,0);
-            if (imode != ECB)  /* ECB */
-                OutputValue("IV",iv[i],AES_BLOCK_SIZE,rfp,0);
-            /* Output Ciphertext | Plaintext */
-            OutputValue(t_tag[dir^1],dir ? ptext[0] : ctext[0],len,rfp,
-                        imode == CFB1);
-            }
-        for (j = 0; j < 1000; ++j)
-            {
-            switch (imode)
-                {
-            case ECB:
-                if (j == 0)
-                    { /* set up encryption */
-                    ret = AESTest(&ctx, amode, akeysz, key[i], NULL, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  ptext[j], ctext[j], len);
-                    if (dir == XENCRYPT)
-                        memcpy(ptext[j+1], ctext[j], len);
-                    else
-                        memcpy(ctext[j+1], ptext[j], len);
-                    }
-                else
-                    {
-                    if (dir == XENCRYPT)
-                        {
-                        EVP_Cipher(&ctx, ctext[j], ptext[j], len);
-                        memcpy(ptext[j+1], ctext[j], len);
-                        }
-                    else
-                        {
-                        EVP_Cipher(&ctx, ptext[j], ctext[j], len);
-                        memcpy(ctext[j+1], ptext[j], len);
-                        }
-                    }
-                break;
-
-            case CBC:
-            case OFB:  
-            case CFB128:
-                if (j == 0)
-                    {
-                    ret = AESTest(&ctx, amode, akeysz, key[i], iv[i], 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  ptext[j], ctext[j], len);
-                    if (dir == XENCRYPT)
-                        memcpy(ptext[j+1], iv[i], len);
-                    else
-                        memcpy(ctext[j+1], iv[i], len);
-                    }
-                else
-                    {
-                    if (dir == XENCRYPT)
-                        {
-                        EVP_Cipher(&ctx, ctext[j], ptext[j], len);
-                        memcpy(ptext[j+1], ctext[j-1], len);
-                        }
-                    else
-                        {
-                        EVP_Cipher(&ctx, ptext[j], ctext[j], len);
-                        memcpy(ctext[j+1], ptext[j-1], len);
-                        }
-                    }
-                break;
-
-            case CFB8:
-                if (j == 0)
-                    {
-                    ret = AESTest(&ctx, amode, akeysz, key[i], iv[i], 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  ptext[j], ctext[j], len);
-                    }
-                else
-                    {
-                    if (dir == XENCRYPT)
-                        EVP_Cipher(&ctx, ctext[j], ptext[j], len);
-                    else
-                        EVP_Cipher(&ctx, ptext[j], ctext[j], len);
-                    }
-                if (dir == XENCRYPT)
-                    {
-                    if (j < 16)
-                        memcpy(ptext[j+1], &iv[i][j], len);
-                    else
-                        memcpy(ptext[j+1], ctext[j-16], len);
-                    }
-                else
-                    {
-                    if (j < 16)
-                        memcpy(ctext[j+1], &iv[i][j], len);
-                    else
-                        memcpy(ctext[j+1], ptext[j-16], len);
-                    }
-                break;
-
-            case CFB1:
-                if(j == 0)
-                    {
-                    /* compensate for wrong endianness of input file */
-                    if(i == 0)
-                        ptext[0][0]<<=7;
-                    ret=AESTest(&ctx,amode,akeysz,key[i],iv[i],dir,
-                                ptext[j], ctext[j], len);
-                    }
-                else
-                    {
-                    if (dir == XENCRYPT)
-                        EVP_Cipher(&ctx, ctext[j], ptext[j], len);
-                    else
-                        EVP_Cipher(&ctx, ptext[j], ctext[j], len);
-
-                    }
-                if(dir == XENCRYPT)
-                    {
-                    if(j < 128)
-                        sb(ptext[j+1],0,gb(iv[i],j));
-                    else
-                        sb(ptext[j+1],0,gb(ctext[j-128],0));
-                    }
-                else
-                    {
-                    if(j < 128)
-                        sb(ctext[j+1],0,gb(iv[i],j));
-                    else
-                        sb(ctext[j+1],0,gb(ptext[j-128],0));
-                    }
-                break;
-                }
-            }
-        --j; /* reset to last of range */
-        /* Output Ciphertext | Plaintext */
-        OutputValue(t_tag[dir],dir ? ctext[j] : ptext[j],len,rfp,
-                    imode == CFB1);
-        fprintf(rfp, "\n");  /* add separator */
-
-        /* Compute next KEY */
-        if (dir == XENCRYPT)
-            {
-            if (imode == CFB8)
-                { /* ct = CT[j-15] || CT[j-14] || ... || CT[j] */
-                for (n1 = 0, n2 = nkeysz-1; n1 < nkeysz; ++n1, --n2)
-                    ciphertext[n1] = ctext[j-n2][0];
-                }
-            else if(imode == CFB1)
-                {
-                for(n1=0,n2=akeysz-1 ; n1 < akeysz ; ++n1,--n2)
-                    sb(ciphertext,n1,gb(ctext[j-n2],0));
-                }
-            else
-                switch (akeysz)
-                    {
-                case 128:
-                    memcpy(ciphertext, ctext[j], 16);
-                    break;
-                case 192:
-                    memcpy(ciphertext, ctext[j-1]+8, 8);
-                    memcpy(ciphertext+8, ctext[j], 16);
-                    break;
-                case 256:
-                    memcpy(ciphertext, ctext[j-1], 16);
-                    memcpy(ciphertext+16, ctext[j], 16);
-                    break;
-                    }
-            }
-        else
-            {
-            if (imode == CFB8)
-                { /* ct = CT[j-15] || CT[j-14] || ... || CT[j] */
-                for (n1 = 0, n2 = nkeysz-1; n1 < nkeysz; ++n1, --n2)
-                    ciphertext[n1] = ptext[j-n2][0];
-                }
-            else if(imode == CFB1)
-                {
-                for(n1=0,n2=akeysz-1 ; n1 < akeysz ; ++n1,--n2)
-                    sb(ciphertext,n1,gb(ptext[j-n2],0));
-                }
-            else
-                switch (akeysz)
-                    {
-                case 128:
-                    memcpy(ciphertext, ptext[j], 16);
-                    break;
-                case 192:
-                    memcpy(ciphertext, ptext[j-1]+8, 8);
-                    memcpy(ciphertext+8, ptext[j], 16);
-                    break;
-                case 256:
-                    memcpy(ciphertext, ptext[j-1], 16);
-                    memcpy(ciphertext+16, ptext[j], 16);
-                    break;
-                    }
-            }
-        /* Compute next key: Key[i+1] = Key[i] xor ct */
-        for (n = 0; n < nkeysz; ++n)
-            key[i+1][n] = key[i][n] ^ ciphertext[n];
-        
-        /* Compute next IV and text */
-        if (dir == XENCRYPT)
-            {
-            switch (imode)
-                {
-            case ECB:
-                memcpy(ptext[0], ctext[j], AES_BLOCK_SIZE);
-                break;
-            case CBC:
-            case OFB:
-            case CFB128:
-                memcpy(iv[i+1], ctext[j], AES_BLOCK_SIZE);
-                memcpy(ptext[0], ctext[j-1], AES_BLOCK_SIZE);
-                break;
-            case CFB8:
-                /* IV[i+1] = ct */
-                for (n1 = 0, n2 = 15; n1 < 16; ++n1, --n2)
-                    iv[i+1][n1] = ctext[j-n2][0];
-                ptext[0][0] = ctext[j-16][0];
-                break;
-            case CFB1:
-                for(n1=0,n2=127 ; n1 < 128 ; ++n1,--n2)
-                    sb(iv[i+1],n1,gb(ctext[j-n2],0));
-                ptext[0][0]=ctext[j-128][0]&0x80;
-                break;
-                }
-            }
-        else
-            {
-            switch (imode)
-                {
-            case ECB:
-                memcpy(ctext[0], ptext[j], AES_BLOCK_SIZE);
-                break;
-            case CBC:
-            case OFB:
-            case CFB128:
-                memcpy(iv[i+1], ptext[j], AES_BLOCK_SIZE);
-                memcpy(ctext[0], ptext[j-1], AES_BLOCK_SIZE);
-                break;
-            case CFB8:
-                for (n1 = 0, n2 = 15; n1 < 16; ++n1, --n2)
-                    iv[i+1][n1] = ptext[j-n2][0];
-                ctext[0][0] = ptext[j-16][0];
-                break;
-            case CFB1:
-                for(n1=0,n2=127 ; n1 < 128 ; ++n1,--n2)
-                    sb(iv[i+1],n1,gb(ptext[j-n2],0));
-                ctext[0][0]=ptext[j-128][0]&0x80;
-                break;
-                }
-            }
-        }
-    
-    return ret;
-    }
-
-/*================================================*/
-/*----------------------------
-  # Config info for v-one
-  # AESVS MMT test data for ECB
-  # State : Encrypt and Decrypt
-  # Key Length : 256
-  # Fri Aug 30 04:07:22 PM
-  ----------------------------*/
-
-int proc_file(char *rqfile)
-    {
-    char afn[256], rfn[256];
-    FILE *afp = NULL, *rfp = NULL;
-    char ibuf[2048];
-    int ilen, len, ret = 0;
-    char algo[8] = "";
-    char amode[8] = "";
-    char atest[8] = "";
-    int akeysz = 0;
-    unsigned char iVec[20], aKey[40];
-    int dir = -1, err = 0, step = 0;
-    unsigned char plaintext[2048];
-    unsigned char ciphertext[2048];
-    char *rp;
-    EVP_CIPHER_CTX ctx;
-
-    if (!rqfile || !(*rqfile))
-        {
-        printf("No req file\n");
-        return -1;
-        }
-    strcpy(afn, rqfile);
-
-    if ((afp = fopen(afn, "r")) == NULL)
-        {
-        printf("Cannot open file: %s, %s\n", 
-               afn, strerror(errno));
-        return -1;
-        }
-    strcpy(rfn,afn);
-    rp=strstr(rfn,"req/");
-    assert(rp);
-    memcpy(rp,"rsp",3);
-    rp = strstr(rfn, ".req");
-    memcpy(rp, ".rsp", 4);
-    if ((rfp = fopen(rfn, "w")) == NULL)
-        {
-        printf("Cannot open file: %s, %s\n", 
-               rfn, strerror(errno));
-        fclose(afp);
-        afp = NULL;
-        return -1;
-        }
-    while (!err && (fgets(ibuf, sizeof(ibuf), afp)) != NULL)
-        {
-        ilen = strlen(ibuf);
-        /*      printf("step=%d ibuf=%s",step,ibuf); */
-        switch (step)
-            {
-        case 0:  /* read preamble */
-            if (ibuf[0] == '\n')
-                { /* end of preamble */
-                if ((*algo == '\0') ||
-                    (*amode == '\0') ||
-                    (akeysz == 0))
-                    {
-                    printf("Missing Algorithm, Mode or KeySize (%s/%s/%d)\n",
-                           algo,amode,akeysz);
-                    err = 1;
-                    }
-                else
-                    {
-                    fputs(ibuf, rfp);
-                    ++ step;
-                    }
-                }
-            else if (ibuf[0] != '#')
-                {
-                printf("Invalid preamble item: %s\n", ibuf);
-                err = 1;
-                }
-            else
-                { /* process preamble */
-                char *xp, *pp = ibuf+2;
-                int n;
-                if (akeysz)
-                    { /* insert current time & date */
-                    time_t rtim = time(0);
-                    fprintf(rfp, "# %s", ctime(&rtim));
-                    }
-                else
-                    {
-                    fputs(ibuf, rfp);
-                    if (strncmp(pp, "AESVS ", 6) == 0)
-                        {
-                        strcpy(algo, "AES");
-                        /* get test type */
-                        pp += 6;
-                        xp = strchr(pp, ' ');
-                        n = xp-pp;
-                        strncpy(atest, pp, n);
-                        atest[n] = '\0';
-                        /* get mode */
-                        xp = strrchr(pp, ' '); /* get mode" */
-                        n = strlen(xp+1)-1;
-                        strncpy(amode, xp+1, n);
-                        amode[n] = '\0';
-                        /* amode[3] = '\0'; */
-                        printf("Test = %s, Mode = %s\n", atest, amode);
-                        }
-                    else if (strncasecmp(pp, "Key Length : ", 13) == 0)
-                        {
-                        akeysz = atoi(pp+13);
-                        printf("Key size = %d\n", akeysz);
-                        }
-                    }
-                }
-            break;
-
-        case 1:  /* [ENCRYPT] | [DECRYPT] */
-            if (ibuf[0] == '[')
-                {
-                fputs(ibuf, rfp);
-                ++step;
-                if (strncasecmp(ibuf, "[ENCRYPT]", 9) == 0)
-                    dir = 1;
-                else if (strncasecmp(ibuf, "[DECRYPT]", 9) == 0)
-                    dir = 0;
-                else
-                    {
-                    printf("Invalid keyword: %s\n", ibuf);
-                    err = 1;
-                    }
-                break;
-                }
-            else if (dir == -1)
-                {
-                err = 1;
-                printf("Missing ENCRYPT/DECRYPT keyword\n");
-                break;
-                }
-            else 
-                step = 2;
-
-        case 2: /* KEY = xxxx */
-            fputs(ibuf, rfp);
-            if(*ibuf == '\n')
-                break;
-            if(!strncasecmp(ibuf,"COUNT = ",8))
-                break;
-
-            if (strncasecmp(ibuf, "KEY = ", 6) != 0)
-                {
-                printf("Missing KEY\n");
-                err = 1;
-                }
-            else
-                {
-                len = hex2bin((char*)ibuf+6, strlen(ibuf+6)-1, aKey);
-                if (len < 0)
-                    {
-                    printf("Invalid KEY\n");
-                    err =1;
-                    break;
-                    }
-                PrintValue("KEY", aKey, len);
-                if (strcmp(amode, "ECB") == 0)
-                    {
-                    memset(iVec, 0, sizeof(iVec));
-                    step = (dir)? 4: 5;  /* no ivec for ECB */
-                    }
-                else
-                    ++step;
-                }
-            break;
-
-        case 3: /* IV = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "IV = ", 5) != 0)
-                {
-                printf("Missing IV\n");
-                err = 1;
-                }
-            else
-                {
-                len = hex2bin((char*)ibuf+5, strlen(ibuf+5)-1, iVec);
-                if (len < 0)
-                    {
-                    printf("Invalid IV\n");
-                    err =1;
-                    break;
-                    }
-                PrintValue("IV", iVec, len);
-                step = (dir)? 4: 5;
-                }
-            break;
-
-        case 4: /* PLAINTEXT = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "PLAINTEXT = ", 12) != 0)
-                {
-                printf("Missing PLAINTEXT\n");
-                err = 1;
-                }
-            else
-                {
-                int nn = strlen(ibuf+12);
-                if(!strcmp(amode,"CFB1"))
-                    len=bint2bin(ibuf+12,nn-1,plaintext);
-                else
-                    len=hex2bin(ibuf+12, nn-1,plaintext);
-                if (len < 0)
-                    {
-                    printf("Invalid PLAINTEXT: %s", ibuf+12);
-                    err =1;
-                    break;
-                    }
-                if (len >= sizeof(plaintext))
-                    {
-                    printf("Buffer overflow\n");
-                    }
-                PrintValue("PLAINTEXT", (unsigned char*)plaintext, len);
-                if (strcmp(atest, "MCT") == 0)  /* Monte Carlo Test */
-                    {
-                    if(do_mct(amode, akeysz, aKey, iVec, 
-                              dir, (unsigned char*)plaintext, len, 
-                              rfp) < 0)
-                        EXIT(1);
-                    }
-                else
-                    {
-                    ret = AESTest(&ctx, amode, akeysz, aKey, iVec, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  plaintext, ciphertext, len);
-                    OutputValue("CIPHERTEXT",ciphertext,len,rfp,
-                                !strcmp(amode,"CFB1"));
-                    }
-                step = 6;
-                }
-            break;
-
-        case 5: /* CIPHERTEXT = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "CIPHERTEXT = ", 13) != 0)
-                {
-                printf("Missing KEY\n");
-                err = 1;
-                }
-            else
-                {
-                if(!strcmp(amode,"CFB1"))
-                    len=bint2bin(ibuf+13,strlen(ibuf+13)-1,ciphertext);
-                else
-                    len = hex2bin(ibuf+13,strlen(ibuf+13)-1,ciphertext);
-                if (len < 0)
-                    {
-                    printf("Invalid CIPHERTEXT\n");
-                    err =1;
-                    break;
-                    }
-
-                PrintValue("CIPHERTEXT", ciphertext, len);
-                if (strcmp(atest, "MCT") == 0)  /* Monte Carlo Test */
-                    {
-                    do_mct(amode, akeysz, aKey, iVec, 
-                           dir, ciphertext, len, rfp);
-                    }
-                else
-                    {
-                    ret = AESTest(&ctx, amode, akeysz, aKey, iVec, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  plaintext, ciphertext, len);
-                    OutputValue("PLAINTEXT",(unsigned char *)plaintext,len,rfp,
-                                !strcmp(amode,"CFB1"));
-                    }
-                step = 6;
-                }
-            break;
-
-        case 6:
-            if (ibuf[0] != '\n')
-                {
-                err = 1;
-                printf("Missing terminator\n");
-                }
-            else if (strcmp(atest, "MCT") != 0)
-                { /* MCT already added terminating nl */
-                fputs(ibuf, rfp);
-                }
-            step = 1;
-            break;
-            }
-        }
-    if (rfp)
-        fclose(rfp);
-    if (afp)
-        fclose(afp);
-    return err;
-    }
-
-/*--------------------------------------------------
-  Processes either a single file or 
-  a set of files whose names are passed in a file.
-  A single file is specified as:
-    aes_test -f xxx.req
-  A set of files is specified as:
-    aes_test -d xxxxx.xxx
-  The default is: -d req.txt
---------------------------------------------------*/
-int main(int argc, char **argv)
-    {
-    char *rqlist = "req.txt";
-    FILE *fp = NULL;
-    char fn[250] = "", rfn[256] = "";
-    int f_opt = 0, d_opt = 1;
-
-#ifdef OPENSSL_FIPS
-    if(!FIPS_mode_set(1))
-        {
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        EXIT(1);
-        }
-#endif
-    ERR_load_crypto_strings();
-    if (argc > 1)
-        {
-        if (strcasecmp(argv[1], "-d") == 0)
-            {
-            d_opt = 1;
-            }
-        else if (strcasecmp(argv[1], "-f") == 0)
-            {
-            f_opt = 1;
-            d_opt = 0;
-            }
-        else
-            {
-            printf("Invalid parameter: %s\n", argv[1]);
-            return 0;
-            }
-        if (argc < 3)
-            {
-            printf("Missing parameter\n");
-            return 0;
-            }
-        if (d_opt)
-            rqlist = argv[2];
-        else
-            strcpy(fn, argv[2]);
-        }
-    if (d_opt)
-        { /* list of files (directory) */
-        if (!(fp = fopen(rqlist, "r")))
-            {
-            printf("Cannot open req list file\n");
-            return -1;
-            }
-        while (fgets(fn, sizeof(fn), fp))
-            {
-            strtok(fn, "\r\n");
-            strcpy(rfn, fn);
-            printf("Processing: %s\n", rfn);
-            if (proc_file(rfn))
-                {
-                printf(">>> Processing failed for: %s <<<\n", rfn);
-                EXIT(1);
-                }
-            }
-        fclose(fp);
-        }
-    else /* single file */
-        {
-        printf("Processing: %s\n", fn);
-        if (proc_file(fn))
-            {
-            printf(">>> Processing failed for: %s <<<\n", fn);
-            }
-        }
-    EXIT(0);
-    return 0;
-    }
diff --git a/src/lib/libssl/src/fips-1.0/des/Makefile b/src/lib/libssl/src/fips-1.0/des/Makefile
deleted file mode 100644
index 772d775790..0000000000
--- a/src/lib/libssl/src/fips-1.0/des/Makefile
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# OpenSSL/fips-1.0/des/Makefile
-#
-
-DIR=    des
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-FIPS_DES_ENC=fips_des_enc.o
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST= fips_desmovs.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_des_enc.c asm/fips-dx86-elf.s fips_des_selftest.c fips_set_key.c
-LIBOBJ=$(FIPS_DES_ENC) fips_des_selftest.o fips_set_key.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER) fips_des_locl.h
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    lib
-
-lib:    $(LIBOBJ)
-        @echo $(LIBOBJ) > lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-fips_test:
-        -find ../testvectors/tdes/req -name '*.req' > testlist
-        -rm -rf ../testvectors/tdes/rsp
-        mkdir ../testvectors/tdes/rsp
-        if [ -s testlist ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_desmovs -d testlist; fi
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) \
-                $(SRC) $(TEST)
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_des_enc.o: ../../e_os.h ../../include/openssl/crypto.h
-fips_des_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/fips.h
-fips_des_enc.o: ../../include/openssl/opensslconf.h
-fips_des_enc.o: ../../include/openssl/opensslv.h
-fips_des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_des_enc.o: ../../include/openssl/ui_compat.h fips_des_enc.c
-fips_des_enc.o: fips_des_locl.h
-fips_des_selftest.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_des_selftest.o: ../../include/openssl/des.h
-fips_des_selftest.o: ../../include/openssl/des_old.h
-fips_des_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_des_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_des_selftest.o: ../../include/openssl/opensslconf.h
-fips_des_selftest.o: ../../include/openssl/opensslv.h
-fips_des_selftest.o: ../../include/openssl/safestack.h
-fips_des_selftest.o: ../../include/openssl/stack.h
-fips_des_selftest.o: ../../include/openssl/symhacks.h
-fips_des_selftest.o: ../../include/openssl/ui.h
-fips_des_selftest.o: ../../include/openssl/ui_compat.h fips_des_selftest.c
-fips_desmovs.o: ../../e_os.h ../../include/openssl/aes.h
-fips_desmovs.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_desmovs.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-fips_desmovs.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-fips_desmovs.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_desmovs.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-fips_desmovs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_desmovs.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_desmovs.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-fips_desmovs.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-fips_desmovs.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-fips_desmovs.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-fips_desmovs.o: ../../include/openssl/opensslconf.h
-fips_desmovs.o: ../../include/openssl/opensslv.h
-fips_desmovs.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h
-fips_desmovs.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-fips_desmovs.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-fips_desmovs.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-fips_desmovs.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_desmovs.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_desmovs.o: fips_desmovs.c
-fips_set_key.o: ../../e_os.h ../../include/openssl/crypto.h
-fips_set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/fips.h
-fips_set_key.o: ../../include/openssl/opensslconf.h
-fips_set_key.o: ../../include/openssl/opensslv.h
-fips_set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_set_key.o: ../../include/openssl/ui_compat.h fips_des_locl.h
-fips_set_key.o: fips_set_key.c
diff --git a/src/lib/libssl/src/fips-1.0/des/asm/fips-dx86-elf.s b/src/lib/libssl/src/fips-1.0/des/asm/fips-dx86-elf.s
deleted file mode 100644
index 7b4b11f0f3..0000000000
--- a/src/lib/libssl/src/fips-1.0/des/asm/fips-dx86-elf.s
+++ /dev/null
@@ -1,2707 +0,0 @@
-
-
-
-
-
-
-        .file   "des-586.s"
-        .version        "01.01"
-gcc2_compiled.:
-.text
-        .align 16
-.globl DES_encrypt1
-        .type   DES_encrypt1,@function
-DES_encrypt1:
-        pushl   %esi
-        pushl   %edi
-
-
-        movl    12(%esp),       %esi
-        xorl    %ecx,           %ecx
-        pushl   %ebx
-        pushl   %ebp
-        movl    (%esi),         %eax
-        movl    28(%esp),       %ebx
-        movl    4(%esi),        %edi
-
-
-        roll    $4,             %eax
-        movl    %eax,           %esi
-        xorl    %edi,           %eax
-        andl    $0xf0f0f0f0,    %eax
-        xorl    %eax,           %esi
-        xorl    %eax,           %edi
-
-        roll    $20,            %edi
-        movl    %edi,           %eax
-        xorl    %esi,           %edi
-        andl    $0xfff0000f,    %edi
-        xorl    %edi,           %eax
-        xorl    %edi,           %esi
-
-        roll    $14,            %eax
-        movl    %eax,           %edi
-        xorl    %esi,           %eax
-        andl    $0x33333333,    %eax
-        xorl    %eax,           %edi
-        xorl    %eax,           %esi
-
-        roll    $22,            %esi
-        movl    %esi,           %eax
-        xorl    %edi,           %esi
-        andl    $0x03fc03fc,    %esi
-        xorl    %esi,           %eax
-        xorl    %esi,           %edi
-
-        roll    $9,             %eax
-        movl    %eax,           %esi
-        xorl    %edi,           %eax
-        andl    $0xaaaaaaaa,    %eax
-        xorl    %eax,           %esi
-        xorl    %eax,           %edi
-
-.byte 209
-.byte 199       
-        .align  8
-        call    .L000PIC_me_up
-.L000PIC_me_up:
-        popl    %ebp
-        addl    $_GLOBAL_OFFSET_TABLE_+[.-.L000PIC_me_up],%ebp
-        movl    DES_SPtrans@GOT(%ebp),%ebp
-        movl    24(%esp),       %ecx
-        cmpl    $0,             %ebx
-        je      .L001start_decrypt
-
-
-        movl    (%ecx),         %eax
-        xorl    %ebx,           %ebx
-        movl    4(%ecx),        %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    8(%ecx),        %eax
-        xorl    %ebx,           %ebx
-        movl    12(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    16(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    20(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    24(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    28(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    32(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    36(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    40(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    44(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    48(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    52(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    56(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    60(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    64(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    68(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    72(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    76(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    80(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    84(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    88(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    92(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    96(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    100(%ecx),      %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    104(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    108(%ecx),      %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    112(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    116(%ecx),      %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    120(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    124(%ecx),      %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-        jmp     .L002end
-.L001start_decrypt:
-
-
-        movl    120(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    124(%ecx),      %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    112(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    116(%ecx),      %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    104(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    108(%ecx),      %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    96(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    100(%ecx),      %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    88(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    92(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    80(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    84(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    72(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    76(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    64(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    68(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    56(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    60(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    48(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    52(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    40(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    44(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    32(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    36(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    24(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    28(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    16(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    20(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    8(%ecx),        %eax
-        xorl    %ebx,           %ebx
-        movl    12(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    (%ecx),         %eax
-        xorl    %ebx,           %ebx
-        movl    4(%ecx),        %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-.L002end:
-
-
-        movl    20(%esp),       %edx
-.byte 209
-.byte 206       
-        movl    %edi,           %eax
-        xorl    %esi,           %edi
-        andl    $0xaaaaaaaa,    %edi
-        xorl    %edi,           %eax
-        xorl    %edi,           %esi
-
-        roll    $23,            %eax
-        movl    %eax,           %edi
-        xorl    %esi,           %eax
-        andl    $0x03fc03fc,    %eax
-        xorl    %eax,           %edi
-        xorl    %eax,           %esi
-
-        roll    $10,            %edi
-        movl    %edi,           %eax
-        xorl    %esi,           %edi
-        andl    $0x33333333,    %edi
-        xorl    %edi,           %eax
-        xorl    %edi,           %esi
-
-        roll    $18,            %esi
-        movl    %esi,           %edi
-        xorl    %eax,           %esi
-        andl    $0xfff0000f,    %esi
-        xorl    %esi,           %edi
-        xorl    %esi,           %eax
-
-        roll    $12,            %edi
-        movl    %edi,           %esi
-        xorl    %eax,           %edi
-        andl    $0xf0f0f0f0,    %edi
-        xorl    %edi,           %esi
-        xorl    %edi,           %eax
-
-        rorl    $4,             %eax
-        movl    %eax,           (%edx)
-        movl    %esi,           4(%edx)
-        popl    %ebp
-        popl    %ebx
-        popl    %edi
-        popl    %esi
-        ret
-.L_DES_encrypt1_end:
-        .size   DES_encrypt1,.L_DES_encrypt1_end-DES_encrypt1
-.ident  "desasm.pl"
-.text
-        .align 16
-.globl DES_encrypt2
-        .type   DES_encrypt2,@function
-DES_encrypt2:
-        pushl   %esi
-        pushl   %edi
-
-
-        movl    12(%esp),       %eax
-        xorl    %ecx,           %ecx
-        pushl   %ebx
-        pushl   %ebp
-        movl    (%eax),         %esi
-        movl    28(%esp),       %ebx
-        roll    $3,             %esi
-        movl    4(%eax),        %edi
-        roll    $3,             %edi
-        .align  8
-        call    .L003PIC_me_up
-.L003PIC_me_up:
-        popl    %ebp
-        addl    $_GLOBAL_OFFSET_TABLE_+[.-.L003PIC_me_up],%ebp
-        movl    DES_SPtrans@GOT(%ebp),%ebp
-        movl    24(%esp),       %ecx
-        cmpl    $0,             %ebx
-        je      .L004start_decrypt
-
-
-        movl    (%ecx),         %eax
-        xorl    %ebx,           %ebx
-        movl    4(%ecx),        %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    8(%ecx),        %eax
-        xorl    %ebx,           %ebx
-        movl    12(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    16(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    20(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    24(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    28(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    32(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    36(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    40(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    44(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    48(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    52(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    56(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    60(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    64(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    68(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    72(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    76(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    80(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    84(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    88(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    92(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    96(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    100(%ecx),      %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    104(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    108(%ecx),      %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    112(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    116(%ecx),      %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    120(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    124(%ecx),      %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-        jmp     .L005end
-.L004start_decrypt:
-
-
-        movl    120(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    124(%ecx),      %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    112(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    116(%ecx),      %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    104(%ecx),      %eax
-        xorl    %ebx,           %ebx
-        movl    108(%ecx),      %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    96(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    100(%ecx),      %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    88(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    92(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    80(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    84(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    72(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    76(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    64(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    68(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    56(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    60(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    48(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    52(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    40(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    44(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    32(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    36(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    24(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    28(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    16(%ecx),       %eax
-        xorl    %ebx,           %ebx
-        movl    20(%ecx),       %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-
-
-        movl    8(%ecx),        %eax
-        xorl    %ebx,           %ebx
-        movl    12(%ecx),       %edx
-        xorl    %esi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %esi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%edi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%edi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%edi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%edi
-        xorl    0x700(%ebp,%ecx),%edi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%edi
-        xorl    0x500(%ebp,%edx),%edi
-
-
-        movl    (%ecx),         %eax
-        xorl    %ebx,           %ebx
-        movl    4(%ecx),        %edx
-        xorl    %edi,           %eax
-        xorl    %ecx,           %ecx
-        xorl    %edi,           %edx
-        andl    $0xfcfcfcfc,    %eax
-        andl    $0xcfcfcfcf,    %edx
-        movb    %al,            %bl
-        movb    %ah,            %cl
-        rorl    $4,             %edx
-        xorl         (%ebp,%ebx),%esi
-        movb    %dl,            %bl
-        xorl    0x200(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        shrl    $16,            %eax
-        xorl    0x100(%ebp,%ebx),%esi
-        movb    %ah,            %bl
-        shrl    $16,            %edx
-        xorl    0x300(%ebp,%ecx),%esi
-        movb    %dh,            %cl
-        andl    $0xff,          %eax
-        andl    $0xff,          %edx
-        xorl    0x600(%ebp,%ebx),%esi
-        xorl    0x700(%ebp,%ecx),%esi
-        movl    24(%esp),       %ecx
-        xorl    0x400(%ebp,%eax),%esi
-        xorl    0x500(%ebp,%edx),%esi
-.L005end:
-
-
-        rorl    $3,             %edi
-        movl    20(%esp),       %eax
-        rorl    $3,             %esi
-        movl    %edi,           (%eax)
-        movl    %esi,           4(%eax)
-        popl    %ebp
-        popl    %ebx
-        popl    %edi
-        popl    %esi
-        ret
-.L_DES_encrypt2_end:
-        .size   DES_encrypt2,.L_DES_encrypt2_end-DES_encrypt2
-.ident  "desasm.pl"
-.text
-        .align 16
-.globl DES_encrypt3
-        .type   DES_encrypt3,@function
-DES_encrypt3:
-        pushl   %ebx
-        movl    8(%esp),        %ebx
-        pushl   %ebp
-        pushl   %esi
-        pushl   %edi
-
-
-        movl    (%ebx),         %edi
-        movl    4(%ebx),        %esi
-        subl    $12,            %esp
-
-
-        roll    $4,             %edi
-        movl    %edi,           %edx
-        xorl    %esi,           %edi
-        andl    $0xf0f0f0f0,    %edi
-        xorl    %edi,           %edx
-        xorl    %edi,           %esi
-
-        roll    $20,            %esi
-        movl    %esi,           %edi
-        xorl    %edx,           %esi
-        andl    $0xfff0000f,    %esi
-        xorl    %esi,           %edi
-        xorl    %esi,           %edx
-
-        roll    $14,            %edi
-        movl    %edi,           %esi
-        xorl    %edx,           %edi
-        andl    $0x33333333,    %edi
-        xorl    %edi,           %esi
-        xorl    %edi,           %edx
-
-        roll    $22,            %edx
-        movl    %edx,           %edi
-        xorl    %esi,           %edx
-        andl    $0x03fc03fc,    %edx
-        xorl    %edx,           %edi
-        xorl    %edx,           %esi
-
-        roll    $9,             %edi
-        movl    %edi,           %edx
-        xorl    %esi,           %edi
-        andl    $0xaaaaaaaa,    %edi
-        xorl    %edi,           %edx
-        xorl    %edi,           %esi
-
-        rorl    $3,             %edx
-        rorl    $2,             %esi
-        movl    %esi,           4(%ebx)
-        movl    36(%esp),       %eax
-        movl    %edx,           (%ebx)
-        movl    40(%esp),       %edi
-        movl    44(%esp),       %esi
-        movl    $1,             8(%esp)
-        movl    %eax,           4(%esp)
-        movl    %ebx,           (%esp)
-        call    DES_encrypt2
-        movl    $0,             8(%esp)
-        movl    %edi,           4(%esp)
-        movl    %ebx,           (%esp)
-        call    DES_encrypt2
-        movl    $1,             8(%esp)
-        movl    %esi,           4(%esp)
-        movl    %ebx,           (%esp)
-        call    DES_encrypt2
-        addl    $12,            %esp
-        movl    (%ebx),         %edi
-        movl    4(%ebx),        %esi
-
-
-        roll    $2,             %esi
-        roll    $3,             %edi
-        movl    %edi,           %eax
-        xorl    %esi,           %edi
-        andl    $0xaaaaaaaa,    %edi
-        xorl    %edi,           %eax
-        xorl    %edi,           %esi
-
-        roll    $23,            %eax
-        movl    %eax,           %edi
-        xorl    %esi,           %eax
-        andl    $0x03fc03fc,    %eax
-        xorl    %eax,           %edi
-        xorl    %eax,           %esi
-
-        roll    $10,            %edi
-        movl    %edi,           %eax
-        xorl    %esi,           %edi
-        andl    $0x33333333,    %edi
-        xorl    %edi,           %eax
-        xorl    %edi,           %esi
-
-        roll    $18,            %esi
-        movl    %esi,           %edi
-        xorl    %eax,           %esi
-        andl    $0xfff0000f,    %esi
-        xorl    %esi,           %edi
-        xorl    %esi,           %eax
-
-        roll    $12,            %edi
-        movl    %edi,           %esi
-        xorl    %eax,           %edi
-        andl    $0xf0f0f0f0,    %edi
-        xorl    %edi,           %esi
-        xorl    %edi,           %eax
-
-        rorl    $4,             %eax
-        movl    %eax,           (%ebx)
-        movl    %esi,           4(%ebx)
-        popl    %edi
-        popl    %esi
-        popl    %ebp
-        popl    %ebx
-        ret
-.L_DES_encrypt3_end:
-        .size   DES_encrypt3,.L_DES_encrypt3_end-DES_encrypt3
-.ident  "desasm.pl"
-.text
-        .align 16
-.globl DES_decrypt3
-        .type   DES_decrypt3,@function
-DES_decrypt3:
-        pushl   %ebx
-        movl    8(%esp),        %ebx
-        pushl   %ebp
-        pushl   %esi
-        pushl   %edi
-
-
-        movl    (%ebx),         %edi
-        movl    4(%ebx),        %esi
-        subl    $12,            %esp
-
-
-        roll    $4,             %edi
-        movl    %edi,           %edx
-        xorl    %esi,           %edi
-        andl    $0xf0f0f0f0,    %edi
-        xorl    %edi,           %edx
-        xorl    %edi,           %esi
-
-        roll    $20,            %esi
-        movl    %esi,           %edi
-        xorl    %edx,           %esi
-        andl    $0xfff0000f,    %esi
-        xorl    %esi,           %edi
-        xorl    %esi,           %edx
-
-        roll    $14,            %edi
-        movl    %edi,           %esi
-        xorl    %edx,           %edi
-        andl    $0x33333333,    %edi
-        xorl    %edi,           %esi
-        xorl    %edi,           %edx
-
-        roll    $22,            %edx
-        movl    %edx,           %edi
-        xorl    %esi,           %edx
-        andl    $0x03fc03fc,    %edx
-        xorl    %edx,           %edi
-        xorl    %edx,           %esi
-
-        roll    $9,             %edi
-        movl    %edi,           %edx
-        xorl    %esi,           %edi
-        andl    $0xaaaaaaaa,    %edi
-        xorl    %edi,           %edx
-        xorl    %edi,           %esi
-
-        rorl    $3,             %edx
-        rorl    $2,             %esi
-        movl    %esi,           4(%ebx)
-        movl    36(%esp),       %esi
-        movl    %edx,           (%ebx)
-        movl    40(%esp),       %edi
-        movl    44(%esp),       %eax
-        movl    $0,             8(%esp)
-        movl    %eax,           4(%esp)
-        movl    %ebx,           (%esp)
-        call    DES_encrypt2
-        movl    $1,             8(%esp)
-        movl    %edi,           4(%esp)
-        movl    %ebx,           (%esp)
-        call    DES_encrypt2
-        movl    $0,             8(%esp)
-        movl    %esi,           4(%esp)
-        movl    %ebx,           (%esp)
-        call    DES_encrypt2
-        addl    $12,            %esp
-        movl    (%ebx),         %edi
-        movl    4(%ebx),        %esi
-
-
-        roll    $2,             %esi
-        roll    $3,             %edi
-        movl    %edi,           %eax
-        xorl    %esi,           %edi
-        andl    $0xaaaaaaaa,    %edi
-        xorl    %edi,           %eax
-        xorl    %edi,           %esi
-
-        roll    $23,            %eax
-        movl    %eax,           %edi
-        xorl    %esi,           %eax
-        andl    $0x03fc03fc,    %eax
-        xorl    %eax,           %edi
-        xorl    %eax,           %esi
-
-        roll    $10,            %edi
-        movl    %edi,           %eax
-        xorl    %esi,           %edi
-        andl    $0x33333333,    %edi
-        xorl    %edi,           %eax
-        xorl    %edi,           %esi
-
-        roll    $18,            %esi
-        movl    %esi,           %edi
-        xorl    %eax,           %esi
-        andl    $0xfff0000f,    %esi
-        xorl    %esi,           %edi
-        xorl    %esi,           %eax
-
-        roll    $12,            %edi
-        movl    %edi,           %esi
-        xorl    %eax,           %edi
-        andl    $0xf0f0f0f0,    %edi
-        xorl    %edi,           %esi
-        xorl    %edi,           %eax
-
-        rorl    $4,             %eax
-        movl    %eax,           (%ebx)
-        movl    %esi,           4(%ebx)
-        popl    %edi
-        popl    %esi
-        popl    %ebp
-        popl    %ebx
-        ret
-.L_DES_decrypt3_end:
-        .size   DES_decrypt3,.L_DES_decrypt3_end-DES_decrypt3
-.ident  "desasm.pl"
-.text
-        .align 16
-.globl DES_ncbc_encrypt
-        .type   DES_ncbc_encrypt,@function
-DES_ncbc_encrypt:
-
-        pushl   %ebp
-        pushl   %ebx
-        pushl   %esi
-        pushl   %edi
-        movl    28(%esp),       %ebp
-
-        movl    36(%esp),       %ebx
-        movl    (%ebx),         %esi
-        movl    4(%ebx),        %edi
-        pushl   %edi
-        pushl   %esi
-        pushl   %edi
-        pushl   %esi
-        movl    %esp,           %ebx
-        movl    36(%esp),       %esi
-        movl    40(%esp),       %edi
-
-        movl    56(%esp),       %ecx
-
-        pushl   %ecx
-
-        movl    52(%esp),       %eax
-        pushl   %eax
-        pushl   %ebx
-        cmpl    $0,             %ecx
-        jz      .L006decrypt
-        andl    $4294967288,    %ebp
-        movl    12(%esp),       %eax
-        movl    16(%esp),       %ebx
-        jz      .L007encrypt_finish
-.L008encrypt_loop:
-        movl    (%esi),         %ecx
-        movl    4(%esi),        %edx
-        xorl    %ecx,           %eax
-        xorl    %edx,           %ebx
-        movl    %eax,           12(%esp)
-        movl    %ebx,           16(%esp)
-        call    DES_encrypt1
-        movl    12(%esp),       %eax
-        movl    16(%esp),       %ebx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        addl    $8,             %esi
-        addl    $8,             %edi
-        subl    $8,             %ebp
-        jnz     .L008encrypt_loop
-.L007encrypt_finish:
-        movl    56(%esp),       %ebp
-        andl    $7,             %ebp
-        jz      .L009finish
-        call    .L010PIC_point
-.L010PIC_point:
-        popl    %edx
-        leal    .L011cbc_enc_jmp_table-.L010PIC_point(%edx),%ecx
-        movl    (%ecx,%ebp,4),  %ebp
-        addl    %edx,           %ebp
-        xorl    %ecx,           %ecx
-        xorl    %edx,           %edx
-        jmp     *%ebp
-.L012ej7:
-        movb    6(%esi),        %dh
-        sall    $8,             %edx
-.L013ej6:
-        movb    5(%esi),        %dh
-.L014ej5:
-        movb    4(%esi),        %dl
-.L015ej4:
-        movl    (%esi),         %ecx
-        jmp     .L016ejend
-.L017ej3:
-        movb    2(%esi),        %ch
-        sall    $8,             %ecx
-.L018ej2:
-        movb    1(%esi),        %ch
-.L019ej1:
-        movb    (%esi),         %cl
-.L016ejend:
-        xorl    %ecx,           %eax
-        xorl    %edx,           %ebx
-        movl    %eax,           12(%esp)
-        movl    %ebx,           16(%esp)
-        call    DES_encrypt1
-        movl    12(%esp),       %eax
-        movl    16(%esp),       %ebx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        jmp     .L009finish
-.align 16
-.L006decrypt:
-        andl    $4294967288,    %ebp
-        movl    20(%esp),       %eax
-        movl    24(%esp),       %ebx
-        jz      .L020decrypt_finish
-.L021decrypt_loop:
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    %eax,           12(%esp)
-        movl    %ebx,           16(%esp)
-        call    DES_encrypt1
-        movl    12(%esp),       %eax
-        movl    16(%esp),       %ebx
-        movl    20(%esp),       %ecx
-        movl    24(%esp),       %edx
-        xorl    %eax,           %ecx
-        xorl    %ebx,           %edx
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    %ecx,           (%edi)
-        movl    %edx,           4(%edi)
-        movl    %eax,           20(%esp)
-        movl    %ebx,           24(%esp)
-        addl    $8,             %esi
-        addl    $8,             %edi
-        subl    $8,             %ebp
-        jnz     .L021decrypt_loop
-.L020decrypt_finish:
-        movl    56(%esp),       %ebp
-        andl    $7,             %ebp
-        jz      .L009finish
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    %eax,           12(%esp)
-        movl    %ebx,           16(%esp)
-        call    DES_encrypt1
-        movl    12(%esp),       %eax
-        movl    16(%esp),       %ebx
-        movl    20(%esp),       %ecx
-        movl    24(%esp),       %edx
-        xorl    %eax,           %ecx
-        xorl    %ebx,           %edx
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-.L022dj7:
-        rorl    $16,            %edx
-        movb    %dl,            6(%edi)
-        shrl    $16,            %edx
-.L023dj6:
-        movb    %dh,            5(%edi)
-.L024dj5:
-        movb    %dl,            4(%edi)
-.L025dj4:
-        movl    %ecx,           (%edi)
-        jmp     .L026djend
-.L027dj3:
-        rorl    $16,            %ecx
-        movb    %cl,            2(%edi)
-        sall    $16,            %ecx
-.L028dj2:
-        movb    %ch,            1(%esi)
-.L029dj1:
-        movb    %cl,            (%esi)
-.L026djend:
-        jmp     .L009finish
-.align 16
-.L009finish:
-        movl    64(%esp),       %ecx
-        addl    $28,            %esp
-        movl    %eax,           (%ecx)
-        movl    %ebx,           4(%ecx)
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-.align 16
-.L011cbc_enc_jmp_table:
-        .long 0
-        .long .L019ej1-.L010PIC_point
-        .long .L018ej2-.L010PIC_point
-        .long .L017ej3-.L010PIC_point
-        .long .L015ej4-.L010PIC_point
-        .long .L014ej5-.L010PIC_point
-        .long .L013ej6-.L010PIC_point
-        .long .L012ej7-.L010PIC_point
-.L_DES_ncbc_encrypt_end:
-        .size   DES_ncbc_encrypt,.L_DES_ncbc_encrypt_end-DES_ncbc_encrypt
-.ident  "desasm.pl"
-.text
-        .align 16
-.globl DES_ede3_cbc_encrypt
-        .type   DES_ede3_cbc_encrypt,@function
-DES_ede3_cbc_encrypt:
-
-        pushl   %ebp
-        pushl   %ebx
-        pushl   %esi
-        pushl   %edi
-        movl    28(%esp),       %ebp
-
-        movl    44(%esp),       %ebx
-        movl    (%ebx),         %esi
-        movl    4(%ebx),        %edi
-        pushl   %edi
-        pushl   %esi
-        pushl   %edi
-        pushl   %esi
-        movl    %esp,           %ebx
-        movl    36(%esp),       %esi
-        movl    40(%esp),       %edi
-
-        movl    64(%esp),       %ecx
-
-        movl    56(%esp),       %eax
-        pushl   %eax
-
-        movl    56(%esp),       %eax
-        pushl   %eax
-
-        movl    56(%esp),       %eax
-        pushl   %eax
-        pushl   %ebx
-        cmpl    $0,             %ecx
-        jz      .L030decrypt
-        andl    $4294967288,    %ebp
-        movl    16(%esp),       %eax
-        movl    20(%esp),       %ebx
-        jz      .L031encrypt_finish
-.L032encrypt_loop:
-        movl    (%esi),         %ecx
-        movl    4(%esi),        %edx
-        xorl    %ecx,           %eax
-        xorl    %edx,           %ebx
-        movl    %eax,           16(%esp)
-        movl    %ebx,           20(%esp)
-        call    DES_encrypt3
-        movl    16(%esp),       %eax
-        movl    20(%esp),       %ebx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        addl    $8,             %esi
-        addl    $8,             %edi
-        subl    $8,             %ebp
-        jnz     .L032encrypt_loop
-.L031encrypt_finish:
-        movl    60(%esp),       %ebp
-        andl    $7,             %ebp
-        jz      .L033finish
-        call    .L034PIC_point
-.L034PIC_point:
-        popl    %edx
-        leal    .L035cbc_enc_jmp_table-.L034PIC_point(%edx),%ecx
-        movl    (%ecx,%ebp,4),  %ebp
-        addl    %edx,           %ebp
-        xorl    %ecx,           %ecx
-        xorl    %edx,           %edx
-        jmp     *%ebp
-.L036ej7:
-        movb    6(%esi),        %dh
-        sall    $8,             %edx
-.L037ej6:
-        movb    5(%esi),        %dh
-.L038ej5:
-        movb    4(%esi),        %dl
-.L039ej4:
-        movl    (%esi),         %ecx
-        jmp     .L040ejend
-.L041ej3:
-        movb    2(%esi),        %ch
-        sall    $8,             %ecx
-.L042ej2:
-        movb    1(%esi),        %ch
-.L043ej1:
-        movb    (%esi),         %cl
-.L040ejend:
-        xorl    %ecx,           %eax
-        xorl    %edx,           %ebx
-        movl    %eax,           16(%esp)
-        movl    %ebx,           20(%esp)
-        call    DES_encrypt3
-        movl    16(%esp),       %eax
-        movl    20(%esp),       %ebx
-        movl    %eax,           (%edi)
-        movl    %ebx,           4(%edi)
-        jmp     .L033finish
-.align 16
-.L030decrypt:
-        andl    $4294967288,    %ebp
-        movl    24(%esp),       %eax
-        movl    28(%esp),       %ebx
-        jz      .L044decrypt_finish
-.L045decrypt_loop:
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    %eax,           16(%esp)
-        movl    %ebx,           20(%esp)
-        call    DES_decrypt3
-        movl    16(%esp),       %eax
-        movl    20(%esp),       %ebx
-        movl    24(%esp),       %ecx
-        movl    28(%esp),       %edx
-        xorl    %eax,           %ecx
-        xorl    %ebx,           %edx
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    %ecx,           (%edi)
-        movl    %edx,           4(%edi)
-        movl    %eax,           24(%esp)
-        movl    %ebx,           28(%esp)
-        addl    $8,             %esi
-        addl    $8,             %edi
-        subl    $8,             %ebp
-        jnz     .L045decrypt_loop
-.L044decrypt_finish:
-        movl    60(%esp),       %ebp
-        andl    $7,             %ebp
-        jz      .L033finish
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-        movl    %eax,           16(%esp)
-        movl    %ebx,           20(%esp)
-        call    DES_decrypt3
-        movl    16(%esp),       %eax
-        movl    20(%esp),       %ebx
-        movl    24(%esp),       %ecx
-        movl    28(%esp),       %edx
-        xorl    %eax,           %ecx
-        xorl    %ebx,           %edx
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ebx
-.L046dj7:
-        rorl    $16,            %edx
-        movb    %dl,            6(%edi)
-        shrl    $16,            %edx
-.L047dj6:
-        movb    %dh,            5(%edi)
-.L048dj5:
-        movb    %dl,            4(%edi)
-.L049dj4:
-        movl    %ecx,           (%edi)
-        jmp     .L050djend
-.L051dj3:
-        rorl    $16,            %ecx
-        movb    %cl,            2(%edi)
-        sall    $16,            %ecx
-.L052dj2:
-        movb    %ch,            1(%esi)
-.L053dj1:
-        movb    %cl,            (%esi)
-.L050djend:
-        jmp     .L033finish
-.align 16
-.L033finish:
-        movl    76(%esp),       %ecx
-        addl    $32,            %esp
-        movl    %eax,           (%ecx)
-        movl    %ebx,           4(%ecx)
-        popl    %edi
-        popl    %esi
-        popl    %ebx
-        popl    %ebp
-        ret
-.align 16
-.L035cbc_enc_jmp_table:
-        .long 0
-        .long .L043ej1-.L034PIC_point
-        .long .L042ej2-.L034PIC_point
-        .long .L041ej3-.L034PIC_point
-        .long .L039ej4-.L034PIC_point
-        .long .L038ej5-.L034PIC_point
-        .long .L037ej6-.L034PIC_point
-        .long .L036ej7-.L034PIC_point
-.L_DES_ede3_cbc_encrypt_end:
-        .size   DES_ede3_cbc_encrypt,.L_DES_ede3_cbc_encrypt_end-DES_ede3_cbc_encrypt
-.ident  "desasm.pl"
diff --git a/src/lib/libssl/src/fips-1.0/des/fips_des_enc.c b/src/lib/libssl/src/fips-1.0/des/fips_des_enc.c
deleted file mode 100644
index 40e25efa58..0000000000
--- a/src/lib/libssl/src/fips-1.0/des/fips_des_enc.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/* crypto/des/des_enc.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include "fips_des_locl.h"
-#include <openssl/fips.h>
-
-#ifdef OPENSSL_FIPS
-
-void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc)
-        {
-        register DES_LONG l,r,t,u;
-#ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
-#endif
-#ifndef DES_UNROLL
-        register int i;
-#endif
-        register DES_LONG *s;
-
-        if(FIPS_selftest_failed())
-            {
-            data[0]=data[1]=0;
-            return;
-            }
-
-        r=data[0];
-        l=data[1];
-
-        IP(r,l);
-        /* Things have been modified so that the initial rotate is
-         * done outside the loop.  This required the
-         * DES_SPtrans values in sp.h to be rotated 1 bit to the right.
-         * One perl script later and things have a 5% speed up on a sparc2.
-         * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
-         * for pointing this out. */
-        /* clear the top bits on machines with 8byte longs */
-        /* shift left by 2 */
-        r=ROTATE(r,29)&0xffffffffL;
-        l=ROTATE(l,29)&0xffffffffL;
-
-        s=ks->ks->deslong;
-        /* I don't know if it is worth the effort of loop unrolling the
-         * inner loop */
-        if (enc)
-                {
-#ifdef DES_UNROLL
-                D_ENCRYPT(l,r, 0); /*  1 */
-                D_ENCRYPT(r,l, 2); /*  2 */
-                D_ENCRYPT(l,r, 4); /*  3 */
-                D_ENCRYPT(r,l, 6); /*  4 */
-                D_ENCRYPT(l,r, 8); /*  5 */
-                D_ENCRYPT(r,l,10); /*  6 */
-                D_ENCRYPT(l,r,12); /*  7 */
-                D_ENCRYPT(r,l,14); /*  8 */
-                D_ENCRYPT(l,r,16); /*  9 */
-                D_ENCRYPT(r,l,18); /*  10 */
-                D_ENCRYPT(l,r,20); /*  11 */
-                D_ENCRYPT(r,l,22); /*  12 */
-                D_ENCRYPT(l,r,24); /*  13 */
-                D_ENCRYPT(r,l,26); /*  14 */
-                D_ENCRYPT(l,r,28); /*  15 */
-                D_ENCRYPT(r,l,30); /*  16 */
-#else
-                for (i=0; i<32; i+=8)
-                        {
-                        D_ENCRYPT(l,r,i+0); /*  1 */
-                        D_ENCRYPT(r,l,i+2); /*  2 */
-                        D_ENCRYPT(l,r,i+4); /*  3 */
-                        D_ENCRYPT(r,l,i+6); /*  4 */
-                        }
-#endif
-                }
-        else
-                {
-#ifdef DES_UNROLL
-                D_ENCRYPT(l,r,30); /* 16 */
-                D_ENCRYPT(r,l,28); /* 15 */
-                D_ENCRYPT(l,r,26); /* 14 */
-                D_ENCRYPT(r,l,24); /* 13 */
-                D_ENCRYPT(l,r,22); /* 12 */
-                D_ENCRYPT(r,l,20); /* 11 */
-                D_ENCRYPT(l,r,18); /* 10 */
-                D_ENCRYPT(r,l,16); /*  9 */
-                D_ENCRYPT(l,r,14); /*  8 */
-                D_ENCRYPT(r,l,12); /*  7 */
-                D_ENCRYPT(l,r,10); /*  6 */
-                D_ENCRYPT(r,l, 8); /*  5 */
-                D_ENCRYPT(l,r, 6); /*  4 */
-                D_ENCRYPT(r,l, 4); /*  3 */
-                D_ENCRYPT(l,r, 2); /*  2 */
-                D_ENCRYPT(r,l, 0); /*  1 */
-#else
-                for (i=30; i>0; i-=8)
-                        {
-                        D_ENCRYPT(l,r,i-0); /* 16 */
-                        D_ENCRYPT(r,l,i-2); /* 15 */
-                        D_ENCRYPT(l,r,i-4); /* 14 */
-                        D_ENCRYPT(r,l,i-6); /* 13 */
-                        }
-#endif
-                }
-
-        /* rotate and clear the top bits on machines with 8byte longs */
-        l=ROTATE(l,3)&0xffffffffL;
-        r=ROTATE(r,3)&0xffffffffL;
-
-        FP(r,l);
-        data[0]=l;
-        data[1]=r;
-        l=r=t=u=0;
-        }
-
-void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc)
-        {
-        register DES_LONG l,r,t,u;
-#ifdef DES_PTR
-        register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
-#endif
-#ifndef DES_UNROLL
-        register int i;
-#endif
-        register DES_LONG *s;
-
-        if(FIPS_selftest_failed())
-            {
-            data[0]=data[1]=0;
-            return;
-            }
-
-        r=data[0];
-        l=data[1];
-
-        /* Things have been modified so that the initial rotate is
-         * done outside the loop.  This required the
-         * DES_SPtrans values in sp.h to be rotated 1 bit to the right.
-         * One perl script later and things have a 5% speed up on a sparc2.
-         * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
-         * for pointing this out. */
-        /* clear the top bits on machines with 8byte longs */
-        r=ROTATE(r,29)&0xffffffffL;
-        l=ROTATE(l,29)&0xffffffffL;
-
-        s=ks->ks->deslong;
-        /* I don't know if it is worth the effort of loop unrolling the
-         * inner loop */
-        if (enc)
-                {
-#ifdef DES_UNROLL
-                D_ENCRYPT(l,r, 0); /*  1 */
-                D_ENCRYPT(r,l, 2); /*  2 */
-                D_ENCRYPT(l,r, 4); /*  3 */
-                D_ENCRYPT(r,l, 6); /*  4 */
-                D_ENCRYPT(l,r, 8); /*  5 */
-                D_ENCRYPT(r,l,10); /*  6 */
-                D_ENCRYPT(l,r,12); /*  7 */
-                D_ENCRYPT(r,l,14); /*  8 */
-                D_ENCRYPT(l,r,16); /*  9 */
-                D_ENCRYPT(r,l,18); /*  10 */
-                D_ENCRYPT(l,r,20); /*  11 */
-                D_ENCRYPT(r,l,22); /*  12 */
-                D_ENCRYPT(l,r,24); /*  13 */
-                D_ENCRYPT(r,l,26); /*  14 */
-                D_ENCRYPT(l,r,28); /*  15 */
-                D_ENCRYPT(r,l,30); /*  16 */
-#else
-                for (i=0; i<32; i+=8)
-                        {
-                        D_ENCRYPT(l,r,i+0); /*  1 */
-                        D_ENCRYPT(r,l,i+2); /*  2 */
-                        D_ENCRYPT(l,r,i+4); /*  3 */
-                        D_ENCRYPT(r,l,i+6); /*  4 */
-                        }
-#endif
-                }
-        else
-                {
-#ifdef DES_UNROLL
-                D_ENCRYPT(l,r,30); /* 16 */
-                D_ENCRYPT(r,l,28); /* 15 */
-                D_ENCRYPT(l,r,26); /* 14 */
-                D_ENCRYPT(r,l,24); /* 13 */
-                D_ENCRYPT(l,r,22); /* 12 */
-                D_ENCRYPT(r,l,20); /* 11 */
-                D_ENCRYPT(l,r,18); /* 10 */
-                D_ENCRYPT(r,l,16); /*  9 */
-                D_ENCRYPT(l,r,14); /*  8 */
-                D_ENCRYPT(r,l,12); /*  7 */
-                D_ENCRYPT(l,r,10); /*  6 */
-                D_ENCRYPT(r,l, 8); /*  5 */
-                D_ENCRYPT(l,r, 6); /*  4 */
-                D_ENCRYPT(r,l, 4); /*  3 */
-                D_ENCRYPT(l,r, 2); /*  2 */
-                D_ENCRYPT(r,l, 0); /*  1 */
-#else
-                for (i=30; i>0; i-=8)
-                        {
-                        D_ENCRYPT(l,r,i-0); /* 16 */
-                        D_ENCRYPT(r,l,i-2); /* 15 */
-                        D_ENCRYPT(l,r,i-4); /* 14 */
-                        D_ENCRYPT(r,l,i-6); /* 13 */
-                        }
-#endif
-                }
-        /* rotate and clear the top bits on machines with 8byte longs */
-        data[0]=ROTATE(l,3)&0xffffffffL;
-        data[1]=ROTATE(r,3)&0xffffffffL;
-        l=r=t=u=0;
-        }
-
-void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3)
-        {
-        register DES_LONG l,r;
-
-        l=data[0];
-        r=data[1];
-        IP(l,r);
-        data[0]=l;
-        data[1]=r;
-        DES_encrypt2((DES_LONG *)data,ks1,DES_ENCRYPT);
-        DES_encrypt2((DES_LONG *)data,ks2,DES_DECRYPT);
-        DES_encrypt2((DES_LONG *)data,ks3,DES_ENCRYPT);
-        l=data[0];
-        r=data[1];
-        FP(r,l);
-        data[0]=l;
-        data[1]=r;
-        }
-
-void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3)
-        {
-        register DES_LONG l,r;
-
-        l=data[0];
-        r=data[1];
-        IP(l,r);
-        data[0]=l;
-        data[1]=r;
-        DES_encrypt2((DES_LONG *)data,ks3,DES_DECRYPT);
-        DES_encrypt2((DES_LONG *)data,ks2,DES_ENCRYPT);
-        DES_encrypt2((DES_LONG *)data,ks1,DES_DECRYPT);
-        l=data[0];
-        r=data[1];
-        FP(r,l);
-        data[0]=l;
-        data[1]=r;
-        }
-
-#else /* ndef OPENSSL_FIPS */
-
-static void *dummy=&dummy;
-
-#endif /* ndef OPENSSL_FIPS */
-
diff --git a/src/lib/libssl/src/fips-1.0/des/fips_des_locl.h b/src/lib/libssl/src/fips-1.0/des/fips_des_locl.h
deleted file mode 100644
index 5c466a5561..0000000000
--- a/src/lib/libssl/src/fips-1.0/des/fips_des_locl.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/* crypto/des/des_locl.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_DES_LOCL_H
-#define HEADER_DES_LOCL_H
-
-#include "e_os.h"
-
-#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
-#ifndef OPENSSL_SYS_MSDOS
-#define OPENSSL_SYS_MSDOS
-#endif
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifndef OPENSSL_SYS_MSDOS
-#if !defined(OPENSSL_SYS_VMS) || defined(__DECC)
-#ifdef OPENSSL_UNISTD
-# include OPENSSL_UNISTD
-#else
-# include <unistd.h>
-#endif
-#include <math.h>
-#endif
-#endif
-#include <openssl/des.h>
-
-#ifdef OPENSSL_SYS_MSDOS                /* Visual C++ 2.1 (Windows NT/95) */
-#include <stdlib.h>
-#include <errno.h>
-#include <time.h>
-#include <io.h>
-#endif
-
-#if defined(__STDC__) || defined(OPENSSL_SYS_VMS) || defined(M_XENIX) || defined(OPENSSL_SYS_MSDOS)
-#include <string.h>
-#endif
-
-#ifdef OPENSSL_BUILD_SHLIBCRYPTO
-# undef OPENSSL_EXTERN
-# define OPENSSL_EXTERN OPENSSL_EXPORT
-#endif
-
-#define ITERATIONS 16
-#define HALF_ITERATIONS 8
-
-/* used in des_read and des_write */
-#define MAXWRITE        (1024*16)
-#define BSIZE           (MAXWRITE+4)
-
-#define c2l(c,l)        (l =((DES_LONG)(*((c)++)))    , \
-                         l|=((DES_LONG)(*((c)++)))<< 8L, \
-                         l|=((DES_LONG)(*((c)++)))<<16L, \
-                         l|=((DES_LONG)(*((c)++)))<<24L)
-
-/* NOTE - c is not incremented as per c2l */
-#define c2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((DES_LONG)(*(--(c))))<<24L; \
-                        case 7: l2|=((DES_LONG)(*(--(c))))<<16L; \
-                        case 6: l2|=((DES_LONG)(*(--(c))))<< 8L; \
-                        case 5: l2|=((DES_LONG)(*(--(c))));     \
-                        case 4: l1 =((DES_LONG)(*(--(c))))<<24L; \
-                        case 3: l1|=((DES_LONG)(*(--(c))))<<16L; \
-                        case 2: l1|=((DES_LONG)(*(--(c))))<< 8L; \
-                        case 1: l1|=((DES_LONG)(*(--(c))));     \
-                                } \
-                        }
-
-#define l2c(l,c)        (*((c)++)=(unsigned char)(((l)     )&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>24L)&0xff))
-
-/* replacements for htonl and ntohl since I have no idea what to do
- * when faced with machines with 8 byte longs. */
-#define HDRSIZE 4
-
-#define n2l(c,l)        (l =((DES_LONG)(*((c)++)))<<24L, \
-                         l|=((DES_LONG)(*((c)++)))<<16L, \
-                         l|=((DES_LONG)(*((c)++)))<< 8L, \
-                         l|=((DES_LONG)(*((c)++))))
-
-#define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
-                         *((c)++)=(unsigned char)(((l)     )&0xff))
-
-/* NOTE - c is not incremented as per l2c */
-#define l2cn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \
-                        case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \
-                        case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \
-                        case 5: *(--(c))=(unsigned char)(((l2)     )&0xff); \
-                        case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \
-                        case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \
-                        case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \
-                        case 1: *(--(c))=(unsigned char)(((l1)     )&0xff); \
-                                } \
-                        }
-
-#if defined(OPENSSL_SYS_WIN32) && defined(_MSC_VER)
-#define ROTATE(a,n)     (_lrotr(a,n))
-#elif defined(__GNUC__) && __GNUC__>=2 && !defined(__STRICT_ANSI__) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) && !defined(PEDANTIC)
-# if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#  define ROTATE(a,n)   ({ register unsigned int ret;   \
-                                asm ("rorl %1,%0"       \
-                                        : "=r"(ret)     \
-                                        : "I"(n),"0"(a) \
-                                        : "cc");        \
-                           ret;                         \
-                        })
-# endif
-#endif
-#ifndef ROTATE
-#define ROTATE(a,n)     (((a)>>(n))+((a)<<(32-(n))))
-#endif
-
-/* Don't worry about the LOAD_DATA() stuff, that is used by
- * fcrypt() to add it's little bit to the front */
-
-#ifdef DES_FCRYPT
-
-#define LOAD_DATA_tmp(R,S,u,t,E0,E1) \
-        { DES_LONG tmp; LOAD_DATA(R,S,u,t,E0,E1,tmp); }
-
-#define LOAD_DATA(R,S,u,t,E0,E1,tmp) \
-        t=R^(R>>16L); \
-        u=t&E0; t&=E1; \
-        tmp=(u<<16); u^=R^s[S  ]; u^=tmp; \
-        tmp=(t<<16); t^=R^s[S+1]; t^=tmp
-#else
-#define LOAD_DATA_tmp(a,b,c,d,e,f) LOAD_DATA(a,b,c,d,e,f,g)
-#define LOAD_DATA(R,S,u,t,E0,E1,tmp) \
-        u=R^s[S  ]; \
-        t=R^s[S+1]
-#endif
-
-/* The changes to this macro may help or hinder, depending on the
- * compiler and the architecture.  gcc2 always seems to do well :-).
- * Inspired by Dana How <how@isl.stanford.edu>
- * DO NOT use the alternative version on machines with 8 byte longs.
- * It does not seem to work on the Alpha, even when DES_LONG is 4
- * bytes, probably an issue of accessing non-word aligned objects :-( */
-#ifdef DES_PTR
-
-/* It recently occurred to me that 0^0^0^0^0^0^0 == 0, so there
- * is no reason to not xor all the sub items together.  This potentially
- * saves a register since things can be xored directly into L */
-
-#if defined(DES_RISC1) || defined(DES_RISC2)
-#ifdef DES_RISC1
-#define D_ENCRYPT(LL,R,S) { \
-        unsigned int u1,u2,u3; \
-        LOAD_DATA(R,S,u,t,E0,E1,u1); \
-        u2=(int)u>>8L; \
-        u1=(int)u&0xfc; \
-        u2&=0xfc; \
-        t=ROTATE(t,4); \
-        u>>=16L; \
-        LL^= *(const DES_LONG *)(des_SP      +u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x200+u2); \
-        u3=(int)(u>>8L); \
-        u1=(int)u&0xfc; \
-        u3&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x400+u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x600+u3); \
-        u2=(int)t>>8L; \
-        u1=(int)t&0xfc; \
-        u2&=0xfc; \
-        t>>=16L; \
-        LL^= *(const DES_LONG *)(des_SP+0x100+u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x300+u2); \
-        u3=(int)t>>8L; \
-        u1=(int)t&0xfc; \
-        u3&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x500+u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x700+u3); }
-#endif
-#ifdef DES_RISC2
-#define D_ENCRYPT(LL,R,S) { \
-        unsigned int u1,u2,s1,s2; \
-        LOAD_DATA(R,S,u,t,E0,E1,u1); \
-        u2=(int)u>>8L; \
-        u1=(int)u&0xfc; \
-        u2&=0xfc; \
-        t=ROTATE(t,4); \
-        LL^= *(const DES_LONG *)(des_SP      +u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x200+u2); \
-        s1=(int)(u>>16L); \
-        s2=(int)(u>>24L); \
-        s1&=0xfc; \
-        s2&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x400+s1); \
-        LL^= *(const DES_LONG *)(des_SP+0x600+s2); \
-        u2=(int)t>>8L; \
-        u1=(int)t&0xfc; \
-        u2&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x100+u1); \
-        LL^= *(const DES_LONG *)(des_SP+0x300+u2); \
-        s1=(int)(t>>16L); \
-        s2=(int)(t>>24L); \
-        s1&=0xfc; \
-        s2&=0xfc; \
-        LL^= *(const DES_LONG *)(des_SP+0x500+s1); \
-        LL^= *(const DES_LONG *)(des_SP+0x700+s2); }
-#endif
-#else
-#define D_ENCRYPT(LL,R,S) { \
-        LOAD_DATA_tmp(R,S,u,t,E0,E1); \
-        t=ROTATE(t,4); \
-        LL^= \
-        *(const DES_LONG *)(des_SP      +((u     )&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x200+((u>> 8L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x400+((u>>16L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x600+((u>>24L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x100+((t     )&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x300+((t>> 8L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x500+((t>>16L)&0xfc))^ \
-        *(const DES_LONG *)(des_SP+0x700+((t>>24L)&0xfc)); }
-#endif
-
-#else /* original version */
-
-#if defined(DES_RISC1) || defined(DES_RISC2)
-#ifdef DES_RISC1
-#define D_ENCRYPT(LL,R,S) {\
-        unsigned int u1,u2,u3; \
-        LOAD_DATA(R,S,u,t,E0,E1,u1); \
-        u>>=2L; \
-        t=ROTATE(t,6); \
-        u2=(int)u>>8L; \
-        u1=(int)u&0x3f; \
-        u2&=0x3f; \
-        u>>=16L; \
-        LL^=DES_SPtrans[0][u1]; \
-        LL^=DES_SPtrans[2][u2]; \
-        u3=(int)u>>8L; \
-        u1=(int)u&0x3f; \
-        u3&=0x3f; \
-        LL^=DES_SPtrans[4][u1]; \
-        LL^=DES_SPtrans[6][u3]; \
-        u2=(int)t>>8L; \
-        u1=(int)t&0x3f; \
-        u2&=0x3f; \
-        t>>=16L; \
-        LL^=DES_SPtrans[1][u1]; \
-        LL^=DES_SPtrans[3][u2]; \
-        u3=(int)t>>8L; \
-        u1=(int)t&0x3f; \
-        u3&=0x3f; \
-        LL^=DES_SPtrans[5][u1]; \
-        LL^=DES_SPtrans[7][u3]; }
-#endif
-#ifdef DES_RISC2
-#define D_ENCRYPT(LL,R,S) {\
-        unsigned int u1,u2,s1,s2; \
-        LOAD_DATA(R,S,u,t,E0,E1,u1); \
-        u>>=2L; \
-        t=ROTATE(t,6); \
-        u2=(int)u>>8L; \
-        u1=(int)u&0x3f; \
-        u2&=0x3f; \
-        LL^=DES_SPtrans[0][u1]; \
-        LL^=DES_SPtrans[2][u2]; \
-        s1=(int)u>>16L; \
-        s2=(int)u>>24L; \
-        s1&=0x3f; \
-        s2&=0x3f; \
-        LL^=DES_SPtrans[4][s1]; \
-        LL^=DES_SPtrans[6][s2]; \
-        u2=(int)t>>8L; \
-        u1=(int)t&0x3f; \
-        u2&=0x3f; \
-        LL^=DES_SPtrans[1][u1]; \
-        LL^=DES_SPtrans[3][u2]; \
-        s1=(int)t>>16; \
-        s2=(int)t>>24L; \
-        s1&=0x3f; \
-        s2&=0x3f; \
-        LL^=DES_SPtrans[5][s1]; \
-        LL^=DES_SPtrans[7][s2]; }
-#endif
-
-#else
-
-#define D_ENCRYPT(LL,R,S) {\
-        LOAD_DATA_tmp(R,S,u,t,E0,E1); \
-        t=ROTATE(t,4); \
-        LL^=\
-                DES_SPtrans[0][(u>> 2L)&0x3f]^ \
-                DES_SPtrans[2][(u>>10L)&0x3f]^ \
-                DES_SPtrans[4][(u>>18L)&0x3f]^ \
-                DES_SPtrans[6][(u>>26L)&0x3f]^ \
-                DES_SPtrans[1][(t>> 2L)&0x3f]^ \
-                DES_SPtrans[3][(t>>10L)&0x3f]^ \
-                DES_SPtrans[5][(t>>18L)&0x3f]^ \
-                DES_SPtrans[7][(t>>26L)&0x3f]; }
-#endif
-#endif
-
-        /* IP and FP
-         * The problem is more of a geometric problem that random bit fiddling.
-         0  1  2  3  4  5  6  7      62 54 46 38 30 22 14  6
-         8  9 10 11 12 13 14 15      60 52 44 36 28 20 12  4
-        16 17 18 19 20 21 22 23      58 50 42 34 26 18 10  2
-        24 25 26 27 28 29 30 31  to  56 48 40 32 24 16  8  0
-
-        32 33 34 35 36 37 38 39      63 55 47 39 31 23 15  7
-        40 41 42 43 44 45 46 47      61 53 45 37 29 21 13  5
-        48 49 50 51 52 53 54 55      59 51 43 35 27 19 11  3
-        56 57 58 59 60 61 62 63      57 49 41 33 25 17  9  1
-
-        The output has been subject to swaps of the form
-        0 1 -> 3 1 but the odd and even bits have been put into
-        2 3    2 0
-        different words.  The main trick is to remember that
-        t=((l>>size)^r)&(mask);
-        r^=t;
-        l^=(t<<size);
-        can be used to swap and move bits between words.
-
-        So l =  0  1  2  3  r = 16 17 18 19
-                4  5  6  7      20 21 22 23
-                8  9 10 11      24 25 26 27
-               12 13 14 15      28 29 30 31
-        becomes (for size == 2 and mask == 0x3333)
-           t =   2^16  3^17 -- --   l =  0  1 16 17  r =  2  3 18 19
-                 6^20  7^21 -- --        4  5 20 21       6  7 22 23
-                10^24 11^25 -- --        8  9 24 25      10 11 24 25
-                14^28 15^29 -- --       12 13 28 29      14 15 28 29
-
-        Thanks for hints from Richard Outerbridge - he told me IP&FP
-        could be done in 15 xor, 10 shifts and 5 ands.
-        When I finally started to think of the problem in 2D
-        I first got ~42 operations without xors.  When I remembered
-        how to use xors :-) I got it to its final state.
-        */
-#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
-        (b)^=(t),\
-        (a)^=((t)<<(n)))
-
-#define IP(l,r) \
-        { \
-        register DES_LONG tt; \
-        PERM_OP(r,l,tt, 4,0x0f0f0f0fL); \
-        PERM_OP(l,r,tt,16,0x0000ffffL); \
-        PERM_OP(r,l,tt, 2,0x33333333L); \
-        PERM_OP(l,r,tt, 8,0x00ff00ffL); \
-        PERM_OP(r,l,tt, 1,0x55555555L); \
-        }
-
-#define FP(l,r) \
-        { \
-        register DES_LONG tt; \
-        PERM_OP(l,r,tt, 1,0x55555555L); \
-        PERM_OP(r,l,tt, 8,0x00ff00ffL); \
-        PERM_OP(l,r,tt, 2,0x33333333L); \
-        PERM_OP(r,l,tt,16,0x0000ffffL); \
-        PERM_OP(l,r,tt, 4,0x0f0f0f0fL); \
-        }
-
-extern const DES_LONG DES_SPtrans[8][64];
-
-void fcrypt_body(DES_LONG *out,DES_key_schedule *ks,
-                 DES_LONG Eswap0, DES_LONG Eswap1);
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/des/fips_des_selftest.c b/src/lib/libssl/src/fips-1.0/des/fips_des_selftest.c
deleted file mode 100644
index 3e0778eb5e..0000000000
--- a/src/lib/libssl/src/fips-1.0/des/fips_des_selftest.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/des.h>
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-static struct
-    {
-    DES_cblock key;
-    unsigned char plaintext[8];
-    unsigned char ciphertext[8];
-    } tests[]=
-        {
-        {
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7 }
-        },
-        {
-        { 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10 },
-        { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF },
-        { 0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4 },
-        },
-        };
-
-static struct
-    {
-    DES_cblock key1;
-    DES_cblock key2;
-    unsigned char plaintext[8];
-    unsigned char ciphertext[8];
-    } tests2[]=
-        {
-        {
-        { 0x7c,0x4f,0x6e,0xf7,0xa2,0x04,0x16,0xec },
-        { 0x0b,0x6b,0x7c,0x9e,0x5e,0x19,0xa7,0xc4 },
-        { 0x06,0xa7,0xd8,0x79,0xaa,0xce,0x69,0xef },
-        { 0x4c,0x11,0x17,0x55,0xbf,0xc4,0x4e,0xfd }
-        },
-        {
-        { 0x5d,0x9e,0x01,0xd3,0x25,0xc7,0x3e,0x34 },
-        { 0x01,0x16,0x7c,0x85,0x23,0xdf,0xe0,0x68 },
-        { 0x9c,0x50,0x09,0x0f,0x5e,0x7d,0x69,0x7e },
-        { 0xd2,0x0b,0x18,0xdf,0xd9,0x0d,0x9e,0xff },
-        }
-        };
-
-static struct
-    {
-    DES_cblock key1;
-    DES_cblock key2;
-    DES_cblock key3;
-    unsigned char plaintext[8];
-    unsigned char ciphertext[8];
-    } tests3[]=
-        {
-        {
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10 },
-        { 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0 },
-        { 0x8f,0x8f,0xbf,0x9b,0x5d,0x48,0xb4,0x1c},
-        { 0x59,0x8c,0xe5,0xd3,0x6c,0xa2,0xea,0x1b},
-        },
-        {
-        { 0xDC,0xBA,0x98,0x76,0x54,0x32,0x10,0xFE },
-        { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF },
-        { 0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4 },
-        { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF },
-        { 0x11,0x25,0xb0,0x35,0xbe,0xa0,0x82,0x86 },
-        },
-        };
-
-void FIPS_corrupt_des()
-    {
-    tests[0].plaintext[0]++;
-    }
-
-int FIPS_selftest_des()
-    {
-    int n;
-
-    /* Encrypt/decrypt with DES and compare to known answers */
-    for(n=0 ; n < 2 ; ++n)
-        {
-        DES_key_schedule key;
-        DES_cblock buf;
-
-        DES_set_key(&tests[n].key,&key);
-        DES_ecb_encrypt(&tests[n].plaintext,&buf,&key,1);
-        if(memcmp(buf,tests[n].ciphertext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        DES_ecb_encrypt(&tests[n].ciphertext,&buf,&key,0);
-        if(memcmp(buf,tests[n].plaintext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-
-    /* Encrypt/decrypt with 2-key 3DES and compare to known answers */
-    for(n=0 ; n < 2 ; ++n)
-        {
-        DES_key_schedule key1, key2;
-        unsigned char buf[8];
-
-        DES_set_key(&tests2[n].key1,&key1);
-        DES_set_key(&tests2[n].key2,&key2);
-        DES_ecb2_encrypt(tests2[n].plaintext,buf,&key1,&key2,1);
-        if(memcmp(buf,tests2[n].ciphertext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        DES_ecb2_encrypt(tests2[n].ciphertext,buf,&key1,&key2,0);
-        if(memcmp(buf,tests2[n].plaintext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-
-    /* Encrypt/decrypt with 3DES and compare to known answers */
-    for(n=0 ; n < 2 ; ++n)
-        {
-        DES_key_schedule key1, key2, key3;
-        unsigned char buf[8];
-
-        DES_set_key(&tests3[n].key1,&key1);
-        DES_set_key(&tests3[n].key2,&key2);
-        DES_set_key(&tests3[n].key3,&key3);
-        DES_ecb3_encrypt(tests3[n].plaintext,buf,&key1,&key2,&key3,1);
-        if(memcmp(buf,tests3[n].ciphertext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        DES_ecb3_encrypt(tests3[n].ciphertext,buf,&key1,&key2,&key3,0);
-        if(memcmp(buf,tests3[n].plaintext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-
-    return 1;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/des/fips_desmovs.c b/src/lib/libssl/src/fips-1.0/des/fips_desmovs.c
deleted file mode 100644
index 5eb55726e3..0000000000
--- a/src/lib/libssl/src/fips-1.0/des/fips_desmovs.c
+++ /dev/null
@@ -1,833 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2004 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*---------------------------------------------
-  NIST DES Modes of Operation Validation System
-  Test Program
-
-  Based on the AES Validation Suite, which was:
-  Donated to OpenSSL by:
-  V-ONE Corporation
-  20250 Century Blvd, Suite 300
-  Germantown, MD 20874
-  U.S.A.
-  ----------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <openssl/des.h>
-#include <openssl/evp.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-#include "e_os.h"
-
-/*#define AES_BLOCK_SIZE 16*/
-
-#define VERBOSE 0
-
-/*-----------------------------------------------*/
-
-int DESTest(EVP_CIPHER_CTX *ctx,
-            char *amode, int akeysz, unsigned char *aKey, 
-            unsigned char *iVec, 
-            int dir,  /* 0 = decrypt, 1 = encrypt */
-            unsigned char *out, unsigned char *in, int len)
-    {
-    const EVP_CIPHER *cipher = NULL;
-    int kt = 0;
-
-    if (ctx)
-        memset(ctx, 0, sizeof(EVP_CIPHER_CTX));
-
-    if (strcasecmp(amode, "CBC") == 0)
-        kt = 1000;
-    else if (strcasecmp(amode, "ECB") == 0)
-        kt = 2000;
-    else if (strcasecmp(amode, "CFB64") == 0)
-        kt = 3000;
-    else if (strncasecmp(amode, "OFB", 3) == 0)
-        kt = 4000;
-    else if(!strcasecmp(amode,"CFB1"))
-        kt=5000;
-    else if(!strcasecmp(amode,"CFB8"))
-        kt=6000;
-    else
-        {
-        printf("Unknown mode: %s\n", amode);
-        EXIT(1);
-        }
-    if (akeysz != 64 && akeysz != 192)
-        {
-        printf("Invalid key size: %d\n", akeysz);
-        EXIT(1);
-        }
-    else
-        {
-        kt += akeysz;
-        switch (kt)
-            {
-        case 1064:
-            cipher=EVP_des_cbc();
-            break;
-        case 1192:
-            cipher=EVP_des_ede3_cbc();
-            break;
-        case 2064:
-            cipher=EVP_des_ecb();
-            break;
-        case 2192:
-            cipher=EVP_des_ede3_ecb();
-            break;
-        case 3064:
-            cipher=EVP_des_cfb64();
-            break;
-        case 3192:
-            cipher=EVP_des_ede3_cfb64();
-            break;
-        case 4064:
-            cipher=EVP_des_ofb();
-            break;
-        case 4192:
-            cipher=EVP_des_ede3_ofb();
-            break;
-        case 5064:
-            cipher=EVP_des_cfb1();
-            break;
-        case 5192:
-            cipher=EVP_des_ede3_cfb1();
-            break;
-        case 6064:
-            cipher=EVP_des_cfb8();
-            break;
-        case 6192:
-            cipher=EVP_des_ede3_cfb8();
-            break;
-        default:
-            printf("Didn't handle mode %d\n",kt);
-            EXIT(1);
-            }
-        if(!EVP_CipherInit(ctx, cipher, aKey, iVec, dir))
-            {
-            ERR_print_errors_fp(stderr);
-            EXIT(1);
-            }
-        EVP_Cipher(ctx, out, in, len);
-        }
-    return 1;
-    }
-
-/*-----------------------------------------------*/
-
-int hex2bin(char *in, int len, unsigned char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1 = 0, n2 = 0; n1 < len; )
-        { /* first byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        if(len == 1)
-            {
-            out[n2++]=ch;
-            break;
-            }
-        out[n2] = ch << 4;
-        /* second byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        out[n2++] |= ch;
-        }
-    return n2;
-    }
-
-/*-----------------------------------------------*/
-
-int bin2hex(unsigned char *in, int len, char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1 = 0, n2 = 0; n1 < len; ++n1)
-        {
-        /* first nibble */
-        ch = in[n1] >> 4;
-        if (ch <= 0x09)
-            out[n2++] = ch + '0';
-        else
-            out[n2++] = ch - 10 + 'a';
-        /* second nibble */
-        ch = in[n1] & 0x0f;
-        if (ch <= 0x09)
-            out[n2++] = ch + '0';
-        else
-            out[n2++] = ch - 10 + 'a';
-        }
-    return n2;
-    }
-
-/* NB: this return the number of _bits_ read */
-int bint2bin(const char *in, int len, unsigned char *out)
-    {
-    int n;
-
-    memset(out,0,len);
-    for(n=0 ; n < len ; ++n)
-        if(in[n] == '1')
-            out[n/8]|=(0x80 >> (n%8));
-    return len;
-    }
-
-int bin2bint(const unsigned char *in,int len,char *out)
-    {
-    int n;
-
-    for(n=0 ; n < len ; ++n)
-        out[n]=(in[n/8]&(0x80 >> (n%8))) ? '1' : '0';
-    return n;
-    }
-
-/*-----------------------------------------------*/
-
-void PrintValue(char *tag, unsigned char *val, int len)
-    {
-#if VERBOSE
-    char obuf[2048];
-    int olen;
-    olen = bin2hex(val, len, obuf);
-    printf("%s = %.*s\n", tag, olen, obuf);
-#endif
-    }
-
-void DebugValue(char *tag, unsigned char *val, int len)
-    {
-    char obuf[2048];
-    int olen;
-    olen = bin2hex(val, len, obuf);
-    printf("%s = %.*s\n", tag, olen, obuf);
-    }
-
-void OutputValue(char *tag, unsigned char *val, int len, FILE *rfp,int bitmode)
-    {
-    char obuf[2048];
-    int olen;
-
-    if(bitmode)
-        olen=bin2bint(val,len,obuf);
-    else
-        olen=bin2hex(val,len,obuf);
-
-    fprintf(rfp, "%s = %.*s\n", tag, olen, obuf);
-#if VERBOSE
-    printf("%s = %.*s\n", tag, olen, obuf);
-#endif
-    }
-
-void shiftin(unsigned char *dst,unsigned char *src,int nbits)
-    {
-    int n;
-
-    /* move the bytes... */
-    memmove(dst,dst+nbits/8,3*8-nbits/8);
-    /* append new data */
-    memcpy(dst+3*8-nbits/8,src,(nbits+7)/8);
-    /* left shift the bits */
-    if(nbits%8)
-        for(n=0 ; n < 3*8 ; ++n)
-            dst[n]=(dst[n] << (nbits%8))|(dst[n+1] >> (8-nbits%8));
-    }   
-
-/*-----------------------------------------------*/
-char *t_tag[2] = {"PLAINTEXT", "CIPHERTEXT"};
-char *t_mode[6] = {"CBC","ECB","OFB","CFB1","CFB8","CFB64"};
-enum Mode {CBC, ECB, OFB, CFB1, CFB8, CFB64};
-int Sizes[6]={64,64,64,1,8,64};
-
-void do_mct(char *amode, 
-            int akeysz, int numkeys, unsigned char *akey,unsigned char *ivec,
-            int dir, unsigned char *text, int len,
-            FILE *rfp)
-    {
-    int i,imode;
-    unsigned char nk[4*8]; /* longest key+8 */
-    unsigned char text0[8];
-
-    for (imode=0 ; imode < 6 ; ++imode)
-        if(!strcmp(amode,t_mode[imode]))
-            break;
-    if (imode == 6)
-        { 
-        printf("Unrecognized mode: %s\n", amode);
-        EXIT(1);
-        }
-
-    for(i=0 ; i < 400 ; ++i)
-        {
-        int j;
-        int n;
-        EVP_CIPHER_CTX ctx;
-        int kp=akeysz/64;
-        unsigned char old_iv[8];
-
-        fprintf(rfp,"\nCOUNT = %d\n",i);
-        if(kp == 1)
-            OutputValue("KEY",akey,8,rfp,0);
-        else
-            for(n=0 ; n < kp ; ++n)
-                {
-                fprintf(rfp,"KEY%d",n+1);
-                OutputValue("",akey+n*8,8,rfp,0);
-                }
-
-        if(imode != ECB)
-            OutputValue("IV",ivec,8,rfp,0);
-        OutputValue(t_tag[dir^1],text,len,rfp,imode == CFB1);
-
-        /* compensate for endianness */
-        if(imode == CFB1)
-            text[0]<<=7;
-
-        memcpy(text0,text,8);
-
-        for(j=0 ; j < 10000 ; ++j)
-            {
-            unsigned char old_text[8];
-
-            memcpy(old_text,text,8);
-            if(j == 0)
-                {
-                memcpy(old_iv,ivec,8);
-                DESTest(&ctx,amode,akeysz,akey,ivec,dir,text,text,len);
-                }
-            else
-                {
-                memcpy(old_iv,ctx.iv,8);
-                EVP_Cipher(&ctx,text,text,len);
-                }
-            if(j == 9999)
-                {
-                OutputValue(t_tag[dir],text,len,rfp,imode == CFB1);
-                /*              memcpy(ivec,text,8); */
-                }
-            /*      DebugValue("iv",ctx.iv,8); */
-            /* accumulate material for the next key */
-            shiftin(nk,text,Sizes[imode]);
-            /*      DebugValue("nk",nk,24);*/
-            if((dir && (imode == CFB1 || imode == CFB8 || imode == CFB64
-                        || imode == CBC)) || imode == OFB)
-                memcpy(text,old_iv,8);
-
-            if(!dir && (imode == CFB1 || imode == CFB8 || imode == CFB64))
-                {
-                /* the test specifies using the output of the raw DES operation
-                   which we don't have, so reconstruct it... */
-                for(n=0 ; n < 8 ; ++n)
-                    text[n]^=old_text[n];
-                }
-            }
-        for(n=0 ; n < 8 ; ++n)
-            akey[n]^=nk[16+n];
-        for(n=0 ; n < 8 ; ++n)
-            akey[8+n]^=nk[8+n];
-        for(n=0 ; n < 8 ; ++n)
-            akey[16+n]^=nk[n];
-        if(numkeys < 3)
-            memcpy(&akey[2*8],akey,8);
-        if(numkeys < 2)
-            memcpy(&akey[8],akey,8);
-        DES_set_odd_parity((DES_cblock *)akey);
-        DES_set_odd_parity((DES_cblock *)(akey+8));
-        DES_set_odd_parity((DES_cblock *)(akey+16));
-        memcpy(ivec,ctx.iv,8);
-
-        /* pointless exercise - the final text doesn't depend on the
-           initial text in OFB mode, so who cares what it is? (Who
-           designed these tests?) */
-        if(imode == OFB)
-            for(n=0 ; n < 8 ; ++n)
-                text[n]=text0[n]^old_iv[n];
-        }
-    }
-    
-int proc_file(char *rqfile)
-    {
-    char afn[256], rfn[256];
-    FILE *afp = NULL, *rfp = NULL;
-    char ibuf[2048];
-    int ilen, len, ret = 0;
-    char amode[8] = "";
-    char atest[100] = "";
-    int akeysz=0;
-    unsigned char iVec[20], aKey[40];
-    int dir = -1, err = 0, step = 0;
-    unsigned char plaintext[2048];
-    unsigned char ciphertext[2048];
-    char *rp;
-    EVP_CIPHER_CTX ctx;
-    int numkeys=1;
-
-    if (!rqfile || !(*rqfile))
-        {
-        printf("No req file\n");
-        return -1;
-        }
-    strcpy(afn, rqfile);
-
-    if ((afp = fopen(afn, "r")) == NULL)
-        {
-        printf("Cannot open file: %s, %s\n", 
-               afn, strerror(errno));
-        return -1;
-        }
-    strcpy(rfn,afn);
-    rp=strstr(rfn,"req/");
-    assert(rp);
-    memcpy(rp,"rsp",3);
-    rp = strstr(rfn, ".req");
-    memcpy(rp, ".rsp", 4);
-    if ((rfp = fopen(rfn, "w")) == NULL)
-        {
-        printf("Cannot open file: %s, %s\n", 
-               rfn, strerror(errno));
-        fclose(afp);
-        afp = NULL;
-        return -1;
-        }
-    while (!err && (fgets(ibuf, sizeof(ibuf), afp)) != NULL)
-        {
-        ilen = strlen(ibuf);
-        /*      printf("step=%d ibuf=%s",step,ibuf);*/
-        if(step == 3 && !strcmp(amode,"ECB"))
-            {
-            memset(iVec, 0, sizeof(iVec));
-            step = (dir)? 4: 5;  /* no ivec for ECB */
-            }
-        switch (step)
-            {
-        case 0:  /* read preamble */
-            if (ibuf[0] == '\n')
-                { /* end of preamble */
-                if (*amode == '\0')
-                    {
-                    printf("Missing Mode\n");
-                    err = 1;
-                    }
-                else
-                    {
-                    fputs(ibuf, rfp);
-                    ++ step;
-                    }
-                }
-            else if (ibuf[0] != '#')
-                {
-                printf("Invalid preamble item: %s\n", ibuf);
-                err = 1;
-                }
-            else
-                { /* process preamble */
-                char *xp, *pp = ibuf+2;
-                int n;
-                if(*amode)
-                    { /* insert current time & date */
-                    time_t rtim = time(0);
-                    fprintf(rfp, "# %s", ctime(&rtim));
-                    }
-                else
-                    {
-                    fputs(ibuf, rfp);
-                    if(!strncmp(pp,"INVERSE ",8) || !strncmp(pp,"DES ",4)
-                       || !strncmp(pp,"TDES ",5)
-                       || !strncmp(pp,"PERMUTATION ",12)
-                       || !strncmp(pp,"SUBSTITUTION ",13)
-                       || !strncmp(pp,"VARIABLE ",9))
-                        {
-                        /* get test type */
-                        if(!strncmp(pp,"DES ",4))
-                            pp+=4;
-                        else if(!strncmp(pp,"TDES ",5))
-                            pp+=5;
-                        xp = strchr(pp, ' ');
-                        n = xp-pp;
-                        strncpy(atest, pp, n);
-                        atest[n] = '\0';
-                        /* get mode */
-                        xp = strrchr(pp, ' '); /* get mode" */
-                        n = strlen(xp+1)-1;
-                        strncpy(amode, xp+1, n);
-                        amode[n] = '\0';
-                        /* amode[3] = '\0'; */
-                        printf("Test=%s, Mode=%s\n",atest,amode);
-                        }
-                    }
-                }
-            break;
-
-        case 1:  /* [ENCRYPT] | [DECRYPT] */
-            if(ibuf[0] == '\n')
-                break;
-            if (ibuf[0] == '[')
-                {
-                fputs(ibuf, rfp);
-                ++step;
-                if (strncasecmp(ibuf, "[ENCRYPT]", 9) == 0)
-                    dir = 1;
-                else if (strncasecmp(ibuf, "[DECRYPT]", 9) == 0)
-                    dir = 0;
-                else
-                    {
-                    printf("Invalid keyword: %s\n", ibuf);
-                    err = 1;
-                    }
-                break;
-                }
-            else if (dir == -1)
-                {
-                err = 1;
-                printf("Missing ENCRYPT/DECRYPT keyword\n");
-                break;
-                }
-            else 
-                step = 2;
-
-        case 2: /* KEY = xxxx */
-            if(*ibuf == '\n')
-                {
-                fputs(ibuf, rfp);
-                break;
-                }
-            if(!strncasecmp(ibuf,"COUNT = ",8))
-                {
-                fputs(ibuf, rfp);
-                break;
-                }
-            if(!strncasecmp(ibuf,"COUNT=",6))
-                {
-                fputs(ibuf, rfp);
-                break;
-                }
-            if(!strncasecmp(ibuf,"NumKeys = ",10))
-                {
-                numkeys=atoi(ibuf+10);
-                break;
-                }
-          
-            fputs(ibuf, rfp);
-            if(!strncasecmp(ibuf,"KEY = ",6))
-                {
-                akeysz=64;
-                len = hex2bin((char*)ibuf+6, strlen(ibuf+6)-1, aKey);
-                if (len < 0)
-                    {
-                    printf("Invalid KEY\n");
-                    err=1;
-                    break;
-                    }
-                PrintValue("KEY", aKey, len);
-                ++step;
-                }
-            else if(!strncasecmp(ibuf,"KEYs = ",7))
-                {
-                akeysz=64*3;
-                len=hex2bin(ibuf+7,strlen(ibuf+7)-1,aKey);
-                if(len != 8)
-                    {
-                    printf("Invalid KEY\n");
-                    err=1;
-                    break;
-                    }
-                memcpy(aKey+8,aKey,8);
-                memcpy(aKey+16,aKey,8);
-                ibuf[4]='\0';
-                PrintValue("KEYs",aKey,len);
-                ++step;
-                }
-            else if(!strncasecmp(ibuf,"KEY",3))
-                {
-                int n=ibuf[3]-'1';
-
-                akeysz=64*3;
-                len=hex2bin(ibuf+7,strlen(ibuf+7)-1,aKey+n*8);
-                if(len != 8)
-                    {
-                    printf("Invalid KEY\n");
-                    err=1;
-                    break;
-                    }
-                ibuf[4]='\0';
-                PrintValue(ibuf,aKey,len);
-                if(n == 2)
-                    ++step;
-                }
-            else
-                {
-                printf("Missing KEY\n");
-                err = 1;
-                }
-            break;
-
-        case 3: /* IV = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "IV = ", 5) != 0)
-                {
-                printf("Missing IV\n");
-                err = 1;
-                }
-            else
-                {
-                len = hex2bin((char*)ibuf+5, strlen(ibuf+5)-1, iVec);
-                if (len < 0)
-                    {
-                    printf("Invalid IV\n");
-                    err =1;
-                    break;
-                    }
-                PrintValue("IV", iVec, len);
-                step = (dir)? 4: 5;
-                }
-            break;
-
-        case 4: /* PLAINTEXT = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "PLAINTEXT = ", 12) != 0)
-                {
-                printf("Missing PLAINTEXT\n");
-                err = 1;
-                }
-            else
-                {
-                int nn = strlen(ibuf+12);
-                if(!strcmp(amode,"CFB1"))
-                    len=bint2bin(ibuf+12,nn-1,plaintext);
-                else
-                    len=hex2bin(ibuf+12, nn-1,plaintext);
-                if (len < 0)
-                    {
-                    printf("Invalid PLAINTEXT: %s", ibuf+12);
-                    err =1;
-                    break;
-                    }
-                if (len >= sizeof(plaintext))
-                    {
-                    printf("Buffer overflow\n");
-                    }
-                PrintValue("PLAINTEXT", (unsigned char*)plaintext, len);
-                if (strcmp(atest, "Monte") == 0)  /* Monte Carlo Test */
-                    {
-                    do_mct(amode,akeysz,numkeys,aKey,iVec,dir,plaintext,len,rfp);
-                    }
-                else
-                    {
-                    assert(dir == 1);
-                    ret = DESTest(&ctx, amode, akeysz, aKey, iVec, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  ciphertext, plaintext, len);
-                    OutputValue("CIPHERTEXT",ciphertext,len,rfp,
-                                !strcmp(amode,"CFB1"));
-                    }
-                step = 6;
-                }
-            break;
-
-        case 5: /* CIPHERTEXT = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "CIPHERTEXT = ", 13) != 0)
-                {
-                printf("Missing KEY\n");
-                err = 1;
-                }
-            else
-                {
-                if(!strcmp(amode,"CFB1"))
-                    len=bint2bin(ibuf+13,strlen(ibuf+13)-1,ciphertext);
-                else
-                    len = hex2bin(ibuf+13,strlen(ibuf+13)-1,ciphertext);
-                if (len < 0)
-                    {
-                    printf("Invalid CIPHERTEXT\n");
-                    err =1;
-                    break;
-                    }
-                
-                PrintValue("CIPHERTEXT", ciphertext, len);
-                if (strcmp(atest, "Monte") == 0)  /* Monte Carlo Test */
-                    {
-                    do_mct(amode, akeysz, numkeys, aKey, iVec, 
-                           dir, ciphertext, len, rfp);
-                    }
-                else
-                    {
-                    assert(dir == 0);
-                    ret = DESTest(&ctx, amode, akeysz, aKey, iVec, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  plaintext, ciphertext, len);
-                    OutputValue("PLAINTEXT",(unsigned char *)plaintext,len,rfp,
-                                !strcmp(amode,"CFB1"));
-                    }
-                step = 6;
-                }
-            break;
-
-        case 6:
-            if (ibuf[0] != '\n')
-                {
-                err = 1;
-                printf("Missing terminator\n");
-                }
-            else if (strcmp(atest, "MCT") != 0)
-                { /* MCT already added terminating nl */
-                fputs(ibuf, rfp);
-                }
-            step = 1;
-            break;
-            }
-        }
-    if (rfp)
-        fclose(rfp);
-    if (afp)
-        fclose(afp);
-    return err;
-    }
-
-/*--------------------------------------------------
-  Processes either a single file or 
-  a set of files whose names are passed in a file.
-  A single file is specified as:
-    aes_test -f xxx.req
-  A set of files is specified as:
-    aes_test -d xxxxx.xxx
-  The default is: -d req.txt
---------------------------------------------------*/
-int main(int argc, char **argv)
-    {
-    char *rqlist = "req.txt";
-    FILE *fp = NULL;
-    char fn[250] = "", rfn[256] = "";
-    int f_opt = 0, d_opt = 1;
-
-#ifdef OPENSSL_FIPS
-    if(!FIPS_mode_set(1))
-        {
-        ERR_load_crypto_strings();
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        EXIT(1);
-        }
-#endif
-    ERR_load_crypto_strings();
-    if (argc > 1)
-        {
-        if (strcasecmp(argv[1], "-d") == 0)
-            {
-            d_opt = 1;
-            }
-        else if (strcasecmp(argv[1], "-f") == 0)
-            {
-            f_opt = 1;
-            d_opt = 0;
-            }
-        else
-            {
-            printf("Invalid parameter: %s\n", argv[1]);
-            return 0;
-            }
-        if (argc < 3)
-            {
-            printf("Missing parameter\n");
-            return 0;
-            }
-        if (d_opt)
-            rqlist = argv[2];
-        else
-            strcpy(fn, argv[2]);
-        }
-    if (d_opt)
-        { /* list of files (directory) */
-        if (!(fp = fopen(rqlist, "r")))
-            {
-            printf("Cannot open req list file\n");
-            return -1;
-            }
-        while (fgets(fn, sizeof(fn), fp))
-            {
-            strtok(fn, "\r\n");
-            strcpy(rfn, fn);
-            printf("Processing: %s\n", rfn);
-            if (proc_file(rfn))
-                {
-                printf(">>> Processing failed for: %s <<<\n", rfn);
-                EXIT(1);
-                }
-            }
-        fclose(fp);
-        }
-    else /* single file */
-        {
-        printf("Processing: %s\n", fn);
-        if (proc_file(fn))
-            {
-            printf(">>> Processing failed for: %s <<<\n", fn);
-            }
-        }
-    EXIT(0);
-    return 0;
-    }
diff --git a/src/lib/libssl/src/fips-1.0/des/fips_set_key.c b/src/lib/libssl/src/fips-1.0/des/fips_set_key.c
deleted file mode 100644
index a508ee5acb..0000000000
--- a/src/lib/libssl/src/fips-1.0/des/fips_set_key.c
+++ /dev/null
@@ -1,417 +0,0 @@
-/* crypto/des/set_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* set_key.c v 1.4 eay 24/9/91
- * 1.4 Speed up by 400% :-)
- * 1.3 added register declarations.
- * 1.2 unrolled make_key_sched a bit more
- * 1.1 added norm_expand_bits
- * 1.0 First working version
- */
-#include "fips_des_locl.h"
-#include <openssl/fips.h>
-
-#ifdef OPENSSL_FIPS
-
-OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);    /* defaults to false */
-
-static const unsigned char odd_parity[256]={
-  1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
- 16, 16, 19, 19, 21, 21, 22, 22, 25, 25, 26, 26, 28, 28, 31, 31,
- 32, 32, 35, 35, 37, 37, 38, 38, 41, 41, 42, 42, 44, 44, 47, 47,
- 49, 49, 50, 50, 52, 52, 55, 55, 56, 56, 59, 59, 61, 61, 62, 62,
- 64, 64, 67, 67, 69, 69, 70, 70, 73, 73, 74, 74, 76, 76, 79, 79,
- 81, 81, 82, 82, 84, 84, 87, 87, 88, 88, 91, 91, 93, 93, 94, 94,
- 97, 97, 98, 98,100,100,103,103,104,104,107,107,109,109,110,110,
-112,112,115,115,117,117,118,118,121,121,122,122,124,124,127,127,
-128,128,131,131,133,133,134,134,137,137,138,138,140,140,143,143,
-145,145,146,146,148,148,151,151,152,152,155,155,157,157,158,158,
-161,161,162,162,164,164,167,167,168,168,171,171,173,173,174,174,
-176,176,179,179,181,181,182,182,185,185,186,186,188,188,191,191,
-193,193,194,194,196,196,199,199,200,200,203,203,205,205,206,206,
-208,208,211,211,213,213,214,214,217,217,218,218,220,220,223,223,
-224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
-241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254};
-
-void DES_set_odd_parity(DES_cblock *key)
-        {
-        int i;
-
-        for (i=0; i<DES_KEY_SZ; i++)
-                (*key)[i]=odd_parity[(*key)[i]];
-        }
-
-int DES_check_key_parity(const_DES_cblock *key)
-        {
-        int i;
-
-        for (i=0; i<DES_KEY_SZ; i++)
-                {
-                if ((*key)[i] != odd_parity[(*key)[i]])
-                        return(0);
-                }
-        return(1);
-        }
-
-/* Weak and semi week keys as take from
- * %A D.W. Davies
- * %A W.L. Price
- * %T Security for Computer Networks
- * %I John Wiley & Sons
- * %D 1984
- * Many thanks to smb@ulysses.att.com (Steven Bellovin) for the reference
- * (and actual cblock values).
- */
-#define NUM_WEAK_KEY    16
-static const DES_cblock weak_keys[NUM_WEAK_KEY]={
-        /* weak keys */
-        {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
-        {0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE},
-        {0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
-        {0xE0,0xE0,0xE0,0xE0,0xF1,0xF1,0xF1,0xF1},
-        /* semi-weak keys */
-        {0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE},
-        {0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01},
-        {0x1F,0xE0,0x1F,0xE0,0x0E,0xF1,0x0E,0xF1},
-        {0xE0,0x1F,0xE0,0x1F,0xF1,0x0E,0xF1,0x0E},
-        {0x01,0xE0,0x01,0xE0,0x01,0xF1,0x01,0xF1},
-        {0xE0,0x01,0xE0,0x01,0xF1,0x01,0xF1,0x01},
-        {0x1F,0xFE,0x1F,0xFE,0x0E,0xFE,0x0E,0xFE},
-        {0xFE,0x1F,0xFE,0x1F,0xFE,0x0E,0xFE,0x0E},
-        {0x01,0x1F,0x01,0x1F,0x01,0x0E,0x01,0x0E},
-        {0x1F,0x01,0x1F,0x01,0x0E,0x01,0x0E,0x01},
-        {0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
-        {0xFE,0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1}};
-
-int DES_is_weak_key(const_DES_cblock *key)
-        {
-        int i;
-
-        for (i=0; i<NUM_WEAK_KEY; i++)
-                /* Added == 0 to comparison, I obviously don't run
-                 * this section very often :-(, thanks to
-                 * engineering@MorningStar.Com for the fix
-                 * eay 93/06/29
-                 * Another problem, I was comparing only the first 4
-                 * bytes, 97/03/18 */
-                if (memcmp(weak_keys[i],key,sizeof(DES_cblock)) == 0) return(1);
-        return(0);
-        }
-
-/* NOW DEFINED IN des_local.h
- * See ecb_encrypt.c for a pseudo description of these macros. 
- * #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
- *      (b)^=(t),\
- *      (a)=((a)^((t)<<(n))))
- */
-
-#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
-        (a)=(a)^(t)^(t>>(16-(n))))
-
-static const DES_LONG des_skb[8][64]={
-        {
-        /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
-        0x00000000L,0x00000010L,0x20000000L,0x20000010L,
-        0x00010000L,0x00010010L,0x20010000L,0x20010010L,
-        0x00000800L,0x00000810L,0x20000800L,0x20000810L,
-        0x00010800L,0x00010810L,0x20010800L,0x20010810L,
-        0x00000020L,0x00000030L,0x20000020L,0x20000030L,
-        0x00010020L,0x00010030L,0x20010020L,0x20010030L,
-        0x00000820L,0x00000830L,0x20000820L,0x20000830L,
-        0x00010820L,0x00010830L,0x20010820L,0x20010830L,
-        0x00080000L,0x00080010L,0x20080000L,0x20080010L,
-        0x00090000L,0x00090010L,0x20090000L,0x20090010L,
-        0x00080800L,0x00080810L,0x20080800L,0x20080810L,
-        0x00090800L,0x00090810L,0x20090800L,0x20090810L,
-        0x00080020L,0x00080030L,0x20080020L,0x20080030L,
-        0x00090020L,0x00090030L,0x20090020L,0x20090030L,
-        0x00080820L,0x00080830L,0x20080820L,0x20080830L,
-        0x00090820L,0x00090830L,0x20090820L,0x20090830L,
-        },{
-        /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
-        0x00000000L,0x02000000L,0x00002000L,0x02002000L,
-        0x00200000L,0x02200000L,0x00202000L,0x02202000L,
-        0x00000004L,0x02000004L,0x00002004L,0x02002004L,
-        0x00200004L,0x02200004L,0x00202004L,0x02202004L,
-        0x00000400L,0x02000400L,0x00002400L,0x02002400L,
-        0x00200400L,0x02200400L,0x00202400L,0x02202400L,
-        0x00000404L,0x02000404L,0x00002404L,0x02002404L,
-        0x00200404L,0x02200404L,0x00202404L,0x02202404L,
-        0x10000000L,0x12000000L,0x10002000L,0x12002000L,
-        0x10200000L,0x12200000L,0x10202000L,0x12202000L,
-        0x10000004L,0x12000004L,0x10002004L,0x12002004L,
-        0x10200004L,0x12200004L,0x10202004L,0x12202004L,
-        0x10000400L,0x12000400L,0x10002400L,0x12002400L,
-        0x10200400L,0x12200400L,0x10202400L,0x12202400L,
-        0x10000404L,0x12000404L,0x10002404L,0x12002404L,
-        0x10200404L,0x12200404L,0x10202404L,0x12202404L,
-        },{
-        /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
-        0x00000000L,0x00000001L,0x00040000L,0x00040001L,
-        0x01000000L,0x01000001L,0x01040000L,0x01040001L,
-        0x00000002L,0x00000003L,0x00040002L,0x00040003L,
-        0x01000002L,0x01000003L,0x01040002L,0x01040003L,
-        0x00000200L,0x00000201L,0x00040200L,0x00040201L,
-        0x01000200L,0x01000201L,0x01040200L,0x01040201L,
-        0x00000202L,0x00000203L,0x00040202L,0x00040203L,
-        0x01000202L,0x01000203L,0x01040202L,0x01040203L,
-        0x08000000L,0x08000001L,0x08040000L,0x08040001L,
-        0x09000000L,0x09000001L,0x09040000L,0x09040001L,
-        0x08000002L,0x08000003L,0x08040002L,0x08040003L,
-        0x09000002L,0x09000003L,0x09040002L,0x09040003L,
-        0x08000200L,0x08000201L,0x08040200L,0x08040201L,
-        0x09000200L,0x09000201L,0x09040200L,0x09040201L,
-        0x08000202L,0x08000203L,0x08040202L,0x08040203L,
-        0x09000202L,0x09000203L,0x09040202L,0x09040203L,
-        },{
-        /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
-        0x00000000L,0x00100000L,0x00000100L,0x00100100L,
-        0x00000008L,0x00100008L,0x00000108L,0x00100108L,
-        0x00001000L,0x00101000L,0x00001100L,0x00101100L,
-        0x00001008L,0x00101008L,0x00001108L,0x00101108L,
-        0x04000000L,0x04100000L,0x04000100L,0x04100100L,
-        0x04000008L,0x04100008L,0x04000108L,0x04100108L,
-        0x04001000L,0x04101000L,0x04001100L,0x04101100L,
-        0x04001008L,0x04101008L,0x04001108L,0x04101108L,
-        0x00020000L,0x00120000L,0x00020100L,0x00120100L,
-        0x00020008L,0x00120008L,0x00020108L,0x00120108L,
-        0x00021000L,0x00121000L,0x00021100L,0x00121100L,
-        0x00021008L,0x00121008L,0x00021108L,0x00121108L,
-        0x04020000L,0x04120000L,0x04020100L,0x04120100L,
-        0x04020008L,0x04120008L,0x04020108L,0x04120108L,
-        0x04021000L,0x04121000L,0x04021100L,0x04121100L,
-        0x04021008L,0x04121008L,0x04021108L,0x04121108L,
-        },{
-        /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
-        0x00000000L,0x10000000L,0x00010000L,0x10010000L,
-        0x00000004L,0x10000004L,0x00010004L,0x10010004L,
-        0x20000000L,0x30000000L,0x20010000L,0x30010000L,
-        0x20000004L,0x30000004L,0x20010004L,0x30010004L,
-        0x00100000L,0x10100000L,0x00110000L,0x10110000L,
-        0x00100004L,0x10100004L,0x00110004L,0x10110004L,
-        0x20100000L,0x30100000L,0x20110000L,0x30110000L,
-        0x20100004L,0x30100004L,0x20110004L,0x30110004L,
-        0x00001000L,0x10001000L,0x00011000L,0x10011000L,
-        0x00001004L,0x10001004L,0x00011004L,0x10011004L,
-        0x20001000L,0x30001000L,0x20011000L,0x30011000L,
-        0x20001004L,0x30001004L,0x20011004L,0x30011004L,
-        0x00101000L,0x10101000L,0x00111000L,0x10111000L,
-        0x00101004L,0x10101004L,0x00111004L,0x10111004L,
-        0x20101000L,0x30101000L,0x20111000L,0x30111000L,
-        0x20101004L,0x30101004L,0x20111004L,0x30111004L,
-        },{
-        /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
-        0x00000000L,0x08000000L,0x00000008L,0x08000008L,
-        0x00000400L,0x08000400L,0x00000408L,0x08000408L,
-        0x00020000L,0x08020000L,0x00020008L,0x08020008L,
-        0x00020400L,0x08020400L,0x00020408L,0x08020408L,
-        0x00000001L,0x08000001L,0x00000009L,0x08000009L,
-        0x00000401L,0x08000401L,0x00000409L,0x08000409L,
-        0x00020001L,0x08020001L,0x00020009L,0x08020009L,
-        0x00020401L,0x08020401L,0x00020409L,0x08020409L,
-        0x02000000L,0x0A000000L,0x02000008L,0x0A000008L,
-        0x02000400L,0x0A000400L,0x02000408L,0x0A000408L,
-        0x02020000L,0x0A020000L,0x02020008L,0x0A020008L,
-        0x02020400L,0x0A020400L,0x02020408L,0x0A020408L,
-        0x02000001L,0x0A000001L,0x02000009L,0x0A000009L,
-        0x02000401L,0x0A000401L,0x02000409L,0x0A000409L,
-        0x02020001L,0x0A020001L,0x02020009L,0x0A020009L,
-        0x02020401L,0x0A020401L,0x02020409L,0x0A020409L,
-        },{
-        /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
-        0x00000000L,0x00000100L,0x00080000L,0x00080100L,
-        0x01000000L,0x01000100L,0x01080000L,0x01080100L,
-        0x00000010L,0x00000110L,0x00080010L,0x00080110L,
-        0x01000010L,0x01000110L,0x01080010L,0x01080110L,
-        0x00200000L,0x00200100L,0x00280000L,0x00280100L,
-        0x01200000L,0x01200100L,0x01280000L,0x01280100L,
-        0x00200010L,0x00200110L,0x00280010L,0x00280110L,
-        0x01200010L,0x01200110L,0x01280010L,0x01280110L,
-        0x00000200L,0x00000300L,0x00080200L,0x00080300L,
-        0x01000200L,0x01000300L,0x01080200L,0x01080300L,
-        0x00000210L,0x00000310L,0x00080210L,0x00080310L,
-        0x01000210L,0x01000310L,0x01080210L,0x01080310L,
-        0x00200200L,0x00200300L,0x00280200L,0x00280300L,
-        0x01200200L,0x01200300L,0x01280200L,0x01280300L,
-        0x00200210L,0x00200310L,0x00280210L,0x00280310L,
-        0x01200210L,0x01200310L,0x01280210L,0x01280310L,
-        },{
-        /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
-        0x00000000L,0x04000000L,0x00040000L,0x04040000L,
-        0x00000002L,0x04000002L,0x00040002L,0x04040002L,
-        0x00002000L,0x04002000L,0x00042000L,0x04042000L,
-        0x00002002L,0x04002002L,0x00042002L,0x04042002L,
-        0x00000020L,0x04000020L,0x00040020L,0x04040020L,
-        0x00000022L,0x04000022L,0x00040022L,0x04040022L,
-        0x00002020L,0x04002020L,0x00042020L,0x04042020L,
-        0x00002022L,0x04002022L,0x00042022L,0x04042022L,
-        0x00000800L,0x04000800L,0x00040800L,0x04040800L,
-        0x00000802L,0x04000802L,0x00040802L,0x04040802L,
-        0x00002800L,0x04002800L,0x00042800L,0x04042800L,
-        0x00002802L,0x04002802L,0x00042802L,0x04042802L,
-        0x00000820L,0x04000820L,0x00040820L,0x04040820L,
-        0x00000822L,0x04000822L,0x00040822L,0x04040822L,
-        0x00002820L,0x04002820L,0x00042820L,0x04042820L,
-        0x00002822L,0x04002822L,0x00042822L,0x04042822L,
-        }};
-
-int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule)
-        {
-        if (FIPS_selftest_failed())
-                return -3;
-        if (DES_check_key)
-                {
-                return DES_set_key_checked(key, schedule);
-                }
-        else
-                {
-                DES_set_key_unchecked(key, schedule);
-                return 0;
-                }
-        }
-
-/* return 0 if key parity is odd (correct),
- * return -1 if key parity error,
- * return -2 if illegal weak key.
- */
-int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
-        {
-        if (!DES_check_key_parity(key))
-                return(-1);
-        if (DES_is_weak_key(key))
-                return(-2);
-        if (FIPS_selftest_failed())
-                return -3;
-
-        DES_set_key_unchecked(key, schedule);
-        return 0;
-        }
-
-void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
-        {
-        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;
-        register const unsigned char *in;
-        register DES_LONG *k;
-        register int i;
-
-#ifdef OPENBSD_DEV_CRYPTO
-        memcpy(schedule->key,key,sizeof schedule->key);
-        schedule->session=NULL;
-#endif
-        k = &schedule->ks->deslong[0];
-        in = &(*key)[0];
-
-        c2l(in,c);
-        c2l(in,d);
-
-        /* do PC1 in 47 simple operations :-)
-         * Thanks to John Fletcher (john_fletcher@lccmail.ocf.llnl.gov)
-         * for the inspiration. :-) */
-        PERM_OP (d,c,t,4,0x0f0f0f0fL);
-        HPERM_OP(c,t,-2,0xcccc0000L);
-        HPERM_OP(d,t,-2,0xcccc0000L);
-        PERM_OP (d,c,t,1,0x55555555L);
-        PERM_OP (c,d,t,8,0x00ff00ffL);
-        PERM_OP (d,c,t,1,0x55555555L);
-        d=      (((d&0x000000ffL)<<16L)| (d&0x0000ff00L)     |
-                 ((d&0x00ff0000L)>>16L)|((c&0xf0000000L)>>4L));
-        c&=0x0fffffffL;
-
-        for (i=0; i<ITERATIONS; i++)
-                {
-                if (shifts2[i])
-                        { c=((c>>2L)|(c<<26L)); d=((d>>2L)|(d<<26L)); }
-                else
-                        { c=((c>>1L)|(c<<27L)); d=((d>>1L)|(d<<27L)); }
-                c&=0x0fffffffL;
-                d&=0x0fffffffL;
-                /* could be a few less shifts but I am to lazy at this
-                 * point in time to investigate */
-                s=      des_skb[0][ (c    )&0x3f                ]|
-                        des_skb[1][((c>> 6L)&0x03)|((c>> 7L)&0x3c)]|
-                        des_skb[2][((c>>13L)&0x0f)|((c>>14L)&0x30)]|
-                        des_skb[3][((c>>20L)&0x01)|((c>>21L)&0x06) |
-                                                  ((c>>22L)&0x38)];
-                t=      des_skb[4][ (d    )&0x3f                ]|
-                        des_skb[5][((d>> 7L)&0x03)|((d>> 8L)&0x3c)]|
-                        des_skb[6][ (d>>15L)&0x3f                ]|
-                        des_skb[7][((d>>21L)&0x0f)|((d>>22L)&0x30)];
-
-                /* table contained 0213 4657 */
-                t2=((t<<16L)|(s&0x0000ffffL))&0xffffffffL;
-                *(k++)=ROTATE(t2,30)&0xffffffffL;
-
-                t2=((s>>16L)|(t&0xffff0000L));
-                *(k++)=ROTATE(t2,26)&0xffffffffL;
-                }
-        }
-
-int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule)
-        {
-        return(DES_set_key(key,schedule));
-        }
-/*
-#undef des_fixup_key_parity
-void des_fixup_key_parity(des_cblock *key)
-        {
-        des_set_odd_parity(key);
-        }
-*/
-
-#endif /* def OPENSSL_FIPS */
diff --git a/src/lib/libssl/src/fips-1.0/dh/Makefile b/src/lib/libssl/src/fips-1.0/dh/Makefile
deleted file mode 100644
index 1166ca6e84..0000000000
--- a/src/lib/libssl/src/fips-1.0/dh/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# OpenSSL/fips-1.0/dh/Makefile
-#
-
-DIR=    dh
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_dh_check.c fips_dh_gen.c fips_dh_key.c
-LIBOBJ=fips_dh_check.o fips_dh_gen.o fips_dh_key.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    lib
-
-lib:    $(LIBOBJ)
-        @echo $(LIBOBJ) > lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_dh_check.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dh_check.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-fips_dh_check.o: ../../include/openssl/e_os2.h
-fips_dh_check.o: ../../include/openssl/opensslconf.h
-fips_dh_check.o: ../../include/openssl/opensslv.h
-fips_dh_check.o: ../../include/openssl/ossl_typ.h
-fips_dh_check.o: ../../include/openssl/safestack.h
-fips_dh_check.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_dh_check.o: fips_dh_check.c
-fips_dh_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dh_gen.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-fips_dh_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_dh_gen.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_dh_gen.o: ../../include/openssl/opensslconf.h
-fips_dh_gen.o: ../../include/openssl/opensslv.h
-fips_dh_gen.o: ../../include/openssl/ossl_typ.h
-fips_dh_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_dh_gen.o: ../../include/openssl/symhacks.h fips_dh_gen.c
-fips_dh_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dh_key.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-fips_dh_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_dh_key.o: ../../include/openssl/lhash.h
-fips_dh_key.o: ../../include/openssl/opensslconf.h
-fips_dh_key.o: ../../include/openssl/opensslv.h
-fips_dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_dh_key.o: ../../include/openssl/symhacks.h fips_dh_key.c
diff --git a/src/lib/libssl/src/fips-1.0/dh/fips_dh_check.c b/src/lib/libssl/src/fips-1.0/dh/fips_dh_check.c
deleted file mode 100644
index 874920b466..0000000000
--- a/src/lib/libssl/src/fips-1.0/dh/fips_dh_check.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* crypto/dh/dh_check.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-
-#ifdef OPENSSL_FIPS
-
-/* Check that p is a safe prime and
- * if g is 2, 3 or 5, check that is is a suitable generator
- * where
- * for 2, p mod 24 == 11
- * for 3, p mod 12 == 5
- * for 5, p mod 10 == 3 or 7
- * should hold.
- */
-
-int DH_check(const DH *dh, int *ret)
-        {
-        int ok=0;
-        BN_CTX *ctx=NULL;
-        BN_ULONG l;
-        BIGNUM *q=NULL;
-
-        *ret=0;
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        q=BN_new();
-        if (q == NULL) goto err;
-
-        if (BN_is_word(dh->g,DH_GENERATOR_2))
-                {
-                l=BN_mod_word(dh->p,24);
-                if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-#if 0
-        else if (BN_is_word(dh->g,DH_GENERATOR_3))
-                {
-                l=BN_mod_word(dh->p,12);
-                if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-#endif
-        else if (BN_is_word(dh->g,DH_GENERATOR_5))
-                {
-                l=BN_mod_word(dh->p,10);
-                if ((l != 3) && (l != 7))
-                        *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-        else
-                *ret|=DH_UNABLE_TO_CHECK_GENERATOR;
-
-        if (!BN_is_prime(dh->p,BN_prime_checks,NULL,ctx,NULL))
-                *ret|=DH_CHECK_P_NOT_PRIME;
-        else
-                {
-                if (!BN_rshift1(q,dh->p)) goto err;
-                if (!BN_is_prime(q,BN_prime_checks,NULL,ctx,NULL))
-                        *ret|=DH_CHECK_P_NOT_SAFE_PRIME;
-                }
-        ok=1;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (q != NULL) BN_free(q);
-        return(ok);
-        }
-
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/dh/fips_dh_gen.c b/src/lib/libssl/src/fips-1.0/dh/fips_dh_gen.c
deleted file mode 100644
index b569e3912d..0000000000
--- a/src/lib/libssl/src/fips-1.0/dh/fips_dh_gen.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* crypto/dh/dh_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-#include <openssl/fips.h>
-
-#ifndef OPENSSL_NO_DH
-#ifdef OPENSSL_FIPS
-
-/* We generate DH parameters as follows
- * find a prime q which is prime_len/2 bits long.
- * p=(2*q)+1 or (p-1)/2 = q
- * For this case, g is a generator if
- * g^((p-1)/q) mod p != 1 for values of q which are the factors of p-1.
- * Since the factors of p-1 are q and 2, we just need to check
- * g^2 mod p != 1 and g^q mod p != 1.
- *
- * Having said all that,
- * there is another special case method for the generators 2, 3 and 5.
- * for 2, p mod 24 == 11
- * for 3, p mod 12 == 5  <<<<< does not work for safe primes.
- * for 5, p mod 10 == 3 or 7
- *
- * Thanks to Phil Karn <karn@qualcomm.com> for the pointers about the
- * special generators and for answering some of my questions.
- *
- * I've implemented the second simple method :-).
- * Since DH should be using a safe prime (both p and q are prime),
- * this generator function can take a very very long time to run.
- */
-/* Actually there is no reason to insist that 'generator' be a generator.
- * It's just as OK (and in some sense better) to use a generator of the
- * order-q subgroup.
- */
-
-DH *DH_generate_parameters(int prime_len, int generator,
-             void (*callback)(int,int,void *), void *cb_arg)
-        {
-        BIGNUM *p=NULL,*t1,*t2;
-        DH *ret=NULL;
-        int g,ok= -1;
-        BN_CTX *ctx=NULL;
-
-        if(FIPS_selftest_failed())
-                {
-                FIPSerr(FIPS_F_DH_GENERATE_PARAMETERS,FIPS_R_FIPS_SELFTEST_FAILED);
-                return NULL;
-                }
-
-        ret=DH_new();
-        if (ret == NULL) goto err;
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        BN_CTX_start(ctx);
-        t1 = BN_CTX_get(ctx);
-        t2 = BN_CTX_get(ctx);
-        if (t1 == NULL || t2 == NULL) goto err;
-        
-        if (generator <= 1)
-                {
-                DHerr(DH_F_DH_GENERATE_PARAMETERS, DH_R_BAD_GENERATOR);
-                goto err;
-                }
-        if (generator == DH_GENERATOR_2)
-                {
-                if (!BN_set_word(t1,24)) goto err;
-                if (!BN_set_word(t2,11)) goto err;
-                g=2;
-                }
-#if 0 /* does not work for safe primes */
-        else if (generator == DH_GENERATOR_3)
-                {
-                if (!BN_set_word(t1,12)) goto err;
-                if (!BN_set_word(t2,5)) goto err;
-                g=3;
-                }
-#endif
-        else if (generator == DH_GENERATOR_5)
-                {
-                if (!BN_set_word(t1,10)) goto err;
-                if (!BN_set_word(t2,3)) goto err;
-                /* BN_set_word(t3,7); just have to miss
-                 * out on these ones :-( */
-                g=5;
-                }
-        else
-                {
-                /* in the general case, don't worry if 'generator' is a
-                 * generator or not: since we are using safe primes,
-                 * it will generate either an order-q or an order-2q group,
-                 * which both is OK */
-                if (!BN_set_word(t1,2)) goto err;
-                if (!BN_set_word(t2,1)) goto err;
-                g=generator;
-                }
-        
-        p=BN_generate_prime(NULL,prime_len,1,t1,t2,callback,cb_arg);
-        if (p == NULL) goto err;
-        if (callback != NULL) callback(3,0,cb_arg);
-        ret->p=p;
-        ret->g=BN_new();
-        if (!BN_set_word(ret->g,g)) goto err;
-        ok=1;
-err:
-        if (ok == -1)
-                {
-                DHerr(DH_F_DH_GENERATE_PARAMETERS,ERR_R_BN_LIB);
-                ok=0;
-                }
-
-        if (ctx != NULL)
-                {
-                BN_CTX_end(ctx);
-                BN_CTX_free(ctx);
-                }
-        if (!ok && (ret != NULL))
-                {
-                DH_free(ret);
-                ret=NULL;
-                }
-        return(ret);
-        }
-
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/dh/fips_dh_key.c b/src/lib/libssl/src/fips-1.0/dh/fips_dh_key.c
deleted file mode 100644
index 79c10404d5..0000000000
--- a/src/lib/libssl/src/fips-1.0/dh/fips_dh_key.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* crypto/dh/dh_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_RAND
-#include <openssl/rand.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-
-#ifdef OPENSSL_FIPS
-
-static int generate_key(DH *dh);
-static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
-static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
-                        const BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *m, BN_CTX *ctx,
-                        BN_MONT_CTX *m_ctx);
-static int dh_init(DH *dh);
-static int dh_finish(DH *dh);
-
-int DH_generate_key(DH *dh)
-        {
-        return dh->meth->generate_key(dh);
-        }
-
-int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
-        {
-        return dh->meth->compute_key(key, pub_key, dh);
-        }
-
-static const DH_METHOD dh_ossl = {
-"OpenSSL DH Method",
-generate_key,
-compute_key,
-dh_bn_mod_exp,
-dh_init,
-dh_finish,
-0,
-NULL
-};
-
-const DH_METHOD *DH_OpenSSL(void)
-{
-        return &dh_ossl;
-}
-
-static int generate_key(DH *dh)
-        {
-        int ok=0;
-        int generate_new_key=0;
-        unsigned l;
-        BN_CTX *ctx;
-        BN_MONT_CTX *mont=NULL;
-        BIGNUM *pub_key=NULL,*priv_key=NULL;
-
-        ctx = BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        if (dh->priv_key == NULL)
-                {
-                priv_key=BN_new();
-                if (priv_key == NULL) goto err;
-                generate_new_key=1;
-                }
-        else
-                priv_key=dh->priv_key;
-
-        if (dh->pub_key == NULL)
-                {
-                pub_key=BN_new();
-                if (pub_key == NULL) goto err;
-                }
-        else
-                pub_key=dh->pub_key;
-
-        if (dh->flags & DH_FLAG_CACHE_MONT_P)
-                {
-                mont = BN_MONT_CTX_set_locked(
-                                (BN_MONT_CTX **)&dh->method_mont_p,
-                                CRYPTO_LOCK_DH, dh->p, ctx);
-                if (!mont)
-                        goto err;
-                }
-
-        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;
-                }
-
-        {
-                BIGNUM local_prk;
-                BIGNUM *prk;
-
-                if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0)
-                        {
-                        BN_init(&local_prk);
-                        prk = &local_prk;
-                        BN_with_flags(prk, priv_key, BN_FLG_EXP_CONSTTIME);
-                        }
-                else
-                        prk = priv_key;
-
-                if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, prk, dh->p, ctx, mont))
-                        goto err;
-        }
-                
-        dh->pub_key=pub_key;
-        dh->priv_key=priv_key;
-        ok=1;
-err:
-        if (ok != 1)
-                DHerr(DH_F_DH_GENERATE_KEY,ERR_R_BN_LIB);
-
-        if ((pub_key != NULL)  && (dh->pub_key == NULL))  BN_free(pub_key);
-        if ((priv_key != NULL) && (dh->priv_key == NULL)) BN_free(priv_key);
-        BN_CTX_free(ctx);
-        return(ok);
-        }
-
-static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
-        {
-        BN_CTX *ctx;
-        BN_MONT_CTX *mont=NULL;
-        BIGNUM *tmp;
-        int ret= -1;
-
-        ctx = BN_CTX_new();
-        if (ctx == NULL) goto err;
-        BN_CTX_start(ctx);
-        tmp = BN_CTX_get(ctx);
-        
-        if (dh->priv_key == NULL)
-                {
-                DHerr(DH_F_DH_COMPUTE_KEY,DH_R_NO_PRIVATE_VALUE);
-                goto err;
-                }
-
-        if (dh->flags & DH_FLAG_CACHE_MONT_P)
-                {
-                mont = BN_MONT_CTX_set_locked(
-                                (BN_MONT_CTX **)&dh->method_mont_p,
-                                CRYPTO_LOCK_DH, dh->p, ctx);
-                if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0)
-                        {
-                        /* XXX */
-                        BN_set_flags(dh->priv_key, BN_FLG_EXP_CONSTTIME);
-                        }
-                if (!mont)
-                        goto err;
-                }
-
-        if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key,dh->p,ctx,mont))
-                {
-                DHerr(DH_F_DH_COMPUTE_KEY,ERR_R_BN_LIB);
-                goto err;
-                }
-
-        ret=BN_bn2bin(tmp,key);
-err:
-        BN_CTX_end(ctx);
-        BN_CTX_free(ctx);
-        return(ret);
-        }
-
-static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
-                        const BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *m, BN_CTX *ctx,
-                        BN_MONT_CTX *m_ctx)
-        {
-        /* If a is only one word long and constant time is false, use the faster
-         * exponenentiation function.
-         */
-        if (a->top == 1 && ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) != 0))
-                {
-                BN_ULONG A = a->d[0];
-                return BN_mod_exp_mont_word(r,A,p,m,ctx,m_ctx);
-                }
-        else
-                return BN_mod_exp_mont(r,a,p,m,ctx,m_ctx);
-        }
-
-
-static int dh_init(DH *dh)
-        {
-        dh->flags |= DH_FLAG_CACHE_MONT_P;
-        return(1);
-        }
-
-static int dh_finish(DH *dh)
-        {
-        if(dh->method_mont_p)
-                BN_MONT_CTX_free((BN_MONT_CTX *)dh->method_mont_p);
-        return(1);
-        }
-
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/dsa/Makefile b/src/lib/libssl/src/fips-1.0/dsa/Makefile
deleted file mode 100644
index aeb08b5943..0000000000
--- a/src/lib/libssl/src/fips-1.0/dsa/Makefile
+++ /dev/null
@@ -1,147 +0,0 @@
-#
-# OpenSSL/fips-1.0/dsa/Makefile
-#
-
-DIR=    dsa
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=fips_dsatest.c fips_dssvs.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_dsa_ossl.c fips_dsa_gen.c fips_dsa_selftest.c
-LIBOBJ=fips_dsa_ossl.o fips_dsa_gen.o fips_dsa_selftest.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    lib
-
-lib:    $(LIBOBJ)
-        @echo $(LIBOBJ) > lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-Q=../testvectors/dsa/req
-A=../testvectors/dsa/rsp
-
-fips_test:
-        -rm -rf $A
-        mkdir $A
-        if [ -f $(Q)/PQGGen.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_dssvs pqg < $(Q)/PQGGen.req > $(A)/PQGGen.rsp; fi
-        if [ -f $(Q)/KeyPair.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_dssvs keypair < $(Q)/KeyPair.req > $(A)/KeyPair.rsp; fi
-        if [ -f $(Q)/SigGen.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_dssvs siggen < $(Q)/SigGen.req > $(A)/SigGen.rsp; fi
-        if [ -f $(Q)/SigVer.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_dssvs sigver < $Q/SigVer.req > $A/SigVer.rsp; fi
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_dsa_gen.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-fips_dsa_gen.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
-fips_dsa_gen.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_dsa_gen.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_dsa_gen.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
-fips_dsa_gen.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-fips_dsa_gen.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-fips_dsa_gen.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-fips_dsa_gen.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-fips_dsa_gen.o: ../../include/openssl/opensslconf.h
-fips_dsa_gen.o: ../../include/openssl/opensslv.h
-fips_dsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_dsa_gen.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_dsa_gen.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-fips_dsa_gen.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_dsa_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_dsa_gen.o: ../../include/openssl/ui_compat.h fips_dsa_gen.c
-fips_dsa_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_dsa_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_dsa_ossl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-fips_dsa_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-fips_dsa_ossl.o: ../../include/openssl/err.h ../../include/openssl/fips.h
-fips_dsa_ossl.o: ../../include/openssl/lhash.h
-fips_dsa_ossl.o: ../../include/openssl/opensslconf.h
-fips_dsa_ossl.o: ../../include/openssl/opensslv.h
-fips_dsa_ossl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_dsa_ossl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_dsa_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_dsa_ossl.o: ../../include/openssl/ui.h fips_dsa_ossl.c
-fips_dsa_selftest.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dsa_selftest.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-fips_dsa_selftest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_dsa_selftest.o: ../../include/openssl/err.h ../../include/openssl/fips.h
-fips_dsa_selftest.o: ../../include/openssl/lhash.h
-fips_dsa_selftest.o: ../../include/openssl/opensslconf.h
-fips_dsa_selftest.o: ../../include/openssl/opensslv.h
-fips_dsa_selftest.o: ../../include/openssl/ossl_typ.h
-fips_dsa_selftest.o: ../../include/openssl/safestack.h
-fips_dsa_selftest.o: ../../include/openssl/stack.h
-fips_dsa_selftest.o: ../../include/openssl/symhacks.h fips_dsa_selftest.c
-fips_dsatest.o: ../../e_os.h ../../include/openssl/asn1.h
-fips_dsatest.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dsatest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_dsatest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_dsatest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_dsatest.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-fips_dsatest.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
-fips_dsatest.o: ../../include/openssl/lhash.h
-fips_dsatest.o: ../../include/openssl/opensslconf.h
-fips_dsatest.o: ../../include/openssl/opensslv.h
-fips_dsatest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_dsatest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_dsatest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_dsatest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_dsatest.o: fips_dsatest.c
-fips_dssvs.o: ../../include/openssl/opensslconf.h fips_dssvs.c
diff --git a/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_gen.c b/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_gen.c
deleted file mode 100644
index 8ed1de0195..0000000000
--- a/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_gen.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/* crypto/dsa/dsa_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#undef GENUINE_DSA
-
-#ifdef GENUINE_DSA
-/* Parameter generation follows the original release of FIPS PUB 186,
- * Appendix 2.2 (i.e. use SHA as defined in FIPS PUB 180) */
-#define HASH    EVP_sha()
-#else
-/* Parameter generation follows the updated Appendix 2.2 for FIPS PUB 186,
- * also Appendix 2.2 of FIPS PUB 186-1 (i.e. use SHA as defined in
- * FIPS PUB 180-1) */
-#define HASH    EVP_sha1()
-#endif 
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-/*#include "cryptlib.h"*/
-#include <openssl/evp.h>
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_RAND
-#include <openssl/rand.h>
-#endif
-#ifndef OPENSSL_NO_SHA
-#include <openssl/fips_sha.h>
-#endif
-#include <openssl/fips.h>
-#include <openssl/err.h>
-
-#ifndef OPENSSL_NO_DSA
-#ifdef OPENSSL_FIPS
-
-static int fips_check_dsa(DSA *dsa)
-    {
-    static const unsigned char str1[]="12345678901234567890";
-    unsigned char sig[256];
-    unsigned int siglen;
-
-    DSA_sign(0, str1, 20, sig, &siglen, dsa);
-    if(DSA_verify(0, str1, 20, sig, siglen, dsa) != 1)
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
-        return 0;
-        }
-    return 1;
-    }
-
-DSA *DSA_generate_parameters(FIPS_DSA_SIZE_T bits,
-                unsigned char *seed_in, FIPS_DSA_SIZE_T seed_len,
-                int *counter_ret, unsigned long *h_ret,
-                void (*callback)(int, int, void *),
-                void *cb_arg)
-        {
-        int ok=0;
-        unsigned char seed[SHA_DIGEST_LENGTH];
-        unsigned char md[SHA_DIGEST_LENGTH];
-        unsigned char buf[SHA_DIGEST_LENGTH],buf2[SHA_DIGEST_LENGTH];
-        BIGNUM *r0,*W,*X,*c,*test;
-        BIGNUM *g=NULL,*q=NULL,*p=NULL;
-        BN_MONT_CTX *mont=NULL;
-        int k,n=0,i,b,m=0;
-        int counter=0;
-        int r=0;
-        BN_CTX *ctx=NULL,*ctx2=NULL,*ctx3=NULL;
-        unsigned int h=2;
-        DSA *ret=NULL;
-        unsigned char *seed_out=seed_in;
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_DSA_GENERATE_PARAMETERS,
-                    FIPS_R_FIPS_SELFTEST_FAILED);
-            goto err;
-            }
-
-        if (bits < 512) bits=512;
-        bits=(bits+63)/64*64;
-
-        if (seed_len < 20)
-                seed_in = NULL; /* seed buffer too small -- ignore */
-        if (seed_len > 20) 
-                seed_len = 20; /* App. 2.2 of FIPS PUB 186 allows larger SEED,
-                                * but our internal buffers are restricted to 160 bits*/
-        if ((seed_in != NULL) && (seed_len == 20))
-                memcpy(seed,seed_in,seed_len);
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        if ((ctx2=BN_CTX_new()) == NULL) goto err;
-        if ((ctx3=BN_CTX_new()) == NULL) goto err;
-        if ((ret=DSA_new()) == NULL) goto err;
-
-        if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
-
-        BN_CTX_start(ctx2);
-        r0 = BN_CTX_get(ctx2);
-        g = BN_CTX_get(ctx2);
-        W = BN_CTX_get(ctx2);
-        q = BN_CTX_get(ctx2);
-        X = BN_CTX_get(ctx2);
-        c = BN_CTX_get(ctx2);
-        p = BN_CTX_get(ctx2);
-        test = BN_CTX_get(ctx2);
-
-        BN_lshift(test,BN_value_one(),bits-1);
-
-        for (;;)
-                {
-                for (;;) /* find q */
-                        {
-                        int seed_is_random;
-
-                        /* step 1 */
-                        if (callback != NULL) callback(0,m++,cb_arg);
-
-                        if (!seed_len)
-                                {
-                                if(RAND_pseudo_bytes(seed,SHA_DIGEST_LENGTH) < 0)
-                                        goto err;
-                                seed_is_random = 1;
-                                }
-                        else
-                                {
-                                seed_is_random = 0;
-                                seed_len=0; /* use random seed if 'seed_in' turns out to be bad*/
-                                }
-                        memcpy(buf,seed,SHA_DIGEST_LENGTH);
-                        memcpy(buf2,seed,SHA_DIGEST_LENGTH);
-                        /* precompute "SEED + 1" for step 7: */
-                        for (i=SHA_DIGEST_LENGTH-1; i >= 0; i--)
-                                {
-                                buf[i]++;
-                                if (buf[i] != 0) break;
-                                }
-
-                        /* step 2 */
-                        EVP_Digest(seed,SHA_DIGEST_LENGTH,md,NULL,HASH, NULL);
-                        EVP_Digest(buf,SHA_DIGEST_LENGTH,buf2,NULL,HASH, NULL);
-                        for (i=0; i<SHA_DIGEST_LENGTH; i++)
-                                md[i]^=buf2[i];
-
-                        /* step 3 */
-                        md[0]|=0x80;
-                        md[SHA_DIGEST_LENGTH-1]|=0x01;
-                        if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,q)) goto err;
-
-                        /* step 4 */
-                        r = BN_is_prime_fasttest(q, DSS_prime_checks, callback, ctx3, cb_arg, seed_is_random);
-                        if (r > 0)
-                                break;
-                        if (r != 0)
-                                goto err;
-
-                        /* do a callback call */
-                        /* step 5 */
-                        }
-
-                if (callback != NULL) callback(2,0,cb_arg);
-                if (callback != NULL) callback(3,0,cb_arg);
-
-                /* step 6 */
-                counter=0;
-                /* "offset = 2" */
-
-                n=(bits-1)/160;
-                b=(bits-1)-n*160;
-
-                for (;;)
-                        {
-                        if (callback != NULL && counter != 0)
-                                callback(0,counter,cb_arg);
-
-                        /* step 7 */
-                        BN_zero(W);
-                        /* now 'buf' contains "SEED + offset - 1" */
-                        for (k=0; k<=n; k++)
-                                {
-                                /* obtain "SEED + offset + k" by incrementing: */
-                                for (i=SHA_DIGEST_LENGTH-1; i >= 0; i--)
-                                        {
-                                        buf[i]++;
-                                        if (buf[i] != 0) break;
-                                        }
-
-                                EVP_Digest(buf,SHA_DIGEST_LENGTH,md,NULL,HASH, NULL);
-
-                                /* step 8 */
-                                if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,r0))
-                                        goto err;
-                                BN_lshift(r0,r0,160*k);
-                                BN_add(W,W,r0);
-                                }
-
-                        /* more of step 8 */
-                        BN_mask_bits(W,bits-1);
-                        BN_copy(X,W); /* this should be ok */
-                        BN_add(X,X,test); /* this should be ok */
-
-                        /* step 9 */
-                        BN_lshift1(r0,q);
-                        BN_mod(c,X,r0,ctx);
-                        BN_sub(r0,c,BN_value_one());
-                        BN_sub(p,X,r0);
-
-                        /* step 10 */
-                        if (BN_cmp(p,test) >= 0)
-                                {
-                                /* step 11 */
-                                r = BN_is_prime_fasttest(p, DSS_prime_checks, callback, ctx3, cb_arg, 1);
-                                if (r > 0)
-                                                goto end; /* found it */
-                                if (r != 0)
-                                        goto err;
-                                }
-
-                        /* step 13 */
-                        counter++;
-                        /* "offset = offset + n + 1" */
-
-                        /* step 14 */
-                        if (counter >= 4096) break;
-                        }
-                }
-end:
-        if (callback != NULL) callback(2,1,cb_arg);
-
-        /* We now need to generate g */
-        /* Set r0=(p-1)/q */
-        BN_sub(test,p,BN_value_one());
-        BN_div(r0,NULL,test,q,ctx);
-
-        BN_set_word(test,h);
-        BN_MONT_CTX_set(mont,p,ctx);
-
-        for (;;)
-                {
-                /* g=test^r0%p */
-                BN_mod_exp_mont(g,test,r0,p,ctx,mont);
-                if (!BN_is_one(g)) break;
-                BN_add(test,test,BN_value_one());
-                h++;
-                }
-
-        if (callback != NULL) callback(3,1,cb_arg);
-
-        ok=1;
-err:
-        if (!ok)
-                {
-                if (ret != NULL) DSA_free(ret);
-                }
-        else
-                {
-                ret->p=BN_dup(p);
-                ret->q=BN_dup(q);
-                ret->g=BN_dup(g);
-                if(seed_out != NULL) memcpy(seed_out,seed,20);
-                if (counter_ret != NULL) *counter_ret=counter;
-                if (h_ret != NULL) *h_ret=h;
-                }
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (ctx2 != NULL)
-                {
-                BN_CTX_end(ctx2);
-                BN_CTX_free(ctx2);
-                }
-        if (ctx3 != NULL) BN_CTX_free(ctx3);
-        if (mont != NULL) BN_MONT_CTX_free(mont);
-        return(ok?ret:NULL);
-        }
-
-int DSA_generate_key(DSA *dsa)
-        {
-        int ok=0;
-        BN_CTX *ctx=NULL;
-        BIGNUM *pub_key=NULL,*priv_key=NULL;
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-        if (dsa->priv_key == NULL)
-                {
-                if ((priv_key=BN_new()) == NULL) goto err;
-                }
-        else
-                priv_key=dsa->priv_key;
-
-        do
-                if (!BN_rand_range(priv_key,dsa->q)) goto err;
-        while (BN_is_zero(priv_key));
-
-        if (dsa->pub_key == NULL)
-                {
-                if ((pub_key=BN_new()) == NULL) goto err;
-                }
-        else
-                pub_key=dsa->pub_key;
-
-        if (!BN_mod_exp(pub_key,dsa->g,priv_key,dsa->p,ctx)) goto err;
-
-        dsa->priv_key=priv_key;
-        dsa->pub_key=pub_key;
-
-        if(!fips_check_dsa(dsa))
-            goto err;
-
-        ok=1;
-
-err:
-        if ((pub_key != NULL) && (dsa->pub_key == NULL)) BN_free(pub_key);
-        if ((priv_key != NULL) && (dsa->priv_key == NULL)) BN_free(priv_key);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        return(ok);
-        }
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_ossl.c b/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_ossl.c
deleted file mode 100644
index f8f3a39343..0000000000
--- a/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_ossl.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/* crypto/dsa/dsa_ossl.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
-
-#include <stdio.h>
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/rand.h>
-#include <openssl/asn1.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/fips.h>
-
-#ifdef OPENSSL_FIPS
-
-static DSA_SIG *dsa_do_sign(const unsigned char *dgst, FIPS_DSA_SIZE_T dlen, DSA *dsa);
-static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
-static int dsa_do_verify(const unsigned char *dgst, FIPS_DSA_SIZE_T dgst_len, DSA_SIG *sig,
-                  DSA *dsa);
-static int dsa_init(DSA *dsa);
-static int dsa_finish(DSA *dsa);
-static int dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
-                BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
-                BN_MONT_CTX *in_mont);
-static int dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-                                const BIGNUM *m, BN_CTX *ctx,
-                                BN_MONT_CTX *m_ctx);
-
-static const DSA_METHOD openssl_dsa_meth = {
-"OpenSSL FIPS DSA method",
-dsa_do_sign,
-dsa_sign_setup,
-dsa_do_verify,
-dsa_mod_exp,
-dsa_bn_mod_exp,
-dsa_init,
-dsa_finish,
-0,
-NULL
-};
-
-int FIPS_dsa_check(struct dsa_st *dsa)
-    {
-    if(dsa->meth != &openssl_dsa_meth || dsa->meth->dsa_do_sign != dsa_do_sign
-       || dsa->meth->dsa_sign_setup != dsa_sign_setup
-       || dsa->meth->dsa_mod_exp != dsa_mod_exp
-       || dsa->meth->bn_mod_exp != dsa_bn_mod_exp
-       || dsa->meth->init != dsa_init
-       || dsa->meth->finish != dsa_finish)
-        {
-        FIPSerr(FIPS_F_FIPS_DSA_CHECK,FIPS_R_NON_FIPS_METHOD);
-        return 0;
-        }
-    return 1;
-    }
-
-const DSA_METHOD *DSA_OpenSSL(void)
-{
-        return &openssl_dsa_meth;
-}
-
-static DSA_SIG *dsa_do_sign(const unsigned char *dgst, FIPS_DSA_SIZE_T dlen, DSA *dsa)
-        {
-        BIGNUM *kinv=NULL,*r=NULL,*s=NULL;
-        BIGNUM m;
-        BIGNUM xr;
-        BN_CTX *ctx=NULL;
-        int i,reason=ERR_R_BN_LIB;
-        DSA_SIG *ret=NULL;
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_DSA_DO_SIGN,FIPS_R_FIPS_SELFTEST_FAILED);
-            return NULL;
-            }
-
-        BN_init(&m);
-        BN_init(&xr);
-
-        if (!dsa->p || !dsa->q || !dsa->g)
-                {
-                reason=DSA_R_MISSING_PARAMETERS;
-                goto err;
-                }
-
-        s=BN_new();
-        if (s == NULL) goto err;
-
-        i=BN_num_bytes(dsa->q); /* should be 20 */
-        if ((dlen > i) || (dlen > 50))
-                {
-                reason=DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE;
-                goto err;
-                }
-
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        if (!DSA_sign_setup(dsa,ctx,&kinv,&r)) goto err;
-
-        if (BN_bin2bn(dgst,dlen,&m) == NULL) goto err;
-
-        /* Compute  s = inv(k) (m + xr) mod q */
-        if (!BN_mod_mul(&xr,dsa->priv_key,r,dsa->q,ctx)) goto err;/* s = xr */
-        if (!BN_add(s, &xr, &m)) goto err;              /* s = m + xr */
-        if (BN_cmp(s,dsa->q) > 0)
-                BN_sub(s,s,dsa->q);
-        if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err;
-
-        ret=DSA_SIG_new();
-        if (ret == NULL) goto err;
-        ret->r = r;
-        ret->s = s;
-        
-err:
-        if (!ret)
-                {
-                DSAerr(DSA_F_DSA_DO_SIGN,reason);
-                BN_free(r);
-                BN_free(s);
-                }
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&m);
-        BN_clear_free(&xr);
-        if (kinv != NULL) /* dsa->kinv is NULL now if we used it */
-            BN_clear_free(kinv);
-        return(ret);
-        }
-
-static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
-        {
-        BN_CTX *ctx;
-        BIGNUM k,kq,*K,*kinv=NULL,*r=NULL;
-        int ret=0;
-
-        if (!dsa->p || !dsa->q || !dsa->g)
-                {
-                DSAerr(DSA_F_DSA_SIGN_SETUP,DSA_R_MISSING_PARAMETERS);
-                return 0;
-                }
-
-        BN_init(&k);
-        BN_init(&kq);
-
-        if (ctx_in == NULL)
-                {
-                if ((ctx=BN_CTX_new()) == NULL) goto err;
-                }
-        else
-                ctx=ctx_in;
-
-        if ((r=BN_new()) == NULL) goto err;
-
-        /* Get random k */
-        do
-                if (!BN_rand_range(&k, dsa->q)) goto err;
-        while (BN_is_zero(&k));
-        if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
-                {
-                BN_set_flags(&k, BN_FLG_EXP_CONSTTIME);
-                }
-
-        if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
-                {
-                if (!BN_MONT_CTX_set_locked((BN_MONT_CTX **)&dsa->method_mont_p,
-                                                CRYPTO_LOCK_DSA,
-                                                dsa->p, ctx))
-                        goto err;
-                }
-
-        /* Compute r = (g^k mod p) mod q */
-
-        if ((dsa->flags & DSA_FLAG_NO_EXP_CONSTTIME) == 0)
-                {
-                if (!BN_copy(&kq, &k)) goto err;
-
-                /* We do not want timing information to leak the length of k,
-                 * so we compute g^k using an equivalent exponent of fixed length.
-                 *
-                 * (This is a kludge that we need because the BN_mod_exp_mont()
-                 * does not let us specify the desired timing behaviour.) */
-
-                if (!BN_add(&kq, &kq, dsa->q)) goto err;
-                if (BN_num_bits(&kq) <= BN_num_bits(dsa->q))
-                        {
-                        if (!BN_add(&kq, &kq, dsa->q)) goto err;
-                        }
-
-                K = &kq;
-                }
-        else
-                {
-                K = &k;
-                }
-        if (!dsa->meth->bn_mod_exp(dsa, r,dsa->g,K,dsa->p,ctx,
-                (BN_MONT_CTX *)dsa->method_mont_p)) goto err;
-        if (!BN_mod(r,r,dsa->q,ctx)) goto err;
-
-        /* Compute  part of 's = inv(k) (m + xr) mod q' */
-        if ((kinv=BN_mod_inverse(NULL,&k,dsa->q,ctx)) == NULL) goto err;
-
-        if (*kinvp != NULL) BN_clear_free(*kinvp);
-        *kinvp=kinv;
-        kinv=NULL;
-        if (*rp != NULL) BN_clear_free(*rp);
-        *rp=r;
-        ret=1;
-err:
-        if (!ret)
-                {
-                DSAerr(DSA_F_DSA_SIGN_SETUP,ERR_R_BN_LIB);
-                if (kinv != NULL) BN_clear_free(kinv);
-                if (r != NULL) BN_clear_free(r);
-                }
-        if (ctx_in == NULL) BN_CTX_free(ctx);
-        if (kinv != NULL) BN_clear_free(kinv);
-        BN_clear_free(&k);
-        BN_clear_free(&kq);
-        return(ret);
-        }
-
-static int dsa_do_verify(const unsigned char *dgst, FIPS_DSA_SIZE_T dgst_len, DSA_SIG *sig,
-                  DSA *dsa)
-        {
-        BN_CTX *ctx;
-        BIGNUM u1,u2,t1;
-        BN_MONT_CTX *mont=NULL;
-        int ret = -1;
-
-        if (!dsa->p || !dsa->q || !dsa->g)
-                {
-                DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MISSING_PARAMETERS);
-                return -1;
-                }
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_DSA_DO_VERIFY,FIPS_R_FIPS_SELFTEST_FAILED);
-            return -1;
-            }
-
-        BN_init(&u1);
-        BN_init(&u2);
-        BN_init(&t1);
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-        if (BN_is_zero(sig->r) || sig->r->neg || BN_ucmp(sig->r, dsa->q) >= 0)
-                {
-                ret = 0;
-                goto err;
-                }
-        if (BN_is_zero(sig->s) || sig->s->neg || BN_ucmp(sig->s, dsa->q) >= 0)
-                {
-                ret = 0;
-                goto err;
-                }
-
-        /* Calculate W = inv(S) mod Q
-         * save W in u2 */
-        if ((BN_mod_inverse(&u2,sig->s,dsa->q,ctx)) == NULL) goto err;
-
-        /* save M in u1 */
-        if (BN_bin2bn(dgst,dgst_len,&u1) == NULL) goto err;
-
-        /* u1 = M * w mod q */
-        if (!BN_mod_mul(&u1,&u1,&u2,dsa->q,ctx)) goto err;
-
-        /* u2 = r * w mod q */
-        if (!BN_mod_mul(&u2,sig->r,&u2,dsa->q,ctx)) goto err;
-
-
-        if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
-                {
-                mont = BN_MONT_CTX_set_locked(
-                                        (BN_MONT_CTX **)&dsa->method_mont_p,
-                                        CRYPTO_LOCK_DSA, dsa->p, ctx);
-                if (!mont)
-                        goto err;
-                }
-
-#if 0
-        {
-        BIGNUM t2;
-
-        BN_init(&t2);
-        /* v = ( g^u1 * y^u2 mod p ) mod q */
-        /* let t1 = g ^ u1 mod p */
-        if (!BN_mod_exp_mont(&t1,dsa->g,&u1,dsa->p,ctx,mont)) goto err;
-        /* let t2 = y ^ u2 mod p */
-        if (!BN_mod_exp_mont(&t2,dsa->pub_key,&u2,dsa->p,ctx,mont)) goto err;
-        /* let u1 = t1 * t2 mod p */
-        if (!BN_mod_mul(&u1,&t1,&t2,dsa->p,ctx)) goto err_bn;
-        BN_free(&t2);
-        }
-        /* let u1 = u1 mod q */
-        if (!BN_mod(&u1,&u1,dsa->q,ctx)) goto err;
-#else
-        {
-        if (!dsa->meth->dsa_mod_exp(dsa, &t1,dsa->g,&u1,dsa->pub_key,&u2,
-                                                dsa->p,ctx,mont)) goto err;
-        /* BN_copy(&u1,&t1); */
-        /* let u1 = u1 mod q */
-        if (!BN_mod(&u1,&t1,dsa->q,ctx)) goto err;
-        }
-#endif
-        /* V is now in u1.  If the signature is correct, it will be
-         * equal to R. */
-        ret=(BN_ucmp(&u1, sig->r) == 0);
-
-        err:
-        if (ret != 1) DSAerr(DSA_F_DSA_DO_VERIFY,ERR_R_BN_LIB);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_free(&u1);
-        BN_free(&u2);
-        BN_free(&t1);
-        return(ret);
-        }
-
-static int dsa_init(DSA *dsa)
-{
-        dsa->flags|=DSA_FLAG_CACHE_MONT_P;
-        return(1);
-}
-
-static int dsa_finish(DSA *dsa)
-{
-        if(dsa->method_mont_p)
-                BN_MONT_CTX_free((BN_MONT_CTX *)dsa->method_mont_p);
-        return(1);
-}
-
-static int dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
-                BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
-                BN_MONT_CTX *in_mont)
-{
-        return BN_mod_exp2_mont(rr, a1, p1, a2, p2, m, ctx, in_mont);
-}
-        
-static int dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-                                const BIGNUM *m, BN_CTX *ctx,
-                                BN_MONT_CTX *m_ctx)
-{
-        return BN_mod_exp_mont(r, a, p, m, ctx, m_ctx);
-}
-
-#else /* ndef OPENSSL_FIPS */
-
-static void *dummy=&dummy;
-
-#endif /* ndef OPENSSL_FIPS */
diff --git a/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_selftest.c b/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_selftest.c
deleted file mode 100644
index 795fda9587..0000000000
--- a/src/lib/libssl/src/fips-1.0/dsa/fips_dsa_selftest.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* crypto/dsa/dsatest.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <string.h>
-#include <openssl/crypto.h>
-#include <openssl/dsa.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-
-#ifdef OPENSSL_FIPS
-
-/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
- * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
-static unsigned char seed[20]={
-        0xd5,0x01,0x4e,0x4b,0x60,0xef,0x2b,0xa8,0xb6,0x21,0x1b,0x40,
-        0x62,0xba,0x32,0x24,0xe0,0x42,0x7d,0xd3,
-        };
-
-static const unsigned char out_p[]={
-        0x8d,0xf2,0xa4,0x94,0x49,0x22,0x76,0xaa,
-        0x3d,0x25,0x75,0x9b,0xb0,0x68,0x69,0xcb,
-        0xea,0xc0,0xd8,0x3a,0xfb,0x8d,0x0c,0xf7,
-        0xcb,0xb8,0x32,0x4f,0x0d,0x78,0x82,0xe5,
-        0xd0,0x76,0x2f,0xc5,0xb7,0x21,0x0e,0xaf,
-        0xc2,0xe9,0xad,0xac,0x32,0xab,0x7a,0xac,
-        0x49,0x69,0x3d,0xfb,0xf8,0x37,0x24,0xc2,
-        0xec,0x07,0x36,0xee,0x31,0xc8,0x02,0x91,
-        };
-
-static const unsigned char out_q[]={
-        0xc7,0x73,0x21,0x8c,0x73,0x7e,0xc8,0xee,
-        0x99,0x3b,0x4f,0x2d,0xed,0x30,0xf4,0x8e,
-        0xda,0xce,0x91,0x5f,
-        };
-
-static const unsigned char out_g[]={
-        0x62,0x6d,0x02,0x78,0x39,0xea,0x0a,0x13,
-        0x41,0x31,0x63,0xa5,0x5b,0x4c,0xb5,0x00,
-        0x29,0x9d,0x55,0x22,0x95,0x6c,0xef,0xcb,
-        0x3b,0xff,0x10,0xf3,0x99,0xce,0x2c,0x2e,
-        0x71,0xcb,0x9d,0xe5,0xfa,0x24,0xba,0xbf,
-        0x58,0xe5,0xb7,0x95,0x21,0x92,0x5c,0x9c,
-        0xc4,0x2e,0x9f,0x6f,0x46,0x4b,0x08,0x8c,
-        0xc5,0x72,0xaf,0x53,0xe6,0xd7,0x88,0x02,
-        };
-
-static const unsigned char str1[]="12345678901234567890";
-
-void FIPS_corrupt_dsa()
-    {
-    ++seed[0];
-    }
-
-int FIPS_selftest_dsa()
-    {
-    DSA *dsa=NULL;
-    int counter,i,j;
-    unsigned char buf[256];
-    unsigned long h;
-    unsigned char sig[256];
-    unsigned int siglen;
-
-    dsa=DSA_generate_parameters(512,seed,20,&counter,&h,NULL,NULL);
-
-    if(dsa == NULL)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    if (counter != 105) 
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    if (h != 2)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    i=BN_bn2bin(dsa->q,buf);
-    j=sizeof(out_q);
-    if (i != j || memcmp(buf,out_q,i) != 0)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-
-    i=BN_bn2bin(dsa->p,buf);
-    j=sizeof(out_p);
-    if (i != j || memcmp(buf,out_p,i) != 0)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-
-    i=BN_bn2bin(dsa->g,buf);
-    j=sizeof(out_g);
-    if (i != j || memcmp(buf,out_g,i) != 0)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    DSA_generate_key(dsa);
-    DSA_sign(0, str1, 20, sig, &siglen, dsa);
-    if(DSA_verify(0, str1, 20, sig, siglen, dsa) != 1)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_DSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    DSA_free(dsa);
-    return 1;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/dsa/fips_dsatest.c b/src/lib/libssl/src/fips-1.0/dsa/fips_dsatest.c
deleted file mode 100644
index 5970b201e9..0000000000
--- a/src/lib/libssl/src/fips-1.0/dsa/fips_dsatest.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* crypto/dsa/dsatest.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "e_os.h"
-
-#include <openssl/crypto.h>
-#include <openssl/rand.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/fips.h>
-#include <openssl/fips_rand.h>
-
-#if defined(OPENSSL_NO_DSA) || !defined(OPENSSL_FIPS)
-int main(int argc, char *argv[])
-{
-    printf("No FIPS DSA support\n");
-    return(0);
-}
-#else
-#include <openssl/dsa.h>
-
-#ifdef OPENSSL_SYS_WIN16
-#define MS_CALLBACK     _far _loadds
-#else
-#define MS_CALLBACK
-#endif
-
-static void MS_CALLBACK dsa_cb(int p, int n, void *arg);
-
-/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
- * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
-static unsigned char seed[20]={
-        0xd5,0x01,0x4e,0x4b,0x60,0xef,0x2b,0xa8,0xb6,0x21,0x1b,0x40,
-        0x62,0xba,0x32,0x24,0xe0,0x42,0x7d,0xd3,
-        };
-
-static unsigned char out_p[]={
-        0x8d,0xf2,0xa4,0x94,0x49,0x22,0x76,0xaa,
-        0x3d,0x25,0x75,0x9b,0xb0,0x68,0x69,0xcb,
-        0xea,0xc0,0xd8,0x3a,0xfb,0x8d,0x0c,0xf7,
-        0xcb,0xb8,0x32,0x4f,0x0d,0x78,0x82,0xe5,
-        0xd0,0x76,0x2f,0xc5,0xb7,0x21,0x0e,0xaf,
-        0xc2,0xe9,0xad,0xac,0x32,0xab,0x7a,0xac,
-        0x49,0x69,0x3d,0xfb,0xf8,0x37,0x24,0xc2,
-        0xec,0x07,0x36,0xee,0x31,0xc8,0x02,0x91,
-        };
-
-static unsigned char out_q[]={
-        0xc7,0x73,0x21,0x8c,0x73,0x7e,0xc8,0xee,
-        0x99,0x3b,0x4f,0x2d,0xed,0x30,0xf4,0x8e,
-        0xda,0xce,0x91,0x5f,
-        };
-
-static unsigned char out_g[]={
-        0x62,0x6d,0x02,0x78,0x39,0xea,0x0a,0x13,
-        0x41,0x31,0x63,0xa5,0x5b,0x4c,0xb5,0x00,
-        0x29,0x9d,0x55,0x22,0x95,0x6c,0xef,0xcb,
-        0x3b,0xff,0x10,0xf3,0x99,0xce,0x2c,0x2e,
-        0x71,0xcb,0x9d,0xe5,0xfa,0x24,0xba,0xbf,
-        0x58,0xe5,0xb7,0x95,0x21,0x92,0x5c,0x9c,
-        0xc4,0x2e,0x9f,0x6f,0x46,0x4b,0x08,0x8c,
-        0xc5,0x72,0xaf,0x53,0xe6,0xd7,0x88,0x02,
-        };
-
-static const unsigned char str1[]="12345678901234567890";
-
-static const char rnd_seed[] = "string to make the random number generator think it has entropy";
-static const unsigned char rnd_key1[]="12345678";
-static const unsigned char rnd_key2[]="abcdefgh";
-
-static BIO *bio_err=NULL;
-
-int main(int argc, char **argv)
-        {
-        DSA *dsa=NULL;
-        int counter,ret=0,i,j;
-        unsigned char buf[256];
-        unsigned long h;
-        unsigned char sig[256];
-        unsigned int siglen;
-
-        if (bio_err == NULL)
-                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-
-#ifdef OPENSSL_FIPS
-        if(!FIPS_mode_set(1))
-            {
-            ERR_print_errors(bio_err);
-            EXIT(1);
-            }
-#endif
-        CRYPTO_malloc_debug_init();
-        CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-        ERR_load_crypto_strings();
-        FIPS_set_prng_key(rnd_key1,rnd_key2);
-        RAND_seed(rnd_seed, sizeof rnd_seed);
-
-        BIO_printf(bio_err,"test generation of DSA parameters\n");
-
-        dsa=DSA_generate_parameters(512,seed,20,&counter,&h,dsa_cb,bio_err);
-
-        BIO_printf(bio_err,"seed\n");
-        for (i=0; i<20; i+=4)
-                {
-                BIO_printf(bio_err,"%02X%02X%02X%02X ",
-                        seed[i],seed[i+1],seed[i+2],seed[i+3]);
-                }
-        BIO_printf(bio_err,"\ncounter=%d h=%d\n",counter,h);
-                
-        if (dsa == NULL) goto end;
-        DSA_print(bio_err,dsa,0);
-        if (counter != 105) 
-                {
-                BIO_printf(bio_err,"counter should be 105\n");
-                goto end;
-                }
-        if (h != 2)
-                {
-                BIO_printf(bio_err,"h should be 2\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->q,buf);
-        j=sizeof(out_q);
-        if ((i != j) || (memcmp(buf,out_q,i) != 0))
-                {
-                BIO_printf(bio_err,"q value is wrong\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->p,buf);
-        j=sizeof(out_p);
-        if ((i != j) || (memcmp(buf,out_p,i) != 0))
-                {
-                BIO_printf(bio_err,"p value is wrong\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->g,buf);
-        j=sizeof(out_g);
-        if ((i != j) || (memcmp(buf,out_g,i) != 0))
-                {
-                BIO_printf(bio_err,"g value is wrong\n");
-                goto end;
-                }
-        DSA_generate_key(dsa);
-        DSA_sign(0, str1, 20, sig, &siglen, dsa);
-        if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1)
-                ret=1;
-end:
-        if (!ret)
-                ERR_print_errors(bio_err);
-        if (dsa != NULL) DSA_free(dsa);
-        CRYPTO_cleanup_all_ex_data();
-        ERR_remove_state(0);
-        ERR_free_strings();
-        CRYPTO_mem_leaks(bio_err);
-        if (bio_err != NULL)
-                {
-                BIO_free(bio_err);
-                bio_err = NULL;
-                }
-        EXIT(!ret);
-        return(!ret);
-        }
-
-static int cb_exit(int ec)
-        {
-        EXIT(ec);
-        return(0);              /* To keep some compilers quiet */
-        }
-
-static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
-        {
-        char c='*';
-        static int ok=0,num=0;
-
-        if (p == 0) { c='.'; num++; };
-        if (p == 1) c='+';
-        if (p == 2) { c='*'; ok++; }
-        if (p == 3) c='\n';
-        BIO_write(arg,&c,1);
-        (void)BIO_flush(arg);
-
-        if (!ok && (p == 0) && (num > 1))
-                {
-                BIO_printf((BIO *)arg,"error in dsatest\n");
-                cb_exit(1);
-                }
-        }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/dsa/fips_dssvs.c b/src/lib/libssl/src/fips-1.0/dsa/fips_dssvs.c
deleted file mode 100644
index 560d635981..0000000000
--- a/src/lib/libssl/src/fips-1.0/dsa/fips_dssvs.c
+++ /dev/null
@@ -1,319 +0,0 @@
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_FIPS
-#include <stdio.h>
-
-int main()
-{
-    printf("No FIPS DSA support\n");
-    return(0);
-}
-#else
-
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-#include <openssl/fips_sha.h>
-#include <string.h>
-
-int hex2bin(const char *in, unsigned char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1=0,n2=0 ; in[n1] && in[n1] != '\n' ; )
-        { /* first byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        if(!in[n1])
-            {
-            out[n2++]=ch;
-            break;
-            }
-        out[n2] = ch << 4;
-        /* second byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        out[n2++] |= ch;
-        }
-    return n2;
-    }
-
-BIGNUM *hex2bn(const char *in)
-    {
-    BIGNUM *p=BN_new();
-
-    BN_hex2bn(&p,in);
-
-    return p;
-    }
-
-int bin2hex(const unsigned char *in,int len,char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1=0,n2=0 ; n1 < len ; ++n1)
-        {
-        ch=in[n1] >> 4;
-        if (ch <= 0x09)
-            out[n2++]=ch+'0';
-        else
-            out[n2++]=ch-10+'a';
-        ch=in[n1] & 0x0f;
-        if(ch <= 0x09)
-            out[n2++]=ch+'0';
-        else
-            out[n2++]=ch-10+'a';
-        }
-    out[n2]='\0';
-    return n2;
-    }
-
-void pv(const char *tag,const unsigned char *val,int len)
-    {
-    char obuf[2048];
-
-    bin2hex(val,len,obuf);
-    printf("%s = %s\n",tag,obuf);
-    }
-
-void pbn(const char *tag,const BIGNUM *val)
-    {
-    printf("%s = %s\n",tag,BN_bn2hex(val));
-    }
-
-void primes()
-    {
-    char buf[10240];
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        fputs(buf,stdout);
-        if(!strncmp(buf,"Prime= ",7))
-            {
-            BIGNUM *pp;
-
-            pp=BN_new();
-            BN_hex2bn(&pp,buf+7);
-            printf("result= %c\n",
-                   BN_is_prime(pp,20,NULL,NULL,NULL) ? 'P' : 'F');
-            }       
-        }
-    }
-
-void pqg()
-    {
-    char buf[1024];
-    int nmod=0;
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"[mod = ",7))
-            nmod=atoi(buf+7);
-        else if(!strncmp(buf,"N = ",4))
-            {
-            int n=atoi(buf+4);
-
-            printf("[mod = %d]\n\n",nmod);
-
-            while(n--)
-                {
-                unsigned char seed[20];
-                DSA *dsa;
-                int counter;
-                unsigned long h;
-
-                dsa=DSA_generate_parameters(nmod,seed,0,&counter,&h,NULL,NULL);
-                printf("P = %s\n",BN_bn2hex(dsa->p));
-                printf("Q = %s\n",BN_bn2hex(dsa->q));
-                printf("G = %s\n",BN_bn2hex(dsa->g));
-                pv("Seed",seed,20);
-                printf("c = %d\n",counter);
-                printf("H = %lx\n",h);
-                putc('\n',stdout);
-                }
-            }
-        else
-            fputs(buf,stdout);
-        }
-    }
-
-void keypair()
-    {
-    char buf[1024];
-    int nmod=0;
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"[mod = ",7))
-            nmod=atoi(buf+7);
-        else if(!strncmp(buf,"N = ",4))
-            {
-            DSA *dsa;
-            int n=atoi(buf+4);
-
-            printf("[mod = %d]\n\n",nmod);
-
-            dsa=DSA_generate_parameters(nmod,NULL,0,NULL,NULL,NULL,NULL);
-            pbn("P",dsa->p);
-            pbn("Q",dsa->q);
-            pbn("G",dsa->g);
-            putc('\n',stdout);
-
-            while(n--)
-                {
-                DSA_generate_key(dsa);
-
-                pbn("X",dsa->priv_key);
-                pbn("Y",dsa->pub_key);
-                putc('\n',stdout);
-                }
-            }
-        }
-    }
-
-void siggen()
-    {
-    char buf[1024];
-    int nmod=0;
-    DSA *dsa=NULL;
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"[mod = ",7))
-            {
-            nmod=atoi(buf+7);
-            printf("[mod = %d]\n\n",nmod);
-
-            dsa=DSA_generate_parameters(nmod,NULL,0,NULL,NULL,NULL,NULL);
-            pbn("P",dsa->p);
-            pbn("Q",dsa->q);
-            pbn("G",dsa->g);
-            putc('\n',stdout);
-            }
-        else if(!strncmp(buf,"Msg = ",6))
-            {
-            unsigned char msg[1024];
-            unsigned char hash[20];
-            int n;
-            DSA_SIG *sig;
-
-            n=hex2bin(buf+6,msg);
-            pv("Msg",msg,n);
-
-            DSA_generate_key(dsa);
-            pbn("Y",dsa->pub_key);
-
-            SHA1(msg,n,hash);
-            sig=DSA_do_sign(hash,sizeof hash,dsa);
-            pbn("R",sig->r);
-            pbn("S",sig->s);
-            putc('\n',stdout);
-            }
-        }
-    }
-
-void sigver()
-    {
-    DSA *dsa=NULL;
-    char buf[1024];
-    int nmod=0;
-    unsigned char hash[20];
-    DSA_SIG *sig=DSA_SIG_new();
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"[mod = ",7))
-            {
-            nmod=atoi(buf+7);
-            if(dsa)
-                DSA_free(dsa);
-            dsa=DSA_new();
-            }
-        else if(!strncmp(buf,"P = ",4))
-            dsa->p=hex2bn(buf+4);
-        else if(!strncmp(buf,"Q = ",4))
-            dsa->q=hex2bn(buf+4);
-        else if(!strncmp(buf,"G = ",4))
-            {
-            dsa->g=hex2bn(buf+4);
-
-            printf("[mod = %d]\n\n",nmod);
-            pbn("P",dsa->p);
-            pbn("Q",dsa->q);
-            pbn("G",dsa->g);
-            putc('\n',stdout);
-            }
-        else if(!strncmp(buf,"Msg = ",6))
-            {
-            unsigned char msg[1024];
-            int n;
-
-            n=hex2bin(buf+6,msg);
-            pv("Msg",msg,n);
-            SHA1(msg,n,hash);
-            }
-        else if(!strncmp(buf,"Y = ",4))
-            dsa->pub_key=hex2bn(buf+4);
-        else if(!strncmp(buf,"R = ",4))
-            sig->r=hex2bn(buf+4);
-        else if(!strncmp(buf,"S = ",4))
-            {
-            sig->s=hex2bn(buf+4);
-        
-            pbn("Y",dsa->pub_key);
-            pbn("R",sig->r);
-            pbn("S",sig->s);
-            printf("Result = %c\n",DSA_do_verify(hash,sizeof hash,sig,dsa)
-                   ? 'P' : 'F');
-            putc('\n',stdout);
-            }
-        }
-    }
-
-int main(int argc,char **argv)
-    {
-    if(argc != 2)
-        {
-        fprintf(stderr,"%s [prime|pqg]\n",argv[0]);
-        exit(1);
-        }
-    if(!FIPS_mode_set(1))
-        {
-        ERR_load_crypto_strings();
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        exit(1);
-        }
-    if(!strcmp(argv[1],"prime"))
-        primes();
-    else if(!strcmp(argv[1],"pqg"))
-        pqg();
-    else if(!strcmp(argv[1],"keypair"))
-        keypair();
-    else if(!strcmp(argv[1],"siggen"))
-        siggen();
-    else if(!strcmp(argv[1],"sigver"))
-        sigver();
-    else
-        {
-        fprintf(stderr,"Don't know how to %s.\n",argv[1]);
-        exit(1);
-        }
-
-    return 0;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/fips-lib.com b/src/lib/libssl/src/fips-1.0/fips-lib.com
deleted file mode 100644
index 539117b2ed..0000000000
--- a/src/lib/libssl/src/fips-1.0/fips-lib.com
+++ /dev/null
@@ -1,1196 +0,0 @@
-$!
-$!  FIPS-LIB.COM
-$!  Written By:  Robert Byer
-$!               Vice-President
-$!               A-Com Computing, Inc.
-$!               byer@mail.all-net.net
-$!
-$!  Changes by Richard Levitte <richard@levitte.org>
-$!
-$!  This command files compiles and creates the FIPS parts of the
-$!  "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library for OpenSSL.  The "xxx"
-$!  denotes the machine architecture of AXP or VAX.
-$!
-$!  It was re-written so it would try to determine what "C" compiler to use 
-$!  or you can specify which "C" compiler to use.
-$!
-$!  Specify the following as P1 to build just that part or ALL to just
-$!  build everything.
-$!
-$!              LIBRARY    To just compile the [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library.
-$!              APPS       To just compile the [.xxx.EXE.CRYPTO]*.EXE
-$!              ALL        To do both LIBRARY and APPS
-$!
-$!  Specify DEBUG or NODEBUG as P2 to compile with or without debugger
-$!  information.
-$!
-$!  Specify which compiler at P3 to try to compile under.
-$!
-$!         VAXC  For VAX C.
-$!         DECC  For DEC C.
-$!         GNUC  For GNU C.
-$!
-$!  If you don't speficy a compiler, it will try to determine which
-$!  "C" compiler to use.
-$!
-$!  P4, if defined, sets a TCP/IP library to use, through one of the following
-$!  keywords:
-$!
-$!      UCX             for UCX
-$!      TCPIP           for TCPIP (post UCX)
-$!      SOCKETSHR       for SOCKETSHR+NETLIB
-$!
-$!  P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
-$!
-$!  P6, if defined, sets a choice of crypto methods to compile.
-$!  WARNING: this should only be done to recompile some part of an already
-$!  fully compiled library.
-$!
-$!
-$! Define A TCP/IP Library That We Will Need To Link To.
-$! (That Is, If We Need To Link To One.)
-$!
-$ TCPIP_LIB = ""
-$!
-$! Check Which Architecture We Are Using.
-$!
-$ IF (F$GETSYI("CPU").GE.128)
-$ THEN
-$!
-$!  The Architecture Is AXP
-$!
-$   ARCH := AXP
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$!  The Architecture Is VAX.
-$!
-$   ARCH := VAX
-$!
-$! End The Architecture Check.
-$!
-$ ENDIF
-$!
-$! Define The Different Encryption Types.
-$!
-$ ENCRYPT_TYPES = "Basic,SHA,RAND,DES,AES,DSA,RSA,DH,HMAC"
-$!
-$! Check To Make Sure We Have Valid Command Line Parameters.
-$!
-$ GOSUB CHECK_OPTIONS
-$!
-$! Initialise logical names and such
-$!
-$ GOSUB INITIALISE
-$!
-$! Tell The User What Kind of Machine We Run On.
-$!
-$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
-$!
-$! Define The OBJ Directory.
-$!
-$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.CRYPTO]
-$!
-$! Check To See If The Architecture Specific OBJ Directory Exists.
-$!
-$ IF (F$PARSE(OBJ_DIR).EQS."")
-$ THEN
-$!
-$!  It Dosen't Exist, So Create It.
-$!
-$   CREATE/DIR 'OBJ_DIR'
-$!
-$! End The Architecture Specific OBJ Directory Check.
-$!
-$ ENDIF
-$!
-$! Define The EXE Directory.
-$!
-$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]
-$!
-$! Check To See If The Architecture Specific Directory Exists.
-$!
-$ IF (F$PARSE(EXE_DIR).EQS."")
-$ THEN
-$!
-$!  It Dosen't Exist, So Create It.
-$!
-$   CREATE/DIRECTORY 'EXE_DIR'
-$!
-$! End The Architecture Specific Directory Check.
-$!
-$ ENDIF
-$!
-$! Define The Library Name.
-$!
-$ LIB_NAME := 'EXE_DIR'LIBCRYPTO.OLB
-$!
-$! Define The CRYPTO-LIB We Are To Use.
-$!
-$ CRYPTO_LIB := 'EXE_DIR'LIBCRYPTO.OLB
-$!
-$! Check To See If We Already Have A "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" Library...
-$!
-$ IF (F$SEARCH(LIB_NAME).EQS."")
-$ THEN
-$!
-$! Guess Not, Create The Library.
-$!
-$   LIBRARY/CREATE/OBJECT 'LIB_NAME'
-$!
-$! End The Library Check.
-$!
-$ ENDIF
-$!
-$! Build our options file for the application
-$!
-$ GOSUB CHECK_OPT_FILE
-$!
-$! Define The Different Encryption "library" Strings.
-$!
-$ LIB_ = "fips,fips_err_wrapper"
-$ LIB_SHA = "fips_sha1dgst,fips_sha1_selftest,fips_sha256,fips_sha512"
-$ LIB_RAND = "fips_rand,fips_rand_selftest"
-$ LIB_DES = "fips_des_enc,fips_des_selftest,fips_set_key"
-$ LIB_AES = "fips_aes_core,fips_aes_selftest"
-$ LIB_DSA = "fips_dsa_ossl,fips_dsa_gen,fips_dsa_selftest"
-$ LIB_RSA = "fips_rsa_eay,fips_rsa_gen,fips_rsa_selftest,fips_rsa_x931g"
-$ LIB_DH = "fips_dh_check,fips_dh_gen,fips_dh_key"
-$ LIB_HMAC = "fips_hmac,fips_hmac_selftest"
-$!
-$! Setup exceptional compilations
-$!
-$ ! Add definitions for no threads on OpenVMS 7.1 and higher
-$ COMPILEWITH_CC3 = ",bss_rtcp,"
-$ ! Disable the DOLLARID warning
-$ COMPILEWITH_CC4 = ",a_utctm,bss_log,o_time,"
-$ ! Disable disjoint optimization
-$ COMPILEWITH_CC5 = ",md2_dgst,md4_dgst,md5_dgst,mdc2dgst," + -
-                    "sha_dgst,sha1dgst,rmd_dgst,bf_enc,"
-$ ! Disable the MIXLINKAGE warning
-$ COMPILEWITH_CC6 = ",fips_set_key,"
-$!
-$! Figure Out What Other Modules We Are To Build.
-$!
-$ BUILD_SET:
-$!
-$! Define A Module Counter.
-$!
-$ MODULE_COUNTER = 0
-$!
-$! Top Of The Loop.
-$!
-$ MODULE_NEXT:
-$!
-$! Extract The Module Name From The Encryption List.
-$!
-$ MODULE_NAME = F$ELEMENT(MODULE_COUNTER,",",ENCRYPT_TYPES)
-$ IF MODULE_NAME.EQS."Basic" THEN MODULE_NAME = ""
-$ MODULE_NAME1 = MODULE_NAME
-$!
-$! Check To See If We Are At The End Of The Module List.
-$!
-$ IF (MODULE_NAME.EQS.",") 
-$ THEN 
-$!
-$!  We Are At The End Of The Module List, Go To MODULE_DONE.
-$!
-$   GOTO MODULE_DONE
-$!
-$! End The Module List Check.
-$!
-$ ENDIF
-$!
-$! Increment The Moudle Counter.
-$!
-$ MODULE_COUNTER = MODULE_COUNTER + 1
-$!
-$! Create The Library and Apps Module Names.
-$!
-$ LIB_MODULE = "LIB_" + MODULE_NAME
-$ APPS_MODULE = "APPS_" + MODULE_NAME
-$ IF (MODULE_NAME.EQS."ASN1_2")
-$ THEN
-$   MODULE_NAME = "ASN1"
-$ ENDIF
-$ IF (MODULE_NAME.EQS."EVP_2")
-$ THEN
-$   MODULE_NAME = "EVP"
-$ ENDIF
-$!
-$! Set state (can be LIB and APPS)
-$!
-$ STATE = "LIB"
-$ IF BUILDALL .EQS. "APPS" THEN STATE = "APPS"
-$!
-$! Check if the library module name actually is defined
-$!
-$ IF F$TYPE('LIB_MODULE') .EQS. ""
-$ THEN
-$   WRITE SYS$ERROR ""
-$   WRITE SYS$ERROR "The module ",MODULE_NAME," does not exist.  Continuing..."
-$   WRITE SYS$ERROR ""
-$   GOTO MODULE_NEXT
-$ ENDIF
-$!
-$! Top Of The Module Loop.
-$!
-$ MODULE_AGAIN:
-$!
-$! Tell The User What Module We Are Building.
-$!
-$ IF (MODULE_NAME1.NES."") 
-$ THEN
-$   IF STATE .EQS. "LIB"
-$   THEN
-$     WRITE SYS$OUTPUT "Compiling The ",MODULE_NAME1," Library Files. (",BUILDALL,",",STATE,")"
-$   ELSE IF F$TYPE('APPS_MODULE') .NES. ""
-$     THEN
-$       WRITE SYS$OUTPUT "Compiling The ",MODULE_NAME1," Applications. (",BUILDALL,",",STATE,")"
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$!  Define A File Counter And Set It To "0".
-$!
-$ FILE_COUNTER = 0
-$ APPLICATION = ""
-$ APPLICATION_COUNTER = 0
-$!
-$! Top Of The File Loop.
-$!
-$ NEXT_FILE:
-$!
-$! Look in the LIB_MODULE is we're in state LIB
-$!
-$ IF STATE .EQS. "LIB"
-$ THEN
-$!
-$!   O.K, Extract The File Name From The File List.
-$!
-$   FILE_NAME = F$ELEMENT(FILE_COUNTER,",",'LIB_MODULE')
-$!
-$!   else
-$!
-$ ELSE
-$   FILE_NAME = ","
-$!
-$   IF F$TYPE('APPS_MODULE') .NES. ""
-$   THEN
-$!
-$!     Extract The File Name From The File List.
-$!     This part is a bit more complicated.
-$!
-$     IF APPLICATION .EQS. ""
-$     THEN
-$       APPLICATION = F$ELEMENT(APPLICATION_COUNTER,";",'APPS_MODULE')
-$       APPLICATION_COUNTER = APPLICATION_COUNTER + 1
-$       APPLICATION_OBJECTS = F$ELEMENT(1,"/",APPLICATION)
-$       APPLICATION = F$ELEMENT(0,"/",APPLICATION)
-$       FILE_COUNTER = 0
-$     ENDIF
-$
-$!     WRITE SYS$OUTPUT "DEBUG: SHOW SYMBOL APPLICATION*"
-$!     SHOW SYMBOL APPLICATION*
-$!
-$     IF APPLICATION .NES. ";"
-$     THEN
-$       FILE_NAME = F$ELEMENT(FILE_COUNTER,",",APPLICATION_OBJECTS)
-$       IF FILE_NAME .EQS. ","
-$       THEN
-$         APPLICATION = ""
-$         GOTO NEXT_FILE
-$       ENDIF
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$! Check To See If We Are At The End Of The File List.
-$!
-$ IF (FILE_NAME.EQS.",") 
-$ THEN 
-$!
-$!  We Are At The End Of The File List, Change State Or Goto FILE_DONE.
-$!
-$   IF STATE .EQS. "LIB" .AND. BUILDALL .NES. "LIBRARY"
-$   THEN
-$     STATE = "APPS"
-$     GOTO MODULE_AGAIN
-$   ELSE
-$     GOTO FILE_DONE
-$   ENDIF
-$!
-$! End The File List Check.
-$!
-$ ENDIF
-$!
-$! Increment The Counter.
-$!
-$ FILE_COUNTER = FILE_COUNTER + 1
-$!
-$! Create The Source File Name.
-$!
-$ TMP_FILE_NAME = F$ELEMENT(1,"]",FILE_NAME)
-$ IF TMP_FILE_NAME .EQS. "]" THEN TMP_FILE_NAME = FILE_NAME
-$ IF F$ELEMENT(0,".",TMP_FILE_NAME) .EQS. TMP_FILE_NAME THEN -
-        FILE_NAME = FILE_NAME + ".c"
-$ IF (MODULE_NAME.NES."")
-$ THEN
-$   SOURCE_FILE = "SYS$DISK:[." + MODULE_NAME+ "]" + FILE_NAME
-$ ELSE
-$   SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME
-$ ENDIF
-$ SOURCE_FILE = SOURCE_FILE - "]["
-$!
-$! Create The Object File Name.
-$!
-$ OBJECT_FILE = OBJ_DIR + F$PARSE(FILE_NAME,,,"NAME","SYNTAX_ONLY") + ".OBJ"
-$ ON WARNING THEN GOTO NEXT_FILE
-$!
-$! Check To See If The File We Want To Compile Is Actually There.
-$!
-$ IF (F$SEARCH(SOURCE_FILE).EQS."")
-$ THEN
-$!
-$!  Tell The User That The File Doesn't Exist.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Doesn't Exist."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Exit The Build.
-$!
-$   GOTO EXIT
-$!
-$! End The File Exist Check.
-$!
-$ ENDIF
-$!
-$! Tell The User We Are Compiling The File.
-$!
-$ IF (MODULE_NAME.EQS."")
-$ THEN
-$   WRITE SYS$OUTPUT "Compiling The ",FILE_NAME," File.  (",BUILDALL,",",STATE,")"
-$ ENDIF
-$ IF (MODULE_NAME.NES."")
-$ THEN 
-$   WRITE SYS$OUTPUT "  ",FILE_NAME,""
-$ ENDIF
-$!
-$! Compile The File.
-$!
-$ ON ERROR THEN GOTO NEXT_FILE
-$ FILE_NAME0 = F$ELEMENT(0,".",FILE_NAME)
-$ IF FILE_NAME - ".mar" .NES. FILE_NAME
-$ THEN
-$   MACRO/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$ ELSE
-$   IF COMPILEWITH_CC3 - FILE_NAME0 .NES. COMPILEWITH_CC3
-$   THEN
-$     CC3/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$   ELSE
-$     IF COMPILEWITH_CC4 - FILE_NAME0 .NES. COMPILEWITH_CC4
-$     THEN
-$       CC4/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$     ELSE
-$       IF COMPILEWITH_CC5 - FILE_NAME0 .NES. COMPILEWITH_CC5
-$       THEN
-$         CC5/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$       ELSE
-$         IF COMPILEWITH_CC6 - FILE_NAME0 .NES. COMPILEWITH_CC6
-$         THEN
-$           CC6/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$         ELSE
-$           CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$         ENDIF
-$       ENDIF
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$ IF STATE .EQS. "LIB"
-$ THEN 
-$!
-$!   Add It To The Library.
-$!
-$   LIBRARY/REPLACE 'LIB_NAME' 'OBJECT_FILE'
-$!
-$!   Time To Clean Up The Object File.
-$!
-$   DELETE 'OBJECT_FILE';*
-$ ENDIF
-$!
-$! Go Back And Do It Again.
-$!
-$ GOTO NEXT_FILE
-$!
-$! All Done With This Library Part.
-$!
-$ FILE_DONE:
-$!
-$! Time To Build Some Applications
-$!
-$ IF F$TYPE('APPS_MODULE') .NES. "" .AND. BUILDALL .NES. "LIBRARY"
-$ THEN
-$   APPLICATION_COUNTER = 0
-$ NEXT_APPLICATION:
-$   APPLICATION = F$ELEMENT(APPLICATION_COUNTER,";",'APPS_MODULE')
-$   IF APPLICATION .EQS. ";" THEN GOTO APPLICATION_DONE
-$
-$   APPLICATION_COUNTER = APPLICATION_COUNTER + 1
-$   APPLICATION_OBJECTS = F$ELEMENT(1,"/",APPLICATION)
-$   APPLICATION = F$ELEMENT(0,"/",APPLICATION)
-$
-$!   WRITE SYS$OUTPUT "DEBUG: SHOW SYMBOL APPLICATION*"
-$!   SHOW SYMBOL APPLICATION*
-$!
-$! Tell the user what happens
-$!
-$   WRITE SYS$OUTPUT "  ",APPLICATION,".exe"
-$!
-$! Link The Program.
-$!
-$   ON ERROR THEN GOTO NEXT_APPLICATION
-$!
-$! Check To See If We Are To Link With A Specific TCP/IP Library.
-$!
-$   IF (TCPIP_LIB.NES."")
-$   THEN
-$!
-$!    Link With A TCP/IP Library.
-$!
-$     LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
-          'OBJ_DIR''APPLICATION_OBJECTS', -
-          'CRYPTO_LIB'/LIBRARY, -
-          'TCPIP_LIB','OPT_FILE'/OPTION
-$!
-$! Else...
-$!
-$   ELSE
-$!
-$!    Don't Link With A TCP/IP Library.
-$!
-$     LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
-          'OBJ_DIR''APPLICATION_OBJECTS',-
-          'CRYPTO_LIB'/LIBRARY, -
-          'OPT_FILE'/OPTION
-$!
-$! End The TCP/IP Library Check.
-$!
-$   ENDIF
-$   GOTO NEXT_APPLICATION
-$  APPLICATION_DONE:
-$ ENDIF
-$!
-$! Go Back And Get The Next Module.
-$!
-$ GOTO MODULE_NEXT
-$!
-$! All Done With This Module.
-$!
-$ MODULE_DONE:
-$!
-$! Tell The User That We Are All Done.
-$!
-$ WRITE SYS$OUTPUT "All Done..."
-$ EXIT:
-$ GOSUB CLEANUP
-$ EXIT
-$!
-$! Check For The Link Option FIle.
-$!
-$ CHECK_OPT_FILE:
-$!
-$! Check To See If We Need To Make A VAX C Option File.
-$!
-$ IF (COMPILER.EQS."VAXC")
-$ THEN
-$!
-$!  Check To See If We Already Have A VAX C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    We Need A VAX C Linker Option File.
-$!
-$     CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable VAX C Runtime Library.
-!
-SYS$SHARE:VAXCRTL.EXE/SHARE
-$EOD
-$!
-$!  End The Option File Check.
-$!
-$   ENDIF
-$!
-$! End The VAXC Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Need A GNU C Option File.
-$!
-$ IF (COMPILER.EQS."GNUC")
-$ THEN
-$!
-$!  Check To See If We Already Have A GNU C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    We Need A GNU C Linker Option File.
-$!
-$     CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable C Runtime Library.
-!
-GNU_CC:[000000]GCCLIB/LIBRARY
-SYS$SHARE:VAXCRTL/SHARE
-$EOD
-$!
-$!  End The Option File Check.
-$!
-$   ENDIF
-$!
-$! End The GNU C Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Need A DEC C Option File.
-$!
-$ IF (COMPILER.EQS."DECC")
-$ THEN
-$!
-$!  Check To See If We Already Have A DEC C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    Figure Out If We Need An AXP Or A VAX Linker Option File.
-$!
-$     IF ARCH .EQS. "VAX"
-$     THEN
-$!
-$!      We Need A DEC C Linker Option File For VAX.
-$!
-$       CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable DEC C Runtime Library.
-!
-SYS$SHARE:DECC$SHR.EXE/SHARE
-$EOD
-$!
-$!    Else...
-$!
-$     ELSE
-$!
-$!      Create The AXP Linker Option File.
-$!
-$       CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File For AXP To Link Agianst 
-! The Sharable C Runtime Library.
-!
-SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
-SYS$SHARE:CMA$OPEN_RTL/SHARE
-$EOD
-$!
-$!    End The VAX/AXP DEC C Option File Check.
-$!
-$     ENDIF
-$!
-$!  End The Option File Search.
-$!
-$   ENDIF
-$!
-$! End The DEC C Check.
-$!
-$ ENDIF
-$!
-$!  Tell The User What Linker Option File We Are Using.
-$!
-$ WRITE SYS$OUTPUT "Using Linker Option File ",OPT_FILE,"."     
-$!
-$! Time To RETURN.
-$!
-$ RETURN
-$!
-$! Check The User's Options.
-$!
-$ CHECK_OPTIONS:
-$!
-$! Check To See If P1 Is Blank.
-$!
-$ IF (P1.EQS."ALL")
-$ THEN
-$!
-$!   P1 Is Blank, So Build Everything.
-$!
-$    BUILDALL = "TRUE"
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$!  Else, Check To See If P1 Has A Valid Arguement.
-$!
-$   IF (P1.EQS."LIBRARY").OR.(P1.EQS."APPS")
-$   THEN
-$!
-$!    A Valid Arguement.
-$!
-$     BUILDALL = P1
-$!
-$!  Else...
-$!
-$   ELSE
-$!
-$!    Tell The User We Don't Know What They Want.
-$!
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "    ALL      :  Just Build Everything."
-$     WRITE SYS$OUTPUT "    LIBRARY  :  To Compile Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."
-$     WRITE SYS$OUTPUT "    APPS     :  To Compile Just The [.xxx.EXE.CRYPTO]*.EXE Programs."
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT " Where 'xxx' Stands For:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "        AXP  :  Alpha Architecture."
-$     WRITE SYS$OUTPUT "        VAX  :  VAX Architecture."
-$     WRITE SYS$OUTPUT ""
-$!
-$!    Time To EXIT.
-$!
-$     EXIT
-$!
-$!  End The Valid Arguement Check.
-$!
-$   ENDIF
-$!
-$! End The P1 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P2 Is Blank.
-$!
-$ IF (P2.EQS."NODEBUG")
-$ THEN
-$!
-$!   P2 Is NODEBUG, So Compile Without The Debugger Information.
-$!
-$    DEBUGGER = "NODEBUG"
-$    TRACEBACK = "NOTRACEBACK" 
-$    GCC_OPTIMIZE = "OPTIMIZE"
-$    CC_OPTIMIZE = "OPTIMIZE"
-$    MACRO_OPTIMIZE = "OPTIMIZE"
-$    WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
-$    WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
-$ ELSE
-$!
-$!  Check To See If We Are To Compile With Debugger Information.
-$!
-$   IF (P2.EQS."DEBUG")
-$   THEN
-$!
-$!    Compile With Debugger Information.
-$!
-$     DEBUGGER = "DEBUG"
-$     TRACEBACK = "TRACEBACK"
-$     GCC_OPTIMIZE = "NOOPTIMIZE"
-$     CC_OPTIMIZE = "NOOPTIMIZE"
-$     MACRO_OPTIMIZE = "NOOPTIMIZE"
-$     WRITE SYS$OUTPUT "Debugger Information Will Be Produced During Compile."
-$     WRITE SYS$OUTPUT "Compiling Without Compiler Optimization."
-$   ELSE 
-$!
-$!    They Entered An Invalid Option..
-$!
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "     DEBUG   :  Compile With The Debugger Information."
-$     WRITE SYS$OUTPUT "     NODEBUG :  Compile Without The Debugger Information."
-$     WRITE SYS$OUTPUT ""
-$!
-$!    Time To EXIT.
-$!
-$     EXIT
-$!
-$!  End The Valid Arguement Check.
-$!
-$   ENDIF
-$!
-$! End The P2 Check.
-$!
-$ ENDIF
-$!
-$! Special Threads For OpenVMS v7.1 Or Later
-$!
-$! Written By:  Richard Levitte
-$!              richard@levitte.org
-$!
-$!
-$! Check To See If We Have A Option For P5.
-$!
-$ IF (P5.EQS."")
-$ THEN
-$!
-$!  Get The Version Of VMS We Are Using.
-$!
-$   ISSEVEN :=
-$   TMP = F$ELEMENT(0,"-",F$EXTRACT(1,4,F$GETSYI("VERSION")))
-$   TMP = F$INTEGER(F$ELEMENT(0,".",TMP)+F$ELEMENT(1,".",TMP))
-$!
-$!  Check To See If The VMS Version Is v7.1 Or Later.
-$!
-$   IF (TMP.GE.71)
-$   THEN
-$!
-$!    We Have OpenVMS v7.1 Or Later, So Use The Special Threads.
-$!
-$     ISSEVEN := ,PTHREAD_USE_D4
-$!
-$!  End The VMS Version Check.
-$!
-$   ENDIF
-$!
-$! End The P5 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P3 Is Blank.
-$!
-$ IF (P3.EQS."")
-$ THEN
-$!
-$!  O.K., The User Didn't Specify A Compiler, Let's Try To
-$!  Find Out Which One To Use.
-$!
-$!  Check To See If We Have GNU C.
-$!
-$   IF (F$TRNLNM("GNU_CC").NES."")
-$   THEN
-$!
-$!    Looks Like GNUC, Set To Use GNUC.
-$!
-$     P3 = "GNUC"
-$!
-$!  Else...
-$!
-$   ELSE
-$!
-$!    Check To See If We Have VAXC Or DECC.
-$!
-$     IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
-$     THEN 
-$!
-$!      Looks Like DECC, Set To Use DECC.
-$!
-$       P3 = "DECC"
-$!
-$!    Else...
-$!
-$     ELSE
-$!
-$!      Looks Like VAXC, Set To Use VAXC.
-$!
-$       P3 = "VAXC"
-$!
-$!    End The VAXC Compiler Check.
-$!
-$     ENDIF
-$!
-$!  End The DECC & VAXC Compiler Check.
-$!
-$   ENDIF
-$!
-$!  End The Compiler Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Have A Option For P4.
-$!
-$ IF (P4.EQS."")
-$ THEN
-$!
-$!  Find out what socket library we have available
-$!
-$   IF F$PARSE("SOCKETSHR:") .NES. ""
-$   THEN
-$!
-$!    We have SOCKETSHR, and it is my opinion that it's the best to use.
-$!
-$     P4 = "SOCKETSHR"
-$!
-$!    Tell the user
-$!
-$     WRITE SYS$OUTPUT "Using SOCKETSHR for TCP/IP"
-$!
-$!    Else, let's look for something else
-$!
-$   ELSE
-$!
-$!    Like UCX (the reason to do this before Multinet is that the UCX
-$!    emulation is easier to use...)
-$!
-$     IF F$TRNLNM("UCX$IPC_SHR") .NES. "" -
-         .OR. F$PARSE("SYS$SHARE:UCX$IPC_SHR.EXE") .NES. "" -
-         .OR. F$PARSE("SYS$LIBRARY:UCX$IPC.OLB") .NES. ""
-$     THEN
-$!
-$!      Last resort: a UCX or UCX-compatible library
-$!
-$       P4 = "UCX"
-$!
-$!      Tell the user
-$!
-$       WRITE SYS$OUTPUT "Using UCX or an emulation thereof for TCP/IP"
-$!
-$!      That was all...
-$!
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$! Set Up Initial CC Definitions, Possibly With User Ones
-$!
-$ CCDEFS = "TCPIP_TYPE_''P4',DSO_VMS"
-$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
-$ CCEXTRAFLAGS = ""
-$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
-$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR"
-$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
-        CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
-$!
-$!  Check To See If The User Entered A Valid Paramter.
-$!
-$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")
-$ THEN
-$!
-$!    Check To See If The User Wanted DECC.
-$!
-$   IF (P3.EQS."DECC")
-$   THEN
-$!
-$!    Looks Like DECC, Set To Use DECC.
-$!
-$     COMPILER = "DECC"
-$!
-$!    Tell The User We Are Using DECC.
-$!
-$     WRITE SYS$OUTPUT "Using DECC 'C' Compiler."
-$!
-$!    Use DECC...
-$!
-$     CC = "CC"
-$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
-         THEN CC = "CC/DECC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
-           "/NOLIST/PREFIX=ALL" + -
-           "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + -
-           CCEXTRAFLAGS
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
-$!
-$!  End DECC Check.
-$!
-$   ENDIF
-$!
-$!  Check To See If We Are To Use VAXC.
-$!
-$   IF (P3.EQS."VAXC")
-$   THEN
-$!
-$!    Looks Like VAXC, Set To Use VAXC.
-$!
-$     COMPILER = "VAXC"
-$!
-$!    Tell The User We Are Using VAX C.
-$!
-$     WRITE SYS$OUTPUT "Using VAXC 'C' Compiler."
-$!
-$!    Compile Using VAXC.
-$!
-$     CC = "CC"
-$     IF ARCH.EQS."AXP"
-$     THEN
-$       WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
-$       EXIT
-$     ENDIF
-$     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-           "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + -
-           CCEXTRAFLAGS
-$     CCDEFS = """VAXC""," + CCDEFS
-$!
-$!    Define <sys> As SYS$COMMON:[SYSLIB]
-$!
-$     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
-$!
-$!  End VAXC Check
-$!
-$   ENDIF
-$!
-$!  Check To See If We Are To Use GNU C.
-$!
-$   IF (P3.EQS."GNUC")
-$   THEN
-$!
-$!    Looks Like GNUC, Set To Use GNUC.
-$!
-$     COMPILER = "GNUC"
-$!
-$!    Tell The User We Are Using GNUC.
-$!
-$     WRITE SYS$OUTPUT "Using GNU 'C' Compiler."
-$!
-$!    Use GNU C...
-$!
-$     CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-           "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + -
-           CCEXTRAFLAGS
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
-$!
-$!  End The GNU C Check.
-$!
-$   ENDIF
-$!
-$!  Set up default defines
-$!
-$   CCDEFS = """FLAT_INC=1""," + CCDEFS
-$!
-$!  Finish up the definition of CC.
-$!
-$   IF COMPILER .EQS. "DECC"
-$   THEN
-$     IF CCDISABLEWARNINGS .EQS. ""
-$     THEN
-$       CC4DISABLEWARNINGS = "DOLLARID"
-$       CC6DISABLEWARNINGS = "MIXLINKAGE"
-$     ELSE
-$       CC4DISABLEWARNINGS = CCDISABLEWARNINGS + ",DOLLARID"
-$       CC6DISABLEWARNINGS = CCDISABLEWARNINGS + ",MIXLINKAGE"
-$       CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
-$     ENDIF
-$     CC4DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC4DISABLEWARNINGS + "))"
-$     CC6DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC6DISABLEWARNINGS + "))"
-$   ELSE
-$     CCDISABLEWARNINGS = ""
-$     CC4DISABLEWARNINGS = ""
-$     CC6DISABLEWARNINGS = ""
-$   ENDIF
-$   CC3 = CC + "/DEFINE=(" + CCDEFS + ISSEVEN + ")" + CCDISABLEWARNINGS
-$   CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
-$   IF ARCH .EQS. "VAX" .AND. COMPILER .EQS. "DECC" .AND. P2 .NES. "DEBUG"
-$   THEN
-$     CC5 = CC + "/OPTIMIZE=NODISJOINT"
-$   ELSE
-$     CC5 = CC + "/NOOPTIMIZE"
-$   ENDIF
-$   CC4 = CC - CCDISABLEWARNINGS + CC4DISABLEWARNINGS
-$   CC6 = CC - CCDISABLEWARNINGS + CC6DISABLEWARNINGS
-$!
-$!  Show user the result
-$!
-$   WRITE/SYMBOL SYS$OUTPUT "Main C Compiling Command: ",CC
-$!
-$!  Else The User Entered An Invalid Arguement.
-$!
-$ ELSE
-$!
-$!  Tell The User We Don't Know What They Want.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "    VAXC  :  To Compile With VAX C."
-$   WRITE SYS$OUTPUT "    DECC  :  To Compile With DEC C."
-$   WRITE SYS$OUTPUT "    GNUC  :  To Compile With GNU C."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Time To EXIT.
-$!
-$   EXIT
-$!
-$! End The Valid Arguement Check.
-$!
-$ ENDIF
-$!
-$! Build a MACRO command for the architecture at hand
-$!
-$ IF ARCH .EQS. "VAX" THEN MACRO = "MACRO/''DEBUGGER'"
-$ IF ARCH .EQS. "AXP" THEN MACRO = "MACRO/MIGRATION/''DEBUGGER'/''MACRO_OPTIMIZE'"
-$!
-$!  Show user the result
-$!
-$   WRITE/SYMBOL SYS$OUTPUT "Main MACRO Compiling Command: ",MACRO
-$!
-$! Time to check the contents, and to make sure we get the correct library.
-$!
-$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
-     .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
-$ THEN
-$!
-$!  Check to see if SOCKETSHR was chosen
-$!
-$   IF P4.EQS."SOCKETSHR"
-$   THEN
-$!
-$!    Set the library to use SOCKETSHR
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
-$!
-$!    Done with SOCKETSHR
-$!
-$   ENDIF
-$!
-$!  Check to see if MULTINET was chosen
-$!
-$   IF P4.EQS."MULTINET"
-$   THEN
-$!
-$!    Set the library to use UCX emulation.
-$!
-$     P4 = "UCX"
-$!
-$!    Done with MULTINET
-$!
-$   ENDIF
-$!
-$!  Check to see if UCX was chosen
-$!
-$   IF P4.EQS."UCX"
-$   THEN
-$!
-$!    Set the library to use UCX.
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
-$     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
-$     THEN
-$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
-$     ELSE
-$       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
-          TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
-$     ENDIF
-$!
-$!    Done with UCX
-$!
-$   ENDIF
-$!
-$!  Check to see if TCPIP was chosen
-$!
-$   IF P4.EQS."TCPIP"
-$   THEN
-$!
-$!    Set the library to use TCPIP (post UCX).
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
-$!
-$!    Done with TCPIP
-$!
-$   ENDIF
-$!
-$!  Check to see if NONE was chosen
-$!
-$   IF P4.EQS."NONE"
-$   THEN
-$!
-$!    Do not use a TCPIP library.
-$!
-$     TCPIP_LIB = ""
-$!
-$!    Done with TCPIP
-$!
-$   ENDIF
-$!
-$!  Print info
-$!
-$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
-$!
-$!  Else The User Entered An Invalid Arguement.
-$!
-$ ELSE
-$!
-$!  Tell The User We Don't Know What They Want.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The Option ",P4," Is Invalid.  The Valid Options Are:"
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."
-$   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."
-$   WRITE SYS$OUTPUT "    TCPIP      :  To link with TCPIP (post UCX) TCP/IP library."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Time To EXIT.
-$!
-$   EXIT
-$!
-$!  Done with TCP/IP libraries
-$!
-$ ENDIF
-$!
-$! Check if the user wanted to compile just a subset of all the encryption
-$! methods.
-$!
-$ IF P6 .NES. ""
-$ THEN
-$   ENCRYPT_TYPES = P6
-$ ENDIF
-$!
-$!  Time To RETURN...
-$!
-$ RETURN
-$!
-$ INITIALISE:
-$!
-$! Save old value of the logical name OPENSSL
-$!
-$ __SAVE_OPENSSL = F$TRNLNM("OPENSSL","LNM$PROCESS_TABLE")
-$!
-$! Save directory information
-$!
-$ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
-$ __HERE = F$EDIT(__HERE,"UPCASE")
-$ __TOP = __HERE - "FIPS-1_0]"
-$ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
-$!
-$! Set up the logical name OPENSSL to point at the include directory
-$!
-$ DEFINE OPENSSL/NOLOG '__INCLUDE'
-$!
-$! Done
-$!
-$ RETURN
-$!
-$ CLEANUP:
-$!
-$! Restore the logical name OPENSSL if it had a value
-$!
-$ IF __SAVE_OPENSSL .EQS. ""
-$ THEN
-$   DEASSIGN OPENSSL
-$ ELSE
-$   DEFINE/NOLOG OPENSSL '__SAVE_OPENSSL'
-$ ENDIF
-$!
-$! Done
-$!
-$ RETURN
diff --git a/src/lib/libssl/src/fips-1.0/fips.c b/src/lib/libssl/src/fips-1.0/fips.c
deleted file mode 100644
index bb833bfa2c..0000000000
--- a/src/lib/libssl/src/fips-1.0/fips.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <openssl/fips.h>
-#include <openssl/rand.h>
-#include <openssl/fips_rand.h>
-#include <openssl/err.h>
-#include <openssl/bio.h>
-#include <openssl/hmac.h>
-#include <string.h>
-#include <limits.h>
-#include "fips_locl.h"
-
-#ifdef OPENSSL_FIPS
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-static int fips_selftest_fail;
-static int fips_mode;
-static const void *fips_rand_check;
-
-static void fips_set_mode(int onoff)
-        {
-        int owning_thread = fips_is_owning_thread();
-
-        if (fips_is_started())
-                {
-                if (!owning_thread) fips_w_lock();
-                fips_mode = onoff;
-                if (!owning_thread) fips_w_unlock();
-                }
-        }
-
-static void fips_set_rand_check(const void *rand_check)
-        {
-        int owning_thread = fips_is_owning_thread();
-
-        if (fips_is_started())
-                {
-                if (!owning_thread) fips_w_lock();
-                fips_rand_check = rand_check;
-                if (!owning_thread) fips_w_unlock();
-                }
-        }
-
-int FIPS_mode(void)
-        {
-        int ret = 0;
-        int owning_thread = fips_is_owning_thread();
-
-        if (fips_is_started())
-                {
-                if (!owning_thread) fips_r_lock();
-                ret = fips_mode;
-                if (!owning_thread) fips_r_unlock();
-                }
-        return ret;
-        }
-
-const void *FIPS_rand_check(void)
-        {
-        const void *ret = 0;
-        int owning_thread = fips_is_owning_thread();
-
-        if (fips_is_started())
-                {
-                if (!owning_thread) fips_r_lock();
-                ret = fips_rand_check;
-                if (!owning_thread) fips_r_unlock();
-                }
-        return ret;
-        }
-
-int FIPS_selftest_failed(void)
-    {
-    int ret = 0;
-    if (fips_is_started())
-        {
-        int owning_thread = fips_is_owning_thread();
-
-        if (!owning_thread) fips_r_lock();
-        ret = fips_selftest_fail;
-        if (!owning_thread) fips_r_unlock();
-        }
-    return ret;
-    }
-
-int FIPS_selftest()
-    {
-    ERR_load_crypto_strings();
-
-    return FIPS_selftest_sha1()
-        && FIPS_selftest_hmac()
-        && FIPS_selftest_aes()
-        && FIPS_selftest_des()
-        && FIPS_selftest_rsa()
-        && FIPS_selftest_dsa();
-    }
-
-extern const void         *FIPS_text_start(),  *FIPS_text_end();
-extern const unsigned char FIPS_rodata_start[], FIPS_rodata_end[];
-unsigned char              FIPS_signature [20] = { 0 };
-static const char          FIPS_hmac_key[]="etaonrishdlcupfm";
-
-unsigned int FIPS_incore_fingerprint(unsigned char *sig,unsigned int len)
-    {
-    const unsigned char *p1 = FIPS_text_start();
-    const unsigned char *p2 = FIPS_text_end();
-    const unsigned char *p3 = FIPS_rodata_start;
-    const unsigned char *p4 = FIPS_rodata_end;
-    HMAC_CTX c;
-
-    HMAC_CTX_init(&c);
-    HMAC_Init(&c,FIPS_hmac_key,strlen(FIPS_hmac_key),EVP_sha1());
-
-    /* detect overlapping regions */
-    if (p1<=p3 && p2>=p3)
-        p3=p1, p4=p2>p4?p2:p4, p1=NULL, p2=NULL;
-    else if (p3<=p1 && p4>=p1)
-        p3=p3, p4=p2>p4?p2:p4, p1=NULL, p2=NULL;
-
-    if (p1)
-        HMAC_Update(&c,p1,(size_t)p2-(size_t)p1);
-
-    if (FIPS_signature>=p3 && FIPS_signature<p4)
-        {
-        /* "punch" hole */
-        HMAC_Update(&c,p3,(size_t)FIPS_signature-(size_t)p3);
-        p3 = FIPS_signature+sizeof(FIPS_signature);
-        if (p3<p4)
-            HMAC_Update(&c,p3,(size_t)p4-(size_t)p3);
-        }
-    else
-        HMAC_Update(&c,p3,(size_t)p4-(size_t)p3);
-
-    HMAC_Final(&c,sig,&len);
-    HMAC_CTX_cleanup(&c);
-
-    return len;
-    }
-
-int FIPS_check_incore_fingerprint(void)
-    {
-    unsigned char sig[EVP_MAX_MD_SIZE];
-    unsigned int len;
-    extern int OPENSSL_NONPIC_relocated;
-
-    if (FIPS_text_start()==NULL)
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_FINGERPRINT,FIPS_R_UNSUPPORTED_PLATFORM);
-        return 0;
-        }
-
-    len=FIPS_incore_fingerprint (sig,sizeof(sig));
-
-    if (len!=sizeof(FIPS_signature) ||
-        memcmp(FIPS_signature,sig,sizeof(FIPS_signature)))
-        {
-        if (FIPS_signature>=FIPS_rodata_start && FIPS_signature<FIPS_rodata_end)
-            FIPSerr(FIPS_F_FIPS_CHECK_FINGERPRINT,FIPS_R_FINGERPRINT_DOES_NOT_MATCH_SEGMENT_ALIASING);
-        else if (OPENSSL_NONPIC_relocated)
-            FIPSerr(FIPS_F_FIPS_CHECK_FINGERPRINT,FIPS_R_FINGERPRINT_DOES_NOT_MATCH_NONPIC_RELOCATED);
-        else
-            FIPSerr(FIPS_F_FIPS_CHECK_FINGERPRINT,FIPS_R_FINGERPRINT_DOES_NOT_MATCH);
-        return 0;
-        }
-
-    return 1;
-    }
-
-int FIPS_mode_set(int onoff)
-    {
-    int fips_set_owning_thread();
-    int fips_clear_owning_thread();
-    int ret = 0;
-
-    fips_w_lock();
-    fips_set_started();
-    fips_set_owning_thread();
-
-    if(onoff)
-        {
-        unsigned char buf[24];
-
-        fips_selftest_fail = 0;
-
-        /* Don't go into FIPS mode twice, just so we can do automagic
-           seeding */
-        if(FIPS_mode())
-            {
-            FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_FIPS_MODE_ALREADY_SET);
-            fips_selftest_fail = 1;
-            ret = 0;
-            goto end;
-            }
-
-        if(fips_signature_witness() != FIPS_signature)
-            {
-            FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_CONTRADICTING_EVIDENCE);
-            fips_selftest_fail = 1;
-            ret = 0;
-            goto end;
-            }
-
-        if(!FIPS_check_incore_fingerprint())
-            {
-            fips_selftest_fail = 1;
-            ret = 0;
-            goto end;
-            }
-
-        /* Perform RNG KAT before seeding */
-        if (!FIPS_selftest_rng())
-            {
-            fips_selftest_fail = 1;
-            ret = 0;
-            goto end;
-            }
-
-        /* automagically seed PRNG if not already seeded */
-        if(!FIPS_rand_seeded())
-            {
-            if(RAND_bytes(buf,sizeof buf) <= 0)
-                {
-                fips_selftest_fail = 1;
-                ret = 0;
-                goto end;
-                }
-            FIPS_set_prng_key(buf,buf+8);
-            FIPS_rand_seed(buf+16,8);
-            }
-
-        /* now switch into FIPS mode */
-        fips_set_rand_check(FIPS_rand_method());
-        RAND_set_rand_method(FIPS_rand_method());
-        if(FIPS_selftest())
-            fips_set_mode(1);
-        else
-            {
-            fips_selftest_fail = 1;
-            ret = 0;
-            goto end;
-            }
-        ret = 1;
-        goto end;
-        }
-    fips_set_mode(0);
-    fips_selftest_fail = 0;
-    ret = 1;
-end:
-    fips_clear_owning_thread();
-    fips_w_unlock();
-    return ret;
-    }
-
-#if 0
-/* here just to cause error codes to exist */
-static void dummy()
-    {
-    FIPSerr(FIPS_F_HASH_FINAL,FIPS_F_NON_FIPS_METHOD);
-    FIPSerr(FIPS_F_HASH_FINAL,FIPS_R_FIPS_SELFTEST_FAILED);
-    }
-#endif
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/fips.h b/src/lib/libssl/src/fips-1.0/fips.h
deleted file mode 100644
index f67bb885c8..0000000000
--- a/src/lib/libssl/src/fips-1.0/fips.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-struct dsa_st;
-
-int FIPS_mode_set(int onoff);
-int FIPS_mode(void);
-const void *FIPS_rand_check(void);
-int FIPS_selftest_failed(void);
-int FIPS_dsa_check(struct dsa_st *dsa);
-void FIPS_corrupt_sha1(void);
-int FIPS_selftest_sha1(void);
-void FIPS_corrupt_aes(void);
-int FIPS_selftest_aes(void);
-void FIPS_corrupt_des(void);
-int FIPS_selftest_des(void);
-void FIPS_corrupt_rsa(void);
-int FIPS_selftest_rsa(void);
-void FIPS_corrupt_dsa(void);
-int FIPS_selftest_dsa(void);
-void FIPS_corrupt_rng(void);
-int FIPS_selftest_rng(void);
-int FIPS_selftest_hmac(void);
-
-/* 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.
- */
-void ERR_load_FIPS_strings(void);
-
-/* Error codes for the FIPS functions. */
-
-/* Function codes. */
-#define FIPS_F_DH_GENERATE_PARAMETERS                    117
-#define FIPS_F_DSA_DO_SIGN                               111
-#define FIPS_F_DSA_DO_VERIFY                             112
-#define FIPS_F_DSA_GENERATE_PARAMETERS                   110
-#define FIPS_F_FIPS_CHECK_DSA                            116
-#define FIPS_F_FIPS_CHECK_EXE                            106
-#define FIPS_F_FIPS_CHECK_FINGERPRINT                    120
-#define FIPS_F_FIPS_CHECK_RSA                            115
-#define FIPS_F_FIPS_DSA_CHECK                            102
-#define FIPS_F_FIPS_MODE_SET                             105
-#define FIPS_F_FIPS_SELFTEST_AES                         104
-#define FIPS_F_FIPS_SELFTEST_DES                         107
-#define FIPS_F_FIPS_SELFTEST_DSA                         109
-#define FIPS_F_FIPS_SELFTEST_RNG                         118
-#define FIPS_F_FIPS_SELFTEST_RSA                         108
-#define FIPS_F_FIPS_SELFTEST_SHA                         103
-#define FIPS_F_HASH_FINAL                                100
-#define FIPS_F_RSA_EAY_PUBLIC_ENCRYPT                    114
-#define FIPS_F_RSA_GENERATE_KEY                          113
-#define FIPS_F_RSA_X931_GENERATE_KEY                     119
-#define FIPS_F_SSLEAY_RAND_BYTES                         101
-#define FIPS_F_FIPS_CHECK_DSO                            120
-
-/* Reason codes. */
-#define FIPS_R_CANNOT_READ_EXE                           103
-#define FIPS_R_CANNOT_READ_EXE_DIGEST                    104
-#define FIPS_R_EXE_DIGEST_DOES_NOT_MATCH                 105
-#define FIPS_R_FINGERPRINT_DOES_NOT_MATCH                110
-#define FIPS_R_FINGERPRINT_DOES_NOT_MATCH_NONPIC_RELOCATED 111
-#define FIPS_R_FINGERPRINT_DOES_NOT_MATCH_SEGMENT_ALIASING 112
-#define FIPS_R_FIPS_MODE_ALREADY_SET                     102
-#define FIPS_R_FIPS_SELFTEST_FAILED                      106
-#define FIPS_R_INVALID_KEY_LENGTH                        109
-#define FIPS_R_KEY_TOO_SHORT                             108
-#define FIPS_R_NON_FIPS_METHOD                           100
-#define FIPS_R_PAIRWISE_TEST_FAILED                      107
-#define FIPS_R_SELFTEST_FAILED                           101
-#define FIPS_R_UNSUPPORTED_PLATFORM                      113
-#define FIPS_R_CONTRADICTING_EVIDENCE                    114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/fips_canister.c b/src/lib/libssl/src/fips-1.0/fips_canister.c
deleted file mode 100644
index 7dec62bb64..0000000000
--- a/src/lib/libssl/src/fips-1.0/fips_canister.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2005 The OpenSSL Project. Rights for redistribution
- * and usage in source and binary forms are granted according to the
- * OpenSSL license.
- */
-
-#include <stdio.h>
-#if defined(__DECC)
-# include <c_asm.h>
-# pragma __nostandard
-#endif
-
-#include "e_os.h"
-
-#if !defined(POINTER_TO_FUNCTION_IS_POINTER_TO_1ST_INSTRUCTION)
-# if    (defined(__sun) && (defined(__sparc) || defined(__sparcv9)))    || \
-        (defined(__sgi) && (defined(__mips) || defined(mips)))          || \
-        (defined(__osf__) && defined(__alpha))                          || \
-        (defined(__linux) && (defined(__arm) || defined(__arm__)))      || \
-        (defined(__i386) || defined(__i386__))                          || \
-        (defined(__x86_64) || defined(__x86_64__))                      || \
-        (defined(vax) || defined(__vax__))
-#  define POINTER_TO_FUNCTION_IS_POINTER_TO_1ST_INSTRUCTION
-# endif
-#endif
-
-#ifdef FIPS_START
-#define FIPS_ref_point FIPS_text_start
-/* Some compilers put string literals into a separate segment. As we
- * are mostly interested to hash AES tables in .rodata, we declare
- * reference points accordingly. In case you wonder, the values are
- * big-endian encoded variable names, just to prevent these arrays
- * from being merged by linker. */
-const unsigned int FIPS_rodata_start[]=
-        { 0x46495053, 0x5f726f64, 0x6174615f, 0x73746172 };
-#else
-#define FIPS_ref_point FIPS_text_end
-const unsigned int FIPS_rodata_end[]=
-        { 0x46495053, 0x5f726f64, 0x6174615f, 0x656e645b };
-#endif
-
-/*
- * I declare reference function as static in order to avoid certain
- * pitfalls in -dynamic linker behaviour...
- */
-static void *instruction_pointer(void)
-{ void *ret=NULL;
-/* These are ABI-neutral CPU-specific snippets. ABI-neutrality means
- * that they are designed to work under any OS running on particular
- * CPU, which is why you don't find any #ifdef THIS_OR_THAT_OS in
- * this function. */
-#if     defined(INSTRUCTION_POINTER_IMPLEMENTED)
-    INSTRUCTION_POINTER_IMPLEMENTED(ret);
-#elif   defined(__GNUC__) && __GNUC__>=2
-# if    defined(__alpha) || defined(__alpha__)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    __asm __volatile (  "br     %0,1f\n1:" : "=r"(ret) );
-# elif  defined(__i386) || defined(__i386__)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    __asm __volatile (  "call 1f\n1:    popl %0" : "=r"(ret) );
-    ret = (void *)((size_t)ret&~3UL); /* align for better performance */
-# elif  defined(__ia64) || defined(__ia64__)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    __asm __volatile (  "mov    %0=ip" : "=r"(ret) );
-# elif  defined(__hppa) || defined(__hppa__) || defined(__pa_risc)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    __asm __volatile (  "blr    %%r0,%0\n\tnop" : "=r"(ret) );
-    ret = (void *)((size_t)ret&~3UL); /* mask privilege level */
-# elif  defined(__mips) || defined(__mips__)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    void *scratch;
-    __asm __volatile (  "move   %1,$31\n\t"     /* save ra */
-                        "bal    .+8; nop\n\t"
-                        "move   %0,$31\n\t"
-                        "move   $31,%1"         /* restore ra */
-                        : "=r"(ret),"=r"(scratch) );
-# elif  defined(__ppc__) || defined(__powerpc) || defined(__powerpc__) || \
-        defined(__POWERPC__) || defined(_POWER) || defined(__PPC__) || \
-        defined(__PPC64__) || defined(__powerpc64__)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    void *scratch;
-    __asm __volatile (  "mfspr  %1,8\n\t"       /* save lr */
-                        "bl     .+4\n\t"
-                        "mfspr  %0,8\n\t"       /* mflr ret */
-                        "mtspr  8,%1"           /* restore lr */
-                        : "=r"(ret),"=r"(scratch) );
-# elif  defined(__sparc) || defined(__sparc__) || defined(__sparcv9)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    void *scratch;
-    __asm __volatile (  "mov    %%o7,%1\n\t"
-                        "call   .+8; nop\n\t"
-                        "mov    %%o7,%0\n\t"
-                        "mov    %1,%%o7"
-                        : "=r"(ret),"=r"(scratch) );
-# elif  defined(__x86_64) || defined(__x86_64__)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    __asm __volatile (  "leaq   0(%%rip),%0" : "=r"(ret) );
-    ret = (void *)((size_t)ret&~3UL); /* align for better performance */
-# endif
-#elif   defined(__DECC) && defined(__alpha)
-#   define INSTRUCTION_POINTER_IMPLEMENTED
-    ret = (void *)(size_t)asm("br %v0,1f\n1:");
-#elif   defined(_MSC_VER) && defined(_M_IX86)
-#   undef INSTRUCTION_POINTER_IMPLEMENTED
-    void *scratch;
-    _asm {
-            call    self
-    self:   pop     eax
-            mov     scratch,eax
-         }
-    ret = (void *)((size_t)scratch&~3UL);
-#endif
-  return ret;
-}
-
-/*
- * This function returns pointer to an instruction in the vicinity of
- * its entry point, but not outside this object module. This guarantees
- * that sequestered code is covered...
- */
-void *FIPS_ref_point()
-{
-#if     defined(INSTRUCTION_POINTER_IMPLEMENTED)
-    return instruction_pointer();
-/* Below we essentially cover vendor compilers which do not support
- * inline assembler... */
-#elif   defined(_AIX)
-    struct { void *ip,*gp,*env; } *p = (void *)instruction_pointer;
-    return p->ip;
-#elif   defined(_HPUX_SOURCE)
-# if    defined(__hppa) || defined(__hppa__)
-    struct { void *i[4]; } *p = (void *)FIPS_ref_point;
-
-    if (sizeof(p) == 8) /* 64-bit */
-        return p->i[2];
-    else if ((size_t)p & 2)
-    {   p = (void *)((size_t)p&~3UL);
-        return p->i[0];
-    }
-    else
-        return (void *)p;
-# elif  defined(__ia64) || defined(__ia64__)
-    struct { unsigned long long ip,gp; } *p=(void *)instruction_pointer;
-    return (void *)(size_t)p->ip;
-# endif
-#elif   (defined(__VMS) || defined(VMS)) && !(defined(vax) || defined(__vax__))
-    /* applies to both alpha and ia64 */
-    struct { unsigned __int64 opaque,ip; } *p=(void *)instruction_pointer;
-    return (void *)(size_t)p->ip;
-#elif   defined(__VOS__)
-    /* applies to both pa-risc and ia32 */
-    struct { void *dp,*ip,*gp; } *p = (void *)instruction_pointer;
-    return p->ip;
-#elif   defined(_WIN32)
-# if    defined(_WIN64) && defined(_M_IA64)
-    struct { void *ip,*gp; } *p = (void *)FIPS_ref_point;
-    return p->ip;
-# else
-    return (void *)FIPS_ref_point;
-# endif
-/*
- * In case you wonder why there is no #ifdef __linux. All Linux targets
- * are GCC-based and therefore are covered by instruction_pointer above
- * [well, some are covered by by the one below]...
- */ 
-#elif   defined(POINTER_TO_FUNCTION_IS_POINTER_TO_1ST_INSTRUCTION)
-    return (void *)instruction_pointer;
-#else
-    return NULL;
-#endif
-}
diff --git a/src/lib/libssl/src/fips-1.0/fips_err.h b/src/lib/libssl/src/fips-1.0/fips_err.h
deleted file mode 100644
index c57aebf8a3..0000000000
--- a/src/lib/libssl/src/fips-1.0/fips_err.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* fips/fips_err.h */
-/* ====================================================================
- * Copyright (c) 1999-2005 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-
-/* BEGIN ERROR CODES */
-#ifndef OPENSSL_NO_ERR
-
-#define ERR_FUNC(func) ERR_PACK(ERR_LIB_FIPS,func,0)
-#define ERR_REASON(reason) ERR_PACK(ERR_LIB_FIPS,0,reason)
-
-static ERR_STRING_DATA FIPS_str_functs[]=
-        {
-{ERR_FUNC(FIPS_F_DH_GENERATE_PARAMETERS),       "DH_generate_parameters"},
-{ERR_FUNC(FIPS_F_DSA_DO_SIGN),  "DSA_do_sign"},
-{ERR_FUNC(FIPS_F_DSA_DO_VERIFY),        "DSA_do_verify"},
-{ERR_FUNC(FIPS_F_DSA_GENERATE_PARAMETERS),      "DSA_generate_parameters"},
-{ERR_FUNC(FIPS_F_FIPS_CHECK_DSA),       "FIPS_CHECK_DSA"},
-{ERR_FUNC(FIPS_F_FIPS_CHECK_EXE),       "FIPS_CHECK_EXE"},
-{ERR_FUNC(FIPS_F_FIPS_CHECK_FINGERPRINT),       "FIPS_CHECK_FINGERPRINT"},
-{ERR_FUNC(FIPS_F_FIPS_CHECK_RSA),       "FIPS_CHECK_RSA"},
-{ERR_FUNC(FIPS_F_FIPS_DSA_CHECK),       "FIPS_dsa_check"},
-{ERR_FUNC(FIPS_F_FIPS_MODE_SET),        "FIPS_mode_set"},
-{ERR_FUNC(FIPS_F_FIPS_SELFTEST_AES),    "FIPS_selftest_aes"},
-{ERR_FUNC(FIPS_F_FIPS_SELFTEST_DES),    "FIPS_selftest_des"},
-{ERR_FUNC(FIPS_F_FIPS_SELFTEST_DSA),    "FIPS_selftest_dsa"},
-{ERR_FUNC(FIPS_F_FIPS_SELFTEST_RNG),    "FIPS_selftest_rng"},
-{ERR_FUNC(FIPS_F_FIPS_SELFTEST_RSA),    "FIPS_selftest_rsa"},
-{ERR_FUNC(FIPS_F_FIPS_SELFTEST_SHA),    "FIPS_SELFTEST_SHA"},
-{ERR_FUNC(FIPS_F_HASH_FINAL),   "HASH_FINAL"},
-{ERR_FUNC(FIPS_F_RSA_EAY_PUBLIC_ENCRYPT),       "RSA_EAY_PUBLIC_ENCRYPT"},
-{ERR_FUNC(FIPS_F_RSA_GENERATE_KEY),     "RSA_generate_key"},
-{ERR_FUNC(FIPS_F_RSA_X931_GENERATE_KEY),        "RSA_X931_generate_key"},
-{ERR_FUNC(FIPS_F_SSLEAY_RAND_BYTES),    "SSLEAY_RAND_BYTES"},
-{ERR_FUNC(FIPS_F_FIPS_CHECK_DSO),       "FIPS_check_dso"},
-{0,NULL}
-        };
-
-static ERR_STRING_DATA FIPS_str_reasons[]=
-        {
-{ERR_REASON(FIPS_R_CANNOT_READ_EXE)      ,"cannot access executable object"},
-{ERR_REASON(FIPS_R_CANNOT_READ_EXE_DIGEST),"cannot access detached digest"},
-{ERR_REASON(FIPS_R_EXE_DIGEST_DOES_NOT_MATCH),"detached digest verification failed"},
-{ERR_REASON(FIPS_R_FINGERPRINT_DOES_NOT_MATCH),"fingerprint does not match"},
-{ERR_REASON(FIPS_R_FINGERPRINT_DOES_NOT_MATCH_NONPIC_RELOCATED),"fingerprint does not match, possibly because non-PIC was relocated"},
-{ERR_REASON(FIPS_R_FINGERPRINT_DOES_NOT_MATCH_SEGMENT_ALIASING),"fingerprint does not match, invalid segment aliasing"},
-{ERR_REASON(FIPS_R_FIPS_MODE_ALREADY_SET),"fips mode already set"},
-{ERR_REASON(FIPS_R_FIPS_SELFTEST_FAILED) ,"fips selftest failed"},
-{ERR_REASON(FIPS_R_INVALID_KEY_LENGTH)   ,"invalid key length"},
-{ERR_REASON(FIPS_R_KEY_TOO_SHORT)        ,"key too short"},
-{ERR_REASON(FIPS_R_NON_FIPS_METHOD)      ,"non fips method"},
-{ERR_REASON(FIPS_R_PAIRWISE_TEST_FAILED) ,"pairwise test failed"},
-{ERR_REASON(FIPS_R_SELFTEST_FAILED)      ,"selftest failed"},
-{ERR_REASON(FIPS_R_UNSUPPORTED_PLATFORM) ,"unsupported platform"},
-{ERR_REASON(FIPS_R_CONTRADICTING_EVIDENCE),"duplicate code detected, check your linking procedure"},
-{0,NULL}
-        };
-
-#endif
-
-void ERR_load_FIPS_strings(void)
-        {
-        static int init;
-
-        if (!init)
-                {
-                init=1;
-#ifndef OPENSSL_NO_ERR
-                ERR_load_strings(0,FIPS_str_functs);
-                ERR_load_strings(0,FIPS_str_reasons);
-#endif
-
-                }
-        }
diff --git a/src/lib/libssl/src/fips-1.0/fips_err_wrapper.c b/src/lib/libssl/src/fips-1.0/fips_err_wrapper.c
deleted file mode 100644
index 09f11748f6..0000000000
--- a/src/lib/libssl/src/fips-1.0/fips_err_wrapper.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-# include "fips_err.h"
-#else
-static void *dummy=&dummy;
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/fips_premain.c b/src/lib/libssl/src/fips-1.0/fips_premain.c
deleted file mode 100644
index 6a75d909eb..0000000000
--- a/src/lib/libssl/src/fips-1.0/fips_premain.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2005 The OpenSSL Project. Rights for redistribution
- * and usage in source and binary forms are granted according to the
- * OpenSSL license.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#if defined(__unix) || defined(__unix__)
-#include <unistd.h>
-#endif
-
-#ifndef FINGERPRINT_PREMAIN_DSO_LOAD
-
-#if defined(__GNUC__) && __GNUC__>=2
-  void FINGERPRINT_premain(void) __attribute__((constructor));
-  /* Most commonly this results in pointer to premain to be dropped
-   * to .ctors segment, which is traversed by GCC crtbegin.o upon
-   * program startup. Except on a.out OpenBSD where it results in
-   * _GLOBAL_$I$premain() {premain();} being auto-generated by
-   * compiler... But one way or another this is believed to cover
-   * *all* GCC targets. */
-#elif defined(_MSC_VER)
-# ifdef _WINDLL
-  __declspec(dllexport) /* this is essentially cosmetics... */
-# endif
-  void FINGERPRINT_premain(void);
-  static int premain_wrapper(void) { FINGERPRINT_premain(); return 0; }
-# pragma data_seg(".CRT$XCU")
-  static int (*p)(void) = premain_wrapper;
-  /* This results in pointer to premain to appear in .CRT segment,
-   * which is traversed by Visual C run-time initialization code.
-   * This applies to both Win32 and [all flavors of] Win64. */
-# pragma data_seg()
-#elif defined(__SUNPRO_C)
-  void FINGERPRINT_premain(void);
-# pragma init(FINGERPRINT_premain)
-  /* This results in a call to premain to appear in .init segment. */
-#elif defined(__DECC) && (defined(__VMS) || defined(VMS))
-  void FINGERPRINT_premain(void);
-# pragma __nostandard
-  globaldef { "LIB$INITIALIZ" } readonly _align (LONGWORD)
-        int spare[8] = {0};
-  globaldef { "LIB$INITIALIZE" } readonly _align (LONGWORD)
-        void (*x_FINGERPRINT_premain)(void) = FINGERPRINT_premain;
-  /* Refer to LIB$INITIALIZE to ensure it exists in the image. */
-  int lib$initialize();
-  globaldef int (*lib_init_ref)() = lib$initialize;
-# pragma __standard
-#elif 0
-  The rest has to be taken care of through command line:
-
-        -Wl,-init,FINGERPRINT_premain           on OSF1 and IRIX
-        -Wl,+init,FINGERPRINT_premain           on HP-UX
-        -Wl,-binitfini:FINGERPRINT_premain      on AIX
-
-  On ELF platforms this results in a call to premain to appear in
-  .init segment...
-#endif
-
-#ifndef HMAC_SHA1_SIG
-#define HMAC_SHA1_SIG "?have to make sure this string is unique"
-#endif
-
-static const unsigned char FINGERPRINT_ascii_value[40] = HMAC_SHA1_SIG;
-
-#define atox(c) ((c)>='a'?((c)-'a'+10):((c)>='A'?(c)-'A'+10:(c)-'0'))
-
-extern const void         *FIPS_text_start(),  *FIPS_text_end();
-extern const unsigned char FIPS_rodata_start[], FIPS_rodata_end[];
-extern unsigned char       FIPS_signature[20];
-extern unsigned int        FIPS_incore_fingerprint(unsigned char *,unsigned int);
-
-/*
- * As name suggests this code is executed prior main(). We use this
- * opportunity to fingerprint sequestered code in virtual address
- * space of target application.
- */
-void FINGERPRINT_premain(void)
-{ unsigned char sig[sizeof(FIPS_signature)];
-  const unsigned char *p=FINGERPRINT_ascii_value;
-  unsigned int len=sizeof(sig),i;
-
-    /* "volatilization" is done to disengage unwanted optimization... */
-    if (*((volatile unsigned char *)p)=='?')
-    {   if (FIPS_text_start()==NULL)
-        {   fprintf(stderr,"FIPS_text_start() returns NULL\n");
-            _exit(1);
-        }
-#if defined(DEBUG_FINGERPRINT_PREMAIN)
-        fprintf(stderr,".text:%p+%d=%p\n",FIPS_text_start(),
-                (int)((size_t)FIPS_text_end()-(size_t)FIPS_text_start()),
-                FIPS_text_end());
-        fprintf(stderr,".rodata:%p+%d=%p\n",FIPS_rodata_start,
-                (int)((size_t)FIPS_rodata_end-(size_t)FIPS_rodata_start),
-                FIPS_rodata_end);
-#endif
-
-        len=FIPS_incore_fingerprint(sig,sizeof(sig));
-
-        if (len!=sizeof(sig))
-        {   fprintf(stderr,"fingerprint length mismatch: %u\n",len);
-            _exit(1);
-        }
-
-        for (i=0;i<len;i++) printf("%02x",sig[i]);
-        printf("\n");
-        fflush(stdout);
-        _exit(0);
-    }
-    else if (FIPS_signature[0]=='\0') do
-    {   for (i=0;i<sizeof(FIPS_signature);i++,p+=2)
-            FIPS_signature[i] = (atox(p[0])<<4)|atox(p[1]);
-
-#if defined(DEBUG_FINGERPRINT_PREMAIN)
-        if (getenv("OPENSSL_FIPS")==NULL) break;
-
-        len=FIPS_incore_fingerprint(sig,sizeof(sig));
-
-        if (memcmp(FIPS_signature,sig,sizeof(FIPS_signature)))
-        {   fprintf(stderr,"FINGERPRINT_premain: FIPS_signature mismatch\n");
-            _exit(1);
-        }
-#endif
-    } while(0);
-}
-
-#else
-
-#include <openssl/bio.h>
-#include <openssl/dso.h>
-#include <openssl/err.h>
-
-int main(int argc,char *argv[])
-{ DSO *dso;
-  DSO_FUNC_TYPE func;
-  BIO *bio_err;
-
-    if (argc < 2)
-    {   fprintf (stderr,"usage: %s libcrypto.dso\n",argv[0]);
-        return 1;
-    }
-
-    if ((bio_err=BIO_new(BIO_s_file())) == NULL)
-    {   fprintf (stderr,"unable to allocate BIO\n");
-        return 1;
-    }
-    BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-    ERR_load_crypto_strings();
-
-    dso = DSO_load(NULL,argv[1],NULL,DSO_FLAG_NO_NAME_TRANSLATION);
-    if (dso == NULL)
-    {   ERR_print_errors(bio_err);
-        return 1;
-    }
-
-    /* This is not normally reached, because FINGERPRINT_premain should
-     * have executed and terminated application already upon DSO_load... */
-    func = DSO_bind_func(dso,"FINGERPRINT_premain");
-    if (func == NULL)
-    {   ERR_print_errors(bio_err);
-        return 1;
-    }
-
-    (*func)();
-
-  return 0;
-}
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/fips_test_suite.c b/src/lib/libssl/src/fips-1.0/fips_test_suite.c
deleted file mode 100644
index 904ff97577..0000000000
--- a/src/lib/libssl/src/fips-1.0/fips_test_suite.c
+++ /dev/null
@@ -1,510 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
- *
- *
- * This command is intended as a test driver for the FIPS-140 testing
- * lab performing FIPS-140 validation.  It demonstrates the use of the
- * OpenSSL library ito perform a variety of common cryptographic
- * functions.  A power-up self test is demonstrated by deliberately
- * pointing to an invalid executable hash
- *
- * Contributed by Steve Marquess.
- *
- */
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <openssl/aes.h>
-#include <openssl/des.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/hmac.h>
-#include <openssl/fips_sha.h>
-#include <openssl/md5.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/bn.h>                                                                                          
-#include <openssl/rand.h>                                                                                          
-#ifndef OPENSSL_FIPS
-int main(int argc, char *argv[])
-    {
-    printf("No FIPS support\n");
-    return(0);
-    }
-#else
-
-/* AES: encrypt and decrypt known plaintext, verify result matches original plaintext
-*/
-static int FIPS_aes_test()
-    {
-    unsigned char userkey[16] = { 0xde, 0xad, 0xbe, 0xef, 0xfe, 0xed, 0xf0, 0x0d };
-    unsigned char plaintext[16] = "etaonrishdlcu";
-    unsigned char ciphertext[16];
-    unsigned char buf[16];
-    AES_KEY key;
-    AES_KEY dkey;
-
-    ERR_clear_error();
-    if (AES_set_encrypt_key( userkey, 128, &key ))
-        return 0;
-    AES_encrypt( plaintext, ciphertext, &key);
-    if (AES_set_decrypt_key( userkey, 128, &dkey ))
-        return 0;
-    AES_decrypt( ciphertext, buf, &dkey);
-    if (memcmp(buf, plaintext, sizeof(buf)))
-        return 0;
-    return 1;
-    }
-
-/* DES: encrypt and decrypt known plaintext, verify result matches original plaintext
-*/
-static int FIPS_des_test()
-    {
-    DES_cblock userkey = { 0xde, 0xad, 0xbe, 0xef, 0xfe, 0xed, 0xf0, 0x0d };
-    DES_cblock plaintext = { 'e', 't', 'a', 'o', 'n', 'r', 'i', 's' };
-
-    DES_key_schedule key;
-    DES_cblock ciphertext;
-    DES_cblock buf;
-
-    ERR_clear_error();
-    if (DES_set_key(&userkey, &key) < 0)
-        return 0;
-    DES_ecb_encrypt( &plaintext, &ciphertext, &key, 1);
-    DES_ecb_encrypt( &ciphertext, &buf, &key, 0);
-    if (memcmp(buf, plaintext, sizeof(buf)))
-        return 0;
-    return 1;
-    }
-
-/* DSA: generate key and sign a known digest, then verify the signature
- * against the digest
-*/
-static int FIPS_dsa_test()
-    {
-    DSA *dsa = NULL;
-    unsigned char dgst[] = "etaonrishdlc";
-    unsigned char sig[256];
-    unsigned int siglen;
-
-    ERR_clear_error();
-    dsa = DSA_generate_parameters(512,NULL,0,NULL,NULL,NULL,NULL);
-    if (!dsa)
-        return 0;
-    if (!DSA_generate_key(dsa))
-        return 0;
-    if ( DSA_sign(0,dgst,sizeof(dgst) - 1,sig,&siglen,dsa) != 1 )
-        return 0;
-    if ( DSA_verify(0,dgst,sizeof(dgst) - 1,sig,siglen,dsa) != 1 )
-        return 0;
-    DSA_free(dsa);
-    return 1;
-    }
-
-/* RSA: generate keys and encrypt and decrypt known plaintext, verify result
- * matches the original plaintext
-*/
-static int FIPS_rsa_test()
-    {
-    RSA *key;
-    unsigned char input_ptext[] = "etaonrishdlc";
-    unsigned char ctext[256];
-    unsigned char ptext[256];
-    int n;
-
-    ERR_clear_error();
-    key = RSA_generate_key(1024,65537,NULL,NULL);
-    if (!key)
-        return 0;
-    n = RSA_size(key);
-    n = RSA_public_encrypt(sizeof(input_ptext) - 1,input_ptext,ctext,key,RSA_PKCS1_PADDING);
-    if (n < 0)
-        return 0;
-    n = RSA_private_decrypt(n,ctext,ptext,key,RSA_PKCS1_PADDING);
-    if (n < 0)
-        return 0;
-    RSA_free(key);
-    if (memcmp(input_ptext,ptext,sizeof(input_ptext) - 1))
-        return 0;
-    return 1;
-    }
-
-/* SHA1: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_sha1_test()
-    {
-    unsigned char digest[SHA_DIGEST_LENGTH] =
-        { 0x11, 0xf1, 0x9a, 0x3a, 0xec, 0x1a, 0x1e, 0x8e, 0x65, 0xd4, 0x9a, 0x38, 0x0c, 0x8b, 0x1e, 0x2c, 0xe8, 0xb3, 0xc5, 0x18 };
-    unsigned char str[] = "etaonrishd";
-
-    unsigned char md[SHA_DIGEST_LENGTH];
-
-    ERR_clear_error();
-    if (!SHA1(str,sizeof(str) - 1,md)) return 0;
-    if (memcmp(md,digest,sizeof(md)))
-        return 0;
-    return 1;
-    }
-
-/* SHA256: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_sha256_test()
-    {
-    unsigned char digest[SHA256_DIGEST_LENGTH] =
-        {0xf5, 0x53, 0xcd, 0xb8, 0xcf, 0x1, 0xee, 0x17, 0x9b, 0x93, 0xc9, 0x68, 0xc0, 0xea, 0x40, 0x91,
-         0x6, 0xec, 0x8e, 0x11, 0x96, 0xc8, 0x5d, 0x1c, 0xaf, 0x64, 0x22, 0xe6, 0x50, 0x4f, 0x47, 0x57};
-    unsigned char str[] = "etaonrishd";
-
-    unsigned char md[SHA256_DIGEST_LENGTH];
-
-    ERR_clear_error();
-    if (!SHA256(str,sizeof(str) - 1,md)) return 0;
-    if (memcmp(md,digest,sizeof(md)))
-        return 0;
-    return 1;
-    }
-
-/* SHA512: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_sha512_test()
-    {
-    unsigned char digest[SHA512_DIGEST_LENGTH] =
-        {0x99, 0xc9, 0xe9, 0x5b, 0x88, 0xd4, 0x78, 0x88, 0xdf, 0x88, 0x5f, 0x94, 0x71, 0x64, 0x28, 0xca,
-         0x16, 0x1f, 0x3d, 0xf4, 0x1f, 0xf3, 0x0f, 0xc5, 0x03, 0x99, 0xb2, 0xd0, 0xe7, 0x0b, 0x94, 0x4a,
-         0x45, 0xd2, 0x6c, 0x4f, 0x20, 0x06, 0xef, 0x71, 0xa9, 0x25, 0x7f, 0x24, 0xb1, 0xd9, 0x40, 0x22,
-         0x49, 0x54, 0x10, 0xc2, 0x22, 0x9d, 0x27, 0xfe, 0xbd, 0xd6, 0xd6, 0xeb, 0x2d, 0x42, 0x1d, 0xa3};
-    unsigned char str[] = "etaonrishd";
-
-    unsigned char md[SHA512_DIGEST_LENGTH];
-
-    ERR_clear_error();
-    if (!SHA512(str,sizeof(str) - 1,md)) return 0;
-    if (memcmp(md,digest,sizeof(md)))
-        return 0;
-    return 1;
-    }
-
-/* HMAC-SHA1: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_hmac_sha1_test()
-    {
-    unsigned char key[] = "etaonrishd";
-    unsigned char iv[] = "Sample text";
-    unsigned char kaval[EVP_MAX_MD_SIZE] =
-        {0x73, 0xf7, 0xa0, 0x48, 0xf8, 0x94, 0xed, 0xdd, 0x0a, 0xea, 0xea, 0x56, 0x1b, 0x61, 0x2e, 0x70,
-         0xb2, 0xfb, 0xec, 0xc6};
-
-    unsigned char out[EVP_MAX_MD_SIZE];
-    unsigned int outlen;
-
-    ERR_clear_error();
-    if (!HMAC(EVP_sha1(),key,sizeof(key)-1,iv,sizeof(iv)-1,out,&outlen)) return 0;
-    if (memcmp(out,kaval,outlen))
-        return 0;
-    return 1;
-    }
-
-/* HMAC-SHA224: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_hmac_sha224_test()
-    {
-    unsigned char key[] = "etaonrishd";
-    unsigned char iv[] = "Sample text";
-    unsigned char kaval[EVP_MAX_MD_SIZE] =
-        {0x75, 0x58, 0xd5, 0xbd, 0x55, 0x6d, 0x87, 0x0f, 0x75, 0xff, 0xbe, 0x1c, 0xb2, 0xf0, 0x20, 0x35,
-         0xe5, 0x62, 0x49, 0xb6, 0x94, 0xb9, 0xfc, 0x65, 0x34, 0x33, 0x3a, 0x19};
-
-    unsigned char out[EVP_MAX_MD_SIZE];
-    unsigned int outlen;
-
-    ERR_clear_error();
-    if (!HMAC(EVP_sha224(),key,sizeof(key)-1,iv,sizeof(iv)-1,out,&outlen)) return 0;
-    if (memcmp(out,kaval,outlen))
-        return 0;
-    return 1;
-    }
-
-/* HMAC-SHA256: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_hmac_sha256_test()
-    {
-    unsigned char key[] = "etaonrishd";
-    unsigned char iv[] = "Sample text";
-    unsigned char kaval[EVP_MAX_MD_SIZE] =
-        {0xe9, 0x17, 0xc1, 0x7b, 0x4c, 0x6b, 0x77, 0xda, 0xd2, 0x30, 0x36, 0x02, 0xf5, 0x72, 0x33, 0x87,
-         0x9f, 0xc6, 0x6e, 0x7b, 0x7e, 0xa8, 0xea, 0xaa, 0x9f, 0xba, 0xee, 0x51, 0xff, 0xda, 0x24, 0xf4};
-
-    unsigned char out[EVP_MAX_MD_SIZE];
-    unsigned int outlen;
-
-    ERR_clear_error();
-    if (!HMAC(EVP_sha256(),key,sizeof(key)-1,iv,sizeof(iv)-1,out,&outlen)) return 0;
-    if (memcmp(out,kaval,outlen))
-        return 0;
-    return 1;
-    }
-
-/* HMAC-SHA384: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_hmac_sha384_test()
-    {
-    unsigned char key[] = "etaonrishd";
-    unsigned char iv[] = "Sample text";
-    unsigned char kaval[EVP_MAX_MD_SIZE] =
-        {0xb2, 0x9d, 0x40, 0x58, 0x32, 0xc4, 0xe3, 0x31, 0xb6, 0x63, 0x08, 0x26, 0x99, 0xef, 0x3b, 0x10,
-         0xe2, 0xdf, 0xf8, 0xff, 0xc6, 0xe1, 0x03, 0x29, 0x81, 0x2a, 0x1b, 0xac, 0xb0, 0x07, 0x39, 0x08,
-         0xf3, 0x91, 0x35, 0x11, 0x76, 0xd6, 0x4c, 0x20, 0xfb, 0x4d, 0xc3, 0xf3, 0xb8, 0x9b, 0x88, 0x1c};
-
-    unsigned char out[EVP_MAX_MD_SIZE];
-    unsigned int outlen;
-
-    ERR_clear_error();
-    if (!HMAC(EVP_sha384(),key,sizeof(key)-1,iv,sizeof(iv)-1,out,&outlen)) return 0;
-    if (memcmp(out,kaval,outlen))
-        return 0;
-    return 1;
-    }
-
-/* HMAC-SHA512: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_hmac_sha512_test()
-    {
-    unsigned char key[] = "etaonrishd";
-    unsigned char iv[] = "Sample text";
-    unsigned char kaval[EVP_MAX_MD_SIZE] =
-        {0xcd, 0x3e, 0xb9, 0x51, 0xb8, 0xbc, 0x7f, 0x9a, 0x23, 0xaf, 0xf3, 0x77, 0x59, 0x85, 0xa9, 0xe6,
-         0xf7, 0xd1, 0x51, 0x96, 0x17, 0xe0, 0x92, 0xd8, 0xa6, 0x3b, 0xc1, 0xad, 0x7e, 0x24, 0xca, 0xb1,
-         0xd7, 0x79, 0x0a, 0xa5, 0xea, 0x2c, 0x02, 0x58, 0x0b, 0xa6, 0x52, 0x6b, 0x61, 0x7f, 0xeb, 0x9c,
-         0x47, 0x86, 0x5d, 0x74, 0x2b, 0x88, 0xdf, 0xee, 0x46, 0x69, 0x96, 0x3d, 0xa6, 0xd9, 0x2a, 0x53};
-
-    unsigned char out[EVP_MAX_MD_SIZE];
-    unsigned int outlen;
-
-    ERR_clear_error();
-    if (!HMAC(EVP_sha512(),key,sizeof(key)-1,iv,sizeof(iv)-1,out,&outlen)) return 0;
-    if (memcmp(out,kaval,outlen))
-        return 0;
-    return 1;
-    }
-
-/* MD5: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int md5_test()
-    {
-    unsigned char digest[MD5_DIGEST_LENGTH] =
-        { 0x48, 0x50, 0xf0, 0xa3, 0x3a, 0xed, 0xd3, 0xaf, 0x6e, 0x47, 0x7f, 0x83, 0x02, 0xb1, 0x09, 0x68 };
-    unsigned char str[] = "etaonrishd";
-
-    unsigned char md[MD5_DIGEST_LENGTH];
-
-    ERR_clear_error();
-    if (!MD5(str,sizeof(str) - 1,md))
-        return 0;
-    if (memcmp(md,digest,sizeof(md)))
-        return 0;
-    return 1;
-    }
-
-/* DH: generate shared parameters
-*/
-static int dh_test()
-    {
-    DH *dh;
-
-    ERR_clear_error();
-    dh = DH_generate_parameters(256, 2, NULL, NULL);
-    if (dh)
-        return 1;
-    return 0;
-    }
-
-/* Zeroize
-*/
-static int Zeroize()
-    {
-    RSA *key;
-    unsigned char userkey[16] = 
-        { 0x48, 0x50, 0xf0, 0xa3, 0x3a, 0xed, 0xd3, 0xaf, 0x6e, 0x47, 0x7f, 0x83, 0x02, 0xb1, 0x09, 0x68 };
-    int i, n;
-    
-    key = RSA_generate_key(1024,65537,NULL,NULL);
-    if (!key)
-        return 0;
-    n = BN_num_bytes(key->d);
-    printf(" Generated %d byte RSA private key\n", n);
-    printf("\tBN key before overwriting:\n%s\n", BN_bn2hex(key->d));
-    BN_rand(key->d,n*8,-1,0);
-    printf("\tBN key after overwriting:\n%s\n", BN_bn2hex(key->d));
-
-    printf("\tchar buffer key before overwriting: \n\t\t");
-    for(i = 0; i < sizeof(userkey); i++) printf("%02x", userkey[i]);
-        printf("\n");
-    RAND_bytes(userkey, sizeof userkey);
-    printf("\tchar buffer key after overwriting: \n\t\t");
-    for(i = 0; i < sizeof(userkey); i++) printf("%02x", userkey[i]);
-        printf("\n");
-
-    return 1;
-    }
-
-static int Error;
-const char * Fail(const char *msg)
-    {
-    Error++;
-    return msg; 
-    }
-
-int main(int argc,char **argv)
-    {
-
-    printf("\tFIPS-mode test application\n\n");
-
-    /* Load entropy from external file, if any */
-    RAND_load_file(".rnd", 1024);
-
-    if (argv[1]) {
-        /* Corrupted KAT tests */
-        if (!strcmp(argv[1], "aes")) {
-            FIPS_corrupt_aes();
-            printf("AES encryption/decryption with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "des")) {
-            FIPS_corrupt_des();
-            printf("DES-ECB encryption/decryption with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "dsa")) {
-            FIPS_corrupt_dsa();
-            printf("DSA key generation and signature validation with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "rsa")) {
-            FIPS_corrupt_rsa();
-            printf("RSA key generation and encryption/decryption with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "sha1")) {
-            FIPS_corrupt_sha1();
-            printf("SHA-1 hash with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "rng")) {
-            FIPS_corrupt_rng();
-            printf("RNG test with corrupted KAT...\n");
-        } else {
-            printf("Bad argument \"%s\"\n", argv[1]);
-            exit(1);
-        }
-        if (!FIPS_mode_set(1))
-            {
-            ERR_load_crypto_strings();
-            ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-            printf("Power-up self test failed\n");
-            exit(1);
-        }
-        printf("Power-up self test successful\n");
-        exit(0);
-    }
-
-    /* Non-Approved cryptographic operation
-    */
-    printf("1. Non-Approved cryptographic operation test...\n");
-    printf("\ta. Excluded algorithm (MD5)...");
-    printf( md5_test() ? "successful\n" :  Fail("FAILED!\n") );
-    printf("\tb. Included algorithm (D-H)...");
-    printf( dh_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* Power-up self test
-    */
-    ERR_clear_error();
-    printf("2. Automatic power-up self test...");
-    if (!FIPS_mode_set(1))
-        {
-        ERR_load_crypto_strings();
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        printf(Fail("FAILED!\n"));
-        exit(1);
-        }
-    printf("successful\n");
-
-    /* AES encryption/decryption
-    */
-    printf("3. AES encryption/decryption...");
-    printf( FIPS_aes_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* RSA key generation and encryption/decryption
-    */
-    printf("4. RSA key generation and encryption/decryption...");
-    printf( FIPS_rsa_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* DES-CBC encryption/decryption
-    */
-    printf("5. DES-ECB encryption/decryption...");
-    printf( FIPS_des_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* DSA key generation and signature validation
-    */
-    printf("6. DSA key generation and signature validation...");
-    printf( FIPS_dsa_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* SHA-1 hash
-    */
-    printf("7a. SHA-1 hash...");
-    printf( FIPS_sha1_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* SHA-256 hash
-    */
-    printf("7b. SHA-256 hash...");
-    printf( FIPS_sha256_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* SHA-512 hash
-    */
-    printf("7c. SHA-512 hash...");
-    printf( FIPS_sha512_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* HMAC-SHA-1 hash
-    */
-    printf("7d. SHA-1 hash...");
-    printf( FIPS_hmac_sha1_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* HMAC-SHA-224 hash
-    */
-    printf("7e. SHA-224 hash...");
-    printf( FIPS_hmac_sha224_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* HMAC-SHA-256 hash
-    */
-    printf("7f. SHA-256 hash...");
-    printf( FIPS_hmac_sha256_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* HMAC-SHA-384 hash
-    */
-    printf("7g. SHA-384 hash...");
-    printf( FIPS_hmac_sha384_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* HMAC-SHA-512 hash
-    */
-    printf("7h. SHA-512 hash...");
-    printf( FIPS_hmac_sha512_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* Non-Approved cryptographic operation
-    */
-    printf("8. Non-Approved cryptographic operation test...\n");
-    printf("\ta. Excluded algorithm (MD5)...");
-    printf( md5_test() ? Fail("passed INCORRECTLY!\n")
-            : "failed as expected\n" );
-    printf("\tb. Included algorithm (D-H)...");
-    printf( dh_test() ? "successful as expected\n"
-            : Fail("failed INCORRECTLY!\n") );
-
-    /* Zeroization
-    */
-    printf("9. Zero-ization...\n");
-    Zeroize();
-
-    printf("\nAll tests completed with %d errors\n", Error);
-    return 0;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/fipshashes.c b/src/lib/libssl/src/fips-1.0/fipshashes.c
deleted file mode 100644
index b96fe2c51c..0000000000
--- a/src/lib/libssl/src/fips-1.0/fipshashes.c
+++ /dev/null
@@ -1,43 +0,0 @@
-const char * const FIPS_source_hashes[] = {
-"HMAC-SHA1(Makefile)= 369e2e023b73789e6af4b8fa2503a7b909c4c3f0",
-"HMAC-SHA1(fips.c)= 3a2deb3c319512952bf5547ed92116a7e0db472b",
-"HMAC-SHA1(fips_err_wrapper.c)= d3e2be316062510312269e98f964cb87e7577898",
-"HMAC-SHA1(fips.h)= 57d602d18efe0594f806fbcc64269e9440638ef4",
-"HMAC-SHA1(fips_err.h)= e0649ee1d60c8162f7eeb293f89f3b63ac85202a",
-"HMAC-SHA1(fips_locl.h)= f90a23c7f68642727012bbfd48ed58706383ad71",
-"HMAC-SHA1(fips_canister.c)= da6d0f5daf9594881fd060773a5f3e057ba302ff",
-"HMAC-SHA1(fips_premain.c)= 6a08d15c578f1258246181bf52134ae974aa5a80",
-"HMAC-SHA1(aes/fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55",
-"HMAC-SHA1(aes/asm/fips-ax86-elf.s)= f797b524a79196e7f59458a5b223432fcfd4a868",
-"HMAC-SHA1(aes/fips_aes_selftest.c)= 98b01502221e7fe529fd981222f2cbb52eb4cbe0",
-"HMAC-SHA1(aes/fips_aes_locl.h)= a98eb0aa449f1d95b8064e261b2ac2b1f328685e",
-"HMAC-SHA1(des/fips_des_enc.c)= 9527f8ea81602358f1aa11348237fdb1e9eeff32",
-"HMAC-SHA1(des/asm/fips-dx86-elf.s)= 9570b03422ffbe5d3d090f91758ebfd46acd5d57",
-"HMAC-SHA1(des/fips_des_selftest.c)= 3bc574e51647c5f5ab45d1007b2cf461d67764a9",
-"HMAC-SHA1(des/fips_set_key.c)= cd1ba25d29376849523a9ddc194c3156a8a7a913",
-"HMAC-SHA1(des/fips_des_locl.h)= e008da40dc6913e374edd66a20d44e1752f00583",
-"HMAC-SHA1(dh/fips_dh_check.c)= 63347e2007e224381d4a7b6d871633889de72cf3",
-"HMAC-SHA1(dh/fips_dh_gen.c)= 93fe69b758ca9d70d70cda1c57fff4eb5c668e85",
-"HMAC-SHA1(dh/fips_dh_key.c)= 2d79eb8d59929ec129d34f53b5aded4a290a28ca",
-"HMAC-SHA1(dsa/fips_dsa_ossl.c)= 2fadb271897a775f023393aa22ddede8a76eec0d",
-"HMAC-SHA1(dsa/fips_dsa_gen.c)= 78c879484fd849312ca4828b957df3842b70efc0",
-"HMAC-SHA1(dsa/fips_dsa_selftest.c)= 7c2ba8d82feda2aadc8b769a3b6c4c25a6356e01",
-"HMAC-SHA1(rand/fips_rand.c)= 7e3964447a81cfe4e75df981827d14a5fe0c2923",
-"HMAC-SHA1(rand/fips_rand.h)= bf009ea8963e79b1e414442ede9ae7010a03160b",
-"HMAC-SHA1(rand/fips_rand_selftest.c)= 5661f383decf0708d0230409fe1564223e834a3b",
-"HMAC-SHA1(rsa/fips_rsa_eay.c)= 2512f849a220daa083f346b10effdb2ee96d4395",
-"HMAC-SHA1(rsa/fips_rsa_gen.c)= 577466931c054d99caf4ac2aefff0e35efd94024",
-"HMAC-SHA1(rsa/fips_rsa_selftest.c)= a9dc47bd1001f795d1565111d26433c300101e06",
-"HMAC-SHA1(rsa/fips_rsa_x931g.c)= 1827d381bb21c53a38a7194cb1c428a2b5f1e3ab",
-"HMAC-SHA1(sha/fips_sha1dgst.c)= 26e529d630b5e754b4a29bd1bb697e991e7fdc04",
-"HMAC-SHA1(sha/fips_standalone_sha1.c)= 46a66875e68398eabca2e933958a2d865149ca1b",
-"HMAC-SHA1(sha/fips_sha1_selftest.c)= a08f9c1e2c0f63b9aa96b927c0333a03b020749f",
-"HMAC-SHA1(sha/asm/fips-sx86-elf.s)= ae66fb23ab8e1a2287e87a0a2dd30a4b9039fe63",
-"HMAC-SHA1(sha/fips_sha_locl.h)= 30b6d6bdbdc9db0d66dc89010c1f4fe1c7b60574",
-"HMAC-SHA1(sha/fips_md32_common.h)= c34d8b7785d3194ff968cf6d3efdd2bfcaec1fad",
-"HMAC-SHA1(sha/fips_sha.h)= cbe98c211cff1684adfa3fe6e6225e92a0a25f6c",
-"HMAC-SHA1(sha/fips_sha256.c)= 97e6dee22a1fe993cc48aa8ff37af10701d7f599",
-"HMAC-SHA1(sha/fips_sha512.c)= 74e6ef26de96f774d233888b831289e69834dd79",
-"HMAC-SHA1(hmac/fips_hmac.c)= a477cec1da76c0092979c4a875b6469339bff7ef",
-"HMAC-SHA1(hmac/fips_hmac_selftest.c)= ebb32b205babf4300017de767fd6e3f1879765c9",
-};
diff --git a/src/lib/libssl/src/fips-1.0/fipsld b/src/lib/libssl/src/fips-1.0/fipsld
deleted file mode 100755
index 819f68731f..0000000000
--- a/src/lib/libssl/src/fips-1.0/fipsld
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (c) 2005 The OpenSSL Project.
-#
-# Depending on output file name, the script either embeds fingerprint
-# into libcrypto.so or static application. "Static" refers to static
-# libcrypto.a, not [necessarily] application per se.
-#
-# Even though this script is called fipsld, it expects C compiler
-# command line syntax and $FIPSLD_CC or $CC environment variable set
-# and can even be used to compile source files.
-
-#set -x
-
-CC=${FIPSLD_CC:-${CC}}
-[ -n "${CC}" ] || { echo '$CC is not defined'; exit 1; }
-
-# Initially -c wasn't intended to be interpreted here, but it might
-# make life easier for those who want to build FIPS-ified applications
-# with minimal [if any] modifications to their Makefiles...
-(   while [ "x$1" != "x" -a "x$1" != "x-c" ]; do shift; done;
-    [ $# -ge 1 ]
-) && exec ${CC} "$@"
-
-# Turn on debugging output?
-(   while [ "x$1" != "x" -a "x$1" != "x-DDEBUG_FINGERPRINT_PREMAIN" ]; do shift; done;
-    [ $# -ge 1 ]
-) && set -x
-
-TARGET=`(while [ "x$1" != "x" -a "x$1" != "x-o" ]; do shift; done; echo $2)`
-[ -n "${TARGET}" ] || { echo 'no -o specified'; exit 1; }
-
-THERE="`echo $0 | sed -e 's|[^/]*$||'`"..
-
-# Location of installed validated FIPS module
-FIPSLIBDIR=${FIPSLIBDIR:-/usr/local/ssl/lib}
-# If this is a build from a validated tarball use this instead
-# FIPSLIBDIR=${THERE}/fips-1.0
-
-[ -f "${FIPSLIBDIR}/fipscanister.o" ] ||
-        { echo "fipscanister.o not found"; exit 1; }
-
-HMAC_KEY="etaonrishdlcupfm"
-
-case "`(uname -s) 2>/dev/null`" in
-OSF1|IRIX*)     _WL_PREMAIN="-Wl,-init,FINGERPRINT_premain"     ;;
-HP-UX)          _WL_PREMAIN="-Wl,+init,FINGERPRINT_premain"     ;;
-AIX)            _WL_PREMAIN="-Wl,-binitfini:FINGERPRINT_premain";;
-Darwin)         (   while [ "x$1" != "x" -a "x$1" != "x-dynamiclib" ]; do shift; done;
-                    [ $# -ge 1 ]
-                ) && _WL_PREMAIN="-Wl,-init,_FINGERPRINT_premain" ;;
-esac
-
-case "${TARGET}" in
-[!/]*)  TARGET=./${TARGET} ;;
-esac
-
-case "${TARGET}" in
-*libcrypto*|*.dll)      # must be linking a shared lib...
-        # Shared lib creation can be taking place in the source
-        # directory only!!!
-        FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"
-        CANISTER_O="${FIPSLIBDIR}/fipscanister.o"
-        PREMAIN_C="${FIPSLIBDIR}/fips_premain.c"
-
-echo Canister: $CANISTER_O
-
-        # verify fipscanister.o against its detached signature...
-        ${FINGERTYPE} "${CANISTER_O}" | sed "s/(.*\//(/" | \
-                diff -w "${CANISTER_O}.sha1" - || \
-        { echo "${CANISTER_O} fingerprint mismatch"; exit 1; }
-
-        # verify fips_premain.c against its signature embedded into
-        # fipscanister.o...
-        SIG=`${FINGERTYPE} "${PREMAIN_C}" | sed -n "s/(.*\//(/;/^./p"`
-        REF=`strings "${CANISTER_O}" | grep "HMAC-SHA1(fips_premain\\.c)"`
-        [ "${SIG}" = "${REF}" ] || \
-        { echo "${PREMAIN_C} fingerprint mismatch"; exit 1; }
-
-        # Temporarily remove fipscanister.o from libcrypto.a!
-        # We are required to use the standalone copy...
-        trap    'ar r "${THERE}/libcrypto.a" "${CANISTER_O}";
-                 (ranlib "${THERE}/libcrypto.a") 2>/dev/null;
-                 sleep 1;
-                 touch -c "${TARGET}"' 0
-
-        ar d "${THERE}/libcrypto.a" fipscanister.o 2>&1 > /dev/null || :
-        (ranlib "${THERE}/libcrypto.a") 2>/dev/null || :
-
-        ${CC}   "${CANISTER_O}" \
-                "${PREMAIN_C}" \
-                ${_WL_PREMAIN} "$@"
-
-        # generate signature...
-        SIG=`("${THERE}/fips-1.0/fips_premain_dso" "${TARGET}" || rm "${TARGET}")`
-        if [ -z "${SIG}" ]; then
-           echo "unable to collect signature"; exit 1
-        fi
-
-        # recompile with signature...
-        ${CC}   "${CANISTER_O}" \
-                -DHMAC_SHA1_SIG=\"${SIG}\" "${PREMAIN_C}" \
-                ${_WL_PREMAIN} "$@"
-        ;;
-
-*)      # must be linking statically...
-        # Static linking can be taking place either in the source
-        # directory or off the installed binary target destination.
-        if [ -x "${THERE}/fips-1.0/sha/fips_standalone_sha1" ]; then
-                FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"
-        else    # Installed tree is expected to contain
-                # lib/fipscanister.o, lib/fipscanister.o.sha1 and
-                # lib/fips_premain.c [not to mention bin/openssl].
-                FINGERTYPE="${THERE}/bin/openssl sha1 -hmac ${HMAC_KEY}"
-        fi
-
-        CANISTER_O="${FIPSLIBDIR}/fipscanister.o"
-        PREMAIN_C="${FIPSLIBDIR}/fips_premain.c"
-
-        # verify fipscanister.o against its detached signature...
-        ${FINGERTYPE} "${CANISTER_O}" | sed "s/(.*\//(/" | \
-                diff -w "${CANISTER_O}.sha1" - || \
-        { echo "${CANISTER_O} fingerprint mismatch"; exit 1; }
-
-        # verify fips_premain.c against its signature embedded into
-        # fipscanister.o...
-        SIG=`${FINGERTYPE} "${PREMAIN_C}" | sed -n "s/(.*\//(/;/^./p"`
-        REF=`strings "${CANISTER_O}" | grep "HMAC-SHA1(fips_premain\\.c)"`
-        [ "${SIG}" = "${REF}" ] || \
-        { echo "${PREMAIN_C} fingerprint mismatch"; exit 1; }
-
-        ${CC}   "${CANISTER_O}" \
-                "${PREMAIN_C}" \
-                ${_WL_PREMAIN} "$@"
-
-        # generate signature...
-        SIG=`("${TARGET}" || /bin/rm "${TARGET}")`
-        if [ -z "${SIG}" ]; then
-           echo "unable to collect signature"; exit 1
-        fi
-
-        # recompile with signature...
-        ${CC}   "${CANISTER_O}" \
-                -DHMAC_SHA1_SIG=\"${SIG}\" "${PREMAIN_C}" \
-                ${_WL_PREMAIN} "$@"
-        ;;
-esac
diff --git a/src/lib/libssl/src/fips-1.0/hmac/Makefile b/src/lib/libssl/src/fips-1.0/hmac/Makefile
deleted file mode 100644
index a5e777f71a..0000000000
--- a/src/lib/libssl/src/fips-1.0/hmac/Makefile
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-# OpenSSL/fips-1.0/hmac/Makefile
-#
-
-DIR=    hmac
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=fips_hmactest.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_hmac.c fips_hmac_selftest.c
-LIBOBJ=fips_hmac.o fips_hmac_selftest.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    lib
-
-lib:    $(LIBOBJ)
-        @echo $(LIBOBJ) > lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-Q=../testvectors/hmac/req
-A=../testvectors/hmac/rsp
-
-fips_test:
-        -rm -rf $(A)
-        mkdir $(A)
-        if [ -f $(Q)/HMAC.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_hmactest < $(Q)/HMAC.req > $(A)/HMAC.rsp; fi
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_hmac.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_hmac.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-fips_hmac.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
-fips_hmac.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_hmac.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_hmac.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_hmac.o: ../../include/openssl/evp.h ../../include/openssl/hmac.h
-fips_hmac.o: ../../include/openssl/idea.h ../../include/openssl/md2.h
-fips_hmac.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-fips_hmac.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-fips_hmac.o: ../../include/openssl/objects.h
-fips_hmac.o: ../../include/openssl/opensslconf.h
-fips_hmac.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-fips_hmac.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_hmac.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-fips_hmac.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_hmac.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_hmac.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_hmac.o: ../../include/openssl/ui_compat.h fips_hmac.c
-fips_hmac_selftest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_hmac_selftest.o: ../../include/openssl/bio.h
-fips_hmac_selftest.o: ../../include/openssl/blowfish.h
-fips_hmac_selftest.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
-fips_hmac_selftest.o: ../../include/openssl/crypto.h
-fips_hmac_selftest.o: ../../include/openssl/des.h
-fips_hmac_selftest.o: ../../include/openssl/des_old.h
-fips_hmac_selftest.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-fips_hmac_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_hmac_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_hmac_selftest.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
-fips_hmac_selftest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-fips_hmac_selftest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-fips_hmac_selftest.o: ../../include/openssl/mdc2.h
-fips_hmac_selftest.o: ../../include/openssl/obj_mac.h
-fips_hmac_selftest.o: ../../include/openssl/objects.h
-fips_hmac_selftest.o: ../../include/openssl/opensslconf.h
-fips_hmac_selftest.o: ../../include/openssl/opensslv.h
-fips_hmac_selftest.o: ../../include/openssl/ossl_typ.h
-fips_hmac_selftest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_hmac_selftest.o: ../../include/openssl/rc5.h
-fips_hmac_selftest.o: ../../include/openssl/ripemd.h
-fips_hmac_selftest.o: ../../include/openssl/rsa.h
-fips_hmac_selftest.o: ../../include/openssl/safestack.h
-fips_hmac_selftest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_hmac_selftest.o: ../../include/openssl/symhacks.h
-fips_hmac_selftest.o: ../../include/openssl/ui.h
-fips_hmac_selftest.o: ../../include/openssl/ui_compat.h fips_hmac_selftest.c
-fips_hmactest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_hmactest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-fips_hmactest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-fips_hmactest.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-fips_hmactest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_hmactest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_hmactest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_hmactest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_hmactest.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
-fips_hmactest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-fips_hmactest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-fips_hmactest.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-fips_hmactest.o: ../../include/openssl/objects.h
-fips_hmactest.o: ../../include/openssl/opensslconf.h
-fips_hmactest.o: ../../include/openssl/opensslv.h
-fips_hmactest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-fips_hmactest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_hmactest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-fips_hmactest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_hmactest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_hmactest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_hmactest.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
-fips_hmactest.o: ../../include/openssl/x509_vfy.h
-fips_hmactest.o: ../../include/openssl/x509v3.h fips_hmactest.c
diff --git a/src/lib/libssl/src/fips-1.0/hmac/fips_hmac_selftest.c b/src/lib/libssl/src/fips-1.0/hmac/fips_hmac_selftest.c
deleted file mode 100644
index fc599b75ef..0000000000
--- a/src/lib/libssl/src/fips-1.0/hmac/fips_hmac_selftest.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2005 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/hmac.h>
-
-#ifdef OPENSSL_FIPS
-typedef struct {
-        const EVP_MD *(*alg)(void);
-        const char *key, *iv;
-        unsigned char kaval[EVP_MAX_MD_SIZE];
-} HMAC_KAT;
-
-static const HMAC_KAT vector[] = {
-    {   EVP_sha1,
-        /* from http://csrc.nist.gov/publications/fips/fips198/fips-198a.pdf */
-        "0123456789:;<=>?@ABC",
-        "Sample #2",
-        { 0x09,0x22,0xd3,0x40,0x5f,0xaa,0x3d,0x19,
-          0x4f,0x82,0xa4,0x58,0x30,0x73,0x7d,0x5c,
-          0xc6,0xc7,0x5d,0x24 }
-    },
-    {   EVP_sha224,
-        /* just keep extending the above... */
-        "0123456789:;<=>?@ABC",
-        "Sample #2",
-        { 0xdd,0xef,0x0a,0x40,0xcb,0x7d,0x50,0xfb,
-          0x6e,0xe6,0xce,0xa1,0x20,0xba,0x26,0xaa,
-          0x08,0xf3,0x07,0x75,0x87,0xb8,0xad,0x1b,
-          0x8c,0x8d,0x12,0xc7 }
-    },
-    {   EVP_sha256,
-        "0123456789:;<=>?@ABC",
-        "Sample #2",
-        { 0xb8,0xf2,0x0d,0xb5,0x41,0xea,0x43,0x09,
-          0xca,0x4e,0xa9,0x38,0x0c,0xd0,0xe8,0x34,
-          0xf7,0x1f,0xbe,0x91,0x74,0xa2,0x61,0x38,
-          0x0d,0xc1,0x7e,0xae,0x6a,0x34,0x51,0xd9 }
-    },
-    {   EVP_sha384,
-        "0123456789:;<=>?@ABC",
-        "Sample #2",
-        { 0x08,0xbc,0xb0,0xda,0x49,0x1e,0x87,0xad,
-          0x9a,0x1d,0x6a,0xce,0x23,0xc5,0x0b,0xf6,
-          0xb7,0x18,0x06,0xa5,0x77,0xcd,0x49,0x04,
-          0x89,0xf1,0xe6,0x23,0x44,0x51,0x51,0x9f,
-          0x85,0x56,0x80,0x79,0x0c,0xbd,0x4d,0x50,
-          0xa4,0x5f,0x29,0xe3,0x93,0xf0,0xe8,0x7f }
-    },
-    {   EVP_sha512,
-        "0123456789:;<=>?@ABC",
-        "Sample #2",
-        { 0x80,0x9d,0x44,0x05,0x7c,0x5b,0x95,0x41,
-          0x05,0xbd,0x04,0x13,0x16,0xdb,0x0f,0xac,
-          0x44,0xd5,0xa4,0xd5,0xd0,0x89,0x2b,0xd0,
-          0x4e,0x86,0x64,0x12,0xc0,0x90,0x77,0x68,
-          0xf1,0x87,0xb7,0x7c,0x4f,0xae,0x2c,0x2f,
-          0x21,0xa5,0xb5,0x65,0x9a,0x4f,0x4b,0xa7,
-          0x47,0x02,0xa3,0xde,0x9b,0x51,0xf1,0x45,
-          0xbd,0x4f,0x25,0x27,0x42,0x98,0x99,0x05 }
-    },
-};
-
-int FIPS_selftest_hmac()
-    {
-    int n;
-    unsigned int    outlen;
-    unsigned char   out[EVP_MAX_MD_SIZE];
-    const EVP_MD   *md;
-    const HMAC_KAT *t;
-
-    for(n=0,t=vector; n<sizeof(vector)/sizeof(vector[0]); n++,t++)
-        {
-        md = (*t->alg)();
-        HMAC(md,t->key,strlen(t->key),
-                (const unsigned char *)t->iv,strlen(t->iv),
-                out,&outlen);
-
-        if(memcmp(out,t->kaval,outlen))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_SHA,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-    return 1;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/hmac/fips_hmactest.c b/src/lib/libssl/src/fips-1.0/hmac/fips_hmactest.c
deleted file mode 100644
index e26e33ee3f..0000000000
--- a/src/lib/libssl/src/fips-1.0/hmac/fips_hmactest.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/* fips_hmactest.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 2005.
- */
-/* ====================================================================
- * Copyright (c) 2005 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/err.h>
-#include <openssl/x509v3.h>
-
-#ifndef OPENSSL_FIPS
-
-int main(int argc, char *argv[])
-{
-    printf("No FIPS HMAC support\n");
-    return(0);
-}
-
-#else
-
-static int hmac_test(BIO *err, const EVP_MD *md, BIO *out, BIO *in);
-static int print_hmac(BIO *err, const EVP_MD *md, BIO *out,
-                unsigned char *Key, int Klen,
-                unsigned char *Msg, int Msglen, int Tlen);
-
-int main(int argc, char **argv)
-        {
-        BIO *in = NULL, *out = NULL, *err = NULL;
-
-        int ret = 1;
-
-        ERR_load_crypto_strings();
-
-        err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-        if (!err)
-                {
-                fprintf(stderr, "FATAL stderr initialization error\n");
-                goto end;
-                }
-
-        if(!FIPS_mode_set(1))
-                {
-                ERR_print_errors(err);
-                goto end;
-                }
-
-        if (argc == 1)
-                in = BIO_new_fp(stdin, BIO_NOCLOSE);
-        else
-                in = BIO_new_file(argv[1], "r");
-
-        if (argc < 2)
-                out = BIO_new_fp(stdout, BIO_NOCLOSE);
-        else
-                out = BIO_new_file(argv[2], "w");
-
-        if (!in)
-                {
-                BIO_printf(err, "FATAL input initialization error\n");
-                goto end;
-                }
-
-        if (!out)
-                {
-                fprintf(stderr, "FATAL output initialization error\n");
-                goto end;
-                }
-
-        if (!hmac_test(err, EVP_sha1(), out, in))
-                {
-                fprintf(stderr, "FATAL hmac file processing error\n");
-                goto end;
-                }
-        else
-                ret = 0;
-
-        end:
-
-        if (ret && err)
-                ERR_print_errors(err);
-
-        if (in)
-                BIO_free(in);
-        if (out)
-                BIO_free(out);
-        if (err)
-                BIO_free(err);
-
-        return ret;
-
-        }
-
-#define HMAC_TEST_MAXLINELEN    1024
-
-int hmac_test(BIO *err, const EVP_MD *md, BIO *out, BIO *in)
-        {
-        char *linebuf, *olinebuf, *p, *q;
-        char *keyword, *value;
-        unsigned char *Key = NULL, *Msg = NULL;
-        int Count, Klen, Tlen;
-        long Keylen, Msglen;
-        int ret = 0;
-        int lnum = 0;
-
-        olinebuf = OPENSSL_malloc(HMAC_TEST_MAXLINELEN);
-        linebuf = OPENSSL_malloc(HMAC_TEST_MAXLINELEN);
-
-        if (!linebuf || !olinebuf)
-                goto error;
-
-        Count = -1;
-        Klen = -1;
-        Tlen = -1;
-
-        while (BIO_gets(in, olinebuf, HMAC_TEST_MAXLINELEN) > 0)
-                {
-                lnum++;
-                strcpy(linebuf, olinebuf);
-                keyword = linebuf;
-                /* Skip leading space */
-                while (isspace((unsigned char)*keyword))
-                        keyword++;
-
-                /* Look for = sign */
-                p = strchr(linebuf, '=');
-
-                /* If no = or starts with [ (for [L=20] line) just copy */
-                if (!p)
-                        {
-                        if (!BIO_puts(out, olinebuf))
-                                goto error;
-                        continue;
-                        }
-
-                q = p - 1;
-
-                /* Remove trailing space */
-                while (isspace((unsigned char)*q))
-                        *q-- = 0;
-
-                *p = 0;
-                value = p + 1;
-
-                /* Remove leading space from value */
-                while (isspace((unsigned char)*value))
-                        value++;
-
-                /* Remove trailing space from value */
-                p = value + strlen(value) - 1;
-
-                while (*p == '\n' || isspace((unsigned char)*p))
-                        *p-- = 0;
-
-                if (!strcmp(keyword,"[L") && *p==']')
-                        {
-                        switch (atoi(value))
-                                {
-                                case 20: md=EVP_sha1();   break;
-                                case 28: md=EVP_sha224(); break;
-                                case 32: md=EVP_sha256(); break;
-                                case 48: md=EVP_sha384(); break;
-                                case 64: md=EVP_sha512(); break;
-                                default: goto parse_error;
-                                }
-                        }
-                else if (!strcmp(keyword, "Count"))
-                        {
-                        if (Count != -1)
-                                goto parse_error;
-                        Count = atoi(value);
-                        if (Count < 0)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Klen"))
-                        {
-                        if (Klen != -1)
-                                goto parse_error;
-                        Klen = atoi(value);
-                        if (Klen < 0)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Tlen"))
-                        {
-                        if (Tlen != -1)
-                                goto parse_error;
-                        Tlen = atoi(value);
-                        if (Tlen < 0)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Msg"))
-                        {
-                        if (Msg)
-                                goto parse_error;
-                        Msg = string_to_hex(value, &Msglen);
-                        if (!Msg)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Key"))
-                        {
-                        if (Key)
-                                goto parse_error;
-                        Key = string_to_hex(value, &Keylen);
-                        if (!Key)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Mac"))
-                        continue;
-                else
-                        goto parse_error;
-
-                BIO_puts(out, olinebuf);
-
-                if (Key && Msg && (Tlen > 0) && (Klen > 0))
-                        {
-                        if (!print_hmac(err, md, out, Key, Klen, Msg, Msglen, Tlen))
-                                goto error;
-                        OPENSSL_free(Key);
-                        Key = NULL;
-                        OPENSSL_free(Msg);
-                        Msg = NULL;
-                        Klen = -1;
-                        Tlen = -1;
-                        Count = -1;
-                        }
-
-                }
-
-
-        ret = 1;
-
-
-        error:
-
-        if (olinebuf)
-                OPENSSL_free(olinebuf);
-        if (linebuf)
-                OPENSSL_free(linebuf);
-        if (Key)
-                OPENSSL_free(Key);
-        if (Msg)
-                OPENSSL_free(Msg);
-
-        return ret;
-
-        parse_error:
-
-        BIO_printf(err, "FATAL parse error processing line %d\n", lnum);
-
-        goto error;
-
-        }
-
-static int print_hmac(BIO *err, const EVP_MD *emd, BIO *out,
-                unsigned char *Key, int Klen,
-                unsigned char *Msg, int Msglen, int Tlen)
-        {
-        int i, mdlen;
-        unsigned char md[EVP_MAX_MD_SIZE];
-        if (!HMAC(emd, Key, Klen, Msg, Msglen, md,
-                                                (unsigned int *)&mdlen))
-                {
-                BIO_puts(err, "Error calculating HMAC\n");
-                return 0;
-                }
-        if (Tlen > mdlen)
-                {
-                BIO_puts(err, "Parameter error, Tlen > HMAC length\n");
-                return 0;
-                }
-        BIO_puts(out, "Mac = ");
-        for (i = 0; i < Tlen; i++)
-                BIO_printf(out, "%02x", md[i]);
-        BIO_puts(out, "\n");
-        return 1;
-        }
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/install.com b/src/lib/libssl/src/fips-1.0/install.com
deleted file mode 100644
index 8867fcf4c0..0000000000
--- a/src/lib/libssl/src/fips-1.0/install.com
+++ /dev/null
@@ -1,57 +0,0 @@
-$! INSTALL.COM -- Installs the files in a given directory tree
-$!
-$! Author: Richard Levitte <richard@levitte.org>
-$! Time of creation: 27-MAY-2004 11:47
-$!
-$! P1   root of the directory tree
-$!
-$       IF P1 .EQS. ""
-$       THEN
-$           WRITE SYS$OUTPUT "First argument missing."
-$           WRITE SYS$OUTPUT "Should be the directory where you want things installed."
-$           EXIT
-$       ENDIF
-$
-$       ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
-$       ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
-$       ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
-                   - "[000000." - "][" - "[" - "]"
-$       ROOT = ROOT_DEV + "[" + ROOT_DIR
-$
-$       DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$       DEFINE/NOLOG WRK_SSLINCLUDE WRK_SSLROOT:[INCLUDE]
-$
-$       IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
-           CREATE/DIR/LOG WRK_SSLROOT:[000000]
-$       IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
-           CREATE/DIR/LOG WRK_SSLINCLUDE:
-$
-$       FDIRS := ,RAND,SHA1,DES,AES,DSA,RSA,DH,HMAC
-$       EXHEADER_ := fips.h
-$       EXHEADER_SHA := fips_sha.h
-$       EXHEADER_RAND := fips_rand.h
-$       EXHEADER_DES :=
-$       EXHEADER_AES :=
-$       EXHEADER_DSA :=
-$       EXHEADER_RSA :=
-$       EXHEADER_DH :=
-$       EXHEADER_HMAC :=
-$
-$       I = 0
-$ LOOP_FDIRS: 
-$       D = F$EDIT(F$ELEMENT(I, ",", FDIRS),"TRIM")
-$       I = I + 1
-$       IF D .EQS. "," THEN GOTO LOOP_FDIRS_END
-$       tmp = EXHEADER_'D'
-$       IF tmp .EQS. "" THEN GOTO LOOP_FDIRS
-$       IF D .EQS. ""
-$       THEN
-$         COPY 'tmp' WRK_SSLINCLUDE: /LOG
-$       ELSE
-$         COPY [.'D']'tmp' WRK_SSLINCLUDE: /LOG
-$       ENDIF
-$       SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'tmp'
-$       GOTO LOOP_FDIRS
-$ LOOP_FDIRS_END:
-$
-$       EXIT
diff --git a/src/lib/libssl/src/fips-1.0/openssl_fips_fingerprint b/src/lib/libssl/src/fips-1.0/openssl_fips_fingerprint
deleted file mode 100755
index f59a67d537..0000000000
--- a/src/lib/libssl/src/fips-1.0/openssl_fips_fingerprint
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# Check the library fingerprint and generate an executable fingerprint, or
-# return an error
-
-lib=$1
-exe=$2
-ext=${HMAC_EXT:-sha1}
-
-# deal with the case where we're run from within the build and OpenSSL is
-# not yet installed.  Also, make sure LD_LIBRARY_PATH is properly set in
-# case shared libraries are built.
-if [ "X$TOP" != "X" ]
-then
-    if test "$OSTYPE" = msdosdjgpp; then
-        PATH="$TOP/apps;$TOP;$PATH"
-    else
-        PATH="$TOP/apps:$TOP:$PATH"
-    fi
-    LD_LIBRARY_PATH=$TOP; export LD_LIBRARY_PATH
-else
-    LD_LIBRARY_PATH=.; export LD_LIBRARY_PATH
-fi
-
-echo "Checking library fingerprint for $lib"
-openssl sha1 -hmac etaonrishdlcupfm $lib | sed "s/(.*\//(/" | diff -w $lib.sha1 - || { echo "$libs fingerprint mismatch"; exit 1; }
-
-[ -x $exe.exe ] && exe=$exe.exe
-
-echo "Making fingerprint for $exe"
-openssl sha1 -hmac etaonrishdlcupfm -binary $exe > $exe.$ext || rm $exe.$ext
diff --git a/src/lib/libssl/src/fips-1.0/rand/Makefile b/src/lib/libssl/src/fips-1.0/rand/Makefile
deleted file mode 100644
index 6820f3a205..0000000000
--- a/src/lib/libssl/src/fips-1.0/rand/Makefile
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# OpenSSL/fips-1.0/rand/Makefile
-#
-
-DIR=    rand
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST= fips_randtest.c fips_rngvs.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_rand.c fips_rand_selftest.c
-LIBOBJ=fips_rand.o fips_rand_selftest.o
-
-SRC= $(LIBSRC)
-
-EXHEADER= fips_rand.h
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all)
-
-all:    lib
-
-lib:    $(LIBOBJ)
-        @echo $(LIBOBJ) > lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-Q=../testvectors/rng/req
-A=../testvectors/rng/rsp
-
-fips_test:
-        -rm -rf $(A)
-        mkdir $(A)
-        if [ -f $(Q)/ANSI931_TDES2MCT.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rngvs mct < $(Q)/ANSI931_TDES2MCT.req > $(A)/ANSI931_TDES2MCT.rsp; fi
-        if [ -f $(Q)/ANSI931_TDES2VST.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rngvs vst < $(Q)/ANSI931_TDES2VST.req > $(A)/ANSI931_TDES2VST.rsp; fi
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_rand.o: ../../e_os.h ../../include/openssl/bio.h
-fips_rand.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_rand.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
-fips_rand.o: ../../include/openssl/err.h ../../include/openssl/fips_rand.h
-fips_rand.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-fips_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-fips_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
-fips_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_rand.o: fips_rand.c
-fips_rand_selftest.o: ../../include/openssl/bio.h
-fips_rand_selftest.o: ../../include/openssl/crypto.h
-fips_rand_selftest.o: ../../include/openssl/des.h
-fips_rand_selftest.o: ../../include/openssl/des_old.h
-fips_rand_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rand_selftest.o: ../../include/openssl/fips.h
-fips_rand_selftest.o: ../../include/openssl/fips_rand.h
-fips_rand_selftest.o: ../../include/openssl/lhash.h
-fips_rand_selftest.o: ../../include/openssl/opensslconf.h
-fips_rand_selftest.o: ../../include/openssl/opensslv.h
-fips_rand_selftest.o: ../../include/openssl/ossl_typ.h
-fips_rand_selftest.o: ../../include/openssl/rand.h
-fips_rand_selftest.o: ../../include/openssl/safestack.h
-fips_rand_selftest.o: ../../include/openssl/stack.h
-fips_rand_selftest.o: ../../include/openssl/symhacks.h
-fips_rand_selftest.o: ../../include/openssl/ui.h
-fips_rand_selftest.o: ../../include/openssl/ui_compat.h fips_rand_selftest.c
-fips_randtest.o: ../../e_os.h ../../include/openssl/bio.h
-fips_randtest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_randtest.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
-fips_randtest.o: ../../include/openssl/err.h ../../include/openssl/fips_rand.h
-fips_randtest.o: ../../include/openssl/lhash.h
-fips_randtest.o: ../../include/openssl/opensslconf.h
-fips_randtest.o: ../../include/openssl/opensslv.h
-fips_randtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_randtest.o: ../../include/openssl/safestack.h
-fips_randtest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_randtest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_randtest.o: fips_randtest.c
-fips_rngvs.o: ../../include/openssl/opensslconf.h fips_rngvs.c
diff --git a/src/lib/libssl/src/fips-1.0/rand/fips_rand.c b/src/lib/libssl/src/fips-1.0/rand/fips_rand.c
deleted file mode 100644
index 7df2dc804e..0000000000
--- a/src/lib/libssl/src/fips-1.0/rand/fips_rand.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- * This is a FIPS approved PRNG, ANSI X9.31 A.2.4.
- */
-
-#include "e_os.h"
-
-/* If we don't define _XOPEN_SOURCE_EXTENDED, struct timeval won't
-   be defined and gettimeofday() won't be declared with strict compilers
-   like DEC C in ANSI C mode.  */
-#ifndef _XOPEN_SOURCE_EXTENDED
-#define _XOPEN_SOURCE_EXTENDED 1
-#endif
-
-#include <openssl/des.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-#include <openssl/fips_rand.h>
-#ifndef OPENSSL_SYS_WIN32
-#include <sys/time.h>
-#endif
-#include <assert.h>
-#ifndef OPENSSL_SYS_WIN32
-# ifdef OPENSSL_UNISTD
-#  include OPENSSL_UNISTD
-# else
-#  include <unistd.h>
-# endif
-#endif
-#include <string.h>
-
-void *OPENSSL_stderr(void);
-
-#ifdef OPENSSL_FIPS
-
-#define SEED_SIZE       8
-
-static unsigned char seed[SEED_SIZE];
-static FIPS_RAND_SIZE_T n_seed;
-static FIPS_RAND_SIZE_T o_seed;
-static DES_cblock key1;
-static DES_cblock key2;
-static DES_key_schedule ks1,ks2;
-static int key_set;
-static int key_init;
-static int test_mode;
-static unsigned char test_faketime[8];
-
-#ifndef GETPID_IS_MEANINGLESS
-static int seed_pid;
-static int key_pid;
-#endif
-
-static void fips_rand_cleanup(void);
-static void fips_rand_add(const void *buf, FIPS_RAND_SIZE_T num, double add_entropy);
-static int fips_rand_bytes(unsigned char *buf, FIPS_RAND_SIZE_T num);
-static int fips_rand_status(void);
-
-static const RAND_METHOD rand_fips_meth=
-    {
-    FIPS_rand_seed,
-    fips_rand_bytes,
-    fips_rand_cleanup,
-    fips_rand_add,
-    fips_rand_bytes,
-    fips_rand_status
-    };
-
-static int second;
-
-const RAND_METHOD *FIPS_rand_method(void)
-{
-  return &rand_fips_meth;
-}
-
-void FIPS_set_prng_key(const unsigned char k1[8],const unsigned char k2[8])
-    {
-    memcpy(&key1,k1,sizeof key1);
-    memcpy(&key2,k2,sizeof key2);
-    key_set=1;
-#ifndef GETPID_IS_MEANINGLESS
-    key_pid=getpid();
-#endif
-    second=0;
-    }
-
-void FIPS_test_mode(int test,const unsigned char faketime[8])
-    {
-    test_mode=test;
-    if(!test_mode)
-        return;
-    memcpy(test_faketime,faketime,sizeof test_faketime);
-    }
-
-/* NB: this returns true if _partially_ seeded */
-int FIPS_rand_seeded()
-    { return key_set || n_seed; }
-
-static void fips_gettime(unsigned char buf[8])
-    {
-#ifdef OPENSSL_SYS_WIN32
-    FILETIME ft;
-#else
-    struct timeval tv;
-#endif
-
-    if(test_mode)
-        {
-        /* fprintf(OPENSSL_stderr(),"WARNING!!! PRNG IN TEST MODE!!!\n"); */
-        memcpy(buf,test_faketime,sizeof test_faketime);
-        return;
-        }
-#ifdef OPENSSL_SYS_WIN32
-    GetSystemTimeAsFileTime(&ft);
-    buf[0] = (unsigned char) (ft.dwHighDateTime & 0xff);
-    buf[1] = (unsigned char) ((ft.dwHighDateTime >> 8) & 0xff);
-    buf[2] = (unsigned char) ((ft.dwHighDateTime >> 16) & 0xff);
-    buf[3] = (unsigned char) ((ft.dwHighDateTime >> 24) & 0xff);
-    buf[4] = (unsigned char) (ft.dwLowDateTime & 0xff);
-    buf[5] = (unsigned char) ((ft.dwLowDateTime >> 8) & 0xff);
-    buf[6] = (unsigned char) ((ft.dwLowDateTime >> 16) & 0xff);
-    buf[7] = (unsigned char) ((ft.dwLowDateTime >> 24) & 0xff);
-#else
-    gettimeofday(&tv,NULL);
-    buf[0] = (unsigned char) (tv.tv_sec & 0xff);
-    buf[1] = (unsigned char) ((tv.tv_sec >> 8) & 0xff);
-    buf[2] = (unsigned char) ((tv.tv_sec >> 16) & 0xff);
-    buf[3] = (unsigned char) ((tv.tv_sec >> 24) & 0xff);
-    buf[4] = (unsigned char) (tv.tv_usec & 0xff);
-    buf[5] = (unsigned char) ((tv.tv_usec >> 8) & 0xff);
-    buf[6] = (unsigned char) ((tv.tv_usec >> 16) & 0xff);
-    buf[7] = (unsigned char) ((tv.tv_usec >> 24) & 0xff);
-#endif
-
-#if 0  /* This eminently sensible strategy is not acceptable to NIST. Sigh. */
-#ifndef GETPID_IS_MEANINGLESS
-    /* we mix in the PID to ensure that after a fork the children don't give
-     * the same results as each other
-     */
-    pid=getpid();
-    /* make sure we shift the pid to the MSB */
-    if((pid&0xffff0000) == 0)
-        pid<<=16;
-    *(long *)&buf[0]^=pid;
-#endif
-#endif
-    }
-
-static void fips_rand_encrypt(unsigned char *out,const unsigned char *in)
-    {
-    DES_ecb2_encrypt(in,out,&ks1,&ks2,1);
-    }
-
-static void fips_rand_cleanup(void)
-    {
-    OPENSSL_cleanse(seed,sizeof seed);
-    n_seed=0;
-    o_seed=0;
-    key_init=0;
-    }
-
-void FIPS_rand_seed(const void *buf_, FIPS_RAND_SIZE_T num)
-    {
-    const char *buf=buf_;
-    FIPS_RAND_SIZE_T n;
-
-    /* If the key hasn't been set, we can't seed! */
-    if(!key_set)
-        return;
-
-    CRYPTO_w_lock(CRYPTO_LOCK_RAND);
-    if(!key_init)
-        {
-        key_init=1;
-        DES_set_key(&key1,&ks1);
-        DES_set_key(&key2,&ks2);
-        }
-
-    /*
-     * This algorithm only uses 64 bits of seed, so ensure that we use
-     * the most recent 64 bits.
-     */
-    for(n=0 ; n < num ; )
-        {
-        FIPS_RAND_SIZE_T t=num-n;
-
-        if(o_seed+t > sizeof seed)
-            t=sizeof seed-o_seed;
-        memcpy(seed+o_seed,buf+n,t);
-        n+=t;
-        o_seed+=t;
-        if(o_seed == sizeof seed)
-            o_seed=0;
-        if(n_seed < sizeof seed)
-            n_seed+=t;
-        }
-
-#ifndef GETPID_IS_MEANINGLESS
-    seed_pid=getpid();
-#endif
-
-    CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-    }
-
-static void fips_rand_add(const void *buf, FIPS_RAND_SIZE_T num, double add_entropy)
-    {
-    FIPS_rand_seed(buf,num);
-    }
-
-static int fips_rand_bytes(unsigned char *buf,FIPS_RAND_SIZE_T num)
-    {
-    FIPS_RAND_SIZE_T n;
-    unsigned char timeseed[8];
-    unsigned char intermediate[SEED_SIZE];
-    unsigned char output[SEED_SIZE];
-    static unsigned char previous[SEED_SIZE];
-#ifndef GETPID_IS_MEANINGLESS
-    int pid;
-#endif
-
-    if(n_seed < sizeof seed)
-        {
-        RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_NOT_SEEDED);
-        return 0;
-        }
-
-#ifdef FIPS_RAND_MAX_SIZE_T
-    if (num > FIPS_RAND_MAX_SIZE_T)
-        {
-#ifdef RAND_R_PRNG_ASKING_FOR_TOO_MUCH
-        RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_ASKING_FOR_TOO_MUCH);
-        return 0;
-#else
-        return -1; /* signal "not supported" condition */
-#endif
-        }
-#endif
-
-#ifndef GETPID_IS_MEANINGLESS
-    pid=getpid();
-    if(pid != seed_pid)
-        {
-        RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_NOT_RESEEDED);
-        return 0;
-        }
-    if(pid != key_pid)
-        {
-        RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_NOT_REKEYED);
-        return 0;
-        }
-#endif
-
-    CRYPTO_w_lock(CRYPTO_LOCK_RAND);
-
-    for(n=0 ; n < num ; )
-        {
-        unsigned char t[SEED_SIZE];
-        FIPS_RAND_SIZE_T l;
-        
-        /* ANS X9.31 A.2.4:     I = ede*K(DT)
-               timeseed == DT
-               intermediate == I
-        */
-        fips_gettime(timeseed);
-        fips_rand_encrypt(intermediate,timeseed);
-
-        /* ANS X9.31 A.2.4:     R = ede*K(I^V)
-               intermediate == I
-               seed == V
-               output == R
-        */
-        for(l=0 ; l < sizeof t ; ++l)
-            t[l]=intermediate[l]^seed[l];
-        fips_rand_encrypt(output,t);
-
-        /* ANS X9.31 A.2.4:     V = ede*K(R^I)
-               output == R
-               intermediate == I
-               seed == V
-        */
-        for(l=0 ; l < sizeof t ; ++l)
-            t[l]=output[l]^intermediate[l];
-        fips_rand_encrypt(seed,t);
-
-        if(second && !memcmp(output,previous,sizeof previous))
-            {
-            RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_STUCK);
-            CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-            return 0;
-            }
-        memcpy(previous,output,sizeof previous);
-        second=1;
-
-        /* Successive values of R may be concatenated to produce a
-           pseudo random number of the desired length */ 
-        l=SEED_SIZE < num-n ? SEED_SIZE : num-n;
-        memcpy(buf+n,output,l);
-        n+=l;
-        }
-
-    CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-
-    return 1;
-    }
-
-static int fips_rand_status(void)
-    {
-    return n_seed == sizeof seed;
-    }
-
-#endif /* OPENSSL_FIPS */
diff --git a/src/lib/libssl/src/fips-1.0/rand/fips_rand_selftest.c b/src/lib/libssl/src/fips-1.0/rand/fips_rand_selftest.c
deleted file mode 100644
index 691b929d71..0000000000
--- a/src/lib/libssl/src/fips-1.0/rand/fips_rand_selftest.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/rand.h>
-#include <openssl/fips_rand.h>
-
-#ifdef OPENSSL_FIPS
-static struct
-    {
-    unsigned char key1[8];
-    unsigned char key2[8];
-    unsigned char seed[8];
-    unsigned char dt[8];
-    } init_iv[] =
-    {
-    { 
-    { 0x75, 0xc7, 0x1a, 0xe5, 0xa1, 0x1a, 0x23, 0x2c },
-    { 0x40, 0x25, 0x6d, 0xcd, 0x94, 0xf7, 0x67, 0xb0 },
-    { 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-    { 0xc8, 0x9a, 0x1d, 0x88, 0x8e, 0xd1, 0x2f, 0x3c },
-    },
-    {
-    { 0x75, 0xc7, 0x1a, 0xe5, 0xa1, 0x1a, 0x23, 0x2c },
-    { 0x40, 0x25, 0x6d, 0xcd, 0x94, 0xf7, 0x67, 0xb0 },
-    { 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
-    { 0xc8, 0x9a, 0x1d, 0x88, 0x8e, 0xd1, 0x2f, 0x40 },
-    },
-    {
-    { 0x75, 0xc7, 0x1a, 0xe5, 0xa1, 0x1a, 0x23, 0x2c },
-    { 0x40, 0x25, 0x6d, 0xcd, 0x94, 0xf7, 0x67, 0xb0 },
-    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-    { 0xc8, 0x9a, 0x1d, 0x88, 0x8e, 0xd1, 0x2f, 0x7b },
-    },
-    };
-
-static const unsigned char expected_ret[][8]=
-    {
-    { 0x94, 0x4d, 0xc7, 0x21, 0x0d, 0x6d, 0x7f, 0xd7 },
-    { 0x02, 0x43, 0x3c, 0x94, 0x17, 0xa3, 0x32, 0x6f },
-    { 0xe7, 0xe2, 0xb2, 0x96, 0x4f, 0x36, 0xed, 0x41 },
-    };
-
-void FIPS_corrupt_rng()
-    {
-    init_iv[0].dt[0]++;
-    }
-
-int FIPS_selftest_rng()
-    {
-    int n;
-
-    for(n=0 ; n < 3 ; ++n)
-        {
-        unsigned char actual_ret[8];
-
-        FIPS_rand_method()->cleanup();
-        FIPS_set_prng_key(init_iv[n].key1,init_iv[n].key2); 
-        FIPS_rand_seed(init_iv[n].seed,8);
-        FIPS_test_mode(1,init_iv[n].dt);
-        if ((FIPS_rand_method()->bytes(actual_ret, 8) <=0) || (memcmp(actual_ret,expected_ret[n],sizeof actual_ret)))
-            {
-            FIPS_test_mode(0,NULL);
-            FIPSerr(FIPS_F_FIPS_SELFTEST_RNG,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-    FIPS_test_mode(0,NULL);
-    return 1;
-    }
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/rand/fips_rngvs.c b/src/lib/libssl/src/fips-1.0/rand/fips_rngvs.c
deleted file mode 100644
index 2c3fdbcca7..0000000000
--- a/src/lib/libssl/src/fips-1.0/rand/fips_rngvs.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Crude test driver for processing the VST and MCT testvector files
- * generated by the CMVP RNGVS product.
- *
- * Note the input files are assumed to have a _very_ specific format
- * as described in the NIST document "The Random Number Generator
- * Validation System (RNGVS)", May 25, 2004.
- *
- */
-#include <openssl/opensslconf.h>
-
-#ifndef OPENSSL_FIPS
-#include <stdio.h>
-int main()
-{
-    printf("No FIPS RNG support\n");
-    return 0;
-}
-#else
-
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/fips_rand.h>
-#include <string.h>
-
-int hex2bin(const char *in, unsigned char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1=0,n2=0 ; in[n1] && in[n1] != '\n' ; )
-        { /* first byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        if(!in[n1])
-            {
-            out[n2++]=ch;
-            break;
-            }
-        out[n2] = ch << 4;
-        /* second byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        out[n2++] |= ch;
-        }
-    return n2;
-    }
-
-int bin2hex(const unsigned char *in,int len,char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1=0,n2=0 ; n1 < len ; ++n1)
-        {
-        ch=in[n1] >> 4;
-        if (ch <= 0x09)
-            out[n2++]=ch+'0';
-        else
-            out[n2++]=ch-10+'a';
-        ch=in[n1] & 0x0f;
-        if(ch <= 0x09)
-            out[n2++]=ch+'0';
-        else
-            out[n2++]=ch-10+'a';
-        }
-    out[n2]='\0';
-    return n2;
-    }
-
-void pv(const char *tag,const unsigned char *val,int len)
-    {
-    char obuf[2048];
-
-    bin2hex(val,len,obuf);
-    printf("%s = %s\n",tag,obuf);
-    }
-
-void vst()
-    {
-    unsigned char key1[8];
-    unsigned char key2[8];
-    unsigned char v[8];
-    unsigned char dt[8];
-    unsigned char ret[8];
-    char buf[1024];
-    int n;
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"Key1 = ",7))
-            {
-            n=hex2bin(buf+7,key1);
-            pv("Key1",key1,n);
-            }
-        else if(!strncmp(buf,"Key2 = ",7))
-            {
-            n=hex2bin(buf+7,key2);
-            pv("Key1",key2,n);
-            }
-        else if(!strncmp(buf,"DT = ",5))
-            {
-            n=hex2bin(buf+5,dt);
-            pv("DT",dt,n);
-            }
-        else if(!strncmp(buf,"V = ",4))
-            {
-            n=hex2bin(buf+4,v);
-            pv("V",v,n);
-
-            FIPS_rand_method()->cleanup();
-            FIPS_set_prng_key(key1,key2);
-            FIPS_rand_seed(v,8);
-            FIPS_test_mode(1,dt);
-            if (FIPS_rand_method()->bytes(ret,8) <= 0)
-                {
-                FIPS_test_mode(0,NULL);
-                FIPSerr(FIPS_F_FIPS_SELFTEST_RNG,FIPS_R_SELFTEST_FAILED);
-                return;
-                }
-
-            pv("R",ret,8);
-            putc('\n',stdout);
-            }
-        else
-            fputs(buf,stdout);
-        }
-    }
-
-
-void mct()
-    {
-    unsigned char key1[8];
-    unsigned char key2[8];
-    unsigned char v[8];
-    unsigned char dt[8];
-    unsigned char ret[8];
-    char buf[1024];
-    int n;
-
-    BIGNUM *bn;
-    BIGNUM *pbn;
-    bn = BN_new();
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"Key1 = ",7))
-            {
-            n=hex2bin(buf+7,key1);
-            pv("Key1",key1,n);
-            }
-        else if(!strncmp(buf,"Key2 = ",7))
-            {
-            n=hex2bin(buf+7,key2);
-            pv("Key1",key2,n);
-            }
-        else if(!strncmp(buf,"DT = ",5))
-            {
-            n=hex2bin(buf+5,dt);
-            pv("DT",dt,n);
-            }
-        else if(!strncmp(buf,"V = ",4))
-            {
-            int iter;
-            n=hex2bin(buf+4,v);
-            pv("V",v,n);
-
-            FIPS_rand_method()->cleanup();
-            FIPS_set_prng_key(key1,key2);
-            FIPS_rand_seed(v,8);
-            for (iter=0; iter < 10000; ++iter)
-                {
-                FIPS_test_mode(1,dt);
-                if (FIPS_rand_method()->bytes(ret,8) <= 0)
-                    {
-                    FIPS_test_mode(0,NULL);
-                    FIPSerr(FIPS_F_FIPS_SELFTEST_RNG,FIPS_R_SELFTEST_FAILED);
-                    return;
-                    }
-                pbn = BN_bin2bn(dt,8,bn);
-                n = BN_add(bn,bn,BN_value_one());
-                n = BN_bn2bin(bn,dt);
-                }
-
-            pv("R",ret,8);
-            putc('\n',stdout);
-            }
-        else
-            fputs(buf,stdout);
-        }
-    BN_free(bn);
-    }
-
-int main(int argc,char **argv)
-    {
-    if(argc != 2)
-        {
-        fprintf(stderr,"%s [mct|vst]\n",argv[0]);
-        exit(1);
-        }
-    if(!FIPS_mode_set(1))
-        {
-        ERR_load_crypto_strings();
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        exit(1);
-        }
-    if(!strcmp(argv[1],"mct"))
-        mct();
-    else if(!strcmp(argv[1],"vst"))
-        vst();
-    else
-        {
-        fprintf(stderr,"Don't know how to %s.\n",argv[1]);
-        exit(1);
-        }
-
-    return 0;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/rsa/Makefile b/src/lib/libssl/src/fips-1.0/rsa/Makefile
deleted file mode 100644
index 179df4758a..0000000000
--- a/src/lib/libssl/src/fips-1.0/rsa/Makefile
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# OpenSSL/fips-1.0/rsa/Makefile
-#
-
-DIR=    rsa
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST= fips_rsavtest.c fips_rsastest.c fips_rsagtest.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_rsa_eay.c fips_rsa_gen.c fips_rsa_selftest.c fips_rsa_x931g.c
-LIBOBJ=fips_rsa_eay.o fips_rsa_gen.o fips_rsa_selftest.o fips_rsa_x931g.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    lib
-
-lib:    $(LIBOBJ)
-        @echo $(LIBOBJ) > lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-Q=../testvectors/rsa/req
-A=../testvectors/rsa/rsp
-Q62=../testvectors/rsa_salt_62/req
-A62=../testvectors/rsa_salt_62/rsp
-
-fips_test:
-        -rm -rf $(A) $(A62)
-        mkdir $(A) $(A62)
-        if [ -f $(Q)/SigGen15.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest < $(Q)/SigGen15.req  > $(A)/SigGen15.rsp; fi
-        if [ -f $(Q)/SigVer15.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsavtest < $(Q)/SigVer15.req > $(A)/SigVer15.rsp; fi
-        if [ -f $(Q)/SigGenPSS.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest -saltlen 0 < $(Q)/SigGenPSS.req > $(A)/SigGenPSS.rsp; fi
-        if [ -f $(Q)/SigVerPSS.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsavtest -saltlen 0 < $(Q)/SigVerPSS.req > $(A)/SigVerPSS.rsp; fi
-        if [ -f $(Q)/SigGenRSA.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest -x931 < $(Q)/SigGenRSA.req > $(A)/SigGenRSA.rsp; fi
-        if [ -f $(Q)/SigVerRSA.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsavtest -x931 < $(Q)/SigVerRSA.req > $(A)/SigVerRSA.rsp; fi
-        if [ -f $(Q62)/SigGenPSS.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsastest -saltlen 62 < $(Q62)/SigGenPSS.req >$(A62)/SigGenPSS.rsp; fi
-        if [ -f $(Q62)/SigVerPSS.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsavtest -saltlen 62 <$(Q62)/SigVerPSS.req >$(A62)/SigVerPSS.rsp; fi
-        if [ -f $(Q)/KeyGenRSA.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_rsagtest < $(Q)/KeyGenRSA.req > $(A)/KeyGenRSA.rsp; fi
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_rsa_eay.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsa_eay.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_rsa_eay.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_eay.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_rsa_eay.o: ../../include/openssl/opensslconf.h
-fips_rsa_eay.o: ../../include/openssl/opensslv.h
-fips_rsa_eay.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_rsa_eay.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rsa_eay.o: fips_rsa_eay.c
-fips_rsa_gen.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsa_gen.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_rsa_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_gen.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_rsa_gen.o: ../../include/openssl/opensslconf.h
-fips_rsa_gen.o: ../../include/openssl/opensslv.h
-fips_rsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
-fips_rsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_rsa_gen.o: ../../include/openssl/symhacks.h fips_rsa_gen.c
-fips_rsa_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsa_selftest.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_rsa_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_selftest.o: ../../include/openssl/fips.h
-fips_rsa_selftest.o: ../../include/openssl/fips_sha.h
-fips_rsa_selftest.o: ../../include/openssl/lhash.h
-fips_rsa_selftest.o: ../../include/openssl/opensslconf.h
-fips_rsa_selftest.o: ../../include/openssl/opensslv.h
-fips_rsa_selftest.o: ../../include/openssl/ossl_typ.h
-fips_rsa_selftest.o: ../../include/openssl/rsa.h
-fips_rsa_selftest.o: ../../include/openssl/safestack.h
-fips_rsa_selftest.o: ../../include/openssl/stack.h
-fips_rsa_selftest.o: ../../include/openssl/symhacks.h fips_rsa_selftest.c
-fips_rsa_x931g.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsa_x931g.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_rsa_x931g.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_x931g.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_rsa_x931g.o: ../../include/openssl/opensslconf.h
-fips_rsa_x931g.o: ../../include/openssl/opensslv.h
-fips_rsa_x931g.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
-fips_rsa_x931g.o: ../../include/openssl/safestack.h
-fips_rsa_x931g.o: ../../include/openssl/stack.h
-fips_rsa_x931g.o: ../../include/openssl/symhacks.h fips_rsa_x931g.c
-fips_rsagtest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_rsagtest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-fips_rsagtest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-fips_rsagtest.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-fips_rsagtest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_rsagtest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_rsagtest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_rsagtest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_rsagtest.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
-fips_rsagtest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-fips_rsagtest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-fips_rsagtest.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-fips_rsagtest.o: ../../include/openssl/objects.h
-fips_rsagtest.o: ../../include/openssl/opensslconf.h
-fips_rsagtest.o: ../../include/openssl/opensslv.h
-fips_rsagtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-fips_rsagtest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_rsagtest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-fips_rsagtest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_rsagtest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_rsagtest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_rsagtest.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
-fips_rsagtest.o: ../../include/openssl/x509_vfy.h
-fips_rsagtest.o: ../../include/openssl/x509v3.h fips_rsagtest.c
-fips_rsastest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_rsastest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-fips_rsastest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-fips_rsastest.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-fips_rsastest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_rsastest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_rsastest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_rsastest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_rsastest.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
-fips_rsastest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-fips_rsastest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-fips_rsastest.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-fips_rsastest.o: ../../include/openssl/objects.h
-fips_rsastest.o: ../../include/openssl/opensslconf.h
-fips_rsastest.o: ../../include/openssl/opensslv.h
-fips_rsastest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-fips_rsastest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_rsastest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-fips_rsastest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_rsastest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_rsastest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_rsastest.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
-fips_rsastest.o: ../../include/openssl/x509_vfy.h
-fips_rsastest.o: ../../include/openssl/x509v3.h fips_rsastest.c
-fips_rsavtest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_rsavtest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-fips_rsavtest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-fips_rsavtest.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-fips_rsavtest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_rsavtest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_rsavtest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_rsavtest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_rsavtest.o: ../../include/openssl/hmac.h ../../include/openssl/idea.h
-fips_rsavtest.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-fips_rsavtest.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-fips_rsavtest.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-fips_rsavtest.o: ../../include/openssl/objects.h
-fips_rsavtest.o: ../../include/openssl/opensslconf.h
-fips_rsavtest.o: ../../include/openssl/opensslv.h
-fips_rsavtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-fips_rsavtest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_rsavtest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-fips_rsavtest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_rsavtest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_rsavtest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_rsavtest.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
-fips_rsavtest.o: ../../include/openssl/x509_vfy.h
-fips_rsavtest.o: ../../include/openssl/x509v3.h fips_rsavtest.c
diff --git a/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_eay.c b/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_eay.c
deleted file mode 100644
index 2d0d973f1e..0000000000
--- a/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_eay.c
+++ /dev/null
@@ -1,788 +0,0 @@
-/* crypto/rsa/rsa_eay.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2005 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-#include <openssl/fips.h>
-
-#if !defined(RSA_NULL) && defined(OPENSSL_FIPS)
-
-static int RSA_eay_public_encrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_private_encrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_public_decrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_private_decrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa);
-static int RSA_eay_init(RSA *rsa);
-static int RSA_eay_finish(RSA *rsa);
-static const RSA_METHOD rsa_pkcs1_eay_meth={
-        "Eric Young's PKCS#1 RSA",
-        RSA_eay_public_encrypt,
-        RSA_eay_public_decrypt, /* signature verification */
-        RSA_eay_private_encrypt, /* signing */
-        RSA_eay_private_decrypt,
-        RSA_eay_mod_exp,
-        BN_mod_exp_mont, /* XXX probably we should not use Montgomery if  e == 3 */
-        RSA_eay_init,
-        RSA_eay_finish,
-        0, /* flags */
-        NULL,
-        0, /* rsa_sign */
-        0  /* rsa_verify */
-        };
-
-const RSA_METHOD *RSA_PKCS1_SSLeay(void)
-        {
-        return(&rsa_pkcs1_eay_meth);
-        }
-
-static int RSA_eay_public_encrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int i,j,k,num=0,r= -1;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-
-        if(FIPS_selftest_failed())
-                {
-                FIPSerr(FIPS_F_RSA_EAY_PUBLIC_ENCRYPT,FIPS_R_FIPS_SELFTEST_FAILED);
-                goto err;
-                }
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        num=BN_num_bytes(rsa->n);
-        if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                i=RSA_padding_add_PKCS1_type_2(buf,num,from,flen);
-                break;
-#ifndef OPENSSL_NO_SHA
-        case RSA_PKCS1_OAEP_PADDING:
-                i=RSA_padding_add_PKCS1_OAEP(buf,num,from,flen,NULL,0);
-                break;
-#endif
-        case RSA_SSLV23_PADDING:
-                i=RSA_padding_add_SSLv23(buf,num,from,flen);
-                break;
-        case RSA_NO_PADDING:
-                i=RSA_padding_add_none(buf,num,from,flen);
-                break;
-        default:
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (i <= 0) goto err;
-
-        if (BN_bin2bn(buf,num,&f) == NULL) goto err;
-        
-        if (BN_ucmp(&f, rsa->n) >= 0)
-                {       
-                /* usually the padding functions would catch this */
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
-                goto err;
-                }
-
-        if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
-                {
-                if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n,
-                                        CRYPTO_LOCK_RSA, rsa->n, ctx))
-                        goto err;
-                }
-
-        if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
-                rsa->_method_mod_n)) goto err;
-
-        /* put in leading 0 bytes if the number is less than the
-         * length of the modulus */
-        j=BN_num_bytes(&ret);
-        i=BN_bn2bin(&ret,&(to[num-j]));
-        for (k=0; k<(num-i); k++)
-                to[k]=0;
-
-        r=num;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (buf != NULL) 
-                {
-                OPENSSL_cleanse(buf,num);
-                OPENSSL_free(buf);
-                }
-        return(r);
-        }
-
-static int rsa_eay_blinding(RSA *rsa, BN_CTX *ctx)
-        {
-        int ret = 1;
-        CRYPTO_w_lock(CRYPTO_LOCK_RSA);
-        /* Check again inside the lock - the macro's check is racey */
-        if(rsa->blinding == NULL)
-                ret = RSA_blinding_on(rsa, ctx);
-        CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-        return ret;
-        }
-
-#define BLINDING_HELPER(rsa, ctx, err_instr) \
-        do { \
-                if((!((rsa)->flags & RSA_FLAG_NO_BLINDING)) && \
-                    ((rsa)->blinding == NULL) && \
-                    !rsa_eay_blinding(rsa, ctx)) \
-                    err_instr \
-        } while(0)
-
-static BN_BLINDING *setup_blinding(RSA *rsa, BN_CTX *ctx)
-        {
-        BIGNUM *A, *Ai;
-        BN_BLINDING *ret = NULL;
-
-        /* added in OpenSSL 0.9.6j and 0.9.7b */
-
-        /* NB: similar code appears in RSA_blinding_on (rsa_lib.c);
-         * this should be placed in a new function of its own, but for reasons
-         * of binary compatibility can't */
-
-        BN_CTX_start(ctx);
-        A = BN_CTX_get(ctx);
-        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);
-                if (!BN_pseudo_rand_range(A,rsa->n)) goto err;
-                }
-        else
-                {
-                if (!BN_rand_range(A,rsa->n)) goto err;
-                }
-        if ((Ai=BN_mod_inverse(NULL,A,rsa->n,ctx)) == NULL) goto err;
-
-        if (!rsa->meth->bn_mod_exp(A,A,rsa->e,rsa->n,ctx,rsa->_method_mod_n))
-                goto err;
-        ret = BN_BLINDING_new(A,Ai,rsa->n);
-        BN_free(Ai);
-err:
-        BN_CTX_end(ctx);
-        return ret;
-        }
-
-/* signing */
-static int RSA_eay_private_encrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret, *res;
-        int i,j,k,num=0,r= -1;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-        int local_blinding = 0;
-        BN_BLINDING *blinding = NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        num=BN_num_bytes(rsa->n);
-        if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                i=RSA_padding_add_PKCS1_type_1(buf,num,from,flen);
-                break;
-        case RSA_NO_PADDING:
-                i=RSA_padding_add_none(buf,num,from,flen);
-                break;
-        case RSA_X931_PADDING:
-                i=RSA_padding_add_X931(buf,num,from,flen);
-                break;
-        case RSA_SSLV23_PADDING:
-        default:
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (i <= 0) goto err;
-
-        if (BN_bin2bn(buf,num,&f) == NULL) goto err;
-        
-        if (BN_ucmp(&f, rsa->n) >= 0)
-                {       
-                /* usually the padding functions would catch this */
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
-                goto err;
-                }
-
-        BLINDING_HELPER(rsa, ctx, goto err;);
-        blinding = rsa->blinding;
-        
-        /* Now unless blinding is disabled, 'blinding' is non-NULL.
-         * But the BN_BLINDING object may be owned by some other thread
-         * (we don't want to keep it constant and we don't want to use
-         * lots of locking to avoid race conditions, so only a single
-         * thread can use it; other threads have to use local blinding
-         * factors) */
-        if (!(rsa->flags & RSA_FLAG_NO_BLINDING))
-                {
-                if (blinding == NULL)
-                        {
-                        RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, ERR_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                }
-        
-        if (blinding != NULL)
-                {
-                if (blinding->thread_id != CRYPTO_thread_id())
-                        {
-                        /* we need a local one-time blinding factor */
-
-                        blinding = setup_blinding(rsa, ctx);
-                        if (blinding == NULL)
-                                goto err;
-                        local_blinding = 1;
-                        }
-                }
-
-        if (blinding)
-                if (!BN_BLINDING_convert(&f, blinding, ctx)) goto err;
-
-        if ( (rsa->flags & RSA_FLAG_EXT_PKEY) ||
-                ((rsa->p != NULL) &&
-                (rsa->q != NULL) &&
-                (rsa->dmp1 != NULL) &&
-                (rsa->dmq1 != NULL) &&
-                (rsa->iqmp != NULL)) )
-                { 
-                if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err;
-                }
-        else
-                {
-                BIGNUM local_d;
-                BIGNUM *d = NULL;
-                
-                if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
-                        {
-                        BN_init(&local_d);
-                        d = &local_d;
-                        BN_with_flags(d, rsa->d, BN_FLG_EXP_CONSTTIME);
-                        }
-                else
-                        d = rsa->d;
-                if (!rsa->meth->bn_mod_exp(&ret,&f,d,rsa->n,ctx,NULL)) goto err;
-                }
-
-        if (blinding)
-                if (!BN_BLINDING_invert(&ret, blinding, ctx)) goto err;
-
-        if (padding == RSA_X931_PADDING)
-                {
-                BN_sub(&f, rsa->n, &ret);
-                if (BN_cmp(&ret, &f))
-                        res = &f;
-                else
-                        res = &ret;
-                }
-        else
-                res = &ret;
-
-        /* put in leading 0 bytes if the number is less than the
-         * length of the modulus */
-        j=BN_num_bytes(res);
-        i=BN_bn2bin(res,&(to[num-j]));
-        for (k=0; k<(num-i); k++)
-                to[k]=0;
-
-        r=num;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&ret);
-        BN_clear_free(&f);
-        if (local_blinding)
-                BN_BLINDING_free(blinding);
-        if (buf != NULL)
-                {
-                OPENSSL_cleanse(buf,num);
-                OPENSSL_free(buf);
-                }
-        return(r);
-        }
-
-static int RSA_eay_private_decrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int j,num=0,r= -1;
-        unsigned char *p;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-        int local_blinding = 0;
-        BN_BLINDING *blinding = NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        num=BN_num_bytes(rsa->n);
-
-        if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        /* This check was for equality but PGP does evil things
-         * and chops off the top '0' bytes */
-        if (flen > num)
-                {
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_DATA_GREATER_THAN_MOD_LEN);
-                goto err;
-                }
-
-        /* make data into a big number */
-        if (BN_bin2bn(from,(int)flen,&f) == NULL) goto err;
-
-        if (BN_ucmp(&f, rsa->n) >= 0)
-                {
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
-                goto err;
-                }
-
-        BLINDING_HELPER(rsa, ctx, goto err;);
-        blinding = rsa->blinding;
-        
-        /* Now unless blinding is disabled, 'blinding' is non-NULL.
-         * But the BN_BLINDING object may be owned by some other thread
-         * (we don't want to keep it constant and we don't want to use
-         * lots of locking to avoid race conditions, so only a single
-         * thread can use it; other threads have to use local blinding
-         * factors) */
-        if (!(rsa->flags & RSA_FLAG_NO_BLINDING))
-                {
-                if (blinding == NULL)
-                        {
-                        RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT, ERR_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                }
-        
-        if (blinding != NULL)
-                {
-                if (blinding->thread_id != CRYPTO_thread_id())
-                        {
-                        /* we need a local one-time blinding factor */
-
-                        blinding = setup_blinding(rsa, ctx);
-                        if (blinding == NULL)
-                                goto err;
-                        local_blinding = 1;
-                        }
-                }
-
-        if (blinding)
-                if (!BN_BLINDING_convert(&f, blinding, ctx)) goto err;
-
-        /* do the decrypt */
-        if ( (rsa->flags & RSA_FLAG_EXT_PKEY) ||
-                ((rsa->p != NULL) &&
-                (rsa->q != NULL) &&
-                (rsa->dmp1 != NULL) &&
-                (rsa->dmq1 != NULL) &&
-                (rsa->iqmp != NULL)) )
-                {
-                if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err;
-                }
-        else
-                {
-                BIGNUM local_d;
-                BIGNUM *d = NULL;
-                
-                if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
-                        {
-                        d = &local_d;
-                        BN_with_flags(d, rsa->d, BN_FLG_EXP_CONSTTIME);
-                        }
-                else
-                        d = rsa->d;
-                if (!rsa->meth->bn_mod_exp(&ret,&f,d,rsa->n,ctx,NULL))
-                        goto err;
-                }
-
-        if (blinding)
-                if (!BN_BLINDING_invert(&ret, blinding, ctx)) goto err;
-
-        p=buf;
-        j=BN_bn2bin(&ret,p); /* j is only used with no-padding mode */
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                r=RSA_padding_check_PKCS1_type_2(to,num,buf,j,num);
-                break;
-#ifndef OPENSSL_NO_SHA
-        case RSA_PKCS1_OAEP_PADDING:
-                r=RSA_padding_check_PKCS1_OAEP(to,num,buf,j,num,NULL,0);
-                break;
-#endif
-        case RSA_SSLV23_PADDING:
-                r=RSA_padding_check_SSLv23(to,num,buf,j,num);
-                break;
-        case RSA_NO_PADDING:
-                r=RSA_padding_check_none(to,num,buf,j,num);
-                break;
-        default:
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (r < 0)
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_PADDING_CHECK_FAILED);
-
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (local_blinding)
-                BN_BLINDING_free(blinding);
-        if (buf != NULL)
-                {
-                OPENSSL_cleanse(buf,num);
-                OPENSSL_free(buf);
-                }
-        return(r);
-        }
-
-/* signature verification */
-static int RSA_eay_public_decrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int i,num=0,r= -1;
-        unsigned char *p;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        num=BN_num_bytes(rsa->n);
-        buf=(unsigned char *)OPENSSL_malloc(num);
-        if (buf == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        /* This check was for equality but PGP does evil things
-         * and chops off the top '0' bytes */
-        if (flen > num)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_DATA_GREATER_THAN_MOD_LEN);
-                goto err;
-                }
-
-        if (BN_bin2bn(from,flen,&f) == NULL) goto err;
-
-        if (BN_ucmp(&f, rsa->n) >= 0)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
-                goto err;
-                }
-
-        /* do the decrypt */
-
-        if (rsa->flags & RSA_FLAG_CACHE_PUBLIC)
-                {
-                if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_n,
-                                        CRYPTO_LOCK_RSA, rsa->n, ctx))
-                        goto err;
-                }
-
-        if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
-                rsa->_method_mod_n)) goto err;
-
-        if ((padding == RSA_X931_PADDING) && ((ret.d[0] & 0xf) != 12))
-                BN_sub(&ret, rsa->n, &ret);
-
-        p=buf;
-        i=BN_bn2bin(&ret,p);
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                r=RSA_padding_check_PKCS1_type_1(to,num,buf,i,num);
-                break;
-        case RSA_X931_PADDING:
-                r=RSA_padding_check_X931(to,num,buf,i,num);
-                break;
-        case RSA_NO_PADDING:
-                r=RSA_padding_check_none(to,num,buf,i,num);
-                break;
-        default:
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (r < 0)
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_PADDING_CHECK_FAILED);
-
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (buf != NULL)
-                {
-                OPENSSL_cleanse(buf,num);
-                OPENSSL_free(buf);
-                }
-        return(r);
-        }
-
-static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
-        {
-        BIGNUM r1,m1,vrfy;
-        BIGNUM local_dmp1, local_dmq1;
-        BIGNUM *dmp1, *dmq1;
-        int ret=0;
-        BN_CTX *ctx;
-
-        BN_init(&m1);
-        BN_init(&r1);
-        BN_init(&vrfy);
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-        if (rsa->flags & RSA_FLAG_CACHE_PRIVATE)
-                {
-                if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_p,
-                                        CRYPTO_LOCK_RSA, rsa->p, ctx))
-                        goto err;
-                if (!BN_MONT_CTX_set_locked(&rsa->_method_mod_q,
-                                        CRYPTO_LOCK_RSA, rsa->q, ctx))
-                        goto err;
-                }
-
-        if (!BN_mod(&r1,I,rsa->q,ctx)) goto err;
-        if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
-                {
-                dmq1 = &local_dmq1;
-                BN_with_flags(dmq1, rsa->dmq1, BN_FLG_EXP_CONSTTIME);
-                }
-        else
-                dmq1 = rsa->dmq1;
-        if (!rsa->meth->bn_mod_exp(&m1,&r1,dmq1,rsa->q,ctx,
-                rsa->_method_mod_q)) goto err;
-
-        if (!BN_mod(&r1,I,rsa->p,ctx)) goto err;
-        if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
-                {
-                dmp1 = &local_dmp1;
-                BN_with_flags(dmp1, rsa->dmp1, BN_FLG_EXP_CONSTTIME);
-                }
-        else
-                dmp1 = rsa->dmp1;
-        if (!rsa->meth->bn_mod_exp(r0,&r1,dmp1,rsa->p,ctx,
-                rsa->_method_mod_p)) goto err;
-
-        if (!BN_sub(r0,r0,&m1)) goto err;
-        /* This will help stop the size of r0 increasing, which does
-         * affect the multiply if it optimised for a power of 2 size */
-        if (r0->neg)
-                if (!BN_add(r0,r0,rsa->p)) goto err;
-
-        if (!BN_mul(&r1,r0,rsa->iqmp,ctx)) goto err;
-        if (!BN_mod(r0,&r1,rsa->p,ctx)) goto err;
-        /* If p < q it is occasionally possible for the correction of
-         * adding 'p' if r0 is negative above to leave the result still
-         * negative. This can break the private key operations: the following
-         * second correction should *always* correct this rare occurrence.
-         * This will *never* happen with OpenSSL generated keys because
-         * they ensure p > q [steve]
-         */
-        if (r0->neg)
-                if (!BN_add(r0,r0,rsa->p)) goto err;
-        if (!BN_mul(&r1,r0,rsa->q,ctx)) goto err;
-        if (!BN_add(r0,&r1,&m1)) goto err;
-
-        if (rsa->e && rsa->n)
-                {
-                if (!rsa->meth->bn_mod_exp(&vrfy,r0,rsa->e,rsa->n,ctx,NULL)) goto err;
-                /* If 'I' was greater than (or equal to) rsa->n, the operation
-                 * will be equivalent to using 'I mod n'. However, the result of
-                 * the verify will *always* be less than 'n' so we don't check
-                 * for absolute equality, just congruency. */
-                if (!BN_sub(&vrfy, &vrfy, I)) goto err;
-                if (!BN_mod(&vrfy, &vrfy, rsa->n, ctx)) goto err;
-                if (vrfy.neg)
-                        if (!BN_add(&vrfy, &vrfy, rsa->n)) goto err;
-                if (!BN_is_zero(&vrfy))
-                        {
-                        /* 'I' and 'vrfy' aren't congruent mod n. Don't leak
-                         * miscalculated CRT output, just do a raw (slower)
-                         * mod_exp and return that instead. */
-
-                        BIGNUM local_d;
-                        BIGNUM *d = NULL;
-                
-                        if (!(rsa->flags & RSA_FLAG_NO_EXP_CONSTTIME))
-                                {
-                                d = &local_d;
-                                BN_with_flags(d, rsa->d, BN_FLG_EXP_CONSTTIME);
-                                }
-                        else
-                                d = rsa->d;
-                        if (!rsa->meth->bn_mod_exp(r0,I,d,rsa->n,ctx,NULL)) goto err;
-                        }
-                }
-        ret=1;
-err:
-        BN_clear_free(&m1);
-        BN_clear_free(&r1);
-        BN_clear_free(&vrfy);
-        BN_CTX_free(ctx);
-        return(ret);
-        }
-
-static int RSA_eay_init(RSA *rsa)
-        {
-        rsa->flags|=RSA_FLAG_CACHE_PUBLIC|RSA_FLAG_CACHE_PRIVATE;
-        return(1);
-        }
-
-static int RSA_eay_finish(RSA *rsa)
-        {
-        if (rsa->_method_mod_n != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_n);
-        if (rsa->_method_mod_p != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_p);
-        if (rsa->_method_mod_q != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_q);
-        return(1);
-        }
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_gen.c b/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_gen.c
deleted file mode 100644
index 3f50746733..0000000000
--- a/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_gen.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* crypto/rsa/rsa_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/fips.h>
-
-void *OPENSSL_stderr(void);
-
-#ifdef OPENSSL_FIPS
-
-int fips_check_rsa(RSA *rsa)
-    {
-    int n, ret = 0;
-    unsigned char tctext[256], *ctext = tctext;
-    unsigned char tptext[256], *ptext = tptext;
-    /* The longest we can have with PKCS#1 v1.5 padding and a 512 bit key,
-     * namely 512/8-11-1 = 52 bytes */
-    static const unsigned char original_ptext[] =
-        "\x01\x23\x45\x67\x89\xab\xcd\xef\x01\x23\x45\x67\x89\xab\xcd\xef"
-        "\x01\x23\x45\x67\x89\xab\xcd\xef\x01\x23\x45\x67\x89\xab\xcd\xef"
-        "\x01\x23\x45\x67\x89\xab\xcd\xef\x01\x23\x45\x67\x89\xab\xcd\xef"
-        "\x01\x23\x45\x67";
-
-    if (RSA_size(rsa) > sizeof(tctext))
-        {
-        ctext = OPENSSL_malloc(RSA_size(rsa));
-        ptext = OPENSSL_malloc(RSA_size(rsa));
-        if (!ctext || !ptext)
-                {
-                ERR_print_errors_fp(OPENSSL_stderr());
-                exit(1);
-                }
-        }
-        
-
-    /* this will fail for keys shorter than 512 bits */
-    n=RSA_private_encrypt(sizeof(original_ptext)-1,original_ptext,ctext,rsa,
-                         RSA_PKCS1_PADDING);
-    if(n < 0)
-        {
-        ERR_print_errors_fp(OPENSSL_stderr());
-        exit(1);
-        }
-    if(!memcmp(ctext,original_ptext,n))
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_RSA,FIPS_R_PAIRWISE_TEST_FAILED);
-        goto error;
-        }
-    n=RSA_public_decrypt(n,ctext,ptext,rsa,RSA_PKCS1_PADDING);
-    if(n < 0)
-        {
-        ERR_print_errors_fp(OPENSSL_stderr());
-        exit(1);
-        }
-    if(n != sizeof(original_ptext)-1 || memcmp(ptext,original_ptext,n))
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_RSA,FIPS_R_PAIRWISE_TEST_FAILED);
-        goto error;
-        }
-
-    ret = 1;
-
-    error:
-
-    if (RSA_size(rsa) > sizeof(tctext))
-        {
-        OPENSSL_free(ctext);
-        OPENSSL_free(ptext);
-        }
-
-    return ret;
-    }
-
-RSA *RSA_generate_key(FIPS_RSA_SIZE_T bits, unsigned long e_value,
-             void (*callback)(int,int,void *), void *cb_arg)
-        {
-        RSA *rsa=NULL;
-        BIGNUM *r0=NULL,*r1=NULL,*r2=NULL,*r3=NULL,*tmp;
-        int bitsp,bitsq,ok= -1,n=0,i;
-        BN_CTX *ctx=NULL,*ctx2=NULL;
-
-        if (bits < 512)
-            {
-            FIPSerr(FIPS_F_RSA_GENERATE_KEY,FIPS_R_KEY_TOO_SHORT);
-            return NULL;
-            }
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_RSA_GENERATE_KEY,FIPS_R_FIPS_SELFTEST_FAILED);
-            return NULL;
-            }
-            
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        ctx2=BN_CTX_new();
-        if (ctx2 == NULL) goto err;
-        BN_CTX_start(ctx);
-        r0 = BN_CTX_get(ctx);
-        r1 = BN_CTX_get(ctx);
-        r2 = BN_CTX_get(ctx);
-        r3 = BN_CTX_get(ctx);
-        if (r3 == NULL) goto err;
-
-        bitsp=(bits+1)/2;
-        bitsq=bits-bitsp;
-        rsa=RSA_new();
-        if (rsa == NULL) goto err;
-
-        /* set e */ 
-        rsa->e=BN_new();
-        if (rsa->e == NULL) goto err;
-
-#if 1
-        /* The problem is when building with 8, 16, or 32 BN_ULONG,
-         * unsigned long can be larger */
-        for (i=0; i<sizeof(unsigned long)*8; i++)
-                {
-                if (e_value & (1UL<<i))
-                        BN_set_bit(rsa->e,i);
-                }
-#else
-        if (!BN_set_word(rsa->e,e_value)) goto err;
-#endif
-
-        /* generate p and q */
-        for (;;)
-                {
-                rsa->p=BN_generate_prime(NULL,bitsp,0,NULL,NULL,callback,cb_arg);
-                if (rsa->p == NULL) goto err;
-                if (!BN_sub(r2,rsa->p,BN_value_one())) goto err;
-                if (!BN_gcd(r1,r2,rsa->e,ctx)) goto err;
-                if (BN_is_one(r1)) break;
-                if (callback != NULL) callback(2,n++,cb_arg);
-                BN_free(rsa->p);
-                }
-        if (callback != NULL) callback(3,0,cb_arg);
-        for (;;)
-                {
-                rsa->q=BN_generate_prime(NULL,bitsq,0,NULL,NULL,callback,cb_arg);
-                if (rsa->q == NULL) goto err;
-                if (!BN_sub(r2,rsa->q,BN_value_one())) goto err;
-                if (!BN_gcd(r1,r2,rsa->e,ctx)) goto err;
-                if (BN_is_one(r1) && (BN_cmp(rsa->p,rsa->q) != 0))
-                        break;
-                if (callback != NULL) callback(2,n++,cb_arg);
-                BN_free(rsa->q);
-                }
-        if (callback != NULL) callback(3,1,cb_arg);
-        if (BN_cmp(rsa->p,rsa->q) < 0)
-                {
-                tmp=rsa->p;
-                rsa->p=rsa->q;
-                rsa->q=tmp;
-                }
-
-        /* calculate n */
-        rsa->n=BN_new();
-        if (rsa->n == NULL) goto err;
-        if (!BN_mul(rsa->n,rsa->p,rsa->q,ctx)) goto err;
-
-        /* calculate d */
-        if (!BN_sub(r1,rsa->p,BN_value_one())) goto err;        /* p-1 */
-        if (!BN_sub(r2,rsa->q,BN_value_one())) goto err;        /* q-1 */
-        if (!BN_mul(r0,r1,r2,ctx)) goto err;    /* (p-1)(q-1) */
-
-/* should not be needed, since gcd(p-1,e) == 1 and gcd(q-1,e) == 1 */
-/*      for (;;)
-                {
-                if (!BN_gcd(r3,r0,rsa->e,ctx)) goto err;
-                if (BN_is_one(r3)) break;
-
-                if (1)
-                        {
-                        if (!BN_add_word(rsa->e,2L)) goto err;
-                        continue;
-                        }
-                RSAerr(RSA_F_RSA_GENERATE_KEY,RSA_R_BAD_E_VALUE);
-                goto err;
-                }
-*/
-        rsa->d=BN_mod_inverse(NULL,rsa->e,r0,ctx2);     /* d */
-        if (rsa->d == NULL) goto err;
-
-        /* calculate d mod (p-1) */
-        rsa->dmp1=BN_new();
-        if (rsa->dmp1 == NULL) goto err;
-        if (!BN_mod(rsa->dmp1,rsa->d,r1,ctx)) goto err;
-
-        /* calculate d mod (q-1) */
-        rsa->dmq1=BN_new();
-        if (rsa->dmq1 == NULL) goto err;
-        if (!BN_mod(rsa->dmq1,rsa->d,r2,ctx)) goto err;
-
-        /* calculate inverse of q mod p */
-        rsa->iqmp=BN_mod_inverse(NULL,rsa->q,rsa->p,ctx2);
-        if (rsa->iqmp == NULL) goto err;
-
-        if(!fips_check_rsa(rsa))
-            goto err;
-
-        ok=1;
-err:
-        if (ok == -1)
-                {
-                RSAerr(RSA_F_RSA_GENERATE_KEY,ERR_LIB_BN);
-                ok=0;
-                }
-        BN_CTX_end(ctx);
-        BN_CTX_free(ctx);
-        BN_CTX_free(ctx2);
-        
-        if (!ok)
-                {
-                if (rsa != NULL) RSA_free(rsa);
-                return(NULL);
-                }
-        else
-                return(rsa);
-        }
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_selftest.c b/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_selftest.c
deleted file mode 100644
index 0b620c717b..0000000000
--- a/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_selftest.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/rsa.h>
-#include <openssl/fips_sha.h>
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-#define SetKey \
-  key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \
-  key->e = BN_bin2bn(e, sizeof(e)-1, key->e); \
-  key->d = BN_bin2bn(d, sizeof(d)-1, key->d); \
-  key->p = BN_bin2bn(p, sizeof(p)-1, key->p); \
-  key->q = BN_bin2bn(q, sizeof(q)-1, key->q); \
-  key->dmp1 = BN_bin2bn(dmp1, sizeof(dmp1)-1, key->dmp1); \
-  key->dmq1 = BN_bin2bn(dmq1, sizeof(dmq1)-1, key->dmq1); \
-  key->iqmp = BN_bin2bn(iqmp, sizeof(iqmp)-1, key->iqmp); \
-  memcpy(c, ctext_ex, sizeof(ctext_ex) - 1); \
-  return (sizeof(ctext_ex) - 1);
-
-static unsigned char n[] =
-"\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
-"\xF7\x36\x8D\x07\xEE\xD4\x10\x43\xA4\x40\xD6\xB6\xF0\x74\x54\xF5"
-"\x1F\xB8\xDF\xBA\xAF\x03\x5C\x02\xAB\x61\xEA\x48\xCE\xEB\x6F\xCD"
-"\x48\x76\xED\x52\x0D\x60\xE1\xEC\x46\x19\x71\x9D\x8A\x5B\x8B\x80"
-"\x7F\xAF\xB8\xE0\xA3\xDF\xC7\x37\x72\x3E\xE6\xB4\xB7\xD9\x3A\x25"
-"\x84\xEE\x6A\x64\x9D\x06\x09\x53\x74\x88\x34\xB2\x45\x45\x98\x39"
-"\x4E\xE0\xAA\xB1\x2D\x7B\x61\xA5\x1F\x52\x7A\x9A\x41\xF6\xC1\x68"
-"\x7F\xE2\x53\x72\x98\xCA\x2A\x8F\x59\x46\xF8\xE5\xFD\x09\x1D\xBD"
-"\xCB";
-
-
-static int setrsakey(RSA *key, unsigned char *c)
-    {
-    static const unsigned char e[] = "\x11";
-
-    static const unsigned char d[] =
-"\x00\xA5\xDA\xFC\x53\x41\xFA\xF2\x89\xC4\xB9\x88\xDB\x30\xC1\xCD"
-"\xF8\x3F\x31\x25\x1E\x06\x68\xB4\x27\x84\x81\x38\x01\x57\x96\x41"
-"\xB2\x94\x10\xB3\xC7\x99\x8D\x6B\xC4\x65\x74\x5E\x5C\x39\x26\x69"
-"\xD6\x87\x0D\xA2\xC0\x82\xA9\x39\xE3\x7F\xDC\xB8\x2E\xC9\x3E\xDA"
-"\xC9\x7F\xF3\xAD\x59\x50\xAC\xCF\xBC\x11\x1C\x76\xF1\xA9\x52\x94"
-"\x44\xE5\x6A\xAF\x68\xC5\x6C\x09\x2C\xD3\x8D\xC3\xBE\xF5\xD2\x0A"
-"\x93\x99\x26\xED\x4F\x74\xA1\x3E\xDD\xFB\xE1\xA1\xCE\xCC\x48\x94"
-"\xAF\x94\x28\xC2\xB7\xB8\x88\x3F\xE4\x46\x3A\x4B\xC8\x5B\x1C\xB3"
-"\xC1";
-
-    static const unsigned char p[] =
-"\x00\xEE\xCF\xAE\x81\xB1\xB9\xB3\xC9\x08\x81\x0B\x10\xA1\xB5\x60"
-"\x01\x99\xEB\x9F\x44\xAE\xF4\xFD\xA4\x93\xB8\x1A\x9E\x3D\x84\xF6"
-"\x32\x12\x4E\xF0\x23\x6E\x5D\x1E\x3B\x7E\x28\xFA\xE7\xAA\x04\x0A"
-"\x2D\x5B\x25\x21\x76\x45\x9D\x1F\x39\x75\x41\xBA\x2A\x58\xFB\x65"
-"\x99";
-
-    static const unsigned char q[] =
-"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-"\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-"\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x15"
-"\x03";
-
-    static const unsigned char dmp1[] =
-"\x54\x49\x4C\xA6\x3E\xBA\x03\x37\xE4\xE2\x40\x23\xFC\xD6\x9A\x5A"
-"\xEB\x07\xDD\xDC\x01\x83\xA4\xD0\xAC\x9B\x54\xB0\x51\xF2\xB1\x3E"
-"\xD9\x49\x09\x75\xEA\xB7\x74\x14\xFF\x59\xC1\xF7\x69\x2E\x9A\x2E"
-"\x20\x2B\x38\xFC\x91\x0A\x47\x41\x74\xAD\xC9\x3C\x1F\x67\xC9\x81";
-
-    static const unsigned char dmq1[] =
-"\x47\x1E\x02\x90\xFF\x0A\xF0\x75\x03\x51\xB7\xF8\x78\x86\x4C\xA9"
-"\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7"
-"\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D"
-"\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D";
-    
-    static const unsigned char iqmp[] =
-"\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23"
-"\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11"
-"\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E"
-"\x9E\x2E\x0F\x96\x56\xE6\x98\xEA\x36\x66\xED\xFB\x25\x79\x80\x39"
-"\xF7";
-
-    static const unsigned char ctext_ex[] =
-"\x42\x4b\xc9\x51\x61\xd4\xca\xa0\x18\x6c\x4d\xca\x61\x8f\x2d\x07"
-"\x8c\x63\xc5\x6b\xa2\x4c\x32\xb1\xda\xb7\xdd\x32\xb6\x51\x68\xc3"
-"\x6e\x98\x46\xd6\xbb\x1a\xd5\x99\x05\x92\x7c\xd7\xbc\x08\x9e\xe4"
-"\xc3\x70\x4d\xe6\x99\x7e\x61\x31\x07\x7a\x19\xdb\x3e\x11\xfa\x3d"
-"\x7c\x61\xd7\x78\x14\x3f\x05\x16\xa0\xc4\xbf\xcd\xee\xca\x67\x4c"
-"\x80\x4e\xca\x43\x2f\x35\x43\x58\xa7\x50\x7e\x3e\x52\x82\xab\xac"
-"\xa6\x50\xe8\x39\x9f\xe0\x7f\x58\x1d\x1b\x90\x93\x04\xec\xb3\xf9"
-"\x24\xd3\x75\x3e\x39\xd1\x14\xc6\x33\xce\xd6\xee\x20\x47\xec\xe4";
-
-    SetKey;
-    }
-
-void FIPS_corrupt_rsa()
-    {
-    n[0]++;
-    }
-
-int FIPS_selftest_rsa()
-    {
-    int clen;
-    RSA *key;
-    unsigned char expected_ctext[256];
-    unsigned char ctext[256];
-    unsigned char ptext[256];
-    static const unsigned char original_ptext[] =
-        "\x01\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0"
-        "\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12"
-        "\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34"
-        "\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56"
-        "\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78"
-        "\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78\x9a"
-        "\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78\x9a\xbc"
-        "\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78\x9a\xbc\xde"
-        "\xf0\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78\x9a\xbc\xde";
-    unsigned char md[SHA_DIGEST_LENGTH];
-    static const unsigned char mdkat[SHA_DIGEST_LENGTH] =
-        "\x2d\x57\x1d\x6f\x5c\x37\xf9\xf0\x3b\xb4\x3c\xe8\x2c\x4c\xb3\x04"
-        "\x75\xa2\x0e\xfb";
-    static const unsigned char ctextkat[] =
-        "\x3e\xc5\x0a\xbe\x29\xa2\xca\x9a\x35\x14\x17\x26\xa4\x0f\xa3\x03"
-        "\x65\xb5\x37\xf5\x6a\xaa\xb\xf\x2c\x0d\x8\xc0\x73\x8\x3c\x88\x85"
-        "\x36\x68\x16\xfe\x2f\x59\x77\x7e\x2a\x76\x9a\xc7\x27\x19\x9b\x54"
-        "\x14\x87\xf3\xe0\xce\x1e\x68\x10\x40\x14\xac\xbc\xe6\x6f\x26\x1f"
-        "\x55\xd1\x15\x81\x48\x10\xf4\x89\xe5\x67\x52\x42\x87\x04\x74\x4e"
-        "\x96\x14\x7c\x53\xc9\x1e\x84\x11\x7d\x7d\x23\xbd\xff\x6c\xcb\x00"
-        "\x96\x2e\x7d\xfb\x47\xea\x78\xcd\xd8\x04\x3a\x98\x06\x13\x68\x39"
-        "\xa1\xe2\xbc\x9f\x64\xc7\x62\xf0\x74\x4d\x42\xe0\x0b\xcf\x24\x48";
-    int i;
-
-    /* Perform pairwise consistency test by: ... */
-
-    key=RSA_new();
-    clen=setrsakey(key,expected_ctext);
-    /* ...1) apply public key to plaintext, resulting ciphertext must be
-     * different
-    */
-    i=RSA_public_encrypt(128,original_ptext,ctext,key,
-                         RSA_NO_PADDING);
-    if(i != clen || memcmp(ctext,expected_ctext,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    if(!memcmp(ctext,original_ptext,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    /* ...2) apply private key to ciphertext and compare result to
-     *       original plaintext; results must be equal
-    */
-    i=RSA_private_decrypt(i,ctext,ptext,key,RSA_NO_PADDING);
-    if(i != 128 || memcmp(ptext,original_ptext,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-
-    /* Perform sign and verify Known Answer Test by... */
-
-    /* ...1)  using the same RSA key to encrypt the SHA-1 hash of a
-     * plaintext value larger than the RSA key size
-    */
-    if (RSA_size(key) >= sizeof(original_ptext) - 1)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    /* ...2) then generate the SHA-1 digest of plaintext, and compare the
-     * digest to the Known Answer (note here we duplicate the SHA-1 KAT)
-     */
-    SHA1(original_ptext,sizeof(original_ptext) - 1,md);
-    if(memcmp(md,mdkat,SHA_DIGEST_LENGTH))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_SHA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    /* ...3) then encrypt the digest, and compare the ciphertext
-     * to the Known Answer
-     */
-    i=RSA_private_encrypt(sizeof(md),md,ctext,key,RSA_PKCS1_PADDING);
-    if(i != clen || memcmp(ctextkat,ctext,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    /* ...4) and finally decrypt the signed digest and compare with
-     * the original Known Answer
-     */
-    i=RSA_public_decrypt(i,ctext,md,key,RSA_PKCS1_PADDING);
-    if(i != sizeof(md) || memcmp(mdkat,md,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-
-    RSA_free(key);
-    return 1;
-    }
-
-#endif /* def OPENSSL_FIPS */
diff --git a/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_x931g.c b/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_x931g.c
deleted file mode 100644
index 41e1473bca..0000000000
--- a/src/lib/libssl/src/fips-1.0/rsa/fips_rsa_x931g.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* crypto/rsa/rsa_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/fips.h>
-
-#ifdef OPENSSL_FIPS
-
-extern int fips_check_rsa(RSA *rsa);
-
-
-/* X9.31 RSA key derivation and generation */
-
-int RSA_X931_derive(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1, BIGNUM *q2,
-                        void (*cb)(int, int, void *), void *cb_arg,
-                        const BIGNUM *Xp1, const BIGNUM *Xp2, const BIGNUM *Xp,
-                        const BIGNUM *Xq1, const BIGNUM *Xq2, const BIGNUM *Xq,
-                        const BIGNUM *e)
-        {
-        BIGNUM *r0=NULL,*r1=NULL,*r2=NULL,*r3=NULL;
-        BN_CTX *ctx=NULL,*ctx2=NULL;
-
-        if (!rsa) 
-                goto err;
-
-        ctx = BN_CTX_new();
-        BN_CTX_start(ctx);
-        if (!ctx) 
-                goto err;
-
-        r0 = BN_CTX_get(ctx);
-        r1 = BN_CTX_get(ctx);
-        r2 = BN_CTX_get(ctx);
-        r3 = BN_CTX_get(ctx);
-
-        if (r3 == NULL)
-                goto err;
-        if (!rsa->e)
-                {
-                rsa->e = BN_dup(e);
-                if (!rsa->e)
-                        goto err;
-                }
-        else
-                e = rsa->e;
-
-        /* If not all parameters present only calculate what we can.
-         * This allows test programs to output selective parameters.
-         */
-
-        if (Xp && !rsa->p)
-                {
-                rsa->p = BN_new();
-                if (!rsa->p)
-                        goto err;
-
-                if (!BN_X931_derive_prime(rsa->p, p1, p2, cb, cb_arg,
-                                        Xp, Xp1, Xp2, e, ctx))
-                        goto err;
-                }
-
-        if (Xq && !rsa->q)
-                {
-                rsa->q = BN_new();
-                if (!rsa->q)
-                        goto err;
-                if (!BN_X931_derive_prime(rsa->q, q1, q2, cb, cb_arg,
-                                        Xq, Xq1, Xq2, e, ctx))
-                        goto err;
-                }
-
-        if (!rsa->p || !rsa->q)
-                {
-                BN_CTX_end(ctx);
-                BN_CTX_free(ctx);
-                return 2;
-                }
-
-        /* Since both primes are set we can now calculate all remaining 
-         * components.
-         */
-
-        /* calculate n */
-        rsa->n=BN_new();
-        if (rsa->n == NULL)
-                goto err;
-        if (!BN_mul(rsa->n,rsa->p,rsa->q,ctx))
-                goto err;
-
-        /* calculate d */
-        if (!BN_sub(r1,rsa->p,BN_value_one()))
-                goto err;       /* p-1 */
-        if (!BN_sub(r2,rsa->q,BN_value_one()))
-                goto err;       /* q-1 */
-        if (!BN_mul(r0,r1,r2,ctx))
-                goto err;       /* (p-1)(q-1) */
-
-        if (!BN_gcd(r3, r1, r2, ctx))
-                goto err;
-
-        if (!BN_div(r0, NULL, r0, r3, ctx))
-                goto err;       /* LCM((p-1)(q-1)) */
-
-        ctx2 = BN_CTX_new();
-        if (!ctx2)
-                goto err;
-
-        rsa->d=BN_mod_inverse(NULL,rsa->e,r0,ctx2);     /* d */
-        if (rsa->d == NULL)
-                goto err;
-
-        /* calculate d mod (p-1) */
-        rsa->dmp1=BN_new();
-        if (rsa->dmp1 == NULL)
-                goto err;
-        if (!BN_mod(rsa->dmp1,rsa->d,r1,ctx))
-                goto err;
-
-        /* calculate d mod (q-1) */
-        rsa->dmq1=BN_new();
-        if (rsa->dmq1 == NULL)
-                goto err;
-        if (!BN_mod(rsa->dmq1,rsa->d,r2,ctx))
-                goto err;
-
-        /* calculate inverse of q mod p */
-        rsa->iqmp=BN_mod_inverse(NULL,rsa->q,rsa->p,ctx2);
-
-        err:
-        if (ctx)
-                {
-                BN_CTX_end(ctx);
-                BN_CTX_free(ctx);
-                }
-        if (ctx2)
-                BN_CTX_free(ctx2);
-        /* If this is set all calls successful */
-        if (rsa->iqmp != NULL)
-                return 1;
-
-        return 0;
-
-        }
-
-RSA *RSA_X931_generate_key(FIPS_RSA_SIZE_T bits, const BIGNUM *e,
-             void (*cb)(int,int,void *), void *cb_arg)
-        {
-        RSA *rsa = NULL;
-        int ok = 0;
-        BIGNUM *Xp = NULL, *Xq = NULL;
-        BN_CTX *ctx = NULL;
-        
-        if (bits < 1024)
-            {
-            FIPSerr(FIPS_F_RSA_X931_GENERATE_KEY,FIPS_R_KEY_TOO_SHORT);
-            return NULL;
-            }
-
-        if (bits & 0xff)
-            {
-            FIPSerr(FIPS_F_RSA_X931_GENERATE_KEY,FIPS_R_INVALID_KEY_LENGTH);
-            return NULL;
-            }
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_RSA_X931_GENERATE_KEY,FIPS_R_FIPS_SELFTEST_FAILED);
-            return NULL;
-            }
-
-        ctx = BN_CTX_new();
-        if (!ctx)
-                goto error;
-
-        BN_CTX_start(ctx);
-        Xp = BN_CTX_get(ctx);
-        Xq = BN_CTX_get(ctx);
-        if (!BN_X931_generate_Xpq(Xp, Xq, bits, ctx))
-                goto error;
-
-        rsa = RSA_new();
-        if (!rsa)
-                goto error;
-        rsa->p = BN_new();
-        rsa->q = BN_new();
-        if (!rsa->p || !rsa->q)
-                goto error;
-
-        /* Generate two primes from Xp, Xq */
-
-        if (!BN_X931_generate_prime(rsa->p, NULL, NULL, NULL, NULL, Xp,
-                                        e, ctx, cb, cb_arg))
-                goto error;
-
-        if (!BN_X931_generate_prime(rsa->q, NULL, NULL, NULL, NULL, Xq,
-                                        e, ctx, cb, cb_arg))
-                goto error;
-
-        /* Since rsa->p and rsa->q are valid this call will just derive
-         * remaining RSA components.
-         */
-
-        if (!RSA_X931_derive(rsa, NULL, NULL, NULL, NULL, cb, cb_arg,
-                                NULL, NULL, NULL, NULL, NULL, NULL, e))
-                goto error;
-
-        if(!fips_check_rsa(rsa))
-            goto error;
-
-        ok = 1;
-
-        error:
-        if (ctx)
-                {
-                BN_CTX_end(ctx);
-                BN_CTX_free(ctx);
-                }
-
-        if (ok)
-                return rsa;
-
-        if (rsa)
-                RSA_free(rsa);
-
-        return NULL;
-
-        }
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/rsa/fips_rsagtest.c b/src/lib/libssl/src/fips-1.0/rsa/fips_rsagtest.c
deleted file mode 100644
index 15d3225d53..0000000000
--- a/src/lib/libssl/src/fips-1.0/rsa/fips_rsagtest.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/* fips_rsagtest.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 2005.
- */
-/* ====================================================================
- * Copyright (c) 2005 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/err.h>
-#include <openssl/x509v3.h>
-
-#ifndef OPENSSL_FIPS
-
-int main(int argc, char *argv[])
-{
-    printf("No FIPS RSA support\n");
-    return(0);
-}
-
-#else
-
-extern int RSA_X931_derive(RSA *rsa, BIGNUM *p1, BIGNUM *p2, BIGNUM *q1, BIGNUM *q2,
-                        void (*cb)(int, int, void *), void *cb_arg,
-                        const BIGNUM *Xp1, const BIGNUM *Xp2, const BIGNUM *Xp,
-                        const BIGNUM *Xq1, const BIGNUM *Xq2, const BIGNUM *Xq,
-                        const BIGNUM *e);
-
-int rsa_test(BIO *err, BIO *out, BIO *in);
-static int rsa_printkey1(BIO *err, BIO *out, RSA *rsa,
-                BIGNUM *Xp1, BIGNUM *Xp2, BIGNUM *Xp,
-                BIGNUM *e);
-static int rsa_printkey2(BIO *err, BIO *out, RSA *rsa,
-                BIGNUM *Xq1, BIGNUM *Xq2, BIGNUM *Xq);
-
-int main(int argc, char **argv)
-        {
-        BIO *in = NULL, *out = NULL, *err = NULL;
-
-        int ret = 1;
-        ERR_load_crypto_strings();
-
-        err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-        if (!err)
-                {
-                fprintf(stderr, "FATAL stderr initialization error\n");
-                goto end;
-                }
-
-        if(!FIPS_mode_set(1))
-                {
-                ERR_print_errors(err);
-                goto end;
-                }
-
-        if (argc == 1)
-                in = BIO_new_fp(stdin, BIO_NOCLOSE);
-        else
-                in = BIO_new_file(argv[1], "r");
-
-        if (argc < 2)
-                out = BIO_new_fp(stdout, BIO_NOCLOSE);
-        else
-                out = BIO_new_file(argv[2], "w");
-
-        if (!in)
-                {
-                BIO_printf(err, "FATAL input initialization error\n");
-                goto end;
-                }
-
-        if (!out)
-                {
-                fprintf(stderr, "FATAL output initialization error\n");
-                goto end;
-                }
-
-        if (!rsa_test(err, out, in))
-                {
-                fprintf(stderr, "FATAL RSAVTEST file processing error\n");
-                goto end;
-                }
-        else
-                ret = 0;
-
-        end:
-
-        if (ret && err)
-                ERR_print_errors(err);
-
-        if (in)
-                BIO_free(in);
-        if (out)
-                BIO_free(out);
-        if (err)
-                BIO_free(err);
-
-        return ret;
-
-        }
-
-
-static void do_bn_print(BIO *out, const char *name, BIGNUM *b)
-        {
-        char *htmp, *p;
-        /* Can't use BN_print_fp because it uses upper case so
-         * use BN_bn2hex() and convert.
-         */
-        htmp = BN_bn2hex(b);
-        for(p = htmp; *p; p++)
-                {
-                if (isupper(*p))
-                        *p = tolower(*p);
-                }
-        BIO_printf(out, "%s = %s\n", name, htmp);
-        OPENSSL_free(htmp);
-        }
-
-#define RSA_TEST_MAXLINELEN     10240
-
-int rsa_test(BIO *err, BIO *out, BIO *in)
-        {
-        char *linebuf, *olinebuf, *p, *q;
-        char *keyword, *value;
-        RSA *rsa = NULL;
-        BIGNUM *Xp1 = NULL, *Xp2 = NULL, *Xp = NULL;
-        BIGNUM *Xq1 = NULL, *Xq2 = NULL, *Xq = NULL;
-        BIGNUM *e = NULL;
-        int ret = 0;
-        int lnum = 0;
-
-        olinebuf = OPENSSL_malloc(RSA_TEST_MAXLINELEN);
-        linebuf = OPENSSL_malloc(RSA_TEST_MAXLINELEN);
-
-        if (!linebuf || !olinebuf)
-                goto error;
-
-        while (BIO_gets(in, olinebuf, RSA_TEST_MAXLINELEN) > 0)
-                {
-                lnum++;
-                strcpy(linebuf, olinebuf);
-                keyword = linebuf;
-                /* Skip leading space */
-                while (isspace((unsigned char)*keyword))
-                        keyword++;
-
-                /* Look for = sign */
-                p = strchr(linebuf, '=');
-
-                /* If no = or starts with [ (for [foo = bar] line) just copy */
-                if (!p || *keyword=='[')
-                        {
-                        if (!BIO_puts(out, olinebuf))
-                                goto error;
-                        continue;
-                        }
-
-                q = p - 1;
-
-                /* Remove trailing space */
-                while (isspace((unsigned char)*q))
-                        *q-- = 0;
-
-
-                value = p + 1;
-
-                /* Remove leading space from value */
-                while (isspace((unsigned char)*value))
-                        value++;
-
-                /* Remove trailing space from value */
-                p = value + strlen(value) - 1;
-
-                while (*p == '\n' || isspace((unsigned char)*p))
-                        *p-- = 0;
-
-                if (!strcmp(keyword, "xp1"))
-                        {
-                        if (Xp1 || !BN_hex2bn(&Xp1,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "xp2"))
-                        {
-                        if (Xp2 || !BN_hex2bn(&Xp2,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Xp"))
-                        {
-                        if (Xp || !BN_hex2bn(&Xp,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "xq1"))
-                        {
-                        if (Xq1 || !BN_hex2bn(&Xq1,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "xq2"))
-                        {
-                        if (Xq2 || !BN_hex2bn(&Xq2,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Xq"))
-                        {
-                        if (Xq || !BN_hex2bn(&Xq,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "e"))
-                        {
-                        if (e || !BN_hex2bn(&e,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "p1"))
-                        continue;
-                else if (!strcmp(keyword, "p2"))
-                        continue;
-                else if (!strcmp(keyword, "p"))
-                        continue;
-                else if (!strcmp(keyword, "q1"))
-                        continue;
-                else if (!strcmp(keyword, "q2"))
-                        continue;
-                else if (!strcmp(keyword, "q"))
-                        continue;
-                else if (!strcmp(keyword, "n"))
-                        continue;
-                else if (!strcmp(keyword, "d"))
-                        continue;
-                else
-                        goto parse_error;
-
-                BIO_puts(out, olinebuf);
-
-                if (e && Xp1 && Xp2 && Xp)
-                        {
-                        rsa = RSA_new();
-                        if (!rsa)
-                                goto error;
-                        if (!rsa_printkey1(err, out, rsa, Xp1, Xp2, Xp, e))
-                                goto error;
-                        BN_free(Xp1);
-                        Xp1 = NULL;
-                        BN_free(Xp2);
-                        Xp2 = NULL;
-                        BN_free(Xp);
-                        Xp = NULL;
-                        BN_free(e);
-                        e = NULL;
-                        }
-
-                if (rsa && Xq1 && Xq2 && Xq)
-                        {
-                        if (!rsa_printkey2(err, out, rsa, Xq1, Xq2, Xq))
-                                goto error;
-                        BN_free(Xq1);
-                        Xq1 = NULL;
-                        BN_free(Xq2);
-                        Xq2 = NULL;
-                        BN_free(Xq);
-                        Xq = NULL;
-                        RSA_free(rsa);
-                        rsa = NULL;
-                        }
-                }
-
-        ret = 1;
-
-        error:
-
-        if (olinebuf)
-                OPENSSL_free(olinebuf);
-        if (linebuf)
-                OPENSSL_free(linebuf);
-
-        if (Xp1)
-                BN_free(Xp1);
-        if (Xp2)
-                BN_free(Xp2);
-        if (Xp)
-                BN_free(Xp);
-        if (Xq1)
-                BN_free(Xq1);
-        if (Xq1)
-                BN_free(Xq1);
-        if (Xq2)
-                BN_free(Xq2);
-        if (Xq)
-                BN_free(Xq);
-        if (e)
-                BN_free(e);
-        if (rsa)
-                RSA_free(rsa);
-
-        return ret;
-
-        parse_error:
-
-        BIO_printf(err, "FATAL parse error processing line %d\n", lnum);
-
-        goto error;
-
-        }
-
-static int rsa_printkey1(BIO *err, BIO *out, RSA *rsa,
-                BIGNUM *Xp1, BIGNUM *Xp2, BIGNUM *Xp,
-                BIGNUM *e)
-        {
-        int ret = 0;
-        BIGNUM *p1 = NULL, *p2 = NULL;
-        p1 = BN_new();
-        p2 = BN_new();
-        if (!p1 || !p2)
-                goto error;
-
-        if (!RSA_X931_derive(rsa, p1, p2, NULL, NULL, 0, NULL, Xp1, Xp2, Xp,
-                                                        NULL, NULL, NULL, e))
-                goto error;
-
-        do_bn_print(out, "p1", p1);
-        do_bn_print(out, "p2", p2);
-        do_bn_print(out, "p", rsa->p);
-
-        ret = 1;
-
-        error:
-        if (p1)
-                BN_free(p1);
-        if (p2)
-                BN_free(p2);
-
-        return ret;
-        }
-
-static int rsa_printkey2(BIO *err, BIO *out, RSA *rsa,
-                BIGNUM *Xq1, BIGNUM *Xq2, BIGNUM *Xq)
-        {
-        int ret = 0;
-        BIGNUM *q1 = NULL, *q2 = NULL;
-        q1 = BN_new();
-        q2 = BN_new();
-        if (!q1 || !q2)
-                goto error;
-
-        if (!RSA_X931_derive(rsa, NULL, NULL, q1, q2, 0, NULL, NULL, NULL, NULL,
-                                                        Xq1, Xq2, Xq, NULL))
-                goto error;
-
-        do_bn_print(out, "q1", q1);
-        do_bn_print(out, "q2", q2);
-        do_bn_print(out, "q", rsa->q);
-        do_bn_print(out, "n", rsa->n);
-        do_bn_print(out, "d", rsa->d);
-
-        ret = 1;
-
-        error:
-        if (q1)
-                BN_free(q1);
-        if (q2)
-                BN_free(q2);
-
-        return ret;
-        }
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/rsa/fips_rsastest.c b/src/lib/libssl/src/fips-1.0/rsa/fips_rsastest.c
deleted file mode 100644
index 880dd636a7..0000000000
--- a/src/lib/libssl/src/fips-1.0/rsa/fips_rsastest.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/* fips_rsastest.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 2005.
- */
-/* ====================================================================
- * Copyright (c) 2005 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/err.h>
-#include <openssl/x509v3.h>
-
-#ifndef OPENSSL_FIPS
-
-int main(int argc, char *argv[])
-{
-    printf("No FIPS RSA support\n");
-    return(0);
-}
-
-#else
-
-static int rsa_stest(BIO *err, BIO *out, BIO *in, int Saltlen);
-static int rsa_printsig(BIO *err, BIO *out, RSA *rsa, const EVP_MD *dgst,
-                unsigned char *Msg, long Msglen, int Saltlen);
-
-int main(int argc, char **argv)
-        {
-        BIO *in = NULL, *out = NULL, *err = NULL;
-
-        int ret = 1, Saltlen = -1;
-        ERR_load_crypto_strings();
-
-        err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-        if (!err)
-                {
-                fprintf(stderr, "FATAL stderr initialization error\n");
-                goto end;
-                }
-
-        if(!FIPS_mode_set(1))
-                {
-                ERR_print_errors(err);
-                goto end;
-                }
-
-        if ((argc > 2) && !strcmp("-saltlen", argv[1]))
-                {
-                Saltlen = atoi(argv[2]);
-                if (Saltlen < 0)
-                        {
-                        BIO_printf(err, "FATAL: Invalid salt length\n");
-                        goto end;
-                        }
-                argc -= 2;
-                argv += 2;
-                }
-        else if ((argc > 1) && !strcmp("-x931", argv[1]))
-                {
-                Saltlen = -2;
-                argc--;
-                argv++;
-                }
-
-        if (argc == 1)
-                in = BIO_new_fp(stdin, BIO_NOCLOSE);
-        else
-                in = BIO_new_file(argv[1], "r");
-
-        if (argc < 2)
-                out = BIO_new_fp(stdout, BIO_NOCLOSE);
-        else
-                out = BIO_new_file(argv[2], "w");
-
-        if (!in)
-                {
-                BIO_printf(err, "FATAL input initialization error\n");
-                goto end;
-                }
-
-        if (!out)
-                {
-                fprintf(stderr, "FATAL output initialization error\n");
-                goto end;
-                }
-
-        if (!rsa_stest(err, out, in, Saltlen))
-                {
-                fprintf(stderr, "FATAL RSAVTEST file processing error\n");
-                goto end;
-                }
-        else
-                ret = 0;
-
-        end:
-
-        if (ret && err)
-                ERR_print_errors(err);
-
-        if (in)
-                BIO_free(in);
-        if (out)
-                BIO_free(out);
-        if (err)
-                BIO_free(err);
-
-        return ret;
-
-        }
-
-#define RSA_TEST_MAXLINELEN     10240
-
-int rsa_stest(BIO *err, BIO *out, BIO *in, int Saltlen)
-        {
-        char *linebuf, *olinebuf, *p, *q;
-        char *keyword, *value;
-        RSA *rsa = NULL;
-        const EVP_MD *dgst = NULL;
-        unsigned char *Msg = NULL;
-        long Msglen;
-        int keylen = -1, current_keylen = -1;
-        int ret = 0;
-        int lnum = 0;
-
-        olinebuf = OPENSSL_malloc(RSA_TEST_MAXLINELEN);
-        linebuf = OPENSSL_malloc(RSA_TEST_MAXLINELEN);
-
-        if (!linebuf || !olinebuf)
-                goto error;
-
-        while (BIO_gets(in, olinebuf, RSA_TEST_MAXLINELEN) > 0)
-                {
-                lnum++;
-                strcpy(linebuf, olinebuf);
-                keyword = linebuf;
-                /* Skip leading space */
-                while (isspace((unsigned char)*keyword))
-                        keyword++;
-
-                /* Look for = sign */
-                p = strchr(linebuf, '=');
-
-                /* If no = just copy */
-                if (!p)
-                        {
-                        if (!BIO_puts(out, olinebuf))
-                                goto error;
-                        continue;
-                        }
-
-                q = p - 1;
-
-                /* Remove trailing space */
-                while (isspace((unsigned char)*q))
-                        *q-- = 0;
-
-
-                value = p + 1;
-
-                /* Remove leading space from value */
-                while (isspace((unsigned char)*value))
-                        value++;
-
-                /* Remove trailing space from value */
-                p = value + strlen(value) - 1;
-
-                while (*p == '\n' || isspace((unsigned char)*p))
-                        *p-- = 0;
-
-                /* Look for [mod = XXX] for key length */
-
-                if (!strcmp(keyword, "[mod"))
-                        {
-                        p = value + strlen(value) - 1;
-                        if (*p != ']')
-                                goto parse_error;
-                        *p = 0;
-                        keylen = atoi(value);
-                        if (keylen < 0)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "SHAAlg"))
-                        {
-                        if (!strcmp(value, "SHA1"))
-                                dgst = EVP_sha1();
-                        else if (!strcmp(value, "SHA224"))
-                                dgst = EVP_sha224();
-                        else if (!strcmp(value, "SHA256"))
-                                dgst = EVP_sha256();
-                        else if (!strcmp(value, "SHA384"))
-                                dgst = EVP_sha384();
-                        else if (!strcmp(value, "SHA512"))
-                                dgst = EVP_sha512();
-                        else
-                                {
-                                BIO_printf(err,
-                                        "FATAL: unsupported algorithm \"%s\"\n",
-                                                                value);
-                                goto parse_error;
-                                }
-                        }
-                else if (!strcmp(keyword, "Msg"))
-                        {
-                        if (Msg)
-                                goto parse_error;
-                        if (strlen(value) & 1)
-                                *(--value) = '0';
-                        Msg = string_to_hex(value, &Msglen);
-                        if (!Msg)
-                                goto parse_error;
-                        }
-
-                BIO_puts(out, olinebuf);
-
-                /* If key length has changed, generate and output public
-                 * key components of new RSA private key.
-                 */
-
-                if (keylen != current_keylen)
-                        {
-                        if (rsa)
-                                RSA_free(rsa);
-                        rsa = RSA_generate_key(keylen, 0x1001, 0, NULL);
-                        if (!rsa)
-                                goto error;
-                        BIO_puts(out, "n = ");
-                        BN_print(out, rsa->n);
-                        BIO_puts(out, "\ne = ");
-                        BN_print(out, rsa->e);
-                        BIO_puts(out, "\n");
-                        current_keylen = keylen;
-                        }
-
-                if (Msg && dgst)
-                        {
-                        if (!rsa_printsig(err, out, rsa, dgst, Msg, Msglen,
-                                                                Saltlen))
-                                goto error;
-                        OPENSSL_free(Msg);
-                        Msg = NULL;
-                        }
-
-                }
-
-        ret = 1;
-
-        error:
-
-        if (olinebuf)
-                OPENSSL_free(olinebuf);
-        if (linebuf)
-                OPENSSL_free(linebuf);
-        if (rsa)
-                RSA_free(rsa);
-
-        return ret;
-
-        parse_error:
-
-        BIO_printf(err, "FATAL parse error processing line %d\n", lnum);
-
-        goto error;
-
-        }
-
-static int rsa_printsig(BIO *err, BIO *out, RSA *rsa, const EVP_MD *dgst,
-                unsigned char *Msg, long Msglen, int Saltlen)
-        {
-        int ret = 0;
-        unsigned char *sigbuf = NULL;
-        int i, siglen;
-        /* EVP_PKEY structure */
-        EVP_PKEY *key = NULL;
-        EVP_MD_CTX ctx;
-        key = EVP_PKEY_new();
-        if (!key)
-                goto error;
-        if (!EVP_PKEY_set1_RSA(key, rsa))
-                goto error;
-
-        siglen = EVP_PKEY_size(key);
-        sigbuf = OPENSSL_malloc(siglen);
-        if (!sigbuf)
-                goto error;
-
-        EVP_MD_CTX_init(&ctx);
-
-        if (Saltlen != -1)
-                {
-                unsigned int mdlen;
-                unsigned char mdtmp[EVP_MAX_MD_SIZE + 1];
-
-                if (!EVP_DigestInit_ex(&ctx, dgst, NULL))
-                        goto error;
-                if (!EVP_DigestUpdate(&ctx, Msg, Msglen))
-                        goto error;
-                if (!EVP_DigestFinal(&ctx, mdtmp, &mdlen))
-                        goto error;
-        
-                if (Saltlen == -2)
-                        {
-                        mdtmp[mdlen] = RSA_X931_hash_id(EVP_MD_type(dgst));
-                        siglen = RSA_private_encrypt(mdlen + 1, mdtmp,
-                                        sigbuf, rsa, RSA_X931_PADDING);
-                        if (siglen <= 0)
-                                goto error;
-                        }
-                else
-                        {
-                        if (!RSA_padding_add_PKCS1_PSS(rsa, sigbuf, mdtmp,
-                                                        dgst, Saltlen))
-                                goto error;
-                        siglen = RSA_private_encrypt(siglen, sigbuf, sigbuf,
-                                                rsa, RSA_NO_PADDING);
-                        if (siglen <= 0)
-                                goto error;
-                        }
-                }
-        else
-                {
-                if (!EVP_SignInit_ex(&ctx, dgst, NULL))
-                        goto error;
-                if (!EVP_SignUpdate(&ctx, Msg, Msglen))
-                        goto error;
-                if (!EVP_SignFinal(&ctx, sigbuf, (unsigned int *)&siglen, key))
-                        goto error;
-                }
-
-        EVP_MD_CTX_cleanup(&ctx);
-
-        BIO_puts(out, "S = ");
-
-        for (i = 0; i < siglen; i++)
-                BIO_printf(out, "%02X", sigbuf[i]);
-
-        BIO_puts(out, "\n");
-
-        ret = 1;
-
-        error:
-        if (key)
-                EVP_PKEY_free(key);
-
-        return ret;
-        }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/rsa/fips_rsavtest.c b/src/lib/libssl/src/fips-1.0/rsa/fips_rsavtest.c
deleted file mode 100644
index 7e2c40424d..0000000000
--- a/src/lib/libssl/src/fips-1.0/rsa/fips_rsavtest.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/* fips_rsavtest.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 2005.
- */
-/* ====================================================================
- * Copyright (c) 2005 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/err.h>
-#include <openssl/x509v3.h>
-
-#ifndef OPENSSL_FIPS
-
-int main(int argc, char *argv[])
-{
-    printf("No FIPS RSA support\n");
-    return(0);
-}
-
-#else
-
-int rsa_test(BIO *err, BIO *out, BIO *in, int saltlen);
-static int rsa_printver(BIO *err, BIO *out,
-                BIGNUM *n, BIGNUM *e,
-                const EVP_MD *dgst,
-                unsigned char *Msg, long Msglen,
-                unsigned char *S, long Slen, int Saltlen);
-
-int main(int argc, char **argv)
-        {
-        BIO *in = NULL, *out = NULL, *err = NULL;
-
-        int ret = 1;
-        int Saltlen = -1;
-        ERR_load_crypto_strings();
-
-        err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-        if (!err)
-                {
-                fprintf(stderr, "FATAL stderr initialization error\n");
-                goto end;
-                }
-
-        if(!FIPS_mode_set(1))
-                {
-                ERR_print_errors(err);
-                goto end;
-                }
-
-        if ((argc > 2) && !strcmp("-saltlen", argv[1]))
-                {
-                Saltlen = atoi(argv[2]);
-                if (Saltlen < 0)
-                        {
-                        BIO_printf(err, "FATAL: Invalid salt length\n");
-                        goto end;
-                        }
-                argc -= 2;
-                argv += 2;
-                }
-        else if ((argc > 1) && !strcmp("-x931", argv[1]))
-                {
-                Saltlen = -2;
-                argc--;
-                argv++;
-                }
-
-        if (argc == 1)
-                in = BIO_new_fp(stdin, BIO_NOCLOSE);
-        else
-                in = BIO_new_file(argv[1], "r");
-
-        if (argc < 2)
-                out = BIO_new_fp(stdout, BIO_NOCLOSE);
-        else
-                out = BIO_new_file(argv[2], "w");
-
-        if (!in)
-                {
-                BIO_printf(err, "FATAL input initialization error\n");
-                goto end;
-                }
-
-        if (!out)
-                {
-                fprintf(stderr, "FATAL output initialization error\n");
-                goto end;
-                }
-
-        if (!rsa_test(err, out, in, Saltlen))
-                {
-                fprintf(stderr, "FATAL RSAVTEST file processing error\n");
-                goto end;
-                }
-        else
-                ret = 0;
-
-        end:
-
-        if (ret && err)
-                ERR_print_errors(err);
-
-        if (in)
-                BIO_free(in);
-        if (out)
-                BIO_free(out);
-        if (err)
-                BIO_free(err);
-
-        return ret;
-
-        }
-
-#define RSA_TEST_MAXLINELEN     10240
-
-int rsa_test(BIO *err, BIO *out, BIO *in, int Saltlen)
-        {
-        char *linebuf, *olinebuf, *p, *q;
-        char *keyword, *value;
-        const EVP_MD *dgst = NULL;
-        BIGNUM *n = NULL, *e = NULL;
-        unsigned char *Msg = NULL, *S = NULL;
-        long Msglen, Slen;
-        int ret = 0;
-        int lnum = 0;
-
-        olinebuf = OPENSSL_malloc(RSA_TEST_MAXLINELEN);
-        linebuf = OPENSSL_malloc(RSA_TEST_MAXLINELEN);
-
-        if (!linebuf || !olinebuf)
-                goto error;
-
-        while (BIO_gets(in, olinebuf, RSA_TEST_MAXLINELEN) > 0)
-                {
-                lnum++;
-                strcpy(linebuf, olinebuf);
-                keyword = linebuf;
-                /* Skip leading space */
-                while (isspace((unsigned char)*keyword))
-                        keyword++;
-
-                /* Look for = sign */
-                p = strchr(linebuf, '=');
-
-                /* If no = or starts with [ (for [foo = bar] line) just copy */
-                if (!p || *keyword=='[')
-                        {
-                        if (!BIO_puts(out, olinebuf))
-                                goto error;
-                        continue;
-                        }
-
-                q = p - 1;
-
-                /* Remove trailing space */
-                while (isspace((unsigned char)*q))
-                        *q-- = 0;
-
-
-                value = p + 1;
-
-                /* Remove leading space from value */
-                while (isspace((unsigned char)*value))
-                        value++;
-
-                /* Remove trailing space from value */
-                p = value + strlen(value) - 1;
-
-                while (*p == '\n' || isspace((unsigned char)*p))
-                        *p-- = 0;
-
-                if (!strcmp(keyword, "n"))
-                        {
-                        if (!BN_hex2bn(&n,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "e"))
-                        {
-                        if (!BN_hex2bn(&e,value))
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "SHAAlg"))
-                        {
-                        if (!strcmp(value, "SHA1"))
-                                dgst = EVP_sha1();
-                        else if (!strcmp(value, "SHA224"))
-                                dgst = EVP_sha224();
-                        else if (!strcmp(value, "SHA256"))
-                                dgst = EVP_sha256();
-                        else if (!strcmp(value, "SHA384"))
-                                dgst = EVP_sha384();
-                        else if (!strcmp(value, "SHA512"))
-                                dgst = EVP_sha512();
-                        else
-                                {
-                                BIO_printf(err,
-                                        "FATAL: unsupported algorithm \"%s\"\n",
-                                                                value);
-                                goto parse_error;
-                                }
-                        }
-                else if (!strcmp(keyword, "Msg"))
-                        {
-                        if (Msg)
-                                goto parse_error;
-                        if (strlen(value) & 1)
-                                *(--value) = '0';
-                        Msg = string_to_hex(value, &Msglen);
-                        if (!Msg)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "S"))
-                        {
-                        if (S)
-                                goto parse_error;
-                        if (strlen(value) & 1)
-                                *(--value) = '0';
-                        S = string_to_hex(value, &Slen);
-                        if (!S)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Result"))
-                        continue;
-                else
-                        goto parse_error;
-
-                BIO_puts(out, olinebuf);
-
-                if (n && e && Msg && S && dgst)
-                        {
-                        if (!rsa_printver(err, out, n, e, dgst,
-                                        Msg, Msglen, S, Slen, Saltlen))
-                                goto error;
-                        OPENSSL_free(Msg);
-                        Msg = NULL;
-                        OPENSSL_free(S);
-                        S = NULL;
-                        }
-
-                }
-
-
-        ret = 1;
-
-
-        error:
-
-        if (olinebuf)
-                OPENSSL_free(olinebuf);
-        if (linebuf)
-                OPENSSL_free(linebuf);
-        if (n)
-                BN_free(n);
-        if (e)
-                BN_free(e);
-
-        return ret;
-
-        parse_error:
-
-        BIO_printf(err, "FATAL parse error processing line %d\n", lnum);
-
-        goto error;
-
-        }
-
-static int rsa_printver(BIO *err, BIO *out,
-                BIGNUM *n, BIGNUM *e,
-                const EVP_MD *dgst,
-                unsigned char *Msg, long Msglen,
-                unsigned char *S, long Slen, int Saltlen)
-        {
-        int ret = 0, r;
-        /* Setup RSA and EVP_PKEY structures */
-        RSA *rsa_pubkey = NULL;
-        EVP_PKEY *pubkey = NULL;
-        EVP_MD_CTX ctx;
-        unsigned char *buf = NULL;
-        rsa_pubkey = RSA_new();
-        pubkey = EVP_PKEY_new();
-        if (!rsa_pubkey || !pubkey)
-                goto error;
-        rsa_pubkey->n = BN_dup(n);
-        rsa_pubkey->e = BN_dup(e);
-        if (!rsa_pubkey->n || !rsa_pubkey->e)
-                goto error;
-        if (!EVP_PKEY_set1_RSA(pubkey, rsa_pubkey))
-                goto error;
-
-        EVP_MD_CTX_init(&ctx);
-
-        if (Saltlen != -1)
-                {
-                int pad;
-                unsigned char mdtmp[EVP_MAX_MD_SIZE];
-                buf = OPENSSL_malloc(RSA_size(rsa_pubkey));
-                if (Saltlen == -2)
-                        pad = RSA_X931_PADDING;
-                else
-                        pad = RSA_NO_PADDING;
-                if (!buf)
-                        goto error;
-                r = RSA_public_decrypt(Slen, S, buf, rsa_pubkey, pad);
-
-                if (r > 0)
-                        {
-                        EVP_DigestInit_ex(&ctx, dgst, NULL);
-                        if (!EVP_DigestUpdate(&ctx, Msg, Msglen))
-                                goto error;
-                        if (!EVP_DigestFinal_ex(&ctx, mdtmp, NULL))
-                                goto error;
-                        if (pad == RSA_X931_PADDING)
-                                {
-                                int mdlen = EVP_MD_size(dgst);
-                                if (r != mdlen + 1)
-                                        r = 0;
-                                else if (buf[mdlen] !=
-                                    RSA_X931_hash_id(EVP_MD_type(dgst)))
-                                        r = 0;
-                                else if (memcmp(buf, mdtmp, mdlen))
-                                        r = 0;
-                                else
-                                        r = 1;
-                                }
-                        else
-                                r = RSA_verify_PKCS1_PSS(rsa_pubkey,
-                                                        mdtmp, dgst,
-                                                        buf, Saltlen);
-                        }
-                if (r < 0)
-                        r = 0;
-                }
-        else
-                {
-
-                if (!EVP_VerifyInit_ex(&ctx, dgst, NULL))
-                        goto error;
-                if (!EVP_VerifyUpdate(&ctx, Msg, Msglen))
-                        goto error;
-
-                r = EVP_VerifyFinal(&ctx, S, Slen, pubkey);
-
-                }
-
-        EVP_MD_CTX_cleanup(&ctx);
-
-        if (r < 0)
-                goto error;
-        ERR_clear_error();
-
-        if (r == 0)
-                BIO_puts(out, "Result = F\n");
-        else
-                BIO_puts(out, "Result = P\n");
-
-        ret = 1;
-
-        error:
-        if (rsa_pubkey)
-                RSA_free(rsa_pubkey);
-        if (pubkey)
-                EVP_PKEY_free(pubkey);
-        if (buf)
-                OPENSSL_free(buf);
-
-        return ret;
-        }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/sha/Makefile b/src/lib/libssl/src/fips-1.0/sha/Makefile
deleted file mode 100644
index 31556697ce..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/Makefile
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# OpenSSL/fips-1.0/sha/Makefile
-#
-
-DIR=    sha
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-EXE_EXT=
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST= fips_shatest.c
-TESTDATA= SHAmix.req SHAmix.fax
-APPS=
-EXE= fips_standalone_sha1$(EXE_EXT)
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_sha1dgst.c fips_sha1_selftest.c asm/fips-sx86-elf.s \
-        fips_sha256.c fips_sha512.c
-LIBOBJ=fips_sha1dgst.o fips_sha1_selftest.o $(FIPS_SHA1_ASM_OBJ) \
-        fips_sha256.o fips_sha512.o
-
-SRC= $(LIBSRC) fips_standalone_sha1.c
-
-EXHEADER=fips_sha.h
-HEADER= $(EXHEADER) fips_sha_locl.h fips_md32_common.h
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all)
-
-all:    fips_standalone_sha1$(EXE_EXT) lib
-
-lib:    $(LIBOBJ)
-        @echo $(LIBOBJ) > lib
-
-fips_standalone_sha1$(EXE_EXT): fips_standalone_sha1.o fips_sha1dgst.o $(FIPS_SHA1_ASM_OBJ)
-        $(CC) -o fips_standalone_sha1$(EXE_EXT) $(CFLAGS) \
-                fips_standalone_sha1.o fips_sha1dgst.o $(FIPS_SHA1_ASM_OBJ)
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        cp $(TESTDATA) $(TOP)/test
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-Q=../testvectors/sha/req
-A=../testvectors/sha/rsp
-
-VECTORS = SHA1LongMsg \
-        SHA1Monte \
-        SHA1ShortMsg \
-        SHA224LongMsg \
-        SHA224Monte \
-        SHA224ShortMsg \
-        SHA256LongMsg \
-        SHA256Monte \
-        SHA256ShortMsg \
-        SHA384LongMsg \
-        SHA384Monte \
-        SHA384ShortMsg \
-        SHA512LongMsg \
-        SHA512Monte \
-        SHA512ShortMsg
-
-fips_test:
-        -rm -rf $(A)
-        mkdir $(A)
-        for file in $(VECTORS); do \
-            if [ -f $(Q)/$$file.req ]; then \
-                $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_shatest $(Q)/$$file.req $(A)/$$file.rsp; \
-            fi; \
-        done
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff $(EXE)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_sha1_selftest.o: ../../include/openssl/bio.h
-fips_sha1_selftest.o: ../../include/openssl/crypto.h
-fips_sha1_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_sha1_selftest.o: ../../include/openssl/fips.h
-fips_sha1_selftest.o: ../../include/openssl/fips_sha.h
-fips_sha1_selftest.o: ../../include/openssl/lhash.h
-fips_sha1_selftest.o: ../../include/openssl/opensslconf.h
-fips_sha1_selftest.o: ../../include/openssl/opensslv.h
-fips_sha1_selftest.o: ../../include/openssl/safestack.h
-fips_sha1_selftest.o: ../../include/openssl/stack.h
-fips_sha1_selftest.o: ../../include/openssl/symhacks.h fips_sha1_selftest.c
-fips_sha1dgst.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_sha1dgst.o: ../../include/openssl/opensslconf.h
-fips_sha1dgst.o: ../../include/openssl/opensslv.h
-fips_sha1dgst.o: ../../include/openssl/safestack.h
-fips_sha1dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_sha1dgst.o: fips_sha1dgst.c
-fips_sha256.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_sha256.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
-fips_sha256.o: ../../include/openssl/opensslconf.h
-fips_sha256.o: ../../include/openssl/opensslv.h
-fips_sha256.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_sha256.o: ../../include/openssl/symhacks.h fips_sha256.c
-fips_sha512.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
-fips_sha512.o: ../../include/openssl/fips.h ../../include/openssl/fips_sha.h
-fips_sha512.o: ../../include/openssl/opensslconf.h
-fips_sha512.o: ../../include/openssl/opensslv.h
-fips_sha512.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_sha512.o: ../../include/openssl/symhacks.h fips_sha512.c
-fips_shatest.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_shatest.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-fips_shatest.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
-fips_shatest.o: ../../include/openssl/cast.h ../../include/openssl/conf.h
-fips_shatest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_shatest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_shatest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_shatest.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_shatest.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-fips_shatest.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-fips_shatest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-fips_shatest.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-fips_shatest.o: ../../include/openssl/opensslconf.h
-fips_shatest.o: ../../include/openssl/opensslv.h
-fips_shatest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h
-fips_shatest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_shatest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-fips_shatest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_shatest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_shatest.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_shatest.o: ../../include/openssl/ui_compat.h ../../include/openssl/x509.h
-fips_shatest.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h
-fips_shatest.o: fips_shatest.c
-fips_standalone_sha1.o: ../../include/openssl/aes.h
-fips_standalone_sha1.o: ../../include/openssl/asn1.h
-fips_standalone_sha1.o: ../../include/openssl/bio.h
-fips_standalone_sha1.o: ../../include/openssl/blowfish.h
-fips_standalone_sha1.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
-fips_standalone_sha1.o: ../../include/openssl/crypto.h
-fips_standalone_sha1.o: ../../include/openssl/des.h
-fips_standalone_sha1.o: ../../include/openssl/des_old.h
-fips_standalone_sha1.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-fips_standalone_sha1.o: ../../include/openssl/e_os2.h
-fips_standalone_sha1.o: ../../include/openssl/evp.h
-fips_standalone_sha1.o: ../../include/openssl/fips_sha.h
-fips_standalone_sha1.o: ../../include/openssl/hmac.h
-fips_standalone_sha1.o: ../../include/openssl/idea.h
-fips_standalone_sha1.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-fips_standalone_sha1.o: ../../include/openssl/md5.h
-fips_standalone_sha1.o: ../../include/openssl/mdc2.h
-fips_standalone_sha1.o: ../../include/openssl/obj_mac.h
-fips_standalone_sha1.o: ../../include/openssl/objects.h
-fips_standalone_sha1.o: ../../include/openssl/opensslconf.h
-fips_standalone_sha1.o: ../../include/openssl/opensslv.h
-fips_standalone_sha1.o: ../../include/openssl/ossl_typ.h
-fips_standalone_sha1.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_standalone_sha1.o: ../../include/openssl/rc5.h
-fips_standalone_sha1.o: ../../include/openssl/ripemd.h
-fips_standalone_sha1.o: ../../include/openssl/rsa.h
-fips_standalone_sha1.o: ../../include/openssl/safestack.h
-fips_standalone_sha1.o: ../../include/openssl/sha.h
-fips_standalone_sha1.o: ../../include/openssl/stack.h
-fips_standalone_sha1.o: ../../include/openssl/symhacks.h
-fips_standalone_sha1.o: ../../include/openssl/ui.h
-fips_standalone_sha1.o: ../../include/openssl/ui_compat.h
-fips_standalone_sha1.o: fips_standalone_sha1.c
diff --git a/src/lib/libssl/src/fips-1.0/sha/SHAmix.fax b/src/lib/libssl/src/fips-1.0/sha/SHAmix.fax
deleted file mode 100644
index 83bcb14126..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/SHAmix.fax
+++ /dev/null
@@ -1,129 +0,0 @@
-[L = 64]
-
-Len = 16
-Msg = 98a1
-MD = 74d78642f70ca830bec75fc60a585917e388cfa4cd1d23daab1c4d9ff1010cac3e67275df64db5a6a7c7d0fda24f1fc3eb272678a7c8becff6743ee812129078
-
-Len = 104
-Msg = 35a37a46df4ccbadd815942249
-MD = 6f5589ea195e745654885d50de687d7fe682affc8da1fb09e681540525f04ecb93022361a27759b9e272c883564223c5e4ecafeb0daaf1abce6caa4bd4153379
-
-Len = 352
-Msg = a93aed0fa5e163a82c9a934aebaab8180edf7de0b32f0fe99f9c75ec305b24609334cefa372c7c758262dc8f
-MD = 66a16799d606c569d2fcd70d7d8321ec90ef61711481aaf7d747744ebfd08ec2e7aead49429af7b4ceec6d8e147ed018e034efbe07982699e818db5fc4b1d71a
-
-Len = 1016
-Msg = 433e88eb2f8aba562d15c18126fbdffb81d5d6c9397fa052321f5f78cd629708ba099b540da5451e949eeab8687a8d6ac35c531411cb37144ab5ff6a7eb46f1ab28fbcd2ea0444cd87c57bf7d3c02952dba3d3987da07622c16e7c086d90e88ad3d9d4afee301d2bad915d868f54197b70b23c9fa385c443404fbc9abf7e6a
-MD = 790bc4844e9aeef8938df0ccda17890556a4151817111a526a88919cfb172f0b03c216080c1b60210eb1942097f17b6d0691bf5b018b6d959198d6a694b922c9
-
-Len = 13696
-Msg = 2c46a76a9dfbae1f5e59f085e9c3d4b600c24b2d404d062cf948e75a3d4ab5b137a31397be9eb34b2a03c78367e0b85448891b511ddee1f787cccd498b172cb7e656c044a03ffde8e42478330fbe9c34072a9e99ce31b41757cc820d98e7d564e06694b96b66f4be34c5eadd0ae4e61fe6abbe4d7ccee855104fedee8b451a7fcedb793d469b0094c0ed07c97fda00dd8c1662b44e3ee6775a5ef6368cb662d257be561a5967893433a4b63f97295036a37272176d081545df00852bc5c4162324161296cd51f76433f2df867a5840f2d0c8d5be00b4dc89443d82175bf69c3bdceb97facae2b2ed68e06ae74fef36d8bd1f75f130cba509341dd54079d45de22845cc8e77a022977c7540aa3e779cb1127f39f825d4d78e55a967ef45e7c1dfb02d9999fd15af2914ba47177177d94576f1091a0657d9e04fe81e6be7b631fc1baae66584c9c26ddbb568750d77555c927bcda1fbdc15c7cbe3e3fe88ca13ff12c59b383343c12976708c0e3dff78be0e286dd32eecf20b71a09fee50a9d0b13c85a15b320b162690f399282798aa3291fdd2f9c40ed873e829388466ddd1da42f2de16aaa9272ccf44790cf3c95382c304e25ae8cb2fc9d9869808f3ee7d42cb143bb0c3a55e03db6d1202ca1bdb744e448640c0aa60d3ebbda5c21e623bb080f4a073a48822725d764e51d415aad1d7c5a7f17433d15ac7d849f910c375ee0899f6a576dada42fd651343383f286009902bb62deeeb2514de6af7f09892c20d0b238f6021f03b62444b1e1f21beeb89acfcd7136416fe7bd8f202e76afaf5345311798be7cb25351add2bb044d2380221009c4d1cbbaba4cdc8631dc0144f2778a6aa1eb3d3c81df0b1b2142fce111af8214d049e40f536c5d462b9224a978e82cc6c420e70ecc3cdaffb726a183c793845315f730fa4dac9fe46e4180397107a6a051f7f0a58ceb9bf4df37e1a81c8e9569187228e8037df2e59c52ba815566768bedc8e09d5e7bdc9f2bff23aaaaf133bb5a3332750f6124ce185e29fda0851addfa2c3d52bb6dfb530fd4ee27dd5bfdce5dc2f41debe6740274bc651aecd4023b098a7d622e2296b50d51b79c4e3f521695a9d43f038e8f273405e26584d3db179e7c1758114a3d39970df674580bbf2884405974f0b9c4b0d8b3287a2314f3f81b6991812f354d655f62513c9551b378cc2efa4c3e08b313c56cada52217fb6112eb8299b28445aca8f72e7170a1cd8bbfee4d2145fbe8d49c6af8831c4d4fc7177a50ee55a7b484261504af946c6bd5e1d6b89092f3c487c0568fa07c356fae9b8e831b8320289039746a435b122cfbc4a0d316bf90d481d3b7d979cc50d98c1190af8dc58e0035557dd5e94f437f41fab513202643a77748f76c6b77302bf40c392cd18731da082c99bdedeb70e15cd68bff59619cabcc92adcf122753c55afde0817352bc247d1170b8ddba1ad1b0faadfe0efbfc5fe6334377fa372c3435691f53dfc2ad5e08966b2d3525b1eec2d993a5cd4ff34278bd40dd80313a0727d05e0a932156152f3e11a190d8d69726f5c57d20f811e1e8932e86409ffdac96c6251c2a2976b8757adcac5d2de94931d1cbea866ec8bcba5774f8a7fde792f6acfd0f01356fd66fdf54a416af6a9397e00f848a2e9831627cbcbb52b5a868ec174e69b4cfa1ed72cdf23f39d7eaf4bdb318c188b1f0fe75655e34ad71907cdb77a1a2b162cd7c22d93dc45321eafb17cd60282e83736267b3e1fb249c307d49509f50839942f0f493afd9ef37db053a918e3ec83d801bbdead07554a018b8ba348fe9b7dd92ea7c5fc0e65a644ba19aa1fb6c022ab768ec7cb249ba17b9dda2860bd4aaaa3dc70ec009804141ad5ebc61203658e57a0887ec0fded18d844a96e79ba7e879c4253056f23e205a80ab1471953438f85848f4ab31ab175c089e0bbb97ea0dd6a67385770356741966053735e2cc2ecdd2c8c75cc045181dd7267584b901674b553082b2c58fb8f8be0b99306194a6f069f684535423304d40a268d55784a14260fa9c9cb1306b82f91cbee3c9f43dea9e50903135cc1c6505605a100bfa28564a2057974eef0852b7b72ce264815026d0759f691db618ef760edde73ec888e181403834f7221bb27a69479ec9b28a3fb0c3f68d4467d25712fc48ad78763f9ea6e8a2e85260225ca1b1a38b720e589fafca29f07257c5467cb74ee53189b8c81b784c43e93f98abde1ed53af60b27b13df6ce45001c6e1813de3521028981086f7d88ba13f6fb1a800f312fbe2f842eebe847fd760c394668cfbfd353ec14ca0366eccd7b4cd63318116bdc42e20a632a0d2b8c5cddb37bfc0a239ebe3800a787d2ece077a7968036b3d9b31cd906f888e3ed742cd769033e2c24c5a9e3c10b6d300db5a17dd88
-MD = a86e07bcd19080d4a83e1384bd8189f60a7dd7a6998406ade0bf03f805375bd823c7656dd51cd9d63e542f8ade41f16d73794d60d0906424133778156ee54b95
-
-Len = 100816
-Msg = f8ed40e878dc68ceec52cc8e2868722310fb117ca3a52e1839eb85d308b8aa00ed0bf0b76aec8a70eba4f0d14d2d85c5a0e876ce2c8ee59cb36947def6c40a587aa07b368ca8e8a08367018e45b984de0d7f1aa46b977cc18c0cd9b7bb897cbb2814aa0ce8f8c9843e03c86c19f2ba95dd2ac4a466a93aae4b3b05055ff148517ecf43e286c57744a3e10a14d0c26e139a503e7927aa688c78609170ebe3b54104390e5f6cf538093a67922e7210e77fcb584ec9b6844e829be246a266460cb442bad52ca47255fb8cfe276108c36e02f9acbd3d191d34b93d29ec40d80496d1c1bb5ef036221641200e905598c54bc4abb3527c5a5f6258e59d4bf54a0498c108a2725428efc2047e0096b32dfdc6ec69d5d72f81301f881ca62a66c22e5dab9fd9d90084c0a36b2f3a0123cc5327a3bc7a12fd947ab57169ac533e4b6a2cb80fc65b9b527cff9fba26994c7fafb5102a0acd8f9d246a3a54178c23eaa04c0fdfd3c0cd980d1fc7a72b25d74df9b95c3dedce8ca316870c654f9ebea9b806da9767cf40605a4b0c7fb06f6b3f197bae7d8cde9daf38530e25bc51b68f9aa23ec0e95199b14bca96c91f3db15bf8432f714dc46ac87218691bc66cb3a42f6865e1c30f8394c8e68c0ddf5851ab7c5906a1994a9af6ac1c44d0d6b95ff15d9f77825ccea40fb9e516d45888f2378e045d95d936d541cea9c8ca52fe5f7d0d919b2b1c59a42d06105ea4f2943c05178e59d67351c5b2c0051c93a4045e512884fa656b772cf398af89081546d920fd3d24ebd16310506a786ab33293027394c1bcb7b1efe46b550ac28529646e8d2a5ae65c59345e24b44cd7b06673f3ed3b9008aa568a739c26682fa596b7a655842cc6b2758b583487c78d14a76bdac7033806c5c210828ef313f8efc4072681f5fded748c31a58ac933b4665c445f07d603e0905e49b84aa55146eb1c1c99196413832a05efee2e64d6732fefc629b79b37bb9390fcbed7226b412204bda523b8b8af5c4a8bdb263ef9f3f6c7b9e1de3a1dc257c1f33b3d54a9101be5b4f2a9db319993c2cd137c41e35c434ce52e859afd1a635af4d8852252dc5e28c729b2b4c96a56d57f3f3854ded59fe612b9b3a51fee3fc1c83db673b0cc7433bff2472bc74a2eeb6706605e308690fd072a7042ca6474603711d8310909e47063f46f287260a26c4f11fe492298a0f98d28c45948a4899e08fcf443a6ba36457dd8329314d53ac0fd0819fcfc3357426c5bb8d3dfd706e205a81091cf08f31cd3459854f3d07e503991ba5f067e3c406c6c5396d8257496f4ba3703cb1ba25c2fe4aa54577af782cd57e85a88a2d75c54039e8b7bb559219edd6e81e41acb6d575d6f798afb2cbf7f00abd5c9c7b0fceec79f9a0fb040ebcbb7bff3602df7b71357efacd37aa57019350bb81213508a006160acde3dae5c42f03141887eaca22d7b33d6791febfb619d11ebabb13e6c5378e9a72e852ddccd31cc53a43275966b7042ddc51485ca20e1c456dcc7020cafb5407548b044d332229911fc74d7fb97de25abff7efb431da82de2ed7e25d0dcc06ffc74e57ca93a6a9f64d76a5c39776fe2266f88d6d0229b527525fd2e22a1407e26f94c5bc6adb1e7327f3c8bb8d4c983385c579dd8f5623df8cd6da569c7de73d9210e6b9253a177653a13ece075940fc81016d8c35fa4f6542df5120c174158ff32533476f4e059e35117081a24798fbdd1eb10f82809836f8dbefe755611347f75423dd8571695960c6f66cca71f0a01e8fecbe1183bee3335eff10b4ff8104132040e2145ec3164b2448f60c730887b9d7894e5f7df3f876cb17136c99cf32db1c02fba860937378dbd093c4c5112133781f06c8ca07c527c2c085e8ba5e52b399f2909e217aef6e3035ecafe2caeb1004069dea023af7eab873deb5ebcef2313c9827821bb9f89fd3d1570a569673d3ede86a4fb13dff242eb98450a8917fd8865c56e0a9f11d72394b79808b0429f3a83cf2465161596887fa2d557b367a1de9c7753666b0cca9c30cba9f0a749c03c55cdc7a6d45852c76ce2010de3e7f75d95228efdc79949b238d90b25f983868b7f07f585f7b00e45d9e132f3c09ee84f794d899759be3dabd46a256f4cf8da71270617cc2425b24cef25d1d2f3945afa6f81abfccc858cd02e05619649b1a5347650934105c02622d538447223d136a8a0455cf3c6f61f696b32266197b5cd1d936fd3ad4288520fb4a2f59bf95e659f33210446ef18debeb679dd99de0c3c74a6eb3dd783861f5db4e94a151c42ce27519d0bbbf1f3b1163563ec06c8bfd881d94a3b896fc07352fc97ada73685588a2242da1b718f81bb1077bc70fbd58b8b52163489ae403838b533851bec30ed0ecd97d72d1af534f3703db59f1f563bdc39d690a0e90e545506463a37e84974fd7b256bbb912cb4077d3e3f5bdd4bd2bab713b696c830b1f2185734c4d2dbd49d5372fe8b813ce73f5e01c36bddbb376ef4541033f2b0355613eeda8951ebf7377e08f967902eb7e23c0fa798c6ae52401721053f1095cacb1e9496500e83c412236fc21566090b3a3eee55aa402c0b774802fd81c9e8579761cfcfdfb1aa23786b2dc35dacd5ca8d8d283369f53e4a5db18060c2c6b0c303052aeeffe169fcaf7ecc63090a9ade245045ab9c8aebf738772297caaef5f857322a597846c7370083d409df27612e47b0cb240daa3cfa51c57108612ac0dddb0f59791289ccbdb3a2cb1fa9ac31a23dd5440682fb373bf0c1f41c4fe2185ad7c53eb69552807410053b0c2d40132250e637b8c425e6a35d93333b5b7d0557927b6179c848ec455fd1ab38348c0e96c60b2da49bd15118df64b6ce4fa48fbc555a4b2874141718e731a40b85382ae6e86ead31cea77f83bf5c063bf1febf71688a832d615e09d6f14badedeaeb6ffbfe343fc7274e78cd46a2aaec0a349c5f133291ee57cdcb65c5474e46294de6bb50886bce6c6f44dcb95f2a4761ed2e6c9e7bfed51e0964afab4e0f7e0b07960f2590baae66b1ec9a63ba0fb6c0d27e81508c51487dbbdc9beb8879fd58c188dfc774b3d0ddbd77ee8bdcdfa0ed8a9387728e12b13e8b3c10cc1c132bd822c2147c5ddf9a993aedbf78ec256db1be76644ca8ca7727208bf89732657152d34e948d73c47561d156f773136684d4162d02260300020123d13a95f4f835907c344942ddeccafe2abb7dc4792c4f1e39c24748c63cba933b16be0b8853e058c47a1ae2c4dfff39ec2339b345fe3557d03c1df91a0607a711636c4416ffdb73532aeeb74f237ed8bf971388a0659e4682a46b8327e751034cbf2c87c7828da9d24baf07a742ada34d1ef38ab1e8f2b4f801192c146600709533e61bc2665dc1e9e6441bf3c4f6643bc0c102a10f9a69da5b0e3d0a0c7cb694c682493032b5853f02953b5c2fc0e1348565389762fc2dcfbb34fd305f2d9df080e859396ffcbb7da78aae0a0d72e3de76c774bc6a81c87f2872b6afe97ced5269009304a4992c4add0bbe24e57632e19ad0fe37ae910193aab0aeae32cf6d618ab33eba59f6a04fad00b1d2403396e6fa661d31b695a1b349d62f56c08fe6c6eae7a482177adf341e51d03ea511d7959c721bd20bf371860ecd7fce1d25212891850b85648db0a039e6638d9c78bc958add3e41341536b5007be63fd1f7e3308876bcebcb97dc3b05a7b2eaadd00f8fcc8dcfa7b961bbe727c9aed1626ff786d6a0ffdbd1002cae8a7d047b6181962a686c152b2341c7c58c9f1dab5af424d183ed1c7d003165a1d04ea3683ff31a0f68615af6f91c21f736e67df641ed31b998445afadf9052bbe004d5dad08f62e5d353e42fc35a92242d8414d99dc4e7e81c8c027af686baa5c185e3f99abb3855b22cfdff0a62e2f47a632b7df8e00e0317af5c24ce7c64077bbb15ec27e062070cd3eb8e549ed9112469090ad9a96eb59294b021eed81987178cb2dcff67a9a2e930f6032c753e203380f8a7c987cea393234699de03a1d09ce204f0a8b6d5cf522b6887174fdbccb08f3e7c4fe2f778254465b32766c48812a45151ac37ae354dac87419f9476baa27e24b2f322b2da4ddf579750684a5881bae2269351fb7de59b9d5a4badd8951135f2713dafc57215dc626ee170fae7f20bff98e36b864e1fe0f0f9a300c903069bf0e0b6f2f8e78423cf6063e89dde6c81efcf26ef15510563c84730f611ac879a6628e55115e1a29de6945d37fbe4f803fcf2e344712d9e0d6f6c79f8773a9f199b705235e20a7830ee3357c5dca29d7a6c29a3d2628bf2c42c8f076cc4525301d8e1860729070dc53164d9fa08bf63cc889eed01b0130a7146d860bbc09ead3865a3082db0836a45f5506c3e46e452e298764939226cedfd06700e4e33c6b4a78add601140249596831e97f960b973a4e4dc3fe2813fa34eb47f998ce57270368fb81719a09298a223f7e3931ce5cdfab3f658649533354e982c87dc9e49eacebb5bb4af9a767b4f1c03d774431168cd4fec1b2726f1aae3f9a062a825f3295557eebf3af4784487b869fb049de44d03fee71194fc200af72103b157431935b5ab9bc122773ffd313d52d7acf1078386090fc011de695e71567cfd51c06317d4ff8841ceeb74ad35f4e5f4d20921123cb88bb2079674ad39e133cdfd6478d69c9bddc7a818be5d7b254bd9e0abdb030f52846fdfeae8ff370a51a9c5f6017af3c6c3db17c5c614ea18ab0e3ca0dd5de621217dffa36e5c5318fe191040a50cc3ca620683bc34da6c142e1c50afce28a86b8b66d189adcd755561a647080d93f3ede1cf54c3afb7e863fc8a82a2576d3f79e9b2bb634e598507a3d7d017e0176b7868bff3a3dfb4474b3ce03c401f33929364e727fbf8096b77eb351435c7a113b3215cc6246dd86f1517a7e550cf828900248f7c1754e40fed62477b296a37d3e53231360d012c4908b466e49b0e620c0a5031228009f259b030956ebd70e49357c3c3ac2842b6bd6e3ca5a3e985dc03f7105681fec03b320a7ca753b782ad3b52fd9c8e3bd980b48dd6ec8901dbf756108e85015821c880416e0693e0479cb31c0743450f6d9214afabc4feadb9bcee9def460a58d3a02d9e3039970068b8e3fd0a403a6ca7f2c71ae2b46ab3c731b1e65e2104c47fcb1f69e7c8c6df8c09b33f2e1cd4192faab316a44536dcac608832019f5765cc5240eabe3c87445c980c299a5e7ae0acc2c2ed19fdc8f011515bcb00476b03633c7669db1b44f97f6cd402778e9687c740dbe5686789b79d0b13f784a2a866eb91ab2d66f064c49e8df513ec348fd7272ee548ba08e1f9f99696ffb53677550d59c67f88404f6e610455a422d9cd987493ca5c366a397dccface2bba8e3e99719dafa768956cbf6fd8defc4104b8925878716a0514f70cbf3fa2c2bc2f66fabe654eed3076257e71117665703eb88c79e4c2b94e8e856e7a6ef90ee2a358409db78b98056ce1750eb80725d70e35507fdfa5933a61496ba48fbd5555717b33b59d4ef211fe096aefd478859ffc97a41372023ef114adcae5a8d5e03c21369baf1e7f417cb40326bc6db1cdf0904651dda3c1039a2f1755e7c329f7c03bf33f324206ce6e1638711c8c9a45f153aa1f847cca2a5d3af1d24fe7a1e1094819e8e712cbe10ead1012b7371b35cbcc2bd5b10505fb63bea20ac81d25e83ed0105e7595b6c28400f4d336791ce4a584323d0b455bbed44392c5f86c9d5287593f6986d4b0b8f9974a7a4157859ba801251d3b44b2bad84f29cb87dcf1680d6d10d1bfd59f0c95fb7bd07fdb3ea2fccd6e3ee80af438956ccfe31e750972f893ea5dcaa26d077fb3f09d990c2f41c8707368bba007803621ecd76540cdb8705435d74f4300eee04710a936f241c034709e625b0dd5dae1f6e86d034426819c365a05f5be420cdf4042bbff965a666a5756f67259448ebf742b6ea189fa17a4c3bfaf651d19a8a525f09d9cff637c8fac02eaa58d3ee3f7221da1e61833c0b183cd9f47686f09597e8115b435454acef80c079eafaa22b18927d07bf8b7c5ebfdec9c42a52b7824d45decef41e6184dc2db1505ca6f94172fafc10731706e79b9856dfede353d2eadeceaf72a302e3492d7dc81e3777e4e9e1f3d33cc4402833ffedb241a75a09e9495d671f80ad3acf06823bb04a92b815edd0ca7d01dcb3318c1ae5c62d3e99c0ec37908b45b51dd65f6b45b34ede2d6f553f60a45e20fafcb34ae4dbd375f52a5db9c62650deeee78e955087c2bea75ede7c304347b171fe0c1a2a033894be6e04605271307f307b2a9cf6ae24b8c87ce033a3fa4cf2bacdfcf54fcccb1f580476c7d00c631a8529a9eea2a713610341e0e25609dc8927e51c58a0a9197a54963b5cb95877354f4b8316df02ed2bea367704a12274d96bcbe0d0d728923a368bb8ab98d5db5401894c822632308ddfd309071fb4b477d8eac0ea5dbbc3e3606d8510d9051dfb5e4b7cdcf2c57c1b76902d864c3109c901da53019ed33cea84b407490486ad9f980a8a63df3d2e3921064afea137f35179130db3351f5bc3f5e7d590a5ab08b5415efbd345f9d57b71ade7dca939efa5a12d677b9af0af14468176a43712bde10cb15787c18bf066eaef8abcdea77d3a0c61d6c74ae7b54fe90940d0233e4b874c9a141dcc740d7fff43b9fbbc012a933d890232cf74fccb7ff7eac1148e203c7381b7f1d1429b1b1152ec25cbf7562596eb402a9328e43b5dc5cae36592da5523f0b9907a6817ecd395a7c778daae85bb11372b20641a04250b77b3a0ece885d07faf9622650259b874536d6d2b92181c834dc111b6fcba483167be40ecc922fb87006f63b9e8e632879563f37a8f712db9fa68c1a20ab239c0116fe022fad1279f3288b8e74a16d447e467b6381515814dd3aecab5c2a09c400b44e9100c04c720dc7e8c6d9460002da6c52004c16999975fef8752c2f9c229cbd9e6446b226cc454bd68cd665668a17328bb30f301e92ef5c7a2197a326df5c99b422096de8af231d1d8872e6e505bcfff026d4862f28d4bb3856a66ced22c9b0587451d8da4230a38561b5b1c69b523a4701a2001382aa82fcbd60733a14696a540227db44aef346d6c0a7ae5173604d59eb828614cafc1b8cfecda054dcc7306f73925e6d1af56ed74c51c6cdb66e9fee8d7a0078254fedb0c0f5dc85a4686870709b499eafbc8451aebadf848b0598ce8f955688bd2d6032abe10d1391d67c20a049841f95d2ee0c8deae2bc1baca0c098d8718cba1ddcd968981c47cd98d247aca4f838f3bf16d092eab8be8deb1f8d504d37cc44a8c96c9f22f2698036d4ad3bb48b31f109626565c147d20a4a7dfd61fb918f81548fb4f78875c1d138e819f6822651b93a3c92ad77793fba5222d870ea671f9cac967919d18f96e92778548415b2e170d90b201215354fc48a77e62823a2c2bb354782ad052732f08beb278f751529416f37d83ea26248517ae2ef2ead28c1077908995a2d25db0deaa957bcab39715283287fd626ea7388abccba2d90e364a7ff4284c84f70da68ce1aafb5be0401cb9d45e085aab41892a49e10cbd5baf2c34f5e0ca076f2772abea6f622b66020d546f8c2f134a87f96edbeb9b08394b585f2c2f98aa792f97b43b5f3aa9c34189804a9ecc2cfaeefbd0f967d85a25bf3136fd8132dec38aa82e4af6ff677682f3b62be27a180aeb22f918c24f23bf6f5954e0722324cccd06829fc32ae4fe3aee6e5a03b3651900e13fb0a759e544d033418b6ed40d037b4549a0404792c8fddc317b7f028493c4c91d6773932f8486417544f3d007e5f9e6fc02fadff175303f77f6b0e1f709bb3d3a93b38552ccf62688a39da1a602dd5e122e6f4e9171769ada5255cc5cf938dfefcbe3ab0faca434c42dc8c357e89a3d1488fa3df35c3580b124ba3bf6d0d203d586707eb692150ed05a01bf9de5c4e67bb948088784016394d47abb853f2b6b643a066ad81bcd1735aed4e108a8c1fcd025b548de874eb60de7f3c568728959147d1219e4b830e06ca2bee1f8a035e28a54ee6958d4821a84e5d1e41139905f7ec60fe67ce5f4eccdcc2c3d1e4a753a32dd3004970a4ff3824471822fe2b5010b9b6c6b01336dbf0181a95cba2624663215468519871cc39e8a7f4a151c8bd03363b402020f2fb98069b2cb8cc1b7e930938e7540d95d1d223e47865135793f9eb573660ff79f7ed2fae503e68ba44596ee745fbd8fa562c5c666d174cc01b1961736e18b8b517161ab9c8058026e0ddd6c94aed0086a26e1b959a5e05eb9d8c1ff5b2ef518ca23b4f265db61b499a48cc46bed28d23ffc1e8d9c9e345c06079ad47c88dd4e8e286575bd7f9420ab9c2d5c6685488b8b34d4c9ac04e1427ae0994cf789b48b01d1db9c2fe75fc5187727bb11119f82d0739ce4048467a08cd635bf78cc1b6cc9c28fdc199d351064a81456f81c9e56a43aef7332973804b06b18a26caa62523a7d0acc272ba49124b17bb68800d5756afd34ddb2b7e2dd8a118aac3fcf39d9f853c4d2c4fd3ed5bd25a6604d68d57db93d15aa1160f8a97e6c24238e84f272780966867f9c644ca2775cdac4af0ece036cfa6ebb1cd9d701dd7daec5763c9a4de0385db383a5647918e79c6a6de1f4ee1f6b722c561704c8d7efa4710d78dfce8ad2df0d3d82cbb59cef0bcb001f70bdc6e17af1a720b117fe02bb1dd527b18e6bce70e9447cd0cc85cbcf431fe7c006f5e4ef878a974a93b25f492847c9ae020583c9d412f4124246164d8f080b615e2eee267a7aeb5fa0974de52cefef23cdda7b305a33a91e9b50471ceb72dae337c485d636e28d6ee31f5705983808b1567d4d4ae820ec445c56e6a404cad6b408691475397c0dd6cfad232106ba96e5104052700a653e21f9ac6d79578a9f52548f426a1e81dd45bae30acdd4d22a2dafd633564d6b2f45e7d35413503c955cb0a9784b42ae8c2a5933a6729f3922f969a158540dcd201ecb6e32f88b5b4921914a2e8f424c8b031f115ea5d23a21e6f22439ffd7e5d11b08df729f65613b4f6ad3edbc9a066a5e712ecbddfa6fa764cdf170c0485f82d924a99b7e7ad8dc44c1f93e49b6469a9af3de5691944413f1417b753bcb84d5b7a34f362c383cbc802b0c88bd23a7ac471b9287571c42081b1134bfc8ce104a550942ab1f2a074cb00a90558d6e841ff15cfde6951f03e450a1bfc90dec6c513fcb2692ddccc31d22e5274d41036656183c72fce208e44920776f196193137ac67d6d65ce9cfaae774f23a86e6ee8ff3a4e9422a4667d971906e5496a4e80278774899c882708611bad282f6c1d666bc5e7c40082b43a6e98d494a18e9b3cf7f154fdbf90d786e59e83b72ad0ab893c49aca50ed37ea5202e650fda54f5c46ca2a35c476f4b009c5e6733232275abd1341199b63d22386c484cb95c43ea90e609c407bc79ddd00609cc2eb0d82848db239b249f164b7ea384d0239fe1e64d04955b9297472cafa2ff272c5c78100aaa86cdd8120556f25652a3c12da5853338e3be8f505d93ea03cd1cae7e78e95befdc0e26b760d11e05403c348e0523fe036381408033c009a8e1f117af5100a6eb91f08307df465c20bc1dd029875ef7e49338689f602d98f2dc690a57a6f2864e57098f8bd723574944ad3688b292db6d01387a16493912722ac8f91fd12b748899bdaeabdf0479df788eda440d7bf30d1c25d78d757f00b74bb556506637fc1ab87162f05d464e63a6272db3fe56e9357275035d6b6bee32bd92c4a1dc94778551e94ee1d8854f767bfac3811bd0287672aaa01ea18c25650f05a68cbacd9158e479b508e72df778589e1e03dc543b60bb3b10399e5c50de9e728e69774fb3f5fea757ddefccd0f9da75afe4b67f9c54aaaaf646e858fb001a6deed0a8a769ecef0689c988de566b6015fb8c40aeb5f2df7ea4bee60e8e69d15c4a4aa5411dbe63fbdd6418cf025d87f37362f15e22aba83abe1a3de9857c71c2234023b969eacc0bc526363b7f30b092ca114f2a6cefb34394d146866ac86a33fc497a8cb8e2a5bac398579ff7958878421fb08fff4f8f3deb8c9641b8de392647df3017a5467f9d7b23036935ec6e188dd6dbfb544b8a9e04a4b3c7fa1e4d1d9879daf69986b8083e6eb023a4b5eff80fef17f8f65433c882a21565a919448e6091d1b61013fdaf9fc3e45bbe827c9b4ab10b05600a1961e81d31c7404f8e0d32bfcac2937eaed811db167dfdc29286b0d51bad2bcdb9dea76eaf495a31a7fe717c1c98be374a36271cdd06ed06c02ef4c3c06cb42f73b3332ed488416010e6bf2f4dc4dade6e2e61f19e9306bf941868f59fa0939005743dd647f0a04b576a7e71d4c383c479453501e18ec56d7cb79fe31ff534afbd8609ed701ef163f9de31bc58114399fa0f22b62c66c380e8a10c34b7e731df2a8d39dcf36fbf3a66d67b973e3a94bf6ee0bd96f5c76baa76492032fdd2f59ecaee403d486f543f2cd7ae7b0dabe1b5566e681cd40d384a94349e9668650a6f2d2daf86c59a7b02ba466cd03ce1d50c3f0ca4c02dc4b3d1c0e7b9a77df9eae0bfcffa32117d7e05adc7195f4278c93497401629897a58d08ad7141ea52e0163f14992d7a284e7b875ce4640b4dd48ceedad1ea17d8ab1e760773044845e0899602f1bdfff4d42ab80c0765d1a8bde2ba0a830c050923956d06c80b182264ad19ae4f7c39e43195f7d421bdcda00e3eb5ec5ef2ec91d69df691ba7fe250352acf01fa92af5e2c634b9c7c97889e9147e869acc153d88cdc18908f882f371ba9c1e13c26e9cb8e3cbd4c5e1988080ca65a67b3a4c3460cfadbec904d853fddd2f5375b6070941fca53cc106b5748480213cfbdc1c34320a0478b05f76fd0454c75eca069cb1fa7b21704dab67dc40d041c8a1040db378e76655636ad725219c049e6536982d6ee9f11dd032280e622547c7ff44a938a1f233c356a98182d22d5770fbc871e20bb37483dd5d6ea1551993b95b30774a49b50d411ebe0e8c92834094e23ec2664d822c40e96fb42b8607b62b6949e05edcaa436d0ffac6a8ff384068acfc0220c0b098d368fb8113918a4f8c9de37cece74c8695cef2427e54a6e77ad092a9b7f1d94ac9f0836deff41b905b5dafc58ad6063759b0372a634f69a639e19521825d66a282f489c3172a3659264d0132af3571e637782bb6fe5c0afd24547612166fd3409d0991392fa054ea5bd07a4cd0921a13ad7b62a0b5e6d56cd8adb7f3eaa5c99576941c38aff311c49a8c9d8c755869302a2e5e40109c8365a551cd3f859b9421be189d3a0e9ed78830d5cd6a2414e9cc4c25814d94d98f8848e5386d6dbddd65d22b96c5d20020a5dd409c7e5344065871e57e01c91a443501dc8bf619890fe231319b5480c3879dee618d319962596539e2970513fb5c0c8eac3a71ff99962779cf1d7e916566d0e29d121c5cec5d7302a18ed00be9316f3de8c669a64c2a960a588f9c8a42690f6867cda7146e8ce27aa6a7fb27606eed9df6a235a42d17ce71627446e206e879de56025a66556263f06684dedcfd6f083d6a707e5fc8f8212d716e062f0f7fd0c2fc62bea93d68581265a803c31cac3f8ac8939c5f8c464ebd19df42c7e8998494af614c8383294f3f3883f2404ac10404759e182a038c97aea04a85530ec005e203807c5bc30fa9f5339b32fb0427e64915e29a25bb25ac60b92256470e7de5298d42c6b88995f8d2fb704e49d55b66b71e237af90fcbfd71d9093e1a543da2e9911ac4102346dc4704859cb33ac5f5dce2b3331a9dc9fb506461a5436c89bf90d39afcf93cbca4cfc35da6ddb112243928246ae0d1ba269b0fce0468d3ecabbdb925c9ea3241e2dbdc6b151fb4aa724a42f98b0248171fa01fa103f116d0e7deb65dc359b09126f9a420300fd209508ec7a50be56d5b470e387d0c52a1d104625f9571ce1404d1b7af3fb00475b95f752ab96610be112d33ded48624015781e7198f4dcdf917839471fbedb43c34efabe09941fab6b342cf672a29dbb1eed0db788dbfcfcc63bcfe80f7718571f691818dd6f839e3cc282f85f03fe0400171cdf1235049fa53de7450b4c40ed398d5a486f52124c1c63de2afc950e81839f52d17e2a7d32f82788465a65da6cd763c6360763561ed2bf47749080549b6e2db87514e1ee1c85a0bbd346eb6e3cc29267cbedcad67a287fc5be65ec59ba8b6854b31c83dfc5155187d4150685c5c2c342ed68b01ac9e44b60f0c100a347a0f93074dd37d8956fe2f43110dda66e9f9e6185c23dab74cfca21f3ede4bca87687549ea02662f45dfa0ad27f9959a120cacb7c419810e1b1a50fad31c12c47d5bbc61bad77044aa541d29faa6126c60ef088b82eead17a52843307d4bf798b853d90d14c5347ff10615381d85e964331b7a123d15a77a6790d93e920052ddb4db4baaac5e2b27b66ff955e53b8308151c81da4711189ccf0eb393c5bbccfa1f6c94a8d5f4bcd266fc6a12061967ce836ca042257368f567dc42de6ce0be84449234a6163b72069f25b7ead4b2003e1a7665e87ccf211abe94175d1c11bff2c0b6bc110194d34aab96934ef59804cd26e4434ba166d9833fb091be37b139cc10748b881c93690528a96ccccd2dbe024510b8da37dceab567dc52706461c486a0463369cbb99bcca2e8a4d2e005c45401964722a4b3ed37c351c9f21685e8992c9634349379f41796deebffc2928058c8ef6ea37c6e4970dedb78d1c2a00ea9e1ff1e7708470a6c60e6a2b1e966aa872776afdb238e97f716b3df8dfd42bf0f7ceb52bf9eb33731bdba5987b8f48b4599d67b383e77413107857e951ae0625059e5616ccb41131df9a480efd5beab3a9c99615921caedc53dbad675c00ba1030577db1d22731677914fa958b44792cc9c19e2ac71ebe61a05ee67ae7116e39e1c0d103f18bbc9d531164360d901da8234d29fb0b37cd2a60c7aa2adb2a4b297ea2fb14122ad95bd4592ef86c88fdae1e37dc8e44ad03c0fcdfa3801e93796771c5a2ec1e4ab12a64b3ffe48e7442c6224661ed5cc987aada6e778399941f7b20f16f94fb346b916be87f005c9c13789741602039d38270643cce3c347565eef5ee09139330301951c15756be47994de6f1802dc5131b9b011051b1d87d744756831a71cc8528487f032fee9dbffccc751e6a1ee6d07bb218b3a7ec6bf5740ead7a47b6907d7aa95b79aecedf4a637ead8fc6fb8654c93d13ee79f5d6258dcc61993aebc65e4fc14eea7d006e31f6e9f60e3bca8ce52ec559876fd20255e507daa99b185671ce1ac11d448c30bcdf97b9617195e0ccd2d15246308dd6cda74a8071114327fe203b1adbaa780f3243105c5111636a51dce966f5652e39d4f91abbbb4576234d6cacc3ec57cef2dd4dda49a6c33d12bb7595fd5ab5bb15b40301f34ddfb831a5dbf62218f496c003227fe6282e2ac054c45e7f3fc93e51b3ee8690f08612395095a0a12729d663eded879d9ffb325c62f2cb546a48bed51ae232fa6ce28a2494c132a6e09d98c2e3d478d5d2d15dce2e2665e4a3db448931068b99899c2bd8ba87349b0cf9e3c52cffdcf58a59b4fe0089b298b42ad7553f831bd60f5cfa3e09102fe773e4c05412973a678f3b3ed420433cd664dc7f218e816a17c5c9013ecb84abf2dd073557dbc41b92a91e0339d57b8b077a9a44d56427fec5748c47c1460b2e2412094db6d0ad06dea0aa0c1368592594bf0b2f590a9d6149e44dd4adc4cb42e5d9940d59397b83b33b88604c210694e3fbd84795c80c1b09ddb3b1ec8bef6e9dfc4d7f295e551a79436007ca48aa605ef5a89571e59cb26f2766e564e39d3bb441deaa0c8664549881d90a77256c0f6c77241fd6ab74b0e2890f78ff16fd2f9271ef96ebfbd0b878ba9c703900752b7447f4efaa60bd9dc9cd5673a36b39d49f54274caf03c0cf82b95141fa20ed3ce02ebf0dd74d9eff8eb9e2dd3a2976b244b12fd33ee75c1f1c459f86a1cefbc817f42d7f43ba406098165cbeab99df4fe751ae3382efce32af252e461652c7598161e74fd8eeca474fab6b1ede039935f2fd4d7562623b90a422a78941f47a76863d95857c33653d1b42b806bbafcfeccb7bb4a0c58acebf6104b2570afc3ca88e4fdf2719cf39c964a1ea7d2ae4a7fadc938abc95adac495093f6b959b1347501606b3f960b6d739291aa8c13eb49e98b0f78d2b91400b6d8961cb6165c8b684738e4d4db2f2ac30ddaa03a5e0cde4142b625e81907f08c60d7cb5729456806c89ff0efd08397423e44738ff38f8e88684f3a099dcda455521caca37ab4f4d9ed5d37975d4fdd778b97cc93babc804864a35e3a2db04598152e67a2f1f157681c3962d46ada23ea5d9a524f9cdbdd08a07a3a85b1f6fbde11d5a35c7743b83bbefd19aedf6d92241d16aeca7f33cc51839b75f111e8edaeaed808daf2f43fdb3c6f032ea45052ac31d4870c4d0d76aa75d0b88635ce449054013f234c4a16cffc58c95ba1cb8a0a0399861eecb1039bdedfab4d05f0270c6b16f03f6b8e629f687f133ebf2662c7f930530746679aac2791f54d6a95bfab5be0c33739074ed4e7ae88dde4a8036a7d6095cf41776366b6ae3f8f4a0734f48c275e129cfffff5e0abd042f99a957bf6f0f47fc7288750f4fe30198f8cad7067b36cd87ebca08abd3f9475e7443f83cca91a1ebfc42ef3494871f51f6d52a5524b9391c687571be5327c7c94ee2a096653acb410917fd51e56a92be4f24c1db6b97b465ca84c31c04c2f61eae07e952eb6554aa4d8a380d9ee81c1c462c360fcc3cdff2867a953b655562cd06162af8b99bbe662e0c27ce4d9a1c1a907def48a3231c2110c930a2f1498e32dbbfee0e5c5869332f3024fa5dfb0327a27c663cacd4e9902de34dd93529e90eb347bafa5035f56fc578e8386c7571d1f0ba335225ecd8be026b4544ad70f3af11501a53119ee39a8558ca0ed5b3d897ffb9cf0fcab55a0942d3bf7bc6b94ea27a6b748f2cfda431f35252c44610b7e843ed91ebf7e8fe10638f04f52d6d5a7752ec62350efcb7c473f80b1f2a26805151e8346d39d23551e92fbe372df7979c3f756bbb43f6bed09bbc6b65fe6fd241ae1c2f1a0d0b805c582853b85502968f9478e9a84895f9d4ef01ec4f3f571e57cd0bda68ee1f6f7e14fb6e0f4ef8c7dff6796472a935294fc27b16216966d5021339ded059687355b42b55926854bbfbd9f974a0c26eadbfca8a6183093996cf252894e6db910c71ca3ab2e82d90d371c36b92c9409cf7937bb266ea9b29c41d774aa522e103cb30bbabfe872b57beb027623742806aa7694a859ede9bc1fd7b9e32880b064b0030fce1a0e5cdf3ce558a5feaa32e323dbfab6661c5878c9377ee52a615b7c17bf1228e328aa20f92d070c71561969e1af532e76835fb0436810c3d87b982217edfb1143bfc3405ac9f6f3a50145608dfa8658b0ab642a347255c55b59cd1c5897b2cf625a0f0706c30ca1c1321e90cec57b7c3d1bd1af455e3732db80643383c41eaa6781f63da6233360ee720cc04d171ae2445b0c071e339d547f7ac32f407d29ec7abce0a9e1ef5276544877bab2f84bd2eef47ffa66f96e7170cd54d836c9badbc59435146031502c1a3cc744a470f693636d9050c5b894d2d6047df60eb0bac16d905d46cbf017ca69d66427cb88036eca4ea9d0e579f6bfd8a4a850703a0fe49d39c107c9358e98689fb62bd0475aab4b2031446b437c7f9e373caf0270a28d7b15c71f02079dde401e26175bb6e392106a9072021f0e5c5145a1db6f595b032faed8551f6e2ce318db1ab513db876a3eb42d225014949c19543e9c5dfd2290e28c5d72c87223f0195ffbcba1c02c7d0087721efd2af6881dee7dba7565e07abc35bc3fa41c6a4d6a313222ac6dbb117c69c62db2691c68869ac5fc5e987b0ae4335f815c73ea4235da2582dde81d6fdae5911617daef847be17f2bc09edd88830eac03977f89179fe03eb2dc3b38df43803ca2d38455232549110f4580ec3cc04c0d8cfe493013d2cde47c506ef6a8dfc42d998f70378fac5ce4709345926dc477e9e339d8c87ff6287ea6e2873e14d538cdc3f2a47e0e37a2601652f5b665b616a7d1ef3537a3327a76f93990f7694e6484e7a52a10e9eea2edc92b99406abfb2b11ec86667c7af4a333dfe900bf071d1bbcf4f0ad768fae4f450c53817c507d26e926e753e3395201d3ad89061f16706d841994abad283f0db74cada25beb5fe46f48669a62e0b849cb77097e1b4578b45062af4a071b04f0cfddf87519cf2bfa10ebb4b860239ff187e6dad73806ae968e6ac0f738baa88edb3ae4883a9e59be7a6b222c5f54818f95578daff9fc7a7aba8c4a41a699923e85ddf24a32bb71c808516f64d506058a70539276d57984d75161cba7d53a4a864c51a249a6b8fcad5738dd0055ba8468b56579ba5f102642df65c598490f3a0c9b1064f4eb1962c4c38bfb7d55d496a0b0f7b3f90b42f733d112c89176aaf937eea4bada845f3ca4e9b56b3a5a06b4c90fa4c1914ea47020c2f32531e270007ed389246906ecf2c4465f7cc5d6a347583dd73341ad97199021819be81100d867d628323ef7552db945e4c0be604cf6c4a8197958bcbd6c1879387d3286dff979632c54baba2a35ea84efd7726b662b94fae61464d069e0103692599fb86fdc3a06e01c6ae3deb3de6fdb21806c716e5f82b784e4ad3f0e2de629a18e3a2309003dfde9dde8e5101b83312f76e811277afc286b56879f4eb80468e58c60bc088284d05d725ddfe3185b7c51b472a7ff7db3930839142d4a452ddab628e07d43375801d7c6a711a55b452748d770b84ede35920c1ac74b595baef963d21df9418533fcf959593ccf5afccc753e86c4ae231eafe77a158c2472143faf169db29bf2b53c3288d8b3c9added65778095f85e2cb471ab58362041f0a27d874c42bbb06385a0403ca193cba67cf70029cdb7e73c7e2267b856fa0b8dd4c706b45e7174659b0ee2891df911724324f7ca5daf07c912b9b2abff762e62a1817688757492975db7185c4695f3a90895634b8d07453b36dd95197abc31d5d153dfb0d0ec92639540e99d6590f9b394f14c93a5e829fbb33616e810f59c502be44a13b700fd3009545e34c211abf9afe1bb8ced793c6f516d40010649f83a78ddbe9b71d8596582997d0aa54192e1200db61dade30500d72a184ca7dfcbfb80e5442f489d316cc8b75005564835d4b11c482e2c4d0d160f14a8b13ae0a0fb0ba5e3b782770aaca357df0e1c4d1c3b28b776a8b3e0da1abfd4f7190673fca1e1c5a31c688d6e8ddb21300e4178d07c4e854a718ac3f672b0120d6a54c16957c9ec8c444208e47737bc4eeb0bf2d801eb2fcb72f91fe988aa75f38e6cf26e858dc2a718580ff5d281d13e8fc3e3bc30c75c0193481c39c375a5b06b962d9491f3f1fb80f1cb27067f0709e0b0730573a9b5f5bdbee1708ad84b4ceb1a9a61e4c41e90655764057bfa07b8c81cc83a315be1aed6a49715479c0fd0f53f625fe6c7f36fadd001149ab978532e4d0de3d1a38934c74265b161899843704fad16ffc6189f42a5cadec98603e0f98c6889bd4a559079e074cb40678fad4690a20d988735280a1ee8ea71275069132101b35c18ecc9d3c6eceb4cfe9b165e4b6acc17d4f113ef8283c0fb6506f5635401e916d4f7e7bc3cf49aed166587a0c72cdbe673f467d81bc2e9cd08cd8dd16d90b353481df31e89b45e8b
-MD = be3cfa6c965b2ee4e6fb0236665b0b95f66c8da8b338375b7393672283b0e50b96112d7cb76fffaa6db8ea4a7687fc6234dc1ee52e764d69ba8ac40c0f51beba
-
-[L = 48]
-
-Len = 16
-Msg = 3a35
-MD = 87bea682792f6bb4977fe1b92e0cc7017413dd263732c3604f0ebd63c2817ce5ddc5d78c0137f614a06e72ab1cab2f4c
-
-Len = 104
-Msg = 7db15b3ee240b45d4610950996
-MD = 7311a6356ab38a690c0b3a1581c3e7b6de418996c05e79849891b061c51d53dffc0fff2b8ad1c1eff165aee5ef6e18ff
-
-Len = 352
-Msg = d2a1efc725c46cd6a19760f49edf0bae823c1b4992ae2260085746cf65833bd008e56e64002383f51f960239
-MD = adb1778360ec659e90609e74b6af219a01a024f216b68aa944841429ed5b03b139444b8b848f73fd5f350ef02d46b6ce
-
-Len = 1016
-Msg = d11ad1253592c094746da7b5c88d329bc3ce1929913b8be07e82d3f6b7a536a855f31ad197376eba6f2f4534413fc4e4e7673fdff8739f774a710754b568b7c61a473059a41c98aa4e86617aa66d2601d0f0d584cd9f132afeebdc0ce3da6a8b290059e6e4aa080c195c42ae7f7e1e99865223439929b0a3a0d79b46ca6419
-MD = 0cbec7be7299f48f043c3d1aacf833b4258c32190a21a8ac2471666b4a51b63cc77fff6e081aaf5ef21b1b7523d65763
-
-Len = 13696
-Msg = 2f7a9929dffaa4a4dcfeea1fc37b18e3cf935abbaa17cf9d834b3a8d61e9fabfb7683cfc387d6f46ece3f8bf845827c7ebe86a651d6dc1e83c5772cee1a9fee4b04453af2f68430bd87835126cfd1b3f8beea4d3822fb27864570e255cb65b414197480b6bc20a39c5450adf2474da93d72f6ecf8063899722d3755b7a19f71e93e782d89593ab19ddd3ddf053c54e0bf832311fbf132e8b9e540f38e4d9bcc3cdbf69de54e40ef348a9170ba2f65def167f568ce846889c0161448342fe907718a465e451bc1b0f2e4f21f9b911f186589f43dea305811473837c063b915d849c20deb43323bab4b64e61823f1df119e71962dd975700391b411f8778980a3080ba3c14a321d32c082d416ddd2345f0eb751a516d44ee55222395cfa11e7fc4edfbe7cd49bf4ebd4d7428843a2ad5538b3cd201ccd431aeafb146a65d28a4870a6948a7cc0413b0adac7e8dff3a898aeff5f4b65d10b28ceb749bd354c061c3008ec569d5f90a4d4f5caa51d35b49dc4028e738c8ff5939fef3fa202fed9ebef6f2c7dd0ba41cdb5c0c16985f96fd93a65d134fb4a90ffc0fb6cc5396b843c2151bb7c9170f2fa4fb44292a4af28df5481de0c3c917ba1c46467a35302738158493fbf6a0422cee558d4bce3d78e14b4fefb65bb05043e2cc2a6a8ea64565ff6ce2fd2c4f43fc02926ee44ee02fe1dce25cfde0115c9396c9ea06269f17b2caf58e2332cc1c8528d9705c70da1f76f22aeb1d1b93449180640fb5c4c4a708bc4621d7d2bed5b1a752191cfdd45086d34f247ed1df0f24e7c620de32bdfc4d1f882380d2cd7467c926f48abc75cbfac8788f88cd9dc5361517a5eb36311e6b39e21a85fba2038fd47d860f776697bb19cdb5a4d6746fae507e274399c91648537d905015e58910117e5914f44ebcb00e771d38b30c1473e1232d4e222cebceb4810c48e83e0fd4c852f4fffcd643c0ef9e4fae2d0ebc6f102f3f749b02a5e3a61517d53b539cc24120df3957a633d50369d46c0c226f8924cae51dcaf54d716f61385fd8cf38c2c311a32bcd6594d6930133dc18ef36a9671ba8b179abe95f588ef74e8558ebbc974dc73c26bb6eaae78ef464181e18b71f4b0f986ecc8495a9c4dc0b0b96be9806fbd3d32952ca3b4737a06ed6561e9c9581a33a720123fbaa2a70fc3233b83e56444f5aa0cfaf70fb24be6118404f3e11e6ea004cf2d079a3e93a8ac1d4e297cf4fc43851dd26314a7ed6a5a784b386daa26e50c64692f7db28c21d82234289bb45bad5042236667e6d70a24bc9525c3adcb793a6a5725d9b10911e3bc8e3fd604db7998346e7f7dd1815c0cbb735a977bd4b32b5b976932bc92ef3b56bcadc089045ec95f241cdb0a84c67f1f76353da6cb493bb27a881d37a2106b8b3010cf935eb3601ce4dce3e449eff8331e444ab117a20809a1010db4cf3be0c488f777b6532df908112e3d11592f04a0cc16232d62340cbb8b5268a662b8278d37c03d848a04f0ab498f5af43b0a20e310197b7e1395a65299fac29f051bcc5fcd09a5605bfee370ee8ea21f5807d9748acca815a44d81796d68b0014eed3bb6a94233fc51725de3809ac6f538beaacf8cbe3d96aca21a7a763a957f8892f22c6d086d9af2e5ac9d90321e186584f17e964c90739559ddd034df076c4aa38c2b78aab6dec8ef6be9adf33bfb66f159ec4826653ee6cb483539c47a4a1d95663e6cc7a42a3bf628623a4c9500a59a50a312aa104b198ce5f3e58952bb79ff1ccfa9ddba2fd4705e91b5acaddab9d6522d7666264ac5f533b6d8ac4512d8371c69c06b6d322b046ae2a0a20aec1c3bfb05f3d91b9044cabdd873abb5f2b0e3e19740df31e39828f9ff9bbb20b73541a7a70b8174ce4e43e0d356e629cdbc6c08d29bd7acb6a4347823075683ce9d7de4ab3ddda6572b175951f30a15263355fe9641b3322df7dd52077402a884cd472e6d0b6c34cd63ab63cec8760c7ebe384f7cc31066bbdb7a3417425e039c4d340166e4bba4839076ac9457c87459c57957d0a06dced2f7a18acd22b7295785dafa435a2a8a2c3a1fa05d115fe129d19fc44c5a29bf15b4d9c2b375bc8e591f92756cfc573a39b8fccb8395cad7617b11f14a60e2dbf69b897844cbbcb70363010f6e1bc0590ea594aa924597dbb32a868b55551789f82437180b85661809089d34a168d44b4d788dba23b13542715843eee797366d9ce7793e72331735bc78cd61b13421a568ba3e66926921c04e9d00888ba7ddeb474db63813756ea4a02c1823083e36ebd2d32d5c88cdebb98d511304cc276c7799cf84a1699ccac9569b13f530c762732e6bd0f8415001b2c02d11dff36660b717054b16df49ba38425e3764a56052ffddecdfc686aff22079897376cc15591e11579fe4feeccb55f
-MD = 70e1259106fc7a7c6be11d95fb673bfaf0074e342fdaefb458faf4619e7f0edbd68d509b9ca7243d2e5e039d42ee3b47
-
-Len = 100816
-Msg = 5f464d3301c5e0871d6b41b002dcd09abc80a805de3482d97f3fd7b9838745da1c0534168f76b93c3c53bbabd904541ffe5179cae619dea77446140b7400f47d242141c7f2e9894d88f44c9e066861498e7394f206f594a419790d697f6a11187f84bc6fb288186109343eb11172bec076d041a4c7306d7978c009fc2d2d62563614ed3555ba2d21c8fcd70e8389352dbe4ec808af3231ce990452eb05b1b0dc4fbb1b4265e69235cc3561dae4148c386cd770474863a84a822b2e5f905fc255d55f90bd6a760d441dc52240ba7d8c888a5283891a2c99963d1fe680549d6267cdea92cfead167f6c49663668f2bfdc61fa647f5abf3ce5ad2c6c175dbd456ba41436aa06f5f68f5c88e6b74ea86a79934bd05b486210d3d470a0967ad6d67f7385260578088d7e63197849354f651aad07e04ed301f1fe7a6d2047d50ce5dc6bbffbb1da6b47d740898f4eb54e3c5a1fbd18ec93254cc01f705fce04e6100ced132c519674b2345547804a372b5c925bd9ee9701527db33408d37b72f8d18b882d3c4744eb58f011d21fce336d426de1fcd5e09610216248b51fe2b79b96c2bd6ca0155e05a8a516b7a24d529a9a475284735bd9c4c437ddf399864b64fc5d0d6ffc4e5a7a3dbdd476bc39ed29a0a92e1f2b6b3506c2be5452d4f896db6eb4f895b554b2af64c4cb8dc2369b91022dc50b7291404cc9605c31569c32756a64ff8c4fbb0f1bca346c7b58a5c6774b2fc7f7fd50741d34c8564d92f396b97be782923ff3c855ea9757bde419f632c8399763003b58ee9140c2d62e914c1e1fa742661a9166d42267edc40905b35a25d5c3cb3fb457376b7422896df7bb19c23e8f764416731d2e20cf2c1beb8663c07edd8f105e078e2fed05c5e5897c430017fa2160f565a75a4c5c64a15dd7d644bf355d169ae2696ae5ed1a39e8f81055cdf315e5b0c6f9235515fc4dbf30281ef17b83a6ed604f89293904bf78c7183fcb0ab236cb1f8935e59c51559217efabc000b165d819b717118a03facb61a13a99b194f8b6c7ddfe5850127d79078397a56564c7ed6716a129409680434061b2a4782c9006587de927c1ae09d6778a5f1c39fc419fe10493eb0d4ad492fbd05485eee7913c59df82fe7182af2cf06a6e8edf06676200077bd1408f5c1cec537cb8566470cb44895826d04ec20f0aba4297c501add65c75d5767ad2ab63aa81b7b66f01b32590f1d55b7e50e6df1ee077a19c8c895f5ef62d452cc336e9aee171fa997ddcedd7af86e6cc37722fb5838a46c5e58e7f700edfb7c6bf832171d9581f660752867118e9535a6118635709d6f1c1cb21b938068958e956149d9bffc67f355cb88205d4894ba97c3e3c8be9fa2d20abe79f3f93a6a2f4f56fd075bb49a4b7dc83630e58c32a29d757fdbcaa607352f65483cf2cb4208a3bf94ca7a25e2a4e05279be31c33696c10fa4971d1b64ee938dd299f483e5c098845749a3b706a787529bf2ca56693d0a7a98243e6482a43e1f5d3086ca1b00368d8ead5ed2d0fb79b1e2f537ab9340809ca3a9b5eb2900390432293008ab7086c2811d33de0648be5597ef002c7c462b5e0f4e0b1720a98b2299ad7aa55eb78f0c77c2ab4371385f280107ae40ebf814a8223dc74f31483c63d9e4ed09fc7e5a51bac34d69d97163116a66c84ea9fe4263269b71fd228555ae3cf5109c4d6ced7b9049a2b8069bd2f71834d6c07fffbd7561939188bc07dcea08086bc7182a5270427c3199bf5fb5c4549861fd32a38ec81c4ab058c777dc01864787f0275f911a17838272cd65135f66baf06d8d93bc439eeb55d50b7c5adafed8eb8140b4b05f59871dacf954f4b096c30b7857774fcd319c096750bf605db8e31fe02cd1b9294eaf8bb009d4609f2cdb3a8657f650501b8553765de8f572fb91ac77b35db35f402453e5c58f60146f2906ff56b9c6b3a5d0bb6afb9e2201110919ac9c01a7e9750dfdb2f72afbf7a8d6f64b1c68b9de17a2c9abf289eef24074eee9b1649caf3693118165503a30200993d271aa31b8b92606a10a52612dd1fab495b82f9a98cade18b9d8a723a71ceb63fd1d27372bd281f9b40aa1839b0cc2f2177a09aa8e7b159ac118d7c145e7a4f032e788d21facde2b4dbc1d5d2238f530d9bf9bd2798f611d03ed8919f0c85bc2da99750b7a8d6322d2e66ff6ab9ebaf7424e8c1c3f4fe92be61f65359106395f5ef995e925be3868ad513f561f873acdbaf18590c903d64bd275121c11ea655124d091740887868544c5348664399d3da96e2e35fff34f062fb939d656bc072096e510b40b2f75ff010af68d64fd0acc778e2e13c9667de266b1816c4ac449521b02bbb217002c604be72e73051aa9048d192e3210a68769dd2693e5d44951711aed3a751240d42f8925844131daa36c51d7d59bbaf99623fddf1649db954705fd6f3405e63894f5258c9ffecf83208c2c90cc55b1a8d2972ea6b3a049ee54942b50526b7930953986e428b2c75e47ed870bba68dbfa624dd94112f3059da0a80c583baeb570fe8314f5c66501b34116c81148dd22396fcd6479da49f7e952c8084f97d6803ff85c3787222064ca368f596a1ebb6dab20a03916b3ab071c927d87fc10ecc4e7ab4a5761e3eadaea4de1a0dee30aa39a9e4dbee047201d7d8a4df1284cf668ae3ed7dc4cb2cc4b5cae9307353fd2ae4c105c5d9f3bb021535fc3ae9bf3ff54ddda8b2e1037cd9d69822df436dc1c750a9f557d1a3a63fbe73c64261dae0c70bba6edb57519f5b957f138d1aa5fefe01b73c1851aea42938147bac2762527a492cb85da43014c876e223b05597354d7c9b328df67f354d168a84ce86dff57d8a870db034196dbeff83ebef80bbe52425a8810f2c9fea29ee688a201cce4a5f447be789a3881a9da3b6c491288e8f1091719032608b332e0410f4576597e17e0b5dde305f069be2e80d565bb979a3915488f88e3ebb90e81c264bcaddd72b8843af4a4ae31f723d50fa0995b027c334c351128913bb93e67b1b08f101f6b8dc8202b44fbc3d3dfb530f66e5a8f35e69725c86998c05ac87c561a4706e90fa095adab4a566da4fab82bff6b20076e5bdf62dbd6614245b6a6f8cb6bf60106f8d12b9c3e26f8127dc547e2181531ce980a3273f452892110cfe1ea834a30f99d66e026a9d22dc76fc3cec8fda2d7fea701deb84dd45c97dcde57a017693e90983a156f11c4d168d89c06d8a32dbfa590adadd16850854f24bba315b0bbf372f03711a20163afa0c137383b9120b26c59f5e9e7cd2ccaf0ef4e0d70d5a81748ad441ee5fe178e14317cab184fe178fb0cc0d82105d2f423467fdcda0f9871b9d84882609248356f3053a99866dad9f9b0f8c4a897a8cb8f30365a7ae5f3ca6e772d863d445e6d57c6a478e35d719d0e4e84f3a30b1816ddb55bcd79df21ea0e95da72a19cc1fe74fc576120bc108be3ed4cae3bea889fb4ddd67efe858a994237378eb623dab070d954ac780c1e6d2095383c98ba622cbdb18fb53260979fb2672c21a4600f4bf06583a112d303096d4e30e7e1060d869f386eba3cf7aec3052ca17593dcc9969fa9cd88179c262770211cf53f53f175037a5cd445d239cee48f7ed0aa1d715a22ac18a8aeecf191d415e4afd92b76c091803f4c757a9e89f696ab7b11ad6d5f24774e4a004dcb0e3f33705dd8150431f051016af37647b9e44b10bef114276d4b1055b634461c655a82a847639a038ec9f58876e84e9a2955b696e072d8054c3f81173473604d5fcc0a75b4a340dba0c375beb87b8b01a0f2de232bbb8371c3a9d27a0ce521c4c43dd3bdeebf92f42f87d88978d5b4e3e563cba0e5f59dd29c31096885b113ea5c57e66a3be015b703bc26d3fd1d51a7c14f85f65747ac909d7e30c8e800be27eebf4a62e42e538ae30b6883907cebb7fc5e150bc9da3a138f394e817df9a9e44420078f30d0d3d6981ca581791a097a5e3982c983d5cec239096c7d8cc55c87242026d769ef1d04eb96e5b5001e3358af88d417cc61f107659791a35d8b5f7a5767ae24d5b2ba7aa12230076db1f1b9b6f213dceea62949d98bc5db38743b23a59ea75dbe4231a285678f5f07facc053c2048022fcb01f15e8c100d64a877ecd56d196a6ac60ae35e0e09a517224ba409ba7b70d8f9fe65bc427b212a4e9b3cb17b0d332267cea4f3bea7c1e550f7ffe567b20e3057aa0ebb560d00d28e2f7aff718a9f2d4d044f0d20709bb9ad567c98cff7c4810e8c542370cf90a491bc1088f69998d59f344b74db6c1bdb61f284e99b517a11452ca0bb37c7bae77fca6514b341066086e600f098a32a92935380a173c9182a2513584c54ff67e580dfe16b508acf1729a3d649ff1eae286bffd688fe658612d6c8e69e6e7f7de4ba85ec54747cdc42b1f23546b7e490e31280f066e52fac117fd3b0792e4de62d5843ee98c7201529455c85b169fdb90cb05e3403cf2f737148bd20a53c73880880a14ffff37d62130e682e50bc7210ea6c1f0c27656cc1785a0d9ce93ff94dbc5b2877519d9bac4a339e98ec594a7cc76f4ddf994fee8070dd4b8e0fe0e51b93105fcf566f83d914dd862b4ce78de7e9e16f142234bd969ff8005dddc641dcd3c7cfbdd6113cd3ba34a9503a0f433899e90e158abde2ed4ed4b3711c991577c5aafeaa982bce80835f8e6d7c7975571fafb1499991646bc499ec32930367d4b1de76ff656442cab987bdecdbcc2b2bc35ce01816594bfa4b6e33080caa41dbdf8ebf2205649f98a2d3bf331fb16b9ecd1824eacbbc9f81297b115b4d36aa7496e05f7d40d4edd1886c1bac10cf3f97840a03277e6369e7a7e90d932050ab8720fce076de5c355fb17959bd75cfaeff325b0737f8f5b1160de0b0184ba04afcc30bca77a6a37e29662302d01858c0bc1d32b883011b7df5a387805296cd91bbc835a3e76152d017ee929d4cbf137eb78db89d71617dd76cb00707aacb8088ac77a1f52ed710331193edb29933a7efd8cc153e6adfc2c6637e88cd86b06036b8177847b4d086b0ff9b5dc91f3cbd1c08217023d7449253c25331594f0f16a3c5f2e122e0145c4ec94f096b45a1fd0b2dd3f1d51e58978471782a336eae49d7bc4e050d1c6a391658f71a1f752c0ec6302bc2dba9e3766359359ce34955a2db86740c90d09cc50e92dbb76e17a39955fa7108bddeaddaf860d1aff14acec8b609ac1d336270a940604209df91cf45be72edee04277d694a6f968ae6d8e065702f3d607f3baf8db4ab7637fa4c78bb0b7fe69937eb1dcb616fca564a5a521e12df71fefbc321187159bd6a47b066a3440ba634de9153a94546b63aa33aed9da2018e1f30628df37f5360ca4f2660a46ffd73e58183e8abffdea25f7bdf798a2b7cddeaa481bcc6e682a67e99143066963d96d4a928a478951dd6ec59b1be8cb23aa688e1867738aecdd9afade39c92c0b2572bdde84eb912ed990ac618834c412231216fdb84f1e01b3f8414fc6dd0f646fd0fa62bb0157b3535e1497c9272df1cc5dcd4e6ab9a8456222655c56ac73fe0d2aa8b599035daddf0986a45b1a59510abe19a11b6dba065c8bcf8a85d20a3681c2414dab7c036cc1358b1dba98d6ae62c5948c36b5b3e307a6f860c0c822ac724a5c917ed5f98ece548a7a741d366868e6c676394c3659f7f6786594196dde332543376f9ba0724b091d30f431f91d919417e5bf7ba1e9a21cb80f6c204c3a58d59d960a5788b5cba5abd7c7518f4c5170115125de97009a6c3fc4d5773e4f57fdd433eb7422c7c4dccee57a1679633ced3b5f08df763d4577983c5ca8b49bc4e08fa76f8bff36daf0fed068db47f0c87e0e45d518dffe37c129cc6e2f5f9e0430185723098e715284a42f302a6b8368a4f2dc16f534d1e5db9d0b86659fc4ba6f16c982774115d02a57684c7e5489b1f491584b0f0546e4194a6041f5e5be3bfff3852a4fc772d83491023a61a37228ef6260edc0d1cb972cba610d5ad1d92d554700771d8236ef55e983765ed8eb21e7de7c8bb51aee9368758454fee4a3f32179c1e54af1d069e0b9728cd0554351907e018146511e4d6f0450b57c8ebd21c71450116296bdfc779945da60b9192c5bb9a67b1f04d94992df4cbb3e30732dc8af2177fef17e0b7d01740b8a64db16bc29c1e589b6bdfc967edeb2ce8a649ba892bc856a929f0b837a838ca7f917a52436ea3d20e72afacc5b9d58a7fd0fefd96787c65ffa7f910d6d0ada63d64d5c4679960e7f06aeb8c70dfef954f8e39efdb629b72979be208d616071289cfaa0756a4bb5eea5c7baf8fe7a31501e7e2d67d708d461c0c93e85f03afd70bd9e16437171e01a34f475e4b5a58d13ce4e2fba72bbba93403f3f8981e0bbd6a8a6223327bf096c44b36e0ccbf7592a98c1fa67f198b628787ec80aaef848b4fea158c715799e6f458327f399e6420f0e7821f2dc4663bbea065c7bdfe830b6102e2e7193381b9dc7f2381ba808c43b8fdf3addab4b5fa81564716f7d46e0349d9b27b559710d723c7ef2f79eb55c3a9d75b99ae6fde6877b278b583f8ae3cae776b914b0cae0772397fd19b6a27676c7ca02cd07f4b4d49bbe1ec87f2ac7e39e5f7712319c31271dbbbaf4b826af8a9f4acab696c62719f7a6a032c4bcf90922a3c630647b7c1c7b78b10afbd863f07486561a0bc8d9b1ff5fc41998a7e3c604e24af1c1df2da1dd5d83eefa2e4012f7fb5959ef9339574367deff73723484b5a969c8c23dc251a3b887f34b9ea09c9a1838e8aaabb254445d7556dda257dfd5579737fe1dd6c67f3851ca68b011e7cb7b6958d588f143828f0bb24fceca31b47b77d1ce05e75ab05b55d6c9f9107f0c738f2cf8a1629f7e9b2694324e082503937ff8ca7c5098f770289af7d038dcedcf0ed77c8b82e2a9003a6f3db69e14131e144f6be7cf0bb5353ea96aebd78befbc6ceae9bdde97823cdbc5ca8ef8a993a9d9383aee9f2d6a18fc64ab92990672ea2dc9b89ed248aacf7f1a513da43fe5953335afe76d78867a066f226ae9c727c6c60671c50a50732698ef7a492d51998eb6da5368a667baf6d12b77eb36686ee0ca239dc6f3598be0bda79e47f0891fe4d8989df8c685480de11c148a2b44c8a6bea3a50b09be557c51f545a09a30e9362cf3080e6a6bee3dbad370ce24f6c5a6f8091007ca195057fa3af8f99703a601086c2a1ffe55fde4c2c4153dbff8d6601ab68743c0d50d021b0b3099535ba6c40f866ca3ff0df7c19d709a3f58b57b40ab5e43556a8c0c1938c875267bb39c0db6b45840e8ee7c22bf6b48798bd744f70e42fca343a8bdfbd7f55f275ca5d62c7288756d4861fba68d16d842c5b893c1d8171bb3c8b593387d3426f292ace5cee7753c9f9a12e6bb9af5a24192e4184f7d3d191d862d3c3dace7853eaa235b6369fd164e5a7bddd06daa3eec7fe4130e82478d36f88a0999cba1f251ffb3a7689ea2baf016073193898716a9f933448d7ba8e0968c669bdb7dd5e6e32fd84a6ce9e8632b393f9263532ec2107b4c0d2abdf3abb2de2d63511805eb58a70bc4ded040d76640af60ce7f03b9a682b8dd84ed8a47225a48e0b94ea47828f1c8974cd64e5027d8b13d43519875d2bbe4461a7f0f5b5b8d63a472765405ea9c994225806395e64dff88506f7f7f3b6368d769e6e550d4e3e81efb13771cf403e855f75312f1383ce4c2744d0b4e3735a0f1e1b99eb014fa60c0d1ca9035fbc4403330c2fefa8411fb7c3d6ede5b5c8f4736106bbe01923d483a84f031e9685a3b6a70646a2a5059ce35fa496b3f21fca6047471a5bdd33908cc9328de9fb032347c249bf7093390b750696124621dfa67fd9c7fe85d6e5a4d277ad8f8d169f8b5e8dbee280f8443518bd94abc5ca704e781e6cb1868ba2d6fbbaa850326fbfa5a20e4df6fb5f8ee2728e86a758763a8af21e1f7a8584d3f0b09a0b19fe8fcd37bc4fdf45084d7fd92b80544f29aba52496e2c9a0aa4adeb89820be321cfd2f0a53585a15d04c7fe4ec9be6eb5df419e20b71506c1f642df75c53a9e3b2414fe6102fa8af7be3f6c95de824c31fd6fe8ef9d49e26095a2674a33cb574e9e493939bdeaf5b309b4c51256ef71e95dbbcee0a11991693b533f916e1c82ce86d65d89b6d596017fae944ec364546e78abbcbe4322b83e2fcbb4c5d4ccb54d8642c7eb9e28c08598a356a5c46f8813e6b63ec2f3e3bb721b726361f85a734e0514f4e9c4732991ed3998b1ba8f618c2071d1b943eb0f8766fdb7f0492421429bd380deca3325c8d5c7b6ed16429539ae54f1eba39748f09aa44efb67d863cda304e8653ff7499cfad44dc27807779ef8e63be4b376ec403f3c84eda4e5af31c30f9807762e0980b4e5d9dc406cad4e888bfc3ec4186de8ccfcf631b0ba5831747a1c200d45ea06ac82c7952fd09aaae5dcdf5475da427cbc8c1f71ebe5132f2fcae15975ed6fa14a11b38766e1c446894f31c0496b0e5e96507d28e6e4549d6d78841e40630ef306491a1da60eaea3fb69bffcbf192610e2e07bc1124690fea61980e8ed654c5e796f67d26db5de35b4a2c67427833e360ac2a7d4fe7a5ce572144443ed62ac460c1b19402e85c79e3d80e1c143279b20a66d8dcf2bfe1cc44a0f5aa9b0d9b36c46c2cae148dd0f2ffe9a8e6e7274d1832e57aa39fb40553da6414094e838d613a20ce9307d49f97d904648d6460985b01af769800cff9a940f70729fe40e98feb64ff0a81c5b2b096b1a9d832e440c49e4e3684bd17a5169fe138d2544d9806fec027dd2a67f1856178e090f9bb2f9b314a202e7e95f2e41fa80dccf7b1810e9cbcaed2acc2445d60e26f7d63ee4b28e4299e60ea4fc659e7d6f0de91748bf1ede1fdb2acde9482bb76bf6716847eb2dd7517e0a94f0bbf20f248d2c79fa0f518b67a44d5c4c73a9bbc3816ba85ae8344b5f377649da75cf1857d6e4338a76446c48e52cc7bc7ce283d4252f8fac5e1427299edc33f84798316f77bad4a87849e91a1a23c0b7a86898046e278eaaa15ff33730a6d3f885dfe2d1dc0acda2a9e49a71cfecb7dcaa9e70eaa8fe15d4567a280e8960ba49d5289535907e9f277f96e8e652c21d89e81696dd821db5b7e1e53e160584477aa9e4c0e12160c9956df36cce6f4e724dd543827366010ed3d843cdf4319c1bf968a70e9b1b6bcd8af96c9eb0620c569716b7bc42e13251a6adf8201faa129844b5e1d699cafa1b66a674e732c7662b0410e5bca2704c5ebed7850d0ebb825cfb0627a183cc9643b709aedeac2c06700358400c389f99666ae97ccd37f265da7addeb07df9ccad6fa777d0da2fc47b6235179136bbbb409596841e921eb278142a19e6203c7f235bf8461ccadb4b47dd290d36ac27126c808b866f9531261f1e0f5c458a6bab6f064b4efc432e1c7379f9af19ac34c5c22e76e6e7651e48f9ce44eff542f018397889d896cc9001a63e8e455fbe4a9ee9a740edad894fe1af2bb21a1dd0318e28ba982c12ed69c08835ce17336ad1638af3cfe0ea892ab8e83d3f25e6bd98d5e4d36292992e2122c265a26cbb3931dd4c1b0d0ac5ee19974d0dd45777908bb416cbce52531820effcd7f28e1fb2d3d4d826e1b2673e834485a25af9f9d174f566abc3b36732ceefdd91a7c3885e1d10d51c321ff704d0883905b7539309ba5e7b7a2bfefd0494e90e9da7541ec37858ec05ea9a9ec5672b113cd5ad6ebfc5b8fe40ed7c3f17d8a73703dc89086b4d75c5eaf06b840bb2f5b4519a4fb17bfdca9605f17253f203efffc92da96fde023007d22cdad05d18aecb4bf08085c5ca5eecd21f2b611e7e8a0ef981fe7aa2014f5ac6862fab44011dfd33be8a1226943aa7ae5fee9221b0400d9ac2ce5241b09a68cde6b13c47d50bf310ecb37f25c32770a299020d8500d8a4b5d7621e4379dbd6ef34a9aceefd4055ea6144f54bbfedefb5b5b0fbd1d81c7a51a802072ec3d84f34585f22c1df84caca07849b1ef054cbef9b40848e9fd238761df5358cf55a79a53a1bc749e49ffab7c5bd9a28bf24ad5833facf43bcc3852c1e85cfe47929fc49c325c20d74588eb9833519f192243cf96625057899b70a7c93f8fdbfb60d8129d9c43c95f8782ed8293641ffd21d21d91a0b4db69d766f6d6497e9a414ceb04b65425d6ad6c8811da00639dce8d8030038f2d08330c75b0879aab81bfb3330b950e54c13780d308fceed2a103a1a8b77a923b66aba737654ba7995acd306aa7b80f632184412e2369c353c2132ae614553e626f0a3436959104ba6e0040dc597dfbc3602a49e401bf2249699375b2c722083489f54fcdc1f616a133ef6112a1754818158ff78f245b9046100b0e89407f74145fe336976af971c054f12d98002c68b3aa2bd699fbcd71bc4dc071e430bbf694595a951e01098aaa499be2f70611f248a694539ef8936b2e8b7a3c5de8662436fed1f7bc24a4e5c17a663d9a23b4692993301b08cb3bc10f518eca51081c717ec8dfbb0c2669f7987fe6aa0bd98231d8e8b58951b42537f12884a857e02d62de4fda6b88b6b754b1b27394c6a819e0f92f6b2b2473fe245678e252ed31477cc7ec6895bc361b718fcab3aa550fc9faeccfe77cdb5b151ab1db2e569b5bc923ee26f0b6113504d295112d47218140e44652a10af10a088f95c7cf2fccd040fc93980939122411ec643e26e7d69ced3178402e320fe156e774b75b5afc2f3d6b6ab828bb4993b1436faa5728cec34d66f520f59e82716ed6d1324944c3c91d04d5ffc5a921f4716c39de24768484d0096f7d8dbce35aeec22db11f899e5e7e3d57e7668f35d6c0db3542255d9262137d39ae6cf9bcde254dfccc54a6062fcf8982f781d9ffab2df4f49ec04a72eb9646d63bf9e1799bc0bec0ec7f0675ed9f8dc9b8be15d9f2175dfa1c8bc99071c70ad7bedb10a4143fa91c89f54777f84c9eae9361cf7f4c2b7ab873ee5785a5241db0af86f3c6d7f091623d6dc576d07550a42023633a09c8dfa21d7e70cce64c13f37663f75c47921c246f3f2d1d16a8283ce7697da4cb7e016971a2a1d0c59d6202bc18b7cee3828de597efdab53b33a9fb41aa7b49f1c964512901773bb396ac80e90ba1a94c408b2860065ae9aec64a41d76cf8842d299d0babf14d5840d647d075c34175e26a786f30091a24f1ce8db30137520dce1cfffb6318a0d0fdcac883eac603bf365efa2c806eb4f194cae8c16780342165222192f6ee2e103ae2a31dc08a84dfc89c64d2e9ada7ca1839dfff62ddfb7982c79684cfc821a098bc6bf09f87317209b16d14d45c6f38fc99f7bf9bb73460977bb323665d480c87c687cec052a5f08a2c6744c8e177a8a269b4a47a925b9123cd2c014313edae988f8aeaeb633ee5ba6be7f53fe36da3aa37ab2077f5fd75a82a55a0fe62af213b85e9e7694f78cc2b0e63a8c1b89db484722fc62c688678a511c474f0eff8eef1382946d26de00e5c626ec1d7079445c1b7c6f7f05073249b11fd1fb30257724a14cd7bbf451146bf366de2e826fdf1d25705587c4460040ab963e3bd504755b6aa5b18786b68efd3c8e59e8dbd172346fe7f4a18bac98164669d73984044f3c777368f965763742ab86a3720208c64801c796f6e3a1c4748b81e41ac58dcf6ecfa0453b18fad7e3473604f57f7da302e1fa81ad538d4a0280c4ad092007bb9a7a12907227a936871886c699db97d00a1966fdef64d9f3672f1b792c1edadc6781b391c91bea1bd7275f30859dbd1707b1f554e49ceb874ca06e92ab466efa7eeb6990667a27507a7ba789e24d593ea2af8eccb3862cce58daa63eaf212bdd86c01ed471cfc79b191c481ad773d20e821d18af85a7049034e5a9c660357a4c2808b9a6139f32c55c13282b8d98904f4f027d438189dc9487c96172e50dc1100ccc224e7374cf96ea6731032c43fbc9b367a4d1d0b31aa3fa8eb589672e69f1d9144114bbd508d56c2049ecdbfd7b43545375a099ad2885353d8c550d22dbb738e6fe3f104b444c89475a2cc24d7887daced8fa05006c02dfded01c00707e2ad04c41199c5decc1eae34b0c0abb5a5beee1b5253c3350e1a077682767a0b9124a4df2e8879366fd37fc04d4dbcf89883892f46a65ce3aec22123cbe6b3af6364df1f9f5f9751bc8179b6dcc5c126dd65feb7d11a85994e90ab6342834c79c5f82413e88198c73e932c66e3cb60b6e0c0cf438622e5dc5a1036c38afe9cf13559044a9e90f5fd72a3188ef6b1043f5f4e6b40ea51f6235dcb33b3099b2d8c2e02103235f0476ad51bce6d8a2934068549633e521a3ee4c62c22b042fb86c13c8da849233205a5e277aea1129678c31f5c379a71fe08b72fad9449cb923126dd465d1e0ae8a925374149b8248b3afb69f168f3ae701c00f6ea08fe07f1b5338ce6af2f3156ba6f300310114479f2f6119367c88c12c158b84be13b9c8c7b5dd7c90edb5b3ea1fa5927a25ad6d5596992dcd4877f58a134e05dcd80dde4fc2c2a680cc0ccf3084d3f4970e3603fa6bc5a180fcf1ca4241c0b8a1e7c607dc025016e297e2b0645de4ec2fc49851b9374f3ef99edd897c284a67b647ca8c96fcef935d541e9faf334043ea50b99fb8819ecce039227b624e52d8c20003b5a43808e4990da8e4398c4fc172b983351fd11a13dcd2aae5193d42d46e1b57c92e3e01d23fc968c729f3782d6c07dd5a17af2bda96735c12cc7d8023629fb0125e974425f7914690a7ed26508343ae58c8a439ebb6232049a194768d4594f5d65aca37a5686c2a86dd04bef35d74e0755937ac0ce3ebded1c00c8adabf030e5e4a5f44193b62fcf2f1bfa9dca2a25afaf2f1ec06c5d17ef3526d26d17af3e2f257ded24b177ba41c0ba64fd4fbd5042fbd5961a105e0e9f77f3db13c1b6c5bd9a9d04801a5c00a4c544218a21016c65bdff774a44b1d05256e0693e14d76605d67bd10048d3816caf31a6d10886c88c783538bd93e92bbc4484f3388b61adac4b92b911c76ebb1dd11b7b4e40be032bccff610068746f41e34a1fbfbfe5faf57c8a4331008e2c1cfd69f57e74379ac80eb6769f4ce4196795b835201ce4ec85ebcaf5eaaec242fe6695cbce1d53fde5b002e006bba8c8a1ee57da061ceed0d21bdd57ab0cab9e46bf3764d9a6c3ab19736d43b33f32eb955f9174ee4a54666e7f19cefeb49aac7a59b7370d9ae730b7bb4e08413222f0a66bfdac252fb61bcfa838f262312febfde8add8f6843f1d64ea3da42d4ef986498604d65737a44f5a099338520cdbdb65ce73b110dd4bcf8592a4adc3e0170b13404f99f0ec8f9fb225c1275a921f09369db165e9109dd5be472b9bc1901bfd882d264d9ed8d88b4c8f3b35f88b69e3e4b8ef5debb895be536a3af492d968dc1caf31879d672f70ad9869ea98335cf9e4a2760f955fd3e8099e4b2eb4269e354548f9de9921e50e49f3f5cbd63468b9db0cfdf17250c8f13535d4c0a1f21c87967cd798fe93b9b2960447401ef90db22c3adfba0f55f5585ad37040e8d6745184dd536d5a26edec365bd6edff1bcc616cdea3bfc8b9d98c0ef9a626054e361194cd05b2287612399f6d3d3be2f71555f14ad2893af6f60ab61adef663c3c2464ade671dd5ebc71935aad290573588fe6e11f48cd2b7db62e4b9932890d1b96e1b83eff70f026d199db75fb1e83197c937b672613c66ea131f485b4318e27c079b4018d4205484993bf50ce70275b244f2caf47cb47eb2a9ca59afbc78809a912eb56a4bb65cae4694f682c6329c690003a1c355f779b5857a60091b1c3685995a366cb43d753a704d3e59c5f5003c78feed877351e27334b3fdefe5907edd9eb25588a42248b9c4a93efa7cc63bad1e5900b95b70436c35eb85cc8251c4030fab9556920141cca24d6acd3122b92b7e868dc174bf071117958a4797fc90866aca685f1456fab397ae647ab9970348082bd74865bab7f248568db98ced7ed84e8360fa91afde3f23509e6b4caf948349ad9fb6a4efe0a0468302cae7a0f999195af1c19058669fc3b88b2780b9075dc180298498caeb7ba0cf8bd42eb36b1959d5ad3ca6fd1e85f76abd27ec5fb637ee38173ad7d86304d5708b6dc8817e099e77f5d43c1a70624cdb96e4e6103bb25e59eb51d894d1dc533a74005bb79cca35b66e10c61d06b5227fcb071457025d605a0862218ca252b871f8343ec231dbee15688aeb914c0f16ebabe6edb0a489b2bd10d4392c6f1863bb6a62181de7cef61997ab02f3bad0a893cc0cd8a99cd7b3f7773085f0929de36b5d124e3729140c375de9a2d0cd9a360cadf17b9e45b7f2adbdff9e75b743b62642ed67aa703b8ef33dcf51a50edc7dbab42d3d2b49badd2457a9f92847aa6a60ae2beae457a5fce1a9e485ecf907be22913893cd1350f20fc6c81c94be426eaf01864e813a03e4674491b61516bc95d8a77c15f03d0adfc4adc27f27a5ac4165ff6518eda1a5c408708f78a9e26b834179804a312148d4f75f21a77d78387139da40c0a6293c2a59d0162437d68504f189ed970c5abb9ffc6d8e1be2b0877c7f24b1dc273b1765bfc5ce6f4b8d99a96d5b1c92ee53a39f685b304313d909c1ba8130d20d51c824cec420b0315229df295f75b453a6c131afaae0c36d7c4fff70623638a4f7ded5eb7db58d95deb6249a29b171d8ce651556dee8037bf4ca74453a4a76aab7cc07ba44e55de57dbef8542c3851ea353fb8e259ee89bbecf9ce8d8bd6227afc0028afac48a7acd9b4e8cbe982eb1475917ad6be4cdca9cf6e7cddd971b2924f2bb730264801685d387485e41993c3fa0af9987e8b52c21688fd9a9595ad8d1b9f41e0457be18492aa09f69e64e2954d1ca3cc1d32b2915cd9cf6862ca79c80beb47347c4cceadf48a37b29b1d6de4e94717d60cdb4293fcf170bba388bddf7a9035a15d433f20fd697c3e4c8b8c5f590ab44aefdda94681407008ea48d03ff21e9bbb4ae7a9aa37c855fe3537c44106e8079f18c24d2584474bd4a99367660ce6f7e6d7c294961e174366e7babc569d5f80572a21a4bd7086629363e0c9ee2599c8b8863c96613ae6c32cc67ccafc66e1cce79654567ad08e62e9abc99e44d6a79ca4d8de15b7f8a763a4741676af0e1f3bd4e002c8fa1ebfbb3bd3a65ae68a80c230422f98f6e1e9837252e045eafd585ba389958297d59aea1e8e1f665fcbc5f7ff449996aa712dc0faf582cf3caf3dbae80594f9f07fc06de63d9d672d14d7ac4662b4a54f40d4aab2de766910be2fc7f6f679b5708790b5376498d3baf0463dca2f093b51bb7e9f3e7033ba0384af0174becc3bb477bc5e86959a12a5e8924adf0bffdf5e5b9c1cf24d232881ad5c05c5c0f50318ea83d8683339ca6a583c52198c00f7c1abbda282e7fd3b179297338ecf9c923a3a87a130dfc06164e9b4c1fe11d51b382643de44b30a6831dee119241d1b6f84f2484784fdf65e41f78c38e15fb4b00e45df1edc40e3467cdcda351a4c0a0185ac4649e91024377e1c331587a8586cc0a4dfe29e14004c3536d305f5dee0eeb8c2f216c1b8d27375b239f6458e08980badd6d82e9ee9e007578c0a3b48288d9ad0ec3c934a99a8c5741149af937dc82bdb545df26428b87fc935c05f1a4964a8408539f267e23de9bc498e2a4b0083cdb7c8e27de6252bfaf680a6d5b7ec1a6dac6d7d537334a95f1553324a0739414dbdb50445a767b0f589fd4c33b35905577ef5a53b0f097191f9cee4836a908748779941de2a78fe1bde0c2efd9f48cbf232ce101d9df93d3ed40d036ae7aedc3a5ff619abd1c159ca8d2dbda7de13b4ca62576c7f925c52925eae2d7500dc969fe14c0a335ff95a7df1d276a6f242765c781208d59edb5848d412b11638b27ce5a61b8209075976c2a6aae88f6e6d8704fe9e83b425dec4defeeb3cd311b8c5a818d51f917a8a4525361791d5c4fd5d70704d4b9fa9df1ea119882f400e682753a41931712c043c120a98f0fe786a600b47befefc9d64cc5bbe8a16c191490874e258760c9e4fd215bebf848e0b4d35521f53ec5f9308644b785171fc4cc3ff886e034bd833d59dbcacebdae8f00e43c151bcb24d1d226d1cc19ecf349361530a81ba3168af3df5536fbe52b3b93621f57959df298e5b4d3c14928d2ef7b9c977c7dda54242d17f8661978a62d94d565b00abc199790b9b25fbfd4a3ffc35c95ccafe35d9a138a2c24d17f06ae2cc376e822317f16fcbcd56e23f84ec135dc935e58c61b34cfbf5a36cb00350483b6bac786030e5c5045a6b61c9aba7dfaa4f7fb21897539863ee865ae061a77c0359915de3aacb3b5dc8cfe53c4d17b393c2b6bb23652f36390407922969d510cc97b99d1df4361530aef10707d7a021b2d9576b2d49ca88b3cc83ad1baa6d88ef8c81c08f8baaf515637b21ace9d5cc8fd9fe4ca6c3aa129caea7060791d566f4de8662b90f9e5d849cdadf9bd23cf6737b07ca105142663c30de27adcea11d64d433fe1ace84b0f6917c8b655f2a421602f07e0a7127e61ae9859c5e9f652ec82416fd2566f291f417ecdf99bf3231d02864e2e5a1cf34c13f59de9aa2760d8734bbda79576c62f566b8269990e9384a41c1634271acb4c7a8b768f276685c3a8c7f20872e56b683244b1af562c3e7dcf592a9915f44f886cc2ac5f679c07d5aa1fd69cf3a460f25c722073da336a310aa551062d92c7297002060072af2f3500b9310c239bedf45c5e985c2e0d60c7dd68522376dc7b560fb34d1b5089450c32ffcbff07b35a96bb6fe01259a06868d00af697f8bbb238d03d49570a109181c9576c1ea9d2ee02000cc23e63d6c93c6cf3050bbb15b6f73b09c25da62e5abd4c2bdb1110e1f25db39f04885595cd6a388c4726c8d4cdbad87d80d42fcaeae843e2e17f44c9aed25c8f6f9736c7ba1bbd3b839126de40a930024a65aacb872936e446114e706a868444cb140e53d976816983f3dd1d57eeca01eab8211b7aa8ae99d26e35c06ea4b226e0a6e52172a40e7f0df5f67759ae2ee026749ba10b8e33694c3e01a001526f9d75f6c419cdccece3ea3f78d69014e509c741214581034bbc7e2bbaf76db8421154abb2233117a1ffe2786b21424576e295c9baef262e80fa2edb69aff800b3ea436eb827e8adb73abc48d740b86c69d557b16e874038598b25f616afeb4f4a900be7dd0d38b5b6fb4259c51a3aaf4748d7a445f518485ed72b25c7df8ed0906b74bd29bd6a5724ac3a503c990f3697a5db484821f68718470810862728a80ce34599a41fc5bd8bb46dd845a4812ae1532c457ef4211d0e41835e5a6f030247614822571c930c727ba397e723d6b3aeba9244f054e331c82e65b74c9f6504c74b4301499a1a6f6269a3352aff57f88442d4eda42a82ebcf7776c5629f97d6160bffdd8282a40ce2e6375b161e4c22ee53bce7a45f4774aa827e2da657e1a1bc07445f0bbd770b7a5a25b1b469fd58715510dbf8d97af4e1b9459a20b08a8d3fa9d92feb32db95b22d36de0bc8b1c397b09970a6826392fd8392b2d790dcc1295888f42ac81ad213c7328b2324b28be7cc1f4fb8414a7785472f1dd3e11d66017b1756d1697be92490e15f056346d7e9126a1f35fd76cb016fe2841c8996a3507c4fffe7fc45026df10b03b86fb6cf26e8418926a030b5fa62748fbb728fa19dc2f8947468c1477750771e442e4a9d25b76d359211c05df788ade5b7824f8770b5dac0819737dec916ee59b28a49666ee8b7ca81386eec8049542f18a3207e51bdbc291470eeefecac385c096a
-MD = b70acba01bd715f542859a4224d035eb177fe7b34d5447e099acd1716ba6d00f515bd02021b5b3015d736b04687544de
-
-[L = 32]
-
-Len = 16
-Msg = 43cd
-MD = 7c5f9ed821a021ef1850dd4e0b179a656fbe27b104463720f467db32bbfab5a4
-
-Len = 104
-Msg = 5f75a437ce0698a7d8151c3fe0
-MD = 774782a9c3023dcef8b2cb83f7994324e3cca35323419b3914a9b6bc3ace5ce1
-
-Len = 352
-Msg = f88bac738d1e3e10f75e46e3fe026d7e423fdcf3d7e4028b33a291bb4aabca53f780fbf99e0346d610d4a38f
-MD = f114f1a390bfc30f34652751f3a38e8bdc9597625e363689459b80082eb34009
-
-Len = 488
-Msg = 832e5b78a73a1012ee62e00621db7f4d248893007c6e5d6e0e689c6b291baeebc72df9cf10b289fe20e7fab80a2399271d0ac63766049da875eed56264
-MD = 7d00fe393c308eadb8c0a4f771d409e17c9a796e63b45fc8e84c0cb2bdb62532
-
-Len = 13976
-Msg = deab57cdeb41974037a9bef5e292894038264eb4d8993d4d1501e6ef9c68fb0f571f57b0925640925deae9a6317e3bc4d6cdd5a0833e52fb48baca16a9ba9b6c8ca469a0555763b54f04c87d4e41aa549258f30eefe5a52d2ba06657a8773b0842e094857b6d8911d6a0636280025e56356fade362b4bf4c875cc19be0c6644b447be0454dbf390eb966c03e10e9de3487b90d0825d327c12495e3c89ad09c9d591e55c91376fb14c2fde9f7461fb25450df1a65806b65f3caf4d5c81ebc6e664871fcf915b9578bb70ee6776acc62205888dce2baa4024941209e81b4b35f0eda1bdcbd9ab1d6db6140bda4c41776fe675d5c681da5852d50c246dda4ddf9fdd7c5fdfeec85ff6c883c78689c2977584406a1ddef977606c182d6c33561c39c071668a2515e5aa6f4aa1faa392aed95b82ab32b79a15e3b5a07551ab068455131b72493126470f26c30b852e4415e1d8b719b3803ecc336e4facbcc5d1908851f4f39b776bec8b6b9794d47e5965458858560eed5a0305e260240c0849d93a19787b0f8c795eb5ba32be573845256ae6d0b0a3336e42a1beac8bdde6d1b6e0b6207903d4b105f4af2ef89bd099ded870daea2f170e03bd5f6f4490e60bc222d4876e16d4c58aeea6e6c400dbb9e9f4b2b142f0fc9bdeaf4132ded38a4a8366e107cac7210945fa2df4b124be37ef76290e5b9758aa3bfe0091bb0448206323584c2f833e0edfbdc0c33075fc9647a3404ca490bfab94302a0679a1a42fe9fec6af0cd98038b09ffbecd2832b579b2294f6ae5b96328fdc0a0b9b3a32cba04fa8bae3389c3951173bdc17caaefe526aa386f98670b177683d0b804c5875fe9c7afa233ee66349c9fd1b60bb0becf5e1d887e67fd3baf34b4f90d94699d18d6bb9d77d4af358f31edc254de2d6c5fe3ec07425c633b18c1b9e3606b78b40b543e1fd31fb578cf58c45744fc073fbf3c7d7d607e815379a5fc565892d81560eab8fb5f1ae6771b998c592e6d288014f13ab283d53fcbfa66e31a9d107308402191fac2cf2b799c7dae91b93a7676898b8a6e516a86eac58ed8f6d8ed2fd4d38031e4a4466dc8798b90c48e6adb6b4391d47872443cfaffa542b4b132f6c3408f0081af8692aadb4c9bbd55053ea56d8b82998f6b4b41d331891acfe6af1bb0d6679989978368ea463743b514866d2d01fb9950e8990867bc14f1db1142254adeccf3da812949cd03cd1d569e9d0bab7ca7405cc21096e3cd4d007cbb9629372e98584b4c6b97ad0bc314e1ab6ac71184ee555c01973570ed9b115bed956f9e4e349083013098b1e483f0fe44d5e9849f38a2f7ae152b36a266ea1faf263ea8c706632ba8629602187379546fc6b82e57ededd6d074c15c771754710731e07c207899eb47e8d7c72ffd768c36257d373375ffa06f9b3f0af11417f9ff9f9b44e1f1f96ae8aaa429af88b14da1da81c7bb38a0fe9372ed6a9ac6fb5e9e56b82593d94c5192904450227bf040b7ce0904789f979845e112a1f995c849ec3f7e49bd975a474e8201630f40fc0d80e76019f110ae158cd0f8da96ea4561f24237d8e795ebf52368218bff3e9d5b040ecd2caef4ab1e7127e53bfa2b3b4fb74829f9993ac703192aedef79dd9ad24c2c976638b4575afbce22ecacc273ba43379ed55ceeb51838b0adb80585bd1b5f2707ee16b67a7232adf7163415b24b9ff9dc94b7197fdc89e2a90d2b9eccde45e965edd064dc0d1eadabe11b8ec3aad2742b5d3323ebf913a92817749090c20758f98aef2544d4c8b48874e8936d7ee492d5585675c214deeb74fd67c4d170ac5e0aeefa607c6e37abd4f8238e776fde3921afab75cbd8f392d3e88da057903ce2e140797f4a85737bd89455e6aa27c7535687b78cd0ea59848e006c8de9c9c0cbc7a9f5e977be850adc710503ce4ba7c7bd0b042297f518abec6c8ef451c33e030251f506cbc3744228b6bb4dab86877d9e6019a0ea9f39ed37557b3b5527c171da5f013e0d3c480a038cff2c087d6e5d41b17e6c8f90c334b5e2b9ccbe9d4efd99fba1f907d00a49b71b5a08aedb644fed24bcf04e71be67b03cd20d53ccef8f854f5e9f7f28c1e98a8a53496646713bebe15a93f1ea336e6e8a4e68de5dab0fe880bf983eec75d1c5027357f6669e098411e0bc3ea2293138f5b34425f78b6508b94d4c0cc32ee9afaa409a26e5f2a1fddcd6d5ff42a89755a58b08f243957a2e208e24b055f51992ab447bc06876eba169c545fa71b88a0fc15d1e0be9d334a1dd0c86f44bd149b42c07608a9a30d0b7e13574f8d862f2ac72b2ed38904d7cab194fdb9e4dcb615f5610b24e202a36866baccac01fadb575df11dd43e00a3b92fcdd8c7702ea49d951e7dad2a56c075730b4af1ceda2bcb2310256f28312579fad40ff471336ea6a44143edfcffc297258d48bd2ea47efab8f0dc00f1e6dba1a55009ed627b7
-MD = 6e5905b22cb95e48b73c5a885f5463f554d81257bd26301c4393d57fff1c8323
-
-Len = 48824
-Msg = 5223e2fece634a95e1e7c83ad4a11a0478f4a41572bd66c2d7902cf4f94404cd80b1f58fbcb8eeba3984fd759410c12f8ee922865f363f684df5a8787c87ceb3086fb8535157f7f39653dbf5c66ae7219253838ec77cf1c6db518225c5ba0a8212e5911236474b8820ddcb8111b87320adb82ff553986324aa2a21c37ce4a083c89ce9931290d4c1fea933e31d014d7507a28e83aa917ccae10bed1a490e77fe501b299f8e3b78e659407ce1934d5d68c7980800746f26ffa9794ef1d23f793bd2eab7fe524e213e58280f441ba48b40162305335b3a480c2afeac11c27f8d817792fd7805d4b61224eb52d35c0fbf471bcaede505fbc9398b216f43bfd69b1a669a61d44fd21faae410af58ff95e1c3ff1528de1aba93cef56bff4d714d8c4cc88a4ddcda52444ec1208d99ab3fd9fde98c1ee6437d8d138f62c5f782eb4660c5eb28564b5b0d46e3a2546009148f3d02b837c5284e9f508290270b97b9b29e84445a0b4df662d9711e6b73c11cebcb7120dc427034b1ccf57d8e4f5bbdb84d2e1d4bc3862a2b51931d3c9a7a5fd6ee5f4c7327c338abd011af638d730141b6eafe63469eff50f473262e9fdce636eff4c5663acb6075a4fdb00c8b8a8d3322e1700a5b3e7db90b36c1a94991b8f51657121b442db6f890e208f312466778d73bfaa8cc0ead4edd0776155f3eddf9abb1bbfc0c94421adce83d7ee94f99f61e1f25a55fb596f8b40ccedbaa8e5e2cf629496f5ca60bc4cf36d917da4e2b973eb57869dddc409dd66d5061f22642743fe843defa0b19dfb2f56425abeb234181267b5c0d2ab4268c538510feb191bbcd1631b0af6c7451cd4c641025cd8bde2d9ab6e6b948f97c1ee6f35098d553e8e9da9b4d437125046864633f109d6a558b38b270a7dd1785d44d248a863a91e3db5c0a1d7ec133decb65e81c3402c98ee329f660a092172bf6b1a02491895394ebc506882805a6c93e767c0e58a5af717d950a206c0f0055cb39ed88816a9fe3613d15f608e486ac08bfa67d462d24e6a0a37716d3fbdaeb9c0e951c1e847fb884ebc1cfe707dc6e7269eed1c44331d5957bc4ac9dfeaed4b157204a3080fafb9df8917b8d15aff9c49cdc739b8fdc26a546794991c183fa523d14797e051894f48b0d62c2b70834467ff9c993b82fc1152c1f5479ec6144c7e8fb10d1bce26bd1cdbeec4e95ee073f3bcc3c7367328e30543d371b27509a577f5c79f14d5f687ce62b82f856695af9f7dd350543ec763de75b593f1859e44c2ac01ba65f98743cfddd8a89a38115badcb51a0ff5655f830c0122af6a830aec13ae5eb89a93755b3a5a6eca233f21cb12db545a24a5334becb8fa32c3d7f5805faeaaeea85a551fc62c94807faa6474c0d74cae79b5d8ddae07498fcc5b8b4f394867112ef5fad1c9da66765ecbc7fc0f3269d29c9c38817c77778f2c19b5a3c705fde9d76a4eb86aed4a7369a832ad267312903462397f7b8fecfa8b195cc2316cd53e48c3371ed2ecaa3e484b8ecd2e22b1aee910c51ed5d71198936266f5a00655d82c089f49295feda0a2bcc1a54ec8adf565acc3a8b2d74c30eafbbd843c59e67f293f6d8296cf7b611f01b57dafec6e2d4d411a633918068c38ef47b72ceff1fae772891141c3bc496824509d78165c1e4cd4b4989321a8722643eed69950dc120fa8da3e53c3181f252d7c4cd2cedf8f086f788ee77a98ab5b019828aa02108f49ea4a51f457f7adfd2220d3e59d5f4a29194e8f5eac40ff80312ff6888ff6393c3fc0914b08c1b9990d247ad80a441558db1ee1203e07353dd99a885a7ff5d791af2548815dde0ca1f56f89d39ef6b93dbcd0cd54b854173903c12649587433f0425fbcbddfb66ebce3eb4800dfddfe7fc44d9b23a3916b1db68c187da4dd13ff0157352814b1a792de7fff855761abc6fb7b93b48525fa90fbe3a51dea974069f3f5fdea86387eccee13f58a8eeb8abc6a43fd30e9788c3bd9ae1751b30a82d420225b2abdb1bc121b9073380be16107188d20be54f2e9c658d5b443869ea0e991c496104086290b6edcc1b656adf94f0d42458750fbd8d88040c518ebbb644f4dc4f7c6971d8d60eee0272df7b51a3d5248b4b264fb22195ad891fb6ac994ae5c0bc6714ae0b0b9a484edc576638b78ee89b568195a8f33ed8362128c30f9b0c7804b3ce1355abc96b15aa55c1e16a9e9ec90d1f580e7cb412a7e85d8585bfb950acd4de5865214ce4db7f6314d81784c588c1482d5f28c5fb62e7dd7aa8237ce9396ccde3a616754414cdf7b5a958c1eb7f25a48c2781b4e0dba220f8c350d7b02ece252b94f5e2e766189c4ac1a8e67f00acacead402316196a9b0a673e24a33f18b7cb6be4a066d33e1c93abd8252feb1c8d9cff134ac0c0861150a463264e316172d0b8e7d6043f2bbf71bf97fa7f9070ca3a21b93853ec55ab67a96db884c2113bea0822a70ea46f9ae5501eb55ec74eaa3179fa96d7842092d9e023844ed96f3c9fc35bbc8ee953d677c636fdd578fd5507719e0c55702fed2eaf4f32b35ec29a7a515bbc8bf61f9baf89a77aeb8bc6f247706c41d398cae5ec80b76abc3a5380001aea500eb31b10160139d5a8e8f1a976dd2dde5ce439a29dba24d370536a14bb87cf201e088e5e3397b3b61477c6a41e22a98af53cc34bc8c55f15d7924e7e32fed4d3c3ddc2ac8eb1dfc438218c08c6a6a8eea888b208f6092dd9f9df49e7ede8bf11051afd23b0b983a81bcc8d00f7d1f2b27cb04c03aeee59c7df23a17775ae5984eda788eb2015680ac5610fb1380b4e7d7a9cda6178dca98690449f5551b66ad2826cab2b662f56903fc95b4611bc86f7a834a34ddc3be7bf142c8baa096abaa3cd51ad0c0b6d15e590eab9e50a4c60c91061f1ed6373d91974c1ad9d263110a0d43fd8b596396cafc0ae70b7ac24a59bba090a6994ec483db7ed4c572f723670a11c724e8ffa2497d8fccae37eaa1d14ac1537eaf80efbd2e597b2ffac97f2bc3cd2c4017f170544dfbb0d9109478fddf06ec0981542bc8107a725be25070d2cab4716f4edfad75fddd582ebd363c49e8efaed9a76ee51f22304eebc232a4f67f865b04f610a628fdb317116666785fe8ca30619a07c83cc449855202d687f162b12d93b63af6e7ddfb7223d4ab998a5f450523c1d521ab76f4aa113cc2967e04a38dae07c51c2d0f44fdc8605c3c53ccee91a2c73dade5dae021cbc87d5cd6e5fbefb65335827311fe1e91921ecd66b2055a6102d7a976308a80c44e6d47a67718c84f2112d65486a558f1f269b91d9f47e3e11d09c0c748625bad2718e3674898abdb19d3644bcdc9317c09a3ac02f514b2a57e6a706362e5f6e8fb16cc83daea0eec85fdc8c367d84c9230730291440a4b109f7034d510a3f70a22dd4fa69e8b65e5fdf87045d560eec71f4e59531c7711d4f8917a96e22ad07346d2f92a13fb4569fa6a075da6e1acad1eac1cb2ef19ab452264de2357c927c6dfae6598cbc821eaf3b8da754ce91a96c702c95b2c308bf3a550cbf4d22d417745b5f17d36608feb826b862747c59d26a0e8eb96547a1852f9fbd095f1c5d20721804941d462f3ee2f0876ee2825c8df24c4f00f0844e50588ac688127013df8eba3c971362dd255420649245e880212cb3d732fb82f866dda090040f28e09cf1c86eea5dc4fbfc373eb69745b4afd841ca8e172d4a8510e7698345fd4cab9ec2ca0453a274720bb2d2e5468bf0d0f85919dd762fe3df969e6c071285e25c2e2a49659b8a78289aee655965bfa3cbca9b292a19a855ec40293185354ff4da9451ccf98abfda07f1137e79bc89d688963081dec641a99656b040637402890f185edb28e7e6a2f65848a6af158f90eea440aa6246a2e6c31f5d220b9846aae2027afe5a7caad6dc16b56463367cd9e73bf22a1d6172145de4565ee369c55e3b99ccbef70fb080a3748340fbe8f6b95ba46e8b76de5a3c4bedc37c55ae24ad02267da26769a3a732badac2e0f3a5393028dd54d78701647582cd04c8310e9f1ff1b433125229547130e1737a1f33604f0d670ea7221097c3eb9c7fa4b8293d7b429af76191ea8e481dc1da31344537a09b33404d782eda1d6f5775500c1d8efc615778baf0905d9fcba1806ef986c40b1c6a72335104376b58266c36f5939a8b95123e8635c0c95e80aaeb97379b1179d6332dc07539b595ec32eebd3a336a1128f3cf2e2924db6d8504a516b62f26d012b7f75cab765c8374a3824da5a405746023b51894649ab422d636513ee809fa181d5b6fbc63351e37a1b14efc8f739e86ca78ae3e280f1c9e4824b2976ec4dd308ede6171a7474c7f530128089bbd75e10f9e57ee17408b4384f99f886a5f63a2320a9b90eb9bf692e1fc449171eae3bb1bb17a6ed937ea57af3c82db84e073b5306683e1d63705b9742a085fb802cf5a1639818417fc2223f476c2566351f4b3b17a822e11255f3c3412dd39190e200727bcd3f9799519ef792ec7c2b0b9d0e2dccf013d436dee63483c2ce83c15c00a76c4d894a60cb90366ecf9e61221ee8bdaec66d715159876d8305b35c81f96ab2cd8f81f4769e9a6e439c08c329036f5d2591ac42f2747bc0e77d4e566358a3271819b6003b290211b9b847ab70e906aed9f86cc38aae27e1098fdc3bd5d84e66c45292183f198bc329cad794aa4e430534511b7d9a75104061b409676a16c1146af0a286e2de8bf51c4a35193581a902bd3224cb9257c961989042538092af92644a63d6d6f6872a29aceca39341ad29dd22354812c4b7c7068b039ac9ca7e6358e662a28be001d4aa697ace540cc3ed3c97b98d8c5a6fd3543ae9a7962c9229b14b0b646229807747064be3e83191cf24092dd67f675638d9f6510486379f47f5eeda870a3187946819ec9ed05e7b325bfd0eed5c9a0f4a2063d63c1a8a0a309f586c94d4a68bbe860ae9599ce204c92cf9d92cb460ff99cff9e5a8b3824786360e1e1861e71158395faeaebe7aa2f61f76190f174aab9a313f0bf4f1befbbb22768b8c22719cf3fa9ec908b576fa4bbc084b1ee5b5a7eddc89b58b45ae7b421d38215aa6e49304323eb4e202655f3c8b16ebd6b03058e75a907ee63fcf6aad5eb96c1e5faea81b88b5eee525c4663af52877c0f759432913b9d48030903e7f9f70e851cd4e20bc56aaf36cb02293d992b38b583b8f0b25a08c3303d8af5b1b37f5127f7021b13934645ef3020e5caadc5e7326ed4ff56f797e26cb986b6512b0cc76f1d8e7be44aaa88e12cbc644f14a7feb979d2ab66907063c51e052d0f8b25d827377fecc5111be0d365e08d17f559e3134cb9db294f1cac03150f4232f853ec15ecde55fd1023b58e83934869796400088e9177e85a2227ee45addd049c1d6b03e5b29dd570496fdb2fde7d8cc74fbb5fe76266ebd90a3b4d57e6e6cb9f0bbdb7ca03ae955915768011c714c909a27ee20135927af55d4feaf2c345d029a54af942da6f85f2103345d059f66864e6b0578111e2ddd5a1cd8bbf4ae35b60747b93f53ec8ec64c10cf4149909b102a2b88712ff3e5ba3611cf96585a6b36fffb64b8c37a114d6b16a53879136eb0b5e003a5a068e3e8422a4fc8d7c77227cce64ebafcde2437166b62ccf486660a7a2ef37012ebacca26ecd5bdf363feeb06aee39050974c25d6a564594c67f56fcf7ed48b07fab4e25ccffe002bbe460325abafe37f23dd9c145b4667f146a1635e462330f02470b35c5a2519f1350c02b263201ec9026cfc57d3659373910e878f2b6c1c5be774df8e01e775d476956c257bd0ccdec17ee939c46e5653d5813eda752ba7bbb245a99a5db1ae55d19692074c2e5820df97c502a4bd1b12929e1be8e9ce6d802347c3e9c4202de6046436c05ab55b2fcb2c227adade6c2046d98102cfd0d859a91f8104eb9f6f155da2acf93df2405bf2c083eafd3ec41d60b810e0bdef6298b21193642a9c0c646bc6771a5c61a25604d96bdb727abd5a7ebe4ddb2a56a6ddece26d8007b26043ad44279c3c8ffb7e6ffb3cd4e10ea2780f509a8a9bc31f99a7e66201195f1543a0a020f754d9a665a29a896faf673df6811379579891374c71b2234fc61e95d4d46f15d44bdb4d7c3b3be3f46410ca46827b8cca976d8866e8ca33c4945d5c87b705588b78015b529843af0b75a7e1e871fd276c1e947d896b92e6181ab7e3ccc7077bb57fe85a6958667d3d7a790f6cde1cebb494c2912478a0eca2bfaad62492e9f1caaa0cc520da08c0d2d910cd44255f4c2ca0646dc89e789a1cf9a28e2f99315d33accb1639cbaf0c94181b85fef648bb4cc7f66dc65b8e90bf5f3b763e58520098febfe7e47bddc2d9cdd5e40dbf4ddb8d51f51bde2e57432266d248d13ed09e62f66794d188f9861c50ec41f0eee30f76f4ece250956733ee97036098db41991a4a3eb7816196c8e447db3a2913bcd992174a7bde1f42d57c764b47f5bc09533760c1ba74943a0dca291f2746bc1fcc573f9a22c72a5eca347b1679683fbc8f32b08d381baf67b7266b14b3ba46a04a3ee45881ac452f64df1bf17f70f4cf9fa4dfed9ae70184679184784a0451d2f5c19c02031e0e4957b4df68b4a069a6f6f6458f6d773924a1841ba664a55c2c3187dd33416cd410e56e4bf8d3671cf737bf67df2a4cc4dcc786872b9e2dc4009fea0e48a749353ac053d80e36357d24d468dd595bc823017c015d7450fe38149370c5decf13b00b6b0e0a2567ac08b45f7b0c8a7c89d227219d051d17a706ccbea49a42035cb327381568eae23b5e2a3b7e8beef6f260d24ab224827ca8ee9d640dd23eee94ed02c9e26abb3053cbfaeadbb1f365a24d8769d92240da842e0b361524020b5c9c22a2fd8602dc9600aaf02b35344309f6bb018a94d4cbc9639ab7430657c4046f0b25df517e31626abeedd58c2e19aa0ae1a43ed2bacad91dc04a2fdf9cc33cc420f4f04379e95988ab36731d5d5402d89fb47e826f4243bb206124364d63564a0872f8d2826eebd9046c7c6f2e7c951e49d4b22a7eec89da1fbed890d63ef15f26422185143c89da3ee269f83e1de11a7467822146042be92295a585e3a09e720ec522e1cbdcb41acf5ac45ee892677ba3ff670d71339a76ed98237be252ae21268e756f05ba0b094a1803f9da84a8a05d0ec9456cf565e1b548cae95eafa0fb01f091935e6eff2413bcb15f605f15270408216fb5b41ed83dfa1454c522375e35bdefe54275f109d0ab450636ac4d8e4d9e27f2d81a15b8cc5e98549254a1c9162918db3e399118f5864774a9d6a2347e1315753071eb1204c8bf5f52b1a0da37e484ebbe545fdfe6b031215678c3b83a19a24d7b661f626beb01eb82b384f02f42bcad4f40addd48db8a92b90d2297e6143702056123286617f86fbef4fea940f648867d790b8f803abc5f4e0e3f4226954c296afd96e287e21b7243d05e743161810da578096521805edd81f68a45500f6a3a1885cb1f45cbd399dde024df65072eb973c827fca13eeaa3f140842016f509aa9ab4603d2457c92cc9aef24950697a0044e3d7c483b8d8391886cd50dff8c2f16de3d6caa7f864c1b3874750781b2b78b545a94b4da0b0036433c6561f5cfea50eae9f5645302eef18238473606e9b9931880d0f6368fa9970d1ffbe59c4454bf97f4a5e8091801b53ee4a209e0642d83605836f69742071aaebd9d813b10f4ccac03851ee9f20cd1351f8e68554c9bc5f58ad19d474ca128edbf561d195e52ddf3c19bee3bb597ac2f92143bafc98bc09fbda6d18dd4ff2a93cd2ba17f54f75c32d3f141468c2baef4e53b6a340286dc2599bf7bb002aa86688e26f5b51a6aaf32e48ffd539d4f3f4bbf0cde2d20138151c82384f9ff29a634ab4e0103d93340bb9a7b0caa108bc7fdc88d7de14abb17e9efdad2b0f304f0bfcbabaeb1b9db75959dbf54930e67aed3a9c8309aa90506b6b9ed4f1d06c4ced19746e206e1e9b8879663bf56bf6c5c920ac5e09e6579b780cb63e1875ef0a731b726864b7ae5705a2d6d343a4a213a05928b7337a59f900fd04472382610e2a8d25383c9ab5804d609e79a88d70eaef3ea22d3aa9100fa2a6e98e97684ade9fe90d6bfc59dc9dec3d3d8db8990bc2123ba92e64253235e9b4d682e8aa04e23fb9bb6248a77c065e93249de829bb2fc5ea9e396461090222816bb29bca37bf86698fb995f62c50110cf418bbe2078a56c5f1ec9fdf3d0b09a719ac253b5bcd00932ae058b86611aff51c8ca8448978615854b69b0216a6eb8050ce199fd9a13aa0fd652570a1b187f61e6831b3a960521c3705da8c5e6c64c7b196ed4a49c2912d77b670b177c6458a7a49ecc1ffd8c57c0978d2a05cd1f1c7ac9514dd14b7b0933a52cefd40b6452ca0903df1f55828025c7e18109a6e0f2ab25724cad2d6f57cb5d894a6a508134731e9b9c61254f64990941f4faf97394b634b91860cc6ec346aa666600d323c849ea4c4a0ef55acbc56495ca004f3fca42ff0ffb11b0e1164c95ab89bf1db3d4f575ff334d4e0d7d50e0c54c422eac5ef78c5a3be95f2e18872540fccfb597211ec79d9d47b6cf41e385b9c2e92122167fe584210f63bf919c620d
-MD = d7c901f0d92a868dced7e2659e90121108611dd7781325fc57e5c336c2279510
-
-[L = 28]
-
-Len = 16
-Msg = 3dd2
-MD = b7399529fe614af98f9ecd73e45790406883cb22e3bdcdf28fadd033
-
-Len = 104
-Msg = 3d232201038fe7d846ac1bd4c6
-MD = d0aee5482c509540a4ea4b902bf42fc8df3af6de42fb14e903d1b2e4
-
-Len = 352
-Msg = 44c98cfc71f82215dadf494d68d1d6b92bb4eb81fa0fbf945a659d9aa2c2302b5c93fd3eedba31e479e29d36
-MD = 56c22e6066cd4c4d6415c5a225257e7f888b317ba4e98eadb72b4be0
-
-Len = 504
-Msg = 02a5c7b1b749d6d49bed302d9439f23ab83020bd4d573906f4190e74216ad33aceab775f71cd31092bba5cfa42f0845bd16fc1b8bed6434dedc92f80b395aa
-MD = 33a84e66cf1ce6970c35807db25e05ca05809e53d4e34cda9bfc0045
-
-Len = 13976
-Msg = bd70deb2cafa75918308d703a6783fe9dc5e3d21de9bfeb6dbb1cd531ed5dafeec463a02abde302d4ae6ab3cdc2f0f94865e38339c88bde507ff71bbea6b30b9851cd8cf599e950b8c8e620c90adccba0033f934ca66ea0a936afdad575bb6235099beff1a632c9114a8045a0919fdc21083880eb05c0d8c489c7810aecef4a41766f67c37557e28a9db9a0d909c2b167ff7eba79693afd3ee3aeace38eb73a5a02a882cf89b123812cf2a0f6d5edd1d14362ce9c43257474def5cce3adbba8cb48e7af9a45e702a182dbf47e8869b3f99e953ba81628e502c60d4f8ffc551c31b3ad6ca85c52164839d5e9d493deee4d4b76604174bdb5655385d34ced2c1b09dd5a486e1f9ac501bc611f9d7aa5c748f496faecc14c6c18e1dfc6aee2991bd0207ea1701219955a751df43dbf66f57904675a0e9e6d7f9a0b8bb82a8f44951117ab2642d6671daf1e5d1639d48aff6a05781c2b5e8976653b0a164445872d393d30355acf0bb49bf2bed4265c9a3b786249afc7a438d706eadb6f90a7f93ad51bde6d2c8e6ff09dacb3dc67ba0d3030c54c8367e1e4280bb5903274191344610de61c3c770c6820a6cc9d826f7c743f88f13580ba23cfc00598fd733b5dd069bde7f10f2b8961c16b69761b0f308dd137f844a67f6054e065863f226141755b96645a291e3fa3fc853b2475fbe1d3b25ca22f4da4425dc95fc855e63d6699b311ebd5fec1c7753e6e81f747c808ec3f618f63eaeb1221075edff0532225c40ccadee304a8997c03920e7ce4e60e4df4d120611296786516dd4d9cdda2077ac52bce0fdf552e1ee89a0133f1f87a6f6f35f5c53958ed806465919a0a5fa42488bf29caf33a0dd469e13abae351d5c6fb1a800ee384da199c823c965d9d5457a3ef8292c4d9b142e3f1fb502da498eb44d95f8c85bcd6871bbdbf004bfdc09ab35758f5e8b6a0d0f366c3b255333c52c8fcd4ecb4536b5f6e72897649f3415443612d72c3436505249a344feeb04883f41f90ade40af119014b3c56fc108f1ab0a77087d9226665d416cd975e9e4605529c032e8926002a70924820c6c7e264a794b2a3beb63d69ae56e017294fad4d611cbd0d3847212a38f22d623eabe3b884a36464d8814286fff52c4dd366f6c2abfc2eb865e0dc9ec6e55ca9d81f1b8cc47e2629bb162e54655bf2a9e156ab0bafb4b8ce96858aeea6e6665607a3f268036f4890dad759486b15e3c9e791429ec8f11bae4ea7c490656fdb0551dcf0b0be017c08bc674bd97d9d701c3ac955e2941ba7d5f2ba122a6f0c1b164b1caf2d50df111fd4287e9e195d181f6f514d7dadbefdd4274edc234025b727680576046842a834b6ad89eccaff5c5209bb91d652357e3750d8bb0165572fb71d09fdfc60f6b1e5d868c67c0edead427e7aeb734e29b96e03ea174b6b1af523feacaf6bd745ceb1bdecec9251958b7f521182daddf62ff6c4f58977adeba81c616ff2e937ca4f16eb9c44e63f9e974709122083ae45524ff87d7a0cca33a90f09b660db0efeb393c61967de2564315827ef1cf42b71c0f822f471713c9d885a3c3281d7c95dbc96f1c6dde0af70ea11232b00a2d215ec8de8fcf84b6193b6ac9d46de660361aabed3371fa44a6f32107f3854262eac355f9ef98701f580b4649175cefc29950e7a0eec958f629999c4b0a98fd4bdaf5c0bd97c963b551f2220bd41ec00b8726836e949e818a49aa1ac5bf12c64fb9991111ce8be3e0cb9605f753dae1a4c84389416f17fb66cecba45d591b22d64e5a4edcde067a088d9ff7f5dbb9dbf324510000c55d50f480a640fb22da9b4862dd81080d61af9560b601edb5e3346263f5f193df97079a27e3f9876078b80ebdcdb17ca4c50aef0c8329c72a7f77584cd963e105eea9c28a2ad4e95c1d018e27d0e720ea59147f59ad796b80b6293da8a55ed47e8abdd37221db0a5eefff31688e2adc294654ab0fddf9c1ffafd4783f01eb539492cb35a77315d0ad19395f47b18298a7b353dcf5bab0b2f193ff73d99310478d2e5c4ff1c68a2493c138818edef73caec9977bd4eda6249c8933953e06d796b288f78b18c343ef561082fd03bf92b084afaaee741de3004abaf746350048294bc52450e31147173f2da13d6ffc5adc718e149f9df3702f414dd3ee88296ae8a0106b071b589e8696401da7993d58a9bf8e5bf417165498c96b4ff5fd2b45bbf88f551688425122a3737ca54b2992fdb4d60957a93097222c3cf4c45dabe18b9d6a69e6f27567d5adec489e4b6812c29a8fa52f1de642b7b0e749c16f54473ed5ca2fdf2199e885fed308fa62a3e0deb7e0b8e439e25b3e9f95d755fdcb7ebee9d73069dd57dd1cdc5145205882023b54f2c9dec6cced9e3f6d24e8cdbb8ef121b8f3eded574d81908e867af5ac82bfb8ed60848b4bfdc1d998bae3a9ca80c1c49601d11a40409c62b1536f01ca67
-MD = 60700d4ef068822d0fe6df450b4aa8e206b2790d6dcf973229a59889
-
-Len = 48824
-Msg = 5fd54472a44e4476d254c0940071ad42dc723354f76ba61f63fbb9df80d1ee56136f51b6982e66c1da83602fc08093506a9e2cf27cb92085ba5c627dd63f59f8850e91a1d86cb1d4ca38ad03160f3c584b128d9b21e935570e086d3815307ab8df396cfa0c100bf6cbfc0fd7a8258fa1a656bc178e02cfdc868540d8e5ad39dd46794a8bdc205e710555ee7421ca7475a4f3232e6a0cd55d4b5d4525f0bd7eb1e455931aeea6918b9fceb2a32706d31a6d7028a85e102f228417e2e7db68317ae155af70eda98c8dc1ecc32a62e294d92855354c1114c5735a3c81e551b63a81650107557f3237bf953989d17c65a0fafd2bb1e32c237f98f55389e8f8b0810e97e201914c487a68403c6d621a98ddc515780435564245d87ce462b8785def699f7f06ebfdf33dd1ed7dd5a3e781348298c7950a387bff7d1878731d7ac66ad9a6607f2c3a3b6843c2852a5e882a8d78ae9dce2a79d595cdf09626dfa6f1dba7d40ed21caa29e304e7dbd559a89bd1f07d84165dc259ef112dc6e2c5a3e82b1c50106983f6c4965c85073c5deddbe6323003d56abb0df590f69010981ab3407e43eeaa29c6156995c492c931fff1b686eda3741a0bfb9094747d1620b2580415d431ffd6c02245f6cb03e39f87e82834dcea59355b2ba663ce145d2514e15e2b2c60cf518ff510c6c3e2f16d2dc523832762ed8352a320462ddd4d6fe755350672038163d996b44ed3b85d64989291bdf39398cb996de785b9614ec5d4bd73efcfa37fd4470b17d6240b8e4c715759286b04c3d7d791e2689927c9f18320ff2e6bc7306c805e23a5de66eced5f1a630cb43dd46db515f837f6b824b99b86c10b6df7fcf22d97be05284edf0e0be597b3f9c63556db031339f79ac9e6c5f8a1cefdbb4b30f5bcd23c2a4dcf791cbfdd6460284c5af0621ab7c5571e40a87c87be459c85ec81d746930dea24f43bb11d6611ea83409d3bf4f987778d8eed1d5b246a2112ef78ef0252f9ae464810c13f02359441d289958b4766807d9a3be0054897d35b01830deec1151f9e3d42f92b80f4aeedd65c78c6e98afc562a3bcf6d72f238c6e94a38f2288ac7929a7a61c92875c1f115c0ed8d261a727f0794f17ceaa3dabc717478f6ce7f2e8b295f000241e154b4575bfac8483f6b62f9ef4e18f7d341a65faad5e2fc1ddaf2b09adebc155ff09e63d5aa5f95206e66c7f4ef2ae3aaf3ea7c93589efa8c552df8d203e0ea181c1703d7023b56e603f33b4adb9bf44f7af290d8081210f327a6c9b0785709346087fd090c42d2b8b2711b9a1a5173eb5e246320ee27867ad6c3eadc4407bada44561a12cf5d53bf0448308bb536a8a525eabc1410c3a34becee25fd6fda453251ec229b53751f2280e142c6b331daa659ab655b78cfb08bf18e40bb02b7f1650eb2dd4ba1707f0aafa219f21c29521581ce249e2e34f5656b0a04c00485079b040e13cbc038bb9f17f47cb8f908591b26bdc28538d8baffe4cc39b17d2ecffbb9698bc2b8b31b08424034c051b535e0cfdf07b7a0a54781e33ba739759991aeb72c0ed992cbe76eb8ec0ab12c182e8b049cbadd6e82e314f1bf15fef5ae95dc86bd64b8556766f8ff62c33492198e454e5ca59ea856d8e095c04da8045522abac865506096ee1cfa1082af08ca09b3533878ea3580b6c0c57a615e0ab768246b3eda96bb6caa01a2648068e21959f843d853e948588e8c0bfda364ef1f9fbd3235c27916562eb0214891eb55ae0e059f4bf7d1838b5942656c27899dec6d67b823a981d1e1e0aaff5323b0e3d69a7dddf9b12d7787ab763a3c7a2697ac65b655aefc4bae7e6444850ad2540d5193b378682c77a4dbf9aa22e517e68cedfd1ba32e3730ecaa2e3f6ae61a4f427d6e69071dd62a9bf6c860980c9d23ce1fa82a1937e6dc1ce3a2de096b680d23d89ee102912ac0bd769c1c02095678dbb00b4430428797cfb966b2f901480811e1b9cde358b6d499c9e93f0961f050465d7b0c70d4961e75a9fe40a24e36eaad27238231dae6d0a17f446c16bce7348e669be563649eba9f23be29adb8b10f462780a066ae573f74e51215a26097b02469c25180890e06acc53ab063c742e08d51359b0a39749b84b9f6be44f3ae3da8e5a2f340a8607d4eed08877d007928d332d6f49502bb5f416c46d866fc87477c58a22d3c5932a8d6298c1151daa032c84ad92f8f90b8053b5aa6f690d1bf682f314471cbf200f3d30959e07adc6488dd17b0be5279e727f3237b8b4b19b31a220dfe63882937f8d5ead677608c42a57217f2239614c521d94559290e3b0ed8055d5474e96564224f6ca6389b40a71337da11e1c307dead8e4eb43252cc2f1c49addb18781cf20acffd3db693b02e5c8ecc949b51b99005529e0149a13390615f5df6e0bcd68e1ca82b0173d25134dbf76dfe92daa085d3f6b1e4d18217df41b70c4c40101884c2886495f2ef8a473bf23cb47ab6533c93cb38c36c6dcf6837f1272fc91a6962b6e1386fb643e1f1d71fc75ab58d5800bf4081217cdce0c7ae9e3d25de543fc4444314f32067eeb147c08c55c5c8158ed11729837547f28a300eccc312260215f50e98c4e3d4170208a50a4a4def1243538f906df8476b0c46d3449be73866d463d422595300e160840daf8c906ae4aac13a64457853b0ea6d8c32f4efe3b48c0b1450250086d459648b0ab14fd3f341a4a803be77e56a811e7a26827eb0a1a9454f90bc6ece665904adaa3cdeb2c4847858fd1d79750e8cd45d8da9163784b8bd06629410502debfed5eca3cf8fef0fa6bdcef6efaaf35a1986d6fd68e0f436dca9442077a4818ebda4606a94a3c93fda46e7ef5ccfef656896a0d3d93566b02ed8c3f6174417cdcb99a415b0c6e9816d94e64b438c295b4bfd69e0d9ad52911de5509971b7370593160629b641d690eb2828bf363857983e3b9098fcd15e66448f786f196685d2ceaa251b17ad06dacd614d9fa78ce0a8b9c1c360b529d0bc1d17ba0b70ea8ac1b8d67f6e5770f0cbaee0b38109d26b09493060dc851f5fef121e83e30aab9c3efc2b8397e8362aefea1708f7ffa14d3656f7f7610f3a629bce14648a593250c6f309c02c6c552bb42984ac58db920dbc7d98f59295f37f3e9b99da55ef074ed65801b390366669b4c7aa1c483ffd23082793f9e5cbe30c34250f63fa3ea2cd097593dc67e8d27b7e4f07e73a9f7b33a5ef6962df1381a038d4f58fdbca9d71ccf640b917f631b75d4a2e8ba46c64a6223f99cee30f47c1a935dccc7f054fc39d3498c824e10cc3ee337e781a3971f0e98295aca611bde701c2359858914248f6bafc88232bbc27bd85883b00990bba7862fd7a7cbd4c86df049071fcd10d686613ec877758d83927cacc530bed9a596b5b21c6fb748c379d676de7e05719a867c9f934b5dad99ed97dcb4e70a9b6542ed5b2f086d9f56fc9752e788785ef8f7837a31e433438cf2f18f58be37fe8412f6d21a5c35000a5efb862926700079413f76ab2c3e79e20b516eba9d8c29897097bee55157936607cabaac41337ea4cc783c0809c875259f8020e16d5045fcc39ac796d11a82f25fcc9579bf0a010200f5745065175fdc15474ed514cc796672c59637c3c8f236cfc9c0978a3db1194680c58c27746090d76ca09f7c48ee4ee7e1d3cf0ea70dbbbd88e30e8814b57404dfd7c33727a0c84cb7bd468b0bcb3c89b526679c00fb0892d2a5e7a3d73698a3db53fd7d78460cdcf24ed22b5f39b8c00b3506541ae4a5b76fae29c1cd5b0f8c3ce142e0af7ae4efe3fa4c438a604bf4a9abb41e3fef1b9227a7dccc3f4d6026ca289b4b1366d9ed546abbbbd5677c8d582e79e2b544f18dc23809ab753313d84dd10fa3ed2f723f0b46277b8877d4f3e0665e88c50caf0f0708b746b736b00c8c83a7d18500384bd035996aebb7da8f09fd6af9b76fde7fbfc0ee854d7ec02950e76abd23ffb27a6ddf1772465016c79b98a61bd3940547b207b6507e32cb9761a5604f0f546834a8edac7ae06910045de218d761a4accea886188f947b57bd876491709028e2e24b075d6b022b51af1880ca16a8c65b7c69e51b2ad580ee058acc0606f0a3a9ea1cd4342bf4be602e941dc4bef1239bb9bccbc8098a6a17d63186c6fa75ec44b6e4fd38a3fe49c5eb995f0cb884e2f3ed6be02515fa605b98453ad935682c3bac6a2971bb68f4094cefeeaceda92dec803ccd3d346f8b40b48f8f489e118a17367801e85c79e9b3bb5d73ac44a8290cdbf83a154f2f125090d42e1a1cb72f5ebbd42da46c7a4d4b9fad9612a4c800de6467ceb74f831e1395dfbf5799a3429ba34754add4b34b5960a5fee8f752dae78450322a1ab3d7102b77e907fc1eec5355991e0c7d6c0866660e5436248edeb1a37c0e769a0764cfbb6354332d6e55103b9235c84eedaff918af3f0213c435c32ab409a4b5c7eed8ab6ca9e313dba459bcfa3ee92e7d669be0526856ac3c06a57fbecbba553a9cb4655a901d98af02b74098e478076655d325bd7639d73d7ae00c62fdc361a997ea4ff5b0eba33096b12f35cc7cc0eea62950b912b47c11b9fb386a47c4c15c0602d304b2541da889cff299a1fd415e7e25c70ee4cd83feea7e6a9c50c75d9b128458513d61ec5d0299ef8c090472fe0850f384938ed44d36f10cc2c1d31daee3f946a2fa18f9982a988fd6ac973b1569313ce3c8ff5746c4dd85a241f1e9dca0e904c091832ca028533a3e34c184edcc510bf22a27f530bdca3d057928a96f72dafc73a9aa6dbf2552598e468735cc5736c67a620e9455483e9cb2108045ad80569582ea93a53b491e528c8df336fb326ad74317bc1dfb8ec30a73af01a5dff3e437b7fe48ba5dbb3e8f01ae0c6fc28675a415f23a796bb6e0ef0efeb4b14cf20d4ad88ad1966da43a76b454dac8687bdd97b89b8f8eede91eb34ca4a0523ea65736ae39341fb32b9b716f25662a37382c16f3b9c346c84f03bef54acd6efb364c6401b07b3f7679e8e7f8c9b77b75e6e98b90f4df88460f1978d19744eecccb743a999aaedd00b5a94018e9d5a56bac9d5d55f6e93bad52e84aa7340cbbf98d56213d9dd3e1970867e3972dc98e61b3cff40b64ec49463ff79a41c82dbbcaa37a82b761f432849aa83a3d3c9a209e2207b87ae9ed9959ffced165fcb0d8873668c3cd8f18ba0f92f7acd2bf50416c22ce11692bf6132eb9f558dc789cf9776da94e48cf48607f19d9a11d5df4db11dbaa67a1d20e9f0c96f5956ee3f906e371c489efc88b0c1e56d881e7bf8dd5d6742622eb873e253dbe54f2e2e6d0e6136941de8c23e9a632727bb5f88c23170316c7aa0df28d8d07589dd6022828834f7ea9b4e5876a1704944aa3186dbf89e0e81767cfba03bfb38c55a9945209c4dfd88272c49d1745dce5ceb40f0a6713b5139dc2fb87a8a4888406d2610b7b910a9e5782ef0df719028d8e50a40a269dc9bee12157038522d06537bb31fc87d21af9ad4b2e7e127bbdb313e0a116010f65126cedadd4a122d15a71cbcccc346f55100e354b997154567fe3caccd50251d137c58fc3a2048dd5883b6af9248b51040c01a80c051b8a151a8878edf0304b5554746d6116b749221a1d0082ac925e6e140f0c3b6a180742ac8a50ce0e93e6399102f151d7c14000369ff52d0b537fdd51bec99e7271b1255c6fbc36d83408c417f6825a8e2a58b9054ab2c3ead69d97ea9947fec32d720653c123ecf51a9a3f0ed88743e3fb7b94aea59d0bf0219ee50825ef220554312cb907edb90e4d85f29e316ad57d3b90d859391fcfc63e6c0fd3ec27d4e1efd6e0b5ca8165cbd6af25ed8792d805f27fce308ca1d51335ed5d727558dafe05486a6f9149b8d3bc022026656714222830be582889e6800c0b170e48ebfd069e711210e4ac7acf07652a6f5051507de68aeffc9540cab5cdac84ceee46059ec23820c04b127266c0bf8df0d2b856be3377ab42592f495980baeddbeed3ba707a85dba64fe36941eefa8fd37204ec8c18df3852febd2b142b1c9a5cd0f9e424cd408ceb7788270899fd793db99ddb8f9ca8df550c513790d8bad37a1d1f4a62c4527bb64c677462c9b093582decea70c7bbe873095536728e7ce05d5cafb5d166a1f03055e918f787fb244c5857e3d7a1009bd37f30f165564a082c1510ed19bb1633811a76da70dac67641c2478c6b335f409ef54a2d0f370c9510d0aabae3cb998bd023778375cbf9cf5ef125afd584c11efbf40bb51839aacd3016e5e4d79f134245f952dbad617c78cb6f5712bd9c0c7e1303db5029640cf9b56e29329c3e6a9e0a2371aac1a437b9b1c4477ec9842aa80eaa22c5eac11b60c661de6ddbb088e844293ab8589c13d938765bbaa44301e4137148dd0257bd4c8c766c5d3bfe53671e9417cd1b52f622870ffd90f4e17b7a4ae1b5601a2edb032e353bca652fb565beea6fb0b2cdcadac71794c662677fb1dc81d116d94f5eced526b37c004b95284cb6aa2ac415754a1f14882595dcf4d3f1d905c6e8c12cf5a9d23d3ab55bdaf9f17d2f03f933e1bab89040753648c426b072b73aee8c2fc0d1c03fce2c656e20d4c96803fb2ef471b912267eecb4d6f342d3513894b94d77767823fe0c7438e51f21bcf16f0e98b94b23a10760271281cf843989824f7061bf834f93fd8d2090f70e939700dcb4d8964a19da39a9601a7e0ed9f55f567fc7d5682d55a9ba0e68861756bb549f2f17c10ff6bd2042a80477f89743d3d762f1dfaf230bb502eab6f4c46b26135ff3bef5faa179bdfbd288e3cadd3d88d8012706e19b7fcc6e9cc2699d3ba0e624e715599480d6b7dbc6eeea0d12a9236444b17285fc7794040dd40c2b2ef175f7f3641664fc9bb7ea6d7eb3489d504f8013d64a23aebcb5ce233405f5ade067dffff253f27e926431ad806703e8fab23656e0b7431916d8d4c72a7d831e3664e5f30839c76c8167b76f3b2dc75a6ef48df515e06ea54ca51de2fd9c5eeabb1610b7eef06a2f3167859cf82e1a5b76be8ed8beee2bba28c3b15af6890d7a37226834ec9f63306a0da11aff918753d8b83fe7220803c070db98195d6d18357233f5504a6e3bd6f30115d3987f93aa5d89aa0b8b577d1fed94da057a6f088233efc0f44f86798896eae9ad0b20c8c9cdd9d72a3f02213f6797800894b864cb44fed009440fa5b0197023929f9bad16f052cc2d87327788a68b9209f46fb4776b092d75713048b5453ccd699d19cafa8e9a93fdab0f0863711916efe3bd81ee71b8e0221e12e9ffe2f6ee1a4dc1a8de6e593480f3c05b3691e916a4a7ca51971eb2f0f693dd10f6b8468f8cf7bcce285938b5a0a76ef86acfa2990f88bdafdc39a065db17b845028ed2b7a9e331c44217de20440e406868f1eca818d0be20248c2948b8f4cb118b2e456e585949139270f57c54715f3297bf714aa7c5f72ed8ddf6a074703ffbf95e45bc81a02c42822c22d2b718f2de5e03d687a4b18d605ef5ae75f9d43c8cb4e77aaa0c0101d978120f29574b22f52783c667f7daab3e1f9cfacf2e68e94a24918e3fe2c4f061deeb64891b5217fe5908e7f389897751839982b7fb736fbfb1232684e93123611b7fc8fbeb74f8815b5ae13240051920f3b6ed34483ff673c467ed7f0a8fbf619796e485affbed0697415d2d0598ba34d5b9e44ffd12a5edc323883a2e28efe9baf860324f2d2016748503eac1888213926b0e0f0335a4b51820a2bd3b42d982ec6ce307b453b6385aed7a735a1e98479394147c40f01c532926e10e1b26a5b395bc150ec4b4daf5b1436bd0baa225583ffc9d9e9d8a354f60fded37b41c7c051daea04e689ab2d4e24d7d07c75c50ccfd6a527e024d1632246c6f40f06b86ffec0b29cf894b665d53d459226b93422d37a8da23587fe884dc3c0f2fb55dea296a9a5b9a0d101f186d9fa6288c912202547cdf958569d2cbf235740eed38d10b0025dbb6de31058e98780d22149c19d4bcaf06dd7353fd91cd1f47e47f45622e1472542be2f63f463d253617eafd4f2ad609f9020884905dd5c22fba53ccc619104b6c0203a7f6c8c26fc80ff6fceb8c0c51600c2e46b4b872e6d597511524545a76cb42278b519d911e6c1320e01682c551e204ccdf91290c52e0836167a5685cbb1af338eb794c10fac92950f3f7956acf28f1ca984e380bcff9876b0c71dc7ce4011d1d0f955da9ca885c6e7bb74c6194dadb0fb9146dd725c8a9574aaf3824b727c9be3fce59c35850b162c17d3013689fca858a0a51d81cf4f30d6a8705bbfe35ff03c34cc7c56aca32140d72c8e8121fc71353596b777b266d75b322c9a97fd2c5d4e2362f19c99de66da7bd9c495c03d9a15b28431a0c051e786fa80f5503a72519e6b419263d72d553d688349c0cf30918eba0622b953a0efce4415c29515c26ba15f00e548ef108afe3f8194aeb965e5e4be94f10df6c45ea5c133a8c3398d09fb80f950b83c1866a1637d2bcc195e05cc32a9233b244cc2b1d4930e66f032cb1163c37b3e58b576ab76de759569797fa9b8bb4fad66aaaa56f09c7a0ce4641d6799d7bb47cf684990ec1e08871458c211a353ccf1285e7429c7b8520180918f7
-MD = 85747c796a910421ecb364b4b4f0e68b49e9217944f6586eac4993ec
-
-[L = 20]
-
-Len = 16
-Msg = 8a61
-MD = 60bdeabf39efdf21ba9c0f94af6552d2ffe699e1
-
-Len = 104
-Msg = 37487aa02b03bdbc6bc62e7e26
-MD = f146072f92dc4a551721a10bf0b01564cc2b43df
-
-Len = 352
-Msg = 6ecd002568bae3bf1873993041bfa292eb94e9ad092d8eb3585be82e8a20cb36a47a06e7a57d301268a4a533
-MD = b0a2d6033cf1d8ff120a605b745d736ee4aa06d2
-
-Len = 504
-Msg = f6dc1d2f6b8e126d99939664693d8709513f97d730074ec2794e536d94ede79c81f2b2ecbff3c2c26ca2d181ada2c60050997f3bb087ce48d956c18dedb227
-MD = 395dd2989edc854746e384f339f0808c515747be
-
-Len = 13976
-Msg = 07a6372c863c7d7c6764e4f05addbbe161762735dfd2d23bf268e2d603cd28de9c369ac379390473e1d3fa7e37af1178cca54fa0f782dfbe68070952b93462ea46c640d43ffe71f5fba42df98f4c48ada0d8aca8753e0731508bc15dff283178ae5c10a6ff132eca5dde63a78d3ac94685152897828eb25a55fdf140fd33fd4e7b03f283e201a1baae8986d25603fb0b2566aab345fb48031d648144dddc2e3556c0ceb1104f348d96ae7dc0152e45c625d21b46e70c31f250c858aec4ab2cf5e79d8c79b0854e0abf5330b9f044113d306161968f4ad6f0973160c9dc296056d5a11523ea2b56fbce8387070fccc639ec1c65ec663b9dc49aa880dc4ddd3020c9d44ff7e8cab6266e436af19b4ecb82010a0f8f9469ef380034a02e3f50051a6a3f233dcfe9d553459dc1bebc538ae0183448c9405c351271dea808d908480e61e9793cca111b4cfb9874b799626a1bd9a0f6e0929ad51b97ad81b2438f5fc255db3a3dfec9f0d8393c6b245b03d3faeb58021db3ad391b17a91174a66db4feef1b4c889699bcbea7928f4d29be2d47f76455c8cb1dc7da9cda41962a28ad8cd7b39965b809e7c7eca1c6792c1ce1c8a4cad6290170e91fcc49fa5ff64ab433b4aa081c8da2d9bbb072f9f18ca455469b946c877e3006b34ffd2219335b30ba2e0980f43cebfb629d0b11fe70dff28883ca012c6ae4855fcefea20a08e189eaeed7eb36ed6db3835976f4e60053205805727c5eec15d0e9f155637a9e66268b9c1c302bcaae6ae88cbb8cf1668a487cc996c4662c4a4e195f094cb31c717165e0e13718f8388957dfe0bf69c70cd0bd763dc38c530b67b9c12244fcab8bd13f602de848a2937699f9ef77944e5f22e3b470601789e1838fbea9359c733aaee2c7082b02ee459b7684ef9bbc200da4b62d368351f5520a65ffa506dc9b097117bb7ae88d04d85fb525e91327689ec0fe86971480c0e864012b1e9f044c7d80a4e48c07320dd4292086e4c71d4c98dd826a9bfced112bfa2beb1ce85cad204451ec45703931bf637d4fe89fe8f485620b7f4b21e011a232ade7a8c92be77925e878ae0bea9723749528fe83cf89ecb9616dae6ca0e8d5754ec6c92abb21108c2f33cdc18c6887c430b72c5b193356494cddccc577bd4c2cd53188f352846edff0c2ac7869cb74bb16a77c0f0f194a7a9477ae15abb890bd0bcfeb0c39381a87f1d05319c7e971c10e9ef687f96450b400e25b4285032892b849fd5db8649cedfb03c88defea063ee144a1ab1f3bf05f59c7db364dc39c11a446c3ce16307d78d50315ba29f5bb9a57438564c8c7b3e367cd37d74b2375a4966f47489dc5448f4979428abd32193d3840aa983d3020a9f29d760fc7493ab2576c90b1934b799c1d0d55e4f2caa78f4ce61930c79dc017c2dea0c5085d73a3b0e4a6f341e9a5061a6658af11e5edf95bdad915ac3619969e39bee15788a8de667f92f4efc84f35082d52d562aa74e12cc7f22d3425b58f5056d74afcf162cd44e65b9ee510ff91af094c3d2d42c3b088536d62a98f1c689edcf3ea3fc228d711c109d76ae83d82d6a34dcfbad563cf3726519b519fd48b51741aa86720836494b7a589c778927047a25d73508adaa401e9a6c0767a675e31c5556cbe35fadc9671359b45e985c3c8af84113989b299ae4474b85e4b5d4b0578ab1e8a2915a8df97c4f52a639fe32272cb91bbfb721505dec46d51383cb8973425a714245c2e37d0577fbe0d66381d9239db1f08a380cf609dc699698e0fada2caeda44d58d766c4f8214b10642b80b8d7d8add7cc41d47108ab7d07dab71069a2d982cc900b331caec317942122158bac6eac9175c2dcba0c04443aa9188832b553f5ca8c336880824d6bc02486a2b4c086665d276aafe3b1b93729829adca50c44466fd5b5cb977aa78fbcf5c0f0da1b09216468a11493ffb39efdeda5d669ae92bee2f2fb250aa1b9cbb11c36c7a6c6dd26cdc3cfd572ffd8c1dd72a13c27a327a34c6b6b3d80fc6c67c72152eec0c8ecbdc1bd5cb829b811e7f29af6d786f4e93dd4c96fdda295a6aa258d7b2fcf291c2d68e0b1866032475964ec0c6f2fa8c2d6a3936ecb187350def4e818507bf157c0e9b33406be7660605af14cccc9c799b4e051d0d0899e53495bb8931a6e2984bc6dbe4e02ec8b4642fc2f1cb5fd5a5520b48cfcb49e1f9533838753554dd98b6a1b8a67409279df477330e5f37367e06247ca5c3ffefd00e693dcc0c9c30754121c9ee88a574915b9e77c104fd2f921c2c096573951407ba9b440423d76bdc6fc978237a6e302cede7f99038ec31500884775556941f1edc30e3a417b0e02cb6fb5bfbe5cdfacf4006411287bedc565fb06f1be987416407dc852254934df4ab59edce476f3506e65be6ce6ddf91038642291fb8e92ba5b1f0b105670905a2c14796110bac6f52455b430a47b8eff61
-MD = 1adccf11e5b7ce2a3ddf71e920138c8647ad699c
-
-Len = 48824
-Msg = cd8490c93613bdf1f284b94b330f6d6f45a39c651d2a160b340e2eb696fc6d1c35e88872845190d141c669de92a97daa5433b1d7b0b899fdef2ce74b8fe72a7296a5b5be26d1dc86520367c730c7400c2fa06f91ab4c48a7bf4ae35a5b9acd5296c4fdf7451b0ad9cc439b4e34f11e5d7ef2bdda376f8dd34d6f092b219dc085dd4c4a6308b8808f588eedbbc7af7f64e83182fc7ca7cf4741a341060a7969d31445834c982fa8739ded4555108acbea1666a83da17f77cc42ee73323eb53203e3b790f81c08e94c44678b6538096ab7b09916e6cf7ceb2af85987f8e4d982dff1ab59b0bdccaae1f405a73366b5c5935dd0b43e2d2894290ceb66a0246dc02de728c5bba30255fb56ce8107c3144246c5156a8fe40ada9126adf67227fa56b66c37be63f532516211ca012977b04a97916f201f1baa2629eda520b51508ab4229df2ceedce406dece0110e0a911464f69e7be38fb91deba0addcdb3161d2799c628f5a57fa1dc37357c947681bd9c36f4832c20ac466c0c245de3b250c33282ea1a02d007f03b34ed427631283eb614db4d521f555136e7e42b4cfbee8134c63dbe3bb79b5a8b9f9f5b9f5ac61cfab1c54d197f1e3ba613f251eed616df952d691b88a16466343ef2d0f63882ddd2d55b8a6786308b2257f5d7b38af166bd7f1339d2d8899c9eda8fa86215850ba547450c267eb3c9147d96c38161a69d1584e521ffa23384313a1debcd37f72ddad02adb3cadce7ee34b7c1f42a15d0d030487daf9488aa7562845a11ee7ffccdb38b300935caa31f78a4ff3dd93403cf0c6a16ca611b58c736aafd33d6dc56f0f47878211d26f6ab801b9453a7f74b44593dae0f047ddbbf2c902891111729edec44f69a05944b18e7a601f41ad24fd6833da3dbe3029bd390de7c9841b2ee2b079b2bd2737518fe1bbec88da64769dc36e4a8bf716c219b2fe059d7dd220c1ed2c59878db5bf8b198e0689edee921ebc0cd2d3853fcf57c363050ce58071c5fda6ebcfbc1bb62e9eb956286291a108bdd4191c4ff47900d6068e1ea26b487649af119b9bb15dfed804836f2196cbe12d8fc86e3d7ce89b52ad49dc9ddbce5b370f73f512bedd853039366612453733740586d1372143b09f21dd4dbe1a2bfc308db8e4098c5e4b0c1e16141ee50e85fafefc4e2529b3c7252af37aee6f86e19df28871686107d7d57dcc812bc077602642d2ecefdd5f694b8f336913210793e4068da2178600b1f41cffb5221c9b4b6298afb47e85701d7b1a44241679d8996f916c81ff437261cfc358b9ec42a2ce16ca3bacb8690d6c1d91cfb3e0bf1e7ba45bd01606df856fd03c7e946f7ab371a89e1fde86d05fdd97bd7b1c583b04c2ed2b5f6815a460645e4e1b4e950bf6bd81dd0352d1048df85266f1696534aff5b1cbc17f15d82cc8e0c0d4f0453f9439094f8e0f7f4bc045b654d9a2f1f44a9c57019f63ecc41021c05b5380675cb56ea8bb691d79ee204d2c4edacde3c1fb3f4996a11d84b035f965e74009e2ab80e2c7ea3c84a834d4971a1e9cf423e4ea67ee526eb3c3e4c2d7372c4290a0741e1fcca5ae4cf36705abe98ac81e98a5419baefcaf3093a7e0449ef1021f88ffb7ad21b2677e41cdda12025b06542c4b2564f15e0b99db43b7c7020028bd829372122cd910227cb07c53cb58fd9dc620c0491f3e2bf883fe6ee8cb1f5b73767977d857e4513e8b5612f6ae4b56014e6a3ad2a065b65472212e2f611743484cfaef860999d1dc5608c58412fab888ad72bb87dd9b55b692f31e252daf8944ec5c02a5a9c23903c50dbd845f2fcc3bc9806af13ca7b025cabe675195b1d56f3fe7d7bca12530bcc0af217efcb03a218bdb6f9726536ea902c8303b02e3ced22be59753588b5f0e2f3419fa5345a942dbcdf3010465384a225ba26cdd0f1d74999c69f336bb6d01fae5cf81cbb8c1a7a29c1eb83ca6b51113bde56b8cfb6a5d72557622a37f039d090a689accd02b57c691174338de8e05bb3620c079705c969c58e56b079dc9eb44eb0fcebe548f5a31f4072a5ed56a2f03107bf40a359b2601eddf53cade66f294cfeaa40a0d94b9c90d15f61852f295d3911f8ea914d015885c8c64540a83badf0021a416c3e37b78236a2ecd1fce4114033416bdd3a36c18ec13250ee9c74c0fc4dd564b3d24a825802d5ae402a53bacace115ae3bbb329be79d1e5e42dbaf0a6446431145fe49b86a8703c7c41f8985d54f12e314c16ff89351d8addf66ebba2783f2d1a11965182aa0b0dd2de53586c5a695c6265c2b173958da648611090557bdebf11a1e042f089fe98e049f4796c60d26be38356fe020d9ace9008410d53a1bb7db78b52ee44bac364213f5c59f1eac4e3314f3423b92fdd7a6156608111ac6ddf58385ec1f3df12061208db98816ac948d803fad10d5ece2018c60faa13de5e5a9033745c824932e53f4122a39f635813545c1b74732cd55642f19ed6deca1585ebf7242c849bde981572a2199066e9c912b2068c8f1c8b936c43ae95c6e22bd7b80dfea05f495d751107da5928e806d0af905c87b5a0795df146af6580d8f9c6a0e2645686d43822ce9b4be0bd5937c097917e048b5af71c7e7521d490f107e9231ee5bd9fbf0727ba87774ed24cd52f471ffb71849ebd55605996515bdcfe95bb1df3541e7c42da4166dd01ec3597634aa6455d15fe14af435e8d7a55ff1682d55a2da867ae63d11fb3fd987fa5d7032ecefc35d3fb9570940e779e13da18070e6df5292f97f2a281f9598101102c955fe4808a2319c85fdef3d55b19e05bb8c2d3da64bafb67a53491513a24f6f0804aa162c8a7db25b38089373fecc45a0eaef65dd9be3b4b7f9436a5423fdcdb5a9b60138fc6a2261225390d9ae0d8ab7f0f7ffff69dca06881d33a637d634358abebb333df41151f239add91abaafc89070cb2159ce3a31655c22e4696c9fa7a7211d1251d4bb21ea4a321a3dbebc29d97f526251e40e548dcd7ed07587719a266f006179dcd22e50b3705152817057b097b043ad63b8d867edc20aea9b4c959ef4ff70f47128cfcc21e31f17978ecacc366f459ac1cc459a3976e4173ca322675f84f18036119ec2f204c3fb554a0b72f7e9d8c882ab147b3d280ca9dff7b9160b1b437b901f03cbc05fe05c6f44824b48aa8da52ae7dda1653fd500f9ccd221843cf76513b3b74d094f14d93a00d7cb954bc4cf2f04f9a35e38edcb1e84f62057647dcb3571f1dd296ca1e049f1746a8a282e85138500e7649db756b2d2ad88f11c471c89dc6be2cd43481013b8d0ae83da2b855cea7be424f8b2325b1850d1fdef03e765458df4513d57c72ba9751e1edc3c4e7f97e3202bb46eec7be89871ba3704aa6c6fc08851e551a3f655fa1fb798d12f003faf31c56b6df399a5dd0ed29ef9e4139dbc254bc5d6051840a859eabaaad56324588fae881fd638d2b70fb3813402df61d941ab495588e5fc3823249bf9a03cf877902394f512de118edaf98843a5445e9073fcfa409df3db0221f1c77e2dd21e74f9e10c9e180dc4ed17010eb949c6d67a22bd5337b2c68f9eccdec778ece728e91353696b742c8f5a3a569f054efb8c1ed478ee9b75e26c768a5816aa6bd08a4c72e745fdb5deb34ecb86b3a84346c1c70f9c16fc45bc0421f0da2f630912d5079f390cc53b78e343310de722b53d2a3b4aa386caa0d7e91986e19c3363426ba30eb5284293af81d00158a3f5233327b40c3b989725ba7dd5b31ac7abf8d3e0b737e843065cd7316dc2f374a00bed4cf9caa0d6e232c854df1bc24c3d484bc6bcb14ec770d5745474dc6ac3b3ddbffc551c9fcc2c56a5e0ae17948457c01e701bf1554022bc2b7d9dd42b2b91172fd85e6874d2d61fc7b3bb3cee2a9bfec09f6d7e98279c6f511f4140b116c856c1438e34bca59fdca2409f025b896a52d68719bf93e82e7d89bbf798991fda0af8d06d17f39eba4bca09c1fe594b537ad4c9b94ab52c895539d639425f9146b24b016368a638e5bba391bc8763cae7c52ff9c496884f1d84e5e08ed451358ecb3c4919dd410e82cac35ae744078287c05c89b42999ea6b8b127d40d53a5722d45139e8bc507a11e7add7fa9ab12cc40afeec008a4668e3e6440f27bb5780936c0e3668ac51262390c79b3f21fd041cf36ba3522f3a552714ff188bfd554c60d0e7d11213cf7d3864a5175d4047c2f3284741f18ec22995a5b82bf62190151bc1529c6d9927f9b0c1dacebd9c2dc406f7f64a973f9a70cff6e3abeebeb46514bbf2ead382f7262d46bd43d88c1b91a9011d1f8ba81fa536a7162aee2b2ec6fc0f2d6efc87b98d2e41e0f946969da659c21053775ece415a34d42b6cfd5bc52259867b411dfb991461ca618052309ca9c96468c2da12dfab0e822ff3bbe7ba281982a239ac19c47024fe1f0e3550cf0975add1f680a9dac9b2c4ab0aed4f409ddda6765eb8a0a9d1e9d07458c69ac8195541219b18efcd06c0001f2ae7fee2d404666a18ca3cb3aa4f0623e86c5b1229f6c2ca28d951111294b91edc52730b6b2c46e000672a7c89b2f38045bd3e37dbb8a75e18687a514dcf740c87a34834d3c3cc8aadf6166ec0c42d2be92f90a3af49633ff23cd80848ceb57ac550eaf9ae496bdc6a2d7cf50fe107895b4a1ed014f78af24eccd6a07420f1dc0df1e7c44b4ba937dd43cab9c798371b148325578d61931766af02b45054bdc2d9fcab2f4b49092f6fff7c27886820739d6140a4a905f0020249e8ae8dd87da1a1e7b1851eb01045aaa72dc8a2bf68055e7aed41d85336648a3405195d2ab61b0e29a770461f32fd05e14c17d72c5252f026a7b9abe7ea9176d3c46f6ed9fb716758d97b41e4f5d81a24538f763d83eecafafc668422612b40cfc32b3354b24755fbe400a2bfed494fe6d0ba0051713b776e67e2f1915e94708e6dc74b398f2f526933aad8fe7dc32faf40022606aebb6e0756b994c3176fae7640ee06d6c67bd54764c4752f1bf831f43e0227cba101174c5554ce26400f333dd8e9f6db1cdf670ce407d7d06c3aef4c0724b62edc8f1ba3e04f0e394d15a73b9255abb4d6ac70303dcf9160d32dc02d4804219ed5c7e3b48402e58ab2f58305f9bb95d2a8759947de96328ed5234cfe7d0b2a9a014df7e4cd0ae48906315f139b8635d2e6bd4aba32e62b8906cdfe5622c411bf0373d0cb07d17bb2bb5b83eae4401c243605fd1df759fd0ddc704ccab5a9776c40fbf6bde0f11b9646c699f26063a9550ac228c9884c277bcadcc0a2c225dc203e28e253c4e464b23d2529d09c7b7dd3c984667372472b615645f294c4e3b0797f9d1c234015b78502d98bfc04f1fa2f16cf3e7221d5794d035e4b172a4d84e679cb1c82df2fb49d3c6668eb1661bed56705096c2371a19d668832808eedd9e5b1256c18fe7ccc494e5e29145d453c553ec86fb7f3a634d0d45661875f2f1005ba5e734c1a976f37cd23450e4606e32d027bc9ec2edd9395e14b2082179bd7b4f9b8caa2d00a2de71d48553f7d4153cb56a1b08f11925e4b11c9281744ae9171f3d6faa3ab3f88c5c34fd23e4f6efeceafdcbc07686ef56efa62c0ad62f1cdcb4d3b5bc508c1f05263bc347158fa5495828f34eb7fcde98fefaa82bafeefed3f4a58968d751c051b52e0047f066de5be533bc3b1e439ab1c8602f6c67503803c8fa113737cb8279f358dbacdf45432b7a654d0e1122cca93420e956661d7275181c75b0d9c20e84c7007dfc49f27bc00007cf4ffa631c892981fd70141d532fcd51de5c23fe0b7a186d0dc296362f235d61698740cc315891cc9342da17843bcde274c17e462263d0e8b4832dd9075a7bbb443d4b26b41e534ad5551ed5ada102175e695363fb48d6b99ac978a3aa6f405d87f983384ce35740e930491d75675337c5dc081e3d301228e61bde5cc169968e5b4350cca2b085f9f75cc4b88497a78cd0a0073d90246c7dc102c7cbf3516498e8a41aa85d8cc5bc285ff66e8338e85ca83fb6889e2bccff52059bb9e92e92c155a349952680ffd0a3c346061a53fdf074417fc90c4d1af7c2acc3ee4b080752cbc9455ba5931b7e910f1e4af0efce905d2cc9c685923ead387fa532c0e8ad92719c76c281cd010e1acce500ae1443838b8afb48af032069dd07aa4df0d56bcb70a64592633699c8658102f1fbca441325e27f1732a7a973d8cb3a0684d72943ef6f1892f2d7ccf39bb6dfe5801ab98653bdbcfbb787bf125253be2624f6cf44177d588bd7b780d9e3f4e3a4e50b8a253fa21abce6a94b9073289c76773b46140f5a6e46b9de9ec066c176f5d1a69f380e1901216617363362d13ebb26ad74fb008ec08841550ff14ca800a1ecf2e007ebaad9f4e0d9664448d60ac0d8544243129fb81c1723b9b4bc2ee971dff736d9fcde0afbfbf5c50a4cc06a4c363998326c17bdc9e2508651dedd9a2a52bd87f8693cfcff60753acf9716c526e8635f12377e36564ae55d0fdb3c7997ec4dbdaa5b4d18c7b660acd95060831795da7d299a5a8d8cf9e92537dbd3ef7f56aebe38fa97c41da6bf0572a0270be7e5a7dcc0be3529339464c811052b65a938e874ea6da469c7d8992ce0aff1c75e82d1621ecb967213c65f2de582cb41de3804c507ddfc708ef3f6096ba4491e431160f98de806d0f334e03cfb7a3bece601099bd971253f3aa0df845da8b478603d5d88533d0cab9c89f2dd9a1404cf8939ffdda652a94093865a85fce2bc3d7babcff7b9f3306bd76b9af80c78ad518f89ee73b7a710da604e72f4927be8d65d06be2e0732fa786a83e27597cfbed9bf98df445499e0746b9f2cb9659ac0a9cef433148521f33b1d78d13c8441c0d1e20fd93ac450a3787a2292bcbd68cd1f961d34937be9a21abaf26f361bf53aa0c095e53c51f3e04d567eabe6e40d96a17c2bcc9230b18f7e079bc549a314b4ae21d30a3341aa205bc75c7f1d21b0a49549c300faeda243d0ce18da5e66c5b663cd705005dd9fea0a9564174abb797d64c58fdab1fae44576d514b75eaa31c9278b15bf9b6df7c6c2873d7a56fb91ab77b83761a09f9e1ddae535622fb87f7462256a60dd39dd3ceb6690b0272920b635ea639daf24f95462c523e5bbd8d8407c61163ab38877d5edfa04c2a78d4d240523ba97c7d01c71783f8748e85164b4dd08c25506a4ed18300b42b7bc6e417f512ae456ceec2ffc83190991a06d4a58ede215babcd3688e1d61f1975016244e80c88ae2aec05c7eeb1c50caca72b3b415b6b870bf5e10bd1ac3ba6b4acb1d1afac554444d94c97e171005fa4ea9c651bb4e527ff58d0c2f90fb453a92d6546a26e9e98395b09e8471bdcf2a145aacb649708cf048a7856ce8cf390c107ff2c66efbf2a76c5b041860ea576103cd8c6b25e50eca9ff6a2fa88083fe9ac0d1fb639c516b9bcdf23c34c6145a705498ff9b9747f15e1c08c63da6efeda4eca02c3f00dfec06c82220c9de840040118dde76be788daf84e6a2f44c81fe6defcc474f99c51c4648d297cbc48f081e0809dbda505d020cbe865e430e0491644ec8c52bd3ab8ce8c4862990f49fe2588caf804ce9500ef42d5a50c057c257168e283e4a4aedbe4ccfaf3eeffb212f9e23d15434d60bf4f455f512e2b655aff3225d1b217c261110cec0400f54dd303d6231d028c2eb649bccc91d30a6391c88bff9d447c3cf35a3467be5957e0ea4d4dc237c9f2c68ce48f658f820a3d72d559b60f233ce538c92cb148808e34fedf2d648c21e7f2ea29a77270c393bda42d869351d6c085d965dc12cbfd0311b8bf604f4391d378781eea3b5f1e0da9d0d8f8de88e56fe47d362cd46f591d3ec0f7cccb85a21f21ddcd4107821ce0ca9ddf99dfdfd9b0c9cd45053e5b1b4385bd8f5b227ada31b5c23e9420014474e8b4494fde7c38edfe70994d97b8cbdfac588df49a49c472fcce78cccc051f31cbbc1e0422878d8d490f3aee28adf1587c38fb7e7d1be54abeaa83cf54b633803a5e669ff4295df8735231ce39631616bd05e0e31117c722c2fd6787003b0bc7fe422a089c89329544e085d71102c1813769450a9f66f160d1702cdb17bd2c6fdf0f722762d193ce83623eeffab17b01b10a31db6e2feb6eb3abdbb2e36320e1a56e44e48d26090afa7f65003a98cbfef590ac3ec89b3eb230557cf6aa566e841806aa2767b21bb26fe001f11ae039e0c9a4bf1bf3d271960f16158eb5bd9ebf0080abd8369d512cab2d1aaae2b14d0ff6ee705a38fb0c801a98b0624cc138fc24834fdf430f33e1760db913da3290f34415c9e3df3e97da1780545ab68ac5a24db89f24d62f4a399728e4144a8c89f47ac2d29e30c49b0bcf790a5e3d3fcd1943c6a28f37251d9dd827a69579e6c17b629c927473b5a07b0a29d9562708d6c8ce576109ad1a3473ffb2047eb069beeec24c114bef392c929038c92abd0e6a19b610e27881361824d57008b7373d0ab76379570ded76c9b8284fe2c247791073c29b2fc6fca05019220ab92856892d3c0dcc6da0b597fe559c162d060d71513ebca050d9638164b9ae271fba5575ade787ec5aee8fc253d1b234b1df561db3e36ac64b9b0100dd6b407043537b2b141f
-MD = 2cbc07b9b9c819b8fd38d8a614a8a9c3fa7e40ee
diff --git a/src/lib/libssl/src/fips-1.0/sha/SHAmix.req b/src/lib/libssl/src/fips-1.0/sha/SHAmix.req
deleted file mode 100644
index 453fce20ce..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/SHAmix.req
+++ /dev/null
@@ -1,99 +0,0 @@
-[L = 64]
-
-Len = 16
-Msg = 98a1
-
-Len = 104
-Msg = 35a37a46df4ccbadd815942249
-
-Len = 352
-Msg = a93aed0fa5e163a82c9a934aebaab8180edf7de0b32f0fe99f9c75ec305b24609334cefa372c7c758262dc8f
-
-Len = 1016
-Msg = 433e88eb2f8aba562d15c18126fbdffb81d5d6c9397fa052321f5f78cd629708ba099b540da5451e949eeab8687a8d6ac35c531411cb37144ab5ff6a7eb46f1ab28fbcd2ea0444cd87c57bf7d3c02952dba3d3987da07622c16e7c086d90e88ad3d9d4afee301d2bad915d868f54197b70b23c9fa385c443404fbc9abf7e6a
-
-Len = 13696
-Msg = 2c46a76a9dfbae1f5e59f085e9c3d4b600c24b2d404d062cf948e75a3d4ab5b137a31397be9eb34b2a03c78367e0b85448891b511ddee1f787cccd498b172cb7e656c044a03ffde8e42478330fbe9c34072a9e99ce31b41757cc820d98e7d564e06694b96b66f4be34c5eadd0ae4e61fe6abbe4d7ccee855104fedee8b451a7fcedb793d469b0094c0ed07c97fda00dd8c1662b44e3ee6775a5ef6368cb662d257be561a5967893433a4b63f97295036a37272176d081545df00852bc5c4162324161296cd51f76433f2df867a5840f2d0c8d5be00b4dc89443d82175bf69c3bdceb97facae2b2ed68e06ae74fef36d8bd1f75f130cba509341dd54079d45de22845cc8e77a022977c7540aa3e779cb1127f39f825d4d78e55a967ef45e7c1dfb02d9999fd15af2914ba47177177d94576f1091a0657d9e04fe81e6be7b631fc1baae66584c9c26ddbb568750d77555c927bcda1fbdc15c7cbe3e3fe88ca13ff12c59b383343c12976708c0e3dff78be0e286dd32eecf20b71a09fee50a9d0b13c85a15b320b162690f399282798aa3291fdd2f9c40ed873e829388466ddd1da42f2de16aaa9272ccf44790cf3c95382c304e25ae8cb2fc9d9869808f3ee7d42cb143bb0c3a55e03db6d1202ca1bdb744e448640c0aa60d3ebbda5c21e623bb080f4a073a48822725d764e51d415aad1d7c5a7f17433d15ac7d849f910c375ee0899f6a576dada42fd651343383f286009902bb62deeeb2514de6af7f09892c20d0b238f6021f03b62444b1e1f21beeb89acfcd7136416fe7bd8f202e76afaf5345311798be7cb25351add2bb044d2380221009c4d1cbbaba4cdc8631dc0144f2778a6aa1eb3d3c81df0b1b2142fce111af8214d049e40f536c5d462b9224a978e82cc6c420e70ecc3cdaffb726a183c793845315f730fa4dac9fe46e4180397107a6a051f7f0a58ceb9bf4df37e1a81c8e9569187228e8037df2e59c52ba815566768bedc8e09d5e7bdc9f2bff23aaaaf133bb5a3332750f6124ce185e29fda0851addfa2c3d52bb6dfb530fd4ee27dd5bfdce5dc2f41debe6740274bc651aecd4023b098a7d622e2296b50d51b79c4e3f521695a9d43f038e8f273405e26584d3db179e7c1758114a3d39970df674580bbf2884405974f0b9c4b0d8b3287a2314f3f81b6991812f354d655f62513c9551b378cc2efa4c3e08b313c56cada52217fb6112eb8299b28445aca8f72e7170a1cd8bbfee4d2145fbe8d49c6af8831c4d4fc7177a50ee55a7b484261504af946c6bd5e1d6b89092f3c487c0568fa07c356fae9b8e831b8320289039746a435b122cfbc4a0d316bf90d481d3b7d979cc50d98c1190af8dc58e0035557dd5e94f437f41fab513202643a77748f76c6b77302bf40c392cd18731da082c99bdedeb70e15cd68bff59619cabcc92adcf122753c55afde0817352bc247d1170b8ddba1ad1b0faadfe0efbfc5fe6334377fa372c3435691f53dfc2ad5e08966b2d3525b1eec2d993a5cd4ff34278bd40dd80313a0727d05e0a932156152f3e11a190d8d69726f5c57d20f811e1e8932e86409ffdac96c6251c2a2976b8757adcac5d2de94931d1cbea866ec8bcba5774f8a7fde792f6acfd0f01356fd66fdf54a416af6a9397e00f848a2e9831627cbcbb52b5a868ec174e69b4cfa1ed72cdf23f39d7eaf4bdb318c188b1f0fe75655e34ad71907cdb77a1a2b162cd7c22d93dc45321eafb17cd60282e83736267b3e1fb249c307d49509f50839942f0f493afd9ef37db053a918e3ec83d801bbdead07554a018b8ba348fe9b7dd92ea7c5fc0e65a644ba19aa1fb6c022ab768ec7cb249ba17b9dda2860bd4aaaa3dc70ec009804141ad5ebc61203658e57a0887ec0fded18d844a96e79ba7e879c4253056f23e205a80ab1471953438f85848f4ab31ab175c089e0bbb97ea0dd6a67385770356741966053735e2cc2ecdd2c8c75cc045181dd7267584b901674b553082b2c58fb8f8be0b99306194a6f069f684535423304d40a268d55784a14260fa9c9cb1306b82f91cbee3c9f43dea9e50903135cc1c6505605a100bfa28564a2057974eef0852b7b72ce264815026d0759f691db618ef760edde73ec888e181403834f7221bb27a69479ec9b28a3fb0c3f68d4467d25712fc48ad78763f9ea6e8a2e85260225ca1b1a38b720e589fafca29f07257c5467cb74ee53189b8c81b784c43e93f98abde1ed53af60b27b13df6ce45001c6e1813de3521028981086f7d88ba13f6fb1a800f312fbe2f842eebe847fd760c394668cfbfd353ec14ca0366eccd7b4cd63318116bdc42e20a632a0d2b8c5cddb37bfc0a239ebe3800a787d2ece077a7968036b3d9b31cd906f888e3ed742cd769033e2c24c5a9e3c10b6d300db5a17dd88
-
-Len = 100816
-Msg = f8ed40e878dc68ceec52cc8e2868722310fb117ca3a52e1839eb85d308b8aa00ed0bf0b76aec8a70eba4f0d14d2d85c5a0e876ce2c8ee59cb36947def6c40a587aa07b368ca8e8a08367018e45b984de0d7f1aa46b977cc18c0cd9b7bb897cbb2814aa0ce8f8c9843e03c86c19f2ba95dd2ac4a466a93aae4b3b05055ff148517ecf43e286c57744a3e10a14d0c26e139a503e7927aa688c78609170ebe3b54104390e5f6cf538093a67922e7210e77fcb584ec9b6844e829be246a266460cb442bad52ca47255fb8cfe276108c36e02f9acbd3d191d34b93d29ec40d80496d1c1bb5ef036221641200e905598c54bc4abb3527c5a5f6258e59d4bf54a0498c108a2725428efc2047e0096b32dfdc6ec69d5d72f81301f881ca62a66c22e5dab9fd9d90084c0a36b2f3a0123cc5327a3bc7a12fd947ab57169ac533e4b6a2cb80fc65b9b527cff9fba26994c7fafb5102a0acd8f9d246a3a54178c23eaa04c0fdfd3c0cd980d1fc7a72b25d74df9b95c3dedce8ca316870c654f9ebea9b806da9767cf40605a4b0c7fb06f6b3f197bae7d8cde9daf38530e25bc51b68f9aa23ec0e95199b14bca96c91f3db15bf8432f714dc46ac87218691bc66cb3a42f6865e1c30f8394c8e68c0ddf5851ab7c5906a1994a9af6ac1c44d0d6b95ff15d9f77825ccea40fb9e516d45888f2378e045d95d936d541cea9c8ca52fe5f7d0d919b2b1c59a42d06105ea4f2943c05178e59d67351c5b2c0051c93a4045e512884fa656b772cf398af89081546d920fd3d24ebd16310506a786ab33293027394c1bcb7b1efe46b550ac28529646e8d2a5ae65c59345e24b44cd7b06673f3ed3b9008aa568a739c26682fa596b7a655842cc6b2758b583487c78d14a76bdac7033806c5c210828ef313f8efc4072681f5fded748c31a58ac933b4665c445f07d603e0905e49b84aa55146eb1c1c99196413832a05efee2e64d6732fefc629b79b37bb9390fcbed7226b412204bda523b8b8af5c4a8bdb263ef9f3f6c7b9e1de3a1dc257c1f33b3d54a9101be5b4f2a9db319993c2cd137c41e35c434ce52e859afd1a635af4d8852252dc5e28c729b2b4c96a56d57f3f3854ded59fe612b9b3a51fee3fc1c83db673b0cc7433bff2472bc74a2eeb6706605e308690fd072a7042ca6474603711d8310909e47063f46f287260a26c4f11fe492298a0f98d28c45948a4899e08fcf443a6ba36457dd8329314d53ac0fd0819fcfc3357426c5bb8d3dfd706e205a81091cf08f31cd3459854f3d07e503991ba5f067e3c406c6c5396d8257496f4ba3703cb1ba25c2fe4aa54577af782cd57e85a88a2d75c54039e8b7bb559219edd6e81e41acb6d575d6f798afb2cbf7f00abd5c9c7b0fceec79f9a0fb040ebcbb7bff3602df7b71357efacd37aa57019350bb81213508a006160acde3dae5c42f03141887eaca22d7b33d6791febfb619d11ebabb13e6c5378e9a72e852ddccd31cc53a43275966b7042ddc51485ca20e1c456dcc7020cafb5407548b044d332229911fc74d7fb97de25abff7efb431da82de2ed7e25d0dcc06ffc74e57ca93a6a9f64d76a5c39776fe2266f88d6d0229b527525fd2e22a1407e26f94c5bc6adb1e7327f3c8bb8d4c983385c579dd8f5623df8cd6da569c7de73d9210e6b9253a177653a13ece075940fc81016d8c35fa4f6542df5120c174158ff32533476f4e059e35117081a24798fbdd1eb10f82809836f8dbefe755611347f75423dd8571695960c6f66cca71f0a01e8fecbe1183bee3335eff10b4ff8104132040e2145ec3164b2448f60c730887b9d7894e5f7df3f876cb17136c99cf32db1c02fba860937378dbd093c4c5112133781f06c8ca07c527c2c085e8ba5e52b399f2909e217aef6e3035ecafe2caeb1004069dea023af7eab873deb5ebcef2313c9827821bb9f89fd3d1570a569673d3ede86a4fb13dff242eb98450a8917fd8865c56e0a9f11d72394b79808b0429f3a83cf2465161596887fa2d557b367a1de9c7753666b0cca9c30cba9f0a749c03c55cdc7a6d45852c76ce2010de3e7f75d95228efdc79949b238d90b25f983868b7f07f585f7b00e45d9e132f3c09ee84f794d899759be3dabd46a256f4cf8da71270617cc2425b24cef25d1d2f3945afa6f81abfccc858cd02e05619649b1a5347650934105c02622d538447223d136a8a0455cf3c6f61f696b32266197b5cd1d936fd3ad4288520fb4a2f59bf95e659f33210446ef18debeb679dd99de0c3c74a6eb3dd783861f5db4e94a151c42ce27519d0bbbf1f3b1163563ec06c8bfd881d94a3b896fc07352fc97ada73685588a2242da1b718f81bb1077bc70fbd58b8b52163489ae403838b533851bec30ed0ecd97d72d1af534f3703db59f1f563bdc39d690a0e90e545506463a37e84974fd7b256bbb912cb4077d3e3f5bdd4bd2bab713b696c830b1f2185734c4d2dbd49d5372fe8b813ce73f5e01c36bddbb376ef4541033f2b0355613eeda8951ebf7377e08f967902eb7e23c0fa798c6ae52401721053f1095cacb1e9496500e83c412236fc21566090b3a3eee55aa402c0b774802fd81c9e8579761cfcfdfb1aa23786b2dc35dacd5ca8d8d283369f53e4a5db18060c2c6b0c303052aeeffe169fcaf7ecc63090a9ade245045ab9c8aebf738772297caaef5f857322a597846c7370083d409df27612e47b0cb240daa3cfa51c57108612ac0dddb0f59791289ccbdb3a2cb1fa9ac31a23dd5440682fb373bf0c1f41c4fe2185ad7c53eb69552807410053b0c2d40132250e637b8c425e6a35d93333b5b7d0557927b6179c848ec455fd1ab38348c0e96c60b2da49bd15118df64b6ce4fa48fbc555a4b2874141718e731a40b85382ae6e86ead31cea77f83bf5c063bf1febf71688a832d615e09d6f14badedeaeb6ffbfe343fc7274e78cd46a2aaec0a349c5f133291ee57cdcb65c5474e46294de6bb50886bce6c6f44dcb95f2a4761ed2e6c9e7bfed51e0964afab4e0f7e0b07960f2590baae66b1ec9a63ba0fb6c0d27e81508c51487dbbdc9beb8879fd58c188dfc774b3d0ddbd77ee8bdcdfa0ed8a9387728e12b13e8b3c10cc1c132bd822c2147c5ddf9a993aedbf78ec256db1be76644ca8ca7727208bf89732657152d34e948d73c47561d156f773136684d4162d02260300020123d13a95f4f835907c344942ddeccafe2abb7dc4792c4f1e39c24748c63cba933b16be0b8853e058c47a1ae2c4dfff39ec2339b345fe3557d03c1df91a0607a711636c4416ffdb73532aeeb74f237ed8bf971388a0659e4682a46b8327e751034cbf2c87c7828da9d24baf07a742ada34d1ef38ab1e8f2b4f801192c146600709533e61bc2665dc1e9e6441bf3c4f6643bc0c102a10f9a69da5b0e3d0a0c7cb694c682493032b5853f02953b5c2fc0e1348565389762fc2dcfbb34fd305f2d9df080e859396ffcbb7da78aae0a0d72e3de76c774bc6a81c87f2872b6afe97ced5269009304a4992c4add0bbe24e57632e19ad0fe37ae910193aab0aeae32cf6d618ab33eba59f6a04fad00b1d2403396e6fa661d31b695a1b349d62f56c08fe6c6eae7a482177adf341e51d03ea511d7959c721bd20bf371860ecd7fce1d25212891850b85648db0a039e6638d9c78bc958add3e41341536b5007be63fd1f7e3308876bcebcb97dc3b05a7b2eaadd00f8fcc8dcfa7b961bbe727c9aed1626ff786d6a0ffdbd1002cae8a7d047b6181962a686c152b2341c7c58c9f1dab5af424d183ed1c7d003165a1d04ea3683ff31a0f68615af6f91c21f736e67df641ed31b998445afadf9052bbe004d5dad08f62e5d353e42fc35a92242d8414d99dc4e7e81c8c027af686baa5c185e3f99abb3855b22cfdff0a62e2f47a632b7df8e00e0317af5c24ce7c64077bbb15ec27e062070cd3eb8e549ed9112469090ad9a96eb59294b021eed81987178cb2dcff67a9a2e930f6032c753e203380f8a7c987cea393234699de03a1d09ce204f0a8b6d5cf522b6887174fdbccb08f3e7c4fe2f778254465b32766c48812a45151ac37ae354dac87419f9476baa27e24b2f322b2da4ddf579750684a5881bae2269351fb7de59b9d5a4badd8951135f2713dafc57215dc626ee170fae7f20bff98e36b864e1fe0f0f9a300c903069bf0e0b6f2f8e78423cf6063e89dde6c81efcf26ef15510563c84730f611ac879a6628e55115e1a29de6945d37fbe4f803fcf2e344712d9e0d6f6c79f8773a9f199b705235e20a7830ee3357c5dca29d7a6c29a3d2628bf2c42c8f076cc4525301d8e1860729070dc53164d9fa08bf63cc889eed01b0130a7146d860bbc09ead3865a3082db0836a45f5506c3e46e452e298764939226cedfd06700e4e33c6b4a78add601140249596831e97f960b973a4e4dc3fe2813fa34eb47f998ce57270368fb81719a09298a223f7e3931ce5cdfab3f658649533354e982c87dc9e49eacebb5bb4af9a767b4f1c03d774431168cd4fec1b2726f1aae3f9a062a825f3295557eebf3af4784487b869fb049de44d03fee71194fc200af72103b157431935b5ab9bc122773ffd313d52d7acf1078386090fc011de695e71567cfd51c06317d4ff8841ceeb74ad35f4e5f4d20921123cb88bb2079674ad39e133cdfd6478d69c9bddc7a818be5d7b254bd9e0abdb030f52846fdfeae8ff370a51a9c5f6017af3c6c3db17c5c614ea18ab0e3ca0dd5de621217dffa36e5c5318fe191040a50cc3ca620683bc34da6c142e1c50afce28a86b8b66d189adcd755561a647080d93f3ede1cf54c3afb7e863fc8a82a2576d3f79e9b2bb634e598507a3d7d017e0176b7868bff3a3dfb4474b3ce03c401f33929364e727fbf8096b77eb351435c7a113b3215cc6246dd86f1517a7e550cf828900248f7c1754e40fed62477b296a37d3e53231360d012c4908b466e49b0e620c0a5031228009f259b030956ebd70e49357c3c3ac2842b6bd6e3ca5a3e985dc03f7105681fec03b320a7ca753b782ad3b52fd9c8e3bd980b48dd6ec8901dbf756108e85015821c880416e0693e0479cb31c0743450f6d9214afabc4feadb9bcee9def460a58d3a02d9e3039970068b8e3fd0a403a6ca7f2c71ae2b46ab3c731b1e65e2104c47fcb1f69e7c8c6df8c09b33f2e1cd4192faab316a44536dcac608832019f5765cc5240eabe3c87445c980c299a5e7ae0acc2c2ed19fdc8f011515bcb00476b03633c7669db1b44f97f6cd402778e9687c740dbe5686789b79d0b13f784a2a866eb91ab2d66f064c49e8df513ec348fd7272ee548ba08e1f9f99696ffb53677550d59c67f88404f6e610455a422d9cd987493ca5c366a397dccface2bba8e3e99719dafa768956cbf6fd8defc4104b8925878716a0514f70cbf3fa2c2bc2f66fabe654eed3076257e71117665703eb88c79e4c2b94e8e856e7a6ef90ee2a358409db78b98056ce1750eb80725d70e35507fdfa5933a61496ba48fbd5555717b33b59d4ef211fe096aefd478859ffc97a41372023ef114adcae5a8d5e03c21369baf1e7f417cb40326bc6db1cdf0904651dda3c1039a2f1755e7c329f7c03bf33f324206ce6e1638711c8c9a45f153aa1f847cca2a5d3af1d24fe7a1e1094819e8e712cbe10ead1012b7371b35cbcc2bd5b10505fb63bea20ac81d25e83ed0105e7595b6c28400f4d336791ce4a584323d0b455bbed44392c5f86c9d5287593f6986d4b0b8f9974a7a4157859ba801251d3b44b2bad84f29cb87dcf1680d6d10d1bfd59f0c95fb7bd07fdb3ea2fccd6e3ee80af438956ccfe31e750972f893ea5dcaa26d077fb3f09d990c2f41c8707368bba007803621ecd76540cdb8705435d74f4300eee04710a936f241c034709e625b0dd5dae1f6e86d034426819c365a05f5be420cdf4042bbff965a666a5756f67259448ebf742b6ea189fa17a4c3bfaf651d19a8a525f09d9cff637c8fac02eaa58d3ee3f7221da1e61833c0b183cd9f47686f09597e8115b435454acef80c079eafaa22b18927d07bf8b7c5ebfdec9c42a52b7824d45decef41e6184dc2db1505ca6f94172fafc10731706e79b9856dfede353d2eadeceaf72a302e3492d7dc81e3777e4e9e1f3d33cc4402833ffedb241a75a09e9495d671f80ad3acf06823bb04a92b815edd0ca7d01dcb3318c1ae5c62d3e99c0ec37908b45b51dd65f6b45b34ede2d6f553f60a45e20fafcb34ae4dbd375f52a5db9c62650deeee78e955087c2bea75ede7c304347b171fe0c1a2a033894be6e04605271307f307b2a9cf6ae24b8c87ce033a3fa4cf2bacdfcf54fcccb1f580476c7d00c631a8529a9eea2a713610341e0e25609dc8927e51c58a0a9197a54963b5cb95877354f4b8316df02ed2bea367704a12274d96bcbe0d0d728923a368bb8ab98d5db5401894c822632308ddfd309071fb4b477d8eac0ea5dbbc3e3606d8510d9051dfb5e4b7cdcf2c57c1b76902d864c3109c901da53019ed33cea84b407490486ad9f980a8a63df3d2e3921064afea137f35179130db3351f5bc3f5e7d590a5ab08b5415efbd345f9d57b71ade7dca939efa5a12d677b9af0af14468176a43712bde10cb15787c18bf066eaef8abcdea77d3a0c61d6c74ae7b54fe90940d0233e4b874c9a141dcc740d7fff43b9fbbc012a933d890232cf74fccb7ff7eac1148e203c7381b7f1d1429b1b1152ec25cbf7562596eb402a9328e43b5dc5cae36592da5523f0b9907a6817ecd395a7c778daae85bb11372b20641a04250b77b3a0ece885d07faf9622650259b874536d6d2b92181c834dc111b6fcba483167be40ecc922fb87006f63b9e8e632879563f37a8f712db9fa68c1a20ab239c0116fe022fad1279f3288b8e74a16d447e467b6381515814dd3aecab5c2a09c400b44e9100c04c720dc7e8c6d9460002da6c52004c16999975fef8752c2f9c229cbd9e6446b226cc454bd68cd665668a17328bb30f301e92ef5c7a2197a326df5c99b422096de8af231d1d8872e6e505bcfff026d4862f28d4bb3856a66ced22c9b0587451d8da4230a38561b5b1c69b523a4701a2001382aa82fcbd60733a14696a540227db44aef346d6c0a7ae5173604d59eb828614cafc1b8cfecda054dcc7306f73925e6d1af56ed74c51c6cdb66e9fee8d7a0078254fedb0c0f5dc85a4686870709b499eafbc8451aebadf848b0598ce8f955688bd2d6032abe10d1391d67c20a049841f95d2ee0c8deae2bc1baca0c098d8718cba1ddcd968981c47cd98d247aca4f838f3bf16d092eab8be8deb1f8d504d37cc44a8c96c9f22f2698036d4ad3bb48b31f109626565c147d20a4a7dfd61fb918f81548fb4f78875c1d138e819f6822651b93a3c92ad77793fba5222d870ea671f9cac967919d18f96e92778548415b2e170d90b201215354fc48a77e62823a2c2bb354782ad052732f08beb278f751529416f37d83ea26248517ae2ef2ead28c1077908995a2d25db0deaa957bcab39715283287fd626ea7388abccba2d90e364a7ff4284c84f70da68ce1aafb5be0401cb9d45e085aab41892a49e10cbd5baf2c34f5e0ca076f2772abea6f622b66020d546f8c2f134a87f96edbeb9b08394b585f2c2f98aa792f97b43b5f3aa9c34189804a9ecc2cfaeefbd0f967d85a25bf3136fd8132dec38aa82e4af6ff677682f3b62be27a180aeb22f918c24f23bf6f5954e0722324cccd06829fc32ae4fe3aee6e5a03b3651900e13fb0a759e544d033418b6ed40d037b4549a0404792c8fddc317b7f028493c4c91d6773932f8486417544f3d007e5f9e6fc02fadff175303f77f6b0e1f709bb3d3a93b38552ccf62688a39da1a602dd5e122e6f4e9171769ada5255cc5cf938dfefcbe3ab0faca434c42dc8c357e89a3d1488fa3df35c3580b124ba3bf6d0d203d586707eb692150ed05a01bf9de5c4e67bb948088784016394d47abb853f2b6b643a066ad81bcd1735aed4e108a8c1fcd025b548de874eb60de7f3c568728959147d1219e4b830e06ca2bee1f8a035e28a54ee6958d4821a84e5d1e41139905f7ec60fe67ce5f4eccdcc2c3d1e4a753a32dd3004970a4ff3824471822fe2b5010b9b6c6b01336dbf0181a95cba2624663215468519871cc39e8a7f4a151c8bd03363b402020f2fb98069b2cb8cc1b7e930938e7540d95d1d223e47865135793f9eb573660ff79f7ed2fae503e68ba44596ee745fbd8fa562c5c666d174cc01b1961736e18b8b517161ab9c8058026e0ddd6c94aed0086a26e1b959a5e05eb9d8c1ff5b2ef518ca23b4f265db61b499a48cc46bed28d23ffc1e8d9c9e345c06079ad47c88dd4e8e286575bd7f9420ab9c2d5c6685488b8b34d4c9ac04e1427ae0994cf789b48b01d1db9c2fe75fc5187727bb11119f82d0739ce4048467a08cd635bf78cc1b6cc9c28fdc199d351064a81456f81c9e56a43aef7332973804b06b18a26caa62523a7d0acc272ba49124b17bb68800d5756afd34ddb2b7e2dd8a118aac3fcf39d9f853c4d2c4fd3ed5bd25a6604d68d57db93d15aa1160f8a97e6c24238e84f272780966867f9c644ca2775cdac4af0ece036cfa6ebb1cd9d701dd7daec5763c9a4de0385db383a5647918e79c6a6de1f4ee1f6b722c561704c8d7efa4710d78dfce8ad2df0d3d82cbb59cef0bcb001f70bdc6e17af1a720b117fe02bb1dd527b18e6bce70e9447cd0cc85cbcf431fe7c006f5e4ef878a974a93b25f492847c9ae020583c9d412f4124246164d8f080b615e2eee267a7aeb5fa0974de52cefef23cdda7b305a33a91e9b50471ceb72dae337c485d636e28d6ee31f5705983808b1567d4d4ae820ec445c56e6a404cad6b408691475397c0dd6cfad232106ba96e5104052700a653e21f9ac6d79578a9f52548f426a1e81dd45bae30acdd4d22a2dafd633564d6b2f45e7d35413503c955cb0a9784b42ae8c2a5933a6729f3922f969a158540dcd201ecb6e32f88b5b4921914a2e8f424c8b031f115ea5d23a21e6f22439ffd7e5d11b08df729f65613b4f6ad3edbc9a066a5e712ecbddfa6fa764cdf170c0485f82d924a99b7e7ad8dc44c1f93e49b6469a9af3de5691944413f1417b753bcb84d5b7a34f362c383cbc802b0c88bd23a7ac471b9287571c42081b1134bfc8ce104a550942ab1f2a074cb00a90558d6e841ff15cfde6951f03e450a1bfc90dec6c513fcb2692ddccc31d22e5274d41036656183c72fce208e44920776f196193137ac67d6d65ce9cfaae774f23a86e6ee8ff3a4e9422a4667d971906e5496a4e80278774899c882708611bad282f6c1d666bc5e7c40082b43a6e98d494a18e9b3cf7f154fdbf90d786e59e83b72ad0ab893c49aca50ed37ea5202e650fda54f5c46ca2a35c476f4b009c5e6733232275abd1341199b63d22386c484cb95c43ea90e609c407bc79ddd00609cc2eb0d82848db239b249f164b7ea384d0239fe1e64d04955b9297472cafa2ff272c5c78100aaa86cdd8120556f25652a3c12da5853338e3be8f505d93ea03cd1cae7e78e95befdc0e26b760d11e05403c348e0523fe036381408033c009a8e1f117af5100a6eb91f08307df465c20bc1dd029875ef7e49338689f602d98f2dc690a57a6f2864e57098f8bd723574944ad3688b292db6d01387a16493912722ac8f91fd12b748899bdaeabdf0479df788eda440d7bf30d1c25d78d757f00b74bb556506637fc1ab87162f05d464e63a6272db3fe56e9357275035d6b6bee32bd92c4a1dc94778551e94ee1d8854f767bfac3811bd0287672aaa01ea18c25650f05a68cbacd9158e479b508e72df778589e1e03dc543b60bb3b10399e5c50de9e728e69774fb3f5fea757ddefccd0f9da75afe4b67f9c54aaaaf646e858fb001a6deed0a8a769ecef0689c988de566b6015fb8c40aeb5f2df7ea4bee60e8e69d15c4a4aa5411dbe63fbdd6418cf025d87f37362f15e22aba83abe1a3de9857c71c2234023b969eacc0bc526363b7f30b092ca114f2a6cefb34394d146866ac86a33fc497a8cb8e2a5bac398579ff7958878421fb08fff4f8f3deb8c9641b8de392647df3017a5467f9d7b23036935ec6e188dd6dbfb544b8a9e04a4b3c7fa1e4d1d9879daf69986b8083e6eb023a4b5eff80fef17f8f65433c882a21565a919448e6091d1b61013fdaf9fc3e45bbe827c9b4ab10b05600a1961e81d31c7404f8e0d32bfcac2937eaed811db167dfdc29286b0d51bad2bcdb9dea76eaf495a31a7fe717c1c98be374a36271cdd06ed06c02ef4c3c06cb42f73b3332ed488416010e6bf2f4dc4dade6e2e61f19e9306bf941868f59fa0939005743dd647f0a04b576a7e71d4c383c479453501e18ec56d7cb79fe31ff534afbd8609ed701ef163f9de31bc58114399fa0f22b62c66c380e8a10c34b7e731df2a8d39dcf36fbf3a66d67b973e3a94bf6ee0bd96f5c76baa76492032fdd2f59ecaee403d486f543f2cd7ae7b0dabe1b5566e681cd40d384a94349e9668650a6f2d2daf86c59a7b02ba466cd03ce1d50c3f0ca4c02dc4b3d1c0e7b9a77df9eae0bfcffa32117d7e05adc7195f4278c93497401629897a58d08ad7141ea52e0163f14992d7a284e7b875ce4640b4dd48ceedad1ea17d8ab1e760773044845e0899602f1bdfff4d42ab80c0765d1a8bde2ba0a830c050923956d06c80b182264ad19ae4f7c39e43195f7d421bdcda00e3eb5ec5ef2ec91d69df691ba7fe250352acf01fa92af5e2c634b9c7c97889e9147e869acc153d88cdc18908f882f371ba9c1e13c26e9cb8e3cbd4c5e1988080ca65a67b3a4c3460cfadbec904d853fddd2f5375b6070941fca53cc106b5748480213cfbdc1c34320a0478b05f76fd0454c75eca069cb1fa7b21704dab67dc40d041c8a1040db378e76655636ad725219c049e6536982d6ee9f11dd032280e622547c7ff44a938a1f233c356a98182d22d5770fbc871e20bb37483dd5d6ea1551993b95b30774a49b50d411ebe0e8c92834094e23ec2664d822c40e96fb42b8607b62b6949e05edcaa436d0ffac6a8ff384068acfc0220c0b098d368fb8113918a4f8c9de37cece74c8695cef2427e54a6e77ad092a9b7f1d94ac9f0836deff41b905b5dafc58ad6063759b0372a634f69a639e19521825d66a282f489c3172a3659264d0132af3571e637782bb6fe5c0afd24547612166fd3409d0991392fa054ea5bd07a4cd0921a13ad7b62a0b5e6d56cd8adb7f3eaa5c99576941c38aff311c49a8c9d8c755869302a2e5e40109c8365a551cd3f859b9421be189d3a0e9ed78830d5cd6a2414e9cc4c25814d94d98f8848e5386d6dbddd65d22b96c5d20020a5dd409c7e5344065871e57e01c91a443501dc8bf619890fe231319b5480c3879dee618d319962596539e2970513fb5c0c8eac3a71ff99962779cf1d7e916566d0e29d121c5cec5d7302a18ed00be9316f3de8c669a64c2a960a588f9c8a42690f6867cda7146e8ce27aa6a7fb27606eed9df6a235a42d17ce71627446e206e879de56025a66556263f06684dedcfd6f083d6a707e5fc8f8212d716e062f0f7fd0c2fc62bea93d68581265a803c31cac3f8ac8939c5f8c464ebd19df42c7e8998494af614c8383294f3f3883f2404ac10404759e182a038c97aea04a85530ec005e203807c5bc30fa9f5339b32fb0427e64915e29a25bb25ac60b92256470e7de5298d42c6b88995f8d2fb704e49d55b66b71e237af90fcbfd71d9093e1a543da2e9911ac4102346dc4704859cb33ac5f5dce2b3331a9dc9fb506461a5436c89bf90d39afcf93cbca4cfc35da6ddb112243928246ae0d1ba269b0fce0468d3ecabbdb925c9ea3241e2dbdc6b151fb4aa724a42f98b0248171fa01fa103f116d0e7deb65dc359b09126f9a420300fd209508ec7a50be56d5b470e387d0c52a1d104625f9571ce1404d1b7af3fb00475b95f752ab96610be112d33ded48624015781e7198f4dcdf917839471fbedb43c34efabe09941fab6b342cf672a29dbb1eed0db788dbfcfcc63bcfe80f7718571f691818dd6f839e3cc282f85f03fe0400171cdf1235049fa53de7450b4c40ed398d5a486f52124c1c63de2afc950e81839f52d17e2a7d32f82788465a65da6cd763c6360763561ed2bf47749080549b6e2db87514e1ee1c85a0bbd346eb6e3cc29267cbedcad67a287fc5be65ec59ba8b6854b31c83dfc5155187d4150685c5c2c342ed68b01ac9e44b60f0c100a347a0f93074dd37d8956fe2f43110dda66e9f9e6185c23dab74cfca21f3ede4bca87687549ea02662f45dfa0ad27f9959a120cacb7c419810e1b1a50fad31c12c47d5bbc61bad77044aa541d29faa6126c60ef088b82eead17a52843307d4bf798b853d90d14c5347ff10615381d85e964331b7a123d15a77a6790d93e920052ddb4db4baaac5e2b27b66ff955e53b8308151c81da4711189ccf0eb393c5bbccfa1f6c94a8d5f4bcd266fc6a12061967ce836ca042257368f567dc42de6ce0be84449234a6163b72069f25b7ead4b2003e1a7665e87ccf211abe94175d1c11bff2c0b6bc110194d34aab96934ef59804cd26e4434ba166d9833fb091be37b139cc10748b881c93690528a96ccccd2dbe024510b8da37dceab567dc52706461c486a0463369cbb99bcca2e8a4d2e005c45401964722a4b3ed37c351c9f21685e8992c9634349379f41796deebffc2928058c8ef6ea37c6e4970dedb78d1c2a00ea9e1ff1e7708470a6c60e6a2b1e966aa872776afdb238e97f716b3df8dfd42bf0f7ceb52bf9eb33731bdba5987b8f48b4599d67b383e77413107857e951ae0625059e5616ccb41131df9a480efd5beab3a9c99615921caedc53dbad675c00ba1030577db1d22731677914fa958b44792cc9c19e2ac71ebe61a05ee67ae7116e39e1c0d103f18bbc9d531164360d901da8234d29fb0b37cd2a60c7aa2adb2a4b297ea2fb14122ad95bd4592ef86c88fdae1e37dc8e44ad03c0fcdfa3801e93796771c5a2ec1e4ab12a64b3ffe48e7442c6224661ed5cc987aada6e778399941f7b20f16f94fb346b916be87f005c9c13789741602039d38270643cce3c347565eef5ee09139330301951c15756be47994de6f1802dc5131b9b011051b1d87d744756831a71cc8528487f032fee9dbffccc751e6a1ee6d07bb218b3a7ec6bf5740ead7a47b6907d7aa95b79aecedf4a637ead8fc6fb8654c93d13ee79f5d6258dcc61993aebc65e4fc14eea7d006e31f6e9f60e3bca8ce52ec559876fd20255e507daa99b185671ce1ac11d448c30bcdf97b9617195e0ccd2d15246308dd6cda74a8071114327fe203b1adbaa780f3243105c5111636a51dce966f5652e39d4f91abbbb4576234d6cacc3ec57cef2dd4dda49a6c33d12bb7595fd5ab5bb15b40301f34ddfb831a5dbf62218f496c003227fe6282e2ac054c45e7f3fc93e51b3ee8690f08612395095a0a12729d663eded879d9ffb325c62f2cb546a48bed51ae232fa6ce28a2494c132a6e09d98c2e3d478d5d2d15dce2e2665e4a3db448931068b99899c2bd8ba87349b0cf9e3c52cffdcf58a59b4fe0089b298b42ad7553f831bd60f5cfa3e09102fe773e4c05412973a678f3b3ed420433cd664dc7f218e816a17c5c9013ecb84abf2dd073557dbc41b92a91e0339d57b8b077a9a44d56427fec5748c47c1460b2e2412094db6d0ad06dea0aa0c1368592594bf0b2f590a9d6149e44dd4adc4cb42e5d9940d59397b83b33b88604c210694e3fbd84795c80c1b09ddb3b1ec8bef6e9dfc4d7f295e551a79436007ca48aa605ef5a89571e59cb26f2766e564e39d3bb441deaa0c8664549881d90a77256c0f6c77241fd6ab74b0e2890f78ff16fd2f9271ef96ebfbd0b878ba9c703900752b7447f4efaa60bd9dc9cd5673a36b39d49f54274caf03c0cf82b95141fa20ed3ce02ebf0dd74d9eff8eb9e2dd3a2976b244b12fd33ee75c1f1c459f86a1cefbc817f42d7f43ba406098165cbeab99df4fe751ae3382efce32af252e461652c7598161e74fd8eeca474fab6b1ede039935f2fd4d7562623b90a422a78941f47a76863d95857c33653d1b42b806bbafcfeccb7bb4a0c58acebf6104b2570afc3ca88e4fdf2719cf39c964a1ea7d2ae4a7fadc938abc95adac495093f6b959b1347501606b3f960b6d739291aa8c13eb49e98b0f78d2b91400b6d8961cb6165c8b684738e4d4db2f2ac30ddaa03a5e0cde4142b625e81907f08c60d7cb5729456806c89ff0efd08397423e44738ff38f8e88684f3a099dcda455521caca37ab4f4d9ed5d37975d4fdd778b97cc93babc804864a35e3a2db04598152e67a2f1f157681c3962d46ada23ea5d9a524f9cdbdd08a07a3a85b1f6fbde11d5a35c7743b83bbefd19aedf6d92241d16aeca7f33cc51839b75f111e8edaeaed808daf2f43fdb3c6f032ea45052ac31d4870c4d0d76aa75d0b88635ce449054013f234c4a16cffc58c95ba1cb8a0a0399861eecb1039bdedfab4d05f0270c6b16f03f6b8e629f687f133ebf2662c7f930530746679aac2791f54d6a95bfab5be0c33739074ed4e7ae88dde4a8036a7d6095cf41776366b6ae3f8f4a0734f48c275e129cfffff5e0abd042f99a957bf6f0f47fc7288750f4fe30198f8cad7067b36cd87ebca08abd3f9475e7443f83cca91a1ebfc42ef3494871f51f6d52a5524b9391c687571be5327c7c94ee2a096653acb410917fd51e56a92be4f24c1db6b97b465ca84c31c04c2f61eae07e952eb6554aa4d8a380d9ee81c1c462c360fcc3cdff2867a953b655562cd06162af8b99bbe662e0c27ce4d9a1c1a907def48a3231c2110c930a2f1498e32dbbfee0e5c5869332f3024fa5dfb0327a27c663cacd4e9902de34dd93529e90eb347bafa5035f56fc578e8386c7571d1f0ba335225ecd8be026b4544ad70f3af11501a53119ee39a8558ca0ed5b3d897ffb9cf0fcab55a0942d3bf7bc6b94ea27a6b748f2cfda431f35252c44610b7e843ed91ebf7e8fe10638f04f52d6d5a7752ec62350efcb7c473f80b1f2a26805151e8346d39d23551e92fbe372df7979c3f756bbb43f6bed09bbc6b65fe6fd241ae1c2f1a0d0b805c582853b85502968f9478e9a84895f9d4ef01ec4f3f571e57cd0bda68ee1f6f7e14fb6e0f4ef8c7dff6796472a935294fc27b16216966d5021339ded059687355b42b55926854bbfbd9f974a0c26eadbfca8a6183093996cf252894e6db910c71ca3ab2e82d90d371c36b92c9409cf7937bb266ea9b29c41d774aa522e103cb30bbabfe872b57beb027623742806aa7694a859ede9bc1fd7b9e32880b064b0030fce1a0e5cdf3ce558a5feaa32e323dbfab6661c5878c9377ee52a615b7c17bf1228e328aa20f92d070c71561969e1af532e76835fb0436810c3d87b982217edfb1143bfc3405ac9f6f3a50145608dfa8658b0ab642a347255c55b59cd1c5897b2cf625a0f0706c30ca1c1321e90cec57b7c3d1bd1af455e3732db80643383c41eaa6781f63da6233360ee720cc04d171ae2445b0c071e339d547f7ac32f407d29ec7abce0a9e1ef5276544877bab2f84bd2eef47ffa66f96e7170cd54d836c9badbc59435146031502c1a3cc744a470f693636d9050c5b894d2d6047df60eb0bac16d905d46cbf017ca69d66427cb88036eca4ea9d0e579f6bfd8a4a850703a0fe49d39c107c9358e98689fb62bd0475aab4b2031446b437c7f9e373caf0270a28d7b15c71f02079dde401e26175bb6e392106a9072021f0e5c5145a1db6f595b032faed8551f6e2ce318db1ab513db876a3eb42d225014949c19543e9c5dfd2290e28c5d72c87223f0195ffbcba1c02c7d0087721efd2af6881dee7dba7565e07abc35bc3fa41c6a4d6a313222ac6dbb117c69c62db2691c68869ac5fc5e987b0ae4335f815c73ea4235da2582dde81d6fdae5911617daef847be17f2bc09edd88830eac03977f89179fe03eb2dc3b38df43803ca2d38455232549110f4580ec3cc04c0d8cfe493013d2cde47c506ef6a8dfc42d998f70378fac5ce4709345926dc477e9e339d8c87ff6287ea6e2873e14d538cdc3f2a47e0e37a2601652f5b665b616a7d1ef3537a3327a76f93990f7694e6484e7a52a10e9eea2edc92b99406abfb2b11ec86667c7af4a333dfe900bf071d1bbcf4f0ad768fae4f450c53817c507d26e926e753e3395201d3ad89061f16706d841994abad283f0db74cada25beb5fe46f48669a62e0b849cb77097e1b4578b45062af4a071b04f0cfddf87519cf2bfa10ebb4b860239ff187e6dad73806ae968e6ac0f738baa88edb3ae4883a9e59be7a6b222c5f54818f95578daff9fc7a7aba8c4a41a699923e85ddf24a32bb71c808516f64d506058a70539276d57984d75161cba7d53a4a864c51a249a6b8fcad5738dd0055ba8468b56579ba5f102642df65c598490f3a0c9b1064f4eb1962c4c38bfb7d55d496a0b0f7b3f90b42f733d112c89176aaf937eea4bada845f3ca4e9b56b3a5a06b4c90fa4c1914ea47020c2f32531e270007ed389246906ecf2c4465f7cc5d6a347583dd73341ad97199021819be81100d867d628323ef7552db945e4c0be604cf6c4a8197958bcbd6c1879387d3286dff979632c54baba2a35ea84efd7726b662b94fae61464d069e0103692599fb86fdc3a06e01c6ae3deb3de6fdb21806c716e5f82b784e4ad3f0e2de629a18e3a2309003dfde9dde8e5101b83312f76e811277afc286b56879f4eb80468e58c60bc088284d05d725ddfe3185b7c51b472a7ff7db3930839142d4a452ddab628e07d43375801d7c6a711a55b452748d770b84ede35920c1ac74b595baef963d21df9418533fcf959593ccf5afccc753e86c4ae231eafe77a158c2472143faf169db29bf2b53c3288d8b3c9added65778095f85e2cb471ab58362041f0a27d874c42bbb06385a0403ca193cba67cf70029cdb7e73c7e2267b856fa0b8dd4c706b45e7174659b0ee2891df911724324f7ca5daf07c912b9b2abff762e62a1817688757492975db7185c4695f3a90895634b8d07453b36dd95197abc31d5d153dfb0d0ec92639540e99d6590f9b394f14c93a5e829fbb33616e810f59c502be44a13b700fd3009545e34c211abf9afe1bb8ced793c6f516d40010649f83a78ddbe9b71d8596582997d0aa54192e1200db61dade30500d72a184ca7dfcbfb80e5442f489d316cc8b75005564835d4b11c482e2c4d0d160f14a8b13ae0a0fb0ba5e3b782770aaca357df0e1c4d1c3b28b776a8b3e0da1abfd4f7190673fca1e1c5a31c688d6e8ddb21300e4178d07c4e854a718ac3f672b0120d6a54c16957c9ec8c444208e47737bc4eeb0bf2d801eb2fcb72f91fe988aa75f38e6cf26e858dc2a718580ff5d281d13e8fc3e3bc30c75c0193481c39c375a5b06b962d9491f3f1fb80f1cb27067f0709e0b0730573a9b5f5bdbee1708ad84b4ceb1a9a61e4c41e90655764057bfa07b8c81cc83a315be1aed6a49715479c0fd0f53f625fe6c7f36fadd001149ab978532e4d0de3d1a38934c74265b161899843704fad16ffc6189f42a5cadec98603e0f98c6889bd4a559079e074cb40678fad4690a20d988735280a1ee8ea71275069132101b35c18ecc9d3c6eceb4cfe9b165e4b6acc17d4f113ef8283c0fb6506f5635401e916d4f7e7bc3cf49aed166587a0c72cdbe673f467d81bc2e9cd08cd8dd16d90b353481df31e89b45e8b
-
-[L = 48]
-
-Len = 16
-Msg = 3a35
-
-Len = 104
-Msg = 7db15b3ee240b45d4610950996
-
-Len = 352
-Msg = d2a1efc725c46cd6a19760f49edf0bae823c1b4992ae2260085746cf65833bd008e56e64002383f51f960239
-
-Len = 1016
-Msg = d11ad1253592c094746da7b5c88d329bc3ce1929913b8be07e82d3f6b7a536a855f31ad197376eba6f2f4534413fc4e4e7673fdff8739f774a710754b568b7c61a473059a41c98aa4e86617aa66d2601d0f0d584cd9f132afeebdc0ce3da6a8b290059e6e4aa080c195c42ae7f7e1e99865223439929b0a3a0d79b46ca6419
-
-Len = 13696
-Msg = 2f7a9929dffaa4a4dcfeea1fc37b18e3cf935abbaa17cf9d834b3a8d61e9fabfb7683cfc387d6f46ece3f8bf845827c7ebe86a651d6dc1e83c5772cee1a9fee4b04453af2f68430bd87835126cfd1b3f8beea4d3822fb27864570e255cb65b414197480b6bc20a39c5450adf2474da93d72f6ecf8063899722d3755b7a19f71e93e782d89593ab19ddd3ddf053c54e0bf832311fbf132e8b9e540f38e4d9bcc3cdbf69de54e40ef348a9170ba2f65def167f568ce846889c0161448342fe907718a465e451bc1b0f2e4f21f9b911f186589f43dea305811473837c063b915d849c20deb43323bab4b64e61823f1df119e71962dd975700391b411f8778980a3080ba3c14a321d32c082d416ddd2345f0eb751a516d44ee55222395cfa11e7fc4edfbe7cd49bf4ebd4d7428843a2ad5538b3cd201ccd431aeafb146a65d28a4870a6948a7cc0413b0adac7e8dff3a898aeff5f4b65d10b28ceb749bd354c061c3008ec569d5f90a4d4f5caa51d35b49dc4028e738c8ff5939fef3fa202fed9ebef6f2c7dd0ba41cdb5c0c16985f96fd93a65d134fb4a90ffc0fb6cc5396b843c2151bb7c9170f2fa4fb44292a4af28df5481de0c3c917ba1c46467a35302738158493fbf6a0422cee558d4bce3d78e14b4fefb65bb05043e2cc2a6a8ea64565ff6ce2fd2c4f43fc02926ee44ee02fe1dce25cfde0115c9396c9ea06269f17b2caf58e2332cc1c8528d9705c70da1f76f22aeb1d1b93449180640fb5c4c4a708bc4621d7d2bed5b1a752191cfdd45086d34f247ed1df0f24e7c620de32bdfc4d1f882380d2cd7467c926f48abc75cbfac8788f88cd9dc5361517a5eb36311e6b39e21a85fba2038fd47d860f776697bb19cdb5a4d6746fae507e274399c91648537d905015e58910117e5914f44ebcb00e771d38b30c1473e1232d4e222cebceb4810c48e83e0fd4c852f4fffcd643c0ef9e4fae2d0ebc6f102f3f749b02a5e3a61517d53b539cc24120df3957a633d50369d46c0c226f8924cae51dcaf54d716f61385fd8cf38c2c311a32bcd6594d6930133dc18ef36a9671ba8b179abe95f588ef74e8558ebbc974dc73c26bb6eaae78ef464181e18b71f4b0f986ecc8495a9c4dc0b0b96be9806fbd3d32952ca3b4737a06ed6561e9c9581a33a720123fbaa2a70fc3233b83e56444f5aa0cfaf70fb24be6118404f3e11e6ea004cf2d079a3e93a8ac1d4e297cf4fc43851dd26314a7ed6a5a784b386daa26e50c64692f7db28c21d82234289bb45bad5042236667e6d70a24bc9525c3adcb793a6a5725d9b10911e3bc8e3fd604db7998346e7f7dd1815c0cbb735a977bd4b32b5b976932bc92ef3b56bcadc089045ec95f241cdb0a84c67f1f76353da6cb493bb27a881d37a2106b8b3010cf935eb3601ce4dce3e449eff8331e444ab117a20809a1010db4cf3be0c488f777b6532df908112e3d11592f04a0cc16232d62340cbb8b5268a662b8278d37c03d848a04f0ab498f5af43b0a20e310197b7e1395a65299fac29f051bcc5fcd09a5605bfee370ee8ea21f5807d9748acca815a44d81796d68b0014eed3bb6a94233fc51725de3809ac6f538beaacf8cbe3d96aca21a7a763a957f8892f22c6d086d9af2e5ac9d90321e186584f17e964c90739559ddd034df076c4aa38c2b78aab6dec8ef6be9adf33bfb66f159ec4826653ee6cb483539c47a4a1d95663e6cc7a42a3bf628623a4c9500a59a50a312aa104b198ce5f3e58952bb79ff1ccfa9ddba2fd4705e91b5acaddab9d6522d7666264ac5f533b6d8ac4512d8371c69c06b6d322b046ae2a0a20aec1c3bfb05f3d91b9044cabdd873abb5f2b0e3e19740df31e39828f9ff9bbb20b73541a7a70b8174ce4e43e0d356e629cdbc6c08d29bd7acb6a4347823075683ce9d7de4ab3ddda6572b175951f30a15263355fe9641b3322df7dd52077402a884cd472e6d0b6c34cd63ab63cec8760c7ebe384f7cc31066bbdb7a3417425e039c4d340166e4bba4839076ac9457c87459c57957d0a06dced2f7a18acd22b7295785dafa435a2a8a2c3a1fa05d115fe129d19fc44c5a29bf15b4d9c2b375bc8e591f92756cfc573a39b8fccb8395cad7617b11f14a60e2dbf69b897844cbbcb70363010f6e1bc0590ea594aa924597dbb32a868b55551789f82437180b85661809089d34a168d44b4d788dba23b13542715843eee797366d9ce7793e72331735bc78cd61b13421a568ba3e66926921c04e9d00888ba7ddeb474db63813756ea4a02c1823083e36ebd2d32d5c88cdebb98d511304cc276c7799cf84a1699ccac9569b13f530c762732e6bd0f8415001b2c02d11dff36660b717054b16df49ba38425e3764a56052ffddecdfc686aff22079897376cc15591e11579fe4feeccb55f
-
-Len = 100816
-Msg = 5f464d3301c5e0871d6b41b002dcd09abc80a805de3482d97f3fd7b9838745da1c0534168f76b93c3c53bbabd904541ffe5179cae619dea77446140b7400f47d242141c7f2e9894d88f44c9e066861498e7394f206f594a419790d697f6a11187f84bc6fb288186109343eb11172bec076d041a4c7306d7978c009fc2d2d62563614ed3555ba2d21c8fcd70e8389352dbe4ec808af3231ce990452eb05b1b0dc4fbb1b4265e69235cc3561dae4148c386cd770474863a84a822b2e5f905fc255d55f90bd6a760d441dc52240ba7d8c888a5283891a2c99963d1fe680549d6267cdea92cfead167f6c49663668f2bfdc61fa647f5abf3ce5ad2c6c175dbd456ba41436aa06f5f68f5c88e6b74ea86a79934bd05b486210d3d470a0967ad6d67f7385260578088d7e63197849354f651aad07e04ed301f1fe7a6d2047d50ce5dc6bbffbb1da6b47d740898f4eb54e3c5a1fbd18ec93254cc01f705fce04e6100ced132c519674b2345547804a372b5c925bd9ee9701527db33408d37b72f8d18b882d3c4744eb58f011d21fce336d426de1fcd5e09610216248b51fe2b79b96c2bd6ca0155e05a8a516b7a24d529a9a475284735bd9c4c437ddf399864b64fc5d0d6ffc4e5a7a3dbdd476bc39ed29a0a92e1f2b6b3506c2be5452d4f896db6eb4f895b554b2af64c4cb8dc2369b91022dc50b7291404cc9605c31569c32756a64ff8c4fbb0f1bca346c7b58a5c6774b2fc7f7fd50741d34c8564d92f396b97be782923ff3c855ea9757bde419f632c8399763003b58ee9140c2d62e914c1e1fa742661a9166d42267edc40905b35a25d5c3cb3fb457376b7422896df7bb19c23e8f764416731d2e20cf2c1beb8663c07edd8f105e078e2fed05c5e5897c430017fa2160f565a75a4c5c64a15dd7d644bf355d169ae2696ae5ed1a39e8f81055cdf315e5b0c6f9235515fc4dbf30281ef17b83a6ed604f89293904bf78c7183fcb0ab236cb1f8935e59c51559217efabc000b165d819b717118a03facb61a13a99b194f8b6c7ddfe5850127d79078397a56564c7ed6716a129409680434061b2a4782c9006587de927c1ae09d6778a5f1c39fc419fe10493eb0d4ad492fbd05485eee7913c59df82fe7182af2cf06a6e8edf06676200077bd1408f5c1cec537cb8566470cb44895826d04ec20f0aba4297c501add65c75d5767ad2ab63aa81b7b66f01b32590f1d55b7e50e6df1ee077a19c8c895f5ef62d452cc336e9aee171fa997ddcedd7af86e6cc37722fb5838a46c5e58e7f700edfb7c6bf832171d9581f660752867118e9535a6118635709d6f1c1cb21b938068958e956149d9bffc67f355cb88205d4894ba97c3e3c8be9fa2d20abe79f3f93a6a2f4f56fd075bb49a4b7dc83630e58c32a29d757fdbcaa607352f65483cf2cb4208a3bf94ca7a25e2a4e05279be31c33696c10fa4971d1b64ee938dd299f483e5c098845749a3b706a787529bf2ca56693d0a7a98243e6482a43e1f5d3086ca1b00368d8ead5ed2d0fb79b1e2f537ab9340809ca3a9b5eb2900390432293008ab7086c2811d33de0648be5597ef002c7c462b5e0f4e0b1720a98b2299ad7aa55eb78f0c77c2ab4371385f280107ae40ebf814a8223dc74f31483c63d9e4ed09fc7e5a51bac34d69d97163116a66c84ea9fe4263269b71fd228555ae3cf5109c4d6ced7b9049a2b8069bd2f71834d6c07fffbd7561939188bc07dcea08086bc7182a5270427c3199bf5fb5c4549861fd32a38ec81c4ab058c777dc01864787f0275f911a17838272cd65135f66baf06d8d93bc439eeb55d50b7c5adafed8eb8140b4b05f59871dacf954f4b096c30b7857774fcd319c096750bf605db8e31fe02cd1b9294eaf8bb009d4609f2cdb3a8657f650501b8553765de8f572fb91ac77b35db35f402453e5c58f60146f2906ff56b9c6b3a5d0bb6afb9e2201110919ac9c01a7e9750dfdb2f72afbf7a8d6f64b1c68b9de17a2c9abf289eef24074eee9b1649caf3693118165503a30200993d271aa31b8b92606a10a52612dd1fab495b82f9a98cade18b9d8a723a71ceb63fd1d27372bd281f9b40aa1839b0cc2f2177a09aa8e7b159ac118d7c145e7a4f032e788d21facde2b4dbc1d5d2238f530d9bf9bd2798f611d03ed8919f0c85bc2da99750b7a8d6322d2e66ff6ab9ebaf7424e8c1c3f4fe92be61f65359106395f5ef995e925be3868ad513f561f873acdbaf18590c903d64bd275121c11ea655124d091740887868544c5348664399d3da96e2e35fff34f062fb939d656bc072096e510b40b2f75ff010af68d64fd0acc778e2e13c9667de266b1816c4ac449521b02bbb217002c604be72e73051aa9048d192e3210a68769dd2693e5d44951711aed3a751240d42f8925844131daa36c51d7d59bbaf99623fddf1649db954705fd6f3405e63894f5258c9ffecf83208c2c90cc55b1a8d2972ea6b3a049ee54942b50526b7930953986e428b2c75e47ed870bba68dbfa624dd94112f3059da0a80c583baeb570fe8314f5c66501b34116c81148dd22396fcd6479da49f7e952c8084f97d6803ff85c3787222064ca368f596a1ebb6dab20a03916b3ab071c927d87fc10ecc4e7ab4a5761e3eadaea4de1a0dee30aa39a9e4dbee047201d7d8a4df1284cf668ae3ed7dc4cb2cc4b5cae9307353fd2ae4c105c5d9f3bb021535fc3ae9bf3ff54ddda8b2e1037cd9d69822df436dc1c750a9f557d1a3a63fbe73c64261dae0c70bba6edb57519f5b957f138d1aa5fefe01b73c1851aea42938147bac2762527a492cb85da43014c876e223b05597354d7c9b328df67f354d168a84ce86dff57d8a870db034196dbeff83ebef80bbe52425a8810f2c9fea29ee688a201cce4a5f447be789a3881a9da3b6c491288e8f1091719032608b332e0410f4576597e17e0b5dde305f069be2e80d565bb979a3915488f88e3ebb90e81c264bcaddd72b8843af4a4ae31f723d50fa0995b027c334c351128913bb93e67b1b08f101f6b8dc8202b44fbc3d3dfb530f66e5a8f35e69725c86998c05ac87c561a4706e90fa095adab4a566da4fab82bff6b20076e5bdf62dbd6614245b6a6f8cb6bf60106f8d12b9c3e26f8127dc547e2181531ce980a3273f452892110cfe1ea834a30f99d66e026a9d22dc76fc3cec8fda2d7fea701deb84dd45c97dcde57a017693e90983a156f11c4d168d89c06d8a32dbfa590adadd16850854f24bba315b0bbf372f03711a20163afa0c137383b9120b26c59f5e9e7cd2ccaf0ef4e0d70d5a81748ad441ee5fe178e14317cab184fe178fb0cc0d82105d2f423467fdcda0f9871b9d84882609248356f3053a99866dad9f9b0f8c4a897a8cb8f30365a7ae5f3ca6e772d863d445e6d57c6a478e35d719d0e4e84f3a30b1816ddb55bcd79df21ea0e95da72a19cc1fe74fc576120bc108be3ed4cae3bea889fb4ddd67efe858a994237378eb623dab070d954ac780c1e6d2095383c98ba622cbdb18fb53260979fb2672c21a4600f4bf06583a112d303096d4e30e7e1060d869f386eba3cf7aec3052ca17593dcc9969fa9cd88179c262770211cf53f53f175037a5cd445d239cee48f7ed0aa1d715a22ac18a8aeecf191d415e4afd92b76c091803f4c757a9e89f696ab7b11ad6d5f24774e4a004dcb0e3f33705dd8150431f051016af37647b9e44b10bef114276d4b1055b634461c655a82a847639a038ec9f58876e84e9a2955b696e072d8054c3f81173473604d5fcc0a75b4a340dba0c375beb87b8b01a0f2de232bbb8371c3a9d27a0ce521c4c43dd3bdeebf92f42f87d88978d5b4e3e563cba0e5f59dd29c31096885b113ea5c57e66a3be015b703bc26d3fd1d51a7c14f85f65747ac909d7e30c8e800be27eebf4a62e42e538ae30b6883907cebb7fc5e150bc9da3a138f394e817df9a9e44420078f30d0d3d6981ca581791a097a5e3982c983d5cec239096c7d8cc55c87242026d769ef1d04eb96e5b5001e3358af88d417cc61f107659791a35d8b5f7a5767ae24d5b2ba7aa12230076db1f1b9b6f213dceea62949d98bc5db38743b23a59ea75dbe4231a285678f5f07facc053c2048022fcb01f15e8c100d64a877ecd56d196a6ac60ae35e0e09a517224ba409ba7b70d8f9fe65bc427b212a4e9b3cb17b0d332267cea4f3bea7c1e550f7ffe567b20e3057aa0ebb560d00d28e2f7aff718a9f2d4d044f0d20709bb9ad567c98cff7c4810e8c542370cf90a491bc1088f69998d59f344b74db6c1bdb61f284e99b517a11452ca0bb37c7bae77fca6514b341066086e600f098a32a92935380a173c9182a2513584c54ff67e580dfe16b508acf1729a3d649ff1eae286bffd688fe658612d6c8e69e6e7f7de4ba85ec54747cdc42b1f23546b7e490e31280f066e52fac117fd3b0792e4de62d5843ee98c7201529455c85b169fdb90cb05e3403cf2f737148bd20a53c73880880a14ffff37d62130e682e50bc7210ea6c1f0c27656cc1785a0d9ce93ff94dbc5b2877519d9bac4a339e98ec594a7cc76f4ddf994fee8070dd4b8e0fe0e51b93105fcf566f83d914dd862b4ce78de7e9e16f142234bd969ff8005dddc641dcd3c7cfbdd6113cd3ba34a9503a0f433899e90e158abde2ed4ed4b3711c991577c5aafeaa982bce80835f8e6d7c7975571fafb1499991646bc499ec32930367d4b1de76ff656442cab987bdecdbcc2b2bc35ce01816594bfa4b6e33080caa41dbdf8ebf2205649f98a2d3bf331fb16b9ecd1824eacbbc9f81297b115b4d36aa7496e05f7d40d4edd1886c1bac10cf3f97840a03277e6369e7a7e90d932050ab8720fce076de5c355fb17959bd75cfaeff325b0737f8f5b1160de0b0184ba04afcc30bca77a6a37e29662302d01858c0bc1d32b883011b7df5a387805296cd91bbc835a3e76152d017ee929d4cbf137eb78db89d71617dd76cb00707aacb8088ac77a1f52ed710331193edb29933a7efd8cc153e6adfc2c6637e88cd86b06036b8177847b4d086b0ff9b5dc91f3cbd1c08217023d7449253c25331594f0f16a3c5f2e122e0145c4ec94f096b45a1fd0b2dd3f1d51e58978471782a336eae49d7bc4e050d1c6a391658f71a1f752c0ec6302bc2dba9e3766359359ce34955a2db86740c90d09cc50e92dbb76e17a39955fa7108bddeaddaf860d1aff14acec8b609ac1d336270a940604209df91cf45be72edee04277d694a6f968ae6d8e065702f3d607f3baf8db4ab7637fa4c78bb0b7fe69937eb1dcb616fca564a5a521e12df71fefbc321187159bd6a47b066a3440ba634de9153a94546b63aa33aed9da2018e1f30628df37f5360ca4f2660a46ffd73e58183e8abffdea25f7bdf798a2b7cddeaa481bcc6e682a67e99143066963d96d4a928a478951dd6ec59b1be8cb23aa688e1867738aecdd9afade39c92c0b2572bdde84eb912ed990ac618834c412231216fdb84f1e01b3f8414fc6dd0f646fd0fa62bb0157b3535e1497c9272df1cc5dcd4e6ab9a8456222655c56ac73fe0d2aa8b599035daddf0986a45b1a59510abe19a11b6dba065c8bcf8a85d20a3681c2414dab7c036cc1358b1dba98d6ae62c5948c36b5b3e307a6f860c0c822ac724a5c917ed5f98ece548a7a741d366868e6c676394c3659f7f6786594196dde332543376f9ba0724b091d30f431f91d919417e5bf7ba1e9a21cb80f6c204c3a58d59d960a5788b5cba5abd7c7518f4c5170115125de97009a6c3fc4d5773e4f57fdd433eb7422c7c4dccee57a1679633ced3b5f08df763d4577983c5ca8b49bc4e08fa76f8bff36daf0fed068db47f0c87e0e45d518dffe37c129cc6e2f5f9e0430185723098e715284a42f302a6b8368a4f2dc16f534d1e5db9d0b86659fc4ba6f16c982774115d02a57684c7e5489b1f491584b0f0546e4194a6041f5e5be3bfff3852a4fc772d83491023a61a37228ef6260edc0d1cb972cba610d5ad1d92d554700771d8236ef55e983765ed8eb21e7de7c8bb51aee9368758454fee4a3f32179c1e54af1d069e0b9728cd0554351907e018146511e4d6f0450b57c8ebd21c71450116296bdfc779945da60b9192c5bb9a67b1f04d94992df4cbb3e30732dc8af2177fef17e0b7d01740b8a64db16bc29c1e589b6bdfc967edeb2ce8a649ba892bc856a929f0b837a838ca7f917a52436ea3d20e72afacc5b9d58a7fd0fefd96787c65ffa7f910d6d0ada63d64d5c4679960e7f06aeb8c70dfef954f8e39efdb629b72979be208d616071289cfaa0756a4bb5eea5c7baf8fe7a31501e7e2d67d708d461c0c93e85f03afd70bd9e16437171e01a34f475e4b5a58d13ce4e2fba72bbba93403f3f8981e0bbd6a8a6223327bf096c44b36e0ccbf7592a98c1fa67f198b628787ec80aaef848b4fea158c715799e6f458327f399e6420f0e7821f2dc4663bbea065c7bdfe830b6102e2e7193381b9dc7f2381ba808c43b8fdf3addab4b5fa81564716f7d46e0349d9b27b559710d723c7ef2f79eb55c3a9d75b99ae6fde6877b278b583f8ae3cae776b914b0cae0772397fd19b6a27676c7ca02cd07f4b4d49bbe1ec87f2ac7e39e5f7712319c31271dbbbaf4b826af8a9f4acab696c62719f7a6a032c4bcf90922a3c630647b7c1c7b78b10afbd863f07486561a0bc8d9b1ff5fc41998a7e3c604e24af1c1df2da1dd5d83eefa2e4012f7fb5959ef9339574367deff73723484b5a969c8c23dc251a3b887f34b9ea09c9a1838e8aaabb254445d7556dda257dfd5579737fe1dd6c67f3851ca68b011e7cb7b6958d588f143828f0bb24fceca31b47b77d1ce05e75ab05b55d6c9f9107f0c738f2cf8a1629f7e9b2694324e082503937ff8ca7c5098f770289af7d038dcedcf0ed77c8b82e2a9003a6f3db69e14131e144f6be7cf0bb5353ea96aebd78befbc6ceae9bdde97823cdbc5ca8ef8a993a9d9383aee9f2d6a18fc64ab92990672ea2dc9b89ed248aacf7f1a513da43fe5953335afe76d78867a066f226ae9c727c6c60671c50a50732698ef7a492d51998eb6da5368a667baf6d12b77eb36686ee0ca239dc6f3598be0bda79e47f0891fe4d8989df8c685480de11c148a2b44c8a6bea3a50b09be557c51f545a09a30e9362cf3080e6a6bee3dbad370ce24f6c5a6f8091007ca195057fa3af8f99703a601086c2a1ffe55fde4c2c4153dbff8d6601ab68743c0d50d021b0b3099535ba6c40f866ca3ff0df7c19d709a3f58b57b40ab5e43556a8c0c1938c875267bb39c0db6b45840e8ee7c22bf6b48798bd744f70e42fca343a8bdfbd7f55f275ca5d62c7288756d4861fba68d16d842c5b893c1d8171bb3c8b593387d3426f292ace5cee7753c9f9a12e6bb9af5a24192e4184f7d3d191d862d3c3dace7853eaa235b6369fd164e5a7bddd06daa3eec7fe4130e82478d36f88a0999cba1f251ffb3a7689ea2baf016073193898716a9f933448d7ba8e0968c669bdb7dd5e6e32fd84a6ce9e8632b393f9263532ec2107b4c0d2abdf3abb2de2d63511805eb58a70bc4ded040d76640af60ce7f03b9a682b8dd84ed8a47225a48e0b94ea47828f1c8974cd64e5027d8b13d43519875d2bbe4461a7f0f5b5b8d63a472765405ea9c994225806395e64dff88506f7f7f3b6368d769e6e550d4e3e81efb13771cf403e855f75312f1383ce4c2744d0b4e3735a0f1e1b99eb014fa60c0d1ca9035fbc4403330c2fefa8411fb7c3d6ede5b5c8f4736106bbe01923d483a84f031e9685a3b6a70646a2a5059ce35fa496b3f21fca6047471a5bdd33908cc9328de9fb032347c249bf7093390b750696124621dfa67fd9c7fe85d6e5a4d277ad8f8d169f8b5e8dbee280f8443518bd94abc5ca704e781e6cb1868ba2d6fbbaa850326fbfa5a20e4df6fb5f8ee2728e86a758763a8af21e1f7a8584d3f0b09a0b19fe8fcd37bc4fdf45084d7fd92b80544f29aba52496e2c9a0aa4adeb89820be321cfd2f0a53585a15d04c7fe4ec9be6eb5df419e20b71506c1f642df75c53a9e3b2414fe6102fa8af7be3f6c95de824c31fd6fe8ef9d49e26095a2674a33cb574e9e493939bdeaf5b309b4c51256ef71e95dbbcee0a11991693b533f916e1c82ce86d65d89b6d596017fae944ec364546e78abbcbe4322b83e2fcbb4c5d4ccb54d8642c7eb9e28c08598a356a5c46f8813e6b63ec2f3e3bb721b726361f85a734e0514f4e9c4732991ed3998b1ba8f618c2071d1b943eb0f8766fdb7f0492421429bd380deca3325c8d5c7b6ed16429539ae54f1eba39748f09aa44efb67d863cda304e8653ff7499cfad44dc27807779ef8e63be4b376ec403f3c84eda4e5af31c30f9807762e0980b4e5d9dc406cad4e888bfc3ec4186de8ccfcf631b0ba5831747a1c200d45ea06ac82c7952fd09aaae5dcdf5475da427cbc8c1f71ebe5132f2fcae15975ed6fa14a11b38766e1c446894f31c0496b0e5e96507d28e6e4549d6d78841e40630ef306491a1da60eaea3fb69bffcbf192610e2e07bc1124690fea61980e8ed654c5e796f67d26db5de35b4a2c67427833e360ac2a7d4fe7a5ce572144443ed62ac460c1b19402e85c79e3d80e1c143279b20a66d8dcf2bfe1cc44a0f5aa9b0d9b36c46c2cae148dd0f2ffe9a8e6e7274d1832e57aa39fb40553da6414094e838d613a20ce9307d49f97d904648d6460985b01af769800cff9a940f70729fe40e98feb64ff0a81c5b2b096b1a9d832e440c49e4e3684bd17a5169fe138d2544d9806fec027dd2a67f1856178e090f9bb2f9b314a202e7e95f2e41fa80dccf7b1810e9cbcaed2acc2445d60e26f7d63ee4b28e4299e60ea4fc659e7d6f0de91748bf1ede1fdb2acde9482bb76bf6716847eb2dd7517e0a94f0bbf20f248d2c79fa0f518b67a44d5c4c73a9bbc3816ba85ae8344b5f377649da75cf1857d6e4338a76446c48e52cc7bc7ce283d4252f8fac5e1427299edc33f84798316f77bad4a87849e91a1a23c0b7a86898046e278eaaa15ff33730a6d3f885dfe2d1dc0acda2a9e49a71cfecb7dcaa9e70eaa8fe15d4567a280e8960ba49d5289535907e9f277f96e8e652c21d89e81696dd821db5b7e1e53e160584477aa9e4c0e12160c9956df36cce6f4e724dd543827366010ed3d843cdf4319c1bf968a70e9b1b6bcd8af96c9eb0620c569716b7bc42e13251a6adf8201faa129844b5e1d699cafa1b66a674e732c7662b0410e5bca2704c5ebed7850d0ebb825cfb0627a183cc9643b709aedeac2c06700358400c389f99666ae97ccd37f265da7addeb07df9ccad6fa777d0da2fc47b6235179136bbbb409596841e921eb278142a19e6203c7f235bf8461ccadb4b47dd290d36ac27126c808b866f9531261f1e0f5c458a6bab6f064b4efc432e1c7379f9af19ac34c5c22e76e6e7651e48f9ce44eff542f018397889d896cc9001a63e8e455fbe4a9ee9a740edad894fe1af2bb21a1dd0318e28ba982c12ed69c08835ce17336ad1638af3cfe0ea892ab8e83d3f25e6bd98d5e4d36292992e2122c265a26cbb3931dd4c1b0d0ac5ee19974d0dd45777908bb416cbce52531820effcd7f28e1fb2d3d4d826e1b2673e834485a25af9f9d174f566abc3b36732ceefdd91a7c3885e1d10d51c321ff704d0883905b7539309ba5e7b7a2bfefd0494e90e9da7541ec37858ec05ea9a9ec5672b113cd5ad6ebfc5b8fe40ed7c3f17d8a73703dc89086b4d75c5eaf06b840bb2f5b4519a4fb17bfdca9605f17253f203efffc92da96fde023007d22cdad05d18aecb4bf08085c5ca5eecd21f2b611e7e8a0ef981fe7aa2014f5ac6862fab44011dfd33be8a1226943aa7ae5fee9221b0400d9ac2ce5241b09a68cde6b13c47d50bf310ecb37f25c32770a299020d8500d8a4b5d7621e4379dbd6ef34a9aceefd4055ea6144f54bbfedefb5b5b0fbd1d81c7a51a802072ec3d84f34585f22c1df84caca07849b1ef054cbef9b40848e9fd238761df5358cf55a79a53a1bc749e49ffab7c5bd9a28bf24ad5833facf43bcc3852c1e85cfe47929fc49c325c20d74588eb9833519f192243cf96625057899b70a7c93f8fdbfb60d8129d9c43c95f8782ed8293641ffd21d21d91a0b4db69d766f6d6497e9a414ceb04b65425d6ad6c8811da00639dce8d8030038f2d08330c75b0879aab81bfb3330b950e54c13780d308fceed2a103a1a8b77a923b66aba737654ba7995acd306aa7b80f632184412e2369c353c2132ae614553e626f0a3436959104ba6e0040dc597dfbc3602a49e401bf2249699375b2c722083489f54fcdc1f616a133ef6112a1754818158ff78f245b9046100b0e89407f74145fe336976af971c054f12d98002c68b3aa2bd699fbcd71bc4dc071e430bbf694595a951e01098aaa499be2f70611f248a694539ef8936b2e8b7a3c5de8662436fed1f7bc24a4e5c17a663d9a23b4692993301b08cb3bc10f518eca51081c717ec8dfbb0c2669f7987fe6aa0bd98231d8e8b58951b42537f12884a857e02d62de4fda6b88b6b754b1b27394c6a819e0f92f6b2b2473fe245678e252ed31477cc7ec6895bc361b718fcab3aa550fc9faeccfe77cdb5b151ab1db2e569b5bc923ee26f0b6113504d295112d47218140e44652a10af10a088f95c7cf2fccd040fc93980939122411ec643e26e7d69ced3178402e320fe156e774b75b5afc2f3d6b6ab828bb4993b1436faa5728cec34d66f520f59e82716ed6d1324944c3c91d04d5ffc5a921f4716c39de24768484d0096f7d8dbce35aeec22db11f899e5e7e3d57e7668f35d6c0db3542255d9262137d39ae6cf9bcde254dfccc54a6062fcf8982f781d9ffab2df4f49ec04a72eb9646d63bf9e1799bc0bec0ec7f0675ed9f8dc9b8be15d9f2175dfa1c8bc99071c70ad7bedb10a4143fa91c89f54777f84c9eae9361cf7f4c2b7ab873ee5785a5241db0af86f3c6d7f091623d6dc576d07550a42023633a09c8dfa21d7e70cce64c13f37663f75c47921c246f3f2d1d16a8283ce7697da4cb7e016971a2a1d0c59d6202bc18b7cee3828de597efdab53b33a9fb41aa7b49f1c964512901773bb396ac80e90ba1a94c408b2860065ae9aec64a41d76cf8842d299d0babf14d5840d647d075c34175e26a786f30091a24f1ce8db30137520dce1cfffb6318a0d0fdcac883eac603bf365efa2c806eb4f194cae8c16780342165222192f6ee2e103ae2a31dc08a84dfc89c64d2e9ada7ca1839dfff62ddfb7982c79684cfc821a098bc6bf09f87317209b16d14d45c6f38fc99f7bf9bb73460977bb323665d480c87c687cec052a5f08a2c6744c8e177a8a269b4a47a925b9123cd2c014313edae988f8aeaeb633ee5ba6be7f53fe36da3aa37ab2077f5fd75a82a55a0fe62af213b85e9e7694f78cc2b0e63a8c1b89db484722fc62c688678a511c474f0eff8eef1382946d26de00e5c626ec1d7079445c1b7c6f7f05073249b11fd1fb30257724a14cd7bbf451146bf366de2e826fdf1d25705587c4460040ab963e3bd504755b6aa5b18786b68efd3c8e59e8dbd172346fe7f4a18bac98164669d73984044f3c777368f965763742ab86a3720208c64801c796f6e3a1c4748b81e41ac58dcf6ecfa0453b18fad7e3473604f57f7da302e1fa81ad538d4a0280c4ad092007bb9a7a12907227a936871886c699db97d00a1966fdef64d9f3672f1b792c1edadc6781b391c91bea1bd7275f30859dbd1707b1f554e49ceb874ca06e92ab466efa7eeb6990667a27507a7ba789e24d593ea2af8eccb3862cce58daa63eaf212bdd86c01ed471cfc79b191c481ad773d20e821d18af85a7049034e5a9c660357a4c2808b9a6139f32c55c13282b8d98904f4f027d438189dc9487c96172e50dc1100ccc224e7374cf96ea6731032c43fbc9b367a4d1d0b31aa3fa8eb589672e69f1d9144114bbd508d56c2049ecdbfd7b43545375a099ad2885353d8c550d22dbb738e6fe3f104b444c89475a2cc24d7887daced8fa05006c02dfded01c00707e2ad04c41199c5decc1eae34b0c0abb5a5beee1b5253c3350e1a077682767a0b9124a4df2e8879366fd37fc04d4dbcf89883892f46a65ce3aec22123cbe6b3af6364df1f9f5f9751bc8179b6dcc5c126dd65feb7d11a85994e90ab6342834c79c5f82413e88198c73e932c66e3cb60b6e0c0cf438622e5dc5a1036c38afe9cf13559044a9e90f5fd72a3188ef6b1043f5f4e6b40ea51f6235dcb33b3099b2d8c2e02103235f0476ad51bce6d8a2934068549633e521a3ee4c62c22b042fb86c13c8da849233205a5e277aea1129678c31f5c379a71fe08b72fad9449cb923126dd465d1e0ae8a925374149b8248b3afb69f168f3ae701c00f6ea08fe07f1b5338ce6af2f3156ba6f300310114479f2f6119367c88c12c158b84be13b9c8c7b5dd7c90edb5b3ea1fa5927a25ad6d5596992dcd4877f58a134e05dcd80dde4fc2c2a680cc0ccf3084d3f4970e3603fa6bc5a180fcf1ca4241c0b8a1e7c607dc025016e297e2b0645de4ec2fc49851b9374f3ef99edd897c284a67b647ca8c96fcef935d541e9faf334043ea50b99fb8819ecce039227b624e52d8c20003b5a43808e4990da8e4398c4fc172b983351fd11a13dcd2aae5193d42d46e1b57c92e3e01d23fc968c729f3782d6c07dd5a17af2bda96735c12cc7d8023629fb0125e974425f7914690a7ed26508343ae58c8a439ebb6232049a194768d4594f5d65aca37a5686c2a86dd04bef35d74e0755937ac0ce3ebded1c00c8adabf030e5e4a5f44193b62fcf2f1bfa9dca2a25afaf2f1ec06c5d17ef3526d26d17af3e2f257ded24b177ba41c0ba64fd4fbd5042fbd5961a105e0e9f77f3db13c1b6c5bd9a9d04801a5c00a4c544218a21016c65bdff774a44b1d05256e0693e14d76605d67bd10048d3816caf31a6d10886c88c783538bd93e92bbc4484f3388b61adac4b92b911c76ebb1dd11b7b4e40be032bccff610068746f41e34a1fbfbfe5faf57c8a4331008e2c1cfd69f57e74379ac80eb6769f4ce4196795b835201ce4ec85ebcaf5eaaec242fe6695cbce1d53fde5b002e006bba8c8a1ee57da061ceed0d21bdd57ab0cab9e46bf3764d9a6c3ab19736d43b33f32eb955f9174ee4a54666e7f19cefeb49aac7a59b7370d9ae730b7bb4e08413222f0a66bfdac252fb61bcfa838f262312febfde8add8f6843f1d64ea3da42d4ef986498604d65737a44f5a099338520cdbdb65ce73b110dd4bcf8592a4adc3e0170b13404f99f0ec8f9fb225c1275a921f09369db165e9109dd5be472b9bc1901bfd882d264d9ed8d88b4c8f3b35f88b69e3e4b8ef5debb895be536a3af492d968dc1caf31879d672f70ad9869ea98335cf9e4a2760f955fd3e8099e4b2eb4269e354548f9de9921e50e49f3f5cbd63468b9db0cfdf17250c8f13535d4c0a1f21c87967cd798fe93b9b2960447401ef90db22c3adfba0f55f5585ad37040e8d6745184dd536d5a26edec365bd6edff1bcc616cdea3bfc8b9d98c0ef9a626054e361194cd05b2287612399f6d3d3be2f71555f14ad2893af6f60ab61adef663c3c2464ade671dd5ebc71935aad290573588fe6e11f48cd2b7db62e4b9932890d1b96e1b83eff70f026d199db75fb1e83197c937b672613c66ea131f485b4318e27c079b4018d4205484993bf50ce70275b244f2caf47cb47eb2a9ca59afbc78809a912eb56a4bb65cae4694f682c6329c690003a1c355f779b5857a60091b1c3685995a366cb43d753a704d3e59c5f5003c78feed877351e27334b3fdefe5907edd9eb25588a42248b9c4a93efa7cc63bad1e5900b95b70436c35eb85cc8251c4030fab9556920141cca24d6acd3122b92b7e868dc174bf071117958a4797fc90866aca685f1456fab397ae647ab9970348082bd74865bab7f248568db98ced7ed84e8360fa91afde3f23509e6b4caf948349ad9fb6a4efe0a0468302cae7a0f999195af1c19058669fc3b88b2780b9075dc180298498caeb7ba0cf8bd42eb36b1959d5ad3ca6fd1e85f76abd27ec5fb637ee38173ad7d86304d5708b6dc8817e099e77f5d43c1a70624cdb96e4e6103bb25e59eb51d894d1dc533a74005bb79cca35b66e10c61d06b5227fcb071457025d605a0862218ca252b871f8343ec231dbee15688aeb914c0f16ebabe6edb0a489b2bd10d4392c6f1863bb6a62181de7cef61997ab02f3bad0a893cc0cd8a99cd7b3f7773085f0929de36b5d124e3729140c375de9a2d0cd9a360cadf17b9e45b7f2adbdff9e75b743b62642ed67aa703b8ef33dcf51a50edc7dbab42d3d2b49badd2457a9f92847aa6a60ae2beae457a5fce1a9e485ecf907be22913893cd1350f20fc6c81c94be426eaf01864e813a03e4674491b61516bc95d8a77c15f03d0adfc4adc27f27a5ac4165ff6518eda1a5c408708f78a9e26b834179804a312148d4f75f21a77d78387139da40c0a6293c2a59d0162437d68504f189ed970c5abb9ffc6d8e1be2b0877c7f24b1dc273b1765bfc5ce6f4b8d99a96d5b1c92ee53a39f685b304313d909c1ba8130d20d51c824cec420b0315229df295f75b453a6c131afaae0c36d7c4fff70623638a4f7ded5eb7db58d95deb6249a29b171d8ce651556dee8037bf4ca74453a4a76aab7cc07ba44e55de57dbef8542c3851ea353fb8e259ee89bbecf9ce8d8bd6227afc0028afac48a7acd9b4e8cbe982eb1475917ad6be4cdca9cf6e7cddd971b2924f2bb730264801685d387485e41993c3fa0af9987e8b52c21688fd9a9595ad8d1b9f41e0457be18492aa09f69e64e2954d1ca3cc1d32b2915cd9cf6862ca79c80beb47347c4cceadf48a37b29b1d6de4e94717d60cdb4293fcf170bba388bddf7a9035a15d433f20fd697c3e4c8b8c5f590ab44aefdda94681407008ea48d03ff21e9bbb4ae7a9aa37c855fe3537c44106e8079f18c24d2584474bd4a99367660ce6f7e6d7c294961e174366e7babc569d5f80572a21a4bd7086629363e0c9ee2599c8b8863c96613ae6c32cc67ccafc66e1cce79654567ad08e62e9abc99e44d6a79ca4d8de15b7f8a763a4741676af0e1f3bd4e002c8fa1ebfbb3bd3a65ae68a80c230422f98f6e1e9837252e045eafd585ba389958297d59aea1e8e1f665fcbc5f7ff449996aa712dc0faf582cf3caf3dbae80594f9f07fc06de63d9d672d14d7ac4662b4a54f40d4aab2de766910be2fc7f6f679b5708790b5376498d3baf0463dca2f093b51bb7e9f3e7033ba0384af0174becc3bb477bc5e86959a12a5e8924adf0bffdf5e5b9c1cf24d232881ad5c05c5c0f50318ea83d8683339ca6a583c52198c00f7c1abbda282e7fd3b179297338ecf9c923a3a87a130dfc06164e9b4c1fe11d51b382643de44b30a6831dee119241d1b6f84f2484784fdf65e41f78c38e15fb4b00e45df1edc40e3467cdcda351a4c0a0185ac4649e91024377e1c331587a8586cc0a4dfe29e14004c3536d305f5dee0eeb8c2f216c1b8d27375b239f6458e08980badd6d82e9ee9e007578c0a3b48288d9ad0ec3c934a99a8c5741149af937dc82bdb545df26428b87fc935c05f1a4964a8408539f267e23de9bc498e2a4b0083cdb7c8e27de6252bfaf680a6d5b7ec1a6dac6d7d537334a95f1553324a0739414dbdb50445a767b0f589fd4c33b35905577ef5a53b0f097191f9cee4836a908748779941de2a78fe1bde0c2efd9f48cbf232ce101d9df93d3ed40d036ae7aedc3a5ff619abd1c159ca8d2dbda7de13b4ca62576c7f925c52925eae2d7500dc969fe14c0a335ff95a7df1d276a6f242765c781208d59edb5848d412b11638b27ce5a61b8209075976c2a6aae88f6e6d8704fe9e83b425dec4defeeb3cd311b8c5a818d51f917a8a4525361791d5c4fd5d70704d4b9fa9df1ea119882f400e682753a41931712c043c120a98f0fe786a600b47befefc9d64cc5bbe8a16c191490874e258760c9e4fd215bebf848e0b4d35521f53ec5f9308644b785171fc4cc3ff886e034bd833d59dbcacebdae8f00e43c151bcb24d1d226d1cc19ecf349361530a81ba3168af3df5536fbe52b3b93621f57959df298e5b4d3c14928d2ef7b9c977c7dda54242d17f8661978a62d94d565b00abc199790b9b25fbfd4a3ffc35c95ccafe35d9a138a2c24d17f06ae2cc376e822317f16fcbcd56e23f84ec135dc935e58c61b34cfbf5a36cb00350483b6bac786030e5c5045a6b61c9aba7dfaa4f7fb21897539863ee865ae061a77c0359915de3aacb3b5dc8cfe53c4d17b393c2b6bb23652f36390407922969d510cc97b99d1df4361530aef10707d7a021b2d9576b2d49ca88b3cc83ad1baa6d88ef8c81c08f8baaf515637b21ace9d5cc8fd9fe4ca6c3aa129caea7060791d566f4de8662b90f9e5d849cdadf9bd23cf6737b07ca105142663c30de27adcea11d64d433fe1ace84b0f6917c8b655f2a421602f07e0a7127e61ae9859c5e9f652ec82416fd2566f291f417ecdf99bf3231d02864e2e5a1cf34c13f59de9aa2760d8734bbda79576c62f566b8269990e9384a41c1634271acb4c7a8b768f276685c3a8c7f20872e56b683244b1af562c3e7dcf592a9915f44f886cc2ac5f679c07d5aa1fd69cf3a460f25c722073da336a310aa551062d92c7297002060072af2f3500b9310c239bedf45c5e985c2e0d60c7dd68522376dc7b560fb34d1b5089450c32ffcbff07b35a96bb6fe01259a06868d00af697f8bbb238d03d49570a109181c9576c1ea9d2ee02000cc23e63d6c93c6cf3050bbb15b6f73b09c25da62e5abd4c2bdb1110e1f25db39f04885595cd6a388c4726c8d4cdbad87d80d42fcaeae843e2e17f44c9aed25c8f6f9736c7ba1bbd3b839126de40a930024a65aacb872936e446114e706a868444cb140e53d976816983f3dd1d57eeca01eab8211b7aa8ae99d26e35c06ea4b226e0a6e52172a40e7f0df5f67759ae2ee026749ba10b8e33694c3e01a001526f9d75f6c419cdccece3ea3f78d69014e509c741214581034bbc7e2bbaf76db8421154abb2233117a1ffe2786b21424576e295c9baef262e80fa2edb69aff800b3ea436eb827e8adb73abc48d740b86c69d557b16e874038598b25f616afeb4f4a900be7dd0d38b5b6fb4259c51a3aaf4748d7a445f518485ed72b25c7df8ed0906b74bd29bd6a5724ac3a503c990f3697a5db484821f68718470810862728a80ce34599a41fc5bd8bb46dd845a4812ae1532c457ef4211d0e41835e5a6f030247614822571c930c727ba397e723d6b3aeba9244f054e331c82e65b74c9f6504c74b4301499a1a6f6269a3352aff57f88442d4eda42a82ebcf7776c5629f97d6160bffdd8282a40ce2e6375b161e4c22ee53bce7a45f4774aa827e2da657e1a1bc07445f0bbd770b7a5a25b1b469fd58715510dbf8d97af4e1b9459a20b08a8d3fa9d92feb32db95b22d36de0bc8b1c397b09970a6826392fd8392b2d790dcc1295888f42ac81ad213c7328b2324b28be7cc1f4fb8414a7785472f1dd3e11d66017b1756d1697be92490e15f056346d7e9126a1f35fd76cb016fe2841c8996a3507c4fffe7fc45026df10b03b86fb6cf26e8418926a030b5fa62748fbb728fa19dc2f8947468c1477750771e442e4a9d25b76d359211c05df788ade5b7824f8770b5dac0819737dec916ee59b28a49666ee8b7ca81386eec8049542f18a3207e51bdbc291470eeefecac385c096a
-
-[L = 32]
-
-Len = 16
-Msg = 43cd
-
-Len = 104
-Msg = 5f75a437ce0698a7d8151c3fe0
-
-Len = 352
-Msg = f88bac738d1e3e10f75e46e3fe026d7e423fdcf3d7e4028b33a291bb4aabca53f780fbf99e0346d610d4a38f
-
-Len = 488
-Msg = 832e5b78a73a1012ee62e00621db7f4d248893007c6e5d6e0e689c6b291baeebc72df9cf10b289fe20e7fab80a2399271d0ac63766049da875eed56264
-
-Len = 13976
-Msg = deab57cdeb41974037a9bef5e292894038264eb4d8993d4d1501e6ef9c68fb0f571f57b0925640925deae9a6317e3bc4d6cdd5a0833e52fb48baca16a9ba9b6c8ca469a0555763b54f04c87d4e41aa549258f30eefe5a52d2ba06657a8773b0842e094857b6d8911d6a0636280025e56356fade362b4bf4c875cc19be0c6644b447be0454dbf390eb966c03e10e9de3487b90d0825d327c12495e3c89ad09c9d591e55c91376fb14c2fde9f7461fb25450df1a65806b65f3caf4d5c81ebc6e664871fcf915b9578bb70ee6776acc62205888dce2baa4024941209e81b4b35f0eda1bdcbd9ab1d6db6140bda4c41776fe675d5c681da5852d50c246dda4ddf9fdd7c5fdfeec85ff6c883c78689c2977584406a1ddef977606c182d6c33561c39c071668a2515e5aa6f4aa1faa392aed95b82ab32b79a15e3b5a07551ab068455131b72493126470f26c30b852e4415e1d8b719b3803ecc336e4facbcc5d1908851f4f39b776bec8b6b9794d47e5965458858560eed5a0305e260240c0849d93a19787b0f8c795eb5ba32be573845256ae6d0b0a3336e42a1beac8bdde6d1b6e0b6207903d4b105f4af2ef89bd099ded870daea2f170e03bd5f6f4490e60bc222d4876e16d4c58aeea6e6c400dbb9e9f4b2b142f0fc9bdeaf4132ded38a4a8366e107cac7210945fa2df4b124be37ef76290e5b9758aa3bfe0091bb0448206323584c2f833e0edfbdc0c33075fc9647a3404ca490bfab94302a0679a1a42fe9fec6af0cd98038b09ffbecd2832b579b2294f6ae5b96328fdc0a0b9b3a32cba04fa8bae3389c3951173bdc17caaefe526aa386f98670b177683d0b804c5875fe9c7afa233ee66349c9fd1b60bb0becf5e1d887e67fd3baf34b4f90d94699d18d6bb9d77d4af358f31edc254de2d6c5fe3ec07425c633b18c1b9e3606b78b40b543e1fd31fb578cf58c45744fc073fbf3c7d7d607e815379a5fc565892d81560eab8fb5f1ae6771b998c592e6d288014f13ab283d53fcbfa66e31a9d107308402191fac2cf2b799c7dae91b93a7676898b8a6e516a86eac58ed8f6d8ed2fd4d38031e4a4466dc8798b90c48e6adb6b4391d47872443cfaffa542b4b132f6c3408f0081af8692aadb4c9bbd55053ea56d8b82998f6b4b41d331891acfe6af1bb0d6679989978368ea463743b514866d2d01fb9950e8990867bc14f1db1142254adeccf3da812949cd03cd1d569e9d0bab7ca7405cc21096e3cd4d007cbb9629372e98584b4c6b97ad0bc314e1ab6ac71184ee555c01973570ed9b115bed956f9e4e349083013098b1e483f0fe44d5e9849f38a2f7ae152b36a266ea1faf263ea8c706632ba8629602187379546fc6b82e57ededd6d074c15c771754710731e07c207899eb47e8d7c72ffd768c36257d373375ffa06f9b3f0af11417f9ff9f9b44e1f1f96ae8aaa429af88b14da1da81c7bb38a0fe9372ed6a9ac6fb5e9e56b82593d94c5192904450227bf040b7ce0904789f979845e112a1f995c849ec3f7e49bd975a474e8201630f40fc0d80e76019f110ae158cd0f8da96ea4561f24237d8e795ebf52368218bff3e9d5b040ecd2caef4ab1e7127e53bfa2b3b4fb74829f9993ac703192aedef79dd9ad24c2c976638b4575afbce22ecacc273ba43379ed55ceeb51838b0adb80585bd1b5f2707ee16b67a7232adf7163415b24b9ff9dc94b7197fdc89e2a90d2b9eccde45e965edd064dc0d1eadabe11b8ec3aad2742b5d3323ebf913a92817749090c20758f98aef2544d4c8b48874e8936d7ee492d5585675c214deeb74fd67c4d170ac5e0aeefa607c6e37abd4f8238e776fde3921afab75cbd8f392d3e88da057903ce2e140797f4a85737bd89455e6aa27c7535687b78cd0ea59848e006c8de9c9c0cbc7a9f5e977be850adc710503ce4ba7c7bd0b042297f518abec6c8ef451c33e030251f506cbc3744228b6bb4dab86877d9e6019a0ea9f39ed37557b3b5527c171da5f013e0d3c480a038cff2c087d6e5d41b17e6c8f90c334b5e2b9ccbe9d4efd99fba1f907d00a49b71b5a08aedb644fed24bcf04e71be67b03cd20d53ccef8f854f5e9f7f28c1e98a8a53496646713bebe15a93f1ea336e6e8a4e68de5dab0fe880bf983eec75d1c5027357f6669e098411e0bc3ea2293138f5b34425f78b6508b94d4c0cc32ee9afaa409a26e5f2a1fddcd6d5ff42a89755a58b08f243957a2e208e24b055f51992ab447bc06876eba169c545fa71b88a0fc15d1e0be9d334a1dd0c86f44bd149b42c07608a9a30d0b7e13574f8d862f2ac72b2ed38904d7cab194fdb9e4dcb615f5610b24e202a36866baccac01fadb575df11dd43e00a3b92fcdd8c7702ea49d951e7dad2a56c075730b4af1ceda2bcb2310256f28312579fad40ff471336ea6a44143edfcffc297258d48bd2ea47efab8f0dc00f1e6dba1a55009ed627b7
-
-Len = 48824
-Msg = 5223e2fece634a95e1e7c83ad4a11a0478f4a41572bd66c2d7902cf4f94404cd80b1f58fbcb8eeba3984fd759410c12f8ee922865f363f684df5a8787c87ceb3086fb8535157f7f39653dbf5c66ae7219253838ec77cf1c6db518225c5ba0a8212e5911236474b8820ddcb8111b87320adb82ff553986324aa2a21c37ce4a083c89ce9931290d4c1fea933e31d014d7507a28e83aa917ccae10bed1a490e77fe501b299f8e3b78e659407ce1934d5d68c7980800746f26ffa9794ef1d23f793bd2eab7fe524e213e58280f441ba48b40162305335b3a480c2afeac11c27f8d817792fd7805d4b61224eb52d35c0fbf471bcaede505fbc9398b216f43bfd69b1a669a61d44fd21faae410af58ff95e1c3ff1528de1aba93cef56bff4d714d8c4cc88a4ddcda52444ec1208d99ab3fd9fde98c1ee6437d8d138f62c5f782eb4660c5eb28564b5b0d46e3a2546009148f3d02b837c5284e9f508290270b97b9b29e84445a0b4df662d9711e6b73c11cebcb7120dc427034b1ccf57d8e4f5bbdb84d2e1d4bc3862a2b51931d3c9a7a5fd6ee5f4c7327c338abd011af638d730141b6eafe63469eff50f473262e9fdce636eff4c5663acb6075a4fdb00c8b8a8d3322e1700a5b3e7db90b36c1a94991b8f51657121b442db6f890e208f312466778d73bfaa8cc0ead4edd0776155f3eddf9abb1bbfc0c94421adce83d7ee94f99f61e1f25a55fb596f8b40ccedbaa8e5e2cf629496f5ca60bc4cf36d917da4e2b973eb57869dddc409dd66d5061f22642743fe843defa0b19dfb2f56425abeb234181267b5c0d2ab4268c538510feb191bbcd1631b0af6c7451cd4c641025cd8bde2d9ab6e6b948f97c1ee6f35098d553e8e9da9b4d437125046864633f109d6a558b38b270a7dd1785d44d248a863a91e3db5c0a1d7ec133decb65e81c3402c98ee329f660a092172bf6b1a02491895394ebc506882805a6c93e767c0e58a5af717d950a206c0f0055cb39ed88816a9fe3613d15f608e486ac08bfa67d462d24e6a0a37716d3fbdaeb9c0e951c1e847fb884ebc1cfe707dc6e7269eed1c44331d5957bc4ac9dfeaed4b157204a3080fafb9df8917b8d15aff9c49cdc739b8fdc26a546794991c183fa523d14797e051894f48b0d62c2b70834467ff9c993b82fc1152c1f5479ec6144c7e8fb10d1bce26bd1cdbeec4e95ee073f3bcc3c7367328e30543d371b27509a577f5c79f14d5f687ce62b82f856695af9f7dd350543ec763de75b593f1859e44c2ac01ba65f98743cfddd8a89a38115badcb51a0ff5655f830c0122af6a830aec13ae5eb89a93755b3a5a6eca233f21cb12db545a24a5334becb8fa32c3d7f5805faeaaeea85a551fc62c94807faa6474c0d74cae79b5d8ddae07498fcc5b8b4f394867112ef5fad1c9da66765ecbc7fc0f3269d29c9c38817c77778f2c19b5a3c705fde9d76a4eb86aed4a7369a832ad267312903462397f7b8fecfa8b195cc2316cd53e48c3371ed2ecaa3e484b8ecd2e22b1aee910c51ed5d71198936266f5a00655d82c089f49295feda0a2bcc1a54ec8adf565acc3a8b2d74c30eafbbd843c59e67f293f6d8296cf7b611f01b57dafec6e2d4d411a633918068c38ef47b72ceff1fae772891141c3bc496824509d78165c1e4cd4b4989321a8722643eed69950dc120fa8da3e53c3181f252d7c4cd2cedf8f086f788ee77a98ab5b019828aa02108f49ea4a51f457f7adfd2220d3e59d5f4a29194e8f5eac40ff80312ff6888ff6393c3fc0914b08c1b9990d247ad80a441558db1ee1203e07353dd99a885a7ff5d791af2548815dde0ca1f56f89d39ef6b93dbcd0cd54b854173903c12649587433f0425fbcbddfb66ebce3eb4800dfddfe7fc44d9b23a3916b1db68c187da4dd13ff0157352814b1a792de7fff855761abc6fb7b93b48525fa90fbe3a51dea974069f3f5fdea86387eccee13f58a8eeb8abc6a43fd30e9788c3bd9ae1751b30a82d420225b2abdb1bc121b9073380be16107188d20be54f2e9c658d5b443869ea0e991c496104086290b6edcc1b656adf94f0d42458750fbd8d88040c518ebbb644f4dc4f7c6971d8d60eee0272df7b51a3d5248b4b264fb22195ad891fb6ac994ae5c0bc6714ae0b0b9a484edc576638b78ee89b568195a8f33ed8362128c30f9b0c7804b3ce1355abc96b15aa55c1e16a9e9ec90d1f580e7cb412a7e85d8585bfb950acd4de5865214ce4db7f6314d81784c588c1482d5f28c5fb62e7dd7aa8237ce9396ccde3a616754414cdf7b5a958c1eb7f25a48c2781b4e0dba220f8c350d7b02ece252b94f5e2e766189c4ac1a8e67f00acacead402316196a9b0a673e24a33f18b7cb6be4a066d33e1c93abd8252feb1c8d9cff134ac0c0861150a463264e316172d0b8e7d6043f2bbf71bf97fa7f9070ca3a21b93853ec55ab67a96db884c2113bea0822a70ea46f9ae5501eb55ec74eaa3179fa96d7842092d9e023844ed96f3c9fc35bbc8ee953d677c636fdd578fd5507719e0c55702fed2eaf4f32b35ec29a7a515bbc8bf61f9baf89a77aeb8bc6f247706c41d398cae5ec80b76abc3a5380001aea500eb31b10160139d5a8e8f1a976dd2dde5ce439a29dba24d370536a14bb87cf201e088e5e3397b3b61477c6a41e22a98af53cc34bc8c55f15d7924e7e32fed4d3c3ddc2ac8eb1dfc438218c08c6a6a8eea888b208f6092dd9f9df49e7ede8bf11051afd23b0b983a81bcc8d00f7d1f2b27cb04c03aeee59c7df23a17775ae5984eda788eb2015680ac5610fb1380b4e7d7a9cda6178dca98690449f5551b66ad2826cab2b662f56903fc95b4611bc86f7a834a34ddc3be7bf142c8baa096abaa3cd51ad0c0b6d15e590eab9e50a4c60c91061f1ed6373d91974c1ad9d263110a0d43fd8b596396cafc0ae70b7ac24a59bba090a6994ec483db7ed4c572f723670a11c724e8ffa2497d8fccae37eaa1d14ac1537eaf80efbd2e597b2ffac97f2bc3cd2c4017f170544dfbb0d9109478fddf06ec0981542bc8107a725be25070d2cab4716f4edfad75fddd582ebd363c49e8efaed9a76ee51f22304eebc232a4f67f865b04f610a628fdb317116666785fe8ca30619a07c83cc449855202d687f162b12d93b63af6e7ddfb7223d4ab998a5f450523c1d521ab76f4aa113cc2967e04a38dae07c51c2d0f44fdc8605c3c53ccee91a2c73dade5dae021cbc87d5cd6e5fbefb65335827311fe1e91921ecd66b2055a6102d7a976308a80c44e6d47a67718c84f2112d65486a558f1f269b91d9f47e3e11d09c0c748625bad2718e3674898abdb19d3644bcdc9317c09a3ac02f514b2a57e6a706362e5f6e8fb16cc83daea0eec85fdc8c367d84c9230730291440a4b109f7034d510a3f70a22dd4fa69e8b65e5fdf87045d560eec71f4e59531c7711d4f8917a96e22ad07346d2f92a13fb4569fa6a075da6e1acad1eac1cb2ef19ab452264de2357c927c6dfae6598cbc821eaf3b8da754ce91a96c702c95b2c308bf3a550cbf4d22d417745b5f17d36608feb826b862747c59d26a0e8eb96547a1852f9fbd095f1c5d20721804941d462f3ee2f0876ee2825c8df24c4f00f0844e50588ac688127013df8eba3c971362dd255420649245e880212cb3d732fb82f866dda090040f28e09cf1c86eea5dc4fbfc373eb69745b4afd841ca8e172d4a8510e7698345fd4cab9ec2ca0453a274720bb2d2e5468bf0d0f85919dd762fe3df969e6c071285e25c2e2a49659b8a78289aee655965bfa3cbca9b292a19a855ec40293185354ff4da9451ccf98abfda07f1137e79bc89d688963081dec641a99656b040637402890f185edb28e7e6a2f65848a6af158f90eea440aa6246a2e6c31f5d220b9846aae2027afe5a7caad6dc16b56463367cd9e73bf22a1d6172145de4565ee369c55e3b99ccbef70fb080a3748340fbe8f6b95ba46e8b76de5a3c4bedc37c55ae24ad02267da26769a3a732badac2e0f3a5393028dd54d78701647582cd04c8310e9f1ff1b433125229547130e1737a1f33604f0d670ea7221097c3eb9c7fa4b8293d7b429af76191ea8e481dc1da31344537a09b33404d782eda1d6f5775500c1d8efc615778baf0905d9fcba1806ef986c40b1c6a72335104376b58266c36f5939a8b95123e8635c0c95e80aaeb97379b1179d6332dc07539b595ec32eebd3a336a1128f3cf2e2924db6d8504a516b62f26d012b7f75cab765c8374a3824da5a405746023b51894649ab422d636513ee809fa181d5b6fbc63351e37a1b14efc8f739e86ca78ae3e280f1c9e4824b2976ec4dd308ede6171a7474c7f530128089bbd75e10f9e57ee17408b4384f99f886a5f63a2320a9b90eb9bf692e1fc449171eae3bb1bb17a6ed937ea57af3c82db84e073b5306683e1d63705b9742a085fb802cf5a1639818417fc2223f476c2566351f4b3b17a822e11255f3c3412dd39190e200727bcd3f9799519ef792ec7c2b0b9d0e2dccf013d436dee63483c2ce83c15c00a76c4d894a60cb90366ecf9e61221ee8bdaec66d715159876d8305b35c81f96ab2cd8f81f4769e9a6e439c08c329036f5d2591ac42f2747bc0e77d4e566358a3271819b6003b290211b9b847ab70e906aed9f86cc38aae27e1098fdc3bd5d84e66c45292183f198bc329cad794aa4e430534511b7d9a75104061b409676a16c1146af0a286e2de8bf51c4a35193581a902bd3224cb9257c961989042538092af92644a63d6d6f6872a29aceca39341ad29dd22354812c4b7c7068b039ac9ca7e6358e662a28be001d4aa697ace540cc3ed3c97b98d8c5a6fd3543ae9a7962c9229b14b0b646229807747064be3e83191cf24092dd67f675638d9f6510486379f47f5eeda870a3187946819ec9ed05e7b325bfd0eed5c9a0f4a2063d63c1a8a0a309f586c94d4a68bbe860ae9599ce204c92cf9d92cb460ff99cff9e5a8b3824786360e1e1861e71158395faeaebe7aa2f61f76190f174aab9a313f0bf4f1befbbb22768b8c22719cf3fa9ec908b576fa4bbc084b1ee5b5a7eddc89b58b45ae7b421d38215aa6e49304323eb4e202655f3c8b16ebd6b03058e75a907ee63fcf6aad5eb96c1e5faea81b88b5eee525c4663af52877c0f759432913b9d48030903e7f9f70e851cd4e20bc56aaf36cb02293d992b38b583b8f0b25a08c3303d8af5b1b37f5127f7021b13934645ef3020e5caadc5e7326ed4ff56f797e26cb986b6512b0cc76f1d8e7be44aaa88e12cbc644f14a7feb979d2ab66907063c51e052d0f8b25d827377fecc5111be0d365e08d17f559e3134cb9db294f1cac03150f4232f853ec15ecde55fd1023b58e83934869796400088e9177e85a2227ee45addd049c1d6b03e5b29dd570496fdb2fde7d8cc74fbb5fe76266ebd90a3b4d57e6e6cb9f0bbdb7ca03ae955915768011c714c909a27ee20135927af55d4feaf2c345d029a54af942da6f85f2103345d059f66864e6b0578111e2ddd5a1cd8bbf4ae35b60747b93f53ec8ec64c10cf4149909b102a2b88712ff3e5ba3611cf96585a6b36fffb64b8c37a114d6b16a53879136eb0b5e003a5a068e3e8422a4fc8d7c77227cce64ebafcde2437166b62ccf486660a7a2ef37012ebacca26ecd5bdf363feeb06aee39050974c25d6a564594c67f56fcf7ed48b07fab4e25ccffe002bbe460325abafe37f23dd9c145b4667f146a1635e462330f02470b35c5a2519f1350c02b263201ec9026cfc57d3659373910e878f2b6c1c5be774df8e01e775d476956c257bd0ccdec17ee939c46e5653d5813eda752ba7bbb245a99a5db1ae55d19692074c2e5820df97c502a4bd1b12929e1be8e9ce6d802347c3e9c4202de6046436c05ab55b2fcb2c227adade6c2046d98102cfd0d859a91f8104eb9f6f155da2acf93df2405bf2c083eafd3ec41d60b810e0bdef6298b21193642a9c0c646bc6771a5c61a25604d96bdb727abd5a7ebe4ddb2a56a6ddece26d8007b26043ad44279c3c8ffb7e6ffb3cd4e10ea2780f509a8a9bc31f99a7e66201195f1543a0a020f754d9a665a29a896faf673df6811379579891374c71b2234fc61e95d4d46f15d44bdb4d7c3b3be3f46410ca46827b8cca976d8866e8ca33c4945d5c87b705588b78015b529843af0b75a7e1e871fd276c1e947d896b92e6181ab7e3ccc7077bb57fe85a6958667d3d7a790f6cde1cebb494c2912478a0eca2bfaad62492e9f1caaa0cc520da08c0d2d910cd44255f4c2ca0646dc89e789a1cf9a28e2f99315d33accb1639cbaf0c94181b85fef648bb4cc7f66dc65b8e90bf5f3b763e58520098febfe7e47bddc2d9cdd5e40dbf4ddb8d51f51bde2e57432266d248d13ed09e62f66794d188f9861c50ec41f0eee30f76f4ece250956733ee97036098db41991a4a3eb7816196c8e447db3a2913bcd992174a7bde1f42d57c764b47f5bc09533760c1ba74943a0dca291f2746bc1fcc573f9a22c72a5eca347b1679683fbc8f32b08d381baf67b7266b14b3ba46a04a3ee45881ac452f64df1bf17f70f4cf9fa4dfed9ae70184679184784a0451d2f5c19c02031e0e4957b4df68b4a069a6f6f6458f6d773924a1841ba664a55c2c3187dd33416cd410e56e4bf8d3671cf737bf67df2a4cc4dcc786872b9e2dc4009fea0e48a749353ac053d80e36357d24d468dd595bc823017c015d7450fe38149370c5decf13b00b6b0e0a2567ac08b45f7b0c8a7c89d227219d051d17a706ccbea49a42035cb327381568eae23b5e2a3b7e8beef6f260d24ab224827ca8ee9d640dd23eee94ed02c9e26abb3053cbfaeadbb1f365a24d8769d92240da842e0b361524020b5c9c22a2fd8602dc9600aaf02b35344309f6bb018a94d4cbc9639ab7430657c4046f0b25df517e31626abeedd58c2e19aa0ae1a43ed2bacad91dc04a2fdf9cc33cc420f4f04379e95988ab36731d5d5402d89fb47e826f4243bb206124364d63564a0872f8d2826eebd9046c7c6f2e7c951e49d4b22a7eec89da1fbed890d63ef15f26422185143c89da3ee269f83e1de11a7467822146042be92295a585e3a09e720ec522e1cbdcb41acf5ac45ee892677ba3ff670d71339a76ed98237be252ae21268e756f05ba0b094a1803f9da84a8a05d0ec9456cf565e1b548cae95eafa0fb01f091935e6eff2413bcb15f605f15270408216fb5b41ed83dfa1454c522375e35bdefe54275f109d0ab450636ac4d8e4d9e27f2d81a15b8cc5e98549254a1c9162918db3e399118f5864774a9d6a2347e1315753071eb1204c8bf5f52b1a0da37e484ebbe545fdfe6b031215678c3b83a19a24d7b661f626beb01eb82b384f02f42bcad4f40addd48db8a92b90d2297e6143702056123286617f86fbef4fea940f648867d790b8f803abc5f4e0e3f4226954c296afd96e287e21b7243d05e743161810da578096521805edd81f68a45500f6a3a1885cb1f45cbd399dde024df65072eb973c827fca13eeaa3f140842016f509aa9ab4603d2457c92cc9aef24950697a0044e3d7c483b8d8391886cd50dff8c2f16de3d6caa7f864c1b3874750781b2b78b545a94b4da0b0036433c6561f5cfea50eae9f5645302eef18238473606e9b9931880d0f6368fa9970d1ffbe59c4454bf97f4a5e8091801b53ee4a209e0642d83605836f69742071aaebd9d813b10f4ccac03851ee9f20cd1351f8e68554c9bc5f58ad19d474ca128edbf561d195e52ddf3c19bee3bb597ac2f92143bafc98bc09fbda6d18dd4ff2a93cd2ba17f54f75c32d3f141468c2baef4e53b6a340286dc2599bf7bb002aa86688e26f5b51a6aaf32e48ffd539d4f3f4bbf0cde2d20138151c82384f9ff29a634ab4e0103d93340bb9a7b0caa108bc7fdc88d7de14abb17e9efdad2b0f304f0bfcbabaeb1b9db75959dbf54930e67aed3a9c8309aa90506b6b9ed4f1d06c4ced19746e206e1e9b8879663bf56bf6c5c920ac5e09e6579b780cb63e1875ef0a731b726864b7ae5705a2d6d343a4a213a05928b7337a59f900fd04472382610e2a8d25383c9ab5804d609e79a88d70eaef3ea22d3aa9100fa2a6e98e97684ade9fe90d6bfc59dc9dec3d3d8db8990bc2123ba92e64253235e9b4d682e8aa04e23fb9bb6248a77c065e93249de829bb2fc5ea9e396461090222816bb29bca37bf86698fb995f62c50110cf418bbe2078a56c5f1ec9fdf3d0b09a719ac253b5bcd00932ae058b86611aff51c8ca8448978615854b69b0216a6eb8050ce199fd9a13aa0fd652570a1b187f61e6831b3a960521c3705da8c5e6c64c7b196ed4a49c2912d77b670b177c6458a7a49ecc1ffd8c57c0978d2a05cd1f1c7ac9514dd14b7b0933a52cefd40b6452ca0903df1f55828025c7e18109a6e0f2ab25724cad2d6f57cb5d894a6a508134731e9b9c61254f64990941f4faf97394b634b91860cc6ec346aa666600d323c849ea4c4a0ef55acbc56495ca004f3fca42ff0ffb11b0e1164c95ab89bf1db3d4f575ff334d4e0d7d50e0c54c422eac5ef78c5a3be95f2e18872540fccfb597211ec79d9d47b6cf41e385b9c2e92122167fe584210f63bf919c620d
-
-[L = 28]
-
-Len = 16
-Msg = 3dd2
-
-Len = 104
-Msg = 3d232201038fe7d846ac1bd4c6
-
-Len = 352
-Msg = 44c98cfc71f82215dadf494d68d1d6b92bb4eb81fa0fbf945a659d9aa2c2302b5c93fd3eedba31e479e29d36
-
-Len = 504
-Msg = 02a5c7b1b749d6d49bed302d9439f23ab83020bd4d573906f4190e74216ad33aceab775f71cd31092bba5cfa42f0845bd16fc1b8bed6434dedc92f80b395aa
-
-Len = 13976
-Msg = bd70deb2cafa75918308d703a6783fe9dc5e3d21de9bfeb6dbb1cd531ed5dafeec463a02abde302d4ae6ab3cdc2f0f94865e38339c88bde507ff71bbea6b30b9851cd8cf599e950b8c8e620c90adccba0033f934ca66ea0a936afdad575bb6235099beff1a632c9114a8045a0919fdc21083880eb05c0d8c489c7810aecef4a41766f67c37557e28a9db9a0d909c2b167ff7eba79693afd3ee3aeace38eb73a5a02a882cf89b123812cf2a0f6d5edd1d14362ce9c43257474def5cce3adbba8cb48e7af9a45e702a182dbf47e8869b3f99e953ba81628e502c60d4f8ffc551c31b3ad6ca85c52164839d5e9d493deee4d4b76604174bdb5655385d34ced2c1b09dd5a486e1f9ac501bc611f9d7aa5c748f496faecc14c6c18e1dfc6aee2991bd0207ea1701219955a751df43dbf66f57904675a0e9e6d7f9a0b8bb82a8f44951117ab2642d6671daf1e5d1639d48aff6a05781c2b5e8976653b0a164445872d393d30355acf0bb49bf2bed4265c9a3b786249afc7a438d706eadb6f90a7f93ad51bde6d2c8e6ff09dacb3dc67ba0d3030c54c8367e1e4280bb5903274191344610de61c3c770c6820a6cc9d826f7c743f88f13580ba23cfc00598fd733b5dd069bde7f10f2b8961c16b69761b0f308dd137f844a67f6054e065863f226141755b96645a291e3fa3fc853b2475fbe1d3b25ca22f4da4425dc95fc855e63d6699b311ebd5fec1c7753e6e81f747c808ec3f618f63eaeb1221075edff0532225c40ccadee304a8997c03920e7ce4e60e4df4d120611296786516dd4d9cdda2077ac52bce0fdf552e1ee89a0133f1f87a6f6f35f5c53958ed806465919a0a5fa42488bf29caf33a0dd469e13abae351d5c6fb1a800ee384da199c823c965d9d5457a3ef8292c4d9b142e3f1fb502da498eb44d95f8c85bcd6871bbdbf004bfdc09ab35758f5e8b6a0d0f366c3b255333c52c8fcd4ecb4536b5f6e72897649f3415443612d72c3436505249a344feeb04883f41f90ade40af119014b3c56fc108f1ab0a77087d9226665d416cd975e9e4605529c032e8926002a70924820c6c7e264a794b2a3beb63d69ae56e017294fad4d611cbd0d3847212a38f22d623eabe3b884a36464d8814286fff52c4dd366f6c2abfc2eb865e0dc9ec6e55ca9d81f1b8cc47e2629bb162e54655bf2a9e156ab0bafb4b8ce96858aeea6e6665607a3f268036f4890dad759486b15e3c9e791429ec8f11bae4ea7c490656fdb0551dcf0b0be017c08bc674bd97d9d701c3ac955e2941ba7d5f2ba122a6f0c1b164b1caf2d50df111fd4287e9e195d181f6f514d7dadbefdd4274edc234025b727680576046842a834b6ad89eccaff5c5209bb91d652357e3750d8bb0165572fb71d09fdfc60f6b1e5d868c67c0edead427e7aeb734e29b96e03ea174b6b1af523feacaf6bd745ceb1bdecec9251958b7f521182daddf62ff6c4f58977adeba81c616ff2e937ca4f16eb9c44e63f9e974709122083ae45524ff87d7a0cca33a90f09b660db0efeb393c61967de2564315827ef1cf42b71c0f822f471713c9d885a3c3281d7c95dbc96f1c6dde0af70ea11232b00a2d215ec8de8fcf84b6193b6ac9d46de660361aabed3371fa44a6f32107f3854262eac355f9ef98701f580b4649175cefc29950e7a0eec958f629999c4b0a98fd4bdaf5c0bd97c963b551f2220bd41ec00b8726836e949e818a49aa1ac5bf12c64fb9991111ce8be3e0cb9605f753dae1a4c84389416f17fb66cecba45d591b22d64e5a4edcde067a088d9ff7f5dbb9dbf324510000c55d50f480a640fb22da9b4862dd81080d61af9560b601edb5e3346263f5f193df97079a27e3f9876078b80ebdcdb17ca4c50aef0c8329c72a7f77584cd963e105eea9c28a2ad4e95c1d018e27d0e720ea59147f59ad796b80b6293da8a55ed47e8abdd37221db0a5eefff31688e2adc294654ab0fddf9c1ffafd4783f01eb539492cb35a77315d0ad19395f47b18298a7b353dcf5bab0b2f193ff73d99310478d2e5c4ff1c68a2493c138818edef73caec9977bd4eda6249c8933953e06d796b288f78b18c343ef561082fd03bf92b084afaaee741de3004abaf746350048294bc52450e31147173f2da13d6ffc5adc718e149f9df3702f414dd3ee88296ae8a0106b071b589e8696401da7993d58a9bf8e5bf417165498c96b4ff5fd2b45bbf88f551688425122a3737ca54b2992fdb4d60957a93097222c3cf4c45dabe18b9d6a69e6f27567d5adec489e4b6812c29a8fa52f1de642b7b0e749c16f54473ed5ca2fdf2199e885fed308fa62a3e0deb7e0b8e439e25b3e9f95d755fdcb7ebee9d73069dd57dd1cdc5145205882023b54f2c9dec6cced9e3f6d24e8cdbb8ef121b8f3eded574d81908e867af5ac82bfb8ed60848b4bfdc1d998bae3a9ca80c1c49601d11a40409c62b1536f01ca67
-
-Len = 48824
-Msg = 5fd54472a44e4476d254c0940071ad42dc723354f76ba61f63fbb9df80d1ee56136f51b6982e66c1da83602fc08093506a9e2cf27cb92085ba5c627dd63f59f8850e91a1d86cb1d4ca38ad03160f3c584b128d9b21e935570e086d3815307ab8df396cfa0c100bf6cbfc0fd7a8258fa1a656bc178e02cfdc868540d8e5ad39dd46794a8bdc205e710555ee7421ca7475a4f3232e6a0cd55d4b5d4525f0bd7eb1e455931aeea6918b9fceb2a32706d31a6d7028a85e102f228417e2e7db68317ae155af70eda98c8dc1ecc32a62e294d92855354c1114c5735a3c81e551b63a81650107557f3237bf953989d17c65a0fafd2bb1e32c237f98f55389e8f8b0810e97e201914c487a68403c6d621a98ddc515780435564245d87ce462b8785def699f7f06ebfdf33dd1ed7dd5a3e781348298c7950a387bff7d1878731d7ac66ad9a6607f2c3a3b6843c2852a5e882a8d78ae9dce2a79d595cdf09626dfa6f1dba7d40ed21caa29e304e7dbd559a89bd1f07d84165dc259ef112dc6e2c5a3e82b1c50106983f6c4965c85073c5deddbe6323003d56abb0df590f69010981ab3407e43eeaa29c6156995c492c931fff1b686eda3741a0bfb9094747d1620b2580415d431ffd6c02245f6cb03e39f87e82834dcea59355b2ba663ce145d2514e15e2b2c60cf518ff510c6c3e2f16d2dc523832762ed8352a320462ddd4d6fe755350672038163d996b44ed3b85d64989291bdf39398cb996de785b9614ec5d4bd73efcfa37fd4470b17d6240b8e4c715759286b04c3d7d791e2689927c9f18320ff2e6bc7306c805e23a5de66eced5f1a630cb43dd46db515f837f6b824b99b86c10b6df7fcf22d97be05284edf0e0be597b3f9c63556db031339f79ac9e6c5f8a1cefdbb4b30f5bcd23c2a4dcf791cbfdd6460284c5af0621ab7c5571e40a87c87be459c85ec81d746930dea24f43bb11d6611ea83409d3bf4f987778d8eed1d5b246a2112ef78ef0252f9ae464810c13f02359441d289958b4766807d9a3be0054897d35b01830deec1151f9e3d42f92b80f4aeedd65c78c6e98afc562a3bcf6d72f238c6e94a38f2288ac7929a7a61c92875c1f115c0ed8d261a727f0794f17ceaa3dabc717478f6ce7f2e8b295f000241e154b4575bfac8483f6b62f9ef4e18f7d341a65faad5e2fc1ddaf2b09adebc155ff09e63d5aa5f95206e66c7f4ef2ae3aaf3ea7c93589efa8c552df8d203e0ea181c1703d7023b56e603f33b4adb9bf44f7af290d8081210f327a6c9b0785709346087fd090c42d2b8b2711b9a1a5173eb5e246320ee27867ad6c3eadc4407bada44561a12cf5d53bf0448308bb536a8a525eabc1410c3a34becee25fd6fda453251ec229b53751f2280e142c6b331daa659ab655b78cfb08bf18e40bb02b7f1650eb2dd4ba1707f0aafa219f21c29521581ce249e2e34f5656b0a04c00485079b040e13cbc038bb9f17f47cb8f908591b26bdc28538d8baffe4cc39b17d2ecffbb9698bc2b8b31b08424034c051b535e0cfdf07b7a0a54781e33ba739759991aeb72c0ed992cbe76eb8ec0ab12c182e8b049cbadd6e82e314f1bf15fef5ae95dc86bd64b8556766f8ff62c33492198e454e5ca59ea856d8e095c04da8045522abac865506096ee1cfa1082af08ca09b3533878ea3580b6c0c57a615e0ab768246b3eda96bb6caa01a2648068e21959f843d853e948588e8c0bfda364ef1f9fbd3235c27916562eb0214891eb55ae0e059f4bf7d1838b5942656c27899dec6d67b823a981d1e1e0aaff5323b0e3d69a7dddf9b12d7787ab763a3c7a2697ac65b655aefc4bae7e6444850ad2540d5193b378682c77a4dbf9aa22e517e68cedfd1ba32e3730ecaa2e3f6ae61a4f427d6e69071dd62a9bf6c860980c9d23ce1fa82a1937e6dc1ce3a2de096b680d23d89ee102912ac0bd769c1c02095678dbb00b4430428797cfb966b2f901480811e1b9cde358b6d499c9e93f0961f050465d7b0c70d4961e75a9fe40a24e36eaad27238231dae6d0a17f446c16bce7348e669be563649eba9f23be29adb8b10f462780a066ae573f74e51215a26097b02469c25180890e06acc53ab063c742e08d51359b0a39749b84b9f6be44f3ae3da8e5a2f340a8607d4eed08877d007928d332d6f49502bb5f416c46d866fc87477c58a22d3c5932a8d6298c1151daa032c84ad92f8f90b8053b5aa6f690d1bf682f314471cbf200f3d30959e07adc6488dd17b0be5279e727f3237b8b4b19b31a220dfe63882937f8d5ead677608c42a57217f2239614c521d94559290e3b0ed8055d5474e96564224f6ca6389b40a71337da11e1c307dead8e4eb43252cc2f1c49addb18781cf20acffd3db693b02e5c8ecc949b51b99005529e0149a13390615f5df6e0bcd68e1ca82b0173d25134dbf76dfe92daa085d3f6b1e4d18217df41b70c4c40101884c2886495f2ef8a473bf23cb47ab6533c93cb38c36c6dcf6837f1272fc91a6962b6e1386fb643e1f1d71fc75ab58d5800bf4081217cdce0c7ae9e3d25de543fc4444314f32067eeb147c08c55c5c8158ed11729837547f28a300eccc312260215f50e98c4e3d4170208a50a4a4def1243538f906df8476b0c46d3449be73866d463d422595300e160840daf8c906ae4aac13a64457853b0ea6d8c32f4efe3b48c0b1450250086d459648b0ab14fd3f341a4a803be77e56a811e7a26827eb0a1a9454f90bc6ece665904adaa3cdeb2c4847858fd1d79750e8cd45d8da9163784b8bd06629410502debfed5eca3cf8fef0fa6bdcef6efaaf35a1986d6fd68e0f436dca9442077a4818ebda4606a94a3c93fda46e7ef5ccfef656896a0d3d93566b02ed8c3f6174417cdcb99a415b0c6e9816d94e64b438c295b4bfd69e0d9ad52911de5509971b7370593160629b641d690eb2828bf363857983e3b9098fcd15e66448f786f196685d2ceaa251b17ad06dacd614d9fa78ce0a8b9c1c360b529d0bc1d17ba0b70ea8ac1b8d67f6e5770f0cbaee0b38109d26b09493060dc851f5fef121e83e30aab9c3efc2b8397e8362aefea1708f7ffa14d3656f7f7610f3a629bce14648a593250c6f309c02c6c552bb42984ac58db920dbc7d98f59295f37f3e9b99da55ef074ed65801b390366669b4c7aa1c483ffd23082793f9e5cbe30c34250f63fa3ea2cd097593dc67e8d27b7e4f07e73a9f7b33a5ef6962df1381a038d4f58fdbca9d71ccf640b917f631b75d4a2e8ba46c64a6223f99cee30f47c1a935dccc7f054fc39d3498c824e10cc3ee337e781a3971f0e98295aca611bde701c2359858914248f6bafc88232bbc27bd85883b00990bba7862fd7a7cbd4c86df049071fcd10d686613ec877758d83927cacc530bed9a596b5b21c6fb748c379d676de7e05719a867c9f934b5dad99ed97dcb4e70a9b6542ed5b2f086d9f56fc9752e788785ef8f7837a31e433438cf2f18f58be37fe8412f6d21a5c35000a5efb862926700079413f76ab2c3e79e20b516eba9d8c29897097bee55157936607cabaac41337ea4cc783c0809c875259f8020e16d5045fcc39ac796d11a82f25fcc9579bf0a010200f5745065175fdc15474ed514cc796672c59637c3c8f236cfc9c0978a3db1194680c58c27746090d76ca09f7c48ee4ee7e1d3cf0ea70dbbbd88e30e8814b57404dfd7c33727a0c84cb7bd468b0bcb3c89b526679c00fb0892d2a5e7a3d73698a3db53fd7d78460cdcf24ed22b5f39b8c00b3506541ae4a5b76fae29c1cd5b0f8c3ce142e0af7ae4efe3fa4c438a604bf4a9abb41e3fef1b9227a7dccc3f4d6026ca289b4b1366d9ed546abbbbd5677c8d582e79e2b544f18dc23809ab753313d84dd10fa3ed2f723f0b46277b8877d4f3e0665e88c50caf0f0708b746b736b00c8c83a7d18500384bd035996aebb7da8f09fd6af9b76fde7fbfc0ee854d7ec02950e76abd23ffb27a6ddf1772465016c79b98a61bd3940547b207b6507e32cb9761a5604f0f546834a8edac7ae06910045de218d761a4accea886188f947b57bd876491709028e2e24b075d6b022b51af1880ca16a8c65b7c69e51b2ad580ee058acc0606f0a3a9ea1cd4342bf4be602e941dc4bef1239bb9bccbc8098a6a17d63186c6fa75ec44b6e4fd38a3fe49c5eb995f0cb884e2f3ed6be02515fa605b98453ad935682c3bac6a2971bb68f4094cefeeaceda92dec803ccd3d346f8b40b48f8f489e118a17367801e85c79e9b3bb5d73ac44a8290cdbf83a154f2f125090d42e1a1cb72f5ebbd42da46c7a4d4b9fad9612a4c800de6467ceb74f831e1395dfbf5799a3429ba34754add4b34b5960a5fee8f752dae78450322a1ab3d7102b77e907fc1eec5355991e0c7d6c0866660e5436248edeb1a37c0e769a0764cfbb6354332d6e55103b9235c84eedaff918af3f0213c435c32ab409a4b5c7eed8ab6ca9e313dba459bcfa3ee92e7d669be0526856ac3c06a57fbecbba553a9cb4655a901d98af02b74098e478076655d325bd7639d73d7ae00c62fdc361a997ea4ff5b0eba33096b12f35cc7cc0eea62950b912b47c11b9fb386a47c4c15c0602d304b2541da889cff299a1fd415e7e25c70ee4cd83feea7e6a9c50c75d9b128458513d61ec5d0299ef8c090472fe0850f384938ed44d36f10cc2c1d31daee3f946a2fa18f9982a988fd6ac973b1569313ce3c8ff5746c4dd85a241f1e9dca0e904c091832ca028533a3e34c184edcc510bf22a27f530bdca3d057928a96f72dafc73a9aa6dbf2552598e468735cc5736c67a620e9455483e9cb2108045ad80569582ea93a53b491e528c8df336fb326ad74317bc1dfb8ec30a73af01a5dff3e437b7fe48ba5dbb3e8f01ae0c6fc28675a415f23a796bb6e0ef0efeb4b14cf20d4ad88ad1966da43a76b454dac8687bdd97b89b8f8eede91eb34ca4a0523ea65736ae39341fb32b9b716f25662a37382c16f3b9c346c84f03bef54acd6efb364c6401b07b3f7679e8e7f8c9b77b75e6e98b90f4df88460f1978d19744eecccb743a999aaedd00b5a94018e9d5a56bac9d5d55f6e93bad52e84aa7340cbbf98d56213d9dd3e1970867e3972dc98e61b3cff40b64ec49463ff79a41c82dbbcaa37a82b761f432849aa83a3d3c9a209e2207b87ae9ed9959ffced165fcb0d8873668c3cd8f18ba0f92f7acd2bf50416c22ce11692bf6132eb9f558dc789cf9776da94e48cf48607f19d9a11d5df4db11dbaa67a1d20e9f0c96f5956ee3f906e371c489efc88b0c1e56d881e7bf8dd5d6742622eb873e253dbe54f2e2e6d0e6136941de8c23e9a632727bb5f88c23170316c7aa0df28d8d07589dd6022828834f7ea9b4e5876a1704944aa3186dbf89e0e81767cfba03bfb38c55a9945209c4dfd88272c49d1745dce5ceb40f0a6713b5139dc2fb87a8a4888406d2610b7b910a9e5782ef0df719028d8e50a40a269dc9bee12157038522d06537bb31fc87d21af9ad4b2e7e127bbdb313e0a116010f65126cedadd4a122d15a71cbcccc346f55100e354b997154567fe3caccd50251d137c58fc3a2048dd5883b6af9248b51040c01a80c051b8a151a8878edf0304b5554746d6116b749221a1d0082ac925e6e140f0c3b6a180742ac8a50ce0e93e6399102f151d7c14000369ff52d0b537fdd51bec99e7271b1255c6fbc36d83408c417f6825a8e2a58b9054ab2c3ead69d97ea9947fec32d720653c123ecf51a9a3f0ed88743e3fb7b94aea59d0bf0219ee50825ef220554312cb907edb90e4d85f29e316ad57d3b90d859391fcfc63e6c0fd3ec27d4e1efd6e0b5ca8165cbd6af25ed8792d805f27fce308ca1d51335ed5d727558dafe05486a6f9149b8d3bc022026656714222830be582889e6800c0b170e48ebfd069e711210e4ac7acf07652a6f5051507de68aeffc9540cab5cdac84ceee46059ec23820c04b127266c0bf8df0d2b856be3377ab42592f495980baeddbeed3ba707a85dba64fe36941eefa8fd37204ec8c18df3852febd2b142b1c9a5cd0f9e424cd408ceb7788270899fd793db99ddb8f9ca8df550c513790d8bad37a1d1f4a62c4527bb64c677462c9b093582decea70c7bbe873095536728e7ce05d5cafb5d166a1f03055e918f787fb244c5857e3d7a1009bd37f30f165564a082c1510ed19bb1633811a76da70dac67641c2478c6b335f409ef54a2d0f370c9510d0aabae3cb998bd023778375cbf9cf5ef125afd584c11efbf40bb51839aacd3016e5e4d79f134245f952dbad617c78cb6f5712bd9c0c7e1303db5029640cf9b56e29329c3e6a9e0a2371aac1a437b9b1c4477ec9842aa80eaa22c5eac11b60c661de6ddbb088e844293ab8589c13d938765bbaa44301e4137148dd0257bd4c8c766c5d3bfe53671e9417cd1b52f622870ffd90f4e17b7a4ae1b5601a2edb032e353bca652fb565beea6fb0b2cdcadac71794c662677fb1dc81d116d94f5eced526b37c004b95284cb6aa2ac415754a1f14882595dcf4d3f1d905c6e8c12cf5a9d23d3ab55bdaf9f17d2f03f933e1bab89040753648c426b072b73aee8c2fc0d1c03fce2c656e20d4c96803fb2ef471b912267eecb4d6f342d3513894b94d77767823fe0c7438e51f21bcf16f0e98b94b23a10760271281cf843989824f7061bf834f93fd8d2090f70e939700dcb4d8964a19da39a9601a7e0ed9f55f567fc7d5682d55a9ba0e68861756bb549f2f17c10ff6bd2042a80477f89743d3d762f1dfaf230bb502eab6f4c46b26135ff3bef5faa179bdfbd288e3cadd3d88d8012706e19b7fcc6e9cc2699d3ba0e624e715599480d6b7dbc6eeea0d12a9236444b17285fc7794040dd40c2b2ef175f7f3641664fc9bb7ea6d7eb3489d504f8013d64a23aebcb5ce233405f5ade067dffff253f27e926431ad806703e8fab23656e0b7431916d8d4c72a7d831e3664e5f30839c76c8167b76f3b2dc75a6ef48df515e06ea54ca51de2fd9c5eeabb1610b7eef06a2f3167859cf82e1a5b76be8ed8beee2bba28c3b15af6890d7a37226834ec9f63306a0da11aff918753d8b83fe7220803c070db98195d6d18357233f5504a6e3bd6f30115d3987f93aa5d89aa0b8b577d1fed94da057a6f088233efc0f44f86798896eae9ad0b20c8c9cdd9d72a3f02213f6797800894b864cb44fed009440fa5b0197023929f9bad16f052cc2d87327788a68b9209f46fb4776b092d75713048b5453ccd699d19cafa8e9a93fdab0f0863711916efe3bd81ee71b8e0221e12e9ffe2f6ee1a4dc1a8de6e593480f3c05b3691e916a4a7ca51971eb2f0f693dd10f6b8468f8cf7bcce285938b5a0a76ef86acfa2990f88bdafdc39a065db17b845028ed2b7a9e331c44217de20440e406868f1eca818d0be20248c2948b8f4cb118b2e456e585949139270f57c54715f3297bf714aa7c5f72ed8ddf6a074703ffbf95e45bc81a02c42822c22d2b718f2de5e03d687a4b18d605ef5ae75f9d43c8cb4e77aaa0c0101d978120f29574b22f52783c667f7daab3e1f9cfacf2e68e94a24918e3fe2c4f061deeb64891b5217fe5908e7f389897751839982b7fb736fbfb1232684e93123611b7fc8fbeb74f8815b5ae13240051920f3b6ed34483ff673c467ed7f0a8fbf619796e485affbed0697415d2d0598ba34d5b9e44ffd12a5edc323883a2e28efe9baf860324f2d2016748503eac1888213926b0e0f0335a4b51820a2bd3b42d982ec6ce307b453b6385aed7a735a1e98479394147c40f01c532926e10e1b26a5b395bc150ec4b4daf5b1436bd0baa225583ffc9d9e9d8a354f60fded37b41c7c051daea04e689ab2d4e24d7d07c75c50ccfd6a527e024d1632246c6f40f06b86ffec0b29cf894b665d53d459226b93422d37a8da23587fe884dc3c0f2fb55dea296a9a5b9a0d101f186d9fa6288c912202547cdf958569d2cbf235740eed38d10b0025dbb6de31058e98780d22149c19d4bcaf06dd7353fd91cd1f47e47f45622e1472542be2f63f463d253617eafd4f2ad609f9020884905dd5c22fba53ccc619104b6c0203a7f6c8c26fc80ff6fceb8c0c51600c2e46b4b872e6d597511524545a76cb42278b519d911e6c1320e01682c551e204ccdf91290c52e0836167a5685cbb1af338eb794c10fac92950f3f7956acf28f1ca984e380bcff9876b0c71dc7ce4011d1d0f955da9ca885c6e7bb74c6194dadb0fb9146dd725c8a9574aaf3824b727c9be3fce59c35850b162c17d3013689fca858a0a51d81cf4f30d6a8705bbfe35ff03c34cc7c56aca32140d72c8e8121fc71353596b777b266d75b322c9a97fd2c5d4e2362f19c99de66da7bd9c495c03d9a15b28431a0c051e786fa80f5503a72519e6b419263d72d553d688349c0cf30918eba0622b953a0efce4415c29515c26ba15f00e548ef108afe3f8194aeb965e5e4be94f10df6c45ea5c133a8c3398d09fb80f950b83c1866a1637d2bcc195e05cc32a9233b244cc2b1d4930e66f032cb1163c37b3e58b576ab76de759569797fa9b8bb4fad66aaaa56f09c7a0ce4641d6799d7bb47cf684990ec1e08871458c211a353ccf1285e7429c7b8520180918f7
-
-[L = 20]
-
-Len = 16
-Msg = 8a61
-
-Len = 104
-Msg = 37487aa02b03bdbc6bc62e7e26
-
-Len = 352
-Msg = 6ecd002568bae3bf1873993041bfa292eb94e9ad092d8eb3585be82e8a20cb36a47a06e7a57d301268a4a533
-
-Len = 504
-Msg = f6dc1d2f6b8e126d99939664693d8709513f97d730074ec2794e536d94ede79c81f2b2ecbff3c2c26ca2d181ada2c60050997f3bb087ce48d956c18dedb227
-
-Len = 13976
-Msg = 07a6372c863c7d7c6764e4f05addbbe161762735dfd2d23bf268e2d603cd28de9c369ac379390473e1d3fa7e37af1178cca54fa0f782dfbe68070952b93462ea46c640d43ffe71f5fba42df98f4c48ada0d8aca8753e0731508bc15dff283178ae5c10a6ff132eca5dde63a78d3ac94685152897828eb25a55fdf140fd33fd4e7b03f283e201a1baae8986d25603fb0b2566aab345fb48031d648144dddc2e3556c0ceb1104f348d96ae7dc0152e45c625d21b46e70c31f250c858aec4ab2cf5e79d8c79b0854e0abf5330b9f044113d306161968f4ad6f0973160c9dc296056d5a11523ea2b56fbce8387070fccc639ec1c65ec663b9dc49aa880dc4ddd3020c9d44ff7e8cab6266e436af19b4ecb82010a0f8f9469ef380034a02e3f50051a6a3f233dcfe9d553459dc1bebc538ae0183448c9405c351271dea808d908480e61e9793cca111b4cfb9874b799626a1bd9a0f6e0929ad51b97ad81b2438f5fc255db3a3dfec9f0d8393c6b245b03d3faeb58021db3ad391b17a91174a66db4feef1b4c889699bcbea7928f4d29be2d47f76455c8cb1dc7da9cda41962a28ad8cd7b39965b809e7c7eca1c6792c1ce1c8a4cad6290170e91fcc49fa5ff64ab433b4aa081c8da2d9bbb072f9f18ca455469b946c877e3006b34ffd2219335b30ba2e0980f43cebfb629d0b11fe70dff28883ca012c6ae4855fcefea20a08e189eaeed7eb36ed6db3835976f4e60053205805727c5eec15d0e9f155637a9e66268b9c1c302bcaae6ae88cbb8cf1668a487cc996c4662c4a4e195f094cb31c717165e0e13718f8388957dfe0bf69c70cd0bd763dc38c530b67b9c12244fcab8bd13f602de848a2937699f9ef77944e5f22e3b470601789e1838fbea9359c733aaee2c7082b02ee459b7684ef9bbc200da4b62d368351f5520a65ffa506dc9b097117bb7ae88d04d85fb525e91327689ec0fe86971480c0e864012b1e9f044c7d80a4e48c07320dd4292086e4c71d4c98dd826a9bfced112bfa2beb1ce85cad204451ec45703931bf637d4fe89fe8f485620b7f4b21e011a232ade7a8c92be77925e878ae0bea9723749528fe83cf89ecb9616dae6ca0e8d5754ec6c92abb21108c2f33cdc18c6887c430b72c5b193356494cddccc577bd4c2cd53188f352846edff0c2ac7869cb74bb16a77c0f0f194a7a9477ae15abb890bd0bcfeb0c39381a87f1d05319c7e971c10e9ef687f96450b400e25b4285032892b849fd5db8649cedfb03c88defea063ee144a1ab1f3bf05f59c7db364dc39c11a446c3ce16307d78d50315ba29f5bb9a57438564c8c7b3e367cd37d74b2375a4966f47489dc5448f4979428abd32193d3840aa983d3020a9f29d760fc7493ab2576c90b1934b799c1d0d55e4f2caa78f4ce61930c79dc017c2dea0c5085d73a3b0e4a6f341e9a5061a6658af11e5edf95bdad915ac3619969e39bee15788a8de667f92f4efc84f35082d52d562aa74e12cc7f22d3425b58f5056d74afcf162cd44e65b9ee510ff91af094c3d2d42c3b088536d62a98f1c689edcf3ea3fc228d711c109d76ae83d82d6a34dcfbad563cf3726519b519fd48b51741aa86720836494b7a589c778927047a25d73508adaa401e9a6c0767a675e31c5556cbe35fadc9671359b45e985c3c8af84113989b299ae4474b85e4b5d4b0578ab1e8a2915a8df97c4f52a639fe32272cb91bbfb721505dec46d51383cb8973425a714245c2e37d0577fbe0d66381d9239db1f08a380cf609dc699698e0fada2caeda44d58d766c4f8214b10642b80b8d7d8add7cc41d47108ab7d07dab71069a2d982cc900b331caec317942122158bac6eac9175c2dcba0c04443aa9188832b553f5ca8c336880824d6bc02486a2b4c086665d276aafe3b1b93729829adca50c44466fd5b5cb977aa78fbcf5c0f0da1b09216468a11493ffb39efdeda5d669ae92bee2f2fb250aa1b9cbb11c36c7a6c6dd26cdc3cfd572ffd8c1dd72a13c27a327a34c6b6b3d80fc6c67c72152eec0c8ecbdc1bd5cb829b811e7f29af6d786f4e93dd4c96fdda295a6aa258d7b2fcf291c2d68e0b1866032475964ec0c6f2fa8c2d6a3936ecb187350def4e818507bf157c0e9b33406be7660605af14cccc9c799b4e051d0d0899e53495bb8931a6e2984bc6dbe4e02ec8b4642fc2f1cb5fd5a5520b48cfcb49e1f9533838753554dd98b6a1b8a67409279df477330e5f37367e06247ca5c3ffefd00e693dcc0c9c30754121c9ee88a574915b9e77c104fd2f921c2c096573951407ba9b440423d76bdc6fc978237a6e302cede7f99038ec31500884775556941f1edc30e3a417b0e02cb6fb5bfbe5cdfacf4006411287bedc565fb06f1be987416407dc852254934df4ab59edce476f3506e65be6ce6ddf91038642291fb8e92ba5b1f0b105670905a2c14796110bac6f52455b430a47b8eff61
-
-Len = 48824
-Msg = cd8490c93613bdf1f284b94b330f6d6f45a39c651d2a160b340e2eb696fc6d1c35e88872845190d141c669de92a97daa5433b1d7b0b899fdef2ce74b8fe72a7296a5b5be26d1dc86520367c730c7400c2fa06f91ab4c48a7bf4ae35a5b9acd5296c4fdf7451b0ad9cc439b4e34f11e5d7ef2bdda376f8dd34d6f092b219dc085dd4c4a6308b8808f588eedbbc7af7f64e83182fc7ca7cf4741a341060a7969d31445834c982fa8739ded4555108acbea1666a83da17f77cc42ee73323eb53203e3b790f81c08e94c44678b6538096ab7b09916e6cf7ceb2af85987f8e4d982dff1ab59b0bdccaae1f405a73366b5c5935dd0b43e2d2894290ceb66a0246dc02de728c5bba30255fb56ce8107c3144246c5156a8fe40ada9126adf67227fa56b66c37be63f532516211ca012977b04a97916f201f1baa2629eda520b51508ab4229df2ceedce406dece0110e0a911464f69e7be38fb91deba0addcdb3161d2799c628f5a57fa1dc37357c947681bd9c36f4832c20ac466c0c245de3b250c33282ea1a02d007f03b34ed427631283eb614db4d521f555136e7e42b4cfbee8134c63dbe3bb79b5a8b9f9f5b9f5ac61cfab1c54d197f1e3ba613f251eed616df952d691b88a16466343ef2d0f63882ddd2d55b8a6786308b2257f5d7b38af166bd7f1339d2d8899c9eda8fa86215850ba547450c267eb3c9147d96c38161a69d1584e521ffa23384313a1debcd37f72ddad02adb3cadce7ee34b7c1f42a15d0d030487daf9488aa7562845a11ee7ffccdb38b300935caa31f78a4ff3dd93403cf0c6a16ca611b58c736aafd33d6dc56f0f47878211d26f6ab801b9453a7f74b44593dae0f047ddbbf2c902891111729edec44f69a05944b18e7a601f41ad24fd6833da3dbe3029bd390de7c9841b2ee2b079b2bd2737518fe1bbec88da64769dc36e4a8bf716c219b2fe059d7dd220c1ed2c59878db5bf8b198e0689edee921ebc0cd2d3853fcf57c363050ce58071c5fda6ebcfbc1bb62e9eb956286291a108bdd4191c4ff47900d6068e1ea26b487649af119b9bb15dfed804836f2196cbe12d8fc86e3d7ce89b52ad49dc9ddbce5b370f73f512bedd853039366612453733740586d1372143b09f21dd4dbe1a2bfc308db8e4098c5e4b0c1e16141ee50e85fafefc4e2529b3c7252af37aee6f86e19df28871686107d7d57dcc812bc077602642d2ecefdd5f694b8f336913210793e4068da2178600b1f41cffb5221c9b4b6298afb47e85701d7b1a44241679d8996f916c81ff437261cfc358b9ec42a2ce16ca3bacb8690d6c1d91cfb3e0bf1e7ba45bd01606df856fd03c7e946f7ab371a89e1fde86d05fdd97bd7b1c583b04c2ed2b5f6815a460645e4e1b4e950bf6bd81dd0352d1048df85266f1696534aff5b1cbc17f15d82cc8e0c0d4f0453f9439094f8e0f7f4bc045b654d9a2f1f44a9c57019f63ecc41021c05b5380675cb56ea8bb691d79ee204d2c4edacde3c1fb3f4996a11d84b035f965e74009e2ab80e2c7ea3c84a834d4971a1e9cf423e4ea67ee526eb3c3e4c2d7372c4290a0741e1fcca5ae4cf36705abe98ac81e98a5419baefcaf3093a7e0449ef1021f88ffb7ad21b2677e41cdda12025b06542c4b2564f15e0b99db43b7c7020028bd829372122cd910227cb07c53cb58fd9dc620c0491f3e2bf883fe6ee8cb1f5b73767977d857e4513e8b5612f6ae4b56014e6a3ad2a065b65472212e2f611743484cfaef860999d1dc5608c58412fab888ad72bb87dd9b55b692f31e252daf8944ec5c02a5a9c23903c50dbd845f2fcc3bc9806af13ca7b025cabe675195b1d56f3fe7d7bca12530bcc0af217efcb03a218bdb6f9726536ea902c8303b02e3ced22be59753588b5f0e2f3419fa5345a942dbcdf3010465384a225ba26cdd0f1d74999c69f336bb6d01fae5cf81cbb8c1a7a29c1eb83ca6b51113bde56b8cfb6a5d72557622a37f039d090a689accd02b57c691174338de8e05bb3620c079705c969c58e56b079dc9eb44eb0fcebe548f5a31f4072a5ed56a2f03107bf40a359b2601eddf53cade66f294cfeaa40a0d94b9c90d15f61852f295d3911f8ea914d015885c8c64540a83badf0021a416c3e37b78236a2ecd1fce4114033416bdd3a36c18ec13250ee9c74c0fc4dd564b3d24a825802d5ae402a53bacace115ae3bbb329be79d1e5e42dbaf0a6446431145fe49b86a8703c7c41f8985d54f12e314c16ff89351d8addf66ebba2783f2d1a11965182aa0b0dd2de53586c5a695c6265c2b173958da648611090557bdebf11a1e042f089fe98e049f4796c60d26be38356fe020d9ace9008410d53a1bb7db78b52ee44bac364213f5c59f1eac4e3314f3423b92fdd7a6156608111ac6ddf58385ec1f3df12061208db98816ac948d803fad10d5ece2018c60faa13de5e5a9033745c824932e53f4122a39f635813545c1b74732cd55642f19ed6deca1585ebf7242c849bde981572a2199066e9c912b2068c8f1c8b936c43ae95c6e22bd7b80dfea05f495d751107da5928e806d0af905c87b5a0795df146af6580d8f9c6a0e2645686d43822ce9b4be0bd5937c097917e048b5af71c7e7521d490f107e9231ee5bd9fbf0727ba87774ed24cd52f471ffb71849ebd55605996515bdcfe95bb1df3541e7c42da4166dd01ec3597634aa6455d15fe14af435e8d7a55ff1682d55a2da867ae63d11fb3fd987fa5d7032ecefc35d3fb9570940e779e13da18070e6df5292f97f2a281f9598101102c955fe4808a2319c85fdef3d55b19e05bb8c2d3da64bafb67a53491513a24f6f0804aa162c8a7db25b38089373fecc45a0eaef65dd9be3b4b7f9436a5423fdcdb5a9b60138fc6a2261225390d9ae0d8ab7f0f7ffff69dca06881d33a637d634358abebb333df41151f239add91abaafc89070cb2159ce3a31655c22e4696c9fa7a7211d1251d4bb21ea4a321a3dbebc29d97f526251e40e548dcd7ed07587719a266f006179dcd22e50b3705152817057b097b043ad63b8d867edc20aea9b4c959ef4ff70f47128cfcc21e31f17978ecacc366f459ac1cc459a3976e4173ca322675f84f18036119ec2f204c3fb554a0b72f7e9d8c882ab147b3d280ca9dff7b9160b1b437b901f03cbc05fe05c6f44824b48aa8da52ae7dda1653fd500f9ccd221843cf76513b3b74d094f14d93a00d7cb954bc4cf2f04f9a35e38edcb1e84f62057647dcb3571f1dd296ca1e049f1746a8a282e85138500e7649db756b2d2ad88f11c471c89dc6be2cd43481013b8d0ae83da2b855cea7be424f8b2325b1850d1fdef03e765458df4513d57c72ba9751e1edc3c4e7f97e3202bb46eec7be89871ba3704aa6c6fc08851e551a3f655fa1fb798d12f003faf31c56b6df399a5dd0ed29ef9e4139dbc254bc5d6051840a859eabaaad56324588fae881fd638d2b70fb3813402df61d941ab495588e5fc3823249bf9a03cf877902394f512de118edaf98843a5445e9073fcfa409df3db0221f1c77e2dd21e74f9e10c9e180dc4ed17010eb949c6d67a22bd5337b2c68f9eccdec778ece728e91353696b742c8f5a3a569f054efb8c1ed478ee9b75e26c768a5816aa6bd08a4c72e745fdb5deb34ecb86b3a84346c1c70f9c16fc45bc0421f0da2f630912d5079f390cc53b78e343310de722b53d2a3b4aa386caa0d7e91986e19c3363426ba30eb5284293af81d00158a3f5233327b40c3b989725ba7dd5b31ac7abf8d3e0b737e843065cd7316dc2f374a00bed4cf9caa0d6e232c854df1bc24c3d484bc6bcb14ec770d5745474dc6ac3b3ddbffc551c9fcc2c56a5e0ae17948457c01e701bf1554022bc2b7d9dd42b2b91172fd85e6874d2d61fc7b3bb3cee2a9bfec09f6d7e98279c6f511f4140b116c856c1438e34bca59fdca2409f025b896a52d68719bf93e82e7d89bbf798991fda0af8d06d17f39eba4bca09c1fe594b537ad4c9b94ab52c895539d639425f9146b24b016368a638e5bba391bc8763cae7c52ff9c496884f1d84e5e08ed451358ecb3c4919dd410e82cac35ae744078287c05c89b42999ea6b8b127d40d53a5722d45139e8bc507a11e7add7fa9ab12cc40afeec008a4668e3e6440f27bb5780936c0e3668ac51262390c79b3f21fd041cf36ba3522f3a552714ff188bfd554c60d0e7d11213cf7d3864a5175d4047c2f3284741f18ec22995a5b82bf62190151bc1529c6d9927f9b0c1dacebd9c2dc406f7f64a973f9a70cff6e3abeebeb46514bbf2ead382f7262d46bd43d88c1b91a9011d1f8ba81fa536a7162aee2b2ec6fc0f2d6efc87b98d2e41e0f946969da659c21053775ece415a34d42b6cfd5bc52259867b411dfb991461ca618052309ca9c96468c2da12dfab0e822ff3bbe7ba281982a239ac19c47024fe1f0e3550cf0975add1f680a9dac9b2c4ab0aed4f409ddda6765eb8a0a9d1e9d07458c69ac8195541219b18efcd06c0001f2ae7fee2d404666a18ca3cb3aa4f0623e86c5b1229f6c2ca28d951111294b91edc52730b6b2c46e000672a7c89b2f38045bd3e37dbb8a75e18687a514dcf740c87a34834d3c3cc8aadf6166ec0c42d2be92f90a3af49633ff23cd80848ceb57ac550eaf9ae496bdc6a2d7cf50fe107895b4a1ed014f78af24eccd6a07420f1dc0df1e7c44b4ba937dd43cab9c798371b148325578d61931766af02b45054bdc2d9fcab2f4b49092f6fff7c27886820739d6140a4a905f0020249e8ae8dd87da1a1e7b1851eb01045aaa72dc8a2bf68055e7aed41d85336648a3405195d2ab61b0e29a770461f32fd05e14c17d72c5252f026a7b9abe7ea9176d3c46f6ed9fb716758d97b41e4f5d81a24538f763d83eecafafc668422612b40cfc32b3354b24755fbe400a2bfed494fe6d0ba0051713b776e67e2f1915e94708e6dc74b398f2f526933aad8fe7dc32faf40022606aebb6e0756b994c3176fae7640ee06d6c67bd54764c4752f1bf831f43e0227cba101174c5554ce26400f333dd8e9f6db1cdf670ce407d7d06c3aef4c0724b62edc8f1ba3e04f0e394d15a73b9255abb4d6ac70303dcf9160d32dc02d4804219ed5c7e3b48402e58ab2f58305f9bb95d2a8759947de96328ed5234cfe7d0b2a9a014df7e4cd0ae48906315f139b8635d2e6bd4aba32e62b8906cdfe5622c411bf0373d0cb07d17bb2bb5b83eae4401c243605fd1df759fd0ddc704ccab5a9776c40fbf6bde0f11b9646c699f26063a9550ac228c9884c277bcadcc0a2c225dc203e28e253c4e464b23d2529d09c7b7dd3c984667372472b615645f294c4e3b0797f9d1c234015b78502d98bfc04f1fa2f16cf3e7221d5794d035e4b172a4d84e679cb1c82df2fb49d3c6668eb1661bed56705096c2371a19d668832808eedd9e5b1256c18fe7ccc494e5e29145d453c553ec86fb7f3a634d0d45661875f2f1005ba5e734c1a976f37cd23450e4606e32d027bc9ec2edd9395e14b2082179bd7b4f9b8caa2d00a2de71d48553f7d4153cb56a1b08f11925e4b11c9281744ae9171f3d6faa3ab3f88c5c34fd23e4f6efeceafdcbc07686ef56efa62c0ad62f1cdcb4d3b5bc508c1f05263bc347158fa5495828f34eb7fcde98fefaa82bafeefed3f4a58968d751c051b52e0047f066de5be533bc3b1e439ab1c8602f6c67503803c8fa113737cb8279f358dbacdf45432b7a654d0e1122cca93420e956661d7275181c75b0d9c20e84c7007dfc49f27bc00007cf4ffa631c892981fd70141d532fcd51de5c23fe0b7a186d0dc296362f235d61698740cc315891cc9342da17843bcde274c17e462263d0e8b4832dd9075a7bbb443d4b26b41e534ad5551ed5ada102175e695363fb48d6b99ac978a3aa6f405d87f983384ce35740e930491d75675337c5dc081e3d301228e61bde5cc169968e5b4350cca2b085f9f75cc4b88497a78cd0a0073d90246c7dc102c7cbf3516498e8a41aa85d8cc5bc285ff66e8338e85ca83fb6889e2bccff52059bb9e92e92c155a349952680ffd0a3c346061a53fdf074417fc90c4d1af7c2acc3ee4b080752cbc9455ba5931b7e910f1e4af0efce905d2cc9c685923ead387fa532c0e8ad92719c76c281cd010e1acce500ae1443838b8afb48af032069dd07aa4df0d56bcb70a64592633699c8658102f1fbca441325e27f1732a7a973d8cb3a0684d72943ef6f1892f2d7ccf39bb6dfe5801ab98653bdbcfbb787bf125253be2624f6cf44177d588bd7b780d9e3f4e3a4e50b8a253fa21abce6a94b9073289c76773b46140f5a6e46b9de9ec066c176f5d1a69f380e1901216617363362d13ebb26ad74fb008ec08841550ff14ca800a1ecf2e007ebaad9f4e0d9664448d60ac0d8544243129fb81c1723b9b4bc2ee971dff736d9fcde0afbfbf5c50a4cc06a4c363998326c17bdc9e2508651dedd9a2a52bd87f8693cfcff60753acf9716c526e8635f12377e36564ae55d0fdb3c7997ec4dbdaa5b4d18c7b660acd95060831795da7d299a5a8d8cf9e92537dbd3ef7f56aebe38fa97c41da6bf0572a0270be7e5a7dcc0be3529339464c811052b65a938e874ea6da469c7d8992ce0aff1c75e82d1621ecb967213c65f2de582cb41de3804c507ddfc708ef3f6096ba4491e431160f98de806d0f334e03cfb7a3bece601099bd971253f3aa0df845da8b478603d5d88533d0cab9c89f2dd9a1404cf8939ffdda652a94093865a85fce2bc3d7babcff7b9f3306bd76b9af80c78ad518f89ee73b7a710da604e72f4927be8d65d06be2e0732fa786a83e27597cfbed9bf98df445499e0746b9f2cb9659ac0a9cef433148521f33b1d78d13c8441c0d1e20fd93ac450a3787a2292bcbd68cd1f961d34937be9a21abaf26f361bf53aa0c095e53c51f3e04d567eabe6e40d96a17c2bcc9230b18f7e079bc549a314b4ae21d30a3341aa205bc75c7f1d21b0a49549c300faeda243d0ce18da5e66c5b663cd705005dd9fea0a9564174abb797d64c58fdab1fae44576d514b75eaa31c9278b15bf9b6df7c6c2873d7a56fb91ab77b83761a09f9e1ddae535622fb87f7462256a60dd39dd3ceb6690b0272920b635ea639daf24f95462c523e5bbd8d8407c61163ab38877d5edfa04c2a78d4d240523ba97c7d01c71783f8748e85164b4dd08c25506a4ed18300b42b7bc6e417f512ae456ceec2ffc83190991a06d4a58ede215babcd3688e1d61f1975016244e80c88ae2aec05c7eeb1c50caca72b3b415b6b870bf5e10bd1ac3ba6b4acb1d1afac554444d94c97e171005fa4ea9c651bb4e527ff58d0c2f90fb453a92d6546a26e9e98395b09e8471bdcf2a145aacb649708cf048a7856ce8cf390c107ff2c66efbf2a76c5b041860ea576103cd8c6b25e50eca9ff6a2fa88083fe9ac0d1fb639c516b9bcdf23c34c6145a705498ff9b9747f15e1c08c63da6efeda4eca02c3f00dfec06c82220c9de840040118dde76be788daf84e6a2f44c81fe6defcc474f99c51c4648d297cbc48f081e0809dbda505d020cbe865e430e0491644ec8c52bd3ab8ce8c4862990f49fe2588caf804ce9500ef42d5a50c057c257168e283e4a4aedbe4ccfaf3eeffb212f9e23d15434d60bf4f455f512e2b655aff3225d1b217c261110cec0400f54dd303d6231d028c2eb649bccc91d30a6391c88bff9d447c3cf35a3467be5957e0ea4d4dc237c9f2c68ce48f658f820a3d72d559b60f233ce538c92cb148808e34fedf2d648c21e7f2ea29a77270c393bda42d869351d6c085d965dc12cbfd0311b8bf604f4391d378781eea3b5f1e0da9d0d8f8de88e56fe47d362cd46f591d3ec0f7cccb85a21f21ddcd4107821ce0ca9ddf99dfdfd9b0c9cd45053e5b1b4385bd8f5b227ada31b5c23e9420014474e8b4494fde7c38edfe70994d97b8cbdfac588df49a49c472fcce78cccc051f31cbbc1e0422878d8d490f3aee28adf1587c38fb7e7d1be54abeaa83cf54b633803a5e669ff4295df8735231ce39631616bd05e0e31117c722c2fd6787003b0bc7fe422a089c89329544e085d71102c1813769450a9f66f160d1702cdb17bd2c6fdf0f722762d193ce83623eeffab17b01b10a31db6e2feb6eb3abdbb2e36320e1a56e44e48d26090afa7f65003a98cbfef590ac3ec89b3eb230557cf6aa566e841806aa2767b21bb26fe001f11ae039e0c9a4bf1bf3d271960f16158eb5bd9ebf0080abd8369d512cab2d1aaae2b14d0ff6ee705a38fb0c801a98b0624cc138fc24834fdf430f33e1760db913da3290f34415c9e3df3e97da1780545ab68ac5a24db89f24d62f4a399728e4144a8c89f47ac2d29e30c49b0bcf790a5e3d3fcd1943c6a28f37251d9dd827a69579e6c17b629c927473b5a07b0a29d9562708d6c8ce576109ad1a3473ffb2047eb069beeec24c114bef392c929038c92abd0e6a19b610e27881361824d57008b7373d0ab76379570ded76c9b8284fe2c247791073c29b2fc6fca05019220ab92856892d3c0dcc6da0b597fe559c162d060d71513ebca050d9638164b9ae271fba5575ade787ec5aee8fc253d1b234b1df561db3e36ac64b9b0100dd6b407043537b2b141f
diff --git a/src/lib/libssl/src/fips-1.0/sha/asm/fips-sx86-elf.s b/src/lib/libssl/src/fips-1.0/sha/asm/fips-sx86-elf.s
deleted file mode 100644
index 2a4d98791d..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/asm/fips-sx86-elf.s
+++ /dev/null
@@ -1,1568 +0,0 @@
-
-
-
-
-
-
-        .file   "sha1-586.s"
-        .version        "01.01"
-gcc2_compiled.:
-.text
-        .align 16
-.globl sha1_block_asm_data_order
-        .type   sha1_block_asm_data_order,@function
-sha1_block_asm_data_order:
-        movl    12(%esp),       %ecx
-        pushl   %esi
-        sall    $6,             %ecx
-        movl    12(%esp),       %esi
-        pushl   %ebp
-        addl    %esi,           %ecx
-        pushl   %ebx
-        movl    16(%esp),       %ebp
-        pushl   %edi
-        movl    12(%ebp),       %edx
-        subl    $108,           %esp
-        movl    16(%ebp),       %edi
-        movl    8(%ebp),        %ebx
-        movl    %ecx,           68(%esp)
-
-.L000start:
-
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ecx
-
-        xchgb   %al,            %ah
-        rorl    $16,            %eax
-        xchgb   %al,            %ah
-
-        xchgb   %cl,            %ch
-        rorl    $16,            %ecx
-        xchgb   %cl,            %ch
-        movl    %eax,           (%esp)
-        movl    %ecx,           4(%esp)
-        movl    8(%esi),        %eax
-        movl    12(%esi),       %ecx
-
-        xchgb   %al,            %ah
-        rorl    $16,            %eax
-        xchgb   %al,            %ah
-
-        xchgb   %cl,            %ch
-        rorl    $16,            %ecx
-        xchgb   %cl,            %ch
-        movl    %eax,           8(%esp)
-        movl    %ecx,           12(%esp)
-        movl    16(%esi),       %eax
-        movl    20(%esi),       %ecx
-
-        xchgb   %al,            %ah
-        rorl    $16,            %eax
-        xchgb   %al,            %ah
-
-        xchgb   %cl,            %ch
-        rorl    $16,            %ecx
-        xchgb   %cl,            %ch
-        movl    %eax,           16(%esp)
-        movl    %ecx,           20(%esp)
-        movl    24(%esi),       %eax
-        movl    28(%esi),       %ecx
-
-        xchgb   %al,            %ah
-        rorl    $16,            %eax
-        xchgb   %al,            %ah
-
-        xchgb   %cl,            %ch
-        rorl    $16,            %ecx
-        xchgb   %cl,            %ch
-        movl    %eax,           24(%esp)
-        movl    %ecx,           28(%esp)
-        movl    32(%esi),       %eax
-        movl    36(%esi),       %ecx
-
-        xchgb   %al,            %ah
-        rorl    $16,            %eax
-        xchgb   %al,            %ah
-
-        xchgb   %cl,            %ch
-        rorl    $16,            %ecx
-        xchgb   %cl,            %ch
-        movl    %eax,           32(%esp)
-        movl    %ecx,           36(%esp)
-        movl    40(%esi),       %eax
-        movl    44(%esi),       %ecx
-
-        xchgb   %al,            %ah
-        rorl    $16,            %eax
-        xchgb   %al,            %ah
-
-        xchgb   %cl,            %ch
-        rorl    $16,            %ecx
-        xchgb   %cl,            %ch
-        movl    %eax,           40(%esp)
-        movl    %ecx,           44(%esp)
-        movl    48(%esi),       %eax
-        movl    52(%esi),       %ecx
-
-        xchgb   %al,            %ah
-        rorl    $16,            %eax
-        xchgb   %al,            %ah
-
-        xchgb   %cl,            %ch
-        rorl    $16,            %ecx
-        xchgb   %cl,            %ch
-        movl    %eax,           48(%esp)
-        movl    %ecx,           52(%esp)
-        movl    56(%esi),       %eax
-        movl    60(%esi),       %ecx
-
-        xchgb   %al,            %ah
-        rorl    $16,            %eax
-        xchgb   %al,            %ah
-
-        xchgb   %cl,            %ch
-        rorl    $16,            %ecx
-        xchgb   %cl,            %ch
-        movl    %eax,           56(%esp)
-        movl    %ecx,           60(%esp)
-
-
-        movl    %esi,           132(%esp)
-.L001shortcut:
-
-
-        movl    (%ebp),         %eax
-        movl    4(%ebp),        %ecx
-
-        movl    %eax,           %ebp
-        movl    %ebx,           %esi
-        roll    $5,             %ebp
-        xorl    %edx,           %esi
-        andl    %ecx,           %esi
-        rorl    $2,             %ecx
-        addl    %edi,           %ebp
-        movl    (%esp),         %edi
-        xorl    %edx,           %esi
-        leal    1518500249(%ebp,%edi,1),%ebp
-        addl    %ebp,           %esi
-
-        movl    %esi,           %ebp
-        movl    %ecx,           %edi
-        roll    $5,             %ebp
-        xorl    %ebx,           %edi
-        andl    %eax,           %edi
-        rorl    $2,             %eax
-        addl    %edx,           %ebp
-        movl    4(%esp),        %edx
-        xorl    %ebx,           %edi
-        leal    1518500249(%ebp,%edx,1),%ebp
-        addl    %ebp,           %edi
-
-        movl    %edi,           %ebp
-        movl    %eax,           %edx
-        roll    $5,             %ebp
-        xorl    %ecx,           %edx
-        andl    %esi,           %edx
-        rorl    $2,             %esi
-        addl    %ebx,           %ebp
-        movl    8(%esp),        %ebx
-        xorl    %ecx,           %edx
-        leal    1518500249(%ebp,%ebx,1),%ebp
-        addl    %ebp,           %edx
-
-        movl    %edx,           %ebp
-        movl    %esi,           %ebx
-        roll    $5,             %ebp
-        xorl    %eax,           %ebx
-        andl    %edi,           %ebx
-        rorl    $2,             %edi
-        addl    %ecx,           %ebp
-        movl    12(%esp),       %ecx
-        xorl    %eax,           %ebx
-        leal    1518500249(%ebp,%ecx,1),%ebp
-        addl    %ebp,           %ebx
-
-        movl    %ebx,           %ebp
-        movl    %edi,           %ecx
-        roll    $5,             %ebp
-        xorl    %esi,           %ecx
-        andl    %edx,           %ecx
-        rorl    $2,             %edx
-        addl    %eax,           %ebp
-        movl    16(%esp),       %eax
-        xorl    %esi,           %ecx
-        leal    1518500249(%ebp,%eax,1),%ebp
-        addl    %ebp,           %ecx
-
-        movl    %ecx,           %ebp
-        movl    %edx,           %eax
-        roll    $5,             %ebp
-        xorl    %edi,           %eax
-        andl    %ebx,           %eax
-        rorl    $2,             %ebx
-        addl    %esi,           %ebp
-        movl    20(%esp),       %esi
-        xorl    %edi,           %eax
-        leal    1518500249(%ebp,%esi,1),%ebp
-        addl    %ebp,           %eax
-
-        movl    %eax,           %ebp
-        movl    %ebx,           %esi
-        roll    $5,             %ebp
-        xorl    %edx,           %esi
-        andl    %ecx,           %esi
-        rorl    $2,             %ecx
-        addl    %edi,           %ebp
-        movl    24(%esp),       %edi
-        xorl    %edx,           %esi
-        leal    1518500249(%ebp,%edi,1),%ebp
-        addl    %ebp,           %esi
-
-        movl    %esi,           %ebp
-        movl    %ecx,           %edi
-        roll    $5,             %ebp
-        xorl    %ebx,           %edi
-        andl    %eax,           %edi
-        rorl    $2,             %eax
-        addl    %edx,           %ebp
-        movl    28(%esp),       %edx
-        xorl    %ebx,           %edi
-        leal    1518500249(%ebp,%edx,1),%ebp
-        addl    %ebp,           %edi
-
-        movl    %edi,           %ebp
-        movl    %eax,           %edx
-        roll    $5,             %ebp
-        xorl    %ecx,           %edx
-        andl    %esi,           %edx
-        rorl    $2,             %esi
-        addl    %ebx,           %ebp
-        movl    32(%esp),       %ebx
-        xorl    %ecx,           %edx
-        leal    1518500249(%ebp,%ebx,1),%ebp
-        addl    %ebp,           %edx
-
-        movl    %edx,           %ebp
-        movl    %esi,           %ebx
-        roll    $5,             %ebp
-        xorl    %eax,           %ebx
-        andl    %edi,           %ebx
-        rorl    $2,             %edi
-        addl    %ecx,           %ebp
-        movl    36(%esp),       %ecx
-        xorl    %eax,           %ebx
-        leal    1518500249(%ebp,%ecx,1),%ebp
-        addl    %ebp,           %ebx
-
-        movl    %ebx,           %ebp
-        movl    %edi,           %ecx
-        roll    $5,             %ebp
-        xorl    %esi,           %ecx
-        andl    %edx,           %ecx
-        rorl    $2,             %edx
-        addl    %eax,           %ebp
-        movl    40(%esp),       %eax
-        xorl    %esi,           %ecx
-        leal    1518500249(%ebp,%eax,1),%ebp
-        addl    %ebp,           %ecx
-
-        movl    %ecx,           %ebp
-        movl    %edx,           %eax
-        roll    $5,             %ebp
-        xorl    %edi,           %eax
-        andl    %ebx,           %eax
-        rorl    $2,             %ebx
-        addl    %esi,           %ebp
-        movl    44(%esp),       %esi
-        xorl    %edi,           %eax
-        leal    1518500249(%ebp,%esi,1),%ebp
-        addl    %ebp,           %eax
-
-        movl    %eax,           %ebp
-        movl    %ebx,           %esi
-        roll    $5,             %ebp
-        xorl    %edx,           %esi
-        andl    %ecx,           %esi
-        rorl    $2,             %ecx
-        addl    %edi,           %ebp
-        movl    48(%esp),       %edi
-        xorl    %edx,           %esi
-        leal    1518500249(%ebp,%edi,1),%ebp
-        addl    %ebp,           %esi
-
-        movl    %esi,           %ebp
-        movl    %ecx,           %edi
-        roll    $5,             %ebp
-        xorl    %ebx,           %edi
-        andl    %eax,           %edi
-        rorl    $2,             %eax
-        addl    %edx,           %ebp
-        movl    52(%esp),       %edx
-        xorl    %ebx,           %edi
-        leal    1518500249(%ebp,%edx,1),%ebp
-        addl    %ebp,           %edi
-
-        movl    %edi,           %ebp
-        movl    %eax,           %edx
-        roll    $5,             %ebp
-        xorl    %ecx,           %edx
-        andl    %esi,           %edx
-        rorl    $2,             %esi
-        addl    %ebx,           %ebp
-        movl    56(%esp),       %ebx
-        xorl    %ecx,           %edx
-        leal    1518500249(%ebp,%ebx,1),%ebp
-        addl    %ebp,           %edx
-
-        movl    %edx,           %ebp
-        movl    %esi,           %ebx
-        roll    $5,             %ebp
-        xorl    %eax,           %ebx
-        andl    %edi,           %ebx
-        rorl    $2,             %edi
-        addl    %ecx,           %ebp
-        movl    60(%esp),       %ecx
-        xorl    %eax,           %ebx
-        leal    1518500249(%ebp,%ecx,1),%ebp
-        addl    %ebp,           %ebx
-
-        movl    8(%esp),        %ecx
-        movl    %edi,           %ebp
-        xorl    (%esp),         %ecx
-        xorl    %esi,           %ebp
-        xorl    32(%esp),       %ecx
-        andl    %edx,           %ebp
-        xorl    52(%esp),       %ecx
-        rorl    $2,             %edx
-        xorl    %esi,           %ebp
-.byte 209
-.byte 193       
-        movl    %ecx,           (%esp)
-        leal    1518500249(%ecx,%eax,1),%ecx
-        movl    %ebx,           %eax
-        addl    %ebp,           %ecx
-        roll    $5,             %eax
-        addl    %eax,           %ecx
-
-        movl    12(%esp),       %eax
-        movl    %edx,           %ebp
-        xorl    4(%esp),        %eax
-        xorl    %edi,           %ebp
-        xorl    36(%esp),       %eax
-        andl    %ebx,           %ebp
-        xorl    56(%esp),       %eax
-        rorl    $2,             %ebx
-        xorl    %edi,           %ebp
-.byte 209
-.byte 192       
-        movl    %eax,           4(%esp)
-        leal    1518500249(%eax,%esi,1),%eax
-        movl    %ecx,           %esi
-        addl    %ebp,           %eax
-        roll    $5,             %esi
-        addl    %esi,           %eax
-
-        movl    16(%esp),       %esi
-        movl    %ebx,           %ebp
-        xorl    8(%esp),        %esi
-        xorl    %edx,           %ebp
-        xorl    40(%esp),       %esi
-        andl    %ecx,           %ebp
-        xorl    60(%esp),       %esi
-        rorl    $2,             %ecx
-        xorl    %edx,           %ebp
-.byte 209
-.byte 198       
-        movl    %esi,           8(%esp)
-        leal    1518500249(%esi,%edi,1),%esi
-        movl    %eax,           %edi
-        addl    %ebp,           %esi
-        roll    $5,             %edi
-        addl    %edi,           %esi
-
-        movl    20(%esp),       %edi
-        movl    %ecx,           %ebp
-        xorl    12(%esp),       %edi
-        xorl    %ebx,           %ebp
-        xorl    44(%esp),       %edi
-        andl    %eax,           %ebp
-        xorl    (%esp),         %edi
-        rorl    $2,             %eax
-        xorl    %ebx,           %ebp
-.byte 209
-.byte 199       
-        movl    %edi,           12(%esp)
-        leal    1518500249(%edi,%edx,1),%edi
-        movl    %esi,           %edx
-        addl    %ebp,           %edi
-        roll    $5,             %edx
-        addl    %edx,           %edi
-
-        movl    16(%esp),       %edx
-        movl    %esi,           %ebp
-        xorl    24(%esp),       %edx
-        rorl    $2,             %esi
-        xorl    48(%esp),       %edx
-        xorl    %eax,           %ebp
-        xorl    4(%esp),        %edx
-        xorl    %ecx,           %ebp
-.byte 209
-.byte 194       
-        movl    %edx,           16(%esp)
-        leal    1859775393(%edx,%ebx,1),%edx
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebp,           %edx
-        addl    %ebx,           %edx
-
-        movl    20(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    28(%esp),       %ebx
-        rorl    $2,             %edi
-        xorl    52(%esp),       %ebx
-        xorl    %esi,           %ebp
-        xorl    8(%esp),        %ebx
-        xorl    %eax,           %ebp
-.byte 209
-.byte 195       
-        movl    %ebx,           20(%esp)
-        leal    1859775393(%ebx,%ecx,1),%ebx
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ebp,           %ebx
-        addl    %ecx,           %ebx
-
-        movl    24(%esp),       %ecx
-        movl    %edx,           %ebp
-        xorl    32(%esp),       %ecx
-        rorl    $2,             %edx
-        xorl    56(%esp),       %ecx
-        xorl    %edi,           %ebp
-        xorl    12(%esp),       %ecx
-        xorl    %esi,           %ebp
-.byte 209
-.byte 193       
-        movl    %ecx,           24(%esp)
-        leal    1859775393(%ecx,%eax,1),%ecx
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %ebp,           %ecx
-        addl    %eax,           %ecx
-
-        movl    28(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    36(%esp),       %eax
-        rorl    $2,             %ebx
-        xorl    60(%esp),       %eax
-        xorl    %edx,           %ebp
-        xorl    16(%esp),       %eax
-        xorl    %edi,           %ebp
-.byte 209
-.byte 192       
-        movl    %eax,           28(%esp)
-        leal    1859775393(%eax,%esi,1),%eax
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %ebp,           %eax
-        addl    %esi,           %eax
-
-        movl    32(%esp),       %esi
-        movl    %ecx,           %ebp
-        xorl    40(%esp),       %esi
-        rorl    $2,             %ecx
-        xorl    (%esp),         %esi
-        xorl    %ebx,           %ebp
-        xorl    20(%esp),       %esi
-        xorl    %edx,           %ebp
-.byte 209
-.byte 198       
-        movl    %esi,           32(%esp)
-        leal    1859775393(%esi,%edi,1),%esi
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %ebp,           %esi
-        addl    %edi,           %esi
-
-        movl    36(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    44(%esp),       %edi
-        rorl    $2,             %eax
-        xorl    4(%esp),        %edi
-        xorl    %ecx,           %ebp
-        xorl    24(%esp),       %edi
-        xorl    %ebx,           %ebp
-.byte 209
-.byte 199       
-        movl    %edi,           36(%esp)
-        leal    1859775393(%edi,%edx,1),%edi
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %ebp,           %edi
-        addl    %edx,           %edi
-
-        movl    40(%esp),       %edx
-        movl    %esi,           %ebp
-        xorl    48(%esp),       %edx
-        rorl    $2,             %esi
-        xorl    8(%esp),        %edx
-        xorl    %eax,           %ebp
-        xorl    28(%esp),       %edx
-        xorl    %ecx,           %ebp
-.byte 209
-.byte 194       
-        movl    %edx,           40(%esp)
-        leal    1859775393(%edx,%ebx,1),%edx
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebp,           %edx
-        addl    %ebx,           %edx
-
-        movl    44(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    52(%esp),       %ebx
-        rorl    $2,             %edi
-        xorl    12(%esp),       %ebx
-        xorl    %esi,           %ebp
-        xorl    32(%esp),       %ebx
-        xorl    %eax,           %ebp
-.byte 209
-.byte 195       
-        movl    %ebx,           44(%esp)
-        leal    1859775393(%ebx,%ecx,1),%ebx
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ebp,           %ebx
-        addl    %ecx,           %ebx
-
-        movl    48(%esp),       %ecx
-        movl    %edx,           %ebp
-        xorl    56(%esp),       %ecx
-        rorl    $2,             %edx
-        xorl    16(%esp),       %ecx
-        xorl    %edi,           %ebp
-        xorl    36(%esp),       %ecx
-        xorl    %esi,           %ebp
-.byte 209
-.byte 193       
-        movl    %ecx,           48(%esp)
-        leal    1859775393(%ecx,%eax,1),%ecx
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %ebp,           %ecx
-        addl    %eax,           %ecx
-
-        movl    52(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    60(%esp),       %eax
-        rorl    $2,             %ebx
-        xorl    20(%esp),       %eax
-        xorl    %edx,           %ebp
-        xorl    40(%esp),       %eax
-        xorl    %edi,           %ebp
-.byte 209
-.byte 192       
-        movl    %eax,           52(%esp)
-        leal    1859775393(%eax,%esi,1),%eax
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %ebp,           %eax
-        addl    %esi,           %eax
-
-        movl    56(%esp),       %esi
-        movl    %ecx,           %ebp
-        xorl    (%esp),         %esi
-        rorl    $2,             %ecx
-        xorl    24(%esp),       %esi
-        xorl    %ebx,           %ebp
-        xorl    44(%esp),       %esi
-        xorl    %edx,           %ebp
-.byte 209
-.byte 198       
-        movl    %esi,           56(%esp)
-        leal    1859775393(%esi,%edi,1),%esi
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %ebp,           %esi
-        addl    %edi,           %esi
-
-        movl    60(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    4(%esp),        %edi
-        rorl    $2,             %eax
-        xorl    28(%esp),       %edi
-        xorl    %ecx,           %ebp
-        xorl    48(%esp),       %edi
-        xorl    %ebx,           %ebp
-.byte 209
-.byte 199       
-        movl    %edi,           60(%esp)
-        leal    1859775393(%edi,%edx,1),%edi
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %ebp,           %edi
-        addl    %edx,           %edi
-
-        movl    (%esp),         %edx
-        movl    %esi,           %ebp
-        xorl    8(%esp),        %edx
-        rorl    $2,             %esi
-        xorl    32(%esp),       %edx
-        xorl    %eax,           %ebp
-        xorl    52(%esp),       %edx
-        xorl    %ecx,           %ebp
-.byte 209
-.byte 194       
-        movl    %edx,           (%esp)
-        leal    1859775393(%edx,%ebx,1),%edx
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebp,           %edx
-        addl    %ebx,           %edx
-
-        movl    4(%esp),        %ebx
-        movl    %edi,           %ebp
-        xorl    12(%esp),       %ebx
-        rorl    $2,             %edi
-        xorl    36(%esp),       %ebx
-        xorl    %esi,           %ebp
-        xorl    56(%esp),       %ebx
-        xorl    %eax,           %ebp
-.byte 209
-.byte 195       
-        movl    %ebx,           4(%esp)
-        leal    1859775393(%ebx,%ecx,1),%ebx
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ebp,           %ebx
-        addl    %ecx,           %ebx
-
-        movl    8(%esp),        %ecx
-        movl    %edx,           %ebp
-        xorl    16(%esp),       %ecx
-        rorl    $2,             %edx
-        xorl    40(%esp),       %ecx
-        xorl    %edi,           %ebp
-        xorl    60(%esp),       %ecx
-        xorl    %esi,           %ebp
-.byte 209
-.byte 193       
-        movl    %ecx,           8(%esp)
-        leal    1859775393(%ecx,%eax,1),%ecx
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %ebp,           %ecx
-        addl    %eax,           %ecx
-
-        movl    12(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    20(%esp),       %eax
-        rorl    $2,             %ebx
-        xorl    44(%esp),       %eax
-        xorl    %edx,           %ebp
-        xorl    (%esp),         %eax
-        xorl    %edi,           %ebp
-.byte 209
-.byte 192       
-        movl    %eax,           12(%esp)
-        leal    1859775393(%eax,%esi,1),%eax
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %ebp,           %eax
-        addl    %esi,           %eax
-
-        movl    16(%esp),       %esi
-        movl    %ecx,           %ebp
-        xorl    24(%esp),       %esi
-        rorl    $2,             %ecx
-        xorl    48(%esp),       %esi
-        xorl    %ebx,           %ebp
-        xorl    4(%esp),        %esi
-        xorl    %edx,           %ebp
-.byte 209
-.byte 198       
-        movl    %esi,           16(%esp)
-        leal    1859775393(%esi,%edi,1),%esi
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %ebp,           %esi
-        addl    %edi,           %esi
-
-        movl    20(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    28(%esp),       %edi
-        rorl    $2,             %eax
-        xorl    52(%esp),       %edi
-        xorl    %ecx,           %ebp
-        xorl    8(%esp),        %edi
-        xorl    %ebx,           %ebp
-.byte 209
-.byte 199       
-        movl    %edi,           20(%esp)
-        leal    1859775393(%edi,%edx,1),%edi
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %ebp,           %edi
-        addl    %edx,           %edi
-
-        movl    24(%esp),       %edx
-        movl    %esi,           %ebp
-        xorl    32(%esp),       %edx
-        rorl    $2,             %esi
-        xorl    56(%esp),       %edx
-        xorl    %eax,           %ebp
-        xorl    12(%esp),       %edx
-        xorl    %ecx,           %ebp
-.byte 209
-.byte 194       
-        movl    %edx,           24(%esp)
-        leal    1859775393(%edx,%ebx,1),%edx
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebp,           %edx
-        addl    %ebx,           %edx
-
-        movl    28(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    36(%esp),       %ebx
-        rorl    $2,             %edi
-        xorl    60(%esp),       %ebx
-        xorl    %esi,           %ebp
-        xorl    16(%esp),       %ebx
-        xorl    %eax,           %ebp
-.byte 209
-.byte 195       
-        movl    %ebx,           28(%esp)
-        leal    1859775393(%ebx,%ecx,1),%ebx
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ebp,           %ebx
-        addl    %ecx,           %ebx
-
-        movl    32(%esp),       %ecx
-        movl    %edx,           %ebp
-        xorl    40(%esp),       %ecx
-        orl     %edi,           %ebp
-        xorl    (%esp),         %ecx
-        andl    %esi,           %ebp
-        xorl    20(%esp),       %ecx
-.byte 209
-.byte 193       
-        movl    %ecx,           32(%esp)
-        leal    2400959708(%ecx,%eax,1),%ecx
-        movl    %edx,           %eax
-        rorl    $2,             %edx
-        andl    %edi,           %eax
-        orl     %eax,           %ebp
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %eax,           %ebp
-        addl    %ebp,           %ecx
-
-        movl    36(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    44(%esp),       %eax
-        orl     %edx,           %ebp
-        xorl    4(%esp),        %eax
-        andl    %edi,           %ebp
-        xorl    24(%esp),       %eax
-.byte 209
-.byte 192       
-        movl    %eax,           36(%esp)
-        leal    2400959708(%eax,%esi,1),%eax
-        movl    %ebx,           %esi
-        rorl    $2,             %ebx
-        andl    %edx,           %esi
-        orl     %esi,           %ebp
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %esi,           %ebp
-        addl    %ebp,           %eax
-
-        movl    40(%esp),       %esi
-        movl    %ecx,           %ebp
-        xorl    48(%esp),       %esi
-        orl     %ebx,           %ebp
-        xorl    8(%esp),        %esi
-        andl    %edx,           %ebp
-        xorl    28(%esp),       %esi
-.byte 209
-.byte 198       
-        movl    %esi,           40(%esp)
-        leal    2400959708(%esi,%edi,1),%esi
-        movl    %ecx,           %edi
-        rorl    $2,             %ecx
-        andl    %ebx,           %edi
-        orl     %edi,           %ebp
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %edi,           %ebp
-        addl    %ebp,           %esi
-
-        movl    44(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    52(%esp),       %edi
-        orl     %ecx,           %ebp
-        xorl    12(%esp),       %edi
-        andl    %ebx,           %ebp
-        xorl    32(%esp),       %edi
-.byte 209
-.byte 199       
-        movl    %edi,           44(%esp)
-        leal    2400959708(%edi,%edx,1),%edi
-        movl    %eax,           %edx
-        rorl    $2,             %eax
-        andl    %ecx,           %edx
-        orl     %edx,           %ebp
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %edx,           %ebp
-        addl    %ebp,           %edi
-
-        movl    48(%esp),       %edx
-        movl    %esi,           %ebp
-        xorl    56(%esp),       %edx
-        orl     %eax,           %ebp
-        xorl    16(%esp),       %edx
-        andl    %ecx,           %ebp
-        xorl    36(%esp),       %edx
-.byte 209
-.byte 194       
-        movl    %edx,           48(%esp)
-        leal    2400959708(%edx,%ebx,1),%edx
-        movl    %esi,           %ebx
-        rorl    $2,             %esi
-        andl    %eax,           %ebx
-        orl     %ebx,           %ebp
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebx,           %ebp
-        addl    %ebp,           %edx
-
-        movl    52(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    60(%esp),       %ebx
-        orl     %esi,           %ebp
-        xorl    20(%esp),       %ebx
-        andl    %eax,           %ebp
-        xorl    40(%esp),       %ebx
-.byte 209
-.byte 195       
-        movl    %ebx,           52(%esp)
-        leal    2400959708(%ebx,%ecx,1),%ebx
-        movl    %edi,           %ecx
-        rorl    $2,             %edi
-        andl    %esi,           %ecx
-        orl     %ecx,           %ebp
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ecx,           %ebp
-        addl    %ebp,           %ebx
-
-        movl    56(%esp),       %ecx
-        movl    %edx,           %ebp
-        xorl    (%esp),         %ecx
-        orl     %edi,           %ebp
-        xorl    24(%esp),       %ecx
-        andl    %esi,           %ebp
-        xorl    44(%esp),       %ecx
-.byte 209
-.byte 193       
-        movl    %ecx,           56(%esp)
-        leal    2400959708(%ecx,%eax,1),%ecx
-        movl    %edx,           %eax
-        rorl    $2,             %edx
-        andl    %edi,           %eax
-        orl     %eax,           %ebp
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %eax,           %ebp
-        addl    %ebp,           %ecx
-
-        movl    60(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    4(%esp),        %eax
-        orl     %edx,           %ebp
-        xorl    28(%esp),       %eax
-        andl    %edi,           %ebp
-        xorl    48(%esp),       %eax
-.byte 209
-.byte 192       
-        movl    %eax,           60(%esp)
-        leal    2400959708(%eax,%esi,1),%eax
-        movl    %ebx,           %esi
-        rorl    $2,             %ebx
-        andl    %edx,           %esi
-        orl     %esi,           %ebp
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %esi,           %ebp
-        addl    %ebp,           %eax
-
-        movl    (%esp),         %esi
-        movl    %ecx,           %ebp
-        xorl    8(%esp),        %esi
-        orl     %ebx,           %ebp
-        xorl    32(%esp),       %esi
-        andl    %edx,           %ebp
-        xorl    52(%esp),       %esi
-.byte 209
-.byte 198       
-        movl    %esi,           (%esp)
-        leal    2400959708(%esi,%edi,1),%esi
-        movl    %ecx,           %edi
-        rorl    $2,             %ecx
-        andl    %ebx,           %edi
-        orl     %edi,           %ebp
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %edi,           %ebp
-        addl    %ebp,           %esi
-
-        movl    4(%esp),        %edi
-        movl    %eax,           %ebp
-        xorl    12(%esp),       %edi
-        orl     %ecx,           %ebp
-        xorl    36(%esp),       %edi
-        andl    %ebx,           %ebp
-        xorl    56(%esp),       %edi
-.byte 209
-.byte 199       
-        movl    %edi,           4(%esp)
-        leal    2400959708(%edi,%edx,1),%edi
-        movl    %eax,           %edx
-        rorl    $2,             %eax
-        andl    %ecx,           %edx
-        orl     %edx,           %ebp
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %edx,           %ebp
-        addl    %ebp,           %edi
-
-        movl    8(%esp),        %edx
-        movl    %esi,           %ebp
-        xorl    16(%esp),       %edx
-        orl     %eax,           %ebp
-        xorl    40(%esp),       %edx
-        andl    %ecx,           %ebp
-        xorl    60(%esp),       %edx
-.byte 209
-.byte 194       
-        movl    %edx,           8(%esp)
-        leal    2400959708(%edx,%ebx,1),%edx
-        movl    %esi,           %ebx
-        rorl    $2,             %esi
-        andl    %eax,           %ebx
-        orl     %ebx,           %ebp
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebx,           %ebp
-        addl    %ebp,           %edx
-
-        movl    12(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    20(%esp),       %ebx
-        orl     %esi,           %ebp
-        xorl    44(%esp),       %ebx
-        andl    %eax,           %ebp
-        xorl    (%esp),         %ebx
-.byte 209
-.byte 195       
-        movl    %ebx,           12(%esp)
-        leal    2400959708(%ebx,%ecx,1),%ebx
-        movl    %edi,           %ecx
-        rorl    $2,             %edi
-        andl    %esi,           %ecx
-        orl     %ecx,           %ebp
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ecx,           %ebp
-        addl    %ebp,           %ebx
-
-        movl    16(%esp),       %ecx
-        movl    %edx,           %ebp
-        xorl    24(%esp),       %ecx
-        orl     %edi,           %ebp
-        xorl    48(%esp),       %ecx
-        andl    %esi,           %ebp
-        xorl    4(%esp),        %ecx
-.byte 209
-.byte 193       
-        movl    %ecx,           16(%esp)
-        leal    2400959708(%ecx,%eax,1),%ecx
-        movl    %edx,           %eax
-        rorl    $2,             %edx
-        andl    %edi,           %eax
-        orl     %eax,           %ebp
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %eax,           %ebp
-        addl    %ebp,           %ecx
-
-        movl    20(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    28(%esp),       %eax
-        orl     %edx,           %ebp
-        xorl    52(%esp),       %eax
-        andl    %edi,           %ebp
-        xorl    8(%esp),        %eax
-.byte 209
-.byte 192       
-        movl    %eax,           20(%esp)
-        leal    2400959708(%eax,%esi,1),%eax
-        movl    %ebx,           %esi
-        rorl    $2,             %ebx
-        andl    %edx,           %esi
-        orl     %esi,           %ebp
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %esi,           %ebp
-        addl    %ebp,           %eax
-
-        movl    24(%esp),       %esi
-        movl    %ecx,           %ebp
-        xorl    32(%esp),       %esi
-        orl     %ebx,           %ebp
-        xorl    56(%esp),       %esi
-        andl    %edx,           %ebp
-        xorl    12(%esp),       %esi
-.byte 209
-.byte 198       
-        movl    %esi,           24(%esp)
-        leal    2400959708(%esi,%edi,1),%esi
-        movl    %ecx,           %edi
-        rorl    $2,             %ecx
-        andl    %ebx,           %edi
-        orl     %edi,           %ebp
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %edi,           %ebp
-        addl    %ebp,           %esi
-
-        movl    28(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    36(%esp),       %edi
-        orl     %ecx,           %ebp
-        xorl    60(%esp),       %edi
-        andl    %ebx,           %ebp
-        xorl    16(%esp),       %edi
-.byte 209
-.byte 199       
-        movl    %edi,           28(%esp)
-        leal    2400959708(%edi,%edx,1),%edi
-        movl    %eax,           %edx
-        rorl    $2,             %eax
-        andl    %ecx,           %edx
-        orl     %edx,           %ebp
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %edx,           %ebp
-        addl    %ebp,           %edi
-
-        movl    32(%esp),       %edx
-        movl    %esi,           %ebp
-        xorl    40(%esp),       %edx
-        orl     %eax,           %ebp
-        xorl    (%esp),         %edx
-        andl    %ecx,           %ebp
-        xorl    20(%esp),       %edx
-.byte 209
-.byte 194       
-        movl    %edx,           32(%esp)
-        leal    2400959708(%edx,%ebx,1),%edx
-        movl    %esi,           %ebx
-        rorl    $2,             %esi
-        andl    %eax,           %ebx
-        orl     %ebx,           %ebp
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebx,           %ebp
-        addl    %ebp,           %edx
-
-        movl    36(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    44(%esp),       %ebx
-        orl     %esi,           %ebp
-        xorl    4(%esp),        %ebx
-        andl    %eax,           %ebp
-        xorl    24(%esp),       %ebx
-.byte 209
-.byte 195       
-        movl    %ebx,           36(%esp)
-        leal    2400959708(%ebx,%ecx,1),%ebx
-        movl    %edi,           %ecx
-        rorl    $2,             %edi
-        andl    %esi,           %ecx
-        orl     %ecx,           %ebp
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ecx,           %ebp
-        addl    %ebp,           %ebx
-
-        movl    40(%esp),       %ecx
-        movl    %edx,           %ebp
-        xorl    48(%esp),       %ecx
-        orl     %edi,           %ebp
-        xorl    8(%esp),        %ecx
-        andl    %esi,           %ebp
-        xorl    28(%esp),       %ecx
-.byte 209
-.byte 193       
-        movl    %ecx,           40(%esp)
-        leal    2400959708(%ecx,%eax,1),%ecx
-        movl    %edx,           %eax
-        rorl    $2,             %edx
-        andl    %edi,           %eax
-        orl     %eax,           %ebp
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %eax,           %ebp
-        addl    %ebp,           %ecx
-
-        movl    44(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    52(%esp),       %eax
-        orl     %edx,           %ebp
-        xorl    12(%esp),       %eax
-        andl    %edi,           %ebp
-        xorl    32(%esp),       %eax
-.byte 209
-.byte 192       
-        movl    %eax,           44(%esp)
-        leal    2400959708(%eax,%esi,1),%eax
-        movl    %ebx,           %esi
-        rorl    $2,             %ebx
-        andl    %edx,           %esi
-        orl     %esi,           %ebp
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %esi,           %ebp
-        addl    %ebp,           %eax
-
-        movl    48(%esp),       %esi
-        movl    %ecx,           %ebp
-        xorl    56(%esp),       %esi
-        rorl    $2,             %ecx
-        xorl    16(%esp),       %esi
-        xorl    %ebx,           %ebp
-        xorl    36(%esp),       %esi
-        xorl    %edx,           %ebp
-.byte 209
-.byte 198       
-        movl    %esi,           48(%esp)
-        leal    3395469782(%esi,%edi,1),%esi
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %ebp,           %esi
-        addl    %edi,           %esi
-
-        movl    52(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    60(%esp),       %edi
-        rorl    $2,             %eax
-        xorl    20(%esp),       %edi
-        xorl    %ecx,           %ebp
-        xorl    40(%esp),       %edi
-        xorl    %ebx,           %ebp
-.byte 209
-.byte 199       
-        movl    %edi,           52(%esp)
-        leal    3395469782(%edi,%edx,1),%edi
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %ebp,           %edi
-        addl    %edx,           %edi
-
-        movl    56(%esp),       %edx
-        movl    %esi,           %ebp
-        xorl    (%esp),         %edx
-        rorl    $2,             %esi
-        xorl    24(%esp),       %edx
-        xorl    %eax,           %ebp
-        xorl    44(%esp),       %edx
-        xorl    %ecx,           %ebp
-.byte 209
-.byte 194       
-        movl    %edx,           56(%esp)
-        leal    3395469782(%edx,%ebx,1),%edx
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebp,           %edx
-        addl    %ebx,           %edx
-
-        movl    60(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    4(%esp),        %ebx
-        rorl    $2,             %edi
-        xorl    28(%esp),       %ebx
-        xorl    %esi,           %ebp
-        xorl    48(%esp),       %ebx
-        xorl    %eax,           %ebp
-.byte 209
-.byte 195       
-        movl    %ebx,           60(%esp)
-        leal    3395469782(%ebx,%ecx,1),%ebx
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ebp,           %ebx
-        addl    %ecx,           %ebx
-
-        movl    (%esp),         %ecx
-        movl    %edx,           %ebp
-        xorl    8(%esp),        %ecx
-        rorl    $2,             %edx
-        xorl    32(%esp),       %ecx
-        xorl    %edi,           %ebp
-        xorl    52(%esp),       %ecx
-        xorl    %esi,           %ebp
-.byte 209
-.byte 193       
-        movl    %ecx,           (%esp)
-        leal    3395469782(%ecx,%eax,1),%ecx
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %ebp,           %ecx
-        addl    %eax,           %ecx
-
-        movl    4(%esp),        %eax
-        movl    %ebx,           %ebp
-        xorl    12(%esp),       %eax
-        rorl    $2,             %ebx
-        xorl    36(%esp),       %eax
-        xorl    %edx,           %ebp
-        xorl    56(%esp),       %eax
-        xorl    %edi,           %ebp
-.byte 209
-.byte 192       
-        movl    %eax,           4(%esp)
-        leal    3395469782(%eax,%esi,1),%eax
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %ebp,           %eax
-        addl    %esi,           %eax
-
-        movl    8(%esp),        %esi
-        movl    %ecx,           %ebp
-        xorl    16(%esp),       %esi
-        rorl    $2,             %ecx
-        xorl    40(%esp),       %esi
-        xorl    %ebx,           %ebp
-        xorl    60(%esp),       %esi
-        xorl    %edx,           %ebp
-.byte 209
-.byte 198       
-        movl    %esi,           8(%esp)
-        leal    3395469782(%esi,%edi,1),%esi
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %ebp,           %esi
-        addl    %edi,           %esi
-
-        movl    12(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    20(%esp),       %edi
-        rorl    $2,             %eax
-        xorl    44(%esp),       %edi
-        xorl    %ecx,           %ebp
-        xorl    (%esp),         %edi
-        xorl    %ebx,           %ebp
-.byte 209
-.byte 199       
-        movl    %edi,           12(%esp)
-        leal    3395469782(%edi,%edx,1),%edi
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %ebp,           %edi
-        addl    %edx,           %edi
-
-        movl    16(%esp),       %edx
-        movl    %esi,           %ebp
-        xorl    24(%esp),       %edx
-        rorl    $2,             %esi
-        xorl    48(%esp),       %edx
-        xorl    %eax,           %ebp
-        xorl    4(%esp),        %edx
-        xorl    %ecx,           %ebp
-.byte 209
-.byte 194       
-        movl    %edx,           16(%esp)
-        leal    3395469782(%edx,%ebx,1),%edx
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebp,           %edx
-        addl    %ebx,           %edx
-
-        movl    20(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    28(%esp),       %ebx
-        rorl    $2,             %edi
-        xorl    52(%esp),       %ebx
-        xorl    %esi,           %ebp
-        xorl    8(%esp),        %ebx
-        xorl    %eax,           %ebp
-.byte 209
-.byte 195       
-        movl    %ebx,           20(%esp)
-        leal    3395469782(%ebx,%ecx,1),%ebx
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ebp,           %ebx
-        addl    %ecx,           %ebx
-
-        movl    24(%esp),       %ecx
-        movl    %edx,           %ebp
-        xorl    32(%esp),       %ecx
-        rorl    $2,             %edx
-        xorl    56(%esp),       %ecx
-        xorl    %edi,           %ebp
-        xorl    12(%esp),       %ecx
-        xorl    %esi,           %ebp
-.byte 209
-.byte 193       
-        movl    %ecx,           24(%esp)
-        leal    3395469782(%ecx,%eax,1),%ecx
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %ebp,           %ecx
-        addl    %eax,           %ecx
-
-        movl    28(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    36(%esp),       %eax
-        rorl    $2,             %ebx
-        xorl    60(%esp),       %eax
-        xorl    %edx,           %ebp
-        xorl    16(%esp),       %eax
-        xorl    %edi,           %ebp
-.byte 209
-.byte 192       
-        movl    %eax,           28(%esp)
-        leal    3395469782(%eax,%esi,1),%eax
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %ebp,           %eax
-        addl    %esi,           %eax
-
-        movl    32(%esp),       %esi
-        movl    %ecx,           %ebp
-        xorl    40(%esp),       %esi
-        rorl    $2,             %ecx
-        xorl    (%esp),         %esi
-        xorl    %ebx,           %ebp
-        xorl    20(%esp),       %esi
-        xorl    %edx,           %ebp
-.byte 209
-.byte 198       
-        movl    %esi,           32(%esp)
-        leal    3395469782(%esi,%edi,1),%esi
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %ebp,           %esi
-        addl    %edi,           %esi
-
-        movl    36(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    44(%esp),       %edi
-        rorl    $2,             %eax
-        xorl    4(%esp),        %edi
-        xorl    %ecx,           %ebp
-        xorl    24(%esp),       %edi
-        xorl    %ebx,           %ebp
-.byte 209
-.byte 199       
-        movl    %edi,           36(%esp)
-        leal    3395469782(%edi,%edx,1),%edi
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %ebp,           %edi
-        addl    %edx,           %edi
-
-        movl    40(%esp),       %edx
-        movl    %esi,           %ebp
-        xorl    48(%esp),       %edx
-        rorl    $2,             %esi
-        xorl    8(%esp),        %edx
-        xorl    %eax,           %ebp
-        xorl    28(%esp),       %edx
-        xorl    %ecx,           %ebp
-.byte 209
-.byte 194       
-        movl    %edx,           40(%esp)
-        leal    3395469782(%edx,%ebx,1),%edx
-        movl    %edi,           %ebx
-        roll    $5,             %ebx
-        addl    %ebp,           %edx
-        addl    %ebx,           %edx
-
-        movl    44(%esp),       %ebx
-        movl    %edi,           %ebp
-        xorl    52(%esp),       %ebx
-        rorl    $2,             %edi
-        xorl    12(%esp),       %ebx
-        xorl    %esi,           %ebp
-        xorl    32(%esp),       %ebx
-        xorl    %eax,           %ebp
-.byte 209
-.byte 195       
-        movl    %ebx,           44(%esp)
-        leal    3395469782(%ebx,%ecx,1),%ebx
-        movl    %edx,           %ecx
-        roll    $5,             %ecx
-        addl    %ebp,           %ebx
-        addl    %ecx,           %ebx
-
-        movl    48(%esp),       %ecx
-        movl    %edx,           %ebp
-        xorl    56(%esp),       %ecx
-        rorl    $2,             %edx
-        xorl    16(%esp),       %ecx
-        xorl    %edi,           %ebp
-        xorl    36(%esp),       %ecx
-        xorl    %esi,           %ebp
-.byte 209
-.byte 193       
-        movl    %ecx,           48(%esp)
-        leal    3395469782(%ecx,%eax,1),%ecx
-        movl    %ebx,           %eax
-        roll    $5,             %eax
-        addl    %ebp,           %ecx
-        addl    %eax,           %ecx
-
-        movl    52(%esp),       %eax
-        movl    %ebx,           %ebp
-        xorl    60(%esp),       %eax
-        rorl    $2,             %ebx
-        xorl    20(%esp),       %eax
-        xorl    %edx,           %ebp
-        xorl    40(%esp),       %eax
-        xorl    %edi,           %ebp
-.byte 209
-.byte 192       
-        movl    %eax,           52(%esp)
-        leal    3395469782(%eax,%esi,1),%eax
-        movl    %ecx,           %esi
-        roll    $5,             %esi
-        addl    %ebp,           %eax
-        addl    %esi,           %eax
-
-        movl    56(%esp),       %esi
-        movl    %ecx,           %ebp
-        xorl    (%esp),         %esi
-        rorl    $2,             %ecx
-        xorl    24(%esp),       %esi
-        xorl    %ebx,           %ebp
-        xorl    44(%esp),       %esi
-        xorl    %edx,           %ebp
-.byte 209
-.byte 198       
-        movl    %esi,           56(%esp)
-        leal    3395469782(%esi,%edi,1),%esi
-        movl    %eax,           %edi
-        roll    $5,             %edi
-        addl    %ebp,           %esi
-        addl    %edi,           %esi
-
-        movl    60(%esp),       %edi
-        movl    %eax,           %ebp
-        xorl    4(%esp),        %edi
-        rorl    $2,             %eax
-        xorl    28(%esp),       %edi
-        xorl    %ecx,           %ebp
-        xorl    48(%esp),       %edi
-        xorl    %ebx,           %ebp
-.byte 209
-.byte 199       
-        movl    %edi,           60(%esp)
-        leal    3395469782(%edi,%edx,1),%edi
-        movl    %esi,           %edx
-        roll    $5,             %edx
-        addl    %ebp,           %edi
-        addl    %edx,           %edi
-
-
-        movl    128(%esp),      %ebp
-        movl    12(%ebp),       %edx
-        addl    %ecx,           %edx
-        movl    4(%ebp),        %ecx
-        addl    %esi,           %ecx
-        movl    %eax,           %esi
-        movl    (%ebp),         %eax
-        movl    %edx,           12(%ebp)
-        addl    %edi,           %eax
-        movl    16(%ebp),       %edi
-        addl    %ebx,           %edi
-        movl    8(%ebp),        %ebx
-        addl    %esi,           %ebx
-        movl    %eax,           (%ebp)
-        movl    132(%esp),      %esi
-        movl    %ebx,           8(%ebp)
-        addl    $64,            %esi
-        movl    68(%esp),       %eax
-        movl    %edi,           16(%ebp)
-        cmpl    %eax,           %esi
-        movl    %ecx,           4(%ebp)
-        jb      .L000start
-        addl    $108,           %esp
-        popl    %edi
-        popl    %ebx
-        popl    %ebp
-        popl    %esi
-        ret
-.L_sha1_block_asm_data_order_end:
-        .size   sha1_block_asm_data_order,.L_sha1_block_asm_data_order_end-sha1_block_asm_data_order
-.ident  "desasm.pl"
-.text
-        .align 16
-.globl sha1_block_asm_host_order
-        .type   sha1_block_asm_host_order,@function
-sha1_block_asm_host_order:
-        movl    12(%esp),       %ecx
-        pushl   %esi
-        sall    $6,             %ecx
-        movl    12(%esp),       %esi
-        pushl   %ebp
-        addl    %esi,           %ecx
-        pushl   %ebx
-        movl    16(%esp),       %ebp
-        pushl   %edi
-        movl    12(%ebp),       %edx
-        subl    $108,           %esp
-        movl    16(%ebp),       %edi
-        movl    8(%ebp),        %ebx
-        movl    %ecx,           68(%esp)
-
-        movl    (%esi),         %eax
-        movl    4(%esi),        %ecx
-        movl    %eax,           (%esp)
-        movl    %ecx,           4(%esp)
-        movl    8(%esi),        %eax
-        movl    12(%esi),       %ecx
-        movl    %eax,           8(%esp)
-        movl    %ecx,           12(%esp)
-        movl    16(%esi),       %eax
-        movl    20(%esi),       %ecx
-        movl    %eax,           16(%esp)
-        movl    %ecx,           20(%esp)
-        movl    24(%esi),       %eax
-        movl    28(%esi),       %ecx
-        movl    %eax,           24(%esp)
-        movl    %ecx,           28(%esp)
-        movl    32(%esi),       %eax
-        movl    36(%esi),       %ecx
-        movl    %eax,           32(%esp)
-        movl    %ecx,           36(%esp)
-        movl    40(%esi),       %eax
-        movl    44(%esi),       %ecx
-        movl    %eax,           40(%esp)
-        movl    %ecx,           44(%esp)
-        movl    48(%esi),       %eax
-        movl    52(%esi),       %ecx
-        movl    %eax,           48(%esp)
-        movl    %ecx,           52(%esp)
-        movl    56(%esi),       %eax
-        movl    60(%esi),       %ecx
-        movl    %eax,           56(%esp)
-        movl    %ecx,           60(%esp)
-        jmp     .L001shortcut
-.L_sha1_block_asm_host_order_end:
-        .size   sha1_block_asm_host_order,.L_sha1_block_asm_host_order_end-sha1_block_asm_host_order
-.ident  "desasm.pl"
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_md32_common.h b/src/lib/libssl/src/fips-1.0/sha/fips_md32_common.h
deleted file mode 100644
index b5ad231e3a..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/fips_md32_common.h
+++ /dev/null
@@ -1,623 +0,0 @@
-/* crypto/md32_common.h */
-/* ====================================================================
- * Copyright (c) 1999-2002 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
- * This is a generic 32 bit "collector" for message digest algorithms.
- * Whenever needed it collects input character stream into chunks of
- * 32 bit values and invokes a block function that performs actual hash
- * calculations.
- *
- * Porting guide.
- *
- * Obligatory macros:
- *
- * DATA_ORDER_IS_BIG_ENDIAN or DATA_ORDER_IS_LITTLE_ENDIAN
- *      this macro defines byte order of input stream.
- * HASH_CBLOCK
- *      size of a unit chunk HASH_BLOCK operates on.
- * HASH_LONG
- *      has to be at lest 32 bit wide, if it's wider, then
- *      HASH_LONG_LOG2 *has to* be defined along
- * HASH_CTX
- *      context structure that at least contains following
- *      members:
- *              typedef struct {
- *                      ...
- *                      HASH_LONG       Nl,Nh;
- *                      HASH_LONG       data[HASH_LBLOCK];
- *                      unsigned int    num;
- *                      ...
- *                      } HASH_CTX;
- * HASH_UPDATE
- *      name of "Update" function, implemented here.
- * HASH_TRANSFORM
- *      name of "Transform" function, implemented here.
- * HASH_FINAL
- *      name of "Final" function, implemented here.
- * HASH_BLOCK_HOST_ORDER
- *      name of "block" function treating *aligned* input message
- *      in host byte order, implemented externally.
- * HASH_BLOCK_DATA_ORDER
- *      name of "block" function treating *unaligned* input message
- *      in original (data) byte order, implemented externally (it
- *      actually is optional if data and host are of the same
- *      "endianess").
- * HASH_MAKE_STRING
- *      macro convering context variables to an ASCII hash string.
- *
- * Optional macros:
- *
- * B_ENDIAN or L_ENDIAN
- *      defines host byte-order.
- * HASH_LONG_LOG2
- *      defaults to 2 if not states otherwise.
- * HASH_LBLOCK
- *      assumed to be HASH_CBLOCK/4 if not stated otherwise.
- * HASH_BLOCK_DATA_ORDER_ALIGNED
- *      alternative "block" function capable of treating
- *      aligned input message in original (data) order,
- *      implemented externally.
- *
- * MD5 example:
- *
- *      #define DATA_ORDER_IS_LITTLE_ENDIAN
- *
- *      #define HASH_LONG               MD5_LONG
- *      #define HASH_LONG_LOG2          MD5_LONG_LOG2
- *      #define HASH_CTX                MD5_CTX
- *      #define HASH_CBLOCK             MD5_CBLOCK
- *      #define HASH_LBLOCK             MD5_LBLOCK
- *      #define HASH_UPDATE             MD5_Update
- *      #define HASH_TRANSFORM          MD5_Transform
- *      #define HASH_FINAL              MD5_Final
- *      #define HASH_BLOCK_HOST_ORDER   md5_block_host_order
- *      #define HASH_BLOCK_DATA_ORDER   md5_block_data_order
- *
- *                                      <appro@fy.chalmers.se>
- */
-
-#if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-#error "DATA_ORDER must be defined!"
-#endif
-
-#ifndef HASH_CBLOCK
-#error "HASH_CBLOCK must be defined!"
-#endif
-#ifndef HASH_LONG
-#error "HASH_LONG must be defined!"
-#endif
-#ifndef HASH_CTX
-#error "HASH_CTX must be defined!"
-#endif
-
-#ifndef HASH_UPDATE
-#error "HASH_UPDATE must be defined!"
-#endif
-#ifndef HASH_TRANSFORM
-#error "HASH_TRANSFORM must be defined!"
-#endif
-#ifndef HASH_FINAL
-#error "HASH_FINAL must be defined!"
-#endif
-
-#ifndef HASH_BLOCK_HOST_ORDER
-#error "HASH_BLOCK_HOST_ORDER must be defined!"
-#endif
-
-#if 0
-/*
- * Moved below as it's required only if HASH_BLOCK_DATA_ORDER_ALIGNED
- * isn't defined.
- */
-#ifndef HASH_BLOCK_DATA_ORDER
-#error "HASH_BLOCK_DATA_ORDER must be defined!"
-#endif
-#endif
-
-#ifndef HASH_LBLOCK
-#define HASH_LBLOCK     (HASH_CBLOCK/4)
-#endif
-
-#ifndef HASH_LONG_LOG2
-#define HASH_LONG_LOG2  2
-#endif
-
-/*
- * Engage compiler specific rotate intrinsic function if available.
- */
-#undef ROTATE
-#ifndef PEDANTIC
-# if defined(_MSC_VER) || defined(__ICC)
-#  define ROTATE(a,n)   _lrotl(a,n)
-# elif defined(__MWERKS__)
-#  if defined(__POWERPC__)
-#   define ROTATE(a,n)  __rlwinm(a,n,0,31)
-#  elif defined(__MC68K__)
-    /* Motorola specific tweak. <appro@fy.chalmers.se> */
-#   define ROTATE(a,n)  ( n<24 ? __rol(a,n) : __ror(a,32-n) )
-#  else
-#   define ROTATE(a,n)  __rol(a,n)
-#  endif
-# elif defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-  /*
-   * Some GNU C inline assembler templates. Note that these are
-   * rotates by *constant* number of bits! But that's exactly
-   * what we need here...
-   *                                    <appro@fy.chalmers.se>
-   */
-#  if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
-                                asm (                   \
-                                "roll %1,%0"            \
-                                : "=r"(ret)             \
-                                : "I"(n), "0"(a)        \
-                                : "cc");                \
-                           ret;                         \
-                        })
-#  elif defined(__powerpc) || defined(__ppc__) || defined(__powerpc64__)
-#   define ROTATE(a,n)  ({ register unsigned int ret;   \
-                                asm (                   \
-                                "rlwinm %0,%1,%2,0,31"  \
-                                : "=r"(ret)             \
-                                : "r"(a), "I"(n));      \
-                           ret;                         \
-                        })
-#  endif
-# endif
-#endif /* PEDANTIC */
-
-#if HASH_LONG_LOG2==2   /* Engage only if sizeof(HASH_LONG)== 4 */
-/* A nice byte order reversal from Wei Dai <weidai@eskimo.com> */
-#ifdef ROTATE
-/* 5 instructions with rotate instruction, else 9 */
-#define REVERSE_FETCH32(a,l)    (                                       \
-                l=*(const HASH_LONG *)(a),                              \
-                ((ROTATE(l,8)&0x00FF00FF)|(ROTATE((l&0x00FF00FF),24)))  \
-                                )
-#else
-/* 6 instructions with rotate instruction, else 8 */
-#define REVERSE_FETCH32(a,l)    (                               \
-                l=*(const HASH_LONG *)(a),                      \
-                l=(((l>>8)&0x00FF00FF)|((l&0x00FF00FF)<<8)),    \
-                ROTATE(l,16)                                    \
-                                )
-/*
- * Originally the middle line started with l=(((l&0xFF00FF00)>>8)|...
- * It's rewritten as above for two reasons:
- *      - RISCs aren't good at long constants and have to explicitely
- *        compose 'em with several (well, usually 2) instructions in a
- *        register before performing the actual operation and (as you
- *        already realized:-) having same constant should inspire the
- *        compiler to permanently allocate the only register for it;
- *      - most modern CPUs have two ALUs, but usually only one has
- *        circuitry for shifts:-( this minor tweak inspires compiler
- *        to schedule shift instructions in a better way...
- *
- *                              <appro@fy.chalmers.se>
- */
-#endif
-#endif
-
-#ifndef ROTATE
-#define ROTATE(a,n)     (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
-#endif
-
-/*
- * Make some obvious choices. E.g., HASH_BLOCK_DATA_ORDER_ALIGNED
- * and HASH_BLOCK_HOST_ORDER ought to be the same if input data
- * and host are of the same "endianess". It's possible to mask
- * this with blank #define HASH_BLOCK_DATA_ORDER though...
- *
- *                              <appro@fy.chalmers.se>
- */
-#if defined(B_ENDIAN)
-#  if defined(DATA_ORDER_IS_BIG_ENDIAN)
-#    if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED) && HASH_LONG_LOG2==2
-#      define HASH_BLOCK_DATA_ORDER_ALIGNED     HASH_BLOCK_HOST_ORDER
-#    endif
-#  endif
-#elif defined(L_ENDIAN)
-#  if defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-#    if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED) && HASH_LONG_LOG2==2
-#      define HASH_BLOCK_DATA_ORDER_ALIGNED     HASH_BLOCK_HOST_ORDER
-#    endif
-#  endif
-#endif
-
-#if !defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
-#ifndef HASH_BLOCK_DATA_ORDER
-#error "HASH_BLOCK_DATA_ORDER must be defined!"
-#endif
-#endif
-
-#if defined(DATA_ORDER_IS_BIG_ENDIAN)
-
-#ifndef PEDANTIC
-# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#  if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-    /*
-     * This gives ~30-40% performance improvement in SHA-256 compiled
-     * with gcc [on P4]. Well, first macro to be frank. We can pull
-     * this trick on x86* platforms only, because these CPUs can fetch
-     * unaligned data without raising an exception.
-     */
-#   define HOST_c2l(c,l)        ({ unsigned int r=*((const unsigned int *)(c)); \
-                                   asm ("bswapl %0":"=r"(r):"0"(r));    \
-                                   (c)+=4; (l)=r;                       })
-#   define HOST_l2c(l,c)        ({ unsigned int r=(l);                  \
-                                   asm ("bswapl %0":"=r"(r):"0"(r));    \
-                                   *((unsigned int *)(c))=r; (c)+=4; r; })
-#  endif
-# endif
-#endif
-
-#ifndef HOST_c2l
-#define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))<<24),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))    ),          \
-                         l)
-#endif
-#define HOST_p_c2l(c,l,n)       {                                       \
-                        switch (n) {                                    \
-                        case 0: l =((unsigned long)(*((c)++)))<<24;     \
-                        case 1: l|=((unsigned long)(*((c)++)))<<16;     \
-                        case 2: l|=((unsigned long)(*((c)++)))<< 8;     \
-                        case 3: l|=((unsigned long)(*((c)++)));         \
-                                } }
-#define HOST_p_c2l_p(c,l,sc,len) {                                      \
-                        switch (sc) {                                   \
-                        case 0: l =((unsigned long)(*((c)++)))<<24;     \
-                                if (--len == 0) break;                  \
-                        case 1: l|=((unsigned long)(*((c)++)))<<16;     \
-                                if (--len == 0) break;                  \
-                        case 2: l|=((unsigned long)(*((c)++)))<< 8;     \
-                                } }
-/* NOTE the pointer is not incremented at the end of this */
-#define HOST_c2l_p(c,l,n)       {                                       \
-                        l=0; (c)+=n;                                    \
-                        switch (n) {                                    \
-                        case 3: l =((unsigned long)(*(--(c))))<< 8;     \
-                        case 2: l|=((unsigned long)(*(--(c))))<<16;     \
-                        case 1: l|=((unsigned long)(*(--(c))))<<24;     \
-                                } }
-#ifndef HOST_l2c
-#define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         l)
-#endif
-
-#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-
-#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
-  /* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */
-# define HOST_c2l(c,l)  ((l)=*((const unsigned int *)(c)), (c)+=4, l)
-# define HOST_l2c(l,c)  (*((unsigned int *)(c))=(l), (c)+=4, l)
-#endif
-
-#ifndef HOST_c2l
-#define HOST_c2l(c,l)   (l =(((unsigned long)(*((c)++)))    ),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<<24),          \
-                         l)
-#endif
-#define HOST_p_c2l(c,l,n)       {                                       \
-                        switch (n) {                                    \
-                        case 0: l =((unsigned long)(*((c)++)));         \
-                        case 1: l|=((unsigned long)(*((c)++)))<< 8;     \
-                        case 2: l|=((unsigned long)(*((c)++)))<<16;     \
-                        case 3: l|=((unsigned long)(*((c)++)))<<24;     \
-                                } }
-#define HOST_p_c2l_p(c,l,sc,len) {                                      \
-                        switch (sc) {                                   \
-                        case 0: l =((unsigned long)(*((c)++)));         \
-                                if (--len == 0) break;                  \
-                        case 1: l|=((unsigned long)(*((c)++)))<< 8;     \
-                                if (--len == 0) break;                  \
-                        case 2: l|=((unsigned long)(*((c)++)))<<16;     \
-                                } }
-/* NOTE the pointer is not incremented at the end of this */
-#define HOST_c2l_p(c,l,n)       {                                       \
-                        l=0; (c)+=n;                                    \
-                        switch (n) {                                    \
-                        case 3: l =((unsigned long)(*(--(c))))<<16;     \
-                        case 2: l|=((unsigned long)(*(--(c))))<< 8;     \
-                        case 1: l|=((unsigned long)(*(--(c))));         \
-                                } }
-#ifndef HOST_l2c
-#define HOST_l2c(l,c)   (*((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         l)
-#endif
-
-#endif
-
-/*
- * Time for some action:-)
- */
-
-int HASH_UPDATE (HASH_CTX *c, const void *data_, size_t len)
-        {
-        const unsigned char *data=data_;
-        register HASH_LONG * p;
-        register HASH_LONG l;
-        size_t sw,sc,ew,ec;
-
-        if(FIPS_selftest_failed())
-                return 0;
-
-        if (len==0) return 1;
-
-        l=(c->Nl+(((HASH_LONG)len)<<3))&0xffffffffUL;
-        /* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
-         * Wei Dai <weidai@eskimo.com> for pointing it out. */
-        if (l < c->Nl) /* overflow */
-                c->Nh++;
-        c->Nh+=(len>>29);       /* might cause compiler warning on 16-bit */
-        c->Nl=l;
-
-        if (c->num != 0)
-                {
-                p=c->data;
-                sw=c->num>>2;
-                sc=c->num&0x03;
-
-                if ((c->num+len) >= HASH_CBLOCK)
-                        {
-                        l=p[sw]; HOST_p_c2l(data,l,sc); p[sw++]=l;
-                        for (; sw<HASH_LBLOCK; sw++)
-                                {
-                                HOST_c2l(data,l); p[sw]=l;
-                                }
-                        HASH_BLOCK_HOST_ORDER (c,p,1);
-                        len-=(HASH_CBLOCK-c->num);
-                        c->num=0;
-                        /* drop through and do the rest */
-                        }
-                else
-                        {
-                        c->num+=(unsigned int)len;
-                        if ((sc+len) < 4) /* ugly, add char's to a word */
-                                {
-                                l=p[sw]; HOST_p_c2l_p(data,l,sc,len); p[sw]=l;
-                                }
-                        else
-                                {
-                                ew=(c->num>>2);
-                                ec=(c->num&0x03);
-                                if (sc)
-                                        l=p[sw];
-                                HOST_p_c2l(data,l,sc);
-                                p[sw++]=l;
-                                for (; sw < ew; sw++)
-                                        {
-                                        HOST_c2l(data,l); p[sw]=l;
-                                        }
-                                if (ec)
-                                        {
-                                        HOST_c2l_p(data,l,ec); p[sw]=l;
-                                        }
-                                }
-                        return 1;
-                        }
-                }
-
-        sw=len/HASH_CBLOCK;
-        if (sw > 0)
-                {
-#if defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
-                /*
-                 * Note that HASH_BLOCK_DATA_ORDER_ALIGNED gets defined
-                 * only if sizeof(HASH_LONG)==4.
-                 */
-                if ((((size_t)data)%4) == 0)
-                        {
-                        /* data is properly aligned so that we can cast it: */
-                        HASH_BLOCK_DATA_ORDER_ALIGNED (c,(const HASH_LONG *)data,sw);
-                        sw*=HASH_CBLOCK;
-                        data+=sw;
-                        len-=sw;
-                        }
-                else
-#if !defined(HASH_BLOCK_DATA_ORDER)
-                        while (sw--)
-                                {
-                                memcpy (p=c->data,data,HASH_CBLOCK);
-                                HASH_BLOCK_DATA_ORDER_ALIGNED(c,p,1);
-                                data+=HASH_CBLOCK;
-                                len-=HASH_CBLOCK;
-                                }
-#endif
-#endif
-#if defined(HASH_BLOCK_DATA_ORDER)
-                        {
-                        HASH_BLOCK_DATA_ORDER(c,data,sw);
-                        sw*=HASH_CBLOCK;
-                        data+=sw;
-                        len-=sw;
-                        }
-#endif
-                }
-
-        if (len!=0)
-                {
-                p = c->data;
-                c->num = len;
-                ew=len>>2;      /* words to copy */
-                ec=len&0x03;
-                for (; ew; ew--,p++)
-                        {
-                        HOST_c2l(data,l); *p=l;
-                        }
-                HOST_c2l_p(data,l,ec);
-                *p=l;
-                }
-        return 1;
-        }
-
-
-void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data)
-        {
-#if defined(HASH_BLOCK_DATA_ORDER_ALIGNED)
-        if ((((size_t)data)%4) == 0)
-                /* data is properly aligned so that we can cast it: */
-                HASH_BLOCK_DATA_ORDER_ALIGNED (c,(const HASH_LONG *)data,1);
-        else
-#if !defined(HASH_BLOCK_DATA_ORDER)
-                {
-                memcpy (c->data,data,HASH_CBLOCK);
-                HASH_BLOCK_DATA_ORDER_ALIGNED (c,c->data,1);
-                }
-#endif
-#endif
-#if defined(HASH_BLOCK_DATA_ORDER)
-        HASH_BLOCK_DATA_ORDER (c,data,1);
-#endif
-        }
-
-
-int HASH_FINAL (unsigned char *md, HASH_CTX *c)
-        {
-        register HASH_LONG *p;
-        register unsigned long l;
-        register int i,j;
-        static const unsigned char end[4]={0x80,0x00,0x00,0x00};
-        const unsigned char *cp=end;
-
-        /* c->num should definitly have room for at least one more byte. */
-        p=c->data;
-        i=c->num>>2;
-        j=c->num&0x03;
-
-#if 0
-        /* purify often complains about the following line as an
-         * Uninitialized Memory Read.  While this can be true, the
-         * following p_c2l macro will reset l when that case is true.
-         * This is because j&0x03 contains the number of 'valid' bytes
-         * already in p[i].  If and only if j&0x03 == 0, the UMR will
-         * occur but this is also the only time p_c2l will do
-         * l= *(cp++) instead of l|= *(cp++)
-         * Many thanks to Alex Tang <altitude@cic.net> for pickup this
-         * 'potential bug' */
-#ifdef PURIFY
-        if (j==0) p[i]=0; /* Yeah, but that's not the way to fix it:-) */
-#endif
-        l=p[i];
-#else
-        l = (j==0) ? 0 : p[i];
-#endif
-        HOST_p_c2l(cp,l,j); p[i++]=l; /* i is the next 'undefined word' */
-
-        if (i>(HASH_LBLOCK-2)) /* save room for Nl and Nh */
-                {
-                if (i<HASH_LBLOCK) p[i]=0;
-                HASH_BLOCK_HOST_ORDER (c,p,1);
-                i=0;
-                }
-        for (; i<(HASH_LBLOCK-2); i++)
-                p[i]=0;
-
-#if   defined(DATA_ORDER_IS_BIG_ENDIAN)
-        p[HASH_LBLOCK-2]=c->Nh;
-        p[HASH_LBLOCK-1]=c->Nl;
-#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-        p[HASH_LBLOCK-2]=c->Nl;
-        p[HASH_LBLOCK-1]=c->Nh;
-#endif
-        HASH_BLOCK_HOST_ORDER (c,p,1);
-
-#ifndef HASH_MAKE_STRING
-#error "HASH_MAKE_STRING must be defined!"
-#else
-        HASH_MAKE_STRING(c,md);
-#endif
-
-        c->num=0;
-        /* clear stuff, HASH_BLOCK may be leaving some stuff on the stack
-         * but I'm not worried :-)
-        OPENSSL_cleanse((void *)c,sizeof(HASH_CTX));
-         */
-        return 1;
-        }
-
-#ifndef MD32_REG_T
-#define MD32_REG_T long
-/*
- * This comment was originaly written for MD5, which is why it
- * discusses A-D. But it basically applies to all 32-bit digests,
- * which is why it was moved to common header file.
- *
- * In case you wonder why A-D are declared as long and not
- * as MD5_LONG. Doing so results in slight performance
- * boost on LP64 architectures. The catch is we don't
- * really care if 32 MSBs of a 64-bit register get polluted
- * with eventual overflows as we *save* only 32 LSBs in
- * *either* case. Now declaring 'em long excuses the compiler
- * from keeping 32 MSBs zeroed resulting in 13% performance
- * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
- * Well, to be honest it should say that this *prevents* 
- * performance degradation.
- *                              <appro@fy.chalmers.se>
- * Apparently there're LP64 compilers that generate better
- * code if A-D are declared int. Most notably GCC-x86_64
- * generates better code.
- *                              <appro@fy.chalmers.se>
- */
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_sha.h b/src/lib/libssl/src/fips-1.0/sha/fips_sha.h
deleted file mode 100644
index 4520b06ce1..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/fips_sha.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/* fips/sha1/fips_sha.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SHA_H
-#define HEADER_SHA_H
-
-#include <openssl/e_os2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
-#error SHA is disabled.
-#endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-#if defined(OPENSSL_SYS_WIN16) || defined(__LP32__)
-#define SHA_LONG unsigned long
-#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#define SHA_LONG unsigned long
-#define SHA_LONG_LOG2 3
-#else
-#define SHA_LONG unsigned int
-#endif
-
-#define SHA_LBLOCK      16
-#define SHA_CBLOCK      (SHA_LBLOCK*4)  /* SHA treats input data as a
-                                         * contiguous array of 32 bit
-                                         * wide big-endian values. */
-#define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-#define SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st
-        {
-        SHA_LONG h0,h1,h2,h3,h4;
-        SHA_LONG Nl,Nh;
-        SHA_LONG data[SHA_LBLOCK];
-        unsigned int num;
-        } SHA_CTX;
-
-#ifndef OPENSSL_NO_SHA1
-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);
-unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
-void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
-#endif
-
-#define SHA256_CBLOCK   (SHA_LBLOCK*4)  /* SHA-256 treats input data as a
-                                         * contiguous array of 32 bit
-                                         * wide big-endian values. */
-#define SHA224_DIGEST_LENGTH    28
-#define SHA256_DIGEST_LENGTH    32
-
-typedef struct SHA256state_st
-        {
-        SHA_LONG h[8];
-        SHA_LONG Nl,Nh;
-        SHA_LONG data[SHA_LBLOCK];
-        unsigned int num,md_len;
-        } SHA256_CTX;
-
-#ifndef OPENSSL_NO_SHA256
-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);
-unsigned char *SHA224(const unsigned char *d, size_t n,unsigned char *md);
-int SHA256_Init(SHA256_CTX *c);
-int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA256_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA256(const unsigned char *d, size_t n,unsigned char *md);
-void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
-#endif
-
-#define SHA384_DIGEST_LENGTH    48
-#define SHA512_DIGEST_LENGTH    64
-
-/*
- * Unlike 32-bit digest algorithms, SHA-512 *relies* on SHA_LONG64
- * being exactly 64-bit wide. See Implementation Notes in sha512.c
- * for further details.
- */
-#define SHA512_CBLOCK   (SHA_LBLOCK*8)  /* SHA-512 treats input data as a
-                                         * contiguous array of 64 bit
-                                         * wide big-endian values. */
-#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#define SHA_LONG64 unsigned __int64
-#define U64(C)     C##UI64
-#elif defined(__arch64__)
-#define SHA_LONG64 unsigned long
-#define U64(C)     C##UL
-#else
-#define SHA_LONG64 unsigned long long
-#define U64(C)     C##ULL
-#endif
-
-typedef struct SHA512state_st
-        {
-        SHA_LONG64 h[8];
-        SHA_LONG64 Nl,Nh;
-        union {
-                SHA_LONG64      d[SHA_LBLOCK];
-                unsigned char   p[SHA512_CBLOCK];
-        } u;
-        unsigned int num,md_len;
-        } SHA512_CTX;
-
-#ifndef OPENSSL_NO_SHA512
-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);
-unsigned char *SHA384(const unsigned char *d, size_t n,unsigned char *md);
-int SHA512_Init(SHA512_CTX *c);
-int SHA512_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA512_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA512(const unsigned char *d, size_t n,unsigned char *md);
-void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_sha1dgst.c b/src/lib/libssl/src/fips-1.0/sha/fips_sha1dgst.c
deleted file mode 100644
index fb9e15453c..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/fips_sha1dgst.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* crypto/sha/sha1dgst.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#if !defined(OPENSSL_NO_SHA1) && !defined(OPENSSL_NO_SHA)
-
-#undef  SHA_0
-#define SHA_1
-
-#include <openssl/opensslv.h>
-#include <openssl/opensslconf.h>
-#include <openssl/crypto.h>
-
-#ifdef OPENSSL_FIPS
-const char SHA1_version[]="SHA1" OPENSSL_VERSION_PTEXT;
-
-/* The implementation is in fips_md32_common.h */
-#include "fips_sha_locl.h"
-
-unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md)
-        {
-        SHA_CTX c;
-        static unsigned char m[SHA_DIGEST_LENGTH];
-
-        OPENSSL_assert(sizeof(unsigned long)<=sizeof(size_t));
-        if (md == NULL) md=m;
-        if (!SHA1_Init(&c))
-                return NULL;
-        SHA1_Update(&c,d,n);
-        SHA1_Final(md,&c);
-        OPENSSL_cleanse(&c,sizeof(c));
-        return(md);
-        }
-
-#else /* ndef OPENSSL_FIPS */
-
-static void *dummy=&dummy;
-
-#endif /* ndef OPENSSL_FIPS */
-
-#endif
-
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_sha_locl.h b/src/lib/libssl/src/fips-1.0/sha/fips_sha_locl.h
deleted file mode 100644
index bf31d3b845..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/fips_sha_locl.h
+++ /dev/null
@@ -1,482 +0,0 @@
-/* crypto/sha/sha_locl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <openssl/opensslconf.h>
-#include <openssl/fips_sha.h>
-#include <openssl/fips.h>
-
-#ifndef SHA_LONG_LOG2
-#define SHA_LONG_LOG2   2       /* default to 32 bits */
-#endif
-
-#define DATA_ORDER_IS_BIG_ENDIAN
-
-#define HASH_LONG               SHA_LONG
-#define HASH_LONG_LOG2          SHA_LONG_LOG2
-#define HASH_CTX                SHA_CTX
-#define HASH_CBLOCK             SHA_CBLOCK
-#define HASH_LBLOCK             SHA_LBLOCK
-#define HASH_MAKE_STRING(c,s)   do {    \
-        unsigned long ll;               \
-        ll=(c)->h0; HOST_l2c(ll,(s));   \
-        ll=(c)->h1; HOST_l2c(ll,(s));   \
-        ll=(c)->h2; HOST_l2c(ll,(s));   \
-        ll=(c)->h3; HOST_l2c(ll,(s));   \
-        ll=(c)->h4; HOST_l2c(ll,(s));   \
-        } while (0)
-
-#if defined(SHA_0)
-
-# define HASH_UPDATE                    SHA_Update
-# define HASH_TRANSFORM                 SHA_Transform
-# define HASH_FINAL                     SHA_Final
-# define HASH_INIT                      SHA_Init
-# define HASH_BLOCK_HOST_ORDER          sha_block_host_order
-# define HASH_BLOCK_DATA_ORDER          sha_block_data_order
-# define Xupdate(a,ix,ia,ib,ic,id)      (ix=(a)=(ia^ib^ic^id))
-
-  void sha_block_host_order (SHA_CTX *c, const void *p,size_t num);
-  void sha_block_data_order (SHA_CTX *c, const void *p,size_t num);
-
-#elif defined(SHA_1)
-
-# define HASH_UPDATE                    SHA1_Update
-# define HASH_TRANSFORM                 SHA1_Transform
-# define HASH_FINAL                     SHA1_Final
-# define HASH_INIT                      SHA1_Init
-# define HASH_BLOCK_HOST_ORDER          sha1_block_host_order
-# define HASH_BLOCK_DATA_ORDER          sha1_block_data_order
-# if defined(__MWERKS__) && defined(__MC68K__)
-   /* Metrowerks for Motorola fails otherwise:-( <appro@fy.chalmers.se> */
-#  define Xupdate(a,ix,ia,ib,ic,id)     do { (a)=(ia^ib^ic^id);         \
-                                             ix=(a)=ROTATE((a),1);      \
-                                        } while (0)
-# else
-#  define Xupdate(a,ix,ia,ib,ic,id)     ( (a)=(ia^ib^ic^id),    \
-                                          ix=(a)=ROTATE((a),1)  \
-                                        )
-# endif
-
-# ifdef SHA1_ASM
-#  if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__INTEL__)
-#   define sha1_block_host_order                sha1_block_asm_host_order
-#   define DONT_IMPLEMENT_BLOCK_HOST_ORDER
-#   define sha1_block_data_order                sha1_block_asm_data_order
-#   define DONT_IMPLEMENT_BLOCK_DATA_ORDER
-#   define HASH_BLOCK_DATA_ORDER_ALIGNED        sha1_block_asm_data_order
-#  endif
-# endif
-  void sha1_block_host_order (SHA_CTX *c, const void *p,size_t num);
-  void sha1_block_data_order (SHA_CTX *c, const void *p,size_t num);
-
-#else
-# error "Either SHA_0 or SHA_1 must be defined."
-#endif
-
-#include "fips_md32_common.h"
-
-#define INIT_DATA_h0 0x67452301UL
-#define INIT_DATA_h1 0xefcdab89UL
-#define INIT_DATA_h2 0x98badcfeUL
-#define INIT_DATA_h3 0x10325476UL
-#define INIT_DATA_h4 0xc3d2e1f0UL
-
-int HASH_INIT (SHA_CTX *c)
-        {
-        /* This assert denotes binary compatibility in 0.9.7 context
-           and commonly optimized away by compiler. */
-        OPENSSL_assert(sizeof(unsigned long)<=sizeof(size_t));
-        c->h0=INIT_DATA_h0;
-        c->h1=INIT_DATA_h1;
-        c->h2=INIT_DATA_h2;
-        c->h3=INIT_DATA_h3;
-        c->h4=INIT_DATA_h4;
-        c->Nl=0;
-        c->Nh=0;
-        c->num=0;
-        return 1;
-        }
-
-#define K_00_19 0x5a827999UL
-#define K_20_39 0x6ed9eba1UL
-#define K_40_59 0x8f1bbcdcUL
-#define K_60_79 0xca62c1d6UL
-
-/* As  pointed out by Wei Dai <weidai@eskimo.com>, F() below can be
- * simplified to the code in F_00_19.  Wei attributes these optimisations
- * to Peter Gutmann's SHS code, and he attributes it to Rich Schroeppel.
- * #define F(x,y,z) (((x) & (y))  |  ((~(x)) & (z)))
- * I've just become aware of another tweak to be made, again from Wei Dai,
- * in F_40_59, (x&a)|(y&a) -> (x|y)&a
- */
-#define F_00_19(b,c,d)  ((((c) ^ (d)) & (b)) ^ (d)) 
-#define F_20_39(b,c,d)  ((b) ^ (c) ^ (d))
-#define F_40_59(b,c,d)  (((b) & (c)) | (((b)|(c)) & (d))) 
-#define F_60_79(b,c,d)  F_20_39(b,c,d)
-
-#define BODY_00_15(i,a,b,c,d,e,f,xi) \
-        (f)=xi+(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-#define BODY_16_19(i,a,b,c,d,e,f,xi,xa,xb,xc,xd) \
-        Xupdate(f,xi,xa,xb,xc,xd); \
-        (f)+=(e)+K_00_19+ROTATE((a),5)+F_00_19((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-#define BODY_20_31(i,a,b,c,d,e,f,xi,xa,xb,xc,xd) \
-        Xupdate(f,xi,xa,xb,xc,xd); \
-        (f)+=(e)+K_20_39+ROTATE((a),5)+F_20_39((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-#define BODY_32_39(i,a,b,c,d,e,f,xa,xb,xc,xd) \
-        Xupdate(f,xa,xa,xb,xc,xd); \
-        (f)+=(e)+K_20_39+ROTATE((a),5)+F_20_39((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-#define BODY_40_59(i,a,b,c,d,e,f,xa,xb,xc,xd) \
-        Xupdate(f,xa,xa,xb,xc,xd); \
-        (f)+=(e)+K_40_59+ROTATE((a),5)+F_40_59((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-#define BODY_60_79(i,a,b,c,d,e,f,xa,xb,xc,xd) \
-        Xupdate(f,xa,xa,xb,xc,xd); \
-        (f)=xa+(e)+K_60_79+ROTATE((a),5)+F_60_79((b),(c),(d)); \
-        (b)=ROTATE((b),30);
-
-#ifdef X
-#undef X
-#endif
-#ifndef MD32_XARRAY
-  /*
-   * Originally X was an array. As it's automatic it's natural
-   * to expect RISC compiler to accomodate at least part of it in
-   * the register bank, isn't it? Unfortunately not all compilers
-   * "find" this expectation reasonable:-( On order to make such
-   * compilers generate better code I replace X[] with a bunch of
-   * X0, X1, etc. See the function body below...
-   *                                    <appro@fy.chalmers.se>
-   */
-# define X(i)   XX##i
-#else
-  /*
-   * However! Some compilers (most notably HP C) get overwhelmed by
-   * that many local variables so that we have to have the way to
-   * fall down to the original behavior.
-   */
-# define X(i)   XX[i]
-#endif
-
-#ifndef DONT_IMPLEMENT_BLOCK_HOST_ORDER
-void HASH_BLOCK_HOST_ORDER (SHA_CTX *c, const void *d, size_t num)
-        {
-        const SHA_LONG *W=d;
-        register unsigned MD32_REG_T A,B,C,D,E,T;
-#ifndef MD32_XARRAY
-        unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
-                                XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15;
-#else
-        SHA_LONG        XX[16];
-#endif
-
-        if(FIPS_selftest_failed())
-            return;
-
-        A=c->h0;
-        B=c->h1;
-        C=c->h2;
-        D=c->h3;
-        E=c->h4;
-
-        for (;;)
-                {
-        BODY_00_15( 0,A,B,C,D,E,T,W[ 0]);
-        BODY_00_15( 1,T,A,B,C,D,E,W[ 1]);
-        BODY_00_15( 2,E,T,A,B,C,D,W[ 2]);
-        BODY_00_15( 3,D,E,T,A,B,C,W[ 3]);
-        BODY_00_15( 4,C,D,E,T,A,B,W[ 4]);
-        BODY_00_15( 5,B,C,D,E,T,A,W[ 5]);
-        BODY_00_15( 6,A,B,C,D,E,T,W[ 6]);
-        BODY_00_15( 7,T,A,B,C,D,E,W[ 7]);
-        BODY_00_15( 8,E,T,A,B,C,D,W[ 8]);
-        BODY_00_15( 9,D,E,T,A,B,C,W[ 9]);
-        BODY_00_15(10,C,D,E,T,A,B,W[10]);
-        BODY_00_15(11,B,C,D,E,T,A,W[11]);
-        BODY_00_15(12,A,B,C,D,E,T,W[12]);
-        BODY_00_15(13,T,A,B,C,D,E,W[13]);
-        BODY_00_15(14,E,T,A,B,C,D,W[14]);
-        BODY_00_15(15,D,E,T,A,B,C,W[15]);
-
-        BODY_16_19(16,C,D,E,T,A,B,X( 0),W[ 0],W[ 2],W[ 8],W[13]);
-        BODY_16_19(17,B,C,D,E,T,A,X( 1),W[ 1],W[ 3],W[ 9],W[14]);
-        BODY_16_19(18,A,B,C,D,E,T,X( 2),W[ 2],W[ 4],W[10],W[15]);
-        BODY_16_19(19,T,A,B,C,D,E,X( 3),W[ 3],W[ 5],W[11],X( 0));
-
-        BODY_20_31(20,E,T,A,B,C,D,X( 4),W[ 4],W[ 6],W[12],X( 1));
-        BODY_20_31(21,D,E,T,A,B,C,X( 5),W[ 5],W[ 7],W[13],X( 2));
-        BODY_20_31(22,C,D,E,T,A,B,X( 6),W[ 6],W[ 8],W[14],X( 3));
-        BODY_20_31(23,B,C,D,E,T,A,X( 7),W[ 7],W[ 9],W[15],X( 4));
-        BODY_20_31(24,A,B,C,D,E,T,X( 8),W[ 8],W[10],X( 0),X( 5));
-        BODY_20_31(25,T,A,B,C,D,E,X( 9),W[ 9],W[11],X( 1),X( 6));
-        BODY_20_31(26,E,T,A,B,C,D,X(10),W[10],W[12],X( 2),X( 7));
-        BODY_20_31(27,D,E,T,A,B,C,X(11),W[11],W[13],X( 3),X( 8));
-        BODY_20_31(28,C,D,E,T,A,B,X(12),W[12],W[14],X( 4),X( 9));
-        BODY_20_31(29,B,C,D,E,T,A,X(13),W[13],W[15],X( 5),X(10));
-        BODY_20_31(30,A,B,C,D,E,T,X(14),W[14],X( 0),X( 6),X(11));
-        BODY_20_31(31,T,A,B,C,D,E,X(15),W[15],X( 1),X( 7),X(12));
-
-        BODY_32_39(32,E,T,A,B,C,D,X( 0),X( 2),X( 8),X(13));
-        BODY_32_39(33,D,E,T,A,B,C,X( 1),X( 3),X( 9),X(14));
-        BODY_32_39(34,C,D,E,T,A,B,X( 2),X( 4),X(10),X(15));
-        BODY_32_39(35,B,C,D,E,T,A,X( 3),X( 5),X(11),X( 0));
-        BODY_32_39(36,A,B,C,D,E,T,X( 4),X( 6),X(12),X( 1));
-        BODY_32_39(37,T,A,B,C,D,E,X( 5),X( 7),X(13),X( 2));
-        BODY_32_39(38,E,T,A,B,C,D,X( 6),X( 8),X(14),X( 3));
-        BODY_32_39(39,D,E,T,A,B,C,X( 7),X( 9),X(15),X( 4));
-
-        BODY_40_59(40,C,D,E,T,A,B,X( 8),X(10),X( 0),X( 5));
-        BODY_40_59(41,B,C,D,E,T,A,X( 9),X(11),X( 1),X( 6));
-        BODY_40_59(42,A,B,C,D,E,T,X(10),X(12),X( 2),X( 7));
-        BODY_40_59(43,T,A,B,C,D,E,X(11),X(13),X( 3),X( 8));
-        BODY_40_59(44,E,T,A,B,C,D,X(12),X(14),X( 4),X( 9));
-        BODY_40_59(45,D,E,T,A,B,C,X(13),X(15),X( 5),X(10));
-        BODY_40_59(46,C,D,E,T,A,B,X(14),X( 0),X( 6),X(11));
-        BODY_40_59(47,B,C,D,E,T,A,X(15),X( 1),X( 7),X(12));
-        BODY_40_59(48,A,B,C,D,E,T,X( 0),X( 2),X( 8),X(13));
-        BODY_40_59(49,T,A,B,C,D,E,X( 1),X( 3),X( 9),X(14));
-        BODY_40_59(50,E,T,A,B,C,D,X( 2),X( 4),X(10),X(15));
-        BODY_40_59(51,D,E,T,A,B,C,X( 3),X( 5),X(11),X( 0));
-        BODY_40_59(52,C,D,E,T,A,B,X( 4),X( 6),X(12),X( 1));
-        BODY_40_59(53,B,C,D,E,T,A,X( 5),X( 7),X(13),X( 2));
-        BODY_40_59(54,A,B,C,D,E,T,X( 6),X( 8),X(14),X( 3));
-        BODY_40_59(55,T,A,B,C,D,E,X( 7),X( 9),X(15),X( 4));
-        BODY_40_59(56,E,T,A,B,C,D,X( 8),X(10),X( 0),X( 5));
-        BODY_40_59(57,D,E,T,A,B,C,X( 9),X(11),X( 1),X( 6));
-        BODY_40_59(58,C,D,E,T,A,B,X(10),X(12),X( 2),X( 7));
-        BODY_40_59(59,B,C,D,E,T,A,X(11),X(13),X( 3),X( 8));
-
-        BODY_60_79(60,A,B,C,D,E,T,X(12),X(14),X( 4),X( 9));
-        BODY_60_79(61,T,A,B,C,D,E,X(13),X(15),X( 5),X(10));
-        BODY_60_79(62,E,T,A,B,C,D,X(14),X( 0),X( 6),X(11));
-        BODY_60_79(63,D,E,T,A,B,C,X(15),X( 1),X( 7),X(12));
-        BODY_60_79(64,C,D,E,T,A,B,X( 0),X( 2),X( 8),X(13));
-        BODY_60_79(65,B,C,D,E,T,A,X( 1),X( 3),X( 9),X(14));
-        BODY_60_79(66,A,B,C,D,E,T,X( 2),X( 4),X(10),X(15));
-        BODY_60_79(67,T,A,B,C,D,E,X( 3),X( 5),X(11),X( 0));
-        BODY_60_79(68,E,T,A,B,C,D,X( 4),X( 6),X(12),X( 1));
-        BODY_60_79(69,D,E,T,A,B,C,X( 5),X( 7),X(13),X( 2));
-        BODY_60_79(70,C,D,E,T,A,B,X( 6),X( 8),X(14),X( 3));
-        BODY_60_79(71,B,C,D,E,T,A,X( 7),X( 9),X(15),X( 4));
-        BODY_60_79(72,A,B,C,D,E,T,X( 8),X(10),X( 0),X( 5));
-        BODY_60_79(73,T,A,B,C,D,E,X( 9),X(11),X( 1),X( 6));
-        BODY_60_79(74,E,T,A,B,C,D,X(10),X(12),X( 2),X( 7));
-        BODY_60_79(75,D,E,T,A,B,C,X(11),X(13),X( 3),X( 8));
-        BODY_60_79(76,C,D,E,T,A,B,X(12),X(14),X( 4),X( 9));
-        BODY_60_79(77,B,C,D,E,T,A,X(13),X(15),X( 5),X(10));
-        BODY_60_79(78,A,B,C,D,E,T,X(14),X( 0),X( 6),X(11));
-        BODY_60_79(79,T,A,B,C,D,E,X(15),X( 1),X( 7),X(12));
-        
-        c->h0=(c->h0+E)&0xffffffffL; 
-        c->h1=(c->h1+T)&0xffffffffL;
-        c->h2=(c->h2+A)&0xffffffffL;
-        c->h3=(c->h3+B)&0xffffffffL;
-        c->h4=(c->h4+C)&0xffffffffL;
-
-        if (--num == 0) break;
-
-        A=c->h0;
-        B=c->h1;
-        C=c->h2;
-        D=c->h3;
-        E=c->h4;
-
-        W+=SHA_LBLOCK;
-                }
-        }
-#endif
-
-#ifndef DONT_IMPLEMENT_BLOCK_DATA_ORDER
-void HASH_BLOCK_DATA_ORDER (SHA_CTX *c, const void *p, size_t num)
-        {
-        const unsigned char *data=p;
-        register unsigned MD32_REG_T A,B,C,D,E,T,l;
-#ifndef MD32_XARRAY
-        unsigned MD32_REG_T     XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7,
-                                XX8, XX9,XX10,XX11,XX12,XX13,XX14,XX15;
-#else
-        SHA_LONG        XX[16];
-#endif
-
-        if(FIPS_selftest_failed())
-            return;
-
-        A=c->h0;
-        B=c->h1;
-        C=c->h2;
-        D=c->h3;
-        E=c->h4;
-
-        for (;;)
-                {
-
-        HOST_c2l(data,l); X( 0)=l;              HOST_c2l(data,l); X( 1)=l;
-        BODY_00_15( 0,A,B,C,D,E,T,X( 0));       HOST_c2l(data,l); X( 2)=l;
-        BODY_00_15( 1,T,A,B,C,D,E,X( 1));       HOST_c2l(data,l); X( 3)=l;
-        BODY_00_15( 2,E,T,A,B,C,D,X( 2));       HOST_c2l(data,l); X( 4)=l;
-        BODY_00_15( 3,D,E,T,A,B,C,X( 3));       HOST_c2l(data,l); X( 5)=l;
-        BODY_00_15( 4,C,D,E,T,A,B,X( 4));       HOST_c2l(data,l); X( 6)=l;
-        BODY_00_15( 5,B,C,D,E,T,A,X( 5));       HOST_c2l(data,l); X( 7)=l;
-        BODY_00_15( 6,A,B,C,D,E,T,X( 6));       HOST_c2l(data,l); X( 8)=l;
-        BODY_00_15( 7,T,A,B,C,D,E,X( 7));       HOST_c2l(data,l); X( 9)=l;
-        BODY_00_15( 8,E,T,A,B,C,D,X( 8));       HOST_c2l(data,l); X(10)=l;
-        BODY_00_15( 9,D,E,T,A,B,C,X( 9));       HOST_c2l(data,l); X(11)=l;
-        BODY_00_15(10,C,D,E,T,A,B,X(10));       HOST_c2l(data,l); X(12)=l;
-        BODY_00_15(11,B,C,D,E,T,A,X(11));       HOST_c2l(data,l); X(13)=l;
-        BODY_00_15(12,A,B,C,D,E,T,X(12));       HOST_c2l(data,l); X(14)=l;
-        BODY_00_15(13,T,A,B,C,D,E,X(13));       HOST_c2l(data,l); X(15)=l;
-        BODY_00_15(14,E,T,A,B,C,D,X(14));
-        BODY_00_15(15,D,E,T,A,B,C,X(15));
-
-        BODY_16_19(16,C,D,E,T,A,B,X( 0),X( 0),X( 2),X( 8),X(13));
-        BODY_16_19(17,B,C,D,E,T,A,X( 1),X( 1),X( 3),X( 9),X(14));
-        BODY_16_19(18,A,B,C,D,E,T,X( 2),X( 2),X( 4),X(10),X(15));
-        BODY_16_19(19,T,A,B,C,D,E,X( 3),X( 3),X( 5),X(11),X( 0));
-
-        BODY_20_31(20,E,T,A,B,C,D,X( 4),X( 4),X( 6),X(12),X( 1));
-        BODY_20_31(21,D,E,T,A,B,C,X( 5),X( 5),X( 7),X(13),X( 2));
-        BODY_20_31(22,C,D,E,T,A,B,X( 6),X( 6),X( 8),X(14),X( 3));
-        BODY_20_31(23,B,C,D,E,T,A,X( 7),X( 7),X( 9),X(15),X( 4));
-        BODY_20_31(24,A,B,C,D,E,T,X( 8),X( 8),X(10),X( 0),X( 5));
-        BODY_20_31(25,T,A,B,C,D,E,X( 9),X( 9),X(11),X( 1),X( 6));
-        BODY_20_31(26,E,T,A,B,C,D,X(10),X(10),X(12),X( 2),X( 7));
-        BODY_20_31(27,D,E,T,A,B,C,X(11),X(11),X(13),X( 3),X( 8));
-        BODY_20_31(28,C,D,E,T,A,B,X(12),X(12),X(14),X( 4),X( 9));
-        BODY_20_31(29,B,C,D,E,T,A,X(13),X(13),X(15),X( 5),X(10));
-        BODY_20_31(30,A,B,C,D,E,T,X(14),X(14),X( 0),X( 6),X(11));
-        BODY_20_31(31,T,A,B,C,D,E,X(15),X(15),X( 1),X( 7),X(12));
-
-        BODY_32_39(32,E,T,A,B,C,D,X( 0),X( 2),X( 8),X(13));
-        BODY_32_39(33,D,E,T,A,B,C,X( 1),X( 3),X( 9),X(14));
-        BODY_32_39(34,C,D,E,T,A,B,X( 2),X( 4),X(10),X(15));
-        BODY_32_39(35,B,C,D,E,T,A,X( 3),X( 5),X(11),X( 0));
-        BODY_32_39(36,A,B,C,D,E,T,X( 4),X( 6),X(12),X( 1));
-        BODY_32_39(37,T,A,B,C,D,E,X( 5),X( 7),X(13),X( 2));
-        BODY_32_39(38,E,T,A,B,C,D,X( 6),X( 8),X(14),X( 3));
-        BODY_32_39(39,D,E,T,A,B,C,X( 7),X( 9),X(15),X( 4));
-
-        BODY_40_59(40,C,D,E,T,A,B,X( 8),X(10),X( 0),X( 5));
-        BODY_40_59(41,B,C,D,E,T,A,X( 9),X(11),X( 1),X( 6));
-        BODY_40_59(42,A,B,C,D,E,T,X(10),X(12),X( 2),X( 7));
-        BODY_40_59(43,T,A,B,C,D,E,X(11),X(13),X( 3),X( 8));
-        BODY_40_59(44,E,T,A,B,C,D,X(12),X(14),X( 4),X( 9));
-        BODY_40_59(45,D,E,T,A,B,C,X(13),X(15),X( 5),X(10));
-        BODY_40_59(46,C,D,E,T,A,B,X(14),X( 0),X( 6),X(11));
-        BODY_40_59(47,B,C,D,E,T,A,X(15),X( 1),X( 7),X(12));
-        BODY_40_59(48,A,B,C,D,E,T,X( 0),X( 2),X( 8),X(13));
-        BODY_40_59(49,T,A,B,C,D,E,X( 1),X( 3),X( 9),X(14));
-        BODY_40_59(50,E,T,A,B,C,D,X( 2),X( 4),X(10),X(15));
-        BODY_40_59(51,D,E,T,A,B,C,X( 3),X( 5),X(11),X( 0));
-        BODY_40_59(52,C,D,E,T,A,B,X( 4),X( 6),X(12),X( 1));
-        BODY_40_59(53,B,C,D,E,T,A,X( 5),X( 7),X(13),X( 2));
-        BODY_40_59(54,A,B,C,D,E,T,X( 6),X( 8),X(14),X( 3));
-        BODY_40_59(55,T,A,B,C,D,E,X( 7),X( 9),X(15),X( 4));
-        BODY_40_59(56,E,T,A,B,C,D,X( 8),X(10),X( 0),X( 5));
-        BODY_40_59(57,D,E,T,A,B,C,X( 9),X(11),X( 1),X( 6));
-        BODY_40_59(58,C,D,E,T,A,B,X(10),X(12),X( 2),X( 7));
-        BODY_40_59(59,B,C,D,E,T,A,X(11),X(13),X( 3),X( 8));
-
-        BODY_60_79(60,A,B,C,D,E,T,X(12),X(14),X( 4),X( 9));
-        BODY_60_79(61,T,A,B,C,D,E,X(13),X(15),X( 5),X(10));
-        BODY_60_79(62,E,T,A,B,C,D,X(14),X( 0),X( 6),X(11));
-        BODY_60_79(63,D,E,T,A,B,C,X(15),X( 1),X( 7),X(12));
-        BODY_60_79(64,C,D,E,T,A,B,X( 0),X( 2),X( 8),X(13));
-        BODY_60_79(65,B,C,D,E,T,A,X( 1),X( 3),X( 9),X(14));
-        BODY_60_79(66,A,B,C,D,E,T,X( 2),X( 4),X(10),X(15));
-        BODY_60_79(67,T,A,B,C,D,E,X( 3),X( 5),X(11),X( 0));
-        BODY_60_79(68,E,T,A,B,C,D,X( 4),X( 6),X(12),X( 1));
-        BODY_60_79(69,D,E,T,A,B,C,X( 5),X( 7),X(13),X( 2));
-        BODY_60_79(70,C,D,E,T,A,B,X( 6),X( 8),X(14),X( 3));
-        BODY_60_79(71,B,C,D,E,T,A,X( 7),X( 9),X(15),X( 4));
-        BODY_60_79(72,A,B,C,D,E,T,X( 8),X(10),X( 0),X( 5));
-        BODY_60_79(73,T,A,B,C,D,E,X( 9),X(11),X( 1),X( 6));
-        BODY_60_79(74,E,T,A,B,C,D,X(10),X(12),X( 2),X( 7));
-        BODY_60_79(75,D,E,T,A,B,C,X(11),X(13),X( 3),X( 8));
-        BODY_60_79(76,C,D,E,T,A,B,X(12),X(14),X( 4),X( 9));
-        BODY_60_79(77,B,C,D,E,T,A,X(13),X(15),X( 5),X(10));
-        BODY_60_79(78,A,B,C,D,E,T,X(14),X( 0),X( 6),X(11));
-        BODY_60_79(79,T,A,B,C,D,E,X(15),X( 1),X( 7),X(12));
-        
-        c->h0=(c->h0+E)&0xffffffffL; 
-        c->h1=(c->h1+T)&0xffffffffL;
-        c->h2=(c->h2+A)&0xffffffffL;
-        c->h3=(c->h3+B)&0xffffffffL;
-        c->h4=(c->h4+C)&0xffffffffL;
-
-        if (--num == 0) break;
-
-        A=c->h0;
-        B=c->h1;
-        C=c->h2;
-        D=c->h3;
-        E=c->h4;
-
-                }
-        }
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_shatest.c b/src/lib/libssl/src/fips-1.0/sha/fips_shatest.c
deleted file mode 100644
index 4896b467e4..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/fips_shatest.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* fips_shatest.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 2005.
- */
-/* ====================================================================
- * Copyright (c) 2005 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <openssl/bio.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <openssl/x509v3.h>
-
-#ifndef OPENSSL_FIPS
-
-int main(int argc, char *argv[])
-{
-    printf("No FIPS SHAXXX support\n");
-    return(0);
-}
-
-#else
-
-static int dgst_test(BIO *err, BIO *out, BIO *in);
-static int print_dgst(BIO *err, const EVP_MD *md, BIO *out,
-                unsigned char *Msg, int Msglen);
-static int print_monte(BIO *err, const EVP_MD *md, BIO *out,
-                unsigned char *Seed, int SeedLen);
-
-int main(int argc, char **argv)
-        {
-        BIO *in = NULL, *out = NULL, *err = NULL;
-
-        int ret = 1;
-
-        ERR_load_crypto_strings();
-
-        err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-        if (!err)
-                {
-                fprintf(stderr, "FATAL stderr initialization error\n");
-                goto end;
-                }
-
-        if(!FIPS_mode_set(1))
-                {
-                ERR_print_errors(err);
-                goto end;
-                }
-
-        if (argc == 1)
-                in = BIO_new_fp(stdin, BIO_NOCLOSE);
-        else
-                in = BIO_new_file(argv[1], "r");
-
-        if (argc < 2)
-                out = BIO_new_fp(stdout, BIO_NOCLOSE);
-        else
-                out = BIO_new_file(argv[2], "w");
-
-        if (!in)
-                {
-                BIO_printf(err, "FATAL input initialization error\n");
-                goto end;
-                }
-
-        if (!out)
-                {
-                fprintf(stderr, "FATAL output initialization error\n");
-                goto end;
-                }
-
-        if (!dgst_test(err, out, in))
-                {
-                fprintf(stderr, "FATAL digest file processing error\n");
-                goto end;
-                }
-        else
-                ret = 0;
-
-        end:
-
-        if (ret && err)
-                ERR_print_errors(err);
-
-        if (in)
-                BIO_free(in);
-        if (out)
-                BIO_free(out);
-        if (err)
-                BIO_free(err);
-
-        return ret;
-
-        }
-
-#define SHA_TEST_MAX_BITS       102400
-#define SHA_TEST_MAXLINELEN     (((SHA_TEST_MAX_BITS >> 3) * 2) + 10)
-
-int dgst_test(BIO *err, BIO *out, BIO *in)
-        {
-        const EVP_MD *md = NULL;
-        char *linebuf, *olinebuf, *p, *q;
-        char *keyword, *value;
-        unsigned char *Msg = NULL, *Seed = NULL;
-        long MsgLen = -1, Len = -1, SeedLen = -1;
-        int ret = 0;
-        int lnum = 0;
-
-        olinebuf = OPENSSL_malloc(SHA_TEST_MAXLINELEN);
-        linebuf = OPENSSL_malloc(SHA_TEST_MAXLINELEN);
-
-        if (!linebuf || !olinebuf)
-                goto error;
-
-
-        while (BIO_gets(in, olinebuf, SHA_TEST_MAXLINELEN) > 0)
-                {
-                lnum++;
-                strcpy(linebuf, olinebuf);
-                keyword = linebuf;
-                /* Skip leading space */
-                while (isspace((unsigned char)*keyword))
-                        keyword++;
-
-                /* Look for = sign */
-                p = strchr(linebuf, '=');
-
-                /* If no = or starts with [ (for [L=20] line) just copy */
-                if (!p)
-                        {
-                        if (!BIO_puts(out, olinebuf))
-                                goto error;
-                        continue;
-                        }
-
-                q = p - 1;
-
-                /* Remove trailing space */
-                while (isspace((unsigned char)*q))
-                        *q-- = 0;
-
-                *p = 0;
-                value = p + 1;
-
-                /* Remove leading space from value */
-                while (isspace((unsigned char)*value))
-                        value++;
-
-                /* Remove trailing space from value */
-                p = value + strlen(value) - 1;
-
-                while (*p == '\n' || isspace((unsigned char)*p))
-                        *p-- = 0;
-
-                if (!strcmp(keyword,"[L") && *p==']')
-                        {
-                        switch (atoi(value))
-                                {
-                                case 20: md=EVP_sha1();   break;
-                                case 28: md=EVP_sha224(); break;
-                                case 32: md=EVP_sha256(); break;
-                                case 48: md=EVP_sha384(); break;
-                                case 64: md=EVP_sha512(); break;
-                                default: goto parse_error;
-                                }
-                        }
-                else if (!strcmp(keyword, "Len"))
-                        {
-                        if (Len != -1)
-                                goto parse_error;
-                        Len = atoi(value);
-                        if (Len < 0)
-                                goto parse_error;
-                        /* Only handle multiples of 8 bits */
-                        if (Len & 0x7)
-                                goto parse_error;
-                        if (Len > SHA_TEST_MAX_BITS)
-                                goto parse_error;
-                        MsgLen = Len >> 3;
-                        }
-
-                else if (!strcmp(keyword, "Msg"))
-                        {
-                        long tmplen;
-                        if (strlen(value) & 1)
-                                *(--value) = '0';
-                        if (Msg)
-                                goto parse_error;
-                        Msg = string_to_hex(value, &tmplen);
-                        if (!Msg)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "Seed"))
-                        {
-                        if (strlen(value) & 1)
-                                *(--value) = '0';
-                        if (Seed)
-                                goto parse_error;
-                        Seed = string_to_hex(value, &SeedLen);
-                        if (!Seed)
-                                goto parse_error;
-                        }
-                else if (!strcmp(keyword, "MD"))
-                        continue;
-                else
-                        goto parse_error;
-
-                BIO_puts(out, olinebuf);
-
-                if (md && Msg && (MsgLen >= 0))
-                        {
-                        if (!print_dgst(err, md, out, Msg, MsgLen))
-                                goto error;
-                        OPENSSL_free(Msg);
-                        Msg = NULL;
-                        MsgLen = -1;
-                        Len = -1;
-                        }
-                else if (md && Seed && (SeedLen > 0))
-                        {
-                        if (!print_monte(err, md, out, Seed, SeedLen))
-                                goto error;
-                        OPENSSL_free(Seed);
-                        Seed = NULL;
-                        SeedLen = -1;
-                        }
-        
-
-                }
-
-
-        ret = 1;
-
-
-        error:
-
-        if (olinebuf)
-                OPENSSL_free(olinebuf);
-        if (linebuf)
-                OPENSSL_free(linebuf);
-        if (Msg)
-                OPENSSL_free(Msg);
-        if (Seed)
-                OPENSSL_free(Seed);
-
-        return ret;
-
-        parse_error:
-
-        BIO_printf(err, "FATAL parse error processing line %d\n", lnum);
-
-        goto error;
-
-        }
-
-static int print_dgst(BIO *err, const EVP_MD *emd, BIO *out,
-                unsigned char *Msg, int Msglen)
-        {
-        int i, mdlen;
-        unsigned char md[EVP_MAX_MD_SIZE];
-        if (!EVP_Digest(Msg, Msglen, md, (unsigned int *)&mdlen, emd, NULL))
-                {
-                BIO_puts(err, "Error calculating HASH\n");
-                return 0;
-                }
-        BIO_puts(out, "MD = ");
-        for (i = 0; i < mdlen; i++)
-                BIO_printf(out, "%02x", md[i]);
-        BIO_puts(out, "\n");
-        return 1;
-        }
-
-static int print_monte(BIO *err, const EVP_MD *md, BIO *out,
-                unsigned char *Seed, int SeedLen)
-        {
-        unsigned int i, j, k;
-        int ret = 0;
-        EVP_MD_CTX ctx;
-        unsigned char *m1, *m2, *m3, *p;
-        unsigned int mlen, m1len, m2len, m3len;
-
-        EVP_MD_CTX_init(&ctx);
-
-        if (SeedLen > EVP_MAX_MD_SIZE)
-                mlen = SeedLen;
-        else
-                mlen = EVP_MAX_MD_SIZE;
-
-        m1 = OPENSSL_malloc(mlen);
-        m2 = OPENSSL_malloc(mlen);
-        m3 = OPENSSL_malloc(mlen);
-
-        if (!m1 || !m2 || !m3)
-                goto mc_error;
-
-        m1len = m2len = m3len = SeedLen;
-        memcpy(m1, Seed, SeedLen);
-        memcpy(m2, Seed, SeedLen);
-        memcpy(m3, Seed, SeedLen);
-
-        BIO_puts(out, "\n");
-
-        for (j = 0; j < 100; j++)
-                {
-                for (i = 0; i < 1000; i++)
-                        {
-                        EVP_DigestInit_ex(&ctx, md, NULL);
-                        EVP_DigestUpdate(&ctx, m1, m1len);
-                        EVP_DigestUpdate(&ctx, m2, m2len);
-                        EVP_DigestUpdate(&ctx, m3, m3len);
-                        p = m1;
-                        m1 = m2;
-                        m1len = m2len;
-                        m2 = m3;
-                        m2len = m3len;
-                        m3 = p;
-                        EVP_DigestFinal_ex(&ctx, m3, &m3len);
-                        }
-                BIO_printf(out, "COUNT = %d\n", j);
-                BIO_puts(out, "MD = ");
-                for (k = 0; k < m3len; k++)
-                        BIO_printf(out, "%02x", m3[k]);
-                BIO_puts(out, "\n\n");
-                memcpy(m1, m3, m3len);
-                memcpy(m2, m3, m3len);
-                m1len = m2len = m3len;
-                }
-
-        ret = 1;
-
-        mc_error:
-        if (m1)
-                OPENSSL_free(m1);
-        if (m2)
-                OPENSSL_free(m2);
-        if (m3)
-                OPENSSL_free(m3);
-
-        EVP_MD_CTX_cleanup(&ctx);
-
-        return ret;
-        }
-
-#endif
diff --git a/src/lib/libssl/src/fips-1.0/sha/fips_standalone_sha1.c b/src/lib/libssl/src/fips-1.0/sha/fips_standalone_sha1.c
deleted file mode 100644
index 8c10c2cd83..0000000000
--- a/src/lib/libssl/src/fips-1.0/sha/fips_standalone_sha1.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <openssl/opensslconf.h>
-#include <openssl/fips_sha.h>
-#include <openssl/hmac.h>
-
-int FIPS_selftest_failed() { return 0; }
-void OPENSSL_cleanse(void *p,size_t len) {}
-
-#ifdef OPENSSL_FIPS
-
-static void hmac_init(SHA_CTX *md_ctx,SHA_CTX *o_ctx,
-                      const char *key)
-    {
-    int len=strlen(key);
-    int i;
-    unsigned char keymd[HMAC_MAX_MD_CBLOCK];
-    unsigned char pad[HMAC_MAX_MD_CBLOCK];
-
-    if (len > SHA_CBLOCK)
-        {
-        SHA1_Init(md_ctx);
-        SHA1_Update(md_ctx,key,len);
-        SHA1_Final(keymd,md_ctx);
-        len=20;
-        }
-    else
-        memcpy(keymd,key,len);
-    memset(&keymd[len],'\0',HMAC_MAX_MD_CBLOCK-len);
-
-    for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
-        pad[i]=0x36^keymd[i];
-    SHA1_Init(md_ctx);
-    SHA1_Update(md_ctx,pad,SHA_CBLOCK);
-
-    for(i=0 ; i < HMAC_MAX_MD_CBLOCK ; i++)
-        pad[i]=0x5c^keymd[i];
-    SHA1_Init(o_ctx);
-    SHA1_Update(o_ctx,pad,SHA_CBLOCK);
-    }
-
-static void hmac_final(unsigned char *md,SHA_CTX *md_ctx,SHA_CTX *o_ctx)
-    {
-    unsigned char buf[20];
-
-    SHA1_Final(buf,md_ctx);
-    SHA1_Update(o_ctx,buf,sizeof buf);
-    SHA1_Final(md,o_ctx);
-    }
-
-#endif
-
-int main(int argc,char **argv)
-    {
-#ifdef OPENSSL_FIPS
-    static char key[]="etaonrishdlcupfm";
-    int n,binary=0;
-
-    if(argc < 2)
-        {
-        fprintf(stderr,"%s [<file>]+\n",argv[0]);
-        exit(1);
-        }
-
-    n=1;
-    if (!strcmp(argv[n],"-binary"))
-        {
-        n++;
-        binary=1;       /* emit binary fingerprint... */
-        }
-
-    for(; n < argc ; ++n)
-        {
-        FILE *f=fopen(argv[n],"rb");
-        SHA_CTX md_ctx,o_ctx;
-        unsigned char md[20];
-        int i;
-
-        if(!f)
-            {
-            perror(argv[n]);
-            exit(2);
-            }
-
-        hmac_init(&md_ctx,&o_ctx,key);
-        for( ; ; )
-            {
-            char buf[1024];
-            int l=fread(buf,1,sizeof buf,f);
-
-            if(l == 0)
-                {
-                if(ferror(f))
-                    {
-                    perror(argv[n]);
-                    exit(3);
-                    }
-                else
-                    break;
-                }
-            SHA1_Update(&md_ctx,buf,l);
-            }
-        hmac_final(md,&md_ctx,&o_ctx);
-
-        if (binary)
-            {
-            fwrite(md,20,1,stdout);
-            break;      /* ... for single(!) file */
-            }
-
-        printf("HMAC-SHA1(%s)= ",argv[n]);
-        for(i=0 ; i < 20 ; ++i)
-            printf("%02x",md[i]);
-        printf("\n");
-        }
-#endif
-    return 0;
-    }
-
-
diff --git a/src/lib/libssl/src/fips/Makefile b/src/lib/libssl/src/fips/Makefile
deleted file mode 100644
index 63e4cf82be..0000000000
--- a/src/lib/libssl/src/fips/Makefile
+++ /dev/null
@@ -1,199 +0,0 @@
-#
-# SSLeay/fips/Makefile
-#
-
-DIR=            fips
-TOP=            ..
-CC=             cc
-INCLUDE=        -I. -I$(TOP) -I../include
-INCLUDES=       -I.. -I../.. -I../../include
-CFLAG=          -g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=     /usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-RM=             rm -f
-AR=             ar r
-
-PEX_LIBS=
-EX_LIBS=
-
-CFLAGS= $(INCLUDE) $(CFLAG)
-
-
-LIBS=
-
-FDIRS=sha1 rand des aes dsa rsa dh
-
-GENERAL=Makefile README fips-lib.com install.com
-
-LIB= $(TOP)/libcrypto.a
-SHARED_LIB= libcrypto$(SHLIB_EXT)
-LIBSRC=fips.c fips_err_wrapper.c
-LIBOBJ=fips.o fips_err_wrapper.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=fips.h
-HEADER=$(EXHEADER) fips_err.h
-EXE=openssl_fips_fingerprint
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        @(cd ..; $(MAKE) DIRS=$(DIR) all)
-
-all:
-        @if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
-                $(MAKE) -e subdirs check lib shared; \
-        fi
-
-check:
-        TOP=`pwd`/$(TOP) ./fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
-subdirs:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making all in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' FIPS_DES_ENC='${FIPS_DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' FIPS_SHA1_ASM_OBJ='${FIPS_SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \
-        done;
-
-sub_target:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making $(TARGET) in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' FIPS_DES_ENC='${FIPS_DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' FIPS_SHA1_ASM_OBJ='${FIPS_SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' $(TARGET) ) || exit 1; \
-        done;
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making 'files' in fips/$$i..." && \
-        $(MAKE) PERL='${PERL}' files ); \
-        done;
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-        @for i in $(FDIRS); do \
-        (cd $$i && echo "making links in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' FIPS_DES_ENC='${FIPS_DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' FIPS_SHA1_ASM_OBJ='${FIPS_SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
-        done;
-
-lib:    $(LIBOBJ)
-        $(AR) $(LIB) $(LIBOBJ)
-        $(RANLIB) $(LIB) || echo Never mind.
-        @touch lib
-
-shared:
-        if [ -n "$(SHARED_LIBS)" ]; then \
-                (cd ..; $(MAKE) $(SHARED_LIB)); \
-        fi
-
-libs:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making libs in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
-        done;
-
-tests:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making tests in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
-        done;
-
-top_fips_test_suite:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=. TARGET=fips_test_suite sub_target)
-
-fips_test_suite: fips_test_suite.o $(TOP)/libcrypto.a
-        $(CC) $(CFLAGS) -o fips_test_suite fips_test_suite.o $(PEX_LIBS) $(TOP)/libcrypto.a $(EX_LIBS)
-        TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_test_suite || { rm fips_test_suite; false; }
-
-fips_test: top top_fips_test_suite
-        cd testvectors && perl -p -i -e 's/COUNT=/COUNT = /' des[23]/req/*.req
-        @for i in dsa sha1 aes des ; \
-        do \
-                (cd $$i && echo "making fips_test in fips/$$i..." && $(MAKE) fips_test) \
-        done;
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist ;\
-        do \
-                (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-                chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done;
-        @for i in $(FDIRS) ;\
-        do \
-                (cd $$i && echo "making install in fips/$$i..." && \
-                $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}'  INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
-        done;
-        @for i in $(EXE) ; \
-        do \
-                echo "installing $$i"; \
-                cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
-                chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
-                mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-        done
-
-lint:
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making lint in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
-        done;
-
-depend:
-        if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(SRC)
-        if [ ! -s buildinf.h ]; then rm buildinf.h; fi
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making depend in fips/$$i..." && \
-        $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ); \
-        done;
-
-clean:
-        rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making clean in fips/$$i..." && \
-        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \
-        done;
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-        @for i in $(FDIRS) ;\
-        do \
-        (cd $$i && echo "making dclean in fips/$$i..." && \
-        $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
-        done;
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips.o: ../include/openssl/aes.h ../include/openssl/asn1.h
-fips.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
-fips.o: ../include/openssl/bn.h ../include/openssl/cast.h
-fips.o: ../include/openssl/crypto.h ../include/openssl/des.h
-fips.o: ../include/openssl/des_old.h ../include/openssl/dh.h
-fips.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
-fips.o: ../include/openssl/err.h ../include/openssl/evp.h
-fips.o: ../include/openssl/fips.h ../include/openssl/fips_rand.h
-fips.o: ../include/openssl/hmac.h ../include/openssl/idea.h
-fips.o: ../include/openssl/lhash.h ../include/openssl/md2.h
-fips.o: ../include/openssl/md4.h ../include/openssl/md5.h
-fips.o: ../include/openssl/mdc2.h ../include/openssl/obj_mac.h
-fips.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
-fips.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
-fips.o: ../include/openssl/rand.h ../include/openssl/rc2.h
-fips.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
-fips.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
-fips.o: ../include/openssl/safestack.h ../include/openssl/sha.h
-fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-fips.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h fips.c
-fips.o: fips_locl.h
-fips_err_wrapper.o: ../include/openssl/opensslconf.h fips_err_wrapper.c
diff --git a/src/lib/libssl/src/fips/aes/Makefile b/src/lib/libssl/src/fips/aes/Makefile
deleted file mode 100644
index fce5eeb5f7..0000000000
--- a/src/lib/libssl/src/fips/aes/Makefile
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# SSLeay/fips/aes/Makefile
-#
-
-DIR=    aes
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=fips_aesavs.c
-TESTDATA=fips_aes_data
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_aes_core.c fips_aes_selftest.c
-LIBOBJ=fips_aes_core.o fips_aes_selftest.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER) fips_aes_locl.h
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    check lib
-
-check:
-        TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
-lib:    $(LIBOBJ)
-        $(AR) $(LIB) $(LIBOBJ)
-        $(RANLIB) $(LIB) || echo Never mind.
-        @sleep 2; touch lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TESTDATA)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-top_fips_aesavs:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_aesavs sub_target)
-
-fips_aesavs: fips_aesavs.o $(TOP)/libcrypto.a
-        $(CC) $(CFLAGS) -o fips_aesavs fips_aesavs.o $(PEX_LIBS) $(TOP)/libcrypto.a $(EX_LIBS)
-        TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_aesavs
-
-fips_test: top top_fips_aesavs
-        find ../testvectors/aes/req -name '*.req' > testlist
-        -rm -rf ../testvectors/aes/rsp
-        mkdir ../testvectors/aes/rsp
-        ./fips_aesavs -d testlist
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) \
-                $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_aes_core.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h
-fips_aes_core.o: ../../include/openssl/fips.h
-fips_aes_core.o: ../../include/openssl/opensslconf.h fips_aes_core.c
-fips_aes_core.o: fips_aes_locl.h
-fips_aes_selftest.o: ../../include/openssl/aes.h ../../include/openssl/bio.h
-fips_aes_selftest.o: ../../include/openssl/crypto.h
-fips_aes_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_aes_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_aes_selftest.o: ../../include/openssl/opensslconf.h
-fips_aes_selftest.o: ../../include/openssl/opensslv.h
-fips_aes_selftest.o: ../../include/openssl/safestack.h
-fips_aes_selftest.o: ../../include/openssl/stack.h
-fips_aes_selftest.o: ../../include/openssl/symhacks.h fips_aes_selftest.c
-fips_aesavs.o: ../../e_os.h ../../include/openssl/aes.h
-fips_aesavs.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_aesavs.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-fips_aesavs.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-fips_aesavs.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_aesavs.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-fips_aesavs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_aesavs.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_aesavs.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-fips_aesavs.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-fips_aesavs.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-fips_aesavs.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-fips_aesavs.o: ../../include/openssl/opensslconf.h
-fips_aesavs.o: ../../include/openssl/opensslv.h
-fips_aesavs.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h
-fips_aesavs.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-fips_aesavs.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-fips_aesavs.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-fips_aesavs.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_aesavs.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_aesavs.o: fips_aesavs.c
diff --git a/src/lib/libssl/src/fips/aes/fips_aes_selftest.c b/src/lib/libssl/src/fips/aes/fips_aes_selftest.c
deleted file mode 100644
index 0e53d21bd0..0000000000
--- a/src/lib/libssl/src/fips/aes/fips_aes_selftest.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/aes.h>
-
-#ifdef OPENSSL_FIPS
-static struct
-    {
-    unsigned char key[16];
-    unsigned char plaintext[16];
-    unsigned char ciphertext[16];
-    } tests[]=
-        {
-        {
-        { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
-          0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F },
-        { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
-          0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF },
-        { 0x69,0xC4,0xE0,0xD8,0x6A,0x7B,0x04,0x30,
-          0xD8,0xCD,0xB7,0x80,0x70,0xB4,0xC5,0x5A },
-        },
-        };
-
-void FIPS_corrupt_aes()
-    {
-    tests[0].key[0]++;
-    }
-
-int FIPS_selftest_aes()
-    {
-    int n;
-
-    /* Encrypt and check against known ciphertext */
-    for(n=0 ; n < 1 ; ++n)
-        {
-        AES_KEY key;
-        unsigned char buf[16];
-
-        AES_set_encrypt_key(tests[n].key,128,&key);
-        AES_encrypt(tests[n].plaintext,buf,&key);
-        if(memcmp(buf,tests[n].ciphertext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_AES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-    /* Decrypt and check against known plaintext */
-    for(n=0 ; n < 1 ; ++n)
-        {
-        AES_KEY key;
-        unsigned char buf[16];
-
-        AES_set_decrypt_key(tests[n].key,128,&key);
-        AES_decrypt(tests[n].ciphertext,buf,&key);
-        if(memcmp(buf,tests[n].plaintext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_AES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-    return 1;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips/aes/fips_aesavs.c b/src/lib/libssl/src/fips/aes/fips_aesavs.c
deleted file mode 100644
index 5fc2879067..0000000000
--- a/src/lib/libssl/src/fips/aes/fips_aesavs.c
+++ /dev/null
@@ -1,1005 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2004 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*---------------------------------------------
-  NIST AES Algorithm Validation Suite
-  Test Program
-
-  Donated to OpenSSL by:
-  V-ONE Corporation
-  20250 Century Blvd, Suite 300
-  Germantown, MD 20874
-  U.S.A.
-  ----------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <openssl/aes.h>
-#include <openssl/evp.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-#include "e_os.h"
-
-#define AES_BLOCK_SIZE 16
-
-#define VERBOSE 1
-
-/*-----------------------------------------------*/
-
-int AESTest(EVP_CIPHER_CTX *ctx,
-            char *amode, int akeysz, unsigned char *aKey, 
-            unsigned char *iVec, 
-            int dir,  /* 0 = decrypt, 1 = encrypt */
-            unsigned char *plaintext, unsigned char *ciphertext, int len)
-    {
-    const EVP_CIPHER *cipher = NULL;
-    int ret = 1;
-    int kt = 0;
-
-    if (ctx)
-        memset(ctx, 0, sizeof(EVP_CIPHER_CTX));
-
-    if (strcasecmp(amode, "CBC") == 0)
-        kt = 1000;
-    else if (strcasecmp(amode, "ECB") == 0)
-        kt = 2000;
-    else if (strcasecmp(amode, "CFB128") == 0)
-        kt = 3000;
-    else if (strncasecmp(amode, "OFB", 3) == 0)
-        kt = 4000;
-    else if(!strcasecmp(amode,"CFB1"))
-        kt=5000;
-    else if(!strcasecmp(amode,"CFB8"))
-        kt=6000;
-    else
-        {
-        printf("Unknown mode: %s\n", amode);
-        EXIT(1);
-        }
-    if (ret)
-        {
-        if ((akeysz != 128) && (akeysz != 192) && (akeysz != 256))
-            {
-            printf("Invalid key size: %d\n", akeysz);
-            ret = 0;
-            }
-        else
-            {
-            kt += akeysz;
-            switch (kt)
-                {
-            case 1128:  /* CBC 128 */
-                cipher = EVP_aes_128_cbc();
-                break;
-            case 1192:  /* CBC 192 */
-                cipher = EVP_aes_192_cbc();
-                break;
-            case 1256:  /* CBC 256 */
-                cipher = EVP_aes_256_cbc();
-                break;
-            case 2128:  /* ECB 128 */
-                cipher = EVP_aes_128_ecb();
-                break;
-            case 2192:  /* ECB 192 */
-                cipher = EVP_aes_192_ecb();
-                break;
-            case 2256:  /* ECB 256 */
-                cipher = EVP_aes_256_ecb();
-                break;
-            case 3128:  /* CFB 128 */
-                cipher = EVP_aes_128_cfb();
-                break;
-            case 3192:  /* CFB 192 */
-                cipher = EVP_aes_192_cfb();
-                break;
-            case 3256:  /* CFB 256 */
-                cipher = EVP_aes_256_cfb();
-                break;
-            case 4128:  /* OFB 128 */
-                cipher = EVP_aes_128_ofb();
-                break;
-            case 4192:  /* OFB 192 */
-                cipher = EVP_aes_192_ofb();
-                break;
-            case 4256:  /* OFB 256 */
-                cipher = EVP_aes_256_ofb();
-                break;
-            case 5128:
-                cipher=EVP_aes_128_cfb1();
-                break;
-            case 5192:
-                cipher=EVP_aes_192_cfb1();
-                break;
-            case 5256:
-                cipher=EVP_aes_256_cfb1();
-                break;
-            case 6128:
-                cipher=EVP_aes_128_cfb8();
-                break;
-            case 6192:
-                cipher=EVP_aes_192_cfb8();
-                break;
-            case 6256:
-                cipher=EVP_aes_256_cfb8();
-                break;
-            default:
-                printf("Didn't handle mode %d\n",kt);
-                EXIT(1);
-                }
-            if (dir)
-                { /* encrypt */
-                if(!EVP_CipherInit(ctx, cipher, aKey, iVec, AES_ENCRYPT))
-                    {
-                    ERR_print_errors_fp(stderr);
-                    EXIT(1);
-                    }
-                  
-                EVP_Cipher(ctx, ciphertext, (unsigned char*)plaintext, len);
-                }
-            else
-                { /* decrypt */
-                if(!EVP_CipherInit(ctx, cipher, aKey, iVec, AES_DECRYPT))
-                    {
-                    ERR_print_errors_fp(stderr);
-                    EXIT(1);
-                    }
-                EVP_Cipher(ctx, (unsigned char*)plaintext, ciphertext, len);
-                }
-            }
-        }
-    return ret;
-    }
-
-/*-----------------------------------------------*/
-
-int hex2bin(char *in, int len, unsigned char *out)
-{
-  int n1, n2;
-  unsigned char ch;
-
-  for (n1 = 0, n2 = 0; n1 < len; )
-    { /* first byte */
-      if ((in[n1] >= '0') && (in[n1] <= '9'))
-        ch = in[n1++] - '0';
-      else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-        ch = in[n1++] - 'A' + 10;
-      else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-        ch = in[n1++] - 'a' + 10;
-      else
-        return -1;
-      if(len == 1)
-          {
-          out[n2++]=ch;
-          break;
-          }
-      out[n2] = ch << 4;
-      /* second byte */
-      if ((in[n1] >= '0') && (in[n1] <= '9'))
-        ch = in[n1++] - '0';
-      else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-        ch = in[n1++] - 'A' + 10;
-      else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-        ch = in[n1++] - 'a' + 10;
-      else
-        return -1;
-      out[n2++] |= ch;
-    }
-  return n2;
-}
-
-/*-----------------------------------------------*/
-
-int bin2hex(unsigned char *in, int len, char *out)
-{
-  int n1, n2;
-  unsigned char ch;
-
-  for (n1 = 0, n2 = 0; n1 < len; ++n1)
-    {
-      /* first nibble */
-      ch = in[n1] >> 4;
-      if (ch <= 0x09)
-        out[n2++] = ch + '0';
-      else
-        out[n2++] = ch - 10 + 'a';
-      /* second nibble */
-      ch = in[n1] & 0x0f;
-      if (ch <= 0x09)
-        out[n2++] = ch + '0';
-      else
-        out[n2++] = ch - 10 + 'a';
-    }
-  return n2;
-}
-
-/* NB: this return the number of _bits_ read */
-int bint2bin(const char *in, int len, unsigned char *out)
-    {
-    int n;
-
-    memset(out,0,len);
-    for(n=0 ; n < len ; ++n)
-        if(in[n] == '1')
-            out[n/8]|=(0x80 >> (n%8));
-    return len;
-    }
-
-int bin2bint(const unsigned char *in,int len,char *out)
-    {
-    int n;
-
-    for(n=0 ; n < len ; ++n)
-        out[n]=(in[n/8]&(0x80 >> (n%8))) ? '1' : '0';
-    return n;
-    }
-
-/*-----------------------------------------------*/
-
-void PrintValue(char *tag, unsigned char *val, int len)
-{
-#if VERBOSE
-  char obuf[2048];
-  int olen;
-  olen = bin2hex(val, len, obuf);
-  printf("%s = %.*s\n", tag, olen, obuf);
-#endif
-}
-
-void OutputValue(char *tag, unsigned char *val, int len, FILE *rfp,int bitmode)
-    {
-    char obuf[2048];
-    int olen;
-
-    if(bitmode)
-        olen=bin2bint(val,len,obuf);
-    else
-        olen=bin2hex(val,len,obuf);
-
-    fprintf(rfp, "%s = %.*s\n", tag, olen, obuf);
-#if VERBOSE
-    printf("%s = %.*s\n", tag, olen, obuf);
-#endif
-    }
-
-/*-----------------------------------------------*/
-char *t_tag[2] = {"PLAINTEXT", "CIPHERTEXT"};
-char *t_mode[6] = {"CBC","ECB","OFB","CFB1","CFB8","CFB128"};
-enum Mode {CBC, ECB, OFB, CFB1, CFB8, CFB128};
-enum XCrypt {XDECRYPT, XENCRYPT};
-
-/*=============================*/
-/*  Monte Carlo Tests          */
-/*-----------------------------*/
-
-/*#define gb(a,b) (((a)[(b)/8] >> ((b)%8))&1)*/
-/*#define sb(a,b,v) ((a)[(b)/8]=((a)[(b)/8]&~(1 << ((b)%8)))|(!!(v) << ((b)%8)))*/
-
-#define gb(a,b) (((a)[(b)/8] >> (7-(b)%8))&1)
-#define sb(a,b,v) ((a)[(b)/8]=((a)[(b)/8]&~(1 << (7-(b)%8)))|(!!(v) << (7-(b)%8)))
-
-int do_mct(char *amode, 
-           int akeysz, unsigned char *aKey,unsigned char *iVec,
-           int dir, unsigned char *text, int len,
-           FILE *rfp)
-    {
-    int ret = 0;
-    unsigned char key[101][32];
-    unsigned char iv[101][AES_BLOCK_SIZE];
-    unsigned char ptext[1001][32];
-    unsigned char ctext[1001][32];
-    unsigned char ciphertext[64+4];
-    int i, j, n, n1, n2;
-    int imode = 0, nkeysz = akeysz/8;
-    EVP_CIPHER_CTX ctx;
-
-    if (len > 32)
-        {
-        printf("\n>>>> Length exceeds 32 for %s %d <<<<\n\n", 
-               amode, akeysz);
-        return -1;
-        }
-    for (imode = 0; imode < 6; ++imode)
-        if (strcmp(amode, t_mode[imode]) == 0)
-            break;
-    if (imode == 6)
-        { 
-        printf("Unrecognized mode: %s\n", amode);
-        return -1;
-        }
-
-    memcpy(key[0], aKey, nkeysz);
-    if (iVec)
-        memcpy(iv[0], iVec, AES_BLOCK_SIZE);
-    if (dir == XENCRYPT)
-        memcpy(ptext[0], text, len);
-    else
-        memcpy(ctext[0], text, len);
-    for (i = 0; i < 100; ++i)
-        {
-        /* printf("Iteration %d\n", i); */
-        if (i > 0)
-            {
-            fprintf(rfp,"COUNT = %d\n",i);
-            OutputValue("KEY",key[i],nkeysz,rfp,0);
-            if (imode != ECB)  /* ECB */
-                OutputValue("IV",iv[i],AES_BLOCK_SIZE,rfp,0);
-            /* Output Ciphertext | Plaintext */
-            OutputValue(t_tag[dir^1],dir ? ptext[0] : ctext[0],len,rfp,
-                        imode == CFB1);
-            }
-        for (j = 0; j < 1000; ++j)
-            {
-            switch (imode)
-                {
-            case ECB:
-                if (j == 0)
-                    { /* set up encryption */
-                    ret = AESTest(&ctx, amode, akeysz, key[i], NULL, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  ptext[j], ctext[j], len);
-                    if (dir == XENCRYPT)
-                        memcpy(ptext[j+1], ctext[j], len);
-                    else
-                        memcpy(ctext[j+1], ptext[j], len);
-                    }
-                else
-                    {
-                    if (dir == XENCRYPT)
-                        {
-                        EVP_Cipher(&ctx, ctext[j], ptext[j], len);
-                        memcpy(ptext[j+1], ctext[j], len);
-                        }
-                    else
-                        {
-                        EVP_Cipher(&ctx, ptext[j], ctext[j], len);
-                        memcpy(ctext[j+1], ptext[j], len);
-                        }
-                    }
-                break;
-
-            case CBC:
-            case OFB:  
-            case CFB128:
-                if (j == 0)
-                    {
-                    ret = AESTest(&ctx, amode, akeysz, key[i], iv[i], 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  ptext[j], ctext[j], len);
-                    if (dir == XENCRYPT)
-                        memcpy(ptext[j+1], iv[i], len);
-                    else
-                        memcpy(ctext[j+1], iv[i], len);
-                    }
-                else
-                    {
-                    if (dir == XENCRYPT)
-                        {
-                        EVP_Cipher(&ctx, ctext[j], ptext[j], len);
-                        memcpy(ptext[j+1], ctext[j-1], len);
-                        }
-                    else
-                        {
-                        EVP_Cipher(&ctx, ptext[j], ctext[j], len);
-                        memcpy(ctext[j+1], ptext[j-1], len);
-                        }
-                    }
-                break;
-
-            case CFB8:
-                if (j == 0)
-                    {
-                    ret = AESTest(&ctx, amode, akeysz, key[i], iv[i], 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  ptext[j], ctext[j], len);
-                    }
-                else
-                    {
-                    if (dir == XENCRYPT)
-                        EVP_Cipher(&ctx, ctext[j], ptext[j], len);
-                    else
-                        EVP_Cipher(&ctx, ptext[j], ctext[j], len);
-                    }
-                if (dir == XENCRYPT)
-                    {
-                    if (j < 16)
-                        memcpy(ptext[j+1], &iv[i][j], len);
-                    else
-                        memcpy(ptext[j+1], ctext[j-16], len);
-                    }
-                else
-                    {
-                    if (j < 16)
-                        memcpy(ctext[j+1], &iv[i][j], len);
-                    else
-                        memcpy(ctext[j+1], ptext[j-16], len);
-                    }
-                break;
-
-            case CFB1:
-                if(j == 0)
-                    {
-                    /* compensate for wrong endianness of input file */
-                    if(i == 0)
-                        ptext[0][0]<<=7;
-                    ret=AESTest(&ctx,amode,akeysz,key[i],iv[i],dir,
-                                ptext[j], ctext[j], len);
-                    }
-                else
-                    {
-                    if (dir == XENCRYPT)
-                        EVP_Cipher(&ctx, ctext[j], ptext[j], len);
-                    else
-                        EVP_Cipher(&ctx, ptext[j], ctext[j], len);
-
-                    }
-                if(dir == XENCRYPT)
-                    {
-                    if(j < 128)
-                        sb(ptext[j+1],0,gb(iv[i],j));
-                    else
-                        sb(ptext[j+1],0,gb(ctext[j-128],0));
-                    }
-                else
-                    {
-                    if(j < 128)
-                        sb(ctext[j+1],0,gb(iv[i],j));
-                    else
-                        sb(ctext[j+1],0,gb(ptext[j-128],0));
-                    }
-                break;
-                }
-            }
-        --j; /* reset to last of range */
-        /* Output Ciphertext | Plaintext */
-        OutputValue(t_tag[dir],dir ? ctext[j] : ptext[j],len,rfp,
-                    imode == CFB1);
-        fprintf(rfp, "\n");  /* add separator */
-
-        /* Compute next KEY */
-        if (dir == XENCRYPT)
-            {
-            if (imode == CFB8)
-                { /* ct = CT[j-15] || CT[j-14] || ... || CT[j] */
-                for (n1 = 0, n2 = nkeysz-1; n1 < nkeysz; ++n1, --n2)
-                    ciphertext[n1] = ctext[j-n2][0];
-                }
-            else if(imode == CFB1)
-                {
-                for(n1=0,n2=akeysz-1 ; n1 < akeysz ; ++n1,--n2)
-                    sb(ciphertext,n1,gb(ctext[j-n2],0));
-                }
-            else
-                switch (akeysz)
-                    {
-                case 128:
-                    memcpy(ciphertext, ctext[j], 16);
-                    break;
-                case 192:
-                    memcpy(ciphertext, ctext[j-1]+8, 8);
-                    memcpy(ciphertext+8, ctext[j], 16);
-                    break;
-                case 256:
-                    memcpy(ciphertext, ctext[j-1], 16);
-                    memcpy(ciphertext+16, ctext[j], 16);
-                    break;
-                    }
-            }
-        else
-            {
-            if (imode == CFB8)
-                { /* ct = CT[j-15] || CT[j-14] || ... || CT[j] */
-                for (n1 = 0, n2 = nkeysz-1; n1 < nkeysz; ++n1, --n2)
-                    ciphertext[n1] = ptext[j-n2][0];
-                }
-            else if(imode == CFB1)
-                {
-                for(n1=0,n2=akeysz-1 ; n1 < akeysz ; ++n1,--n2)
-                    sb(ciphertext,n1,gb(ptext[j-n2],0));
-                }
-            else
-                switch (akeysz)
-                    {
-                case 128:
-                    memcpy(ciphertext, ptext[j], 16);
-                    break;
-                case 192:
-                    memcpy(ciphertext, ptext[j-1]+8, 8);
-                    memcpy(ciphertext+8, ptext[j], 16);
-                    break;
-                case 256:
-                    memcpy(ciphertext, ptext[j-1], 16);
-                    memcpy(ciphertext+16, ptext[j], 16);
-                    break;
-                    }
-            }
-        /* Compute next key: Key[i+1] = Key[i] xor ct */
-        for (n = 0; n < nkeysz; ++n)
-            key[i+1][n] = key[i][n] ^ ciphertext[n];
-        
-        /* Compute next IV and text */
-        if (dir == XENCRYPT)
-            {
-            switch (imode)
-                {
-            case ECB:
-                memcpy(ptext[0], ctext[j], AES_BLOCK_SIZE);
-                break;
-            case CBC:
-            case OFB:
-            case CFB128:
-                memcpy(iv[i+1], ctext[j], AES_BLOCK_SIZE);
-                memcpy(ptext[0], ctext[j-1], AES_BLOCK_SIZE);
-                break;
-            case CFB8:
-                /* IV[i+1] = ct */
-                for (n1 = 0, n2 = 15; n1 < 16; ++n1, --n2)
-                    iv[i+1][n1] = ctext[j-n2][0];
-                ptext[0][0] = ctext[j-16][0];
-                break;
-            case CFB1:
-                for(n1=0,n2=127 ; n1 < 128 ; ++n1,--n2)
-                    sb(iv[i+1],n1,gb(ctext[j-n2],0));
-                ptext[0][0]=ctext[j-128][0]&0x80;
-                break;
-                }
-            }
-        else
-            {
-            switch (imode)
-                {
-            case ECB:
-                memcpy(ctext[0], ptext[j], AES_BLOCK_SIZE);
-                break;
-            case CBC:
-            case OFB:
-            case CFB128:
-                memcpy(iv[i+1], ptext[j], AES_BLOCK_SIZE);
-                memcpy(ctext[0], ptext[j-1], AES_BLOCK_SIZE);
-                break;
-            case CFB8:
-                for (n1 = 0, n2 = 15; n1 < 16; ++n1, --n2)
-                    iv[i+1][n1] = ptext[j-n2][0];
-                ctext[0][0] = ptext[j-16][0];
-                break;
-            case CFB1:
-                for(n1=0,n2=127 ; n1 < 128 ; ++n1,--n2)
-                    sb(iv[i+1],n1,gb(ptext[j-n2],0));
-                ctext[0][0]=ptext[j-128][0]&0x80;
-                break;
-                }
-            }
-        }
-    
-    return ret;
-    }
-
-/*================================================*/
-/*----------------------------
-  # Config info for v-one
-  # AESVS MMT test data for ECB
-  # State : Encrypt and Decrypt
-  # Key Length : 256
-  # Fri Aug 30 04:07:22 PM
-  ----------------------------*/
-
-int proc_file(char *rqfile)
-    {
-    char afn[256], rfn[256];
-    FILE *afp = NULL, *rfp = NULL;
-    char ibuf[2048];
-    int ilen, len, ret = 0;
-    char algo[8] = "";
-    char amode[8] = "";
-    char atest[8] = "";
-    int akeysz = 0;
-    unsigned char iVec[20], aKey[40];
-    int dir = -1, err = 0, step = 0;
-    unsigned char plaintext[2048];
-    unsigned char ciphertext[2048];
-    char *rp;
-    EVP_CIPHER_CTX ctx;
-
-    if (!rqfile || !(*rqfile))
-        {
-        printf("No req file\n");
-        return -1;
-        }
-    strcpy(afn, rqfile);
-
-    if ((afp = fopen(afn, "r")) == NULL)
-        {
-        printf("Cannot open file: %s, %s\n", 
-               afn, strerror(errno));
-        return -1;
-        }
-    strcpy(rfn,afn);
-    rp=strstr(rfn,"req/");
-    assert(rp);
-    memcpy(rp,"rsp",3);
-    rp = strstr(rfn, ".req");
-    memcpy(rp, ".rsp", 4);
-    if ((rfp = fopen(rfn, "w")) == NULL)
-        {
-        printf("Cannot open file: %s, %s\n", 
-               rfn, strerror(errno));
-        fclose(afp);
-        afp = NULL;
-        return -1;
-        }
-    while (!err && (fgets(ibuf, sizeof(ibuf), afp)) != NULL)
-        {
-        ilen = strlen(ibuf);
-        /*      printf("step=%d ibuf=%s",step,ibuf); */
-        switch (step)
-            {
-        case 0:  /* read preamble */
-            if (ibuf[0] == '\n')
-                { /* end of preamble */
-                if ((*algo == '\0') ||
-                    (*amode == '\0') ||
-                    (akeysz == 0))
-                    {
-                    printf("Missing Algorithm, Mode or KeySize (%s/%s/%d)\n",
-                           algo,amode,akeysz);
-                    err = 1;
-                    }
-                else
-                    {
-                    fputs(ibuf, rfp);
-                    ++ step;
-                    }
-                }
-            else if (ibuf[0] != '#')
-                {
-                printf("Invalid preamble item: %s\n", ibuf);
-                err = 1;
-                }
-            else
-                { /* process preamble */
-                char *xp, *pp = ibuf+2;
-                int n;
-                if (akeysz)
-                    { /* insert current time & date */
-                    time_t rtim = time(0);
-                    fprintf(rfp, "# %s", ctime(&rtim));
-                    }
-                else
-                    {
-                    fputs(ibuf, rfp);
-                    if (strncmp(pp, "AESVS ", 6) == 0)
-                        {
-                        strcpy(algo, "AES");
-                        /* get test type */
-                        pp += 6;
-                        xp = strchr(pp, ' ');
-                        n = xp-pp;
-                        strncpy(atest, pp, n);
-                        atest[n] = '\0';
-                        /* get mode */
-                        xp = strrchr(pp, ' '); /* get mode" */
-                        n = strlen(xp+1)-1;
-                        strncpy(amode, xp+1, n);
-                        amode[n] = '\0';
-                        /* amode[3] = '\0'; */
-                        printf("Test = %s, Mode = %s\n", atest, amode);
-                        }
-                    else if (strncasecmp(pp, "Key Length : ", 13) == 0)
-                        {
-                        akeysz = atoi(pp+13);
-                        printf("Key size = %d\n", akeysz);
-                        }
-                    }
-                }
-            break;
-
-        case 1:  /* [ENCRYPT] | [DECRYPT] */
-            if (ibuf[0] == '[')
-                {
-                fputs(ibuf, rfp);
-                ++step;
-                if (strncasecmp(ibuf, "[ENCRYPT]", 9) == 0)
-                    dir = 1;
-                else if (strncasecmp(ibuf, "[DECRYPT]", 9) == 0)
-                    dir = 0;
-                else
-                    {
-                    printf("Invalid keyword: %s\n", ibuf);
-                    err = 1;
-                    }
-                break;
-                }
-            else if (dir == -1)
-                {
-                err = 1;
-                printf("Missing ENCRYPT/DECRYPT keyword\n");
-                break;
-                }
-            else 
-                step = 2;
-
-        case 2: /* KEY = xxxx */
-            fputs(ibuf, rfp);
-            if(*ibuf == '\n')
-                break;
-            if(!strncasecmp(ibuf,"COUNT = ",8))
-                break;
-
-            if (strncasecmp(ibuf, "KEY = ", 6) != 0)
-                {
-                printf("Missing KEY\n");
-                err = 1;
-                }
-            else
-                {
-                len = hex2bin((char*)ibuf+6, strlen(ibuf+6)-1, aKey);
-                if (len < 0)
-                    {
-                    printf("Invalid KEY\n");
-                    err =1;
-                    break;
-                    }
-                PrintValue("KEY", aKey, len);
-                if (strcmp(amode, "ECB") == 0)
-                    {
-                    memset(iVec, 0, sizeof(iVec));
-                    step = (dir)? 4: 5;  /* no ivec for ECB */
-                    }
-                else
-                    ++step;
-                }
-            break;
-
-        case 3: /* IV = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "IV = ", 5) != 0)
-                {
-                printf("Missing IV\n");
-                err = 1;
-                }
-            else
-                {
-                len = hex2bin((char*)ibuf+5, strlen(ibuf+5)-1, iVec);
-                if (len < 0)
-                    {
-                    printf("Invalid IV\n");
-                    err =1;
-                    break;
-                    }
-                PrintValue("IV", iVec, len);
-                step = (dir)? 4: 5;
-                }
-            break;
-
-        case 4: /* PLAINTEXT = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "PLAINTEXT = ", 12) != 0)
-                {
-                printf("Missing PLAINTEXT\n");
-                err = 1;
-                }
-            else
-                {
-                int nn = strlen(ibuf+12);
-                if(!strcmp(amode,"CFB1"))
-                    len=bint2bin(ibuf+12,nn-1,plaintext);
-                else
-                    len=hex2bin(ibuf+12, nn-1,plaintext);
-                if (len < 0)
-                    {
-                    printf("Invalid PLAINTEXT: %s", ibuf+12);
-                    err =1;
-                    break;
-                    }
-                if (len >= sizeof(plaintext))
-                    {
-                    printf("Buffer overflow\n");
-                    }
-                PrintValue("PLAINTEXT", (unsigned char*)plaintext, len);
-                if (strcmp(atest, "MCT") == 0)  /* Monte Carlo Test */
-                    {
-                    if(do_mct(amode, akeysz, aKey, iVec, 
-                              dir, (unsigned char*)plaintext, len, 
-                              rfp) < 0)
-                        EXIT(1);
-                    }
-                else
-                    {
-                    ret = AESTest(&ctx, amode, akeysz, aKey, iVec, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  plaintext, ciphertext, len);
-                    OutputValue("CIPHERTEXT",ciphertext,len,rfp,
-                                !strcmp(amode,"CFB1"));
-                    }
-                step = 6;
-                }
-            break;
-
-        case 5: /* CIPHERTEXT = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "CIPHERTEXT = ", 13) != 0)
-                {
-                printf("Missing KEY\n");
-                err = 1;
-                }
-            else
-                {
-                if(!strcmp(amode,"CFB1"))
-                    len=bint2bin(ibuf+13,strlen(ibuf+13)-1,ciphertext);
-                else
-                    len = hex2bin(ibuf+13,strlen(ibuf+13)-1,ciphertext);
-                if (len < 0)
-                    {
-                    printf("Invalid CIPHERTEXT\n");
-                    err =1;
-                    break;
-                    }
-
-                PrintValue("CIPHERTEXT", ciphertext, len);
-                if (strcmp(atest, "MCT") == 0)  /* Monte Carlo Test */
-                    {
-                    do_mct(amode, akeysz, aKey, iVec, 
-                           dir, ciphertext, len, rfp);
-                    }
-                else
-                    {
-                    ret = AESTest(&ctx, amode, akeysz, aKey, iVec, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  plaintext, ciphertext, len);
-                    OutputValue("PLAINTEXT",(unsigned char *)plaintext,len,rfp,
-                                !strcmp(amode,"CFB1"));
-                    }
-                step = 6;
-                }
-            break;
-
-        case 6:
-            if (ibuf[0] != '\n')
-                {
-                err = 1;
-                printf("Missing terminator\n");
-                }
-            else if (strcmp(atest, "MCT") != 0)
-                { /* MCT already added terminating nl */
-                fputs(ibuf, rfp);
-                }
-            step = 1;
-            break;
-            }
-        }
-    if (rfp)
-        fclose(rfp);
-    if (afp)
-        fclose(afp);
-    return err;
-    }
-
-/*--------------------------------------------------
-  Processes either a single file or 
-  a set of files whose names are passed in a file.
-  A single file is specified as:
-    aes_test -f xxx.req
-  A set of files is specified as:
-    aes_test -d xxxxx.xxx
-  The default is: -d req.txt
---------------------------------------------------*/
-int main(int argc, char **argv)
-    {
-    char *rqlist = "req.txt";
-    FILE *fp = NULL;
-    char fn[250] = "", rfn[256] = "";
-    int f_opt = 0, d_opt = 1;
-
-#ifdef OPENSSL_FIPS
-    if(!FIPS_mode_set(1,argv[0]))
-        {
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        EXIT(1);
-        }
-#endif
-    ERR_load_crypto_strings();
-    if (argc > 1)
-        {
-        if (strcasecmp(argv[1], "-d") == 0)
-            {
-            d_opt = 1;
-            }
-        else if (strcasecmp(argv[1], "-f") == 0)
-            {
-            f_opt = 1;
-            d_opt = 0;
-            }
-        else
-            {
-            printf("Invalid parameter: %s\n", argv[1]);
-            return 0;
-            }
-        if (argc < 3)
-            {
-            printf("Missing parameter\n");
-            return 0;
-            }
-        if (d_opt)
-            rqlist = argv[2];
-        else
-            strcpy(fn, argv[2]);
-        }
-    if (d_opt)
-        { /* list of files (directory) */
-        if (!(fp = fopen(rqlist, "r")))
-            {
-            printf("Cannot open req list file\n");
-            return -1;
-            }
-        while (fgets(fn, sizeof(fn), fp))
-            {
-            strtok(fn, "\r\n");
-            strcpy(rfn, fn);
-            printf("Processing: %s\n", rfn);
-            if (proc_file(rfn))
-                {
-                printf(">>> Processing failed for: %s <<<\n", rfn);
-                EXIT(1);
-                }
-            }
-        fclose(fp);
-        }
-    else /* single file */
-        {
-        printf("Processing: %s\n", fn);
-        if (proc_file(fn))
-            {
-            printf(">>> Processing failed for: %s <<<\n", fn);
-            }
-        }
-    EXIT(0);
-    return 0;
-    }
diff --git a/src/lib/libssl/src/fips/des/Makefile b/src/lib/libssl/src/fips/des/Makefile
deleted file mode 100644
index 87a5329d53..0000000000
--- a/src/lib/libssl/src/fips/des/Makefile
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-# SSLeay/fips/des/Makefile
-#
-
-DIR=    des
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-FIPS_DES_ENC=fips_des_enc.o
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST= fips_desmovs.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_des_enc.c asm/fips-dx86-elf.s fips_des_selftest.c fips_set_key.c
-LIBOBJ=$(FIPS_DES_ENC) fips_des_selftest.o fips_set_key.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER) fips_des_locl.h
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    check lib
-
-check:
-        TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
-lib:    $(LIBOBJ)
-        $(AR) $(LIB) $(LIBOBJ)
-        $(RANLIB) $(LIB) || echo Never mind.
-        @sleep 2; touch lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-top_fips_desmovs:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_desmovs sub_target)
-
-fips_desmovs: fips_desmovs.o $(TOP)/libcrypto.a
-        $(CC) $(CFLAGS) -o fips_desmovs fips_desmovs.o $(PEX_LIBS) $(TOP)/libcrypto.a $(EX_LIBS)
-        TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_desmovs
-
-fips_test: top_fips_desmovs
-        find ../testvectors/des/req -name '*.req' > testlist
-        -rm -rf ../testvectors/des/rsp
-        mkdir ../testvectors/des/rsp
-        ./fips_desmovs -d testlist
-        find ../testvectors/des2/req -name '*.req' > testlist
-        -rm -rf ../testvectors/des2/rsp
-        mkdir ../testvectors/des2/rsp
-        ./fips_desmovs -d testlist
-        find ../testvectors/des3/req -name '*.req' > testlist
-        -rm -rf ../testvectors/des3/rsp
-        mkdir ../testvectors/des3/rsp
-        ./fips_desmovs -d testlist
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) \
-                $(SRC) $(TEST)
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_des_enc.o: ../../e_os.h ../../include/openssl/crypto.h
-fips_des_enc.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_des_enc.o: ../../include/openssl/e_os2.h ../../include/openssl/fips.h
-fips_des_enc.o: ../../include/openssl/opensslconf.h
-fips_des_enc.o: ../../include/openssl/opensslv.h
-fips_des_enc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_des_enc.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_des_enc.o: ../../include/openssl/ui_compat.h fips_des_enc.c
-fips_des_enc.o: fips_des_locl.h
-fips_des_selftest.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
-fips_des_selftest.o: ../../include/openssl/des.h
-fips_des_selftest.o: ../../include/openssl/des_old.h
-fips_des_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_des_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_des_selftest.o: ../../include/openssl/opensslconf.h
-fips_des_selftest.o: ../../include/openssl/opensslv.h
-fips_des_selftest.o: ../../include/openssl/safestack.h
-fips_des_selftest.o: ../../include/openssl/stack.h
-fips_des_selftest.o: ../../include/openssl/symhacks.h
-fips_des_selftest.o: ../../include/openssl/ui.h
-fips_des_selftest.o: ../../include/openssl/ui_compat.h fips_des_selftest.c
-fips_desmovs.o: ../../e_os.h ../../include/openssl/aes.h
-fips_desmovs.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_desmovs.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
-fips_desmovs.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
-fips_desmovs.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_desmovs.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-fips_desmovs.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_desmovs.o: ../../include/openssl/evp.h ../../include/openssl/fips.h
-fips_desmovs.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
-fips_desmovs.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
-fips_desmovs.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
-fips_desmovs.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
-fips_desmovs.o: ../../include/openssl/opensslconf.h
-fips_desmovs.o: ../../include/openssl/opensslv.h
-fips_desmovs.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rc2.h
-fips_desmovs.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
-fips_desmovs.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
-fips_desmovs.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-fips_desmovs.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_desmovs.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_desmovs.o: fips_desmovs.c
-fips_set_key.o: ../../e_os.h ../../include/openssl/crypto.h
-fips_set_key.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
-fips_set_key.o: ../../include/openssl/e_os2.h ../../include/openssl/fips.h
-fips_set_key.o: ../../include/openssl/opensslconf.h
-fips_set_key.o: ../../include/openssl/opensslv.h
-fips_set_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_set_key.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_set_key.o: ../../include/openssl/ui_compat.h fips_des_locl.h
-fips_set_key.o: fips_set_key.c
diff --git a/src/lib/libssl/src/fips/des/fips_des_selftest.c b/src/lib/libssl/src/fips/des/fips_des_selftest.c
deleted file mode 100644
index 3e0778eb5e..0000000000
--- a/src/lib/libssl/src/fips/des/fips_des_selftest.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/des.h>
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-static struct
-    {
-    DES_cblock key;
-    unsigned char plaintext[8];
-    unsigned char ciphertext[8];
-    } tests[]=
-        {
-        {
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0x8C,0xA6,0x4D,0xE9,0xC1,0xB1,0x23,0xA7 }
-        },
-        {
-        { 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10 },
-        { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF },
-        { 0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4 },
-        },
-        };
-
-static struct
-    {
-    DES_cblock key1;
-    DES_cblock key2;
-    unsigned char plaintext[8];
-    unsigned char ciphertext[8];
-    } tests2[]=
-        {
-        {
-        { 0x7c,0x4f,0x6e,0xf7,0xa2,0x04,0x16,0xec },
-        { 0x0b,0x6b,0x7c,0x9e,0x5e,0x19,0xa7,0xc4 },
-        { 0x06,0xa7,0xd8,0x79,0xaa,0xce,0x69,0xef },
-        { 0x4c,0x11,0x17,0x55,0xbf,0xc4,0x4e,0xfd }
-        },
-        {
-        { 0x5d,0x9e,0x01,0xd3,0x25,0xc7,0x3e,0x34 },
-        { 0x01,0x16,0x7c,0x85,0x23,0xdf,0xe0,0x68 },
-        { 0x9c,0x50,0x09,0x0f,0x5e,0x7d,0x69,0x7e },
-        { 0xd2,0x0b,0x18,0xdf,0xd9,0x0d,0x9e,0xff },
-        }
-        };
-
-static struct
-    {
-    DES_cblock key1;
-    DES_cblock key2;
-    DES_cblock key3;
-    unsigned char plaintext[8];
-    unsigned char ciphertext[8];
-    } tests3[]=
-        {
-        {
-        { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-        { 0xFE,0xDC,0xBA,0x98,0x76,0x54,0x32,0x10 },
-        { 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0 },
-        { 0x8f,0x8f,0xbf,0x9b,0x5d,0x48,0xb4,0x1c},
-        { 0x59,0x8c,0xe5,0xd3,0x6c,0xa2,0xea,0x1b},
-        },
-        {
-        { 0xDC,0xBA,0x98,0x76,0x54,0x32,0x10,0xFE },
-        { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF },
-        { 0xED,0x39,0xD9,0x50,0xFA,0x74,0xBC,0xC4 },
-        { 0x01,0x23,0x45,0x67,0x89,0xAB,0xCD,0xEF },
-        { 0x11,0x25,0xb0,0x35,0xbe,0xa0,0x82,0x86 },
-        },
-        };
-
-void FIPS_corrupt_des()
-    {
-    tests[0].plaintext[0]++;
-    }
-
-int FIPS_selftest_des()
-    {
-    int n;
-
-    /* Encrypt/decrypt with DES and compare to known answers */
-    for(n=0 ; n < 2 ; ++n)
-        {
-        DES_key_schedule key;
-        DES_cblock buf;
-
-        DES_set_key(&tests[n].key,&key);
-        DES_ecb_encrypt(&tests[n].plaintext,&buf,&key,1);
-        if(memcmp(buf,tests[n].ciphertext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        DES_ecb_encrypt(&tests[n].ciphertext,&buf,&key,0);
-        if(memcmp(buf,tests[n].plaintext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-
-    /* Encrypt/decrypt with 2-key 3DES and compare to known answers */
-    for(n=0 ; n < 2 ; ++n)
-        {
-        DES_key_schedule key1, key2;
-        unsigned char buf[8];
-
-        DES_set_key(&tests2[n].key1,&key1);
-        DES_set_key(&tests2[n].key2,&key2);
-        DES_ecb2_encrypt(tests2[n].plaintext,buf,&key1,&key2,1);
-        if(memcmp(buf,tests2[n].ciphertext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        DES_ecb2_encrypt(tests2[n].ciphertext,buf,&key1,&key2,0);
-        if(memcmp(buf,tests2[n].plaintext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-
-    /* Encrypt/decrypt with 3DES and compare to known answers */
-    for(n=0 ; n < 2 ; ++n)
-        {
-        DES_key_schedule key1, key2, key3;
-        unsigned char buf[8];
-
-        DES_set_key(&tests3[n].key1,&key1);
-        DES_set_key(&tests3[n].key2,&key2);
-        DES_set_key(&tests3[n].key3,&key3);
-        DES_ecb3_encrypt(tests3[n].plaintext,buf,&key1,&key2,&key3,1);
-        if(memcmp(buf,tests3[n].ciphertext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        DES_ecb3_encrypt(tests3[n].ciphertext,buf,&key1,&key2,&key3,0);
-        if(memcmp(buf,tests3[n].plaintext,sizeof buf))
-            {
-            FIPSerr(FIPS_F_FIPS_SELFTEST_DES,FIPS_R_SELFTEST_FAILED);
-            return 0;
-            }
-        }
-
-    return 1;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips/des/fips_desmovs.c b/src/lib/libssl/src/fips/des/fips_desmovs.c
deleted file mode 100644
index d1b60c1a40..0000000000
--- a/src/lib/libssl/src/fips/des/fips_desmovs.c
+++ /dev/null
@@ -1,833 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2004 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*---------------------------------------------
-  NIST DES Modes of Operation Validation System
-  Test Program
-
-  Based on the AES Validation Suite, which was:
-  Donated to OpenSSL by:
-  V-ONE Corporation
-  20250 Century Blvd, Suite 300
-  Germantown, MD 20874
-  U.S.A.
-  ----------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <openssl/des.h>
-#include <openssl/evp.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-#include "e_os.h"
-
-/*#define AES_BLOCK_SIZE 16*/
-
-#define VERBOSE 0
-
-/*-----------------------------------------------*/
-
-int DESTest(EVP_CIPHER_CTX *ctx,
-            char *amode, int akeysz, unsigned char *aKey, 
-            unsigned char *iVec, 
-            int dir,  /* 0 = decrypt, 1 = encrypt */
-            unsigned char *out, unsigned char *in, int len)
-    {
-    const EVP_CIPHER *cipher = NULL;
-    int kt = 0;
-
-    if (ctx)
-        memset(ctx, 0, sizeof(EVP_CIPHER_CTX));
-
-    if (strcasecmp(amode, "CBC") == 0)
-        kt = 1000;
-    else if (strcasecmp(amode, "ECB") == 0)
-        kt = 2000;
-    else if (strcasecmp(amode, "CFB64") == 0)
-        kt = 3000;
-    else if (strncasecmp(amode, "OFB", 3) == 0)
-        kt = 4000;
-    else if(!strcasecmp(amode,"CFB1"))
-        kt=5000;
-    else if(!strcasecmp(amode,"CFB8"))
-        kt=6000;
-    else
-        {
-        printf("Unknown mode: %s\n", amode);
-        EXIT(1);
-        }
-    if (akeysz != 64 && akeysz != 192)
-        {
-        printf("Invalid key size: %d\n", akeysz);
-        EXIT(1);
-        }
-    else
-        {
-        kt += akeysz;
-        switch (kt)
-            {
-        case 1064:
-            cipher=EVP_des_cbc();
-            break;
-        case 1192:
-            cipher=EVP_des_ede3_cbc();
-            break;
-        case 2064:
-            cipher=EVP_des_ecb();
-            break;
-        case 2192:
-            cipher=EVP_des_ede3_ecb();
-            break;
-        case 3064:
-            cipher=EVP_des_cfb64();
-            break;
-        case 3192:
-            cipher=EVP_des_ede3_cfb64();
-            break;
-        case 4064:
-            cipher=EVP_des_ofb();
-            break;
-        case 4192:
-            cipher=EVP_des_ede3_ofb();
-            break;
-        case 5064:
-            cipher=EVP_des_cfb1();
-            break;
-        case 5192:
-            cipher=EVP_des_ede3_cfb1();
-            break;
-        case 6064:
-            cipher=EVP_des_cfb8();
-            break;
-        case 6192:
-            cipher=EVP_des_ede3_cfb8();
-            break;
-        default:
-            printf("Didn't handle mode %d\n",kt);
-            EXIT(1);
-            }
-        if(!EVP_CipherInit(ctx, cipher, aKey, iVec, dir))
-            {
-            ERR_print_errors_fp(stderr);
-            EXIT(1);
-            }
-        EVP_Cipher(ctx, out, in, len);
-        }
-    return 1;
-    }
-
-/*-----------------------------------------------*/
-
-int hex2bin(char *in, int len, unsigned char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1 = 0, n2 = 0; n1 < len; )
-        { /* first byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        if(len == 1)
-            {
-            out[n2++]=ch;
-            break;
-            }
-        out[n2] = ch << 4;
-        /* second byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        out[n2++] |= ch;
-        }
-    return n2;
-    }
-
-/*-----------------------------------------------*/
-
-int bin2hex(unsigned char *in, int len, char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1 = 0, n2 = 0; n1 < len; ++n1)
-        {
-        /* first nibble */
-        ch = in[n1] >> 4;
-        if (ch <= 0x09)
-            out[n2++] = ch + '0';
-        else
-            out[n2++] = ch - 10 + 'a';
-        /* second nibble */
-        ch = in[n1] & 0x0f;
-        if (ch <= 0x09)
-            out[n2++] = ch + '0';
-        else
-            out[n2++] = ch - 10 + 'a';
-        }
-    return n2;
-    }
-
-/* NB: this return the number of _bits_ read */
-int bint2bin(const char *in, int len, unsigned char *out)
-    {
-    int n;
-
-    memset(out,0,len);
-    for(n=0 ; n < len ; ++n)
-        if(in[n] == '1')
-            out[n/8]|=(0x80 >> (n%8));
-    return len;
-    }
-
-int bin2bint(const unsigned char *in,int len,char *out)
-    {
-    int n;
-
-    for(n=0 ; n < len ; ++n)
-        out[n]=(in[n/8]&(0x80 >> (n%8))) ? '1' : '0';
-    return n;
-    }
-
-/*-----------------------------------------------*/
-
-void PrintValue(char *tag, unsigned char *val, int len)
-    {
-#if VERBOSE
-    char obuf[2048];
-    int olen;
-    olen = bin2hex(val, len, obuf);
-    printf("%s = %.*s\n", tag, olen, obuf);
-#endif
-    }
-
-void DebugValue(char *tag, unsigned char *val, int len)
-    {
-    char obuf[2048];
-    int olen;
-    olen = bin2hex(val, len, obuf);
-    printf("%s = %.*s\n", tag, olen, obuf);
-    }
-
-void OutputValue(char *tag, unsigned char *val, int len, FILE *rfp,int bitmode)
-    {
-    char obuf[2048];
-    int olen;
-
-    if(bitmode)
-        olen=bin2bint(val,len,obuf);
-    else
-        olen=bin2hex(val,len,obuf);
-
-    fprintf(rfp, "%s = %.*s\n", tag, olen, obuf);
-#if VERBOSE
-    printf("%s = %.*s\n", tag, olen, obuf);
-#endif
-    }
-
-void shiftin(unsigned char *dst,unsigned char *src,int nbits)
-    {
-    int n;
-
-    /* move the bytes... */
-    memmove(dst,dst+nbits/8,3*8-nbits/8);
-    /* append new data */
-    memcpy(dst+3*8-nbits/8,src,(nbits+7)/8);
-    /* left shift the bits */
-    if(nbits%8)
-        for(n=0 ; n < 3*8 ; ++n)
-            dst[n]=(dst[n] << (nbits%8))|(dst[n+1] >> (8-nbits%8));
-    }   
-
-/*-----------------------------------------------*/
-char *t_tag[2] = {"PLAINTEXT", "CIPHERTEXT"};
-char *t_mode[6] = {"CBC","ECB","OFB","CFB1","CFB8","CFB64"};
-enum Mode {CBC, ECB, OFB, CFB1, CFB8, CFB64};
-int Sizes[6]={64,64,64,1,8,64};
-
-void do_mct(char *amode, 
-            int akeysz, int numkeys, unsigned char *akey,unsigned char *ivec,
-            int dir, unsigned char *text, int len,
-            FILE *rfp)
-    {
-    int i,imode;
-    unsigned char nk[4*8]; /* longest key+8 */
-    unsigned char text0[8];
-
-    for (imode=0 ; imode < 6 ; ++imode)
-        if(!strcmp(amode,t_mode[imode]))
-            break;
-    if (imode == 6)
-        { 
-        printf("Unrecognized mode: %s\n", amode);
-        EXIT(1);
-        }
-
-    for(i=0 ; i < 400 ; ++i)
-        {
-        int j;
-        int n;
-        EVP_CIPHER_CTX ctx;
-        int kp=akeysz/64;
-        unsigned char old_iv[8];
-
-        fprintf(rfp,"\nCOUNT = %d\n",i);
-        if(kp == 1)
-            OutputValue("KEY",akey,8,rfp,0);
-        else
-            for(n=0 ; n < kp ; ++n)
-                {
-                fprintf(rfp,"KEY%d",n+1);
-                OutputValue("",akey+n*8,8,rfp,0);
-                }
-
-        if(imode != ECB)
-            OutputValue("IV",ivec,8,rfp,0);
-        OutputValue(t_tag[dir^1],text,len,rfp,imode == CFB1);
-
-        /* compensate for endianness */
-        if(imode == CFB1)
-            text[0]<<=7;
-
-        memcpy(text0,text,8);
-
-        for(j=0 ; j < 10000 ; ++j)
-            {
-            unsigned char old_text[8];
-
-            memcpy(old_text,text,8);
-            if(j == 0)
-                {
-                memcpy(old_iv,ivec,8);
-                DESTest(&ctx,amode,akeysz,akey,ivec,dir,text,text,len);
-                }
-            else
-                {
-                memcpy(old_iv,ctx.iv,8);
-                EVP_Cipher(&ctx,text,text,len);
-                }
-            if(j == 9999)
-                {
-                OutputValue(t_tag[dir],text,len,rfp,imode == CFB1);
-                /*              memcpy(ivec,text,8); */
-                }
-            /*      DebugValue("iv",ctx.iv,8); */
-            /* accumulate material for the next key */
-            shiftin(nk,text,Sizes[imode]);
-            /*      DebugValue("nk",nk,24);*/
-            if((dir && (imode == CFB1 || imode == CFB8 || imode == CFB64
-                        || imode == CBC)) || imode == OFB)
-                memcpy(text,old_iv,8);
-
-            if(!dir && (imode == CFB1 || imode == CFB8 || imode == CFB64))
-                {
-                /* the test specifies using the output of the raw DES operation
-                   which we don't have, so reconstruct it... */
-                for(n=0 ; n < 8 ; ++n)
-                    text[n]^=old_text[n];
-                }
-            }
-        for(n=0 ; n < 8 ; ++n)
-            akey[n]^=nk[16+n];
-        for(n=0 ; n < 8 ; ++n)
-            akey[8+n]^=nk[8+n];
-        for(n=0 ; n < 8 ; ++n)
-            akey[16+n]^=nk[n];
-        if(numkeys < 3)
-            memcpy(&akey[2*8],akey,8);
-        if(numkeys < 2)
-            memcpy(&akey[8],akey,8);
-        DES_set_odd_parity((DES_cblock *)akey);
-        DES_set_odd_parity((DES_cblock *)(akey+8));
-        DES_set_odd_parity((DES_cblock *)(akey+16));
-        memcpy(ivec,ctx.iv,8);
-
-        /* pointless exercise - the final text doesn't depend on the
-           initial text in OFB mode, so who cares what it is? (Who
-           designed these tests?) */
-        if(imode == OFB)
-            for(n=0 ; n < 8 ; ++n)
-                text[n]=text0[n]^old_iv[n];
-        }
-    }
-    
-int proc_file(char *rqfile)
-    {
-    char afn[256], rfn[256];
-    FILE *afp = NULL, *rfp = NULL;
-    char ibuf[2048];
-    int ilen, len, ret = 0;
-    char amode[8] = "";
-    char atest[100] = "";
-    int akeysz=0;
-    unsigned char iVec[20], aKey[40];
-    int dir = -1, err = 0, step = 0;
-    unsigned char plaintext[2048];
-    unsigned char ciphertext[2048];
-    char *rp;
-    EVP_CIPHER_CTX ctx;
-    int numkeys=1;
-
-    if (!rqfile || !(*rqfile))
-        {
-        printf("No req file\n");
-        return -1;
-        }
-    strcpy(afn, rqfile);
-
-    if ((afp = fopen(afn, "r")) == NULL)
-        {
-        printf("Cannot open file: %s, %s\n", 
-               afn, strerror(errno));
-        return -1;
-        }
-    strcpy(rfn,afn);
-    rp=strstr(rfn,"req/");
-    assert(rp);
-    memcpy(rp,"rsp",3);
-    rp = strstr(rfn, ".req");
-    memcpy(rp, ".rsp", 4);
-    if ((rfp = fopen(rfn, "w")) == NULL)
-        {
-        printf("Cannot open file: %s, %s\n", 
-               rfn, strerror(errno));
-        fclose(afp);
-        afp = NULL;
-        return -1;
-        }
-    while (!err && (fgets(ibuf, sizeof(ibuf), afp)) != NULL)
-        {
-        ilen = strlen(ibuf);
-        /*      printf("step=%d ibuf=%s",step,ibuf);*/
-        if(step == 3 && !strcmp(amode,"ECB"))
-            {
-            memset(iVec, 0, sizeof(iVec));
-            step = (dir)? 4: 5;  /* no ivec for ECB */
-            }
-        switch (step)
-            {
-        case 0:  /* read preamble */
-            if (ibuf[0] == '\n')
-                { /* end of preamble */
-                if (*amode == '\0')
-                    {
-                    printf("Missing Mode\n");
-                    err = 1;
-                    }
-                else
-                    {
-                    fputs(ibuf, rfp);
-                    ++ step;
-                    }
-                }
-            else if (ibuf[0] != '#')
-                {
-                printf("Invalid preamble item: %s\n", ibuf);
-                err = 1;
-                }
-            else
-                { /* process preamble */
-                char *xp, *pp = ibuf+2;
-                int n;
-                if(*amode)
-                    { /* insert current time & date */
-                    time_t rtim = time(0);
-                    fprintf(rfp, "# %s", ctime(&rtim));
-                    }
-                else
-                    {
-                    fputs(ibuf, rfp);
-                    if(!strncmp(pp,"INVERSE ",8) || !strncmp(pp,"DES ",4)
-                       || !strncmp(pp,"TDES ",5)
-                       || !strncmp(pp,"PERMUTATION ",12)
-                       || !strncmp(pp,"SUBSTITUTION ",13)
-                       || !strncmp(pp,"VARIABLE ",9))
-                        {
-                        /* get test type */
-                        if(!strncmp(pp,"DES ",4))
-                            pp+=4;
-                        else if(!strncmp(pp,"TDES ",5))
-                            pp+=5;
-                        xp = strchr(pp, ' ');
-                        n = xp-pp;
-                        strncpy(atest, pp, n);
-                        atest[n] = '\0';
-                        /* get mode */
-                        xp = strrchr(pp, ' '); /* get mode" */
-                        n = strlen(xp+1)-1;
-                        strncpy(amode, xp+1, n);
-                        amode[n] = '\0';
-                        /* amode[3] = '\0'; */
-                        printf("Test=%s, Mode=%s\n",atest,amode);
-                        }
-                    }
-                }
-            break;
-
-        case 1:  /* [ENCRYPT] | [DECRYPT] */
-            if(ibuf[0] == '\n')
-                break;
-            if (ibuf[0] == '[')
-                {
-                fputs(ibuf, rfp);
-                ++step;
-                if (strncasecmp(ibuf, "[ENCRYPT]", 9) == 0)
-                    dir = 1;
-                else if (strncasecmp(ibuf, "[DECRYPT]", 9) == 0)
-                    dir = 0;
-                else
-                    {
-                    printf("Invalid keyword: %s\n", ibuf);
-                    err = 1;
-                    }
-                break;
-                }
-            else if (dir == -1)
-                {
-                err = 1;
-                printf("Missing ENCRYPT/DECRYPT keyword\n");
-                break;
-                }
-            else 
-                step = 2;
-
-        case 2: /* KEY = xxxx */
-            if(*ibuf == '\n')
-                {
-                fputs(ibuf, rfp);
-                break;
-                }
-            if(!strncasecmp(ibuf,"COUNT = ",8))
-                {
-                fputs(ibuf, rfp);
-                break;
-                }
-            if(!strncasecmp(ibuf,"COUNT=",6))
-                {
-                fputs(ibuf, rfp);
-                break;
-                }
-            if(!strncasecmp(ibuf,"NumKeys = ",10))
-                {
-                numkeys=atoi(ibuf+10);
-                break;
-                }
-          
-            fputs(ibuf, rfp);
-            if(!strncasecmp(ibuf,"KEY = ",6))
-                {
-                akeysz=64;
-                len = hex2bin((char*)ibuf+6, strlen(ibuf+6)-1, aKey);
-                if (len < 0)
-                    {
-                    printf("Invalid KEY\n");
-                    err=1;
-                    break;
-                    }
-                PrintValue("KEY", aKey, len);
-                ++step;
-                }
-            else if(!strncasecmp(ibuf,"KEYs = ",7))
-                {
-                akeysz=64*3;
-                len=hex2bin(ibuf+7,strlen(ibuf+7)-1,aKey);
-                if(len != 8)
-                    {
-                    printf("Invalid KEY\n");
-                    err=1;
-                    break;
-                    }
-                memcpy(aKey+8,aKey,8);
-                memcpy(aKey+16,aKey,8);
-                ibuf[4]='\0';
-                PrintValue("KEYs",aKey,len);
-                ++step;
-                }
-            else if(!strncasecmp(ibuf,"KEY",3))
-                {
-                int n=ibuf[3]-'1';
-
-                akeysz=64*3;
-                len=hex2bin(ibuf+7,strlen(ibuf+7)-1,aKey+n*8);
-                if(len != 8)
-                    {
-                    printf("Invalid KEY\n");
-                    err=1;
-                    break;
-                    }
-                ibuf[4]='\0';
-                PrintValue(ibuf,aKey,len);
-                if(n == 2)
-                    ++step;
-                }
-            else
-                {
-                printf("Missing KEY\n");
-                err = 1;
-                }
-            break;
-
-        case 3: /* IV = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "IV = ", 5) != 0)
-                {
-                printf("Missing IV\n");
-                err = 1;
-                }
-            else
-                {
-                len = hex2bin((char*)ibuf+5, strlen(ibuf+5)-1, iVec);
-                if (len < 0)
-                    {
-                    printf("Invalid IV\n");
-                    err =1;
-                    break;
-                    }
-                PrintValue("IV", iVec, len);
-                step = (dir)? 4: 5;
-                }
-            break;
-
-        case 4: /* PLAINTEXT = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "PLAINTEXT = ", 12) != 0)
-                {
-                printf("Missing PLAINTEXT\n");
-                err = 1;
-                }
-            else
-                {
-                int nn = strlen(ibuf+12);
-                if(!strcmp(amode,"CFB1"))
-                    len=bint2bin(ibuf+12,nn-1,plaintext);
-                else
-                    len=hex2bin(ibuf+12, nn-1,plaintext);
-                if (len < 0)
-                    {
-                    printf("Invalid PLAINTEXT: %s", ibuf+12);
-                    err =1;
-                    break;
-                    }
-                if (len >= sizeof(plaintext))
-                    {
-                    printf("Buffer overflow\n");
-                    }
-                PrintValue("PLAINTEXT", (unsigned char*)plaintext, len);
-                if (strcmp(atest, "Monte") == 0)  /* Monte Carlo Test */
-                    {
-                    do_mct(amode,akeysz,numkeys,aKey,iVec,dir,plaintext,len,rfp);
-                    }
-                else
-                    {
-                    assert(dir == 1);
-                    ret = DESTest(&ctx, amode, akeysz, aKey, iVec, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  ciphertext, plaintext, len);
-                    OutputValue("CIPHERTEXT",ciphertext,len,rfp,
-                                !strcmp(amode,"CFB1"));
-                    }
-                step = 6;
-                }
-            break;
-
-        case 5: /* CIPHERTEXT = xxxx */
-            fputs(ibuf, rfp);
-            if (strncasecmp(ibuf, "CIPHERTEXT = ", 13) != 0)
-                {
-                printf("Missing KEY\n");
-                err = 1;
-                }
-            else
-                {
-                if(!strcmp(amode,"CFB1"))
-                    len=bint2bin(ibuf+13,strlen(ibuf+13)-1,ciphertext);
-                else
-                    len = hex2bin(ibuf+13,strlen(ibuf+13)-1,ciphertext);
-                if (len < 0)
-                    {
-                    printf("Invalid CIPHERTEXT\n");
-                    err =1;
-                    break;
-                    }
-                
-                PrintValue("CIPHERTEXT", ciphertext, len);
-                if (strcmp(atest, "Monte") == 0)  /* Monte Carlo Test */
-                    {
-                    do_mct(amode, akeysz, numkeys, aKey, iVec, 
-                           dir, ciphertext, len, rfp);
-                    }
-                else
-                    {
-                    assert(dir == 0);
-                    ret = DESTest(&ctx, amode, akeysz, aKey, iVec, 
-                                  dir,  /* 0 = decrypt, 1 = encrypt */
-                                  plaintext, ciphertext, len);
-                    OutputValue("PLAINTEXT",(unsigned char *)plaintext,len,rfp,
-                                !strcmp(amode,"CFB1"));
-                    }
-                step = 6;
-                }
-            break;
-
-        case 6:
-            if (ibuf[0] != '\n')
-                {
-                err = 1;
-                printf("Missing terminator\n");
-                }
-            else if (strcmp(atest, "MCT") != 0)
-                { /* MCT already added terminating nl */
-                fputs(ibuf, rfp);
-                }
-            step = 1;
-            break;
-            }
-        }
-    if (rfp)
-        fclose(rfp);
-    if (afp)
-        fclose(afp);
-    return err;
-    }
-
-/*--------------------------------------------------
-  Processes either a single file or 
-  a set of files whose names are passed in a file.
-  A single file is specified as:
-    aes_test -f xxx.req
-  A set of files is specified as:
-    aes_test -d xxxxx.xxx
-  The default is: -d req.txt
---------------------------------------------------*/
-int main(int argc, char **argv)
-    {
-    char *rqlist = "req.txt";
-    FILE *fp = NULL;
-    char fn[250] = "", rfn[256] = "";
-    int f_opt = 0, d_opt = 1;
-
-#ifdef OPENSSL_FIPS
-    if(!FIPS_mode_set(1,argv[0]))
-        {
-        ERR_load_crypto_strings();
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        EXIT(1);
-        }
-#endif
-    ERR_load_crypto_strings();
-    if (argc > 1)
-        {
-        if (strcasecmp(argv[1], "-d") == 0)
-            {
-            d_opt = 1;
-            }
-        else if (strcasecmp(argv[1], "-f") == 0)
-            {
-            f_opt = 1;
-            d_opt = 0;
-            }
-        else
-            {
-            printf("Invalid parameter: %s\n", argv[1]);
-            return 0;
-            }
-        if (argc < 3)
-            {
-            printf("Missing parameter\n");
-            return 0;
-            }
-        if (d_opt)
-            rqlist = argv[2];
-        else
-            strcpy(fn, argv[2]);
-        }
-    if (d_opt)
-        { /* list of files (directory) */
-        if (!(fp = fopen(rqlist, "r")))
-            {
-            printf("Cannot open req list file\n");
-            return -1;
-            }
-        while (fgets(fn, sizeof(fn), fp))
-            {
-            strtok(fn, "\r\n");
-            strcpy(rfn, fn);
-            printf("Processing: %s\n", rfn);
-            if (proc_file(rfn))
-                {
-                printf(">>> Processing failed for: %s <<<\n", rfn);
-                EXIT(1);
-                }
-            }
-        fclose(fp);
-        }
-    else /* single file */
-        {
-        printf("Processing: %s\n", fn);
-        if (proc_file(fn))
-            {
-            printf(">>> Processing failed for: %s <<<\n", fn);
-            }
-        }
-    EXIT(0);
-    return 0;
-    }
diff --git a/src/lib/libssl/src/fips/dh/Makefile b/src/lib/libssl/src/fips/dh/Makefile
deleted file mode 100644
index 10b40aa9f6..0000000000
--- a/src/lib/libssl/src/fips/dh/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# SSLeay/fips/dh/Makefile
-#
-
-DIR=    dh
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_dh_check.c fips_dh_gen.c fips_dh_key.c
-LIBOBJ=fips_dh_check.o fips_dh_gen.o fips_dh_key.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    check lib
-
-lib:    $(LIBOBJ)
-        $(AR) $(LIB) $(LIBOBJ)
-        $(RANLIB) $(LIB) || echo Never mind.
-        @sleep 2; touch lib
-
-check:
-        TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_dh_check.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dh_check.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-fips_dh_check.o: ../../include/openssl/e_os2.h
-fips_dh_check.o: ../../include/openssl/opensslconf.h
-fips_dh_check.o: ../../include/openssl/opensslv.h
-fips_dh_check.o: ../../include/openssl/ossl_typ.h
-fips_dh_check.o: ../../include/openssl/safestack.h
-fips_dh_check.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_dh_check.o: fips_dh_check.c
-fips_dh_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dh_gen.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-fips_dh_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_dh_gen.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_dh_gen.o: ../../include/openssl/opensslconf.h
-fips_dh_gen.o: ../../include/openssl/opensslv.h
-fips_dh_gen.o: ../../include/openssl/ossl_typ.h
-fips_dh_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_dh_gen.o: ../../include/openssl/symhacks.h fips_dh_gen.c
-fips_dh_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dh_key.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-fips_dh_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_dh_key.o: ../../include/openssl/lhash.h
-fips_dh_key.o: ../../include/openssl/opensslconf.h
-fips_dh_key.o: ../../include/openssl/opensslv.h
-fips_dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_dh_key.o: ../../include/openssl/symhacks.h fips_dh_key.c
diff --git a/src/lib/libssl/src/fips/dh/fips_dh_check.c b/src/lib/libssl/src/fips/dh/fips_dh_check.c
deleted file mode 100644
index 874920b466..0000000000
--- a/src/lib/libssl/src/fips/dh/fips_dh_check.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/* crypto/dh/dh_check.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-
-#ifdef OPENSSL_FIPS
-
-/* Check that p is a safe prime and
- * if g is 2, 3 or 5, check that is is a suitable generator
- * where
- * for 2, p mod 24 == 11
- * for 3, p mod 12 == 5
- * for 5, p mod 10 == 3 or 7
- * should hold.
- */
-
-int DH_check(const DH *dh, int *ret)
-        {
-        int ok=0;
-        BN_CTX *ctx=NULL;
-        BN_ULONG l;
-        BIGNUM *q=NULL;
-
-        *ret=0;
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        q=BN_new();
-        if (q == NULL) goto err;
-
-        if (BN_is_word(dh->g,DH_GENERATOR_2))
-                {
-                l=BN_mod_word(dh->p,24);
-                if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-#if 0
-        else if (BN_is_word(dh->g,DH_GENERATOR_3))
-                {
-                l=BN_mod_word(dh->p,12);
-                if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-#endif
-        else if (BN_is_word(dh->g,DH_GENERATOR_5))
-                {
-                l=BN_mod_word(dh->p,10);
-                if ((l != 3) && (l != 7))
-                        *ret|=DH_NOT_SUITABLE_GENERATOR;
-                }
-        else
-                *ret|=DH_UNABLE_TO_CHECK_GENERATOR;
-
-        if (!BN_is_prime(dh->p,BN_prime_checks,NULL,ctx,NULL))
-                *ret|=DH_CHECK_P_NOT_PRIME;
-        else
-                {
-                if (!BN_rshift1(q,dh->p)) goto err;
-                if (!BN_is_prime(q,BN_prime_checks,NULL,ctx,NULL))
-                        *ret|=DH_CHECK_P_NOT_SAFE_PRIME;
-                }
-        ok=1;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (q != NULL) BN_free(q);
-        return(ok);
-        }
-
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips/dh/fips_dh_gen.c b/src/lib/libssl/src/fips/dh/fips_dh_gen.c
deleted file mode 100644
index b569e3912d..0000000000
--- a/src/lib/libssl/src/fips/dh/fips_dh_gen.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* crypto/dh/dh_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-#endif
-#include <openssl/fips.h>
-
-#ifndef OPENSSL_NO_DH
-#ifdef OPENSSL_FIPS
-
-/* We generate DH parameters as follows
- * find a prime q which is prime_len/2 bits long.
- * p=(2*q)+1 or (p-1)/2 = q
- * For this case, g is a generator if
- * g^((p-1)/q) mod p != 1 for values of q which are the factors of p-1.
- * Since the factors of p-1 are q and 2, we just need to check
- * g^2 mod p != 1 and g^q mod p != 1.
- *
- * Having said all that,
- * there is another special case method for the generators 2, 3 and 5.
- * for 2, p mod 24 == 11
- * for 3, p mod 12 == 5  <<<<< does not work for safe primes.
- * for 5, p mod 10 == 3 or 7
- *
- * Thanks to Phil Karn <karn@qualcomm.com> for the pointers about the
- * special generators and for answering some of my questions.
- *
- * I've implemented the second simple method :-).
- * Since DH should be using a safe prime (both p and q are prime),
- * this generator function can take a very very long time to run.
- */
-/* Actually there is no reason to insist that 'generator' be a generator.
- * It's just as OK (and in some sense better) to use a generator of the
- * order-q subgroup.
- */
-
-DH *DH_generate_parameters(int prime_len, int generator,
-             void (*callback)(int,int,void *), void *cb_arg)
-        {
-        BIGNUM *p=NULL,*t1,*t2;
-        DH *ret=NULL;
-        int g,ok= -1;
-        BN_CTX *ctx=NULL;
-
-        if(FIPS_selftest_failed())
-                {
-                FIPSerr(FIPS_F_DH_GENERATE_PARAMETERS,FIPS_R_FIPS_SELFTEST_FAILED);
-                return NULL;
-                }
-
-        ret=DH_new();
-        if (ret == NULL) goto err;
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        BN_CTX_start(ctx);
-        t1 = BN_CTX_get(ctx);
-        t2 = BN_CTX_get(ctx);
-        if (t1 == NULL || t2 == NULL) goto err;
-        
-        if (generator <= 1)
-                {
-                DHerr(DH_F_DH_GENERATE_PARAMETERS, DH_R_BAD_GENERATOR);
-                goto err;
-                }
-        if (generator == DH_GENERATOR_2)
-                {
-                if (!BN_set_word(t1,24)) goto err;
-                if (!BN_set_word(t2,11)) goto err;
-                g=2;
-                }
-#if 0 /* does not work for safe primes */
-        else if (generator == DH_GENERATOR_3)
-                {
-                if (!BN_set_word(t1,12)) goto err;
-                if (!BN_set_word(t2,5)) goto err;
-                g=3;
-                }
-#endif
-        else if (generator == DH_GENERATOR_5)
-                {
-                if (!BN_set_word(t1,10)) goto err;
-                if (!BN_set_word(t2,3)) goto err;
-                /* BN_set_word(t3,7); just have to miss
-                 * out on these ones :-( */
-                g=5;
-                }
-        else
-                {
-                /* in the general case, don't worry if 'generator' is a
-                 * generator or not: since we are using safe primes,
-                 * it will generate either an order-q or an order-2q group,
-                 * which both is OK */
-                if (!BN_set_word(t1,2)) goto err;
-                if (!BN_set_word(t2,1)) goto err;
-                g=generator;
-                }
-        
-        p=BN_generate_prime(NULL,prime_len,1,t1,t2,callback,cb_arg);
-        if (p == NULL) goto err;
-        if (callback != NULL) callback(3,0,cb_arg);
-        ret->p=p;
-        ret->g=BN_new();
-        if (!BN_set_word(ret->g,g)) goto err;
-        ok=1;
-err:
-        if (ok == -1)
-                {
-                DHerr(DH_F_DH_GENERATE_PARAMETERS,ERR_R_BN_LIB);
-                ok=0;
-                }
-
-        if (ctx != NULL)
-                {
-                BN_CTX_end(ctx);
-                BN_CTX_free(ctx);
-                }
-        if (!ok && (ret != NULL))
-                {
-                DH_free(ret);
-                ret=NULL;
-                }
-        return(ret);
-        }
-
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips/dh/fips_dh_key.c b/src/lib/libssl/src/fips/dh/fips_dh_key.c
deleted file mode 100644
index 41e3a661c0..0000000000
--- a/src/lib/libssl/src/fips/dh/fips_dh_key.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* crypto/dh/dh_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_RAND
-#include <openssl/rand.h>
-#endif
-#ifndef OPENSSL_NO_DH
-#include <openssl/dh.h>
-
-#ifdef OPENSSL_FIPS
-
-static int generate_key(DH *dh);
-static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
-static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
-                        const BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *m, BN_CTX *ctx,
-                        BN_MONT_CTX *m_ctx);
-static int dh_init(DH *dh);
-static int dh_finish(DH *dh);
-
-int DH_generate_key(DH *dh)
-        {
-        return dh->meth->generate_key(dh);
-        }
-
-int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
-        {
-        return dh->meth->compute_key(key, pub_key, dh);
-        }
-
-static DH_METHOD dh_ossl = {
-"OpenSSL DH Method",
-generate_key,
-compute_key,
-dh_bn_mod_exp,
-dh_init,
-dh_finish,
-0,
-NULL
-};
-
-const DH_METHOD *DH_OpenSSL(void)
-{
-        return &dh_ossl;
-}
-
-static int generate_key(DH *dh)
-        {
-        int ok=0;
-        int generate_new_key=0;
-        unsigned l;
-        BN_CTX *ctx;
-        BN_MONT_CTX *mont;
-        BIGNUM *pub_key=NULL,*priv_key=NULL;
-
-        ctx = BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        if (dh->priv_key == NULL)
-                {
-                priv_key=BN_new();
-                if (priv_key == NULL) goto err;
-                generate_new_key=1;
-                }
-        else
-                priv_key=dh->priv_key;
-
-        if (dh->pub_key == NULL)
-                {
-                pub_key=BN_new();
-                if (pub_key == NULL) goto err;
-                }
-        else
-                pub_key=dh->pub_key;
-
-        if ((dh->method_mont_p == NULL) && (dh->flags & DH_FLAG_CACHE_MONT_P))
-                {
-                if ((dh->method_mont_p=(char *)BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set((BN_MONT_CTX *)dh->method_mont_p,
-                                dh->p,ctx)) goto err;
-                }
-        mont=(BN_MONT_CTX *)dh->method_mont_p;
-
-        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->meth->bn_mod_exp(dh, pub_key, dh->g, priv_key,dh->p,ctx,mont))
-                goto err;
-                
-        dh->pub_key=pub_key;
-        dh->priv_key=priv_key;
-        ok=1;
-err:
-        if (ok != 1)
-                DHerr(DH_F_DH_GENERATE_KEY,ERR_R_BN_LIB);
-
-        if ((pub_key != NULL)  && (dh->pub_key == NULL))  BN_free(pub_key);
-        if ((priv_key != NULL) && (dh->priv_key == NULL)) BN_free(priv_key);
-        BN_CTX_free(ctx);
-        return(ok);
-        }
-
-static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
-        {
-        BN_CTX *ctx;
-        BN_MONT_CTX *mont;
-        BIGNUM *tmp;
-        int ret= -1;
-
-        ctx = BN_CTX_new();
-        if (ctx == NULL) goto err;
-        BN_CTX_start(ctx);
-        tmp = BN_CTX_get(ctx);
-        
-        if (dh->priv_key == NULL)
-                {
-                DHerr(DH_F_DH_COMPUTE_KEY,DH_R_NO_PRIVATE_VALUE);
-                goto err;
-                }
-        if ((dh->method_mont_p == NULL) && (dh->flags & DH_FLAG_CACHE_MONT_P))
-                {
-                if ((dh->method_mont_p=(char *)BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set((BN_MONT_CTX *)dh->method_mont_p,
-                                dh->p,ctx)) goto err;
-                }
-
-        mont=(BN_MONT_CTX *)dh->method_mont_p;
-        if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key,dh->p,ctx,mont))
-                {
-                DHerr(DH_F_DH_COMPUTE_KEY,ERR_R_BN_LIB);
-                goto err;
-                }
-
-        ret=BN_bn2bin(tmp,key);
-err:
-        BN_CTX_end(ctx);
-        BN_CTX_free(ctx);
-        return(ret);
-        }
-
-static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
-                        const BIGNUM *a, const BIGNUM *p,
-                        const BIGNUM *m, BN_CTX *ctx,
-                        BN_MONT_CTX *m_ctx)
-        {
-        if (a->top == 1)
-                {
-                BN_ULONG A = a->d[0];
-                return BN_mod_exp_mont_word(r,A,p,m,ctx,m_ctx);
-                }
-        else
-                return BN_mod_exp_mont(r,a,p,m,ctx,m_ctx);
-        }
-
-
-static int dh_init(DH *dh)
-        {
-        dh->flags |= DH_FLAG_CACHE_MONT_P;
-        return(1);
-        }
-
-static int dh_finish(DH *dh)
-        {
-        if(dh->method_mont_p)
-                BN_MONT_CTX_free((BN_MONT_CTX *)dh->method_mont_p);
-        return(1);
-        }
-
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips/dsa/Makefile b/src/lib/libssl/src/fips/dsa/Makefile
deleted file mode 100644
index 0cc5704ed1..0000000000
--- a/src/lib/libssl/src/fips/dsa/Makefile
+++ /dev/null
@@ -1,158 +0,0 @@
-#
-# SSLeay/fips/dsa/Makefile
-#
-
-DIR=    dsa
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=fips_dsatest.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_dsa_ossl.c fips_dsa_gen.c fips_dsa_selftest.c
-LIBOBJ=fips_dsa_ossl.o fips_dsa_gen.o fips_dsa_selftest.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    check lib
-
-lib:    $(LIBOBJ)
-        $(AR) $(LIB) $(LIBOBJ)
-        $(RANLIB) $(LIB) || echo Never mind.
-        @sleep 2; touch lib
-
-check:
-        TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do  \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-top_fips_dssvs:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) TARGET=fips_dssvs sub_target)
-
-fips_dssvs: fips_dssvs.o $(TOP)/libcrypto.a
-        $(CC) $(CFLAGS) -o fips_dssvs fips_dssvs.o $(PEX_LIBS) $(TOP)/libcrypto.a $(EX_LIBS)
-        TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_dssvs
-
-Q=../testvectors/dsa/req
-A=../testvectors/dsa/rsp
-
-fips_test: top_fips_dssvs
-        -rm -rf $A
-        mkdir $A
-        ./fips_dssvs pqg < $Q/PQGGen.req > $A/PQGGen.rsp
-        ./fips_dssvs keypair < $Q/KeyPair.req > $A/KeyPair.rsp
-        ./fips_dssvs siggen < $Q/SigGen.req > $A/SigGen.rsp
-        ./fips_dssvs sigver < $Q/SigVer.req > $A/SigVer.rsp
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_dsa_gen.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h
-fips_dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h
-fips_dsa_gen.o: ../../include/openssl/bn.h ../../include/openssl/cast.h
-fips_dsa_gen.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_dsa_gen.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/evp.h
-fips_dsa_gen.o: ../../include/openssl/fips.h ../../include/openssl/idea.h
-fips_dsa_gen.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
-fips_dsa_gen.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
-fips_dsa_gen.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
-fips_dsa_gen.o: ../../include/openssl/objects.h
-fips_dsa_gen.o: ../../include/openssl/opensslconf.h
-fips_dsa_gen.o: ../../include/openssl/opensslv.h
-fips_dsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_dsa_gen.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h
-fips_dsa_gen.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h
-fips_dsa_gen.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_dsa_gen.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
-fips_dsa_gen.o: ../../include/openssl/ui_compat.h fips_dsa_gen.c
-fips_dsa_ossl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_dsa_ossl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_dsa_ossl.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
-fips_dsa_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
-fips_dsa_ossl.o: ../../include/openssl/err.h ../../include/openssl/fips.h
-fips_dsa_ossl.o: ../../include/openssl/lhash.h
-fips_dsa_ossl.o: ../../include/openssl/opensslconf.h
-fips_dsa_ossl.o: ../../include/openssl/opensslv.h
-fips_dsa_ossl.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_dsa_ossl.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_dsa_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_dsa_ossl.o: ../../include/openssl/ui.h fips_dsa_ossl.c
-fips_dsa_selftest.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dsa_selftest.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
-fips_dsa_selftest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_dsa_selftest.o: ../../include/openssl/err.h ../../include/openssl/fips.h
-fips_dsa_selftest.o: ../../include/openssl/lhash.h
-fips_dsa_selftest.o: ../../include/openssl/opensslconf.h
-fips_dsa_selftest.o: ../../include/openssl/opensslv.h
-fips_dsa_selftest.o: ../../include/openssl/ossl_typ.h
-fips_dsa_selftest.o: ../../include/openssl/safestack.h
-fips_dsa_selftest.o: ../../include/openssl/stack.h
-fips_dsa_selftest.o: ../../include/openssl/symhacks.h fips_dsa_selftest.c
-fips_dsatest.o: ../../e_os.h ../../include/openssl/asn1.h
-fips_dsatest.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-fips_dsatest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_dsatest.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
-fips_dsatest.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
-fips_dsatest.o: ../../include/openssl/engine.h ../../include/openssl/err.h
-fips_dsatest.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h
-fips_dsatest.o: ../../include/openssl/lhash.h
-fips_dsatest.o: ../../include/openssl/opensslconf.h
-fips_dsatest.o: ../../include/openssl/opensslv.h
-fips_dsatest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_dsatest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_dsatest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_dsatest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_dsatest.o: fips_dsatest.c
diff --git a/src/lib/libssl/src/fips/dsa/fips_dsa_gen.c b/src/lib/libssl/src/fips/dsa/fips_dsa_gen.c
deleted file mode 100644
index 21fa3d1783..0000000000
--- a/src/lib/libssl/src/fips/dsa/fips_dsa_gen.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/* crypto/dsa/dsa_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#undef GENUINE_DSA
-
-#ifdef GENUINE_DSA
-/* Parameter generation follows the original release of FIPS PUB 186,
- * Appendix 2.2 (i.e. use SHA as defined in FIPS PUB 180) */
-#define HASH    EVP_sha()
-#else
-/* Parameter generation follows the updated Appendix 2.2 for FIPS PUB 186,
- * also Appendix 2.2 of FIPS PUB 186-1 (i.e. use SHA as defined in
- * FIPS PUB 180-1) */
-#define HASH    EVP_sha1()
-#endif 
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-/*#include "cryptlib.h"*/
-#include <openssl/evp.h>
-#include <openssl/bn.h>
-#ifndef OPENSSL_NO_DSA
-#include <openssl/dsa.h>
-#endif
-#ifndef OPENSSL_NO_RAND
-#include <openssl/rand.h>
-#endif
-#ifndef OPENSSL_NO_SHA
-#include <openssl/sha.h>
-#endif
-#include <openssl/fips.h>
-#include <openssl/err.h>
-
-#ifndef OPENSSL_NO_DSA
-#ifdef OPENSSL_FIPS
-
-static int fips_check_dsa(DSA *dsa)
-    {
-    static const unsigned char str1[]="12345678901234567890";
-    unsigned char sig[256];
-    unsigned int siglen;
-
-    DSA_sign(0, str1, 20, sig, &siglen, dsa);
-    if(DSA_verify(0, str1, 20, sig, siglen, dsa) != 1)
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
-        return 0;
-        }
-    return 1;
-    }
-
-DSA *DSA_generate_parameters(FIPS_DSA_SIZE_T bits,
-                unsigned char *seed_in, FIPS_DSA_SIZE_T seed_len,
-                int *counter_ret, unsigned long *h_ret,
-                void (*callback)(int, int, void *),
-                void *cb_arg)
-        {
-        int ok=0;
-        unsigned char seed[SHA_DIGEST_LENGTH];
-        unsigned char md[SHA_DIGEST_LENGTH];
-        unsigned char buf[SHA_DIGEST_LENGTH],buf2[SHA_DIGEST_LENGTH];
-        BIGNUM *r0,*W,*X,*c,*test;
-        BIGNUM *g=NULL,*q=NULL,*p=NULL;
-        BN_MONT_CTX *mont=NULL;
-        int k,n=0,i,b,m=0;
-        int counter=0;
-        int r=0;
-        BN_CTX *ctx=NULL,*ctx2=NULL,*ctx3=NULL;
-        unsigned int h=2;
-        DSA *ret=NULL;
-        unsigned char *seed_out=seed_in;
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_DSA_GENERATE_PARAMETERS,
-                    FIPS_R_FIPS_SELFTEST_FAILED);
-            goto err;
-            }
-
-        if (bits < 512) bits=512;
-        bits=(bits+63)/64*64;
-
-        if (seed_len < 20)
-                seed_in = NULL; /* seed buffer too small -- ignore */
-        if (seed_len > 20) 
-                seed_len = 20; /* App. 2.2 of FIPS PUB 186 allows larger SEED,
-                                * but our internal buffers are restricted to 160 bits*/
-        if ((seed_in != NULL) && (seed_len == 20))
-                memcpy(seed,seed_in,seed_len);
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        if ((ctx2=BN_CTX_new()) == NULL) goto err;
-        if ((ctx3=BN_CTX_new()) == NULL) goto err;
-        if ((ret=DSA_new()) == NULL) goto err;
-
-        if ((mont=BN_MONT_CTX_new()) == NULL) goto err;
-
-        BN_CTX_start(ctx2);
-        r0 = BN_CTX_get(ctx2);
-        g = BN_CTX_get(ctx2);
-        W = BN_CTX_get(ctx2);
-        q = BN_CTX_get(ctx2);
-        X = BN_CTX_get(ctx2);
-        c = BN_CTX_get(ctx2);
-        p = BN_CTX_get(ctx2);
-        test = BN_CTX_get(ctx2);
-
-        BN_lshift(test,BN_value_one(),bits-1);
-
-        for (;;)
-                {
-                for (;;) /* find q */
-                        {
-                        int seed_is_random;
-
-                        /* step 1 */
-                        if (callback != NULL) callback(0,m++,cb_arg);
-
-                        if (!seed_len)
-                                {
-                                if(RAND_pseudo_bytes(seed,SHA_DIGEST_LENGTH) < 0)
-                                        goto err;
-                                seed_is_random = 1;
-                                }
-                        else
-                                {
-                                seed_is_random = 0;
-                                seed_len=0; /* use random seed if 'seed_in' turns out to be bad*/
-                                }
-                        memcpy(buf,seed,SHA_DIGEST_LENGTH);
-                        memcpy(buf2,seed,SHA_DIGEST_LENGTH);
-                        /* precompute "SEED + 1" for step 7: */
-                        for (i=SHA_DIGEST_LENGTH-1; i >= 0; i--)
-                                {
-                                buf[i]++;
-                                if (buf[i] != 0) break;
-                                }
-
-                        /* step 2 */
-                        EVP_Digest(seed,SHA_DIGEST_LENGTH,md,NULL,HASH, NULL);
-                        EVP_Digest(buf,SHA_DIGEST_LENGTH,buf2,NULL,HASH, NULL);
-                        for (i=0; i<SHA_DIGEST_LENGTH; i++)
-                                md[i]^=buf2[i];
-
-                        /* step 3 */
-                        md[0]|=0x80;
-                        md[SHA_DIGEST_LENGTH-1]|=0x01;
-                        if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,q)) goto err;
-
-                        /* step 4 */
-                        r = BN_is_prime_fasttest(q, DSS_prime_checks, callback, ctx3, cb_arg, seed_is_random);
-                        if (r > 0)
-                                break;
-                        if (r != 0)
-                                goto err;
-
-                        /* do a callback call */
-                        /* step 5 */
-                        }
-
-                if (callback != NULL) callback(2,0,cb_arg);
-                if (callback != NULL) callback(3,0,cb_arg);
-
-                /* step 6 */
-                counter=0;
-                /* "offset = 2" */
-
-                n=(bits-1)/160;
-                b=(bits-1)-n*160;
-
-                for (;;)
-                        {
-                        if (callback != NULL && counter != 0)
-                                callback(0,counter,cb_arg);
-
-                        /* step 7 */
-                        BN_zero(W);
-                        /* now 'buf' contains "SEED + offset - 1" */
-                        for (k=0; k<=n; k++)
-                                {
-                                /* obtain "SEED + offset + k" by incrementing: */
-                                for (i=SHA_DIGEST_LENGTH-1; i >= 0; i--)
-                                        {
-                                        buf[i]++;
-                                        if (buf[i] != 0) break;
-                                        }
-
-                                EVP_Digest(buf,SHA_DIGEST_LENGTH,md,NULL,HASH, NULL);
-
-                                /* step 8 */
-                                if (!BN_bin2bn(md,SHA_DIGEST_LENGTH,r0))
-                                        goto err;
-                                BN_lshift(r0,r0,160*k);
-                                BN_add(W,W,r0);
-                                }
-
-                        /* more of step 8 */
-                        BN_mask_bits(W,bits-1);
-                        BN_copy(X,W); /* this should be ok */
-                        BN_add(X,X,test); /* this should be ok */
-
-                        /* step 9 */
-                        BN_lshift1(r0,q);
-                        BN_mod(c,X,r0,ctx);
-                        BN_sub(r0,c,BN_value_one());
-                        BN_sub(p,X,r0);
-
-                        /* step 10 */
-                        if (BN_cmp(p,test) >= 0)
-                                {
-                                /* step 11 */
-                                r = BN_is_prime_fasttest(p, DSS_prime_checks, callback, ctx3, cb_arg, 1);
-                                if (r > 0)
-                                                goto end; /* found it */
-                                if (r != 0)
-                                        goto err;
-                                }
-
-                        /* step 13 */
-                        counter++;
-                        /* "offset = offset + n + 1" */
-
-                        /* step 14 */
-                        if (counter >= 4096) break;
-                        }
-                }
-end:
-        if (callback != NULL) callback(2,1,cb_arg);
-
-        /* We now need to generate g */
-        /* Set r0=(p-1)/q */
-        BN_sub(test,p,BN_value_one());
-        BN_div(r0,NULL,test,q,ctx);
-
-        BN_set_word(test,h);
-        BN_MONT_CTX_set(mont,p,ctx);
-
-        for (;;)
-                {
-                /* g=test^r0%p */
-                BN_mod_exp_mont(g,test,r0,p,ctx,mont);
-                if (!BN_is_one(g)) break;
-                BN_add(test,test,BN_value_one());
-                h++;
-                }
-
-        if (callback != NULL) callback(3,1,cb_arg);
-
-        ok=1;
-err:
-        if (!ok)
-                {
-                if (ret != NULL) DSA_free(ret);
-                }
-        else
-                {
-                ret->p=BN_dup(p);
-                ret->q=BN_dup(q);
-                ret->g=BN_dup(g);
-                if(seed_out != NULL) memcpy(seed_out,seed,20);
-                if (counter_ret != NULL) *counter_ret=counter;
-                if (h_ret != NULL) *h_ret=h;
-                }
-        if (ctx != NULL) BN_CTX_free(ctx);
-        if (ctx2 != NULL)
-                {
-                BN_CTX_end(ctx2);
-                BN_CTX_free(ctx2);
-                }
-        if (ctx3 != NULL) BN_CTX_free(ctx3);
-        if (mont != NULL) BN_MONT_CTX_free(mont);
-        return(ok?ret:NULL);
-        }
-
-int DSA_generate_key(DSA *dsa)
-        {
-        int ok=0;
-        BN_CTX *ctx=NULL;
-        BIGNUM *pub_key=NULL,*priv_key=NULL;
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-        if (dsa->priv_key == NULL)
-                {
-                if ((priv_key=BN_new()) == NULL) goto err;
-                }
-        else
-                priv_key=dsa->priv_key;
-
-        do
-                if (!BN_rand_range(priv_key,dsa->q)) goto err;
-        while (BN_is_zero(priv_key));
-
-        if (dsa->pub_key == NULL)
-                {
-                if ((pub_key=BN_new()) == NULL) goto err;
-                }
-        else
-                pub_key=dsa->pub_key;
-
-        if (!BN_mod_exp(pub_key,dsa->g,priv_key,dsa->p,ctx)) goto err;
-
-        dsa->priv_key=priv_key;
-        dsa->pub_key=pub_key;
-
-        if(!fips_check_dsa(dsa))
-            goto err;
-
-        ok=1;
-
-err:
-        if ((pub_key != NULL) && (dsa->pub_key == NULL)) BN_free(pub_key);
-        if ((priv_key != NULL) && (dsa->priv_key == NULL)) BN_free(priv_key);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        return(ok);
-        }
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips/dsa/fips_dsa_ossl.c b/src/lib/libssl/src/fips/dsa/fips_dsa_ossl.c
deleted file mode 100644
index 0ae5eb4b9e..0000000000
--- a/src/lib/libssl/src/fips/dsa/fips_dsa_ossl.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/* crypto/dsa/dsa_ossl.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
-
-#include <stdio.h>
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/rand.h>
-#include <openssl/asn1.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/fips.h>
-
-#ifdef OPENSSL_FIPS
-
-static DSA_SIG *dsa_do_sign(const unsigned char *dgst, FIPS_DSA_SIZE_T dlen, DSA *dsa);
-static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
-static int dsa_do_verify(const unsigned char *dgst, FIPS_DSA_SIZE_T dgst_len, DSA_SIG *sig,
-                  DSA *dsa);
-static int dsa_init(DSA *dsa);
-static int dsa_finish(DSA *dsa);
-static int dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
-                BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
-                BN_MONT_CTX *in_mont);
-static int dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-                                const BIGNUM *m, BN_CTX *ctx,
-                                BN_MONT_CTX *m_ctx);
-
-static DSA_METHOD openssl_dsa_meth = {
-"OpenSSL FIPS DSA method",
-dsa_do_sign,
-dsa_sign_setup,
-dsa_do_verify,
-dsa_mod_exp,
-dsa_bn_mod_exp,
-dsa_init,
-dsa_finish,
-0,
-NULL
-};
-
-int FIPS_dsa_check(struct dsa_st *dsa)
-    {
-    if(dsa->meth != &openssl_dsa_meth || dsa->meth->dsa_do_sign != dsa_do_sign
-       || dsa->meth->dsa_sign_setup != dsa_sign_setup
-       || dsa->meth->dsa_mod_exp != dsa_mod_exp
-       || dsa->meth->bn_mod_exp != dsa_bn_mod_exp
-       || dsa->meth->init != dsa_init
-       || dsa->meth->finish != dsa_finish)
-        {
-        FIPSerr(FIPS_F_FIPS_DSA_CHECK,FIPS_R_NON_FIPS_METHOD);
-        return 0;
-        }
-    return 1;
-    }
-
-const DSA_METHOD *DSA_OpenSSL(void)
-{
-        return &openssl_dsa_meth;
-}
-
-static DSA_SIG *dsa_do_sign(const unsigned char *dgst, FIPS_DSA_SIZE_T dlen, DSA *dsa)
-        {
-        BIGNUM *kinv=NULL,*r=NULL,*s=NULL;
-        BIGNUM m;
-        BIGNUM xr;
-        BN_CTX *ctx=NULL;
-        int i,reason=ERR_R_BN_LIB;
-        DSA_SIG *ret=NULL;
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_DSA_DO_SIGN,FIPS_R_FIPS_SELFTEST_FAILED);
-            return NULL;
-            }
-
-        BN_init(&m);
-        BN_init(&xr);
-
-        if (!dsa->p || !dsa->q || !dsa->g)
-                {
-                reason=DSA_R_MISSING_PARAMETERS;
-                goto err;
-                }
-
-        s=BN_new();
-        if (s == NULL) goto err;
-
-        i=BN_num_bytes(dsa->q); /* should be 20 */
-        if ((dlen > i) || (dlen > 50))
-                {
-                reason=DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE;
-                goto err;
-                }
-
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        if ((dsa->kinv == NULL) || (dsa->r == NULL))
-                {
-                if (!DSA_sign_setup(dsa,ctx,&kinv,&r)) goto err;
-                }
-        else
-                {
-                kinv=dsa->kinv;
-                dsa->kinv=NULL;
-                r=dsa->r;
-                dsa->r=NULL;
-                }
-
-        if (BN_bin2bn(dgst,dlen,&m) == NULL) goto err;
-
-        /* Compute  s = inv(k) (m + xr) mod q */
-        if (!BN_mod_mul(&xr,dsa->priv_key,r,dsa->q,ctx)) goto err;/* s = xr */
-        if (!BN_add(s, &xr, &m)) goto err;              /* s = m + xr */
-        if (BN_cmp(s,dsa->q) > 0)
-                BN_sub(s,s,dsa->q);
-        if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err;
-
-        ret=DSA_SIG_new();
-        if (ret == NULL) goto err;
-        ret->r = r;
-        ret->s = s;
-        
-err:
-        if (!ret)
-                {
-                DSAerr(DSA_F_DSA_DO_SIGN,reason);
-                BN_free(r);
-                BN_free(s);
-                }
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&m);
-        BN_clear_free(&xr);
-        if (kinv != NULL) /* dsa->kinv is NULL now if we used it */
-            BN_clear_free(kinv);
-        return(ret);
-        }
-
-static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
-        {
-        BN_CTX *ctx;
-        BIGNUM k,*kinv=NULL,*r=NULL;
-        int ret=0;
-
-        if (!dsa->p || !dsa->q || !dsa->g)
-                {
-                DSAerr(DSA_F_DSA_SIGN_SETUP,DSA_R_MISSING_PARAMETERS);
-                return 0;
-                }
-
-        BN_init(&k);
-
-        if (ctx_in == NULL)
-                {
-                if ((ctx=BN_CTX_new()) == NULL) goto err;
-                }
-        else
-                ctx=ctx_in;
-
-        if ((r=BN_new()) == NULL) goto err;
-        kinv=NULL;
-
-        /* Get random k */
-        do
-                if (!BN_rand_range(&k, dsa->q)) goto err;
-        while (BN_is_zero(&k));
-
-        if ((dsa->method_mont_p == NULL) && (dsa->flags & DSA_FLAG_CACHE_MONT_P))
-                {
-                if ((dsa->method_mont_p=(char *)BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set((BN_MONT_CTX *)dsa->method_mont_p,
-                                dsa->p,ctx)) goto err;
-                }
-
-        /* Compute r = (g^k mod p) mod q */
-        if (!dsa->meth->bn_mod_exp(dsa, r,dsa->g,&k,dsa->p,ctx,
-                (BN_MONT_CTX *)dsa->method_mont_p)) goto err;
-        if (!BN_mod(r,r,dsa->q,ctx)) goto err;
-
-        /* Compute  part of 's = inv(k) (m + xr) mod q' */
-        if ((kinv=BN_mod_inverse(NULL,&k,dsa->q,ctx)) == NULL) goto err;
-
-        if (*kinvp != NULL) BN_clear_free(*kinvp);
-        *kinvp=kinv;
-        kinv=NULL;
-        if (*rp != NULL) BN_clear_free(*rp);
-        *rp=r;
-        ret=1;
-err:
-        if (!ret)
-                {
-                DSAerr(DSA_F_DSA_SIGN_SETUP,ERR_R_BN_LIB);
-                if (kinv != NULL) BN_clear_free(kinv);
-                if (r != NULL) BN_clear_free(r);
-                }
-        if (ctx_in == NULL) BN_CTX_free(ctx);
-        if (kinv != NULL) BN_clear_free(kinv);
-        BN_clear_free(&k);
-        return(ret);
-        }
-
-static int dsa_do_verify(const unsigned char *dgst, FIPS_DSA_SIZE_T dgst_len, DSA_SIG *sig,
-                  DSA *dsa)
-        {
-        BN_CTX *ctx;
-        BIGNUM u1,u2,t1;
-        BN_MONT_CTX *mont=NULL;
-        int ret = -1;
-
-        if (!dsa->p || !dsa->q || !dsa->g)
-                {
-                DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MISSING_PARAMETERS);
-                return -1;
-                }
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_DSA_DO_VERIFY,FIPS_R_FIPS_SELFTEST_FAILED);
-            return -1;
-            }
-
-        BN_init(&u1);
-        BN_init(&u2);
-        BN_init(&t1);
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-        if (BN_is_zero(sig->r) || sig->r->neg || BN_ucmp(sig->r, dsa->q) >= 0)
-                {
-                ret = 0;
-                goto err;
-                }
-        if (BN_is_zero(sig->s) || sig->s->neg || BN_ucmp(sig->s, dsa->q) >= 0)
-                {
-                ret = 0;
-                goto err;
-                }
-
-        /* Calculate W = inv(S) mod Q
-         * save W in u2 */
-        if ((BN_mod_inverse(&u2,sig->s,dsa->q,ctx)) == NULL) goto err;
-
-        /* save M in u1 */
-        if (BN_bin2bn(dgst,dgst_len,&u1) == NULL) goto err;
-
-        /* u1 = M * w mod q */
-        if (!BN_mod_mul(&u1,&u1,&u2,dsa->q,ctx)) goto err;
-
-        /* u2 = r * w mod q */
-        if (!BN_mod_mul(&u2,sig->r,&u2,dsa->q,ctx)) goto err;
-
-        if ((dsa->method_mont_p == NULL) && (dsa->flags & DSA_FLAG_CACHE_MONT_P))
-                {
-                if ((dsa->method_mont_p=(char *)BN_MONT_CTX_new()) != NULL)
-                        if (!BN_MONT_CTX_set((BN_MONT_CTX *)dsa->method_mont_p,
-                                dsa->p,ctx)) goto err;
-                }
-        mont=(BN_MONT_CTX *)dsa->method_mont_p;
-
-#if 0
-        {
-        BIGNUM t2;
-
-        BN_init(&t2);
-        /* v = ( g^u1 * y^u2 mod p ) mod q */
-        /* let t1 = g ^ u1 mod p */
-        if (!BN_mod_exp_mont(&t1,dsa->g,&u1,dsa->p,ctx,mont)) goto err;
-        /* let t2 = y ^ u2 mod p */
-        if (!BN_mod_exp_mont(&t2,dsa->pub_key,&u2,dsa->p,ctx,mont)) goto err;
-        /* let u1 = t1 * t2 mod p */
-        if (!BN_mod_mul(&u1,&t1,&t2,dsa->p,ctx)) goto err_bn;
-        BN_free(&t2);
-        }
-        /* let u1 = u1 mod q */
-        if (!BN_mod(&u1,&u1,dsa->q,ctx)) goto err;
-#else
-        {
-        if (!dsa->meth->dsa_mod_exp(dsa, &t1,dsa->g,&u1,dsa->pub_key,&u2,
-                                                dsa->p,ctx,mont)) goto err;
-        /* BN_copy(&u1,&t1); */
-        /* let u1 = u1 mod q */
-        if (!BN_mod(&u1,&t1,dsa->q,ctx)) goto err;
-        }
-#endif
-        /* V is now in u1.  If the signature is correct, it will be
-         * equal to R. */
-        ret=(BN_ucmp(&u1, sig->r) == 0);
-
-        err:
-        if (ret != 1) DSAerr(DSA_F_DSA_DO_VERIFY,ERR_R_BN_LIB);
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_free(&u1);
-        BN_free(&u2);
-        BN_free(&t1);
-        return(ret);
-        }
-
-static int dsa_init(DSA *dsa)
-{
-        dsa->flags|=DSA_FLAG_CACHE_MONT_P;
-        return(1);
-}
-
-static int dsa_finish(DSA *dsa)
-{
-        if(dsa->method_mont_p)
-                BN_MONT_CTX_free((BN_MONT_CTX *)dsa->method_mont_p);
-        return(1);
-}
-
-static int dsa_mod_exp(DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
-                BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
-                BN_MONT_CTX *in_mont)
-{
-        return BN_mod_exp2_mont(rr, a1, p1, a2, p2, m, ctx, in_mont);
-}
-        
-static int dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-                                const BIGNUM *m, BN_CTX *ctx,
-                                BN_MONT_CTX *m_ctx)
-{
-        return BN_mod_exp_mont(r, a, p, m, ctx, m_ctx);
-}
-
-#else /* ndef OPENSSL_FIPS */
-
-static void *dummy=&dummy;
-
-#endif /* ndef OPENSSL_FIPS */
diff --git a/src/lib/libssl/src/fips/dsa/fips_dsatest.c b/src/lib/libssl/src/fips/dsa/fips_dsatest.c
deleted file mode 100644
index 7215940ede..0000000000
--- a/src/lib/libssl/src/fips/dsa/fips_dsatest.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* crypto/dsa/dsatest.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "e_os.h"
-
-#include <openssl/crypto.h>
-#include <openssl/rand.h>
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
-#include <openssl/fips.h>
-#include <openssl/fips_rand.h>
-
-#if defined(OPENSSL_NO_DSA) || !defined(OPENSSL_FIPS)
-int main(int argc, char *argv[])
-{
-    printf("No FIPS DSA support\n");
-    return(0);
-}
-#else
-#include <openssl/dsa.h>
-
-#ifdef OPENSSL_SYS_WIN16
-#define MS_CALLBACK     _far _loadds
-#else
-#define MS_CALLBACK
-#endif
-
-static void MS_CALLBACK dsa_cb(int p, int n, void *arg);
-
-/* seed, out_p, out_q, out_g are taken from the updated Appendix 5 to
- * FIPS PUB 186 and also appear in Appendix 5 to FIPS PIB 186-1 */
-static unsigned char seed[20]={
-        0xd5,0x01,0x4e,0x4b,0x60,0xef,0x2b,0xa8,0xb6,0x21,0x1b,0x40,
-        0x62,0xba,0x32,0x24,0xe0,0x42,0x7d,0xd3,
-        };
-
-static unsigned char out_p[]={
-        0x8d,0xf2,0xa4,0x94,0x49,0x22,0x76,0xaa,
-        0x3d,0x25,0x75,0x9b,0xb0,0x68,0x69,0xcb,
-        0xea,0xc0,0xd8,0x3a,0xfb,0x8d,0x0c,0xf7,
-        0xcb,0xb8,0x32,0x4f,0x0d,0x78,0x82,0xe5,
-        0xd0,0x76,0x2f,0xc5,0xb7,0x21,0x0e,0xaf,
-        0xc2,0xe9,0xad,0xac,0x32,0xab,0x7a,0xac,
-        0x49,0x69,0x3d,0xfb,0xf8,0x37,0x24,0xc2,
-        0xec,0x07,0x36,0xee,0x31,0xc8,0x02,0x91,
-        };
-
-static unsigned char out_q[]={
-        0xc7,0x73,0x21,0x8c,0x73,0x7e,0xc8,0xee,
-        0x99,0x3b,0x4f,0x2d,0xed,0x30,0xf4,0x8e,
-        0xda,0xce,0x91,0x5f,
-        };
-
-static unsigned char out_g[]={
-        0x62,0x6d,0x02,0x78,0x39,0xea,0x0a,0x13,
-        0x41,0x31,0x63,0xa5,0x5b,0x4c,0xb5,0x00,
-        0x29,0x9d,0x55,0x22,0x95,0x6c,0xef,0xcb,
-        0x3b,0xff,0x10,0xf3,0x99,0xce,0x2c,0x2e,
-        0x71,0xcb,0x9d,0xe5,0xfa,0x24,0xba,0xbf,
-        0x58,0xe5,0xb7,0x95,0x21,0x92,0x5c,0x9c,
-        0xc4,0x2e,0x9f,0x6f,0x46,0x4b,0x08,0x8c,
-        0xc5,0x72,0xaf,0x53,0xe6,0xd7,0x88,0x02,
-        };
-
-static const unsigned char str1[]="12345678901234567890";
-
-static const char rnd_seed[] = "string to make the random number generator think it has entropy";
-static const unsigned char rnd_key1[]="12345678";
-static const unsigned char rnd_key2[]="abcdefgh";
-
-static BIO *bio_err=NULL;
-
-int main(int argc, char **argv)
-        {
-        DSA *dsa=NULL;
-        int counter,ret=0,i,j;
-        unsigned char buf[256];
-        unsigned long h;
-        unsigned char sig[256];
-        unsigned int siglen;
-
-        if (bio_err == NULL)
-                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-
-#ifdef OPENSSL_FIPS
-        if(!FIPS_mode_set(1,argv[0]))
-            {
-            ERR_print_errors(bio_err);
-            EXIT(1);
-            }
-#endif
-        CRYPTO_malloc_debug_init();
-        CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
-        CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
-        ERR_load_crypto_strings();
-        FIPS_set_prng_key(rnd_key1,rnd_key2);
-        RAND_seed(rnd_seed, sizeof rnd_seed);
-
-        BIO_printf(bio_err,"test generation of DSA parameters\n");
-
-        dsa=DSA_generate_parameters(512,seed,20,&counter,&h,dsa_cb,bio_err);
-
-        BIO_printf(bio_err,"seed\n");
-        for (i=0; i<20; i+=4)
-                {
-                BIO_printf(bio_err,"%02X%02X%02X%02X ",
-                        seed[i],seed[i+1],seed[i+2],seed[i+3]);
-                }
-        BIO_printf(bio_err,"\ncounter=%d h=%d\n",counter,h);
-                
-        if (dsa == NULL) goto end;
-        DSA_print(bio_err,dsa,0);
-        if (counter != 105) 
-                {
-                BIO_printf(bio_err,"counter should be 105\n");
-                goto end;
-                }
-        if (h != 2)
-                {
-                BIO_printf(bio_err,"h should be 2\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->q,buf);
-        j=sizeof(out_q);
-        if ((i != j) || (memcmp(buf,out_q,i) != 0))
-                {
-                BIO_printf(bio_err,"q value is wrong\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->p,buf);
-        j=sizeof(out_p);
-        if ((i != j) || (memcmp(buf,out_p,i) != 0))
-                {
-                BIO_printf(bio_err,"p value is wrong\n");
-                goto end;
-                }
-
-        i=BN_bn2bin(dsa->g,buf);
-        j=sizeof(out_g);
-        if ((i != j) || (memcmp(buf,out_g,i) != 0))
-                {
-                BIO_printf(bio_err,"g value is wrong\n");
-                goto end;
-                }
-        DSA_generate_key(dsa);
-        DSA_sign(0, str1, 20, sig, &siglen, dsa);
-        if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1)
-                ret=1;
-end:
-        if (!ret)
-                ERR_print_errors(bio_err);
-        if (dsa != NULL) DSA_free(dsa);
-        CRYPTO_cleanup_all_ex_data();
-        ERR_remove_state(0);
-        ERR_free_strings();
-        CRYPTO_mem_leaks(bio_err);
-        if (bio_err != NULL)
-                {
-                BIO_free(bio_err);
-                bio_err = NULL;
-                }
-        EXIT(!ret);
-        return(!ret);
-        }
-
-static int cb_exit(int ec)
-        {
-        EXIT(ec);
-        return(0);              /* To keep some compilers quiet */
-        }
-
-static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
-        {
-        char c='*';
-        static int ok=0,num=0;
-
-        if (p == 0) { c='.'; num++; };
-        if (p == 1) c='+';
-        if (p == 2) { c='*'; ok++; }
-        if (p == 3) c='\n';
-        BIO_write(arg,&c,1);
-        (void)BIO_flush(arg);
-
-        if (!ok && (p == 0) && (num > 1))
-                {
-                BIO_printf((BIO *)arg,"error in dsatest\n");
-                cb_exit(1);
-                }
-        }
-#endif
diff --git a/src/lib/libssl/src/fips/dsa/fips_dssvs.c b/src/lib/libssl/src/fips/dsa/fips_dssvs.c
deleted file mode 100644
index 50a4d96986..0000000000
--- a/src/lib/libssl/src/fips/dsa/fips_dssvs.c
+++ /dev/null
@@ -1,306 +0,0 @@
-#include <openssl/bn.h>
-#include <openssl/dsa.h>
-#include <openssl/fips.h>
-#include <openssl/err.h>
-#include <openssl/sha.h>
-#include <string.h>
-
-int hex2bin(const char *in, unsigned char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1=0,n2=0 ; in[n1] && in[n1] != '\n' ; )
-        { /* first byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        if(!in[n1])
-            {
-            out[n2++]=ch;
-            break;
-            }
-        out[n2] = ch << 4;
-        /* second byte */
-        if ((in[n1] >= '0') && (in[n1] <= '9'))
-            ch = in[n1++] - '0';
-        else if ((in[n1] >= 'A') && (in[n1] <= 'F'))
-            ch = in[n1++] - 'A' + 10;
-        else if ((in[n1] >= 'a') && (in[n1] <= 'f'))
-            ch = in[n1++] - 'a' + 10;
-        else
-            return -1;
-        out[n2++] |= ch;
-        }
-    return n2;
-    }
-
-BIGNUM *hex2bn(const char *in)
-    {
-    BIGNUM *p=BN_new();
-
-    BN_hex2bn(&p,in);
-
-    return p;
-    }
-
-int bin2hex(const unsigned char *in,int len,char *out)
-    {
-    int n1, n2;
-    unsigned char ch;
-
-    for (n1=0,n2=0 ; n1 < len ; ++n1)
-        {
-        ch=in[n1] >> 4;
-        if (ch <= 0x09)
-            out[n2++]=ch+'0';
-        else
-            out[n2++]=ch-10+'a';
-        ch=in[n1] & 0x0f;
-        if(ch <= 0x09)
-            out[n2++]=ch+'0';
-        else
-            out[n2++]=ch-10+'a';
-        }
-    out[n2]='\0';
-    return n2;
-    }
-
-void pv(const char *tag,const unsigned char *val,int len)
-    {
-    char obuf[2048];
-
-    bin2hex(val,len,obuf);
-    printf("%s = %s\n",tag,obuf);
-    }
-
-void pbn(const char *tag,const BIGNUM *val)
-    {
-    printf("%s = %s\n",tag,BN_bn2hex(val));
-    }
-
-void primes()
-    {
-    char buf[10240];
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        fputs(buf,stdout);
-        if(!strncmp(buf,"Prime= ",7))
-            {
-            BIGNUM *pp;
-
-            pp=BN_new();
-            BN_hex2bn(&pp,buf+7);
-            printf("result= %c\n",
-                   BN_is_prime(pp,20,NULL,NULL,NULL) ? 'P' : 'F');
-            }       
-        }
-    }
-
-void pqg()
-    {
-    char buf[1024];
-    int nmod=0;
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"[mod = ",7))
-            nmod=atoi(buf+7);
-        else if(!strncmp(buf,"N = ",4))
-            {
-            int n=atoi(buf+4);
-
-            printf("[mod = %d]\n\n",nmod);
-
-            while(n--)
-                {
-                unsigned char seed[20];
-                DSA *dsa;
-                int counter;
-                unsigned long h;
-
-                dsa=DSA_generate_parameters(nmod,seed,0,&counter,&h,NULL,NULL);
-                printf("P = %s\n",BN_bn2hex(dsa->p));
-                printf("Q = %s\n",BN_bn2hex(dsa->q));
-                printf("G = %s\n",BN_bn2hex(dsa->g));
-                pv("Seed",seed,20);
-                printf("c = %d\n",counter);
-                printf("H = %lx\n",h);
-                putc('\n',stdout);
-                }
-            }
-        else
-            fputs(buf,stdout);
-        }
-    }
-
-void keypair()
-    {
-    char buf[1024];
-    int nmod=0;
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"[mod = ",7))
-            nmod=atoi(buf+7);
-        else if(!strncmp(buf,"N = ",4))
-            {
-            DSA *dsa;
-            int n=atoi(buf+4);
-
-            printf("[mod = %d]\n\n",nmod);
-
-            dsa=DSA_generate_parameters(nmod,NULL,0,NULL,NULL,NULL,NULL);
-            pbn("P",dsa->p);
-            pbn("Q",dsa->q);
-            pbn("G",dsa->g);
-            putc('\n',stdout);
-
-            while(n--)
-                {
-                DSA_generate_key(dsa);
-
-                pbn("X",dsa->priv_key);
-                pbn("Y",dsa->pub_key);
-                putc('\n',stdout);
-                }
-            }
-        }
-    }
-
-void siggen()
-    {
-    char buf[1024];
-    int nmod=0;
-    DSA *dsa=NULL;
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"[mod = ",7))
-            {
-            nmod=atoi(buf+7);
-            printf("[mod = %d]\n\n",nmod);
-
-            dsa=DSA_generate_parameters(nmod,NULL,0,NULL,NULL,NULL,NULL);
-            pbn("P",dsa->p);
-            pbn("Q",dsa->q);
-            pbn("G",dsa->g);
-            putc('\n',stdout);
-            }
-        else if(!strncmp(buf,"Msg = ",6))
-            {
-            unsigned char msg[1024];
-            unsigned char hash[20];
-            int n;
-            DSA_SIG *sig;
-
-            n=hex2bin(buf+6,msg);
-            pv("Msg",msg,n);
-
-            DSA_generate_key(dsa);
-            pbn("Y",dsa->pub_key);
-
-            SHA1(msg,n,hash);
-            sig=DSA_do_sign(hash,sizeof hash,dsa);
-            pbn("R",sig->r);
-            pbn("S",sig->s);
-            putc('\n',stdout);
-            }
-        }
-    }
-
-void sigver()
-    {
-    DSA *dsa=NULL;
-    char buf[1024];
-    int nmod=0;
-    unsigned char hash[20];
-    DSA_SIG *sig=DSA_SIG_new();
-
-    while(fgets(buf,sizeof buf,stdin) != NULL)
-        {
-        if(!strncmp(buf,"[mod = ",7))
-            {
-            nmod=atoi(buf+7);
-            if(dsa)
-                DSA_free(dsa);
-            dsa=DSA_new();
-            }
-        else if(!strncmp(buf,"P = ",4))
-            dsa->p=hex2bn(buf+4);
-        else if(!strncmp(buf,"Q = ",4))
-            dsa->q=hex2bn(buf+4);
-        else if(!strncmp(buf,"G = ",4))
-            {
-            dsa->g=hex2bn(buf+4);
-
-            printf("[mod = %d]\n\n",nmod);
-            pbn("P",dsa->p);
-            pbn("Q",dsa->q);
-            pbn("G",dsa->g);
-            putc('\n',stdout);
-            }
-        else if(!strncmp(buf,"Msg = ",6))
-            {
-            unsigned char msg[1024];
-            int n;
-
-            n=hex2bin(buf+6,msg);
-            pv("Msg",msg,n);
-            SHA1(msg,n,hash);
-            }
-        else if(!strncmp(buf,"Y = ",4))
-            dsa->pub_key=hex2bn(buf+4);
-        else if(!strncmp(buf,"R = ",4))
-            sig->r=hex2bn(buf+4);
-        else if(!strncmp(buf,"S = ",4))
-            {
-            sig->s=hex2bn(buf+4);
-        
-            pbn("Y",dsa->pub_key);
-            pbn("R",sig->r);
-            pbn("S",sig->s);
-            printf("Result = %c\n",DSA_do_verify(hash,sizeof hash,sig,dsa)
-                   ? 'P' : 'F');
-            putc('\n',stdout);
-            }
-        }
-    }
-
-int main(int argc,char **argv)
-    {
-    if(argc != 2)
-        {
-        fprintf(stderr,"%s [prime|pqg]\n",argv[0]);
-        exit(1);
-        }
-    if(!FIPS_mode_set(1,argv[0]))
-        {
-        ERR_load_crypto_strings();
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        exit(1);
-        }
-    if(!strcmp(argv[1],"prime"))
-        primes();
-    else if(!strcmp(argv[1],"pqg"))
-        pqg();
-    else if(!strcmp(argv[1],"keypair"))
-        keypair();
-    else if(!strcmp(argv[1],"siggen"))
-        siggen();
-    else if(!strcmp(argv[1],"sigver"))
-        sigver();
-    else
-        {
-        fprintf(stderr,"Don't know how to %s.\n",argv[1]);
-        exit(1);
-        }
-
-    return 0;
-    }
diff --git a/src/lib/libssl/src/fips/fips-lib.com b/src/lib/libssl/src/fips/fips-lib.com
deleted file mode 100644
index f3571bf845..0000000000
--- a/src/lib/libssl/src/fips/fips-lib.com
+++ /dev/null
@@ -1,1180 +0,0 @@
-$!
-$!  FIPS-LIB.COM
-$!  Written By:  Robert Byer
-$!               Vice-President
-$!               A-Com Computing, Inc.
-$!               byer@mail.all-net.net
-$!
-$!  Changes by Richard Levitte <richard@levitte.org>
-$!
-$!  This command files compiles and creates the FIPS parts of the
-$!  "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library for OpenSSL.  The "xxx"
-$!  denotes the machine architecture of AXP or VAX.
-$!
-$!  It was re-written so it would try to determine what "C" compiler to use 
-$!  or you can specify which "C" compiler to use.
-$!
-$!  Specify the following as P1 to build just that part or ALL to just
-$!  build everything.
-$!
-$!              LIBRARY    To just compile the [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library.
-$!              APPS       To just compile the [.xxx.EXE.CRYPTO]*.EXE
-$!              ALL        To do both LIBRARY and APPS
-$!
-$!  Specify DEBUG or NODEBUG as P2 to compile with or without debugger
-$!  information.
-$!
-$!  Specify which compiler at P3 to try to compile under.
-$!
-$!         VAXC  For VAX C.
-$!         DECC  For DEC C.
-$!         GNUC  For GNU C.
-$!
-$!  If you don't speficy a compiler, it will try to determine which
-$!  "C" compiler to use.
-$!
-$!  P4, if defined, sets a TCP/IP library to use, through one of the following
-$!  keywords:
-$!
-$!      UCX             for UCX
-$!      TCPIP           for TCPIP (post UCX)
-$!      SOCKETSHR       for SOCKETSHR+NETLIB
-$!
-$!  P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
-$!
-$!  P6, if defined, sets a choice of crypto methods to compile.
-$!  WARNING: this should only be done to recompile some part of an already
-$!  fully compiled library.
-$!
-$!
-$! Define A TCP/IP Library That We Will Need To Link To.
-$! (That Is, If We Need To Link To One.)
-$!
-$ TCPIP_LIB = ""
-$!
-$! Check Which Architecture We Are Using.
-$!
-$ IF (F$GETSYI("CPU").GE.128)
-$ THEN
-$!
-$!  The Architecture Is AXP
-$!
-$   ARCH := AXP
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$!  The Architecture Is VAX.
-$!
-$   ARCH := VAX
-$!
-$! End The Architecture Check.
-$!
-$ ENDIF
-$!
-$! Define The Different Encryption Types.
-$!
-$ ENCRYPT_TYPES = "Basic,SHA1,RAND,DES,AES,DSA,RSA,DH"
-$!
-$! Check To Make Sure We Have Valid Command Line Parameters.
-$!
-$ GOSUB CHECK_OPTIONS
-$!
-$! Initialise logical names and such
-$!
-$ GOSUB INITIALISE
-$!
-$! Tell The User What Kind of Machine We Run On.
-$!
-$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
-$!
-$! Define The OBJ Directory.
-$!
-$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.CRYPTO]
-$!
-$! Check To See If The Architecture Specific OBJ Directory Exists.
-$!
-$ IF (F$PARSE(OBJ_DIR).EQS."")
-$ THEN
-$!
-$!  It Dosen't Exist, So Create It.
-$!
-$   CREATE/DIR 'OBJ_DIR'
-$!
-$! End The Architecture Specific OBJ Directory Check.
-$!
-$ ENDIF
-$!
-$! Define The EXE Directory.
-$!
-$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]
-$!
-$! Check To See If The Architecture Specific Directory Exists.
-$!
-$ IF (F$PARSE(EXE_DIR).EQS."")
-$ THEN
-$!
-$!  It Dosen't Exist, So Create It.
-$!
-$   CREATE/DIRECTORY 'EXE_DIR'
-$!
-$! End The Architecture Specific Directory Check.
-$!
-$ ENDIF
-$!
-$! Define The Library Name.
-$!
-$ LIB_NAME := 'EXE_DIR'LIBCRYPTO.OLB
-$!
-$! Define The CRYPTO-LIB We Are To Use.
-$!
-$ CRYPTO_LIB := 'EXE_DIR'LIBCRYPTO.OLB
-$!
-$! Check To See If We Already Have A "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" Library...
-$!
-$ IF (F$SEARCH(LIB_NAME).EQS."")
-$ THEN
-$!
-$! Guess Not, Create The Library.
-$!
-$   LIBRARY/CREATE/OBJECT 'LIB_NAME'
-$!
-$! End The Library Check.
-$!
-$ ENDIF
-$!
-$! Build our options file for the application
-$!
-$ GOSUB CHECK_OPT_FILE
-$!
-$! Define The Different Encryption "library" Strings.
-$!
-$ LIB_ = "fips,fips_err_wrapper"
-$ LIB_SHA1 = "fips_sha1dgst,fips_sha1_selftest"
-$ LIB_RAND = "fips_rand"
-$ LIB_DES = "fips_des_enc,fips_des_selftest,fips_set_key"
-$ LIB_AES = "fips_aes_core,fips_aes_selftest"
-$ LIB_DSA = "fips_dsa_ossl,fips_dsa_gen,fips_dsa_selftest"
-$ LIB_RSA = "fips_rsa_eay,fips_rsa_gen,fips_rsa_selftest"
-$ LIB_DH = "fips_dh_check,fips_dh_gen,fips_dh_key"
-$!
-$! Setup exceptional compilations
-$!
-$ COMPILEWITH_CC3 = ",bss_rtcp,"
-$ COMPILEWITH_CC4 = ",a_utctm,bss_log,o_time,"
-$ COMPILEWITH_CC5 = ",md2_dgst,md4_dgst,md5_dgst,mdc2dgst," + -
-                    "sha_dgst,sha1dgst,rmd_dgst,bf_enc,"
-$!
-$! Figure Out What Other Modules We Are To Build.
-$!
-$ BUILD_SET:
-$!
-$! Define A Module Counter.
-$!
-$ MODULE_COUNTER = 0
-$!
-$! Top Of The Loop.
-$!
-$ MODULE_NEXT:
-$!
-$! Extract The Module Name From The Encryption List.
-$!
-$ MODULE_NAME = F$ELEMENT(MODULE_COUNTER,",",ENCRYPT_TYPES)
-$ IF MODULE_NAME.EQS."Basic" THEN MODULE_NAME = ""
-$ MODULE_NAME1 = MODULE_NAME
-$!
-$! Check To See If We Are At The End Of The Module List.
-$!
-$ IF (MODULE_NAME.EQS.",") 
-$ THEN 
-$!
-$!  We Are At The End Of The Module List, Go To MODULE_DONE.
-$!
-$   GOTO MODULE_DONE
-$!
-$! End The Module List Check.
-$!
-$ ENDIF
-$!
-$! Increment The Moudle Counter.
-$!
-$ MODULE_COUNTER = MODULE_COUNTER + 1
-$!
-$! Create The Library and Apps Module Names.
-$!
-$ LIB_MODULE = "LIB_" + MODULE_NAME
-$ APPS_MODULE = "APPS_" + MODULE_NAME
-$ IF (MODULE_NAME.EQS."ASN1_2")
-$ THEN
-$   MODULE_NAME = "ASN1"
-$ ENDIF
-$ IF (MODULE_NAME.EQS."EVP_2")
-$ THEN
-$   MODULE_NAME = "EVP"
-$ ENDIF
-$!
-$! Set state (can be LIB and APPS)
-$!
-$ STATE = "LIB"
-$ IF BUILDALL .EQS. "APPS" THEN STATE = "APPS"
-$!
-$! Check if the library module name actually is defined
-$!
-$ IF F$TYPE('LIB_MODULE') .EQS. ""
-$ THEN
-$   WRITE SYS$ERROR ""
-$   WRITE SYS$ERROR "The module ",MODULE_NAME," does not exist.  Continuing..."
-$   WRITE SYS$ERROR ""
-$   GOTO MODULE_NEXT
-$ ENDIF
-$!
-$! Top Of The Module Loop.
-$!
-$ MODULE_AGAIN:
-$!
-$! Tell The User What Module We Are Building.
-$!
-$ IF (MODULE_NAME1.NES."") 
-$ THEN
-$   IF STATE .EQS. "LIB"
-$   THEN
-$     WRITE SYS$OUTPUT "Compiling The ",MODULE_NAME1," Library Files. (",BUILDALL,",",STATE,")"
-$   ELSE IF F$TYPE('APPS_MODULE') .NES. ""
-$     THEN
-$       WRITE SYS$OUTPUT "Compiling The ",MODULE_NAME1," Applications. (",BUILDALL,",",STATE,")"
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$!  Define A File Counter And Set It To "0".
-$!
-$ FILE_COUNTER = 0
-$ APPLICATION = ""
-$ APPLICATION_COUNTER = 0
-$!
-$! Top Of The File Loop.
-$!
-$ NEXT_FILE:
-$!
-$! Look in the LIB_MODULE is we're in state LIB
-$!
-$ IF STATE .EQS. "LIB"
-$ THEN
-$!
-$!   O.K, Extract The File Name From The File List.
-$!
-$   FILE_NAME = F$ELEMENT(FILE_COUNTER,",",'LIB_MODULE')
-$!
-$!   else
-$!
-$ ELSE
-$   FILE_NAME = ","
-$!
-$   IF F$TYPE('APPS_MODULE') .NES. ""
-$   THEN
-$!
-$!     Extract The File Name From The File List.
-$!     This part is a bit more complicated.
-$!
-$     IF APPLICATION .EQS. ""
-$     THEN
-$       APPLICATION = F$ELEMENT(APPLICATION_COUNTER,";",'APPS_MODULE')
-$       APPLICATION_COUNTER = APPLICATION_COUNTER + 1
-$       APPLICATION_OBJECTS = F$ELEMENT(1,"/",APPLICATION)
-$       APPLICATION = F$ELEMENT(0,"/",APPLICATION)
-$       FILE_COUNTER = 0
-$     ENDIF
-$
-$!     WRITE SYS$OUTPUT "DEBUG: SHOW SYMBOL APPLICATION*"
-$!     SHOW SYMBOL APPLICATION*
-$!
-$     IF APPLICATION .NES. ";"
-$     THEN
-$       FILE_NAME = F$ELEMENT(FILE_COUNTER,",",APPLICATION_OBJECTS)
-$       IF FILE_NAME .EQS. ","
-$       THEN
-$         APPLICATION = ""
-$         GOTO NEXT_FILE
-$       ENDIF
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$! Check To See If We Are At The End Of The File List.
-$!
-$ IF (FILE_NAME.EQS.",") 
-$ THEN 
-$!
-$!  We Are At The End Of The File List, Change State Or Goto FILE_DONE.
-$!
-$   IF STATE .EQS. "LIB" .AND. BUILDALL .NES. "LIBRARY"
-$   THEN
-$     STATE = "APPS"
-$     GOTO MODULE_AGAIN
-$   ELSE
-$     GOTO FILE_DONE
-$   ENDIF
-$!
-$! End The File List Check.
-$!
-$ ENDIF
-$!
-$! Increment The Counter.
-$!
-$ FILE_COUNTER = FILE_COUNTER + 1
-$!
-$! Create The Source File Name.
-$!
-$ TMP_FILE_NAME = F$ELEMENT(1,"]",FILE_NAME)
-$ IF TMP_FILE_NAME .EQS. "]" THEN TMP_FILE_NAME = FILE_NAME
-$ IF F$ELEMENT(0,".",TMP_FILE_NAME) .EQS. TMP_FILE_NAME THEN -
-        FILE_NAME = FILE_NAME + ".c"
-$ IF (MODULE_NAME.NES."")
-$ THEN
-$   SOURCE_FILE = "SYS$DISK:[." + MODULE_NAME+ "]" + FILE_NAME
-$ ELSE
-$   SOURCE_FILE = "SYS$DISK:[]" + FILE_NAME
-$ ENDIF
-$ SOURCE_FILE = SOURCE_FILE - "]["
-$!
-$! Create The Object File Name.
-$!
-$ OBJECT_FILE = OBJ_DIR + F$PARSE(FILE_NAME,,,"NAME","SYNTAX_ONLY") + ".OBJ"
-$ ON WARNING THEN GOTO NEXT_FILE
-$!
-$! Check To See If The File We Want To Compile Is Actually There.
-$!
-$ IF (F$SEARCH(SOURCE_FILE).EQS."")
-$ THEN
-$!
-$!  Tell The User That The File Doesn't Exist.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Doesn't Exist."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Exit The Build.
-$!
-$   GOTO EXIT
-$!
-$! End The File Exist Check.
-$!
-$ ENDIF
-$!
-$! Tell The User We Are Compiling The File.
-$!
-$ IF (MODULE_NAME.EQS."")
-$ THEN
-$   WRITE SYS$OUTPUT "Compiling The ",FILE_NAME," File.  (",BUILDALL,",",STATE,")"
-$ ENDIF
-$ IF (MODULE_NAME.NES."")
-$ THEN 
-$   WRITE SYS$OUTPUT "  ",FILE_NAME,""
-$ ENDIF
-$!
-$! Compile The File.
-$!
-$ ON ERROR THEN GOTO NEXT_FILE
-$ FILE_NAME0 = F$ELEMENT(0,".",FILE_NAME)
-$ IF FILE_NAME - ".mar" .NES. FILE_NAME
-$ THEN
-$   MACRO/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$ ELSE
-$   IF COMPILEWITH_CC3 - FILE_NAME0 .NES. COMPILEWITH_CC3
-$   THEN
-$     CC3/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$   ELSE
-$     IF COMPILEWITH_CC4 - FILE_NAME0 .NES. COMPILEWITH_CC4
-$     THEN
-$       CC4/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$     ELSE
-$       IF COMPILEWITH_CC5 - FILE_NAME0 .NES. COMPILEWITH_CC5
-$       THEN
-$         CC5/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$       ELSE
-$         CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
-$       ENDIF
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$ IF STATE .EQS. "LIB"
-$ THEN 
-$!
-$!   Add It To The Library.
-$!
-$   LIBRARY/REPLACE 'LIB_NAME' 'OBJECT_FILE'
-$!
-$!   Time To Clean Up The Object File.
-$!
-$   DELETE 'OBJECT_FILE';*
-$ ENDIF
-$!
-$! Go Back And Do It Again.
-$!
-$ GOTO NEXT_FILE
-$!
-$! All Done With This Library Part.
-$!
-$ FILE_DONE:
-$!
-$! Time To Build Some Applications
-$!
-$ IF F$TYPE('APPS_MODULE') .NES. "" .AND. BUILDALL .NES. "LIBRARY"
-$ THEN
-$   APPLICATION_COUNTER = 0
-$ NEXT_APPLICATION:
-$   APPLICATION = F$ELEMENT(APPLICATION_COUNTER,";",'APPS_MODULE')
-$   IF APPLICATION .EQS. ";" THEN GOTO APPLICATION_DONE
-$
-$   APPLICATION_COUNTER = APPLICATION_COUNTER + 1
-$   APPLICATION_OBJECTS = F$ELEMENT(1,"/",APPLICATION)
-$   APPLICATION = F$ELEMENT(0,"/",APPLICATION)
-$
-$!   WRITE SYS$OUTPUT "DEBUG: SHOW SYMBOL APPLICATION*"
-$!   SHOW SYMBOL APPLICATION*
-$!
-$! Tell the user what happens
-$!
-$   WRITE SYS$OUTPUT "  ",APPLICATION,".exe"
-$!
-$! Link The Program.
-$!
-$   ON ERROR THEN GOTO NEXT_APPLICATION
-$!
-$! Check To See If We Are To Link With A Specific TCP/IP Library.
-$!
-$   IF (TCPIP_LIB.NES."")
-$   THEN
-$!
-$!    Link With A TCP/IP Library.
-$!
-$     LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
-          'OBJ_DIR''APPLICATION_OBJECTS', -
-          'CRYPTO_LIB'/LIBRARY, -
-          'TCPIP_LIB','OPT_FILE'/OPTION
-$!
-$! Else...
-$!
-$   ELSE
-$!
-$!    Don't Link With A TCP/IP Library.
-$!
-$     LINK/'DEBUGGER'/'TRACEBACK'/EXE='EXE_DIR''APPLICATION'.EXE -
-          'OBJ_DIR''APPLICATION_OBJECTS',-
-          'CRYPTO_LIB'/LIBRARY, -
-          'OPT_FILE'/OPTION
-$!
-$! End The TCP/IP Library Check.
-$!
-$   ENDIF
-$   GOTO NEXT_APPLICATION
-$  APPLICATION_DONE:
-$ ENDIF
-$!
-$! Go Back And Get The Next Module.
-$!
-$ GOTO MODULE_NEXT
-$!
-$! All Done With This Module.
-$!
-$ MODULE_DONE:
-$!
-$! Tell The User That We Are All Done.
-$!
-$ WRITE SYS$OUTPUT "All Done..."
-$ EXIT:
-$ GOSUB CLEANUP
-$ EXIT
-$!
-$! Check For The Link Option FIle.
-$!
-$ CHECK_OPT_FILE:
-$!
-$! Check To See If We Need To Make A VAX C Option File.
-$!
-$ IF (COMPILER.EQS."VAXC")
-$ THEN
-$!
-$!  Check To See If We Already Have A VAX C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    We Need A VAX C Linker Option File.
-$!
-$     CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable VAX C Runtime Library.
-!
-SYS$SHARE:VAXCRTL.EXE/SHARE
-$EOD
-$!
-$!  End The Option File Check.
-$!
-$   ENDIF
-$!
-$! End The VAXC Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Need A GNU C Option File.
-$!
-$ IF (COMPILER.EQS."GNUC")
-$ THEN
-$!
-$!  Check To See If We Already Have A GNU C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    We Need A GNU C Linker Option File.
-$!
-$     CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable C Runtime Library.
-!
-GNU_CC:[000000]GCCLIB/LIBRARY
-SYS$SHARE:VAXCRTL/SHARE
-$EOD
-$!
-$!  End The Option File Check.
-$!
-$   ENDIF
-$!
-$! End The GNU C Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Need A DEC C Option File.
-$!
-$ IF (COMPILER.EQS."DECC")
-$ THEN
-$!
-$!  Check To See If We Already Have A DEC C Linker Option File.
-$!
-$   IF (F$SEARCH(OPT_FILE).EQS."")
-$   THEN
-$!
-$!    Figure Out If We Need An AXP Or A VAX Linker Option File.
-$!
-$     IF ARCH .EQS. "VAX"
-$     THEN
-$!
-$!      We Need A DEC C Linker Option File For VAX.
-$!
-$       CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File To Link Agianst 
-! The Sharable DEC C Runtime Library.
-!
-SYS$SHARE:DECC$SHR.EXE/SHARE
-$EOD
-$!
-$!    Else...
-$!
-$     ELSE
-$!
-$!      Create The AXP Linker Option File.
-$!
-$       CREATE 'OPT_FILE'
-$DECK
-!
-! Default System Options File For AXP To Link Agianst 
-! The Sharable C Runtime Library.
-!
-SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
-SYS$SHARE:CMA$OPEN_RTL/SHARE
-$EOD
-$!
-$!    End The VAX/AXP DEC C Option File Check.
-$!
-$     ENDIF
-$!
-$!  End The Option File Search.
-$!
-$   ENDIF
-$!
-$! End The DEC C Check.
-$!
-$ ENDIF
-$!
-$!  Tell The User What Linker Option File We Are Using.
-$!
-$ WRITE SYS$OUTPUT "Using Linker Option File ",OPT_FILE,"."     
-$!
-$! Time To RETURN.
-$!
-$ RETURN
-$!
-$! Check The User's Options.
-$!
-$ CHECK_OPTIONS:
-$!
-$! Check To See If P1 Is Blank.
-$!
-$ IF (P1.EQS."ALL")
-$ THEN
-$!
-$!   P1 Is Blank, So Build Everything.
-$!
-$    BUILDALL = "TRUE"
-$!
-$! Else...
-$!
-$ ELSE
-$!
-$!  Else, Check To See If P1 Has A Valid Arguement.
-$!
-$   IF (P1.EQS."LIBRARY").OR.(P1.EQS."APPS")
-$   THEN
-$!
-$!    A Valid Arguement.
-$!
-$     BUILDALL = P1
-$!
-$!  Else...
-$!
-$   ELSE
-$!
-$!    Tell The User We Don't Know What They Want.
-$!
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "    ALL      :  Just Build Everything."
-$     WRITE SYS$OUTPUT "    LIBRARY  :  To Compile Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."
-$     WRITE SYS$OUTPUT "    APPS     :  To Compile Just The [.xxx.EXE.CRYPTO]*.EXE Programs."
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT " Where 'xxx' Stands For:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "        AXP  :  Alpha Architecture."
-$     WRITE SYS$OUTPUT "        VAX  :  VAX Architecture."
-$     WRITE SYS$OUTPUT ""
-$!
-$!    Time To EXIT.
-$!
-$     EXIT
-$!
-$!  End The Valid Arguement Check.
-$!
-$   ENDIF
-$!
-$! End The P1 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P2 Is Blank.
-$!
-$ IF (P2.EQS."NODEBUG")
-$ THEN
-$!
-$!   P2 Is NODEBUG, So Compile Without The Debugger Information.
-$!
-$    DEBUGGER = "NODEBUG"
-$    TRACEBACK = "NOTRACEBACK" 
-$    GCC_OPTIMIZE = "OPTIMIZE"
-$    CC_OPTIMIZE = "OPTIMIZE"
-$    MACRO_OPTIMIZE = "OPTIMIZE"
-$    WRITE SYS$OUTPUT "No Debugger Information Will Be Produced During Compile."
-$    WRITE SYS$OUTPUT "Compiling With Compiler Optimization."
-$ ELSE
-$!
-$!  Check To See If We Are To Compile With Debugger Information.
-$!
-$   IF (P2.EQS."DEBUG")
-$   THEN
-$!
-$!    Compile With Debugger Information.
-$!
-$     DEBUGGER = "DEBUG"
-$     TRACEBACK = "TRACEBACK"
-$     GCC_OPTIMIZE = "NOOPTIMIZE"
-$     CC_OPTIMIZE = "NOOPTIMIZE"
-$     MACRO_OPTIMIZE = "NOOPTIMIZE"
-$     WRITE SYS$OUTPUT "Debugger Information Will Be Produced During Compile."
-$     WRITE SYS$OUTPUT "Compiling Without Compiler Optimization."
-$   ELSE 
-$!
-$!    They Entered An Invalid Option..
-$!
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"
-$     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "     DEBUG   :  Compile With The Debugger Information."
-$     WRITE SYS$OUTPUT "     NODEBUG :  Compile Without The Debugger Information."
-$     WRITE SYS$OUTPUT ""
-$!
-$!    Time To EXIT.
-$!
-$     EXIT
-$!
-$!  End The Valid Arguement Check.
-$!
-$   ENDIF
-$!
-$! End The P2 Check.
-$!
-$ ENDIF
-$!
-$! Special Threads For OpenVMS v7.1 Or Later
-$!
-$! Written By:  Richard Levitte
-$!              richard@levitte.org
-$!
-$!
-$! Check To See If We Have A Option For P5.
-$!
-$ IF (P5.EQS."")
-$ THEN
-$!
-$!  Get The Version Of VMS We Are Using.
-$!
-$   ISSEVEN :=
-$   TMP = F$ELEMENT(0,"-",F$EXTRACT(1,4,F$GETSYI("VERSION")))
-$   TMP = F$INTEGER(F$ELEMENT(0,".",TMP)+F$ELEMENT(1,".",TMP))
-$!
-$!  Check To See If The VMS Version Is v7.1 Or Later.
-$!
-$   IF (TMP.GE.71)
-$   THEN
-$!
-$!    We Have OpenVMS v7.1 Or Later, So Use The Special Threads.
-$!
-$     ISSEVEN := ,PTHREAD_USE_D4
-$!
-$!  End The VMS Version Check.
-$!
-$   ENDIF
-$!
-$! End The P5 Check.
-$!
-$ ENDIF
-$!
-$! Check To See If P3 Is Blank.
-$!
-$ IF (P3.EQS."")
-$ THEN
-$!
-$!  O.K., The User Didn't Specify A Compiler, Let's Try To
-$!  Find Out Which One To Use.
-$!
-$!  Check To See If We Have GNU C.
-$!
-$   IF (F$TRNLNM("GNU_CC").NES."")
-$   THEN
-$!
-$!    Looks Like GNUC, Set To Use GNUC.
-$!
-$     P3 = "GNUC"
-$!
-$!  Else...
-$!
-$   ELSE
-$!
-$!    Check To See If We Have VAXC Or DECC.
-$!
-$     IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
-$     THEN 
-$!
-$!      Looks Like DECC, Set To Use DECC.
-$!
-$       P3 = "DECC"
-$!
-$!    Else...
-$!
-$     ELSE
-$!
-$!      Looks Like VAXC, Set To Use VAXC.
-$!
-$       P3 = "VAXC"
-$!
-$!    End The VAXC Compiler Check.
-$!
-$     ENDIF
-$!
-$!  End The DECC & VAXC Compiler Check.
-$!
-$   ENDIF
-$!
-$!  End The Compiler Check.
-$!
-$ ENDIF
-$!
-$! Check To See If We Have A Option For P4.
-$!
-$ IF (P4.EQS."")
-$ THEN
-$!
-$!  Find out what socket library we have available
-$!
-$   IF F$PARSE("SOCKETSHR:") .NES. ""
-$   THEN
-$!
-$!    We have SOCKETSHR, and it is my opinion that it's the best to use.
-$!
-$     P4 = "SOCKETSHR"
-$!
-$!    Tell the user
-$!
-$     WRITE SYS$OUTPUT "Using SOCKETSHR for TCP/IP"
-$!
-$!    Else, let's look for something else
-$!
-$   ELSE
-$!
-$!    Like UCX (the reason to do this before Multinet is that the UCX
-$!    emulation is easier to use...)
-$!
-$     IF F$TRNLNM("UCX$IPC_SHR") .NES. "" -
-         .OR. F$PARSE("SYS$SHARE:UCX$IPC_SHR.EXE") .NES. "" -
-         .OR. F$PARSE("SYS$LIBRARY:UCX$IPC.OLB") .NES. ""
-$     THEN
-$!
-$!      Last resort: a UCX or UCX-compatible library
-$!
-$       P4 = "UCX"
-$!
-$!      Tell the user
-$!
-$       WRITE SYS$OUTPUT "Using UCX or an emulation thereof for TCP/IP"
-$!
-$!      That was all...
-$!
-$     ENDIF
-$   ENDIF
-$ ENDIF
-$!
-$! Set Up Initial CC Definitions, Possibly With User Ones
-$!
-$ CCDEFS = "TCPIP_TYPE_''P4',DSO_VMS"
-$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
-$ CCEXTRAFLAGS = ""
-$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
-$ CCDISABLEWARNINGS = "LONGLONGTYPE,LONGLONGSUFX"
-$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
-        CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS
-$!
-$!  Check To See If The User Entered A Valid Paramter.
-$!
-$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")
-$ THEN
-$!
-$!    Check To See If The User Wanted DECC.
-$!
-$   IF (P3.EQS."DECC")
-$   THEN
-$!
-$!    Looks Like DECC, Set To Use DECC.
-$!
-$     COMPILER = "DECC"
-$!
-$!    Tell The User We Are Using DECC.
-$!
-$     WRITE SYS$OUTPUT "Using DECC 'C' Compiler."
-$!
-$!    Use DECC...
-$!
-$     CC = "CC"
-$     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
-         THEN CC = "CC/DECC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
-           "/NOLIST/PREFIX=ALL" + -
-           "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + -
-           CCEXTRAFLAGS
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
-$!
-$!  End DECC Check.
-$!
-$   ENDIF
-$!
-$!  Check To See If We Are To Use VAXC.
-$!
-$   IF (P3.EQS."VAXC")
-$   THEN
-$!
-$!    Looks Like VAXC, Set To Use VAXC.
-$!
-$     COMPILER = "VAXC"
-$!
-$!    Tell The User We Are Using VAX C.
-$!
-$     WRITE SYS$OUTPUT "Using VAXC 'C' Compiler."
-$!
-$!    Compile Using VAXC.
-$!
-$     CC = "CC"
-$     IF ARCH.EQS."AXP"
-$     THEN
-$       WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
-$       EXIT
-$     ENDIF
-$     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-           "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + -
-           CCEXTRAFLAGS
-$     CCDEFS = """VAXC""," + CCDEFS
-$!
-$!    Define <sys> As SYS$COMMON:[SYSLIB]
-$!
-$     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
-$!
-$!  End VAXC Check
-$!
-$   ENDIF
-$!
-$!  Check To See If We Are To Use GNU C.
-$!
-$   IF (P3.EQS."GNUC")
-$   THEN
-$!
-$!    Looks Like GNUC, Set To Use GNUC.
-$!
-$     COMPILER = "GNUC"
-$!
-$!    Tell The User We Are Using GNUC.
-$!
-$     WRITE SYS$OUTPUT "Using GNU 'C' Compiler."
-$!
-$!    Use GNU C...
-$!
-$     CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
-           "/INCLUDE=(SYS$DISK:[],SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + -
-           CCEXTRAFLAGS
-$!
-$!    Define The Linker Options File Name.
-$!
-$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
-$!
-$!  End The GNU C Check.
-$!
-$   ENDIF
-$!
-$!  Set up default defines
-$!
-$   CCDEFS = """FLAT_INC=1""," + CCDEFS
-$!
-$!  Finish up the definition of CC.
-$!
-$   IF COMPILER .EQS. "DECC"
-$   THEN
-$     IF CCDISABLEWARNINGS .EQS. ""
-$     THEN
-$       CC4DISABLEWARNINGS = "DOLLARID"
-$     ELSE
-$       CC4DISABLEWARNINGS = CCDISABLEWARNINGS + ",DOLLARID"
-$       CCDISABLEWARNINGS = "/WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))"
-$     ENDIF
-$     CC4DISABLEWARNINGS = "/WARNING=(DISABLE=(" + CC4DISABLEWARNINGS + "))"
-$   ELSE
-$     CCDISABLEWARNINGS = ""
-$     CC4DISABLEWARNINGS = ""
-$   ENDIF
-$   CC3 = CC + "/DEFINE=(" + CCDEFS + ISSEVEN + ")" + CCDISABLEWARNINGS
-$   CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
-$   IF ARCH .EQS. "VAX" .AND. COMPILER .EQS. "DECC" .AND. P2 .NES. "DEBUG"
-$   THEN
-$     CC5 = CC + "/OPTIMIZE=NODISJOINT"
-$   ELSE
-$     CC5 = CC + "/NOOPTIMIZE"
-$   ENDIF
-$   CC4 = CC - CCDISABLEWARNINGS + CC4DISABLEWARNINGS
-$!
-$!  Show user the result
-$!
-$   WRITE/SYMBOL SYS$OUTPUT "Main C Compiling Command: ",CC
-$!
-$!  Else The User Entered An Invalid Arguement.
-$!
-$ ELSE
-$!
-$!  Tell The User We Don't Know What They Want.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "    VAXC  :  To Compile With VAX C."
-$   WRITE SYS$OUTPUT "    DECC  :  To Compile With DEC C."
-$   WRITE SYS$OUTPUT "    GNUC  :  To Compile With GNU C."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Time To EXIT.
-$!
-$   EXIT
-$!
-$! End The Valid Arguement Check.
-$!
-$ ENDIF
-$!
-$! Build a MACRO command for the architecture at hand
-$!
-$ IF ARCH .EQS. "VAX" THEN MACRO = "MACRO/''DEBUGGER'"
-$ IF ARCH .EQS. "AXP" THEN MACRO = "MACRO/MIGRATION/''DEBUGGER'/''MACRO_OPTIMIZE'"
-$!
-$!  Show user the result
-$!
-$   WRITE/SYMBOL SYS$OUTPUT "Main MACRO Compiling Command: ",MACRO
-$!
-$! Time to check the contents, and to make sure we get the correct library.
-$!
-$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" -
-     .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
-$ THEN
-$!
-$!  Check to see if SOCKETSHR was chosen
-$!
-$   IF P4.EQS."SOCKETSHR"
-$   THEN
-$!
-$!    Set the library to use SOCKETSHR
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
-$!
-$!    Done with SOCKETSHR
-$!
-$   ENDIF
-$!
-$!  Check to see if MULTINET was chosen
-$!
-$   IF P4.EQS."MULTINET"
-$   THEN
-$!
-$!    Set the library to use UCX emulation.
-$!
-$     P4 = "UCX"
-$!
-$!    Done with MULTINET
-$!
-$   ENDIF
-$!
-$!  Check to see if UCX was chosen
-$!
-$   IF P4.EQS."UCX"
-$   THEN
-$!
-$!    Set the library to use UCX.
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
-$     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
-$     THEN
-$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
-$     ELSE
-$       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
-          TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
-$     ENDIF
-$!
-$!    Done with UCX
-$!
-$   ENDIF
-$!
-$!  Check to see if TCPIP was chosen
-$!
-$   IF P4.EQS."TCPIP"
-$   THEN
-$!
-$!    Set the library to use TCPIP (post UCX).
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
-$!
-$!    Done with TCPIP
-$!
-$   ENDIF
-$!
-$!  Check to see if NONE was chosen
-$!
-$   IF P4.EQS."NONE"
-$   THEN
-$!
-$!    Do not use a TCPIP library.
-$!
-$     TCPIP_LIB = ""
-$!
-$!    Done with TCPIP
-$!
-$   ENDIF
-$!
-$!  Print info
-$!
-$   WRITE SYS$OUTPUT "TCP/IP library spec: ", TCPIP_LIB
-$!
-$!  Else The User Entered An Invalid Arguement.
-$!
-$ ELSE
-$!
-$!  Tell The User We Don't Know What They Want.
-$!
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The Option ",P4," Is Invalid.  The Valid Options Are:"
-$   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."
-$   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."
-$   WRITE SYS$OUTPUT "    TCPIP      :  To link with TCPIP (post UCX) TCP/IP library."
-$   WRITE SYS$OUTPUT ""
-$!
-$!  Time To EXIT.
-$!
-$   EXIT
-$!
-$!  Done with TCP/IP libraries
-$!
-$ ENDIF
-$!
-$! Check if the user wanted to compile just a subset of all the encryption
-$! methods.
-$!
-$ IF P6 .NES. ""
-$ THEN
-$   ENCRYPT_TYPES = P6
-$ ENDIF
-$!
-$!  Time To RETURN...
-$!
-$ RETURN
-$!
-$ INITIALISE:
-$!
-$! Save old value of the logical name OPENSSL
-$!
-$ __SAVE_OPENSSL = F$TRNLNM("OPENSSL","LNM$PROCESS_TABLE")
-$!
-$! Save directory information
-$!
-$ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
-$ __HERE = F$EDIT(__HERE,"UPCASE")
-$ __TOP = __HERE - "FIPS]"
-$ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
-$!
-$! Set up the logical name OPENSSL to point at the include directory
-$!
-$ DEFINE OPENSSL/NOLOG '__INCLUDE'
-$!
-$! Done
-$!
-$ RETURN
-$!
-$ CLEANUP:
-$!
-$! Restore the logical name OPENSSL if it had a value
-$!
-$ IF __SAVE_OPENSSL .EQS. ""
-$ THEN
-$   DEASSIGN OPENSSL
-$ ELSE
-$   DEFINE/NOLOG OPENSSL '__SAVE_OPENSSL'
-$ ENDIF
-$!
-$! Done
-$!
-$ RETURN
diff --git a/src/lib/libssl/src/fips/fips.c b/src/lib/libssl/src/fips/fips.c
deleted file mode 100644
index 7ecba57f70..0000000000
--- a/src/lib/libssl/src/fips/fips.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <openssl/fips.h>
-#include <openssl/rand.h>
-#include <openssl/fips_rand.h>
-#include <openssl/err.h>
-#include <openssl/bio.h>
-#include <openssl/hmac.h>
-#include <string.h>
-#include <limits.h>
-#include "fips_locl.h"
-
-#ifdef OPENSSL_FIPS
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-static int fips_md5_allowed = 0;
-static int fips_selftest_fail = 0;
-
-void FIPS_allow_md5(int onoff)
-    {
-    if (fips_is_started())
-        {
-        int owning_thread = fips_is_owning_thread();
-
-        if (!owning_thread) CRYPTO_w_lock(CRYPTO_LOCK_FIPS);
-        fips_md5_allowed = onoff;
-        if (!owning_thread) CRYPTO_w_unlock(CRYPTO_LOCK_FIPS);
-        }
-    }
-
-int FIPS_md5_allowed(void)
-    {
-    int ret = 1;
-    if (fips_is_started())
-        {
-        int owning_thread = fips_is_owning_thread();
-
-        if (!owning_thread) CRYPTO_r_lock(CRYPTO_LOCK_FIPS);
-        ret = fips_md5_allowed;
-        if (!owning_thread) CRYPTO_r_unlock(CRYPTO_LOCK_FIPS);
-        }
-    return ret;
-    }
-
-int FIPS_selftest_failed(void)
-    {
-    int ret = 0;
-    if (fips_is_started())
-        {
-        int owning_thread = fips_is_owning_thread();
-
-        if (!owning_thread) CRYPTO_r_lock(CRYPTO_LOCK_FIPS);
-        ret = fips_selftest_fail;
-        if (!owning_thread) CRYPTO_r_unlock(CRYPTO_LOCK_FIPS);
-        }
-    return ret;
-    }
-
-int FIPS_selftest()
-    {
-    ERR_load_crypto_strings();
-
-    return FIPS_selftest_sha1()
-        && FIPS_selftest_aes()
-        && FIPS_selftest_des()
-        && FIPS_selftest_rsa()
-        && FIPS_selftest_dsa();
-    }
-
-static int FIPS_check_exe(const char *path)
-    {
-    unsigned char buf[1024];
-    char p2[PATH_MAX];
-    unsigned int n;
-    unsigned char mdbuf[EVP_MAX_MD_SIZE];
-    FILE *f;
-    static char key[]="etaonrishdlcupfm";
-    HMAC_CTX hmac;
-    const char *sha1_fmt="%s.sha1";
-
-    f=fopen(path,"rb");
-#ifdef __CYGWIN32__
-    /* cygwin scrupulously strips .exe extentions:-( as of now it's
-       actually no point to attempt above fopen, but we keep the call
-       just in case the behavior changes in the future... */
-    if (!f)
-        {
-        sha1_fmt="%s.exe.sha1";
-        BIO_snprintf(p2,sizeof p2,"%s.exe",path);
-        f=fopen(p2,"rb");
-        }
-#endif
-    if(!f)
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_EXE,FIPS_R_CANNOT_READ_EXE);
-        return 0;
-        }
-    HMAC_Init(&hmac,key,strlen(key),EVP_sha1());
-    while(!feof(f))
-        {
-        n=fread(buf,1,sizeof buf,f);
-        if(ferror(f))
-            {
-            clearerr(f);
-            fclose(f);
-            FIPSerr(FIPS_F_FIPS_CHECK_EXE,FIPS_R_CANNOT_READ_EXE);
-            return 0;
-            }
-        if (n) HMAC_Update(&hmac,buf,n);
-        }
-    fclose(f);
-    HMAC_Final(&hmac,mdbuf,&n);
-    HMAC_CTX_cleanup(&hmac);
-    BIO_snprintf(p2,sizeof p2,sha1_fmt,path);
-    f=fopen(p2,"rb");
-    if(!f || fread(buf,1,20,f) != 20)
-        {
-        if (f) fclose(f);
-        FIPSerr(FIPS_F_FIPS_CHECK_EXE,FIPS_R_CANNOT_READ_EXE_DIGEST);
-        return 0;
-        }
-    fclose(f);
-    if(memcmp(buf,mdbuf,20))
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_EXE,FIPS_R_EXE_DIGEST_DOES_NOT_MATCH);
-        return 0;
-        }
-    return 1;
-    }
-
-int FIPS_mode_set(int onoff,const char *path)
-    {
-    void fips_set_mode(int _onoff);
-    int fips_set_owning_thread();
-    int fips_clear_owning_thread();
-    int ret = 0;
-
-    CRYPTO_w_lock(CRYPTO_LOCK_FIPS);
-    fips_set_started();
-    fips_set_owning_thread();
-
-    if(onoff)
-        {
-        unsigned char buf[24];
-
-        fips_selftest_fail = 0;
-
-        /* Don't go into FIPS mode twice, just so we can do automagic
-           seeding */
-        if(FIPS_mode())
-            {
-            FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_FIPS_MODE_ALREADY_SET);
-            fips_selftest_fail = 1;
-            ret = 0;
-            goto end;
-            }
-
-        if(!FIPS_check_exe(path))
-            {
-            fips_selftest_fail = 1;
-            ret = 0;
-            goto end;
-            }
-
-        /* automagically seed PRNG if not already seeded */
-        if(!FIPS_rand_seeded())
-            {
-            if(RAND_bytes(buf,sizeof buf) <= 0)
-                {
-                fips_selftest_fail = 1;
-                ret = 0;
-                goto end;
-                }
-            FIPS_set_prng_key(buf,buf+8);
-            FIPS_rand_seed(buf+16,8);
-            }
-
-        /* now switch into FIPS mode */
-        fips_set_rand_check(FIPS_rand_method());
-        RAND_set_rand_method(FIPS_rand_method());
-        if(FIPS_selftest())
-            fips_set_mode(1);
-        else
-            {
-            fips_selftest_fail = 1;
-            ret = 0;
-            goto end;
-            }
-        ret = 1;
-        goto end;
-        }
-    fips_set_mode(0);
-    fips_selftest_fail = 0;
-    ret = 1;
-end:
-    fips_clear_owning_thread();
-    CRYPTO_w_unlock(CRYPTO_LOCK_FIPS);
-    return ret;
-    }
-
-#if 0
-/* here just to cause error codes to exist */
-static void dummy()
-    {
-    FIPSerr(FIPS_F_HASH_FINAL,FIPS_F_NON_FIPS_METHOD);
-    FIPSerr(FIPS_F_HASH_FINAL,FIPS_R_FIPS_SELFTEST_FAILED);
-    }
-#endif
-
-#endif
diff --git a/src/lib/libssl/src/fips/fips.h b/src/lib/libssl/src/fips/fips.h
deleted file mode 100644
index a4df06b148..0000000000
--- a/src/lib/libssl/src/fips/fips.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Note that these are defined in crypto/cryptlib.c so they're
- * available even without -lfips.
- */
-struct dsa_st;
-
-int FIPS_mode_set(int onoff,const char *path);
-void FIPS_allow_md5(int onoff);
-int FIPS_md5_allowed(void);
-int FIPS_selftest_failed(void);
-int FIPS_dsa_check(struct dsa_st *dsa);
-void FIPS_corrupt_sha1(void);
-int FIPS_selftest_sha1(void);
-void FIPS_corrupt_aes(void);
-int FIPS_selftest_aes(void);
-void FIPS_corrupt_des(void);
-int FIPS_selftest_des(void);
-void FIPS_corrupt_rsa(void);
-int FIPS_selftest_rsa(void);
-void FIPS_corrupt_dsa(void);
-int FIPS_selftest_dsa(void);
-
-/* 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.
- */
-void ERR_load_FIPS_strings(void);
-
-/* 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.
- */
-void ERR_load_FIPS_strings(void);
-
-/* Error codes for the FIPS functions. */
-
-/* Function codes. */
-#define FIPS_F_DSA_DO_SIGN                               111
-#define FIPS_F_DSA_DO_VERIFY                             112
-#define FIPS_F_DSA_GENERATE_PARAMETERS                   110
-#define FIPS_F_FIPS_CHECK_DSA                            116
-#define FIPS_F_FIPS_CHECK_EXE                            106
-#define FIPS_F_FIPS_CHECK_RSA                            115
-#define FIPS_F_FIPS_DSA_CHECK                            102
-#define FIPS_F_FIPS_MODE_SET                             105
-#define FIPS_F_FIPS_SELFTEST_AES                         104
-#define FIPS_F_FIPS_SELFTEST_DES                         107
-#define FIPS_F_FIPS_SELFTEST_DSA                         109
-#define FIPS_F_FIPS_SELFTEST_RSA                         108
-#define FIPS_F_FIPS_SELFTEST_SHA1                        103
-#define FIPS_F_HASH_FINAL                                100
-#define FIPS_F_DH_GENERATE_PARAMETERS                    117
-#define FIPS_F_RSA_EAY_PUBLIC_ENCRYPT                    114
-#define FIPS_F_RSA_GENERATE_KEY                          113
-#define FIPS_F_SSLEAY_RAND_BYTES                         101
-
-/* Reason codes. */
-#define FIPS_R_CANNOT_READ_EXE                           103
-#define FIPS_R_CANNOT_READ_EXE_DIGEST                    104
-#define FIPS_R_EXE_DIGEST_DOES_NOT_MATCH                 105
-#define FIPS_R_FIPS_MODE_ALREADY_SET                     102
-#define FIPS_R_FIPS_SELFTEST_FAILED                      106
-#define FIPS_R_NON_FIPS_METHOD                           100
-#define FIPS_R_PAIRWISE_TEST_FAILED                      107
-#define FIPS_R_SELFTEST_FAILED                           101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/src/lib/libssl/src/fips/fips_test_suite.c b/src/lib/libssl/src/fips/fips_test_suite.c
deleted file mode 100644
index 60ee8d856b..0000000000
--- a/src/lib/libssl/src/fips/fips_test_suite.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
- *
- *
- * This command is intended as a test driver for the FIPS-140 testing
- * lab performing FIPS-140 validation.  It demonstrates the use of the
- * OpenSSL library ito perform a variety of common cryptographic
- * functions.  A power-up self test is demonstrated by deliberately
- * pointing to an invalid executable hash
- *
- * Contributed by Steve Marquess.
- *
- */
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <openssl/aes.h>
-#include <openssl/des.h>
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/sha.h>
-#include <openssl/md5.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/bn.h>                                                                                          
-#include <openssl/rand.h>                                                                                          
-#ifndef OPENSSL_FIPS
-int main(int argc, char *argv[])
-    {
-    printf("No FIPS support\n");
-    return(0);
-    }
-#else
-
-/* AES: encrypt and decrypt known plaintext, verify result matches original plaintext
-*/
-static int FIPS_aes_test()
-    {
-    unsigned char userkey[16] = { 0xde, 0xad, 0xbe, 0xef, 0xfe, 0xed, 0xf0, 0x0d };
-    unsigned char plaintext[16] = "etaonrishdlcu";
-    unsigned char ciphertext[16];
-    unsigned char buf[16];
-    AES_KEY key;
-    AES_KEY dkey;
-
-    ERR_clear_error();
-    if (AES_set_encrypt_key( userkey, 128, &key ))
-        return 0;
-    AES_encrypt( plaintext, ciphertext, &key);
-    if (AES_set_decrypt_key( userkey, 128, &dkey ))
-        return 0;
-    AES_decrypt( ciphertext, buf, &dkey);
-    if (memcmp(buf, plaintext, sizeof(buf)))
-        return 0;
-    return 1;
-    }
-
-/* DES: encrypt and decrypt known plaintext, verify result matches original plaintext
-*/
-static int FIPS_des_test()
-    {
-    DES_cblock userkey = { 0xde, 0xad, 0xbe, 0xef, 0xfe, 0xed, 0xf0, 0x0d };
-    DES_cblock plaintext = { 'e', 't', 'a', 'o', 'n', 'r', 'i', 's' };
-
-    DES_key_schedule key;
-    DES_cblock ciphertext;
-    DES_cblock buf;
-
-    ERR_clear_error();
-    if (DES_set_key(&userkey, &key) < 0)
-        return 0;
-    DES_ecb_encrypt( &plaintext, &ciphertext, &key, 1);
-    DES_ecb_encrypt( &ciphertext, &buf, &key, 0);
-    if (memcmp(buf, plaintext, sizeof(buf)))
-        return 0;
-    return 1;
-    }
-
-/* DSA: generate key and sign a known digest, then verify the signature
- * against the digest
-*/
-static int FIPS_dsa_test()
-    {
-    DSA *dsa = NULL;
-    unsigned char dgst[] = "etaonrishdlc";
-    unsigned char sig[256];
-    unsigned int siglen;
-
-    ERR_clear_error();
-    dsa = DSA_generate_parameters(512,NULL,0,NULL,NULL,NULL,NULL);
-    if (!dsa)
-        return 0;
-    if (!DSA_generate_key(dsa))
-        return 0;
-    if ( DSA_sign(0,dgst,sizeof(dgst) - 1,sig,&siglen,dsa) != 1 )
-        return 0;
-    if ( DSA_verify(0,dgst,sizeof(dgst) - 1,sig,siglen,dsa) != 1 )
-        return 0;
-    DSA_free(dsa);
-    return 1;
-    }
-
-/* RSA: generate keys and encrypt and decrypt known plaintext, verify result
- * matches the original plaintext
-*/
-static int FIPS_rsa_test()
-    {
-    RSA *key;
-    unsigned char input_ptext[] = "etaonrishdlc";
-    unsigned char ctext[256];
-    unsigned char ptext[256];
-    int n;
-
-    ERR_clear_error();
-    key = RSA_generate_key(1024,65537,NULL,NULL);
-    if (!key)
-        return 0;
-    n = RSA_size(key);
-    n = RSA_public_encrypt(sizeof(input_ptext) - 1,input_ptext,ctext,key,RSA_PKCS1_PADDING);
-    if (n < 0)
-        return 0;
-    n = RSA_private_decrypt(n,ctext,ptext,key,RSA_PKCS1_PADDING);
-    if (n < 0)
-        return 0;
-    RSA_free(key);
-    if (memcmp(input_ptext,ptext,sizeof(input_ptext) - 1))
-        return 0;
-    return 1;
-    }
-
-/* SHA1: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int FIPS_sha1_test()
-    {
-    unsigned char digest[SHA_DIGEST_LENGTH] =
-        { 0x11, 0xf1, 0x9a, 0x3a, 0xec, 0x1a, 0x1e, 0x8e, 0x65, 0xd4, 0x9a, 0x38, 0x0c, 0x8b, 0x1e, 0x2c, 0xe8, 0xb3, 0xc5, 0x18 };
-    unsigned char str[] = "etaonrishd";
-
-    unsigned char md[SHA_DIGEST_LENGTH];
-
-    ERR_clear_error();
-    if (!SHA1(str,sizeof(str) - 1,md)) return 0;
-    if (memcmp(md,digest,sizeof(md)))
-        return 0;
-    return 1;
-    }
-
-/* MD5: generate hash of known digest value and compare to known
-   precomputed correct hash
-*/
-static int md5_test()
-    {
-    unsigned char digest[MD5_DIGEST_LENGTH] =
-        { 0x48, 0x50, 0xf0, 0xa3, 0x3a, 0xed, 0xd3, 0xaf, 0x6e, 0x47, 0x7f, 0x83, 0x02, 0xb1, 0x09, 0x68 };
-    unsigned char str[] = "etaonrishd";
-
-    unsigned char md[MD5_DIGEST_LENGTH];
-
-    ERR_clear_error();
-    if (!MD5(str,sizeof(str) - 1,md))
-        return 0;
-    if (memcmp(md,digest,sizeof(md)))
-        return 0;
-    return 1;
-    }
-
-/* DH: generate shared parameters
-*/
-static int dh_test()
-    {
-    DH *dh;
-
-    ERR_clear_error();
-    dh = DH_generate_parameters(256, 2, NULL, NULL);
-    if (dh)
-        return 1;
-    return 0;
-    }
-
-/* Zeroize
-*/
-static int Zeroize()
-    {
-    RSA *key;
-    unsigned char userkey[16] = 
-        { 0x48, 0x50, 0xf0, 0xa3, 0x3a, 0xed, 0xd3, 0xaf, 0x6e, 0x47, 0x7f, 0x83, 0x02, 0xb1, 0x09, 0x68 };
-    int i, n;
-    
-    key = RSA_generate_key(1024,65537,NULL,NULL);
-    if (!key)
-        return 0;
-    n = BN_num_bytes(key->d);
-    printf(" Generated %d byte RSA private key\n", n);
-    printf("\tBN key before overwriting:\n%s\n", BN_bn2hex(key->d));
-    BN_rand(key->d,n*8,-1,0);
-    printf("\tBN key after overwriting:\n%s\n", BN_bn2hex(key->d));
-
-    printf("\tchar buffer key before overwriting: \n\t\t");
-    for(i = 0; i < sizeof(userkey); i++) printf("%02x", userkey[i]);
-        printf("\n");
-    RAND_bytes(userkey, sizeof userkey);
-    printf("\tchar buffer key after overwriting: \n\t\t");
-    for(i = 0; i < sizeof(userkey); i++) printf("%02x", userkey[i]);
-        printf("\n");
-
-    return 1;
-    }
-
-static int Error;
-const char * Fail(const char *msg)
-    {
-    Error++;
-    return msg; 
-    }
-
-int main(int argc,char **argv)
-    {
-
-    printf("\tFIPS-mode test application\n\n");
-
-    /* Load entropy from external file, if any */
-    RAND_load_file(".rnd", 1024);
-
-    if (argv[1]) {
-        /* Corrupted KAT tests */
-        if (!strcmp(argv[1], "aes")) {
-            FIPS_corrupt_aes();
-            printf("3. AES encryption/decryption with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "des")) {
-            FIPS_corrupt_des();
-            printf("5. DES-ECB encryption/decryption with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "dsa")) {
-            FIPS_corrupt_dsa();
-            printf("6. DSA key generation and signature validation with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "rsa")) {
-            FIPS_corrupt_rsa();
-            printf("4. RSA key generation and encryption/decryption with corrupted KAT...\n");
-        } else if (!strcmp(argv[1], "sha1")) {
-            FIPS_corrupt_sha1();
-            printf("7. SHA-1 hash with corrupted KAT...\n");
-        } else {
-            printf("Bad argument \"%s\"\n", argv[1]);
-            exit(1);
-        }
-        if (!FIPS_mode_set(1,argv[0]))
-            {
-            ERR_load_crypto_strings();
-            ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-            printf("Power-up self test failed\n");
-            exit(1);
-        }
-        printf("Power-up self test successful\n");
-        exit(0);
-    }
-
-    /* Non-Approved cryptographic operation
-    */
-    printf("0. Non-Approved cryptographic operation test...\n");
-    printf("\ta. Excluded algorithm (MD5)...");
-    printf( md5_test() ? "successful\n" :  Fail("FAILED!\n") );
-    printf("\tb. Included algorithm (D-H)...");
-    printf( dh_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* Power-up self test failure
-    */
-    printf("1. Automatic power-up self test...");
-    printf( FIPS_mode_set(1,"/dev/null") ? Fail("passed INCORRECTLY!\n") : "failed as expected\n" );
-
-    /* Algorithm call when uninitialized failure
-    */
-    printf("\ta. AES API failure on failed power-up self test...");
-    printf( FIPS_aes_test() ? Fail("passed INCORRECTLY!\n") :"failed as expected\n" );
-    printf("\tb. RSA API failure on failed power-up self test...");
-    printf( FIPS_rsa_test() ? Fail("passed INCORRECTLY!\n") :  "failed as expected\n" );
-    printf("\tc. DES API failure on failed power-up self test...");
-    printf( FIPS_des_test() ? Fail("passed INCORRECTLY!\n") : "failed as expected\n" );
-    printf("\td. DSA API failure on failed power-up self test...");
-    printf( FIPS_dsa_test() ? Fail("passed INCORRECTLY!\n") :  "failed as expected\n" );
-    printf("\te. SHA1 API failure on failed power-up self test...");
-    printf( FIPS_sha1_test() ? Fail("passed INCORRECTLY!\n") : "failed as expected\n" );
-
-    /* Power-up self test retry
-    */
-    ERR_clear_error();
-    printf("2. Automatic power-up self test retry...");
-    if (!FIPS_mode_set(1,argv[0]))
-        {
-        ERR_load_crypto_strings();
-        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
-        printf(Fail("FAILED!\n"));
-        exit(1);
-        }
-    printf("successful\n");
-
-    /* AES encryption/decryption
-    */
-    printf("3. AES encryption/decryption...");
-    printf( FIPS_aes_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* RSA key generation and encryption/decryption
-    */
-    printf("4. RSA key generation and encryption/decryption...");
-    printf( FIPS_rsa_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* DES-CBC encryption/decryption
-    */
-    printf("5. DES-ECB encryption/decryption...");
-    printf( FIPS_des_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* DSA key generation and signature validation
-    */
-    printf("6. DSA key generation and signature validation...");
-    printf( FIPS_dsa_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* SHA-1 hash
-    */
-    printf("7. SHA-1 hash...");
-    printf( FIPS_sha1_test() ? "successful\n" :  Fail("FAILED!\n") );
-
-    /* Non-Approved cryptographic operation
-    */
-    printf("8. Non-Approved cryptographic operation test...\n");
-    printf("\ta. Excluded algorithm (MD5)...");
-    printf( md5_test() ? Fail("passed INCORRECTLY!\n")
-            : "failed as expected\n" );
-    printf("\tb. Included algorithm (D-H)...");
-    printf( dh_test() ? "successful as expected\n"
-            : Fail("failed INCORRECTLY!\n") );
-
-    /* Zeroization
-    */
-    printf("9. Zero-ization...\n");
-    Zeroize();
-
-    printf("\nAll tests completed with %d errors\n", Error);
-    return 0;
-    }
-#endif
diff --git a/src/lib/libssl/src/fips/install.com b/src/lib/libssl/src/fips/install.com
deleted file mode 100644
index aa19f0599d..0000000000
--- a/src/lib/libssl/src/fips/install.com
+++ /dev/null
@@ -1,55 +0,0 @@
-$! INSTALL.COM -- Installs the files in a given directory tree
-$!
-$! Author: Richard Levitte <richard@levitte.org>
-$! Time of creation: 27-MAY-2004 11:47
-$!
-$! P1   root of the directory tree
-$!
-$       IF P1 .EQS. ""
-$       THEN
-$           WRITE SYS$OUTPUT "First argument missing."
-$           WRITE SYS$OUTPUT "Should be the directory where you want things installed."
-$           EXIT
-$       ENDIF
-$
-$       ROOT = F$PARSE(P1,"[]A.;0",,,"SYNTAX_ONLY,NO_CONCEAL") - "A.;0"
-$       ROOT_DEV = F$PARSE(ROOT,,,"DEVICE","SYNTAX_ONLY")
-$       ROOT_DIR = F$PARSE(ROOT,,,"DIRECTORY","SYNTAX_ONLY") -
-                   - "[000000." - "][" - "[" - "]"
-$       ROOT = ROOT_DEV + "[" + ROOT_DIR
-$
-$       DEFINE/NOLOG WRK_SSLROOT 'ROOT'.] /TRANS=CONC
-$       DEFINE/NOLOG WRK_SSLINCLUDE WRK_SSLROOT:[INCLUDE]
-$
-$       IF F$PARSE("WRK_SSLROOT:[000000]") .EQS. "" THEN -
-           CREATE/DIR/LOG WRK_SSLROOT:[000000]
-$       IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
-           CREATE/DIR/LOG WRK_SSLINCLUDE:
-$
-$       FDIRS := ,RAND,SHA1,DES,AES,DSA,RSA
-$       EXHEADER_ := fips.h
-$       EXHEADER_SHA1 :=
-$       EXHEADER_RAND := fips_rand.h
-$       EXHEADER_DES :=
-$       EXHEADER_AES :=
-$       EXHEADER_DSA :=
-$       EXHEADER_RSA :=
-$
-$       I = 0
-$ LOOP_FDIRS: 
-$       D = F$EDIT(F$ELEMENT(I, ",", FDIRS),"TRIM")
-$       I = I + 1
-$       IF D .EQS. "," THEN GOTO LOOP_FDIRS_END
-$       tmp = EXHEADER_'D'
-$       IF tmp .EQS. "" THEN GOTO LOOP_FDIRS
-$       IF D .EQS. ""
-$       THEN
-$         COPY 'tmp' WRK_SSLINCLUDE: /LOG
-$       ELSE
-$         COPY [.'D']'tmp' WRK_SSLINCLUDE: /LOG
-$       ENDIF
-$       SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'tmp'
-$       GOTO LOOP_FDIRS
-$ LOOP_FDIRS_END:
-$
-$       EXIT
diff --git a/src/lib/libssl/src/fips/openssl_fips_fingerprint b/src/lib/libssl/src/fips/openssl_fips_fingerprint
deleted file mode 100755
index d3dfb7eb61..0000000000
--- a/src/lib/libssl/src/fips/openssl_fips_fingerprint
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# Check the library fingerprint and generate an executable fingerprint, or
-# return an error
-
-lib=$1
-exe=$2
-
-# deal with the case where we're run from within the build and OpenSSL is
-# not yet installed.  Also, make sure LD_LIBRARY_PATH is properly set in
-# case shared libraries are built.
-if [ "X$TOP" != "X" ]
-then
-    if test "$OSTYPE" = msdosdjgpp; then
-        PATH="$TOP/apps;$TOP;$PATH"
-    else
-        PATH="$TOP/apps:$TOP:$PATH"
-    fi
-    LD_LIBRARY_PATH=$TOP; export LD_LIBRARY_PATH
-else
-    LD_LIBRARY_PATH=.; export LD_LIBRARY_PATH
-fi
-
-echo "Checking library fingerprint for $lib"
-openssl sha1 -hmac etaonrishdlcupfm $lib | sed "s/(.*\//(/" | diff -w $lib.sha1 - || { echo "$libs fingerprint mismatch"; exit 1; }
-
-[ -x $exe.exe ] && exe=$exe.exe
-
-echo "Making fingerprint for $exe"
-openssl sha1 -hmac etaonrishdlcupfm -binary $exe > $exe.sha1 || rm $exe.sha1
diff --git a/src/lib/libssl/src/fips/rand/Makefile b/src/lib/libssl/src/fips/rand/Makefile
deleted file mode 100644
index c8922abc77..0000000000
--- a/src/lib/libssl/src/fips/rand/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# SSLeay/fips/rand/Makefile
-#
-
-DIR=    rand
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST= fips_randtest.c
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_rand.c
-LIBOBJ=fips_rand.o
-
-SRC= $(LIBSRC)
-
-EXHEADER= fips_rand.h
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips SDIRS=$(DIR) sub_all)
-
-all:    check lib
-
-check:
-        TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
-lib:    $(LIBOBJ)
-        $(AR) $(LIB) $(LIBOBJ)
-        $(RANLIB) $(LIB) || echo Never mind.
-        @sleep 2; touch lib
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_rand.o: ../../e_os.h ../../include/openssl/bio.h
-fips_rand.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_rand.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
-fips_rand.o: ../../include/openssl/err.h ../../include/openssl/fips_rand.h
-fips_rand.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
-fips_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-fips_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
-fips_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_rand.o: fips_rand.c
-fips_randtest.o: ../../e_os.h ../../include/openssl/bio.h
-fips_randtest.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
-fips_randtest.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h
-fips_randtest.o: ../../include/openssl/err.h ../../include/openssl/fips_rand.h
-fips_randtest.o: ../../include/openssl/lhash.h
-fips_randtest.o: ../../include/openssl/opensslconf.h
-fips_randtest.o: ../../include/openssl/opensslv.h
-fips_randtest.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_randtest.o: ../../include/openssl/safestack.h
-fips_randtest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_randtest.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
-fips_randtest.o: fips_randtest.c
diff --git a/src/lib/libssl/src/fips/rand/fips_rand.c b/src/lib/libssl/src/fips/rand/fips_rand.c
deleted file mode 100644
index cc2f12deb9..0000000000
--- a/src/lib/libssl/src/fips/rand/fips_rand.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- * This is a FIPS approved PRNG, ANSI X9.31 A.2.4.
- */
-
-#include "e_os.h"
-
-/* If we don't define _XOPEN_SOURCE_EXTENDED, struct timeval won't
-   be defined and gettimeofday() won't be declared with strict compilers
-   like DEC C in ANSI C mode.  */
-#ifndef _XOPEN_SOURCE_EXTENDED
-#define _XOPEN_SOURCE_EXTENDED 1
-#endif
-
-#include <openssl/des.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-#include <openssl/fips_rand.h>
-#ifndef OPENSSL_SYS_WIN32
-#include <sys/time.h>
-#endif
-#include <assert.h>
-#ifndef OPENSSL_SYS_WIN32
-# ifdef OPENSSL_UNISTD
-#  include OPENSSL_UNISTD
-# else
-#  include <unistd.h>
-# endif
-#endif
-#include <string.h>
-
-#ifdef OPENSSL_FIPS
-
-#define SEED_SIZE       8
-
-static unsigned char seed[SEED_SIZE];
-static FIPS_RAND_SIZE_T n_seed;
-static FIPS_RAND_SIZE_T o_seed;
-static DES_cblock key1;
-static DES_cblock key2;
-static DES_key_schedule ks1,ks2;
-static int key_set;
-static int test_mode;
-static unsigned char test_faketime[8];
-
-#ifndef GETPID_IS_MEANINGLESS
-static int seed_pid;
-static int key_pid;
-#endif
-
-static void fips_rand_cleanup(void);
-static void fips_rand_add(const void *buf, FIPS_RAND_SIZE_T num, double add_entropy);
-static int fips_rand_bytes(unsigned char *buf, FIPS_RAND_SIZE_T num);
-static int fips_rand_status(void);
-
-static RAND_METHOD rand_fips_meth=
-    {
-    FIPS_rand_seed,
-    fips_rand_bytes,
-    fips_rand_cleanup,
-    fips_rand_add,
-    fips_rand_bytes,
-    fips_rand_status
-    };
-
-static int second;
-
-RAND_METHOD *FIPS_rand_method(void)
-{
-  return &rand_fips_meth;
-}
-
-void FIPS_set_prng_key(const unsigned char k1[8],const unsigned char k2[8])
-    {
-    memcpy(&key1,k1,sizeof key1);
-    memcpy(&key2,k2,sizeof key2);
-    key_set=1;
-#ifndef GETPID_IS_MEANINGLESS
-    key_pid=getpid();
-#endif
-    second=0;
-    }
-
-void FIPS_test_mode(int test,const unsigned char faketime[8])
-    {
-    test_mode=test;
-    if(!test_mode)
-        return;
-    memcpy(test_faketime,faketime,sizeof test_faketime);
-    }
-
-/* NB: this returns true if _partially_ seeded */
-int FIPS_rand_seeded()
-    { return key_set || n_seed; }
-
-static void fips_gettime(unsigned char buf[8])
-    {
-#ifdef OPENSSL_SYS_WIN32
-    FILETIME ft;
-#else
-    struct timeval tv;
-#endif
-
-    if(test_mode)
-        {
-        fprintf(stderr,"WARNING!!! PRNG IN TEST MODE!!!\n");
-        memcpy(buf,test_faketime,sizeof test_faketime);
-        return;
-        }
-#ifdef OPENSSL_SYS_WIN32
-    GetSystemTimeAsFileTime(&ft);
-    buf[0] = (unsigned char) (ft.dwHighDateTime & 0xff);
-    buf[1] = (unsigned char) ((ft.dwHighDateTime >> 8) & 0xff);
-    buf[2] = (unsigned char) ((ft.dwHighDateTime >> 16) & 0xff);
-    buf[3] = (unsigned char) ((ft.dwHighDateTime >> 24) & 0xff);
-    buf[4] = (unsigned char) (ft.dwLowDateTime & 0xff);
-    buf[5] = (unsigned char) ((ft.dwLowDateTime >> 8) & 0xff);
-    buf[6] = (unsigned char) ((ft.dwLowDateTime >> 16) & 0xff);
-    buf[7] = (unsigned char) ((ft.dwLowDateTime >> 24) & 0xff);
-#else
-    gettimeofday(&tv,NULL);
-    buf[0] = (unsigned char) (tv.tv_sec & 0xff);
-    buf[1] = (unsigned char) ((tv.tv_sec >> 8) & 0xff);
-    buf[2] = (unsigned char) ((tv.tv_sec >> 16) & 0xff);
-    buf[3] = (unsigned char) ((tv.tv_sec >> 24) & 0xff);
-    buf[4] = (unsigned char) (tv.tv_usec & 0xff);
-    buf[5] = (unsigned char) ((tv.tv_usec >> 8) & 0xff);
-    buf[6] = (unsigned char) ((tv.tv_usec >> 16) & 0xff);
-    buf[7] = (unsigned char) ((tv.tv_usec >> 24) & 0xff);
-#endif
-
-#if 0  /* This eminently sensible strategy is not acceptable to NIST. Sigh. */
-#ifndef GETPID_IS_MEANINGLESS
-    /* we mix in the PID to ensure that after a fork the children don't give
-     * the same results as each other
-     */
-    pid=getpid();
-    /* make sure we shift the pid to the MSB */
-    if((pid&0xffff0000) == 0)
-        pid<<=16;
-    *(long *)&buf[0]^=pid;
-#endif
-#endif
-    }
-
-static void fips_rand_encrypt(unsigned char *out,const unsigned char *in)
-    {
-    DES_ecb2_encrypt(in,out,&ks1,&ks2,1);
-    }
-
-static void fips_rand_cleanup(void)
-    {
-    OPENSSL_cleanse(seed,sizeof seed);
-    n_seed=0;
-    }
-
-void FIPS_rand_seed(const void *buf_, FIPS_RAND_SIZE_T num)
-    {
-    const char *buf=buf_;
-    FIPS_RAND_SIZE_T n;
-    static int init;
-
-    /* If the key hasn't been set, we can't seed! */
-    if(!key_set)
-        return;
-
-    CRYPTO_w_lock(CRYPTO_LOCK_RAND);
-    if(!init)
-        {
-        init=1;
-        DES_set_key(&key1,&ks1);
-        DES_set_key(&key2,&ks2);
-        }
-
-    /*
-     * This algorithm only uses 64 bits of seed, so ensure that we use
-     * the most recent 64 bits.
-     */
-    for(n=0 ; n < num ; )
-        {
-        FIPS_RAND_SIZE_T t=num-n;
-
-        if(o_seed+t > sizeof seed)
-            t=sizeof seed-o_seed;
-        memcpy(seed+o_seed,buf+n,t);
-        n+=t;
-        o_seed+=t;
-        if(o_seed == sizeof seed)
-            o_seed=0;
-        if(n_seed < sizeof seed)
-            n_seed+=t;
-        }
-
-#ifndef GETPID_IS_MEANINGLESS
-    seed_pid=getpid();
-#endif
-
-    CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-    }
-
-static void fips_rand_add(const void *buf, FIPS_RAND_SIZE_T num, double add_entropy)
-    {
-    FIPS_rand_seed(buf,num);
-    }
-
-static int fips_rand_bytes(unsigned char *buf,FIPS_RAND_SIZE_T num)
-    {
-    FIPS_RAND_SIZE_T n;
-    unsigned char timeseed[8];
-    unsigned char intermediate[SEED_SIZE];
-    unsigned char output[SEED_SIZE];
-    static unsigned char previous[SEED_SIZE];
-#ifndef GETPID_IS_MEANINGLESS
-    int pid;
-#endif
-
-    if(n_seed < sizeof seed)
-        {
-        RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_NOT_SEEDED);
-        return 0;
-        }
-
-#ifdef FIPS_RAND_MAX_SIZE_T
-    if (num > FIPS_RAND_MAX_SIZE_T)
-        {
-#ifdef RAND_R_PRNG_ASKING_FOR_TOO_MUCH
-        RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_ASKING_FOR_TOO_MUCH);
-        return 0;
-#else
-        return -1; /* signal "not supported" condition */
-#endif
-        }
-#endif
-
-#ifndef GETPID_IS_MEANINGLESS
-    pid=getpid();
-    if(pid != seed_pid)
-        {
-        RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_NOT_RESEEDED);
-        return 0;
-        }
-    if(pid != key_pid)
-        {
-        RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_NOT_REKEYED);
-        return 0;
-        }
-#endif
-
-    CRYPTO_w_lock(CRYPTO_LOCK_RAND);
-
-    for(n=0 ; n < num ; )
-        {
-        unsigned char t[SEED_SIZE];
-        FIPS_RAND_SIZE_T l;
-        
-        /* ANS X9.31 A.2.4:     I = ede*K(DT)
-               timeseed == DT
-               intermediate == I
-        */
-        fips_gettime(timeseed);
-        fips_rand_encrypt(intermediate,timeseed);
-
-        /* ANS X9.31 A.2.4:     R = ede*K(I^V)
-               intermediate == I
-               seed == V
-               output == R
-        */
-        for(l=0 ; l < sizeof t ; ++l)
-            t[l]=intermediate[l]^seed[l];
-        fips_rand_encrypt(output,t);
-
-        /* ANS X9.31 A.2.4:     V = ede*K(R^I)
-               output == R
-               intermediate == I
-               seed == V
-        */
-        for(l=0 ; l < sizeof t ; ++l)
-            t[l]=output[l]^intermediate[l];
-        fips_rand_encrypt(seed,t);
-
-        if(second && !memcmp(output,previous,sizeof previous))
-            {
-            RANDerr(RAND_F_FIPS_RAND_BYTES,RAND_R_PRNG_STUCK);
-            CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-            return 0;
-            }
-        memcpy(previous,output,sizeof previous);
-        second=1;
-
-        /* Successive values of R may be concatenated to produce a
-           pseudo random number of the desired length */ 
-        l=SEED_SIZE < num-n ? SEED_SIZE : num-n;
-        memcpy(buf+n,output,l);
-        n+=l;
-        }
-
-    CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
-
-    return 1;
-    }
-
-static int fips_rand_status(void)
-    {
-    return n_seed == sizeof seed;
-    }
-
-#endif /* OPENSSL_FIPS */
diff --git a/src/lib/libssl/src/fips/rsa/Makefile b/src/lib/libssl/src/fips/rsa/Makefile
deleted file mode 100644
index bb20f86442..0000000000
--- a/src/lib/libssl/src/fips/rsa/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# SSLeay/fips/rsa/Makefile
-#
-
-DIR=    rsa
-TOP=    ../..
-CC=     cc
-INCLUDES=
-CFLAG=-g
-INSTALL_PREFIX=
-OPENSSLDIR=     /usr/local/ssl
-INSTALLTOP=/usr/local/ssl
-MAKEDEPPROG=    makedepend
-MAKEDEPEND=     $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
-MAKEFILE=       Makefile
-AR=             ar r
-
-CFLAGS= $(INCLUDES) $(CFLAG)
-
-GENERAL=Makefile
-TEST=
-APPS=
-
-LIB=$(TOP)/libcrypto.a
-LIBSRC=fips_rsa_eay.c fips_rsa_gen.c fips_rsa_selftest.c
-LIBOBJ=fips_rsa_eay.o fips_rsa_gen.o fips_rsa_selftest.o
-
-SRC= $(LIBSRC)
-
-EXHEADER=
-HEADER= $(EXHEADER)
-
-ALL=    $(GENERAL) $(SRC) $(HEADER)
-
-top:
-        (cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)
-
-all:    check lib
-
-lib:    $(LIBOBJ)
-        $(AR) $(LIB) $(LIBOBJ)
-        $(RANLIB) $(LIB) || echo Never mind.
-        @sleep 2; touch lib
-
-check:
-        TOP=`pwd`/$(TOP) ../fips_check_sha1 fingerprint.sha1 $(SRC) $(HEADER)
-
-files:
-        $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-
-links:
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)
-        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
-
-install:
-        @headerlist="$(EXHEADER)"; for i in $$headerlist; \
-        do \
-          (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-          chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-        done
-
-tags:
-        ctags $(SRC)
-
-tests:
-
-lint:
-        lint -DLINT $(INCLUDES) $(SRC)>fluff
-
-depend:
-        $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)
-
-dclean:
-        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
-        mv -f Makefile.new $(MAKEFILE)
-
-clean:
-        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-fips_rsa_eay.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsa_eay.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_rsa_eay.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_eay.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_rsa_eay.o: ../../include/openssl/opensslconf.h
-fips_rsa_eay.o: ../../include/openssl/opensslv.h
-fips_rsa_eay.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
-fips_rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h
-fips_rsa_eay.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-fips_rsa_eay.o: fips_rsa_eay.c
-fips_rsa_gen.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsa_gen.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_rsa_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_gen.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_rsa_gen.o: ../../include/openssl/opensslconf.h
-fips_rsa_gen.o: ../../include/openssl/opensslv.h
-fips_rsa_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rsa.h
-fips_rsa_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-fips_rsa_gen.o: ../../include/openssl/symhacks.h fips_rsa_gen.c
-fips_rsa_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-fips_rsa_selftest.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h
-fips_rsa_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
-fips_rsa_selftest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h
-fips_rsa_selftest.o: ../../include/openssl/opensslconf.h
-fips_rsa_selftest.o: ../../include/openssl/opensslv.h
-fips_rsa_selftest.o: ../../include/openssl/ossl_typ.h
-fips_rsa_selftest.o: ../../include/openssl/rsa.h
-fips_rsa_selftest.o: ../../include/openssl/safestack.h
-fips_rsa_selftest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
-fips_rsa_selftest.o: ../../include/openssl/symhacks.h fips_rsa_selftest.c
diff --git a/src/lib/libssl/src/fips/rsa/fips_rsa_eay.c b/src/lib/libssl/src/fips/rsa/fips_rsa_eay.c
deleted file mode 100644
index c571e2b1bf..0000000000
--- a/src/lib/libssl/src/fips/rsa/fips_rsa_eay.c
+++ /dev/null
@@ -1,735 +0,0 @@
-/* crypto/rsa/rsa_eay.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-#include <openssl/fips.h>
-
-#if !defined(RSA_NULL) && defined(OPENSSL_FIPS)
-
-static int RSA_eay_public_encrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_private_encrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_public_decrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_private_decrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-                unsigned char *to, RSA *rsa,int padding);
-static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *i, RSA *rsa);
-static int RSA_eay_init(RSA *rsa);
-static int RSA_eay_finish(RSA *rsa);
-static RSA_METHOD rsa_pkcs1_eay_meth={
-        "Eric Young's PKCS#1 RSA",
-        RSA_eay_public_encrypt,
-        RSA_eay_public_decrypt, /* signature verification */
-        RSA_eay_private_encrypt, /* signing */
-        RSA_eay_private_decrypt,
-        RSA_eay_mod_exp,
-        BN_mod_exp_mont, /* XXX probably we should not use Montgomery if  e == 3 */
-        RSA_eay_init,
-        RSA_eay_finish,
-        0, /* flags */
-        NULL,
-        0, /* rsa_sign */
-        0  /* rsa_verify */
-        };
-
-const RSA_METHOD *RSA_PKCS1_SSLeay(void)
-        {
-        return(&rsa_pkcs1_eay_meth);
-        }
-
-static int RSA_eay_public_encrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int i,j,k,num=0,r= -1;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-
-        if(FIPS_selftest_failed())
-                {
-                FIPSerr(FIPS_F_RSA_EAY_PUBLIC_ENCRYPT,FIPS_R_FIPS_SELFTEST_FAILED);
-                goto err;
-                }
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        num=BN_num_bytes(rsa->n);
-        if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                i=RSA_padding_add_PKCS1_type_2(buf,num,from,flen);
-                break;
-#ifndef OPENSSL_NO_SHA
-        case RSA_PKCS1_OAEP_PADDING:
-                i=RSA_padding_add_PKCS1_OAEP(buf,num,from,flen,NULL,0);
-                break;
-#endif
-        case RSA_SSLV23_PADDING:
-                i=RSA_padding_add_SSLv23(buf,num,from,flen);
-                break;
-        case RSA_NO_PADDING:
-                i=RSA_padding_add_none(buf,num,from,flen);
-                break;
-        default:
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (i <= 0) goto err;
-
-        if (BN_bin2bn(buf,num,&f) == NULL) goto err;
-        
-        if (BN_ucmp(&f, rsa->n) >= 0)
-                {       
-                /* usually the padding functions would catch this */
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_ENCRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
-                goto err;
-                }
-
-        if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
-                {
-                BN_MONT_CTX* bn_mont_ctx;
-                if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
-                        goto err;
-                if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->n,ctx))
-                        {
-                        BN_MONT_CTX_free(bn_mont_ctx);
-                        goto err;
-                        }
-                if (rsa->_method_mod_n == NULL) /* other thread may have finished first */
-                        {
-                        CRYPTO_w_lock(CRYPTO_LOCK_RSA);
-                        if (rsa->_method_mod_n == NULL)
-                                {
-                                rsa->_method_mod_n = bn_mont_ctx;
-                                bn_mont_ctx = NULL;
-                                }
-                        CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-                        }
-                if (bn_mont_ctx)
-                        BN_MONT_CTX_free(bn_mont_ctx);
-                }
-                
-        if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
-                rsa->_method_mod_n)) goto err;
-
-        /* put in leading 0 bytes if the number is less than the
-         * length of the modulus */
-        j=BN_num_bytes(&ret);
-        i=BN_bn2bin(&ret,&(to[num-j]));
-        for (k=0; k<(num-i); k++)
-                to[k]=0;
-
-        r=num;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (buf != NULL) 
-                {
-                OPENSSL_cleanse(buf,num);
-                OPENSSL_free(buf);
-                }
-        return(r);
-        }
-
-static int rsa_eay_blinding(RSA *rsa, BN_CTX *ctx)
-        {
-        int ret = 1;
-        CRYPTO_w_lock(CRYPTO_LOCK_RSA);
-        /* Check again inside the lock - the macro's check is racey */
-        if(rsa->blinding == NULL)
-                ret = RSA_blinding_on(rsa, ctx);
-        CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-        return ret;
-        }
-
-#define BLINDING_HELPER(rsa, ctx, err_instr) \
-        do { \
-                if((!((rsa)->flags & RSA_FLAG_NO_BLINDING)) && \
-                    ((rsa)->blinding == NULL) && \
-                    !rsa_eay_blinding(rsa, ctx)) \
-                    err_instr \
-        } while(0)
-
-static BN_BLINDING *setup_blinding(RSA *rsa, BN_CTX *ctx)
-        {
-        BIGNUM *A, *Ai;
-        BN_BLINDING *ret = NULL;
-
-        /* added in OpenSSL 0.9.6j and 0.9.7b */
-
-        /* NB: similar code appears in RSA_blinding_on (rsa_lib.c);
-         * this should be placed in a new function of its own, but for reasons
-         * of binary compatibility can't */
-
-        BN_CTX_start(ctx);
-        A = BN_CTX_get(ctx);
-        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);
-                if (!BN_pseudo_rand_range(A,rsa->n)) goto err;
-                }
-        else
-                {
-                if (!BN_rand_range(A,rsa->n)) goto err;
-                }
-        if ((Ai=BN_mod_inverse(NULL,A,rsa->n,ctx)) == NULL) goto err;
-
-        if (!rsa->meth->bn_mod_exp(A,A,rsa->e,rsa->n,ctx,rsa->_method_mod_n))
-                goto err;
-        ret = BN_BLINDING_new(A,Ai,rsa->n);
-        BN_free(Ai);
-err:
-        BN_CTX_end(ctx);
-        return ret;
-        }
-
-/* signing */
-static int RSA_eay_private_encrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int i,j,k,num=0,r= -1;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-        int local_blinding = 0;
-        BN_BLINDING *blinding = NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-        num=BN_num_bytes(rsa->n);
-        if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                i=RSA_padding_add_PKCS1_type_1(buf,num,from,flen);
-                break;
-        case RSA_NO_PADDING:
-                i=RSA_padding_add_none(buf,num,from,flen);
-                break;
-        case RSA_SSLV23_PADDING:
-        default:
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (i <= 0) goto err;
-
-        if (BN_bin2bn(buf,num,&f) == NULL) goto err;
-        
-        if (BN_ucmp(&f, rsa->n) >= 0)
-                {       
-                /* usually the padding functions would catch this */
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
-                goto err;
-                }
-
-        BLINDING_HELPER(rsa, ctx, goto err;);
-        blinding = rsa->blinding;
-        
-        /* Now unless blinding is disabled, 'blinding' is non-NULL.
-         * But the BN_BLINDING object may be owned by some other thread
-         * (we don't want to keep it constant and we don't want to use
-         * lots of locking to avoid race conditions, so only a single
-         * thread can use it; other threads have to use local blinding
-         * factors) */
-        if (!(rsa->flags & RSA_FLAG_NO_BLINDING))
-                {
-                if (blinding == NULL)
-                        {
-                        RSAerr(RSA_F_RSA_EAY_PRIVATE_ENCRYPT, ERR_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                }
-        
-        if (blinding != NULL)
-                {
-                if (blinding->thread_id != CRYPTO_thread_id())
-                        {
-                        /* we need a local one-time blinding factor */
-
-                        blinding = setup_blinding(rsa, ctx);
-                        if (blinding == NULL)
-                                goto err;
-                        local_blinding = 1;
-                        }
-                }
-
-        if (blinding)
-                if (!BN_BLINDING_convert(&f, blinding, ctx)) goto err;
-
-        if ( (rsa->flags & RSA_FLAG_EXT_PKEY) ||
-                ((rsa->p != NULL) &&
-                (rsa->q != NULL) &&
-                (rsa->dmp1 != NULL) &&
-                (rsa->dmq1 != NULL) &&
-                (rsa->iqmp != NULL)) )
-                { if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err; }
-        else
-                {
-                if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->d,rsa->n,ctx,NULL)) goto err;
-                }
-
-        if (blinding)
-                if (!BN_BLINDING_invert(&ret, blinding, ctx)) goto err;
-
-        /* put in leading 0 bytes if the number is less than the
-         * length of the modulus */
-        j=BN_num_bytes(&ret);
-        i=BN_bn2bin(&ret,&(to[num-j]));
-        for (k=0; k<(num-i); k++)
-                to[k]=0;
-
-        r=num;
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&ret);
-        BN_clear_free(&f);
-        if (local_blinding)
-                BN_BLINDING_free(blinding);
-        if (buf != NULL)
-                {
-                OPENSSL_cleanse(buf,num);
-                OPENSSL_free(buf);
-                }
-        return(r);
-        }
-
-static int RSA_eay_private_decrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int j,num=0,r= -1;
-        unsigned char *p;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-        int local_blinding = 0;
-        BN_BLINDING *blinding = NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        num=BN_num_bytes(rsa->n);
-
-        if ((buf=(unsigned char *)OPENSSL_malloc(num)) == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        /* This check was for equality but PGP does evil things
-         * and chops off the top '0' bytes */
-        if (flen > num)
-                {
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_DATA_GREATER_THAN_MOD_LEN);
-                goto err;
-                }
-
-        /* make data into a big number */
-        if (BN_bin2bn(from,(int)flen,&f) == NULL) goto err;
-
-        if (BN_ucmp(&f, rsa->n) >= 0)
-                {
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
-                goto err;
-                }
-
-        BLINDING_HELPER(rsa, ctx, goto err;);
-        blinding = rsa->blinding;
-        
-        /* Now unless blinding is disabled, 'blinding' is non-NULL.
-         * But the BN_BLINDING object may be owned by some other thread
-         * (we don't want to keep it constant and we don't want to use
-         * lots of locking to avoid race conditions, so only a single
-         * thread can use it; other threads have to use local blinding
-         * factors) */
-        if (!(rsa->flags & RSA_FLAG_NO_BLINDING))
-                {
-                if (blinding == NULL)
-                        {
-                        RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT, ERR_R_INTERNAL_ERROR);
-                        goto err;
-                        }
-                }
-        
-        if (blinding != NULL)
-                {
-                if (blinding->thread_id != CRYPTO_thread_id())
-                        {
-                        /* we need a local one-time blinding factor */
-
-                        blinding = setup_blinding(rsa, ctx);
-                        if (blinding == NULL)
-                                goto err;
-                        local_blinding = 1;
-                        }
-                }
-
-        if (blinding)
-                if (!BN_BLINDING_convert(&f, blinding, ctx)) goto err;
-
-        /* do the decrypt */
-        if ( (rsa->flags & RSA_FLAG_EXT_PKEY) ||
-                ((rsa->p != NULL) &&
-                (rsa->q != NULL) &&
-                (rsa->dmp1 != NULL) &&
-                (rsa->dmq1 != NULL) &&
-                (rsa->iqmp != NULL)) )
-                { if (!rsa->meth->rsa_mod_exp(&ret,&f,rsa)) goto err; }
-        else
-                {
-                if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->d,rsa->n,ctx,NULL))
-                        goto err;
-                }
-
-        if (blinding)
-                if (!BN_BLINDING_invert(&ret, blinding, ctx)) goto err;
-
-        p=buf;
-        j=BN_bn2bin(&ret,p); /* j is only used with no-padding mode */
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                r=RSA_padding_check_PKCS1_type_2(to,num,buf,j,num);
-                break;
-#ifndef OPENSSL_NO_SHA
-        case RSA_PKCS1_OAEP_PADDING:
-                r=RSA_padding_check_PKCS1_OAEP(to,num,buf,j,num,NULL,0);
-                break;
-#endif
-        case RSA_SSLV23_PADDING:
-                r=RSA_padding_check_SSLv23(to,num,buf,j,num);
-                break;
-        case RSA_NO_PADDING:
-                r=RSA_padding_check_none(to,num,buf,j,num);
-                break;
-        default:
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (r < 0)
-                RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT,RSA_R_PADDING_CHECK_FAILED);
-
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (local_blinding)
-                BN_BLINDING_free(blinding);
-        if (buf != NULL)
-                {
-                OPENSSL_cleanse(buf,num);
-                OPENSSL_free(buf);
-                }
-        return(r);
-        }
-
-/* signature verification */
-static int RSA_eay_public_decrypt(FIPS_RSA_SIZE_T flen, const unsigned char *from,
-             unsigned char *to, RSA *rsa, int padding)
-        {
-        BIGNUM f,ret;
-        int i,num=0,r= -1;
-        unsigned char *p;
-        unsigned char *buf=NULL;
-        BN_CTX *ctx=NULL;
-
-        BN_init(&f);
-        BN_init(&ret);
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-
-        num=BN_num_bytes(rsa->n);
-        buf=(unsigned char *)OPENSSL_malloc(num);
-        if (buf == NULL)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,ERR_R_MALLOC_FAILURE);
-                goto err;
-                }
-
-        /* This check was for equality but PGP does evil things
-         * and chops off the top '0' bytes */
-        if (flen > num)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_DATA_GREATER_THAN_MOD_LEN);
-                goto err;
-                }
-
-        if (BN_bin2bn(from,flen,&f) == NULL) goto err;
-
-        if (BN_ucmp(&f, rsa->n) >= 0)
-                {
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_DATA_TOO_LARGE_FOR_MODULUS);
-                goto err;
-                }
-
-        /* do the decrypt */
-        if ((rsa->_method_mod_n == NULL) && (rsa->flags & RSA_FLAG_CACHE_PUBLIC))
-                {
-                BN_MONT_CTX* bn_mont_ctx;
-                if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
-                        goto err;
-                if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->n,ctx))
-                        {
-                        BN_MONT_CTX_free(bn_mont_ctx);
-                        goto err;
-                        }
-                if (rsa->_method_mod_n == NULL) /* other thread may have finished first */
-                        {
-                        CRYPTO_w_lock(CRYPTO_LOCK_RSA);
-                        if (rsa->_method_mod_n == NULL)
-                                {
-                                rsa->_method_mod_n = bn_mont_ctx;
-                                bn_mont_ctx = NULL;
-                                }
-                        CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-                        }
-                if (bn_mont_ctx)
-                        BN_MONT_CTX_free(bn_mont_ctx);
-                }
-                
-        if (!rsa->meth->bn_mod_exp(&ret,&f,rsa->e,rsa->n,ctx,
-                rsa->_method_mod_n)) goto err;
-
-        p=buf;
-        i=BN_bn2bin(&ret,p);
-
-        switch (padding)
-                {
-        case RSA_PKCS1_PADDING:
-                r=RSA_padding_check_PKCS1_type_1(to,num,buf,i,num);
-                break;
-        case RSA_NO_PADDING:
-                r=RSA_padding_check_none(to,num,buf,i,num);
-                break;
-        default:
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_UNKNOWN_PADDING_TYPE);
-                goto err;
-                }
-        if (r < 0)
-                RSAerr(RSA_F_RSA_EAY_PUBLIC_DECRYPT,RSA_R_PADDING_CHECK_FAILED);
-
-err:
-        if (ctx != NULL) BN_CTX_free(ctx);
-        BN_clear_free(&f);
-        BN_clear_free(&ret);
-        if (buf != NULL)
-                {
-                OPENSSL_cleanse(buf,num);
-                OPENSSL_free(buf);
-                }
-        return(r);
-        }
-
-static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)
-        {
-        BIGNUM r1,m1,vrfy;
-        int ret=0;
-        BN_CTX *ctx;
-
-        BN_init(&m1);
-        BN_init(&r1);
-        BN_init(&vrfy);
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
-
-        if (rsa->flags & RSA_FLAG_CACHE_PRIVATE)
-                {
-                if (rsa->_method_mod_p == NULL)
-                        {
-                        BN_MONT_CTX* bn_mont_ctx;
-                        if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
-                                goto err;
-                        if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->p,ctx))
-                                {
-                                BN_MONT_CTX_free(bn_mont_ctx);
-                                goto err;
-                                }
-                        if (rsa->_method_mod_p == NULL) /* other thread may have finished first */
-                                {
-                                CRYPTO_w_lock(CRYPTO_LOCK_RSA);
-                                if (rsa->_method_mod_p == NULL)
-                                        {
-                                        rsa->_method_mod_p = bn_mont_ctx;
-                                        bn_mont_ctx = NULL;
-                                        }
-                                CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-                                }
-                        if (bn_mont_ctx)
-                                BN_MONT_CTX_free(bn_mont_ctx);
-                        }
-
-                if (rsa->_method_mod_q == NULL)
-                        {
-                        BN_MONT_CTX* bn_mont_ctx;
-                        if ((bn_mont_ctx=BN_MONT_CTX_new()) == NULL)
-                                goto err;
-                        if (!BN_MONT_CTX_set(bn_mont_ctx,rsa->q,ctx))
-                                {
-                                BN_MONT_CTX_free(bn_mont_ctx);
-                                goto err;
-                                }
-                        if (rsa->_method_mod_q == NULL) /* other thread may have finished first */
-                                {
-                                CRYPTO_w_lock(CRYPTO_LOCK_RSA);
-                                if (rsa->_method_mod_q == NULL)
-                                        {
-                                        rsa->_method_mod_q = bn_mont_ctx;
-                                        bn_mont_ctx = NULL;
-                                        }
-                                CRYPTO_w_unlock(CRYPTO_LOCK_RSA);
-                                }
-                        if (bn_mont_ctx)
-                                BN_MONT_CTX_free(bn_mont_ctx);
-                        }
-                }
-                
-        if (!BN_mod(&r1,I,rsa->q,ctx)) goto err;
-        if (!rsa->meth->bn_mod_exp(&m1,&r1,rsa->dmq1,rsa->q,ctx,
-                rsa->_method_mod_q)) goto err;
-
-        if (!BN_mod(&r1,I,rsa->p,ctx)) goto err;
-        if (!rsa->meth->bn_mod_exp(r0,&r1,rsa->dmp1,rsa->p,ctx,
-                rsa->_method_mod_p)) goto err;
-
-        if (!BN_sub(r0,r0,&m1)) goto err;
-        /* This will help stop the size of r0 increasing, which does
-         * affect the multiply if it optimised for a power of 2 size */
-        if (r0->neg)
-                if (!BN_add(r0,r0,rsa->p)) goto err;
-
-        if (!BN_mul(&r1,r0,rsa->iqmp,ctx)) goto err;
-        if (!BN_mod(r0,&r1,rsa->p,ctx)) goto err;
-        /* If p < q it is occasionally possible for the correction of
-         * adding 'p' if r0 is negative above to leave the result still
-         * negative. This can break the private key operations: the following
-         * second correction should *always* correct this rare occurrence.
-         * This will *never* happen with OpenSSL generated keys because
-         * they ensure p > q [steve]
-         */
-        if (r0->neg)
-                if (!BN_add(r0,r0,rsa->p)) goto err;
-        if (!BN_mul(&r1,r0,rsa->q,ctx)) goto err;
-        if (!BN_add(r0,&r1,&m1)) goto err;
-
-        if (rsa->e && rsa->n)
-                {
-                if (!rsa->meth->bn_mod_exp(&vrfy,r0,rsa->e,rsa->n,ctx,NULL)) goto err;
-                /* If 'I' was greater than (or equal to) rsa->n, the operation
-                 * will be equivalent to using 'I mod n'. However, the result of
-                 * the verify will *always* be less than 'n' so we don't check
-                 * for absolute equality, just congruency. */
-                if (!BN_sub(&vrfy, &vrfy, I)) goto err;
-                if (!BN_mod(&vrfy, &vrfy, rsa->n, ctx)) goto err;
-                if (vrfy.neg)
-                        if (!BN_add(&vrfy, &vrfy, rsa->n)) goto err;
-                if (!BN_is_zero(&vrfy))
-                        /* 'I' and 'vrfy' aren't congruent mod n. Don't leak
-                         * miscalculated CRT output, just do a raw (slower)
-                         * mod_exp and return that instead. */
-                        if (!rsa->meth->bn_mod_exp(r0,I,rsa->d,rsa->n,ctx,NULL)) goto err;
-                }
-        ret=1;
-err:
-        BN_clear_free(&m1);
-        BN_clear_free(&r1);
-        BN_clear_free(&vrfy);
-        BN_CTX_free(ctx);
-        return(ret);
-        }
-
-static int RSA_eay_init(RSA *rsa)
-        {
-        rsa->flags|=RSA_FLAG_CACHE_PUBLIC|RSA_FLAG_CACHE_PRIVATE;
-        return(1);
-        }
-
-static int RSA_eay_finish(RSA *rsa)
-        {
-        if (rsa->_method_mod_n != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_n);
-        if (rsa->_method_mod_p != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_p);
-        if (rsa->_method_mod_q != NULL)
-                BN_MONT_CTX_free(rsa->_method_mod_q);
-        return(1);
-        }
-
-#endif
diff --git a/src/lib/libssl/src/fips/rsa/fips_rsa_gen.c b/src/lib/libssl/src/fips/rsa/fips_rsa_gen.c
deleted file mode 100644
index 2c92112477..0000000000
--- a/src/lib/libssl/src/fips/rsa/fips_rsa_gen.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* crypto/rsa/rsa_gen.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <openssl/err.h>
-#include <openssl/bn.h>
-#include <openssl/rsa.h>
-#include <openssl/fips.h>
-
-#ifdef OPENSSL_FIPS
-
-static int fips_check_rsa(RSA *rsa)
-    {
-    int n;
-    unsigned char ctext[256];
-    unsigned char ptext[256];
-    /* The longest we can have with OAEP padding and a 512 bit key */
-    static unsigned char original_ptext[] =
-        "\x01\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0"
-        "\x23\x45\x67\x89\xab\xcd";
-
-    /* this will fail for keys shorter than 512 bits */
-    n=RSA_public_encrypt(sizeof(original_ptext)-1,original_ptext,ctext,rsa,
-                         RSA_PKCS1_OAEP_PADDING);
-    if(n < 0)
-        {
-        ERR_print_errors_fp(stderr);
-        exit(1);
-        }
-    if(!memcmp(ctext,original_ptext,n))
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_RSA,FIPS_R_PAIRWISE_TEST_FAILED);
-        return 0;
-        }
-    n=RSA_private_decrypt(n,ctext,ptext,rsa,RSA_PKCS1_OAEP_PADDING);
-    if(n < 0)
-        {
-        ERR_print_errors_fp(stderr);
-        exit(1);
-        }
-    if(n != sizeof(original_ptext)-1 || memcmp(ptext,original_ptext,n))
-        {
-        FIPSerr(FIPS_F_FIPS_CHECK_RSA,FIPS_R_PAIRWISE_TEST_FAILED);
-        return 0;
-        }
-
-    return 1;
-    }
-
-RSA *RSA_generate_key(FIPS_RSA_SIZE_T bits, unsigned long e_value,
-             void (*callback)(int,int,void *), void *cb_arg)
-        {
-        RSA *rsa=NULL;
-        BIGNUM *r0=NULL,*r1=NULL,*r2=NULL,*r3=NULL,*tmp;
-        int bitsp,bitsq,ok= -1,n=0,i;
-        BN_CTX *ctx=NULL,*ctx2=NULL;
-
-        if(FIPS_selftest_failed())
-            {
-            FIPSerr(FIPS_F_RSA_GENERATE_KEY,FIPS_R_FIPS_SELFTEST_FAILED);
-            return NULL;
-            }
-            
-        ctx=BN_CTX_new();
-        if (ctx == NULL) goto err;
-        ctx2=BN_CTX_new();
-        if (ctx2 == NULL) goto err;
-        BN_CTX_start(ctx);
-        r0 = BN_CTX_get(ctx);
-        r1 = BN_CTX_get(ctx);
-        r2 = BN_CTX_get(ctx);
-        r3 = BN_CTX_get(ctx);
-        if (r3 == NULL) goto err;
-
-        bitsp=(bits+1)/2;
-        bitsq=bits-bitsp;
-        rsa=RSA_new();
-        if (rsa == NULL) goto err;
-
-        /* set e */ 
-        rsa->e=BN_new();
-        if (rsa->e == NULL) goto err;
-
-#if 1
-        /* The problem is when building with 8, 16, or 32 BN_ULONG,
-         * unsigned long can be larger */
-        for (i=0; i<sizeof(unsigned long)*8; i++)
-                {
-                if (e_value & (1UL<<i))
-                        BN_set_bit(rsa->e,i);
-                }
-#else
-        if (!BN_set_word(rsa->e,e_value)) goto err;
-#endif
-
-        /* generate p and q */
-        for (;;)
-                {
-                rsa->p=BN_generate_prime(NULL,bitsp,0,NULL,NULL,callback,cb_arg);
-                if (rsa->p == NULL) goto err;
-                if (!BN_sub(r2,rsa->p,BN_value_one())) goto err;
-                if (!BN_gcd(r1,r2,rsa->e,ctx)) goto err;
-                if (BN_is_one(r1)) break;
-                if (callback != NULL) callback(2,n++,cb_arg);
-                BN_free(rsa->p);
-                }
-        if (callback != NULL) callback(3,0,cb_arg);
-        for (;;)
-                {
-                rsa->q=BN_generate_prime(NULL,bitsq,0,NULL,NULL,callback,cb_arg);
-                if (rsa->q == NULL) goto err;
-                if (!BN_sub(r2,rsa->q,BN_value_one())) goto err;
-                if (!BN_gcd(r1,r2,rsa->e,ctx)) goto err;
-                if (BN_is_one(r1) && (BN_cmp(rsa->p,rsa->q) != 0))
-                        break;
-                if (callback != NULL) callback(2,n++,cb_arg);
-                BN_free(rsa->q);
-                }
-        if (callback != NULL) callback(3,1,cb_arg);
-        if (BN_cmp(rsa->p,rsa->q) < 0)
-                {
-                tmp=rsa->p;
-                rsa->p=rsa->q;
-                rsa->q=tmp;
-                }
-
-        /* calculate n */
-        rsa->n=BN_new();
-        if (rsa->n == NULL) goto err;
-        if (!BN_mul(rsa->n,rsa->p,rsa->q,ctx)) goto err;
-
-        /* calculate d */
-        if (!BN_sub(r1,rsa->p,BN_value_one())) goto err;        /* p-1 */
-        if (!BN_sub(r2,rsa->q,BN_value_one())) goto err;        /* q-1 */
-        if (!BN_mul(r0,r1,r2,ctx)) goto err;    /* (p-1)(q-1) */
-
-/* should not be needed, since gcd(p-1,e) == 1 and gcd(q-1,e) == 1 */
-/*      for (;;)
-                {
-                if (!BN_gcd(r3,r0,rsa->e,ctx)) goto err;
-                if (BN_is_one(r3)) break;
-
-                if (1)
-                        {
-                        if (!BN_add_word(rsa->e,2L)) goto err;
-                        continue;
-                        }
-                RSAerr(RSA_F_RSA_GENERATE_KEY,RSA_R_BAD_E_VALUE);
-                goto err;
-                }
-*/
-        rsa->d=BN_mod_inverse(NULL,rsa->e,r0,ctx2);     /* d */
-        if (rsa->d == NULL) goto err;
-
-        /* calculate d mod (p-1) */
-        rsa->dmp1=BN_new();
-        if (rsa->dmp1 == NULL) goto err;
-        if (!BN_mod(rsa->dmp1,rsa->d,r1,ctx)) goto err;
-
-        /* calculate d mod (q-1) */
-        rsa->dmq1=BN_new();
-        if (rsa->dmq1 == NULL) goto err;
-        if (!BN_mod(rsa->dmq1,rsa->d,r2,ctx)) goto err;
-
-        /* calculate inverse of q mod p */
-        rsa->iqmp=BN_mod_inverse(NULL,rsa->q,rsa->p,ctx2);
-        if (rsa->iqmp == NULL) goto err;
-
-        if(!fips_check_rsa(rsa))
-            goto err;
-
-        ok=1;
-err:
-        if (ok == -1)
-                {
-                RSAerr(RSA_F_RSA_GENERATE_KEY,ERR_LIB_BN);
-                ok=0;
-                }
-        BN_CTX_end(ctx);
-        BN_CTX_free(ctx);
-        BN_CTX_free(ctx2);
-        
-        if (!ok)
-                {
-                if (rsa != NULL) RSA_free(rsa);
-                return(NULL);
-                }
-        else
-                return(rsa);
-        }
-
-#endif
diff --git a/src/lib/libssl/src/fips/rsa/fips_rsa_selftest.c b/src/lib/libssl/src/fips/rsa/fips_rsa_selftest.c
deleted file mode 100644
index 4e3b9445fc..0000000000
--- a/src/lib/libssl/src/fips/rsa/fips_rsa_selftest.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <string.h>
-#include <openssl/err.h>
-#include <openssl/fips.h>
-#include <openssl/rsa.h>
-#include <openssl/sha.h>
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_FIPS
-#define SetKey \
-  key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \
-  key->e = BN_bin2bn(e, sizeof(e)-1, key->e); \
-  key->d = BN_bin2bn(d, sizeof(d)-1, key->d); \
-  key->p = BN_bin2bn(p, sizeof(p)-1, key->p); \
-  key->q = BN_bin2bn(q, sizeof(q)-1, key->q); \
-  key->dmp1 = BN_bin2bn(dmp1, sizeof(dmp1)-1, key->dmp1); \
-  key->dmq1 = BN_bin2bn(dmq1, sizeof(dmq1)-1, key->dmq1); \
-  key->iqmp = BN_bin2bn(iqmp, sizeof(iqmp)-1, key->iqmp); \
-  memcpy(c, ctext_ex, sizeof(ctext_ex) - 1); \
-  return (sizeof(ctext_ex) - 1);
-
-static unsigned char n[] =
-"\x00\xBB\xF8\x2F\x09\x06\x82\xCE\x9C\x23\x38\xAC\x2B\x9D\xA8\x71"
-"\xF7\x36\x8D\x07\xEE\xD4\x10\x43\xA4\x40\xD6\xB6\xF0\x74\x54\xF5"
-"\x1F\xB8\xDF\xBA\xAF\x03\x5C\x02\xAB\x61\xEA\x48\xCE\xEB\x6F\xCD"
-"\x48\x76\xED\x52\x0D\x60\xE1\xEC\x46\x19\x71\x9D\x8A\x5B\x8B\x80"
-"\x7F\xAF\xB8\xE0\xA3\xDF\xC7\x37\x72\x3E\xE6\xB4\xB7\xD9\x3A\x25"
-"\x84\xEE\x6A\x64\x9D\x06\x09\x53\x74\x88\x34\xB2\x45\x45\x98\x39"
-"\x4E\xE0\xAA\xB1\x2D\x7B\x61\xA5\x1F\x52\x7A\x9A\x41\xF6\xC1\x68"
-"\x7F\xE2\x53\x72\x98\xCA\x2A\x8F\x59\x46\xF8\xE5\xFD\x09\x1D\xBD"
-"\xCB";
-
-
-static int setrsakey(RSA *key, unsigned char *c)
-    {
-    static unsigned char e[] = "\x11";
-
-    static unsigned char d[] =
-"\x00\xA5\xDA\xFC\x53\x41\xFA\xF2\x89\xC4\xB9\x88\xDB\x30\xC1\xCD"
-"\xF8\x3F\x31\x25\x1E\x06\x68\xB4\x27\x84\x81\x38\x01\x57\x96\x41"
-"\xB2\x94\x10\xB3\xC7\x99\x8D\x6B\xC4\x65\x74\x5E\x5C\x39\x26\x69"
-"\xD6\x87\x0D\xA2\xC0\x82\xA9\x39\xE3\x7F\xDC\xB8\x2E\xC9\x3E\xDA"
-"\xC9\x7F\xF3\xAD\x59\x50\xAC\xCF\xBC\x11\x1C\x76\xF1\xA9\x52\x94"
-"\x44\xE5\x6A\xAF\x68\xC5\x6C\x09\x2C\xD3\x8D\xC3\xBE\xF5\xD2\x0A"
-"\x93\x99\x26\xED\x4F\x74\xA1\x3E\xDD\xFB\xE1\xA1\xCE\xCC\x48\x94"
-"\xAF\x94\x28\xC2\xB7\xB8\x88\x3F\xE4\x46\x3A\x4B\xC8\x5B\x1C\xB3"
-"\xC1";
-
-    static unsigned char p[] =
-"\x00\xEE\xCF\xAE\x81\xB1\xB9\xB3\xC9\x08\x81\x0B\x10\xA1\xB5\x60"
-"\x01\x99\xEB\x9F\x44\xAE\xF4\xFD\xA4\x93\xB8\x1A\x9E\x3D\x84\xF6"
-"\x32\x12\x4E\xF0\x23\x6E\x5D\x1E\x3B\x7E\x28\xFA\xE7\xAA\x04\x0A"
-"\x2D\x5B\x25\x21\x76\x45\x9D\x1F\x39\x75\x41\xBA\x2A\x58\xFB\x65"
-"\x99";
-
-    static unsigned char q[] =
-"\x00\xC9\x7F\xB1\xF0\x27\xF4\x53\xF6\x34\x12\x33\xEA\xAA\xD1\xD9"
-"\x35\x3F\x6C\x42\xD0\x88\x66\xB1\xD0\x5A\x0F\x20\x35\x02\x8B\x9D"
-"\x86\x98\x40\xB4\x16\x66\xB4\x2E\x92\xEA\x0D\xA3\xB4\x32\x04\xB5"
-"\xCF\xCE\x33\x52\x52\x4D\x04\x16\xA5\xA4\x41\xE7\x00\xAF\x46\x15"
-"\x03";
-
-    static unsigned char dmp1[] =
-"\x54\x49\x4C\xA6\x3E\xBA\x03\x37\xE4\xE2\x40\x23\xFC\xD6\x9A\x5A"
-"\xEB\x07\xDD\xDC\x01\x83\xA4\xD0\xAC\x9B\x54\xB0\x51\xF2\xB1\x3E"
-"\xD9\x49\x09\x75\xEA\xB7\x74\x14\xFF\x59\xC1\xF7\x69\x2E\x9A\x2E"
-"\x20\x2B\x38\xFC\x91\x0A\x47\x41\x74\xAD\xC9\x3C\x1F\x67\xC9\x81";
-
-    static unsigned char dmq1[] =
-"\x47\x1E\x02\x90\xFF\x0A\xF0\x75\x03\x51\xB7\xF8\x78\x86\x4C\xA9"
-"\x61\xAD\xBD\x3A\x8A\x7E\x99\x1C\x5C\x05\x56\xA9\x4C\x31\x46\xA7"
-"\xF9\x80\x3F\x8F\x6F\x8A\xE3\x42\xE9\x31\xFD\x8A\xE4\x7A\x22\x0D"
-"\x1B\x99\xA4\x95\x84\x98\x07\xFE\x39\xF9\x24\x5A\x98\x36\xDA\x3D";
-    
-    static unsigned char iqmp[] =
-"\x00\xB0\x6C\x4F\xDA\xBB\x63\x01\x19\x8D\x26\x5B\xDB\xAE\x94\x23"
-"\xB3\x80\xF2\x71\xF7\x34\x53\x88\x50\x93\x07\x7F\xCD\x39\xE2\x11"
-"\x9F\xC9\x86\x32\x15\x4F\x58\x83\xB1\x67\xA9\x67\xBF\x40\x2B\x4E"
-"\x9E\x2E\x0F\x96\x56\xE6\x98\xEA\x36\x66\xED\xFB\x25\x79\x80\x39"
-"\xF7";
-
-    static unsigned char ctext_ex[] =
-"\x42\x4b\xc9\x51\x61\xd4\xca\xa0\x18\x6c\x4d\xca\x61\x8f\x2d\x07"
-"\x8c\x63\xc5\x6b\xa2\x4c\x32\xb1\xda\xb7\xdd\x32\xb6\x51\x68\xc3"
-"\x6e\x98\x46\xd6\xbb\x1a\xd5\x99\x05\x92\x7c\xd7\xbc\x08\x9e\xe4"
-"\xc3\x70\x4d\xe6\x99\x7e\x61\x31\x07\x7a\x19\xdb\x3e\x11\xfa\x3d"
-"\x7c\x61\xd7\x78\x14\x3f\x05\x16\xa0\xc4\xbf\xcd\xee\xca\x67\x4c"
-"\x80\x4e\xca\x43\x2f\x35\x43\x58\xa7\x50\x7e\x3e\x52\x82\xab\xac"
-"\xa6\x50\xe8\x39\x9f\xe0\x7f\x58\x1d\x1b\x90\x93\x04\xec\xb3\xf9"
-"\x24\xd3\x75\x3e\x39\xd1\x14\xc6\x33\xce\xd6\xee\x20\x47\xec\xe4";
-
-    SetKey;
-    }
-
-void FIPS_corrupt_rsa()
-    {
-    n[0]++;
-    }
-
-int FIPS_selftest_rsa()
-    {
-    int clen;
-    RSA *key;
-    unsigned char expected_ctext[256];
-    unsigned char ctext[256];
-    unsigned char ptext[256];
-    static unsigned char original_ptext[] =
-        "\x01\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0"
-        "\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12"
-        "\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34"
-        "\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56"
-        "\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78"
-        "\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78\x9a"
-        "\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78\x9a\xbc"
-        "\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78\x9a\xbc\xde"
-        "\xf0\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56\x78\x9a\xbc\xde";
-    unsigned char md[SHA_DIGEST_LENGTH];
-    unsigned char mdkat[SHA_DIGEST_LENGTH] =
-        "\x2d\x57\x1d\x6f\x5c\x37\xf9\xf0\x3b\xb4\x3c\xe8\x2c\x4c\xb3\x04"
-        "\x75\xa2\x0e\xfb";
-    unsigned char ctextkat[] =
-        "\x3e\xc5\x0a\xbe\x29\xa2\xca\x9a\x35\x14\x17\x26\xa4\x0f\xa3\x03"
-        "\x65\xb5\x37\xf5\x6a\xaa\xb\xf\x2c\x0d\x8\xc0\x73\x8\x3c\x88\x85"
-        "\x36\x68\x16\xfe\x2f\x59\x77\x7e\x2a\x76\x9a\xc7\x27\x19\x9b\x54"
-        "\x14\x87\xf3\xe0\xce\x1e\x68\x10\x40\x14\xac\xbc\xe6\x6f\x26\x1f"
-        "\x55\xd1\x15\x81\x48\x10\xf4\x89\xe5\x67\x52\x42\x87\x04\x74\x4e"
-        "\x96\x14\x7c\x53\xc9\x1e\x84\x11\x7d\x7d\x23\xbd\xff\x6c\xcb\x00"
-        "\x96\x2e\x7d\xfb\x47\xea\x78\xcd\xd8\x04\x3a\x98\x06\x13\x68\x39"
-        "\xa1\xe2\xbc\x9f\x64\xc7\x62\xf0\x74\x4d\x42\xe0\x0b\xcf\x24\x48";
-    int i;
-
-    /* Perform pairwise consistency test by: ... */
-
-    key=RSA_new();
-    clen=setrsakey(key,expected_ctext);
-    /* ...1) apply public key to plaintext, resulting ciphertext must be
-     * different
-    */
-    i=RSA_public_encrypt(128,original_ptext,ctext,key,
-                         RSA_NO_PADDING);
-    if(i != clen || memcmp(ctext,expected_ctext,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    if(!memcmp(ctext,original_ptext,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    /* ...2) apply private key to ciphertext and compare result to
-     *       original plaintext; results must be equal
-    */
-    i=RSA_private_decrypt(i,ctext,ptext,key,RSA_NO_PADDING);
-    if(i != 128 || memcmp(ptext,original_ptext,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-
-    /* Perform sign and verify Known Answer Test by... */
-
-    /* ...1)  using the same RSA key to encrypt the SHA-1 hash of a
-     * plaintext value larger than the RSA key size
-    */
-    if (RSA_size(key) >= sizeof(original_ptext) - 1)
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    /* ...2) then generate the SHA-1 digest of plaintext, and compare the
-     * digest to the Known Answer (note here we duplicate the SHA-1 KAT)
-     */
-    SHA1(original_ptext,sizeof(original_ptext) - 1,md);
-    if(memcmp(md,mdkat,SHA_DIGEST_LENGTH))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_SHA1,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    /* ...3) then encrypt the digest, and compare the ciphertext
-     * to the Known Answer
-     */
-    i=RSA_private_encrypt(sizeof(md),md,ctext,key,RSA_PKCS1_PADDING);
-    if(i != clen || memcmp(ctextkat,ctext,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-    /* ...4) and finally decrypt the signed digest and compare with
-     * the original Known Answer
-     */
-    i=RSA_public_decrypt(i,ctext,md,key,RSA_PKCS1_PADDING);
-    if(i != sizeof(md) || memcmp(mdkat,md,i))
-        {
-        FIPSerr(FIPS_F_FIPS_SELFTEST_RSA,FIPS_R_SELFTEST_FAILED);
-        return 0;
-        }
-
-    RSA_free(key);
-    return 1;
-    }
-
-#endif /* def OPENSSL_FIPS */
diff --git a/src/lib/libssl/src/ms/16all.bat b/src/lib/libssl/src/ms/16all.bat
deleted file mode 100644
index 62ccf78963..0000000000
--- a/src/lib/libssl/src/ms/16all.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-set OPTS=no_asm
-
-perl Configure VC-WIN16
-perl util\mkfiles.pl >MINFO
-perl util\mk1mf.pl %OPTS% debug VC-WIN16 >d16.mak
-perl util\mk1mf.pl %OPTS% VC-WIN16 >16.mak
-perl util\mk1mf.pl %OPTS% debug dll VC-WIN16 >d16dll.mak
-perl util\mk1mf.pl %OPTS% dll VC-WIN16 >16dll.mak
-perl util\mkdef.pl 16 libeay > ms\libeay32.def
-perl util\mkdef.pl 16 ssleay > ms\ssleay32.def
-
-nmake -f d16.mak
-nmake -f 16.mak
-nmake -f d16dll.mak
-nmake -f 16dll.mak
diff --git a/src/lib/libssl/src/ms/fipscheck.pl b/src/lib/libssl/src/ms/fipscheck.pl
deleted file mode 100644
index 80ffbd15ae..0000000000
--- a/src/lib/libssl/src/ms/fipscheck.pl
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/perl
-
-# fipscheck.pl
-# sample perl script to check integrity of critical FIPS files
-
-my ($fipsdir) = @ARGV;
-
-die "Directory $fipsdir not found or invalid" unless -d $fipsdir;
-
-die "Standalone SHA1 check program ${fipsdir}/fips_standalone_sha1.exe not found" unless -f "${fipsdir}/fips_standalone_sha1.exe";
-
-check_hash("fips_premain.c", $fipsdir);
-check_hash("fipscanister.o", $fipsdir);
-
-sub check_hash
-        {
-        my ($filename, $dir) = @_;
-        my ($hashfile, $hashval);
-
-        $filename = "$dir/$filename";
-
-        die "File $filename does not exist" unless -f $filename;
-        die "File ${filename}.sha1 does not exist" unless -f "${filename}.sha1";
-
-        open(IN, "${filename}.sha1") || die "Cannot open file hash file ${filename}.sha1";
-        $hashfile = <IN>;
-        close IN;
-        $hashval = `${dir}/fips_standalone_sha1.exe $filename`;
-        chomp $hashfile;
-        chomp $hashval;
-        $hashfile =~ s/^.*=\s+//;
-        $hashval =~ s/^.*=\s+//;
-        die "Invalid hash syntax in file" if (length($hashfile) != 40);
-        die "Invalid hash received for file" if (length($hashval) != 40);
-        die "*** HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile); 
-        }
-
-
diff --git a/src/lib/libssl/src/ms/speed16.bat b/src/lib/libssl/src/ms/speed16.bat
deleted file mode 100644
index 7ff08851a2..0000000000
--- a/src/lib/libssl/src/ms/speed16.bat
+++ /dev/null
@@ -1,38 +0,0 @@
-set makefile=ms\dos.bat
-
-perl Configure b
-del tmp\*.obj
-nmake -f %makefile%
-nmake -f %makefile%
-nmake -f %makefile%
-out\ssleay version -v -b -f >speed.1
-out\ssleay speed >speed.1l
-
-perl Configure bl-4c-2c
-del tmp\rc4*.obj tmp\bn*.obj tmp\md2_dgst.obj
-nmake -f %makefile%
-nmake -f %makefile%
-nmake -f %makefile%
-out\ssleay speed rc4 rsa md2 >speed.2l
-
-perl Configure bl-4c-ri
-del tmp\rc4*.obj
-nmake -f %makefile%
-nmake -f %makefile%
-nmake -f %makefile%
-out\ssleay speed rc4 >speed.3l
-
-perl Configure b2-is-ri-dp
-perl util\mk1mf.pl VC-MSDOS no-asm >m2
-del tmp\i_*.obj tmp\rc4*.obj tmp\ecb_enc.obj tmp\bn*.obj
-nmake -f m2
-nmake -f m2
-nmake -f m2
-out\ssleay speed rsa rc4 idea des >speed.4l
-
-type speed.1 >speed.log
-type speed.1l >>speed.log
-perl util\sp-diff.pl speed.1l speed.2l >>speed.log
-perl util\sp-diff.pl speed.1l speed.3l >>speed.log
-perl util\sp-diff.pl speed.1l speed.4l >>speed.log
-
diff --git a/src/lib/libssl/src/ssl/d1_both.c b/src/lib/libssl/src/ssl/d1_both.c
new file mode 100644
index 0000000000..15a201a25c
--- /dev/null
+++ b/src/lib/libssl/src/ssl/d1_both.c
@@ -0,0 +1,1193 @@
+/* ssl/d1_both.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <limits.h>
+#include <string.h>
+#include <stdio.h>
+#include "ssl_locl.h"
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+
+
+/* XDTLS:  figure out the right values */
+static unsigned int g_probable_mtu[] = {1500 - 28, 512 - 28, 256 - 28};
+
+static unsigned int dtls1_min_mtu(void);
+static unsigned int dtls1_guess_mtu(unsigned int curr_mtu);
+static void dtls1_fix_message_header(SSL *s, unsigned long frag_off, 
+        unsigned long frag_len);
+static unsigned char *dtls1_write_message_header(SSL *s,
+        unsigned char *p);
+static void dtls1_set_message_header_int(SSL *s, unsigned char mt,
+        unsigned long len, unsigned short seq_num, unsigned long frag_off, 
+        unsigned long frag_len);
+static int dtls1_retransmit_buffered_messages(SSL *s);
+static long dtls1_get_message_fragment(SSL *s, int st1, int stn, 
+        long max, int *ok);
+
+static hm_fragment *
+dtls1_hm_fragment_new(unsigned long frag_len)
+        {
+        hm_fragment *frag = NULL;
+        unsigned char *buf = NULL;
+
+        frag = (hm_fragment *)OPENSSL_malloc(sizeof(hm_fragment));
+        if ( frag == NULL)
+                return NULL;
+
+        if (frag_len)
+                {
+                buf = (unsigned char *)OPENSSL_malloc(frag_len);
+                if ( buf == NULL)
+                        {
+                        OPENSSL_free(frag);
+                        return NULL;
+                        }
+                }
+
+        /* zero length fragment gets zero frag->fragment */
+        frag->fragment = buf;
+
+        return frag;
+        }
+
+static void
+dtls1_hm_fragment_free(hm_fragment *frag)
+        {
+        if (frag->fragment) OPENSSL_free(frag->fragment);
+        OPENSSL_free(frag);
+        }
+
+/* send s->init_buf in records of type 'type' (SSL3_RT_HANDSHAKE or SSL3_RT_CHANGE_CIPHER_SPEC) */
+int dtls1_do_write(SSL *s, int type)
+        {
+        int ret;
+        int curr_mtu;
+        unsigned int len, frag_off;
+
+        /* AHA!  Figure out the MTU, and stick to the right size */
+        if ( ! (SSL_get_options(s) & SSL_OP_NO_QUERY_MTU))
+                {
+                s->d1->mtu = 
+                        BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
+
+                /* I've seen the kernel return bogus numbers when it doesn't know
+                 * (initial write), so just make sure we have a reasonable number */
+                if ( s->d1->mtu < dtls1_min_mtu())
+                        {
+                        s->d1->mtu = 0;
+                        s->d1->mtu = dtls1_guess_mtu(s->d1->mtu);
+                        BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_SET_MTU, 
+                                s->d1->mtu, NULL);
+                        }
+                }
+#if 0 
+        mtu = s->d1->mtu;
+
+        fprintf(stderr, "using MTU = %d\n", mtu);
+
+        mtu -= (DTLS1_HM_HEADER_LENGTH + DTLS1_RT_HEADER_LENGTH);
+
+        curr_mtu = mtu - BIO_wpending(SSL_get_wbio(s));
+
+        if ( curr_mtu > 0)
+                mtu = curr_mtu;
+        else if ( ( ret = BIO_flush(SSL_get_wbio(s))) <= 0)
+                return ret;
+
+        if ( BIO_wpending(SSL_get_wbio(s)) + s->init_num >= mtu)
+                {
+                ret = BIO_flush(SSL_get_wbio(s));
+                if ( ret <= 0)
+                        return ret;
+                mtu = s->d1->mtu - (DTLS1_HM_HEADER_LENGTH + DTLS1_RT_HEADER_LENGTH);
+                }
+
+        OPENSSL_assert(mtu > 0);  /* should have something reasonable now */
+
+#endif
+
+        if ( s->init_off == 0  && type == SSL3_RT_HANDSHAKE)
+                OPENSSL_assert(s->init_num == 
+                        (int)s->d1->w_msg_hdr.msg_len + DTLS1_HM_HEADER_LENGTH);
+
+        frag_off = 0;
+        while( s->init_num)
+                {
+                curr_mtu = s->d1->mtu - BIO_wpending(SSL_get_wbio(s)) - 
+                        DTLS1_RT_HEADER_LENGTH;
+
+                if ( curr_mtu <= DTLS1_HM_HEADER_LENGTH)
+                        {
+                        /* grr.. we could get an error if MTU picked was wrong */
+                        ret = BIO_flush(SSL_get_wbio(s));
+                        if ( ret <= 0)
+                                return ret;
+                        curr_mtu = s->d1->mtu - DTLS1_RT_HEADER_LENGTH;
+                        }
+
+                if ( s->init_num > curr_mtu)
+                        len = curr_mtu;
+                else
+                        len = s->init_num;
+
+
+                /* XDTLS: this function is too long.  split out the CCS part */
+                if ( type == SSL3_RT_HANDSHAKE)
+                        {
+                        if ( s->init_off != 0)
+                                {
+                                OPENSSL_assert(s->init_off > DTLS1_HM_HEADER_LENGTH);
+                                s->init_off -= DTLS1_HM_HEADER_LENGTH;
+                                s->init_num += DTLS1_HM_HEADER_LENGTH;
+
+                                /* write atleast DTLS1_HM_HEADER_LENGTH bytes */
+                                if ( len <= DTLS1_HM_HEADER_LENGTH)  
+                                        len += DTLS1_HM_HEADER_LENGTH;
+                                }
+
+                        dtls1_fix_message_header(s, frag_off, 
+                                len - DTLS1_HM_HEADER_LENGTH);
+
+                        dtls1_write_message_header(s, (unsigned char *)&s->init_buf->data[s->init_off]);
+
+                        OPENSSL_assert(len >= DTLS1_HM_HEADER_LENGTH);
+                        }
+
+                ret=dtls1_write_bytes(s,type,&s->init_buf->data[s->init_off],
+                        len);
+                if (ret < 0)
+                        {
+                        /* might need to update MTU here, but we don't know
+                         * which previous packet caused the failure -- so can't
+                         * really retransmit anything.  continue as if everything
+                         * is fine and wait for an alert to handle the
+                         * retransmit 
+                         */
+                        if ( BIO_ctrl(SSL_get_wbio(s),
+                                BIO_CTRL_DGRAM_MTU_EXCEEDED, 0, NULL))
+                                s->d1->mtu = BIO_ctrl(SSL_get_wbio(s),
+                                        BIO_CTRL_DGRAM_QUERY_MTU, 0, NULL);
+                        else
+                                return(-1);
+                        }
+                else
+                        {
+
+                        /* bad if this assert fails, only part of the handshake
+                         * message got sent.  but why would this happen? */
+                        OPENSSL_assert(len == (unsigned int)ret);
+
+                        if (type == SSL3_RT_HANDSHAKE && ! s->d1->retransmitting)
+                                {
+                                /* should not be done for 'Hello Request's, but in that case
+                                 * we'll ignore the result anyway */
+                                unsigned char *p = (unsigned char *)&s->init_buf->data[s->init_off];
+                                const struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
+                                int xlen;
+
+                                if (frag_off == 0 && s->client_version != DTLS1_BAD_VER)
+                                        {
+                                        /* reconstruct message header is if it
+                                         * is being sent in single fragment */
+                                        *p++ = msg_hdr->type;
+                                        l2n3(msg_hdr->msg_len,p);
+                                        s2n (msg_hdr->seq,p);
+                                        l2n3(0,p);
+                                        l2n3(msg_hdr->msg_len,p);
+                                        p  -= DTLS1_HM_HEADER_LENGTH;
+                                        xlen = ret;
+                                        }
+                                else
+                                        {
+                                        p  += DTLS1_HM_HEADER_LENGTH;
+                                        xlen = ret - DTLS1_HM_HEADER_LENGTH;
+                                        }
+
+                                ssl3_finish_mac(s, p, xlen);
+                                }
+
+                        if (ret == s->init_num)
+                                {
+                                if (s->msg_callback)
+                                        s->msg_callback(1, s->version, type, s->init_buf->data, 
+                                                (size_t)(s->init_off + s->init_num), s, 
+                                                s->msg_callback_arg);
+
+                                s->init_off = 0;  /* done writing this message */
+                                s->init_num = 0;
+
+                                return(1);
+                                }
+                        s->init_off+=ret;
+                        s->init_num-=ret;
+                        frag_off += (ret -= DTLS1_HM_HEADER_LENGTH);
+                        }
+                }
+        return(0);
+        }
+
+
+/* Obtain handshake message of message type 'mt' (any if mt == -1),
+ * maximum acceptable body length 'max'.
+ * Read an entire handshake message.  Handshake messages arrive in
+ * fragments.
+ */
+long dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
+        {
+        int i, al;
+        struct hm_header_st *msg_hdr;
+
+        /* s3->tmp is used to store messages that are unexpected, caused
+         * by the absence of an optional handshake message */
+        if (s->s3->tmp.reuse_message)
+                {
+                s->s3->tmp.reuse_message=0;
+                if ((mt >= 0) && (s->s3->tmp.message_type != mt))
+                        {
+                        al=SSL_AD_UNEXPECTED_MESSAGE;
+                        SSLerr(SSL_F_DTLS1_GET_MESSAGE,SSL_R_UNEXPECTED_MESSAGE);
+                        goto f_err;
+                        }
+                *ok=1;
+                s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
+                s->init_num = (int)s->s3->tmp.message_size;
+                return s->init_num;
+                }
+
+        msg_hdr = &s->d1->r_msg_hdr;
+        do
+                {
+                if ( msg_hdr->frag_off == 0)
+                        {
+                        /* s->d1->r_message_header.msg_len = 0; */
+                        memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
+                        }
+
+                i = dtls1_get_message_fragment(s, st1, stn, max, ok);
+                if ( i == DTLS1_HM_BAD_FRAGMENT ||
+                        i == DTLS1_HM_FRAGMENT_RETRY)  /* bad fragment received */
+                        continue;
+                else if ( i <= 0 && !*ok)
+                        return i;
+
+                /* Note that s->init_sum is used as a counter summing
+                 * up fragments' lengths: as soon as they sum up to
+                 * handshake packet length, we assume we have got all
+                 * the fragments. Overlapping fragments would cause
+                 * premature termination, so we don't expect overlaps.
+                 * Well, handling overlaps would require something more
+                 * drastic. Indeed, as it is now there is no way to
+                 * tell if out-of-order fragment from the middle was
+                 * the last. '>=' is the best/least we can do to control
+                 * the potential damage caused by malformed overlaps. */
+                if ((unsigned int)s->init_num >= msg_hdr->msg_len)
+                        {
+                        unsigned char *p = (unsigned char *)s->init_buf->data;
+                        unsigned long msg_len = msg_hdr->msg_len;
+
+                        /* reconstruct message header as if it was
+                         * sent in single fragment */
+                        *(p++) = msg_hdr->type;
+                        l2n3(msg_len,p);
+                        s2n (msg_hdr->seq,p);
+                        l2n3(0,p);
+                        l2n3(msg_len,p);
+                        if (s->client_version != DTLS1_BAD_VER)
+                                p       -= DTLS1_HM_HEADER_LENGTH,
+                                msg_len += DTLS1_HM_HEADER_LENGTH;
+
+                        ssl3_finish_mac(s, p, msg_len);
+                        if (s->msg_callback)
+                                s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE,
+                                        p, msg_len,
+                                        s, s->msg_callback_arg);
+
+                        memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
+
+                        s->d1->handshake_read_seq++;
+                        /* we just read a handshake message from the other side:
+                         * this means that we don't need to retransmit of the
+                         * buffered messages.  
+                         * XDTLS: may be able clear out this
+                         * buffer a little sooner (i.e if an out-of-order
+                         * handshake message/record is received at the record
+                         * layer.  
+                         * XDTLS: exception is that the server needs to
+                         * know that change cipher spec and finished messages
+                         * have been received by the client before clearing this
+                         * buffer.  this can simply be done by waiting for the
+                         * first data  segment, but is there a better way?  */
+                        dtls1_clear_record_buffer(s);
+
+                        s->init_msg = s->init_buf->data + DTLS1_HM_HEADER_LENGTH;
+                        return s->init_num;
+                        }
+                else
+                        msg_hdr->frag_off = i;
+                } while(1) ;
+
+f_err:
+        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        *ok = 0;
+        return -1;
+        }
+
+
+static int dtls1_preprocess_fragment(SSL *s,struct hm_header_st *msg_hdr,int max)
+        {
+        size_t frag_off,frag_len,msg_len;
+
+        msg_len  = msg_hdr->msg_len;
+        frag_off = msg_hdr->frag_off;
+        frag_len = msg_hdr->frag_len;
+
+        /* sanity checking */
+        if ( (frag_off+frag_len) > msg_len)
+                {
+                SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
+                return SSL_AD_ILLEGAL_PARAMETER;
+                }
+
+        if ( (frag_off+frag_len) > (unsigned long)max)
+                {
+                SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
+                return SSL_AD_ILLEGAL_PARAMETER;
+                }
+
+        if ( s->d1->r_msg_hdr.frag_off == 0) /* first fragment */
+                {
+                /* msg_len is limited to 2^24, but is effectively checked
+                 * against max above */
+                if (!BUF_MEM_grow_clean(s->init_buf,(int)msg_len+DTLS1_HM_HEADER_LENGTH))
+                        {
+                        SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,ERR_R_BUF_LIB);
+                        return SSL_AD_INTERNAL_ERROR;
+                        }
+
+                s->s3->tmp.message_size  = msg_len;
+                s->d1->r_msg_hdr.msg_len = msg_len;
+                s->s3->tmp.message_type  = msg_hdr->type;
+                s->d1->r_msg_hdr.type    = msg_hdr->type;
+                s->d1->r_msg_hdr.seq     = msg_hdr->seq;
+                }
+        else if (msg_len != s->d1->r_msg_hdr.msg_len)
+                {
+                /* They must be playing with us! BTW, failure to enforce
+                 * upper limit would open possibility for buffer overrun. */
+                SSLerr(SSL_F_DTLS1_PREPROCESS_FRAGMENT,SSL_R_EXCESSIVE_MESSAGE_SIZE);
+                return SSL_AD_ILLEGAL_PARAMETER;
+                }
+
+        return 0; /* no error */
+        }
+
+
+static int
+dtls1_retrieve_buffered_fragment(SSL *s, long max, int *ok)
+        {
+        /* (0) check whether the desired fragment is available
+         * if so:
+         * (1) copy over the fragment to s->init_buf->data[]
+         * (2) update s->init_num
+         */
+        pitem *item;
+        hm_fragment *frag;
+        int al;
+
+        *ok = 0;
+        item = pqueue_peek(s->d1->buffered_messages);
+        if ( item == NULL)
+                return 0;
+
+        frag = (hm_fragment *)item->data;
+
+        if ( s->d1->handshake_read_seq == frag->msg_header.seq)
+                {
+                pqueue_pop(s->d1->buffered_messages);
+
+                al=dtls1_preprocess_fragment(s,&frag->msg_header,max);
+
+                if (al==0) /* no alert */
+                        {
+                        unsigned char *p = (unsigned char *)s->init_buf->data+DTLS1_HM_HEADER_LENGTH;
+                        memcpy(&p[frag->msg_header.frag_off],
+                                frag->fragment,frag->msg_header.frag_len);
+                        }
+
+                dtls1_hm_fragment_free(frag);
+                pitem_free(item);
+
+                if (al==0)
+                        {
+                        *ok = 1;
+                        return frag->msg_header.frag_len;
+                        }
+
+                ssl3_send_alert(s,SSL3_AL_FATAL,al);
+                s->init_num = 0;
+                *ok = 0;
+                return -1;
+                }
+        else
+                return 0;
+        }
+
+
+static int
+dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st* msg_hdr, int *ok)
+{
+        int i=-1;
+        hm_fragment *frag = NULL;
+        pitem *item = NULL;
+        PQ_64BIT seq64;
+        unsigned long frag_len = msg_hdr->frag_len;
+
+        if ((msg_hdr->frag_off+frag_len) > msg_hdr->msg_len)
+                goto err;
+
+        if (msg_hdr->seq <= s->d1->handshake_read_seq)
+                {
+                unsigned char devnull [256];
+
+                while (frag_len)
+                        {
+                        i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
+                                devnull,
+                                frag_len>sizeof(devnull)?sizeof(devnull):frag_len,0);
+                        if (i<=0) goto err;
+                        frag_len -= i;
+                        }
+                }
+
+        frag = dtls1_hm_fragment_new(frag_len);
+        if ( frag == NULL)
+                goto err;
+
+        memcpy(&(frag->msg_header), msg_hdr, sizeof(*msg_hdr));
+
+        if (frag_len)
+                {
+                /* read the body of the fragment (header has already been read */
+                i = s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
+                        frag->fragment,frag_len,0);
+                if (i<=0 || (unsigned long)i!=frag_len)
+                        goto err;
+                }
+
+        pq_64bit_init(&seq64);
+        pq_64bit_assign_word(&seq64, msg_hdr->seq);
+
+        item = pitem_new(seq64, frag);
+        pq_64bit_free(&seq64);
+        if ( item == NULL)
+                goto err;
+
+        pqueue_insert(s->d1->buffered_messages, item);
+        return DTLS1_HM_FRAGMENT_RETRY;
+
+err:
+        if ( frag != NULL) dtls1_hm_fragment_free(frag);
+        if ( item != NULL) OPENSSL_free(item);
+        *ok = 0;
+        return i;
+        }
+
+
+static long
+dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok)
+        {
+        unsigned char wire[DTLS1_HM_HEADER_LENGTH];
+        unsigned long l, frag_off, frag_len;
+        int i,al;
+        struct hm_header_st msg_hdr;
+
+        /* see if we have the required fragment already */
+        if ((frag_len = dtls1_retrieve_buffered_fragment(s,max,ok)) || *ok)
+                {
+                if (*ok)        s->init_num += frag_len;
+                return frag_len;
+                }
+
+        /* read handshake message header */
+        i=s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,wire,
+                DTLS1_HM_HEADER_LENGTH, 0);
+        if (i <= 0)     /* nbio, or an error */
+                {
+                s->rwstate=SSL_READING;
+                *ok = 0;
+                return i;
+                }
+        OPENSSL_assert(i == DTLS1_HM_HEADER_LENGTH);
+
+        /* parse the message fragment header */
+        dtls1_get_message_header(wire, &msg_hdr);
+
+        /* 
+         * if this is a future (or stale) message it gets buffered
+         * (or dropped)--no further processing at this time 
+         */
+        if ( msg_hdr.seq != s->d1->handshake_read_seq)
+                return dtls1_process_out_of_seq_message(s, &msg_hdr, ok);
+
+        l = msg_hdr.msg_len;
+        frag_off = msg_hdr.frag_off;
+        frag_len = msg_hdr.frag_len;
+
+        if (!s->server && s->d1->r_msg_hdr.frag_off == 0 &&
+                wire[0] == SSL3_MT_HELLO_REQUEST)
+                {
+                /* The server may always send 'Hello Request' messages --
+                 * we are doing a handshake anyway now, so ignore them
+                 * if their format is correct. Does not count for
+                 * 'Finished' MAC. */
+                if (wire[1] == 0 && wire[2] == 0 && wire[3] == 0)
+                        {
+                        if (s->msg_callback)
+                                s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, 
+                                        wire, DTLS1_HM_HEADER_LENGTH, s, 
+                                        s->msg_callback_arg);
+                        
+                        s->init_num = 0;
+                        return dtls1_get_message_fragment(s, st1, stn,
+                                max, ok);
+                        }
+                else /* Incorrectly formated Hello request */
+                        {
+                        al=SSL_AD_UNEXPECTED_MESSAGE;
+                        SSLerr(SSL_F_DTLS1_GET_MESSAGE_FRAGMENT,SSL_R_UNEXPECTED_MESSAGE);
+                        goto f_err;
+                        }
+                }
+
+        if ((al=dtls1_preprocess_fragment(s,&msg_hdr,max)))
+                goto f_err;
+
+        /* XDTLS:  ressurect this when restart is in place */
+        s->state=stn;
+
+        if ( frag_len > 0)
+                {
+                unsigned char *p=(unsigned char *)s->init_buf->data+DTLS1_HM_HEADER_LENGTH;
+
+                i=s->method->ssl_read_bytes(s,SSL3_RT_HANDSHAKE,
+                        &p[frag_off],frag_len,0);
+                /* XDTLS:  fix this--message fragments cannot span multiple packets */
+                if (i <= 0)
+                        {
+                        s->rwstate=SSL_READING;
+                        *ok = 0;
+                        return i;
+                        }
+                }
+        else
+                i = 0;
+
+        /* XDTLS:  an incorrectly formatted fragment should cause the 
+         * handshake to fail */
+        OPENSSL_assert(i == (int)frag_len);
+
+        *ok = 1;
+
+        /* Note that s->init_num is *not* used as current offset in
+         * s->init_buf->data, but as a counter summing up fragments'
+         * lengths: as soon as they sum up to handshake packet
+         * length, we assume we have got all the fragments. */
+        s->init_num += frag_len;
+        return frag_len;
+
+f_err:
+        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+        s->init_num = 0;
+
+        *ok=0;
+        return(-1);
+        }
+
+int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen)
+        {
+        unsigned char *p,*d;
+        int i;
+        unsigned long l;
+
+        if (s->state == a)
+                {
+                d=(unsigned char *)s->init_buf->data;
+                p= &(d[DTLS1_HM_HEADER_LENGTH]);
+
+                i=s->method->ssl3_enc->final_finish_mac(s,
+                        &(s->s3->finish_dgst1),
+                        &(s->s3->finish_dgst2),
+                        sender,slen,s->s3->tmp.finish_md);
+                s->s3->tmp.finish_md_len = i;
+                memcpy(p, s->s3->tmp.finish_md, i);
+                p+=i;
+                l=i;
+
+#ifdef OPENSSL_SYS_WIN16
+                /* MSVC 1.5 does not clear the top bytes of the word unless
+                 * I do this.
+                 */
+                l&=0xffff;
+#endif
+
+                d = dtls1_set_message_header(s, d, SSL3_MT_FINISHED, l, 0, l);
+                s->init_num=(int)l+DTLS1_HM_HEADER_LENGTH;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+
+                s->state=b;
+                }
+
+        /* SSL3_ST_SEND_xxxxxx_HELLO_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+        }
+
+/* for these 2 messages, we need to
+ * ssl->enc_read_ctx                    re-init
+ * ssl->s3->read_sequence               zero
+ * ssl->s3->read_mac_secret             re-init
+ * ssl->session->read_sym_enc           assign
+ * ssl->session->read_compression       assign
+ * ssl->session->read_hash              assign
+ */
+int dtls1_send_change_cipher_spec(SSL *s, int a, int b)
+        { 
+        unsigned char *p;
+
+        if (s->state == a)
+                {
+                p=(unsigned char *)s->init_buf->data;
+                *p++=SSL3_MT_CCS;
+                s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
+                s->init_num=DTLS1_CCS_HEADER_LENGTH;
+
+                if (s->client_version == DTLS1_BAD_VER)
+                        {
+                        s->d1->next_handshake_write_seq++;
+                        s2n(s->d1->handshake_write_seq,p);
+                        s->init_num+=2;
+                        }
+
+                s->init_off=0;
+
+                dtls1_set_message_header_int(s, SSL3_MT_CCS, 0, 
+                        s->d1->handshake_write_seq, 0, 0);
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 1);
+
+                s->state=b;
+                }
+
+        /* SSL3_ST_CW_CHANGE_B */
+        return(dtls1_do_write(s,SSL3_RT_CHANGE_CIPHER_SPEC));
+        }
+
+unsigned long dtls1_output_cert_chain(SSL *s, X509 *x)
+        {
+        unsigned char *p;
+        int n,i;
+        unsigned long l= 3 + DTLS1_HM_HEADER_LENGTH;
+        BUF_MEM *buf;
+        X509_STORE_CTX xs_ctx;
+        X509_OBJECT obj;
+
+        /* TLSv1 sends a chain with nothing in it, instead of an alert */
+        buf=s->init_buf;
+        if (!BUF_MEM_grow_clean(buf,10))
+                {
+                SSLerr(SSL_F_DTLS1_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);
+                return(0);
+                }
+        if (x != NULL)
+                {
+                if(!X509_STORE_CTX_init(&xs_ctx,s->ctx->cert_store,NULL,NULL))
+                        {
+                        SSLerr(SSL_F_DTLS1_OUTPUT_CERT_CHAIN,ERR_R_X509_LIB);
+                        return(0);
+                        }
+
+                for (;;)
+                        {
+                        n=i2d_X509(x,NULL);
+                        if (!BUF_MEM_grow_clean(buf,(int)(n+l+3)))
+                                {
+                                SSLerr(SSL_F_DTLS1_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);
+                                return(0);
+                                }
+                        p=(unsigned char *)&(buf->data[l]);
+                        l2n3(n,p);
+                        i2d_X509(x,&p);
+                        l+=n+3;
+                        if (X509_NAME_cmp(X509_get_subject_name(x),
+                                X509_get_issuer_name(x)) == 0) break;
+
+                        i=X509_STORE_get_by_subject(&xs_ctx,X509_LU_X509,
+                                X509_get_issuer_name(x),&obj);
+                        if (i <= 0) break;
+                        x=obj.data.x509;
+                        /* Count is one too high since the X509_STORE_get uped the
+                         * ref count */
+                        X509_free(x);
+                        }
+
+                X509_STORE_CTX_cleanup(&xs_ctx);
+                }
+
+        /* Thawte special :-) */
+        if (s->ctx->extra_certs != NULL)
+        for (i=0; i<sk_X509_num(s->ctx->extra_certs); i++)
+                {
+                x=sk_X509_value(s->ctx->extra_certs,i);
+                n=i2d_X509(x,NULL);
+                if (!BUF_MEM_grow_clean(buf,(int)(n+l+3)))
+                        {
+                        SSLerr(SSL_F_DTLS1_OUTPUT_CERT_CHAIN,ERR_R_BUF_LIB);
+                        return(0);
+                        }
+                p=(unsigned char *)&(buf->data[l]);
+                l2n3(n,p);
+                i2d_X509(x,&p);
+                l+=n+3;
+                }
+
+        l-= (3 + DTLS1_HM_HEADER_LENGTH);
+
+        p=(unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH]);
+        l2n3(l,p);
+        l+=3;
+        p=(unsigned char *)&(buf->data[0]);
+        p = dtls1_set_message_header(s, p, SSL3_MT_CERTIFICATE, l, 0, l);
+
+        l+=DTLS1_HM_HEADER_LENGTH;
+        return(l);
+        }
+
+int dtls1_read_failed(SSL *s, int code)
+        {
+        DTLS1_STATE *state;
+        BIO *bio;
+        int send_alert = 0;
+
+        if ( code > 0)
+                {
+                fprintf( stderr, "invalid state reached %s:%d", __FILE__, __LINE__);
+                return 1;
+                }
+
+        bio = SSL_get_rbio(s);
+        if ( ! BIO_dgram_recv_timedout(bio))
+                {
+                /* not a timeout, none of our business, 
+                   let higher layers handle this.  in fact it's probably an error */
+                return code;
+                }
+
+        if ( ! SSL_in_init(s))  /* done, no need to send a retransmit */
+                {
+                BIO_set_flags(SSL_get_rbio(s), BIO_FLAGS_READ);
+                return code;
+                }
+
+        state = s->d1;
+        state->timeout.num_alerts++;
+        if ( state->timeout.num_alerts > DTLS1_TMO_ALERT_COUNT)
+                {
+                /* fail the connection, enough alerts have been sent */
+                SSLerr(SSL_F_DTLS1_READ_FAILED,SSL_R_READ_TIMEOUT_EXPIRED);
+                return 0;
+                }
+
+        state->timeout.read_timeouts++;
+        if ( state->timeout.read_timeouts > DTLS1_TMO_READ_COUNT)
+                {
+                send_alert = 1;
+                state->timeout.read_timeouts = 1;
+                }
+
+
+#if 0 /* for now, each alert contains only one record number */
+        item = pqueue_peek(state->rcvd_records);
+        if ( item )
+                {
+                /* send an alert immediately for all the missing records */
+                }
+        else
+#endif
+
+#if 0  /* no more alert sending, just retransmit the last set of messages */
+                if ( send_alert)
+                        ssl3_send_alert(s,SSL3_AL_WARNING,
+                                DTLS1_AD_MISSING_HANDSHAKE_MESSAGE);
+#endif
+
+        return dtls1_retransmit_buffered_messages(s) ;
+        }
+
+
+static int
+dtls1_retransmit_buffered_messages(SSL *s)
+        {
+        pqueue sent = s->d1->sent_messages;
+        piterator iter;
+        pitem *item;
+        hm_fragment *frag;
+        int found = 0;
+
+        iter = pqueue_iterator(sent);
+
+        for ( item = pqueue_next(&iter); item != NULL; item = pqueue_next(&iter))
+                {
+                frag = (hm_fragment *)item->data;
+                if ( dtls1_retransmit_message(s, frag->msg_header.seq, 0, &found) <= 0 &&
+                        found)
+                        {
+                        fprintf(stderr, "dtls1_retransmit_message() failed\n");
+                        return -1;
+                        }
+                }
+
+        return 1;
+        }
+
+int
+dtls1_buffer_message(SSL *s, int is_ccs)
+        {
+        pitem *item;
+        hm_fragment *frag;
+        PQ_64BIT seq64;
+        unsigned int epoch = s->d1->w_epoch;
+
+        /* this function is called immediately after a message has 
+         * been serialized */
+        OPENSSL_assert(s->init_off == 0);
+
+        frag = dtls1_hm_fragment_new(s->init_num);
+
+        memcpy(frag->fragment, s->init_buf->data, s->init_num);
+
+        if ( is_ccs)
+                {
+                OPENSSL_assert(s->d1->w_msg_hdr.msg_len + 
+                        DTLS1_CCS_HEADER_LENGTH <= (unsigned int)s->init_num);
+                epoch++;
+                }
+        else
+                {
+                OPENSSL_assert(s->d1->w_msg_hdr.msg_len + 
+                        DTLS1_HM_HEADER_LENGTH == (unsigned int)s->init_num);
+                }
+
+        frag->msg_header.msg_len = s->d1->w_msg_hdr.msg_len;
+        frag->msg_header.seq = s->d1->w_msg_hdr.seq;
+        frag->msg_header.type = s->d1->w_msg_hdr.type;
+        frag->msg_header.frag_off = 0;
+        frag->msg_header.frag_len = s->d1->w_msg_hdr.msg_len;
+        frag->msg_header.is_ccs = is_ccs;
+
+        pq_64bit_init(&seq64);
+        pq_64bit_assign_word(&seq64, epoch<<16 | frag->msg_header.seq);
+
+        item = pitem_new(seq64, frag);
+        pq_64bit_free(&seq64);
+        if ( item == NULL)
+                {
+                dtls1_hm_fragment_free(frag);
+                return 0;
+                }
+
+#if 0
+        fprintf( stderr, "buffered messge: \ttype = %xx\n", msg_buf->type);
+        fprintf( stderr, "\t\t\t\t\tlen = %d\n", msg_buf->len);
+        fprintf( stderr, "\t\t\t\t\tseq_num = %d\n", msg_buf->seq_num);
+#endif
+
+        pqueue_insert(s->d1->sent_messages, item);
+        return 1;
+        }
+
+int
+dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
+        int *found)
+        {
+        int ret;
+        /* XDTLS: for now assuming that read/writes are blocking */
+        pitem *item;
+        hm_fragment *frag ;
+        unsigned long header_length;
+        PQ_64BIT seq64;
+
+        /*
+          OPENSSL_assert(s->init_num == 0);
+          OPENSSL_assert(s->init_off == 0);
+         */
+
+        /* XDTLS:  the requested message ought to be found, otherwise error */
+        pq_64bit_init(&seq64);
+        pq_64bit_assign_word(&seq64, seq);
+
+        item = pqueue_find(s->d1->sent_messages, seq64);
+        pq_64bit_free(&seq64);
+        if ( item == NULL)
+                {
+                fprintf(stderr, "retransmit:  message %d non-existant\n", seq);
+                *found = 0;
+                return 0;
+                }
+
+        *found = 1;
+        frag = (hm_fragment *)item->data;
+
+        if ( frag->msg_header.is_ccs)
+                header_length = DTLS1_CCS_HEADER_LENGTH;
+        else
+                header_length = DTLS1_HM_HEADER_LENGTH;
+
+        memcpy(s->init_buf->data, frag->fragment, 
+                frag->msg_header.msg_len + header_length);
+                s->init_num = frag->msg_header.msg_len + header_length;
+
+        dtls1_set_message_header_int(s, frag->msg_header.type, 
+                frag->msg_header.msg_len, frag->msg_header.seq, 0, 
+                frag->msg_header.frag_len);
+
+        s->d1->retransmitting = 1;
+        ret = dtls1_do_write(s, frag->msg_header.is_ccs ? 
+                SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
+        s->d1->retransmitting = 0;
+
+        (void)BIO_flush(SSL_get_wbio(s));
+        return ret;
+        }
+
+/* call this function when the buffered messages are no longer needed */
+void
+dtls1_clear_record_buffer(SSL *s)
+        {
+        pitem *item;
+
+        for(item = pqueue_pop(s->d1->sent_messages);
+                item != NULL; item = pqueue_pop(s->d1->sent_messages))
+                {
+                dtls1_hm_fragment_free((hm_fragment *)item->data);
+                pitem_free(item);
+                }
+        }
+
+
+unsigned char *
+dtls1_set_message_header(SSL *s, unsigned char *p, unsigned char mt,
+                        unsigned long len, unsigned long frag_off, unsigned long frag_len)
+        {
+        if ( frag_off == 0)
+                {
+                s->d1->handshake_write_seq = s->d1->next_handshake_write_seq;
+                s->d1->next_handshake_write_seq++;
+                }
+
+        dtls1_set_message_header_int(s, mt, len, s->d1->handshake_write_seq,
+                frag_off, frag_len);
+
+        return p += DTLS1_HM_HEADER_LENGTH;
+        }
+
+
+/* don't actually do the writing, wait till the MTU has been retrieved */
+static void
+dtls1_set_message_header_int(SSL *s, unsigned char mt,
+                            unsigned long len, unsigned short seq_num, unsigned long frag_off,
+                            unsigned long frag_len)
+        {
+        struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
+
+        msg_hdr->type = mt;
+        msg_hdr->msg_len = len;
+        msg_hdr->seq = seq_num;
+        msg_hdr->frag_off = frag_off;
+        msg_hdr->frag_len = frag_len;
+        }
+
+static void
+dtls1_fix_message_header(SSL *s, unsigned long frag_off,
+                        unsigned long frag_len)
+        {
+        struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
+
+        msg_hdr->frag_off = frag_off;
+        msg_hdr->frag_len = frag_len;
+        }
+
+static unsigned char *
+dtls1_write_message_header(SSL *s, unsigned char *p)
+        {
+        struct hm_header_st *msg_hdr = &s->d1->w_msg_hdr;
+
+        *p++ = msg_hdr->type;
+        l2n3(msg_hdr->msg_len, p);
+
+        s2n(msg_hdr->seq, p);
+        l2n3(msg_hdr->frag_off, p);
+        l2n3(msg_hdr->frag_len, p);
+
+        return p;
+        }
+
+static unsigned int 
+dtls1_min_mtu(void)
+        {
+        return (g_probable_mtu[(sizeof(g_probable_mtu) / 
+                sizeof(g_probable_mtu[0])) - 1]);
+        }
+
+static unsigned int 
+dtls1_guess_mtu(unsigned int curr_mtu)
+        {
+        size_t i;
+
+        if ( curr_mtu == 0 )
+                return g_probable_mtu[0] ;
+
+        for ( i = 0; i < sizeof(g_probable_mtu)/sizeof(g_probable_mtu[0]); i++)
+                if ( curr_mtu > g_probable_mtu[i])
+                        return g_probable_mtu[i];
+
+        return curr_mtu;
+        }
+
+void
+dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr)
+        {
+        memset(msg_hdr, 0x00, sizeof(struct hm_header_st));
+        msg_hdr->type = *(data++);
+        n2l3(data, msg_hdr->msg_len);
+
+        n2s(data, msg_hdr->seq);
+        n2l3(data, msg_hdr->frag_off);
+        n2l3(data, msg_hdr->frag_len);
+        }
+
+void
+dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr)
+        {
+        memset(ccs_hdr, 0x00, sizeof(struct ccs_header_st));
+
+        ccs_hdr->type = *(data++);
+        }
diff --git a/src/lib/libssl/src/ssl/d1_clnt.c b/src/lib/libssl/src/ssl/d1_clnt.c
new file mode 100644
index 0000000000..5e59dc845a
--- /dev/null
+++ b/src/lib/libssl/src/ssl/d1_clnt.c
@@ -0,0 +1,1156 @@
+/* ssl/d1_clnt.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "ssl_locl.h"
+#include "kssl_lcl.h"
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/md5.h>
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+
+static SSL_METHOD *dtls1_get_client_method(int ver);
+static int dtls1_get_hello_verify(SSL *s);
+
+static SSL_METHOD *dtls1_get_client_method(int ver)
+        {
+        if (ver == DTLS1_VERSION)
+                return(DTLSv1_client_method());
+        else
+                return(NULL);
+        }
+
+IMPLEMENT_dtls1_meth_func(DTLSv1_client_method,
+                        ssl_undefined_function,
+                        dtls1_connect,
+                        dtls1_get_client_method)
+
+int dtls1_connect(SSL *s)
+        {
+        BUF_MEM *buf=NULL;
+        unsigned long Time=(unsigned long)time(NULL),l;
+        long num1;
+        void (*cb)(const SSL *ssl,int type,int val)=NULL;
+        int ret= -1;
+        int new_state,state,skip=0;;
+
+        RAND_add(&Time,sizeof(Time),0);
+        ERR_clear_error();
+        clear_sys_error();
+
+        if (s->info_callback != NULL)
+                cb=s->info_callback;
+        else if (s->ctx->info_callback != NULL)
+                cb=s->ctx->info_callback;
+        
+        s->in_handshake++;
+        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s); 
+
+        for (;;)
+                {
+                state=s->state;
+
+                switch(s->state)
+                        {
+                case SSL_ST_RENEGOTIATE:
+                        s->new_session=1;
+                        s->state=SSL_ST_CONNECT;
+                        s->ctx->stats.sess_connect_renegotiate++;
+                        /* break */
+                case SSL_ST_BEFORE:
+                case SSL_ST_CONNECT:
+                case SSL_ST_BEFORE|SSL_ST_CONNECT:
+                case SSL_ST_OK|SSL_ST_CONNECT:
+
+                        s->server=0;
+                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
+
+                        if ((s->version & 0xff00 ) != (DTLS1_VERSION & 0xff00))
+                                {
+                                SSLerr(SSL_F_DTLS1_CONNECT, ERR_R_INTERNAL_ERROR);
+                                ret = -1;
+                                goto end;
+                                }
+                                
+                        /* s->version=SSL3_VERSION; */
+                        s->type=SSL_ST_CONNECT;
+
+                        if (s->init_buf == NULL)
+                                {
+                                if ((buf=BUF_MEM_new()) == NULL)
+                                        {
+                                        ret= -1;
+                                        goto end;
+                                        }
+                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
+                                        {
+                                        ret= -1;
+                                        goto end;
+                                        }
+                                s->init_buf=buf;
+                                buf=NULL;
+                                }
+
+                        if (!ssl3_setup_buffers(s)) { ret= -1; goto end; }
+
+                        /* setup buffing BIO */
+                        if (!ssl_init_wbio_buffer(s,0)) { ret= -1; goto end; }
+
+                        /* don't push the buffering BIO quite yet */
+
+                        s->state=SSL3_ST_CW_CLNT_HELLO_A;
+                        s->ctx->stats.sess_connect++;
+                        s->init_num=0;
+                        /* mark client_random uninitialized */
+                        memset(s->s3->client_random,0,sizeof(s->s3->client_random));
+                        break;
+
+                case SSL3_ST_CW_CLNT_HELLO_A:
+                case SSL3_ST_CW_CLNT_HELLO_B:
+
+                        s->shutdown=0;
+
+                        /* every DTLS ClientHello resets Finished MAC */
+                        ssl3_init_finished_mac(s);
+
+                        ret=dtls1_client_hello(s);
+                        if (ret <= 0) goto end;
+
+                        if ( s->d1->send_cookie)
+                                {
+                                s->state=SSL3_ST_CW_FLUSH;
+                                s->s3->tmp.next_state=SSL3_ST_CR_SRVR_HELLO_A;
+                                }
+                        else
+                                s->state=SSL3_ST_CR_SRVR_HELLO_A;
+
+                        s->init_num=0;
+
+                        /* turn on buffering for the next lot of output */
+                        if (s->bbio != s->wbio)
+                                s->wbio=BIO_push(s->bbio,s->wbio);
+
+                        break;
+
+                case SSL3_ST_CR_SRVR_HELLO_A:
+                case SSL3_ST_CR_SRVR_HELLO_B:
+                        ret=ssl3_get_server_hello(s);
+                        if (ret <= 0) goto end;
+                        else
+                                {
+                                if (s->hit)
+                                        s->state=SSL3_ST_CR_FINISHED_A;
+                                else
+                                        s->state=DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A;
+                                }
+                        s->init_num=0;
+                        break;
+
+                case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A:
+                case DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B:
+
+                        ret = dtls1_get_hello_verify(s);
+                        if ( ret <= 0)
+                                goto end;
+                        if ( s->d1->send_cookie) /* start again, with a cookie */
+                                s->state=SSL3_ST_CW_CLNT_HELLO_A;
+                        else
+                                s->state = SSL3_ST_CR_CERT_A;
+                        s->init_num = 0;
+                        break;
+
+                case SSL3_ST_CR_CERT_A:
+                case SSL3_ST_CR_CERT_B:
+                        /* Check if it is anon DH */
+                        if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
+                                {
+                                ret=ssl3_get_server_certificate(s);
+                                if (ret <= 0) goto end;
+                                }
+                        else
+                                skip=1;
+                        s->state=SSL3_ST_CR_KEY_EXCH_A;
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_CR_KEY_EXCH_A:
+                case SSL3_ST_CR_KEY_EXCH_B:
+                        ret=ssl3_get_key_exchange(s);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_CR_CERT_REQ_A;
+                        s->init_num=0;
+
+                        /* at this point we check that we have the
+                         * required stuff from the server */
+                        if (!ssl3_check_cert_and_algorithm(s))
+                                {
+                                ret= -1;
+                                goto end;
+                                }
+                        break;
+
+                case SSL3_ST_CR_CERT_REQ_A:
+                case SSL3_ST_CR_CERT_REQ_B:
+                        ret=ssl3_get_certificate_request(s);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_CR_SRVR_DONE_A;
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_CR_SRVR_DONE_A:
+                case SSL3_ST_CR_SRVR_DONE_B:
+                        ret=ssl3_get_server_done(s);
+                        if (ret <= 0) goto end;
+                        if (s->s3->tmp.cert_req)
+                                s->state=SSL3_ST_CW_CERT_A;
+                        else
+                                s->state=SSL3_ST_CW_KEY_EXCH_A;
+                        s->init_num=0;
+
+                        break;
+
+                case SSL3_ST_CW_CERT_A:
+                case SSL3_ST_CW_CERT_B:
+                case SSL3_ST_CW_CERT_C:
+                case SSL3_ST_CW_CERT_D:
+                        ret=dtls1_send_client_certificate(s);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_CW_KEY_EXCH_A;
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_CW_KEY_EXCH_A:
+                case SSL3_ST_CW_KEY_EXCH_B:
+                        ret=dtls1_send_client_key_exchange(s);
+                        if (ret <= 0) goto end;
+                        l=s->s3->tmp.new_cipher->algorithms;
+                        /* EAY EAY EAY need to check for DH fix cert
+                         * sent back */
+                        /* For TLS, cert_req is set to 2, so a cert chain
+                         * of nothing is sent, but no verify packet is sent */
+                        if (s->s3->tmp.cert_req == 1)
+                                {
+                                s->state=SSL3_ST_CW_CERT_VRFY_A;
+                                }
+                        else
+                                {
+                                s->state=SSL3_ST_CW_CHANGE_A;
+                                s->s3->change_cipher_spec=0;
+                                }
+
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_CW_CERT_VRFY_A:
+                case SSL3_ST_CW_CERT_VRFY_B:
+                        ret=dtls1_send_client_verify(s);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_CW_CHANGE_A;
+                        s->init_num=0;
+                        s->s3->change_cipher_spec=0;
+                        break;
+
+                case SSL3_ST_CW_CHANGE_A:
+                case SSL3_ST_CW_CHANGE_B:
+                        ret=dtls1_send_change_cipher_spec(s,
+                                SSL3_ST_CW_CHANGE_A,SSL3_ST_CW_CHANGE_B);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_CW_FINISHED_A;
+                        s->init_num=0;
+
+                        s->session->cipher=s->s3->tmp.new_cipher;
+#ifdef OPENSSL_NO_COMP
+                        s->session->compress_meth=0;
+#else
+                        if (s->s3->tmp.new_compression == NULL)
+                                s->session->compress_meth=0;
+                        else
+                                s->session->compress_meth=
+                                        s->s3->tmp.new_compression->id;
+#endif
+                        if (!s->method->ssl3_enc->setup_key_block(s))
+                                {
+                                ret= -1;
+                                goto end;
+                                }
+
+                        if (!s->method->ssl3_enc->change_cipher_state(s,
+                                SSL3_CHANGE_CIPHER_CLIENT_WRITE))
+                                {
+                                ret= -1;
+                                goto end;
+                                }
+                        
+                        dtls1_reset_seq_numbers(s, SSL3_CC_WRITE);
+                        break;
+
+                case SSL3_ST_CW_FINISHED_A:
+                case SSL3_ST_CW_FINISHED_B:
+                        ret=dtls1_send_finished(s,
+                                SSL3_ST_CW_FINISHED_A,SSL3_ST_CW_FINISHED_B,
+                                s->method->ssl3_enc->client_finished_label,
+                                s->method->ssl3_enc->client_finished_label_len);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_CW_FLUSH;
+
+                        /* clear flags */
+                        s->s3->flags&= ~SSL3_FLAGS_POP_BUFFER;
+                        if (s->hit)
+                                {
+                                s->s3->tmp.next_state=SSL_ST_OK;
+                                if (s->s3->flags & SSL3_FLAGS_DELAY_CLIENT_FINISHED)
+                                        {
+                                        s->state=SSL_ST_OK;
+                                        s->s3->flags|=SSL3_FLAGS_POP_BUFFER;
+                                        s->s3->delay_buf_pop_ret=0;
+                                        }
+                                }
+                        else
+                                {
+                                s->s3->tmp.next_state=SSL3_ST_CR_FINISHED_A;
+                                }
+                        s->init_num=0;
+                        /* mark client_random uninitialized */
+                        memset (s->s3->client_random,0,sizeof(s->s3->client_random));
+
+                        break;
+
+                case SSL3_ST_CR_FINISHED_A:
+                case SSL3_ST_CR_FINISHED_B:
+
+                        ret=ssl3_get_finished(s,SSL3_ST_CR_FINISHED_A,
+                                SSL3_ST_CR_FINISHED_B);
+                        if (ret <= 0) goto end;
+
+                        if (s->hit)
+                                s->state=SSL3_ST_CW_CHANGE_A;
+                        else
+                                s->state=SSL_ST_OK;
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_CW_FLUSH:
+                        /* number of bytes to be flushed */
+                        num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL);
+                        if (num1 > 0)
+                                {
+                                s->rwstate=SSL_WRITING;
+                                num1=BIO_flush(s->wbio);
+                                if (num1 <= 0) { ret= -1; goto end; }
+                                s->rwstate=SSL_NOTHING;
+                                }
+
+                        s->state=s->s3->tmp.next_state;
+                        break;
+
+                case SSL_ST_OK:
+                        /* clean a few things up */
+                        ssl3_cleanup_key_block(s);
+
+#if 0
+                        if (s->init_buf != NULL)
+                                {
+                                BUF_MEM_free(s->init_buf);
+                                s->init_buf=NULL;
+                                }
+#endif
+
+                        /* If we are not 'joining' the last two packets,
+                         * remove the buffering now */
+                        if (!(s->s3->flags & SSL3_FLAGS_POP_BUFFER))
+                                ssl_free_wbio_buffer(s);
+                        /* else do it later in ssl3_write */
+
+                        s->init_num=0;
+                        s->new_session=0;
+
+                        ssl_update_cache(s,SSL_SESS_CACHE_CLIENT);
+                        if (s->hit) s->ctx->stats.sess_hit++;
+
+                        ret=1;
+                        /* s->server=0; */
+                        s->handshake_func=dtls1_connect;
+                        s->ctx->stats.sess_connect_good++;
+
+                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
+
+                        /* done with handshaking */
+                        s->d1->handshake_read_seq  = 0;
+                        goto end;
+                        /* break; */
+                        
+                default:
+                        SSLerr(SSL_F_DTLS1_CONNECT,SSL_R_UNKNOWN_STATE);
+                        ret= -1;
+                        goto end;
+                        /* break; */
+                        }
+
+                /* did we do anything */
+                if (!s->s3->tmp.reuse_message && !skip)
+                        {
+                        if (s->debug)
+                                {
+                                if ((ret=BIO_flush(s->wbio)) <= 0)
+                                        goto end;
+                                }
+
+                        if ((cb != NULL) && (s->state != state))
+                                {
+                                new_state=s->state;
+                                s->state=state;
+                                cb(s,SSL_CB_CONNECT_LOOP,1);
+                                s->state=new_state;
+                                }
+                        }
+                skip=0;
+                }
+end:
+        s->in_handshake--;
+        if (buf != NULL)
+                BUF_MEM_free(buf);
+        if (cb != NULL)
+                cb(s,SSL_CB_CONNECT_EXIT,ret);
+        return(ret);
+        }
+
+int dtls1_client_hello(SSL *s)
+        {
+        unsigned char *buf;
+        unsigned char *p,*d;
+        unsigned int i,j;
+        unsigned long Time,l;
+        SSL_COMP *comp;
+
+        buf=(unsigned char *)s->init_buf->data;
+        if (s->state == SSL3_ST_CW_CLNT_HELLO_A)
+                {
+                if ((s->session == NULL) ||
+                        (s->session->ssl_version != s->version) ||
+                        (s->session->not_resumable))
+                        {
+                        if (!ssl_get_new_session(s,0))
+                                goto err;
+                        }
+                /* else use the pre-loaded session */
+
+                p=s->s3->client_random;
+                /* if client_random is initialized, reuse it, we are
+                 * required to use same upon reply to HelloVerify */
+                for (i=0;p[i]=='\0' && i<sizeof(s->s3->client_random);i++) ;
+                if (i==sizeof(s->s3->client_random))
+                        {
+                        Time=(unsigned long)time(NULL); /* Time */
+                        l2n(Time,p);
+                        RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-4);
+                        }
+
+                /* Do the message type and length last */
+                d=p= &(buf[DTLS1_HM_HEADER_LENGTH]);
+
+                *(p++)=s->version>>8;
+                *(p++)=s->version&0xff;
+                s->client_version=s->version;
+
+                /* Random stuff */
+                memcpy(p,s->s3->client_random,SSL3_RANDOM_SIZE);
+                p+=SSL3_RANDOM_SIZE;
+
+                /* Session ID */
+                if (s->new_session)
+                        i=0;
+                else
+                        i=s->session->session_id_length;
+                *(p++)=i;
+                if (i != 0)
+                        {
+                        if (i > sizeof s->session->session_id)
+                                {
+                                SSLerr(SSL_F_DTLS1_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+                        memcpy(p,s->session->session_id,i);
+                        p+=i;
+                        }
+                
+                /* cookie stuff */
+                if ( s->d1->cookie_len > sizeof(s->d1->cookie))
+                        {
+                        SSLerr(SSL_F_DTLS1_CLIENT_HELLO, ERR_R_INTERNAL_ERROR);
+                        goto err;
+                        }
+                *(p++) = s->d1->cookie_len;
+                memcpy(p, s->d1->cookie, s->d1->cookie_len);
+                p += s->d1->cookie_len;
+
+                /* Ciphers supported */
+                i=ssl_cipher_list_to_bytes(s,SSL_get_ciphers(s),&(p[2]),0);
+                if (i == 0)
+                        {
+                        SSLerr(SSL_F_DTLS1_CLIENT_HELLO,SSL_R_NO_CIPHERS_AVAILABLE);
+                        goto err;
+                        }
+                s2n(i,p);
+                p+=i;
+
+                /* COMPRESSION */
+                if (s->ctx->comp_methods == NULL)
+                        j=0;
+                else
+                        j=sk_SSL_COMP_num(s->ctx->comp_methods);
+                *(p++)=1+j;
+                for (i=0; i<j; i++)
+                        {
+                        comp=sk_SSL_COMP_value(s->ctx->comp_methods,i);
+                        *(p++)=comp->id;
+                        }
+                *(p++)=0; /* Add the NULL method */
+                
+                l=(p-d);
+                d=buf;
+
+                d = dtls1_set_message_header(s, d, SSL3_MT_CLIENT_HELLO, l, 0, l);
+
+                s->state=SSL3_ST_CW_CLNT_HELLO_B;
+                /* number of bytes to write */
+                s->init_num=p-buf;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+                }
+
+        /* SSL3_ST_CW_CLNT_HELLO_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+err:
+        return(-1);
+        }
+
+static int dtls1_get_hello_verify(SSL *s)
+        {
+        int n, al, ok = 0;
+        unsigned char *data;
+        unsigned int cookie_len;
+
+        n=s->method->ssl_get_message(s,
+                DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A,
+                DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B,
+                -1,
+                s->max_cert_list,
+                &ok);
+
+        if (!ok) return((int)n);
+
+        if (s->s3->tmp.message_type != DTLS1_MT_HELLO_VERIFY_REQUEST)
+                {
+                s->d1->send_cookie = 0;
+                s->s3->tmp.reuse_message=1;
+                return(1);
+                }
+
+        data = (unsigned char *)s->init_msg;
+
+        if ((data[0] != (s->version>>8)) || (data[1] != (s->version&0xff)))
+                {
+                SSLerr(SSL_F_DTLS1_GET_HELLO_VERIFY,SSL_R_WRONG_SSL_VERSION);
+                s->version=(s->version&0xff00)|data[1];
+                al = SSL_AD_PROTOCOL_VERSION;
+                goto f_err;
+                }
+        data+=2;
+
+        cookie_len = *(data++);
+        if ( cookie_len > sizeof(s->d1->cookie))
+                {
+                al=SSL_AD_ILLEGAL_PARAMETER;
+                goto f_err;
+                }
+
+        memcpy(s->d1->cookie, data, cookie_len);
+        s->d1->cookie_len = cookie_len;
+
+        s->d1->send_cookie = 1;
+        return 1;
+
+f_err:
+        ssl3_send_alert(s, SSL3_AL_FATAL, al);
+        return -1;
+        }
+
+int dtls1_send_client_key_exchange(SSL *s)
+        {
+        unsigned char *p,*d;
+        int n;
+        unsigned long l;
+#ifndef OPENSSL_NO_RSA
+        unsigned char *q;
+        EVP_PKEY *pkey=NULL;
+#endif
+#ifndef OPENSSL_NO_KRB5
+        KSSL_ERR kssl_err;
+#endif /* OPENSSL_NO_KRB5 */
+
+        if (s->state == SSL3_ST_CW_KEY_EXCH_A)
+                {
+                d=(unsigned char *)s->init_buf->data;
+                p= &(d[DTLS1_HM_HEADER_LENGTH]);
+
+                l=s->s3->tmp.new_cipher->algorithms;
+
+                /* Fool emacs indentation */
+                if (0) {}
+#ifndef OPENSSL_NO_RSA
+                else if (l & SSL_kRSA)
+                        {
+                        RSA *rsa;
+                        unsigned char tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
+
+                        if (s->session->sess_cert->peer_rsa_tmp != NULL)
+                                rsa=s->session->sess_cert->peer_rsa_tmp;
+                        else
+                                {
+                                pkey=X509_get_pubkey(s->session->sess_cert->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
+                                if ((pkey == NULL) ||
+                                        (pkey->type != EVP_PKEY_RSA) ||
+                                        (pkey->pkey.rsa == NULL))
+                                        {
+                                        SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                                        goto err;
+                                        }
+                                rsa=pkey->pkey.rsa;
+                                EVP_PKEY_free(pkey);
+                                }
+                                
+                        tmp_buf[0]=s->client_version>>8;
+                        tmp_buf[1]=s->client_version&0xff;
+                        if (RAND_bytes(&(tmp_buf[2]),sizeof tmp_buf-2) <= 0)
+                                        goto err;
+
+                        s->session->master_key_length=sizeof tmp_buf;
+
+                        q=p;
+                        /* Fix buf for TLS and [incidentally] DTLS */
+                        if (s->version > SSL3_VERSION)
+                                p+=2;
+                        n=RSA_public_encrypt(sizeof tmp_buf,
+                                tmp_buf,p,rsa,RSA_PKCS1_PADDING);
+#ifdef PKCS1_CHECK
+                        if (s->options & SSL_OP_PKCS1_CHECK_1) p[1]++;
+                        if (s->options & SSL_OP_PKCS1_CHECK_2) tmp_buf[0]=0x70;
+#endif
+                        if (n <= 0)
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_ENCRYPT);
+                                goto err;
+                                }
+
+                        /* Fix buf for TLS and [incidentally] DTLS */
+                        if (s->version > SSL3_VERSION)
+                                {
+                                s2n(n,q);
+                                n+=2;
+                                }
+
+                        s->session->master_key_length=
+                                s->method->ssl3_enc->generate_master_secret(s,
+                                        s->session->master_key,
+                                        tmp_buf,sizeof tmp_buf);
+                        OPENSSL_cleanse(tmp_buf,sizeof tmp_buf);
+                        }
+#endif
+#ifndef OPENSSL_NO_KRB5
+                else if (l & SSL_kKRB5)
+                        {
+                        krb5_error_code krb5rc;
+                        KSSL_CTX        *kssl_ctx = s->kssl_ctx;
+                        /*  krb5_data   krb5_ap_req;  */
+                        krb5_data       *enc_ticket;
+                        krb5_data       authenticator, *authp = NULL;
+                        EVP_CIPHER_CTX  ciph_ctx;
+                        EVP_CIPHER      *enc = NULL;
+                        unsigned char   iv[EVP_MAX_IV_LENGTH];
+                        unsigned char   tmp_buf[SSL_MAX_MASTER_KEY_LENGTH];
+                        unsigned char   epms[SSL_MAX_MASTER_KEY_LENGTH 
+                                                + EVP_MAX_IV_LENGTH];
+                        int             padl, outl = sizeof(epms);
+
+                        EVP_CIPHER_CTX_init(&ciph_ctx);
+
+#ifdef KSSL_DEBUG
+                        printf("ssl3_send_client_key_exchange(%lx & %lx)\n",
+                                l, SSL_kKRB5);
+#endif  /* KSSL_DEBUG */
+
+                        authp = NULL;
+#ifdef KRB5SENDAUTH
+                        if (KRB5SENDAUTH)  authp = &authenticator;
+#endif  /* KRB5SENDAUTH */
+
+                        krb5rc = kssl_cget_tkt(kssl_ctx, &enc_ticket, authp,
+                                &kssl_err);
+                        enc = kssl_map_enc(kssl_ctx->enctype);
+                        if (enc == NULL)
+                            goto err;
+#ifdef KSSL_DEBUG
+                        {
+                        printf("kssl_cget_tkt rtn %d\n", krb5rc);
+                        if (krb5rc && kssl_err.text)
+                          printf("kssl_cget_tkt kssl_err=%s\n", kssl_err.text);
+                        }
+#endif  /* KSSL_DEBUG */
+
+                        if (krb5rc)
+                                {
+                                ssl3_send_alert(s,SSL3_AL_FATAL,
+                                                SSL_AD_HANDSHAKE_FAILURE);
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,
+                                                kssl_err.reason);
+                                goto err;
+                                }
+
+                        /*  20010406 VRS - Earlier versions used KRB5 AP_REQ
+                        **  in place of RFC 2712 KerberosWrapper, as in:
+                        **
+                        **  Send ticket (copy to *p, set n = length)
+                        **  n = krb5_ap_req.length;
+                        **  memcpy(p, krb5_ap_req.data, krb5_ap_req.length);
+                        **  if (krb5_ap_req.data)  
+                        **    kssl_krb5_free_data_contents(NULL,&krb5_ap_req);
+                        **
+                        **  Now using real RFC 2712 KerberosWrapper
+                        **  (Thanks to Simon Wilkinson <sxw@sxw.org.uk>)
+                        **  Note: 2712 "opaque" types are here replaced
+                        **  with a 2-byte length followed by the value.
+                        **  Example:
+                        **  KerberosWrapper= xx xx asn1ticket 0 0 xx xx encpms
+                        **  Where "xx xx" = length bytes.  Shown here with
+                        **  optional authenticator omitted.
+                        */
+
+                        /*  KerberosWrapper.Ticket              */
+                        s2n(enc_ticket->length,p);
+                        memcpy(p, enc_ticket->data, enc_ticket->length);
+                        p+= enc_ticket->length;
+                        n = enc_ticket->length + 2;
+
+                        /*  KerberosWrapper.Authenticator       */
+                        if (authp  &&  authp->length)  
+                                {
+                                s2n(authp->length,p);
+                                memcpy(p, authp->data, authp->length);
+                                p+= authp->length;
+                                n+= authp->length + 2;
+                                
+                                free(authp->data);
+                                authp->data = NULL;
+                                authp->length = 0;
+                                }
+                        else
+                                {
+                                s2n(0,p);/*  null authenticator length  */
+                                n+=2;
+                                }
+ 
+                        if (RAND_bytes(tmp_buf,sizeof tmp_buf) <= 0)
+                            goto err;
+
+                        /*  20010420 VRS.  Tried it this way; failed.
+                        **      EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,NULL);
+                        **      EVP_CIPHER_CTX_set_key_length(&ciph_ctx,
+                        **                              kssl_ctx->length);
+                        **      EVP_EncryptInit_ex(&ciph_ctx,NULL, key,iv);
+                        */
+
+                        memset(iv, 0, sizeof iv);  /* per RFC 1510 */
+                        EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,
+                                kssl_ctx->key,iv);
+                        EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,
+                                sizeof tmp_buf);
+                        EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
+                        outl += padl;
+                        if (outl > sizeof epms)
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+                        EVP_CIPHER_CTX_cleanup(&ciph_ctx);
+
+                        /*  KerberosWrapper.EncryptedPreMasterSecret    */
+                        s2n(outl,p);
+                        memcpy(p, epms, outl);
+                        p+=outl;
+                        n+=outl + 2;
+
+                        s->session->master_key_length=
+                                s->method->ssl3_enc->generate_master_secret(s,
+                                        s->session->master_key,
+                                        tmp_buf, sizeof tmp_buf);
+
+                        OPENSSL_cleanse(tmp_buf, sizeof tmp_buf);
+                        OPENSSL_cleanse(epms, outl);
+                        }
+#endif
+#ifndef OPENSSL_NO_DH
+                else if (l & (SSL_kEDH|SSL_kDHr|SSL_kDHd))
+                        {
+                        DH *dh_srvr,*dh_clnt;
+
+                        if (s->session->sess_cert->peer_dh_tmp != NULL)
+                                dh_srvr=s->session->sess_cert->peer_dh_tmp;
+                        else
+                                {
+                                /* we get them from the cert */
+                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_DH_PARAMETERS);
+                                goto err;
+                                }
+                        
+                        /* generate a new random key */
+                        if ((dh_clnt=DHparams_dup(dh_srvr)) == NULL)
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                goto err;
+                                }
+                        if (!DH_generate_key(dh_clnt))
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                goto err;
+                                }
+
+                        /* use the 'p' output buffer for the DH key, but
+                         * make sure to clear it out afterwards */
+
+                        n=DH_compute_key(p,dh_srvr->pub_key,dh_clnt);
+
+                        if (n <= 0)
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                goto err;
+                                }
+
+                        /* generate master key from the result */
+                        s->session->master_key_length=
+                                s->method->ssl3_enc->generate_master_secret(s,
+                                        s->session->master_key,p,n);
+                        /* clean up */
+                        memset(p,0,n);
+
+                        /* send off the data */
+                        n=BN_num_bytes(dh_clnt->pub_key);
+                        s2n(n,p);
+                        BN_bn2bin(dh_clnt->pub_key,p);
+                        n+=2;
+
+                        DH_free(dh_clnt);
+
+                        /* perhaps clean things up a bit EAY EAY EAY EAY*/
+                        }
+#endif
+                else
+                        {
+                        ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_HANDSHAKE_FAILURE);
+                        SSLerr(SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR);
+                        goto err;
+                        }
+                
+                d = dtls1_set_message_header(s, d,
+                SSL3_MT_CLIENT_KEY_EXCHANGE, n, 0, n);
+                /*
+                 *(d++)=SSL3_MT_CLIENT_KEY_EXCHANGE;
+                 l2n3(n,d);
+                 l2n(s->d1->handshake_write_seq,d);
+                 s->d1->handshake_write_seq++;
+                */
+                
+                s->state=SSL3_ST_CW_KEY_EXCH_B;
+                /* number of bytes to write */
+                s->init_num=n+DTLS1_HM_HEADER_LENGTH;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+                }
+        
+        /* SSL3_ST_CW_KEY_EXCH_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+err:
+        return(-1);
+        }
+
+int dtls1_send_client_verify(SSL *s)
+        {
+        unsigned char *p,*d;
+        unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
+        EVP_PKEY *pkey;
+#ifndef OPENSSL_NO_RSA
+        unsigned u=0;
+#endif
+        unsigned long n;
+#ifndef OPENSSL_NO_DSA
+        int j;
+#endif
+
+        if (s->state == SSL3_ST_CW_CERT_VRFY_A)
+                {
+                d=(unsigned char *)s->init_buf->data;
+                p= &(d[DTLS1_HM_HEADER_LENGTH]);
+                pkey=s->cert->key->privatekey;
+
+                s->method->ssl3_enc->cert_verify_mac(s,&(s->s3->finish_dgst2),
+                        &(data[MD5_DIGEST_LENGTH]));
+
+#ifndef OPENSSL_NO_RSA
+                if (pkey->type == EVP_PKEY_RSA)
+                        {
+                        s->method->ssl3_enc->cert_verify_mac(s,
+                                &(s->s3->finish_dgst1),&(data[0]));
+                        if (RSA_sign(NID_md5_sha1, data,
+                                         MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
+                                        &(p[2]), &u, pkey->pkey.rsa) <= 0 )
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_VERIFY,ERR_R_RSA_LIB);
+                                goto err;
+                                }
+                        s2n(u,p);
+                        n=u+2;
+                        }
+                else
+#endif
+#ifndef OPENSSL_NO_DSA
+                        if (pkey->type == EVP_PKEY_DSA)
+                        {
+                        if (!DSA_sign(pkey->save_type,
+                                &(data[MD5_DIGEST_LENGTH]),
+                                SHA_DIGEST_LENGTH,&(p[2]),
+                                (unsigned int *)&j,pkey->pkey.dsa))
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_CLIENT_VERIFY,ERR_R_DSA_LIB);
+                                goto err;
+                                }
+                        s2n(j,p);
+                        n=j+2;
+                        }
+                else
+#endif
+                        {
+                        SSLerr(SSL_F_DTLS1_SEND_CLIENT_VERIFY,ERR_R_INTERNAL_ERROR);
+                        goto err;
+                        }
+
+                d = dtls1_set_message_header(s, d,
+                        SSL3_MT_CERTIFICATE_VERIFY, n, 0, n) ;
+
+                s->init_num=(int)n+DTLS1_HM_HEADER_LENGTH;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+
+                s->state = SSL3_ST_CW_CERT_VRFY_B;
+                }
+
+        /* s->state = SSL3_ST_CW_CERT_VRFY_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+err:
+        return(-1);
+        }
+
+int dtls1_send_client_certificate(SSL *s)
+        {
+        X509 *x509=NULL;
+        EVP_PKEY *pkey=NULL;
+        int i;
+        unsigned long l;
+
+        if (s->state == SSL3_ST_CW_CERT_A)
+                {
+                if ((s->cert == NULL) ||
+                        (s->cert->key->x509 == NULL) ||
+                        (s->cert->key->privatekey == NULL))
+                        s->state=SSL3_ST_CW_CERT_B;
+                else
+                        s->state=SSL3_ST_CW_CERT_C;
+                }
+
+        /* We need to get a client cert */
+        if (s->state == SSL3_ST_CW_CERT_B)
+                {
+                /* If we get an error, we need to
+                 * ssl->rwstate=SSL_X509_LOOKUP; return(-1);
+                 * We then get retied later */
+                i=0;
+                if (s->ctx->client_cert_cb != NULL)
+                        i=s->ctx->client_cert_cb(s,&(x509),&(pkey));
+                if (i < 0)
+                        {
+                        s->rwstate=SSL_X509_LOOKUP;
+                        return(-1);
+                        }
+                s->rwstate=SSL_NOTHING;
+                if ((i == 1) && (pkey != NULL) && (x509 != NULL))
+                        {
+                        s->state=SSL3_ST_CW_CERT_B;
+                        if (    !SSL_use_certificate(s,x509) ||
+                                !SSL_use_PrivateKey(s,pkey))
+                                i=0;
+                        }
+                else if (i == 1)
+                        {
+                        i=0;
+                        SSLerr(SSL_F_DTLS1_SEND_CLIENT_CERTIFICATE,SSL_R_BAD_DATA_RETURNED_BY_CALLBACK);
+                        }
+
+                if (x509 != NULL) X509_free(x509);
+                if (pkey != NULL) EVP_PKEY_free(pkey);
+                if (i == 0)
+                        {
+                        if (s->version == SSL3_VERSION)
+                                {
+                                s->s3->tmp.cert_req=0;
+                                ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_NO_CERTIFICATE);
+                                return(1);
+                                }
+                        else
+                                {
+                                s->s3->tmp.cert_req=2;
+                                }
+                        }
+
+                /* Ok, we have a cert */
+                s->state=SSL3_ST_CW_CERT_C;
+                }
+
+        if (s->state == SSL3_ST_CW_CERT_C)
+                {
+                s->state=SSL3_ST_CW_CERT_D;
+                l=dtls1_output_cert_chain(s,
+                        (s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509);
+                s->init_num=(int)l;
+                s->init_off=0;
+
+                /* set header called by dtls1_output_cert_chain() */
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+                }
+        /* SSL3_ST_CW_CERT_D */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+        }
+
+
diff --git a/src/lib/libssl/src/fips/rand/fips_randtest.c b/src/lib/libssl/src/ssl/d1_enc.c
index 6165944e56..cbff7495c5 100644
--- a/src/lib/libssl/src/fips/rand/fips_randtest.c
+++ b/src/lib/libssl/src/ssl/d1_enc.c
@@ -1,3 +1,61 @@
+/* ssl/d1_enc.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -54,316 +112,170 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 2003 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
 
 #include <stdio.h>
-#include <stdlib.h>
+#include "ssl_locl.h"
+#include <openssl/comp.h>
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#include <openssl/md5.h>
 #include <openssl/rand.h>
-#include <openssl/fips_rand.h>
-#include <openssl/err.h>
-
-#include "e_os.h"
-
-#ifndef OPENSSL_FIPS
-int main(int argc, char *argv[])
-{
-    printf("No FIPS RAND support\n");
-    return(0);
-}
-
-#else
-
-/* some FIPS 140-1 random number test */
-/* some simple tests */
 
-static DES_cblock prng_key1={0x21,0x58,0x47,0xb7,0xc2,0x97,0x5a,0x8e};
-static DES_cblock prng_key2={0x61,0x23,0x05,0x96,0x18,0x91,0x86,0xac};
-static unsigned char prng_seed[8]={0x6b,0xa3,0x4f,0x07,0xe4,0x2a,0xb0,0xc};
 
-typedef struct
-    {
-    DES_cblock keys[2];
-    const unsigned char time[8];
-    const unsigned char seed[8];
-    const unsigned char block1[8];
-    const unsigned char block100[8];
-    } PRNGtest;
-
-/* FIXME: these test vectors are made up! */
-static PRNGtest t1=
-    {
-    { { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07 },
-      { 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f },
-    },
-    { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-    { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 },
-    { 0x33,0xc3,0xdf,0xfe,0x60,0x60,0x49,0x9e },
-    { 0xcd,0x2b,0x41,0xaf,0x80,0x51,0x37,0xd8 }
-    };
-static PRNGtest t2=
-    {
-    { { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
-      { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff } },
-    { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
-    { 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
-    { 0x65,0xf1,0xa4,0x07,0x42,0x38,0xd5,0x25 },
-    { 0xbb,0x75,0x84,0x20,0x7a,0x44,0xf0,0xa0 }
-    };
-
-static void dump(const unsigned char *b,int n)
-    {
-    while(n-- > 0)
-        {
-        printf(" %02x",*b++);
-        }
-    }
-
-static void compare(const unsigned char *result,const unsigned char *expected,
-                    int n)
-    {
-    int i;
-
-    for(i=0 ; i < n ; ++i)
-        if(result[i] != expected[i])
-            {
-            puts("Random test failed, got:");
-            dump(result,8);
-            puts("\n               expected:");
-            dump(expected,8);
-            putchar('\n');
-            EXIT(1);
-            }
-    }
-
-static void run_test(const PRNGtest *t)
-    {
-    unsigned char buf[8];
-    int n;
-
-    FIPS_set_prng_key(t->keys[0],t->keys[1]);
-    FIPS_test_mode(1,t->time);
-    RAND_seed(t->seed,sizeof t->seed);
-
-    if(RAND_bytes(buf,8) <= 0)
-        {
-        ERR_print_errors_fp(stderr);
-        EXIT(2);
-        }
-    compare(buf,t->block1,8);
-    for(n=0 ; n < 99 ; ++n)
-        if(RAND_bytes(buf,8) <= 0)
-            {
-            ERR_print_errors_fp(stderr);
-            EXIT(2);
-            }
-    compare(buf,t->block100,8);
-    FIPS_test_mode(0,NULL);
-    }
-
-int main()
+int dtls1_enc(SSL *s, int send)
         {
-        unsigned char buf[2500];
-        int i,j,k,s,sign,nsign,err=0;
-        unsigned long n1;
-        unsigned long n2[16];
-        unsigned long runs[2][34];
-        /*double d; */
-        long d;
-
-        ERR_load_crypto_strings();
-        RAND_set_rand_method(FIPS_rand_method());
-
-        run_test(&t1);
-        run_test(&t2);
-
-        FIPS_set_prng_key(prng_key1,prng_key2);
-        RAND_seed(prng_seed,sizeof prng_seed);
+        SSL3_RECORD *rec;
+        EVP_CIPHER_CTX *ds;
+        unsigned long l;
+        int bs,i,ii,j,k,n=0;
+        const EVP_CIPHER *enc;
 
-        i = RAND_pseudo_bytes(buf,2500);
-        if (i <= 0)
+        if (send)
                 {
-                printf ("init failed, the rand method is not properly installed\n");
-                err++;
-                goto err;
-                }
-
-        n1=0;
-        for (i=0; i<16; i++) n2[i]=0;
-        for (i=0; i<34; i++) runs[0][i]=runs[1][i]=0;
-
-        /* test 1 and 2 */
-        sign=0;
-        nsign=0;
-        for (i=0; i<2500; i++)
-                {
-                j=buf[i];
-
-                n2[j&0x0f]++;
-                n2[(j>>4)&0x0f]++;
-
-                for (k=0; k<8; k++)
+                if (s->write_hash != NULL)
+                        n=EVP_MD_size(s->write_hash);
+                ds=s->enc_write_ctx;
+                rec= &(s->s3->wrec);
+                if (s->enc_write_ctx == NULL)
+                        enc=NULL;
+                else
                         {
-                        s=(j&0x01);
-                        if (s == sign)
-                                nsign++;
-                        else
+                        enc=EVP_CIPHER_CTX_cipher(s->enc_write_ctx);
+                        if ( rec->data != rec->input)
+                                /* we can't write into the input stream */
+                                fprintf(stderr, "%s:%d: rec->data != rec->input\n",
+                                        __FILE__, __LINE__);
+                        else if ( EVP_CIPHER_block_size(ds->cipher) > 1)
                                 {
-                                if (nsign > 34) nsign=34;
-                                if (nsign != 0)
-                                        {
-                                        runs[sign][nsign-1]++;
-                                        if (nsign > 6)
-                                                runs[sign][5]++;
-                                        }
-                                sign=s;
-                                nsign=1;
+                                if (!RAND_bytes(rec->input, EVP_CIPHER_block_size(ds->cipher)))
+                                        return -1;
                                 }
-
-                        if (s) n1++;
-                        j>>=1;
                         }
                 }
-                if (nsign > 34) nsign=34;
-                if (nsign != 0) runs[sign][nsign-1]++;
-
-        /* test 1 */
-        if (!((9654 < n1) && (n1 < 10346)))
+        else
                 {
-                printf("test 1 failed, X=%lu\n",n1);
-                err++;
+                if (s->read_hash != NULL)
+                        n=EVP_MD_size(s->read_hash);
+                ds=s->enc_read_ctx;
+                rec= &(s->s3->rrec);
+                if (s->enc_read_ctx == NULL)
+                        enc=NULL;
+                else
+                        enc=EVP_CIPHER_CTX_cipher(s->enc_read_ctx);
                 }
-        printf("test 1 done\n");
 
-        /* test 2 */
-#ifdef undef
-        d=0;
-        for (i=0; i<16; i++)
-                d+=n2[i]*n2[i];
-        d=d*16.0/5000.0-5000.0;
-        if (!((1.03 < d) && (d < 57.4)))
+#ifdef KSSL_DEBUG
+        printf("dtls1_enc(%d)\n", send);
+#endif    /* KSSL_DEBUG */
+
+        if ((s->session == NULL) || (ds == NULL) ||
+                (enc == NULL))
                 {
-                printf("test 2 failed, X=%.2f\n",d);
-                err++;
+                memmove(rec->data,rec->input,rec->length);
+                rec->input=rec->data;
                 }
-#endif
-        d=0;
-        for (i=0; i<16; i++)
-                d+=n2[i]*n2[i];
-        d=(d*8)/25-500000;
-        if (!((103 < d) && (d < 5740)))
+        else
                 {
-                printf("test 2 failed, X=%ld.%02ld\n",d/100L,d%100L);
-                err++;
-                }
-        printf("test 2 done\n");
+                l=rec->length;
+                bs=EVP_CIPHER_block_size(ds->cipher);
 
-        /* test 3 */
-        for (i=0; i<2; i++)
-                {
-                if (!((2267 < runs[i][0]) && (runs[i][0] < 2733)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,1,runs[i][0]);
-                        err++;
-                        }
-                if (!((1079 < runs[i][1]) && (runs[i][1] < 1421)))
+                if ((bs != 1) && send)
                         {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,2,runs[i][1]);
-                        err++;
-                        }
-                if (!(( 502 < runs[i][2]) && (runs[i][2] <  748)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,3,runs[i][2]);
-                        err++;
-                        }
-                if (!(( 223 < runs[i][3]) && (runs[i][3] <  402)))
-                        {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,4,runs[i][3]);
-                        err++;
+                        i=bs-((int)l%bs);
+
+                        /* Add weird padding of upto 256 bytes */
+
+                        /* we need to add 'i' padding bytes of value j */
+                        j=i-1;
+                        if (s->options & SSL_OP_TLS_BLOCK_PADDING_BUG)
+                                {
+                                if (s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG)
+                                        j++;
+                                }
+                        for (k=(int)l; k<(int)(l+i); k++)
+                                rec->input[k]=j;
+                        l+=i;
+                        rec->length+=i;
                         }
-                if (!((  90 < runs[i][4]) && (runs[i][4] <  223)))
+
+#ifdef KSSL_DEBUG
+                {
+                unsigned long ui;
+                printf("EVP_Cipher(ds=%p,rec->data=%p,rec->input=%p,l=%ld) ==>\n",
+                        ds,rec->data,rec->input,l);
+                printf("\tEVP_CIPHER_CTX: %d buf_len, %d key_len [%d %d], %d iv_len\n",
+                        ds->buf_len, ds->cipher->key_len,
+                        DES_KEY_SZ, DES_SCHEDULE_SZ,
+                        ds->cipher->iv_len);
+                printf("\t\tIV: ");
+                for (i=0; i<ds->cipher->iv_len; i++) printf("%02X", ds->iv[i]);
+                printf("\n");
+                printf("\trec->input=");
+                for (ui=0; ui<l; ui++) printf(" %02x", rec->input[ui]);
+                printf("\n");
+                }
+#endif  /* KSSL_DEBUG */
+
+                if (!send)
                         {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,5,runs[i][4]);
-                        err++;
+                        if (l == 0 || l%bs != 0)
+                                {
+                                SSLerr(SSL_F_DTLS1_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
+                                ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPTION_FAILED);
+                                return 0;
+                                }
                         }
-                if (!((  90 < runs[i][5]) && (runs[i][5] <  223)))
+                
+                EVP_Cipher(ds,rec->data,rec->input,l);
+
+#ifdef KSSL_DEBUG
+                {
+                unsigned long i;
+                printf("\trec->data=");
+                for (i=0; i<l; i++)
+                        printf(" %02x", rec->data[i]);  printf("\n");
+                }
+#endif  /* KSSL_DEBUG */
+
+                if ((bs != 1) && !send)
                         {
-                        printf("test 3 failed, bit=%d run=%d num=%lu\n",
-                                i,6,runs[i][5]);
-                        err++;
+                        ii=i=rec->data[l-1]; /* padding_length */
+                        i++;
+                        if (s->options&SSL_OP_TLS_BLOCK_PADDING_BUG)
+                                {
+                                /* First packet is even in size, so check */
+                                if ((memcmp(s->s3->read_sequence,
+                                        "\0\0\0\0\0\0\0\0",8) == 0) && !(ii & 1))
+                                        s->s3->flags|=TLS1_FLAGS_TLS_PADDING_BUG;
+                                if (s->s3->flags & TLS1_FLAGS_TLS_PADDING_BUG)
+                                        i--;
+                                }
+                        /* TLS 1.0 does not bound the number of padding bytes by the block size.
+                         * All of them must have value 'padding_length'. */
+                        if (i > (int)rec->length)
+                                {
+                                /* Incorrect padding. SSLerr() and ssl3_alert are done
+                                 * by caller: we don't want to reveal whether this is
+                                 * a decryption error or a MAC verification failure
+                                 * (see http://www.openssl.org/~bodo/tls-cbc.txt) 
+                                 */
+                                return -1;
+                                }
+                        for (j=(int)(l-i); j<(int)l; j++)
+                                {
+                                if (rec->data[j] != ii)
+                                        {
+                                        /* Incorrect padding */
+                                        return -1;
+                                        }
+                                }
+                        rec->length-=i;
+
+                        rec->data += bs;    /* skip the implicit IV */
+                        rec->input += bs;
+                        rec->length -= bs;
                         }
                 }
-        printf("test 3 done\n");
-        
-        /* test 4 */
-        if (runs[0][33] != 0)
-                {
-                printf("test 4 failed, bit=%d run=%d num=%lu\n",
-                        0,34,runs[0][33]);
-                err++;
-                }
-        if (runs[1][33] != 0)
-                {
-                printf("test 4 failed, bit=%d run=%d num=%lu\n",
-                        1,34,runs[1][33]);
-                err++;
-                }
-        printf("test 4 done\n");
- err:
-        err=((err)?1:0);
-        EXIT(err);
-        return(err);
+        return(1);
         }
 
-#endif
diff --git a/src/lib/libssl/src/ssl/d1_lib.c b/src/lib/libssl/src/ssl/d1_lib.c
new file mode 100644
index 0000000000..fc088b4148
--- /dev/null
+++ b/src/lib/libssl/src/ssl/d1_lib.c
@@ -0,0 +1,210 @@
+/* ssl/d1_lib.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <openssl/objects.h>
+#include "ssl_locl.h"
+
+const char dtls1_version_str[]="DTLSv1" OPENSSL_VERSION_PTEXT;
+
+SSL3_ENC_METHOD DTLSv1_enc_data={
+    dtls1_enc,
+        tls1_mac,
+        tls1_setup_key_block,
+        tls1_generate_master_secret,
+        tls1_change_cipher_state,
+        tls1_final_finish_mac,
+        TLS1_FINISH_MAC_LENGTH,
+        tls1_cert_verify_mac,
+        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,
+        };
+
+long dtls1_default_timeout(void)
+        {
+        /* 2 hours, the 24 hours mentioned in the DTLSv1 spec
+         * is way too long for http, the cache would over fill */
+        return(60*60*2);
+        }
+
+IMPLEMENT_dtls1_meth_func(dtlsv1_base_method,
+                        ssl_undefined_function,
+                        ssl_undefined_function,
+                        ssl_bad_method)
+
+int dtls1_new(SSL *s)
+        {
+        DTLS1_STATE *d1;
+
+        if (!ssl3_new(s)) return(0);
+        if ((d1=OPENSSL_malloc(sizeof *d1)) == NULL) return (0);
+        memset(d1,0, sizeof *d1);
+
+        /* d1->handshake_epoch=0; */
+#if defined(OPENSSL_SYS_VMS) || defined(VMS_TEST)
+        d1->bitmap.length=64;
+#else
+        d1->bitmap.length=sizeof(d1->bitmap.map) * 8;
+#endif
+        pq_64bit_init(&(d1->bitmap.map));
+        pq_64bit_init(&(d1->bitmap.max_seq_num));
+        
+        pq_64bit_init(&(d1->next_bitmap.map));
+        pq_64bit_init(&(d1->next_bitmap.max_seq_num));
+
+        d1->unprocessed_rcds.q=pqueue_new();
+        d1->processed_rcds.q=pqueue_new();
+        d1->buffered_messages = pqueue_new();
+        d1->sent_messages=pqueue_new();
+
+        if ( s->server)
+                {
+                d1->cookie_len = sizeof(s->d1->cookie);
+                }
+
+        if( ! d1->unprocessed_rcds.q || ! d1->processed_rcds.q 
+        || ! d1->buffered_messages || ! d1->sent_messages)
+                {
+        if ( d1->unprocessed_rcds.q) pqueue_free(d1->unprocessed_rcds.q);
+        if ( d1->processed_rcds.q) pqueue_free(d1->processed_rcds.q);
+        if ( d1->buffered_messages) pqueue_free(d1->buffered_messages);
+                if ( d1->sent_messages) pqueue_free(d1->sent_messages);
+                OPENSSL_free(d1);
+                return (0);
+                }
+
+        s->d1=d1;
+        s->method->ssl_clear(s);
+        return(1);
+        }
+
+void dtls1_free(SSL *s)
+        {
+    pitem *item = NULL;
+    hm_fragment *frag = NULL;
+
+        ssl3_free(s);
+
+    while( (item = pqueue_pop(s->d1->unprocessed_rcds.q)) != NULL)
+        {
+        OPENSSL_free(item->data);
+        pitem_free(item);
+        }
+    pqueue_free(s->d1->unprocessed_rcds.q);
+
+    while( (item = pqueue_pop(s->d1->processed_rcds.q)) != NULL)
+        {
+        OPENSSL_free(item->data);
+        pitem_free(item);
+        }
+    pqueue_free(s->d1->processed_rcds.q);
+
+    while( (item = pqueue_pop(s->d1->buffered_messages)) != NULL)
+        {
+        frag = (hm_fragment *)item->data;
+        OPENSSL_free(frag->fragment);
+        OPENSSL_free(frag);
+        pitem_free(item);
+        }
+    pqueue_free(s->d1->buffered_messages);
+
+    while ( (item = pqueue_pop(s->d1->sent_messages)) != NULL)
+        {
+        frag = (hm_fragment *)item->data;
+        OPENSSL_free(frag->fragment);
+        OPENSSL_free(frag);
+        pitem_free(item);
+        }
+        pqueue_free(s->d1->sent_messages);
+
+        pq_64bit_free(&(s->d1->bitmap.map));
+        pq_64bit_free(&(s->d1->bitmap.max_seq_num));
+
+        pq_64bit_free(&(s->d1->next_bitmap.map));
+        pq_64bit_free(&(s->d1->next_bitmap.max_seq_num));
+
+        OPENSSL_free(s->d1);
+        }
+
+void dtls1_clear(SSL *s)
+        {
+        ssl3_clear(s);
+        s->version=DTLS1_VERSION;
+        }
+
+/*
+ * As it's impossible to use stream ciphers in "datagram" mode, this
+ * simple filter is designed to disengage them in DTLS. Unfortunately
+ * there is no universal way to identify stream SSL_CIPHER, so we have
+ * to explicitly list their SSL_* codes. Currently RC4 is the only one
+ * available, but if new ones emerge, they will have to be added...
+ */
+SSL_CIPHER *dtls1_get_cipher(unsigned int u)
+        {
+        SSL_CIPHER *ciph = ssl3_get_cipher(u);
+
+        if (ciph != NULL)
+                {
+                if ((ciph->algorithms&SSL_ENC_MASK) == SSL_RC4)
+                        return NULL;
+                }
+
+        return ciph;
+        }
diff --git a/src/lib/libssl/src/ssl/d1_meth.c b/src/lib/libssl/src/ssl/d1_meth.c
new file mode 100644
index 0000000000..8a6cf31947
--- /dev/null
+++ b/src/lib/libssl/src/ssl/d1_meth.c
@@ -0,0 +1,77 @@
+/* ssl/d1_meth.h */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#include <stdio.h>
+#include <openssl/objects.h>
+#include "ssl_locl.h"
+
+static SSL_METHOD *dtls1_get_method(int ver);
+static SSL_METHOD *dtls1_get_method(int ver)
+        {
+        if (ver == DTLS1_VERSION)
+                return(DTLSv1_method());
+        else
+                return(NULL);
+        }
+
+IMPLEMENT_dtls1_meth_func(DTLSv1_method,
+                        dtls1_accept,
+                        dtls1_connect,
+                        dtls1_get_method)
+
diff --git a/src/lib/libssl/src/ssl/d1_pkt.c b/src/lib/libssl/src/ssl/d1_pkt.c
new file mode 100644
index 0000000000..377696deac
--- /dev/null
+++ b/src/lib/libssl/src/ssl/d1_pkt.c
@@ -0,0 +1,1778 @@
+/* ssl/d1_pkt.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1998-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#define USE_SOCKETS
+#include "ssl_locl.h"
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
+#include <openssl/pqueue.h>
+#include <openssl/rand.h>
+
+static int have_handshake_fragment(SSL *s, int type, unsigned char *buf, 
+        int len, int peek);
+static int dtls1_record_replay_check(SSL *s, DTLS1_BITMAP *bitmap,
+        PQ_64BIT *seq_num);
+static void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap);
+static DTLS1_BITMAP *dtls1_get_bitmap(SSL *s, SSL3_RECORD *rr, 
+    unsigned int *is_next_epoch);
+#if 0
+static int dtls1_record_needs_buffering(SSL *s, SSL3_RECORD *rr,
+        unsigned short *priority, unsigned long *offset);
+#endif
+static int dtls1_buffer_record(SSL *s, record_pqueue *q,
+        PQ_64BIT priority);
+static int dtls1_process_record(SSL *s);
+#if PQ_64BIT_IS_INTEGER
+static PQ_64BIT bytes_to_long_long(unsigned char *bytes, PQ_64BIT *num);
+#endif
+static void dtls1_clear_timeouts(SSL *s);
+
+/* copy buffered record into SSL structure */
+static int
+dtls1_copy_record(SSL *s, pitem *item)
+    {
+    DTLS1_RECORD_DATA *rdata;
+
+    rdata = (DTLS1_RECORD_DATA *)item->data;
+    
+    if (s->s3->rbuf.buf != NULL)
+        OPENSSL_free(s->s3->rbuf.buf);
+    
+    s->packet = rdata->packet;
+    s->packet_length = rdata->packet_length;
+    memcpy(&(s->s3->rbuf), &(rdata->rbuf), sizeof(SSL3_BUFFER));
+    memcpy(&(s->s3->rrec), &(rdata->rrec), sizeof(SSL3_RECORD));
+    
+    return(1);
+    }
+
+
+static int
+dtls1_buffer_record(SSL *s, record_pqueue *queue, PQ_64BIT priority)
+{
+    DTLS1_RECORD_DATA *rdata;
+        pitem *item;
+
+        rdata = OPENSSL_malloc(sizeof(DTLS1_RECORD_DATA));
+        item = pitem_new(priority, rdata);
+        if (rdata == NULL || item == NULL)
+                {
+                if (rdata != NULL) OPENSSL_free(rdata);
+                if (item != NULL) pitem_free(item);
+                
+                SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR);
+                return(0);
+                }
+        
+        rdata->packet = s->packet;
+        rdata->packet_length = s->packet_length;
+        memcpy(&(rdata->rbuf), &(s->s3->rbuf), sizeof(SSL3_BUFFER));
+        memcpy(&(rdata->rrec), &(s->s3->rrec), sizeof(SSL3_RECORD));
+
+        item->data = rdata;
+
+        /* insert should not fail, since duplicates are dropped */
+        if (pqueue_insert(queue->q, item) == NULL)
+                {
+                OPENSSL_free(rdata);
+                pitem_free(item);
+                return(0);
+                }
+
+        s->packet = NULL;
+        s->packet_length = 0;
+        memset(&(s->s3->rbuf), 0, sizeof(SSL3_BUFFER));
+        memset(&(s->s3->rrec), 0, sizeof(SSL3_RECORD));
+        
+        if (!ssl3_setup_buffers(s))
+                {
+                SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR);
+                OPENSSL_free(rdata);
+                pitem_free(item);
+                return(0);
+                }
+        
+        return(1);
+    }
+
+
+static int
+dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue)
+    {
+    pitem *item;
+
+    item = pqueue_pop(queue->q);
+    if (item)
+        {
+        dtls1_copy_record(s, item);
+
+        OPENSSL_free(item->data);
+                pitem_free(item);
+
+        return(1);
+        }
+
+    return(0);
+    }
+
+
+/* retrieve a buffered record that belongs to the new epoch, i.e., not processed 
+ * yet */
+#define dtls1_get_unprocessed_record(s) \
+                   dtls1_retrieve_buffered_record((s), \
+                   &((s)->d1->unprocessed_rcds))
+
+/* retrieve a buffered record that belongs to the current epoch, ie, processed */
+#define dtls1_get_processed_record(s) \
+                   dtls1_retrieve_buffered_record((s), \
+                   &((s)->d1->processed_rcds))
+
+static int
+dtls1_process_buffered_records(SSL *s)
+    {
+    pitem *item;
+    
+    item = pqueue_peek(s->d1->unprocessed_rcds.q);
+    if (item)
+        {
+        DTLS1_RECORD_DATA *rdata;
+        rdata = (DTLS1_RECORD_DATA *)item->data;
+        
+        /* Check if epoch is current. */
+        if (s->d1->unprocessed_rcds.epoch != s->d1->r_epoch)
+            return(1);  /* Nothing to do. */
+        
+        /* Process all the records. */
+        while (pqueue_peek(s->d1->unprocessed_rcds.q))
+            {
+            dtls1_get_unprocessed_record(s);
+            if ( ! dtls1_process_record(s))
+                return(0);
+            dtls1_buffer_record(s, &(s->d1->processed_rcds), 
+                s->s3->rrec.seq_num);
+            }
+        }
+
+    /* sync epoch numbers once all the unprocessed records 
+     * have been processed */
+    s->d1->processed_rcds.epoch = s->d1->r_epoch;
+    s->d1->unprocessed_rcds.epoch = s->d1->r_epoch + 1;
+
+    return(1);
+    }
+
+
+#if 0
+
+static int
+dtls1_get_buffered_record(SSL *s)
+        {
+        pitem *item;
+        PQ_64BIT priority = 
+                (((PQ_64BIT)s->d1->handshake_read_seq) << 32) | 
+                ((PQ_64BIT)s->d1->r_msg_hdr.frag_off);
+        
+        if ( ! SSL_in_init(s))  /* if we're not (re)negotiating, 
+                                                           nothing buffered */
+                return 0;
+
+
+        item = pqueue_peek(s->d1->rcvd_records);
+        if (item && item->priority == priority)
+                {
+                /* Check if we've received the record of interest.  It must be
+                 * a handshake record, since data records as passed up without
+                 * buffering */
+                DTLS1_RECORD_DATA *rdata;
+                item = pqueue_pop(s->d1->rcvd_records);
+                rdata = (DTLS1_RECORD_DATA *)item->data;
+                
+                if (s->s3->rbuf.buf != NULL)
+                        OPENSSL_free(s->s3->rbuf.buf);
+                
+                s->packet = rdata->packet;
+                s->packet_length = rdata->packet_length;
+                memcpy(&(s->s3->rbuf), &(rdata->rbuf), sizeof(SSL3_BUFFER));
+                memcpy(&(s->s3->rrec), &(rdata->rrec), sizeof(SSL3_RECORD));
+                
+                OPENSSL_free(item->data);
+                pitem_free(item);
+                
+                /* s->d1->next_expected_seq_num++; */
+                return(1);
+                }
+        
+        return 0;
+        }
+
+#endif
+
+static int
+dtls1_process_record(SSL *s)
+{
+    int i,al;
+        int clear=0;
+    int enc_err;
+        SSL_SESSION *sess;
+    SSL3_RECORD *rr;
+        unsigned int mac_size;
+        unsigned char md[EVP_MAX_MD_SIZE];
+
+
+        rr= &(s->s3->rrec);
+    sess = s->session;
+
+        /* At this point, s->packet_length == SSL3_RT_HEADER_LNGTH + rr->length,
+         * and we have that many bytes in s->packet
+         */
+        rr->input= &(s->packet[DTLS1_RT_HEADER_LENGTH]);
+
+        /* ok, we can now read from 's->packet' data into 'rr'
+         * rr->input points at rr->length bytes, which
+         * need to be copied into rr->data by either
+         * the decryption or by the decompression
+         * When the data is 'copied' into the rr->data buffer,
+         * rr->input will be pointed at the new buffer */ 
+
+        /* We now have - encrypted [ MAC [ compressed [ plain ] ] ]
+         * rr->length bytes of encrypted compressed stuff. */
+
+        /* check is not needed I believe */
+        if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH)
+                {
+                al=SSL_AD_RECORD_OVERFLOW;
+                SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
+                goto f_err;
+                }
+
+        /* decrypt in place in 'rr->input' */
+        rr->data=rr->input;
+
+        enc_err = s->method->ssl3_enc->enc(s,0);
+        if (enc_err <= 0)
+                {
+                if (enc_err == 0)
+                        /* SSLerr() and ssl3_send_alert() have been called */
+                        goto err;
+
+                /* otherwise enc_err == -1 */
+                goto decryption_failed_or_bad_record_mac;
+                }
+
+#ifdef TLS_DEBUG
+printf("dec %d\n",rr->length);
+{ unsigned int z; for (z=0; z<rr->length; z++) printf("%02X%c",rr->data[z],((z+1)%16)?' ':'\n'); }
+printf("\n");
+#endif
+
+        /* r->length is now the compressed data plus mac */
+if (    (sess == NULL) ||
+                (s->enc_read_ctx == NULL) ||
+                (s->read_hash == NULL))
+    clear=1;
+
+        if (!clear)
+                {
+                mac_size=EVP_MD_size(s->read_hash);
+
+                if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH+mac_size)
+                        {
+#if 0 /* OK only for stream ciphers (then rr->length is visible from ciphertext anyway) */
+                        al=SSL_AD_RECORD_OVERFLOW;
+                        SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_PRE_MAC_LENGTH_TOO_LONG);
+                        goto f_err;
+#else
+                        goto decryption_failed_or_bad_record_mac;
+#endif                  
+                        }
+                /* check the MAC for rr->input (it's in mac_size bytes at the tail) */
+                if (rr->length < mac_size)
+                        {
+#if 0 /* OK only for stream ciphers */
+                        al=SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_LENGTH_TOO_SHORT);
+                        goto f_err;
+#else
+                        goto decryption_failed_or_bad_record_mac;
+#endif
+                        }
+                rr->length-=mac_size;
+                i=s->method->ssl3_enc->mac(s,md,0);
+                if (memcmp(md,&(rr->data[rr->length]),mac_size) != 0)
+                        {
+                        goto decryption_failed_or_bad_record_mac;
+                        }
+                }
+
+        /* r->length is now just compressed */
+        if (s->expand != NULL)
+                {
+                if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH)
+                        {
+                        al=SSL_AD_RECORD_OVERFLOW;
+                        SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_COMPRESSED_LENGTH_TOO_LONG);
+                        goto f_err;
+                        }
+                if (!ssl3_do_uncompress(s))
+                        {
+                        al=SSL_AD_DECOMPRESSION_FAILURE;
+                        SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_BAD_DECOMPRESSION);
+                        goto f_err;
+                        }
+                }
+
+        if (rr->length > SSL3_RT_MAX_PLAIN_LENGTH)
+                {
+                al=SSL_AD_RECORD_OVERFLOW;
+                SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_DATA_LENGTH_TOO_LONG);
+                goto f_err;
+                }
+
+        rr->off=0;
+        /* So at this point the following is true
+         * ssl->s3->rrec.type   is the type of record
+         * ssl->s3->rrec.length == number of bytes in record
+         * ssl->s3->rrec.off    == offset to first valid byte
+         * ssl->s3->rrec.data   == where to take bytes from, increment
+         *                         after use :-).
+         */
+
+        /* we have pulled in a full packet so zero things */
+        s->packet_length=0;
+    dtls1_record_bitmap_update(s, &(s->d1->bitmap));/* Mark receipt of record. */
+    return(1);
+
+decryption_failed_or_bad_record_mac:
+        /* Separate 'decryption_failed' alert was introduced with TLS 1.0,
+         * SSL 3.0 only has 'bad_record_mac'.  But unless a decryption
+         * failure is directly visible from the ciphertext anyway,
+         * we should not reveal which kind of error occured -- this
+         * might become visible to an attacker (e.g. via logfile) */
+        al=SSL_AD_BAD_RECORD_MAC;
+        SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC);
+f_err:
+        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+err:
+        return(0);
+}
+
+
+/* Call this to get a new input record.
+ * It will return <= 0 if more data is needed, normally due to an error
+ * or non-blocking IO.
+ * When it finishes, one packet has been decoded and can be found in
+ * ssl->s3->rrec.type    - is the type of record
+ * ssl->s3->rrec.data,   - data
+ * ssl->s3->rrec.length, - number of bytes
+ */
+/* used only by dtls1_read_bytes */
+int dtls1_get_record(SSL *s)
+        {
+        int ssl_major,ssl_minor,al;
+        int i,n;
+        SSL3_RECORD *rr;
+        SSL_SESSION *sess;
+        unsigned char *p;
+        unsigned short version;
+        DTLS1_BITMAP *bitmap;
+        unsigned int is_next_epoch;
+
+        rr= &(s->s3->rrec);
+        sess=s->session;
+
+    /* The epoch may have changed.  If so, process all the
+     * pending records.  This is a non-blocking operation. */
+    if ( ! dtls1_process_buffered_records(s))
+        return 0;
+
+        /* if we're renegotiating, then there may be buffered records */
+        if (dtls1_get_processed_record(s))
+                return 1;
+
+        /* get something from the wire */
+again:
+        /* check if we have the header */
+        if (    (s->rstate != SSL_ST_READ_BODY) ||
+                (s->packet_length < DTLS1_RT_HEADER_LENGTH)) 
+                {
+                n=ssl3_read_n(s, DTLS1_RT_HEADER_LENGTH, s->s3->rbuf.len, 0);
+                /* read timeout is handled by dtls1_read_bytes */
+                if (n <= 0) return(n); /* error or non-blocking */
+
+                OPENSSL_assert(s->packet_length == DTLS1_RT_HEADER_LENGTH);
+
+                s->rstate=SSL_ST_READ_BODY;
+
+                p=s->packet;
+
+                /* Pull apart the header into the DTLS1_RECORD */
+                rr->type= *(p++);
+                ssl_major= *(p++);
+                ssl_minor= *(p++);
+                version=(ssl_major<<8)|ssl_minor;
+
+                /* sequence number is 64 bits, with top 2 bytes = epoch */ 
+                n2s(p,rr->epoch);
+
+                memcpy(&(s->s3->read_sequence[2]), p, 6);
+                p+=6;
+
+                n2s(p,rr->length);
+
+                /* Lets check version */
+                if (!s->first_packet)
+                        {
+                        if (version != s->version && version != DTLS1_BAD_VER)
+                                {
+                                SSLerr(SSL_F_DTLS1_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
+                                /* Send back error using their
+                                 * version number :-) */
+                                s->version=version;
+                                al=SSL_AD_PROTOCOL_VERSION;
+                                goto f_err;
+                                }
+                        }
+
+                if ((version & 0xff00) != (DTLS1_VERSION & 0xff00) &&
+                    (version & 0xff00) != (DTLS1_BAD_VER & 0xff00))
+                        {
+                        SSLerr(SSL_F_DTLS1_GET_RECORD,SSL_R_WRONG_VERSION_NUMBER);
+                        goto err;
+                        }
+
+                if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH)
+                        {
+                        al=SSL_AD_RECORD_OVERFLOW;
+                        SSLerr(SSL_F_DTLS1_GET_RECORD,SSL_R_PACKET_LENGTH_TOO_LONG);
+                        goto f_err;
+                        }
+
+                s->client_version = version;
+                /* now s->rstate == SSL_ST_READ_BODY */
+                }
+
+        /* s->rstate == SSL_ST_READ_BODY, get and decode the data */
+
+        if (rr->length > s->packet_length-DTLS1_RT_HEADER_LENGTH)
+                {
+                /* now s->packet_length == DTLS1_RT_HEADER_LENGTH */
+                i=rr->length;
+                n=ssl3_read_n(s,i,i,1);
+                if (n <= 0) return(n); /* error or non-blocking io */
+
+                /* this packet contained a partial record, dump it */
+                if ( n != i)
+                        {
+                        s->packet_length = 0;
+                        goto again;
+                        }
+
+                /* now n == rr->length,
+                 * and s->packet_length == DTLS1_RT_HEADER_LENGTH + rr->length */
+                }
+        s->rstate=SSL_ST_READ_HEADER; /* set state for later operations */
+
+        /* match epochs.  NULL means the packet is dropped on the floor */
+        bitmap = dtls1_get_bitmap(s, rr, &is_next_epoch);
+        if ( bitmap == NULL)
+        {
+        s->packet_length = 0;  /* dump this record */
+        goto again;   /* get another record */
+                }
+
+        /* check whether this is a repeat, or aged record */
+        if ( ! dtls1_record_replay_check(s, bitmap, &(rr->seq_num)))
+                {
+                s->packet_length=0; /* dump this record */
+                goto again;     /* get another record */
+                }
+
+        /* just read a 0 length packet */
+        if (rr->length == 0) goto again;
+
+    /* If this record is from the next epoch (either HM or ALERT), buffer it
+     * since it cannot be processed at this time.
+     * Records from the next epoch are marked as received even though they are 
+     * not processed, so as to prevent any potential resource DoS attack */
+    if (is_next_epoch)
+        {
+        dtls1_record_bitmap_update(s, bitmap);
+        dtls1_buffer_record(s, &(s->d1->unprocessed_rcds), rr->seq_num);
+        s->packet_length = 0;
+        goto again;
+        }
+
+    if ( ! dtls1_process_record(s))
+        return(0);
+
+        dtls1_clear_timeouts(s);  /* done waiting */
+        return(1);
+
+f_err:
+        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+err:
+        return(0);
+        }
+
+/* Return up to 'len' payload bytes received in 'type' records.
+ * 'type' is one of the following:
+ *
+ *   -  SSL3_RT_HANDSHAKE (when ssl3_get_message calls us)
+ *   -  SSL3_RT_APPLICATION_DATA (when ssl3_read calls us)
+ *   -  0 (during a shutdown, no data has to be returned)
+ *
+ * If we don't have stored data to work from, read a SSL/TLS record first
+ * (possibly multiple records if we still don't have anything to return).
+ *
+ * This function must handle any surprises the peer may have for us, such as
+ * Alert records (e.g. close_notify), ChangeCipherSpec records (not really
+ * a surprise, but handled as if it were), or renegotiation requests.
+ * Also if record payloads contain fragments too small to process, we store
+ * them until there is enough for the respective protocol (the record protocol
+ * may use arbitrary fragmentation and even interleaving):
+ *     Change cipher spec protocol
+ *             just 1 byte needed, no need for keeping anything stored
+ *     Alert protocol
+ *             2 bytes needed (AlertLevel, AlertDescription)
+ *     Handshake protocol
+ *             4 bytes needed (HandshakeType, uint24 length) -- we just have
+ *             to detect unexpected Client Hello and Hello Request messages
+ *             here, anything else is handled by higher layers
+ *     Application data protocol
+ *             none of our business
+ */
+int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
+        {
+        int al,i,j,ret;
+        unsigned int n;
+        SSL3_RECORD *rr;
+        void (*cb)(const SSL *ssl,int type2,int val)=NULL;
+
+        if (s->s3->rbuf.buf == NULL) /* Not initialized yet */
+                if (!ssl3_setup_buffers(s))
+                        return(-1);
+
+    /* XXX: check what the second '&& type' is about */
+        if ((type && (type != SSL3_RT_APPLICATION_DATA) && 
+                (type != SSL3_RT_HANDSHAKE) && type) ||
+            (peek && (type != SSL3_RT_APPLICATION_DATA)))
+                {
+                SSLerr(SSL_F_DTLS1_READ_BYTES, ERR_R_INTERNAL_ERROR);
+                return -1;
+                }
+
+        /* check whether there's a handshake message (client hello?) waiting */
+        if ( (ret = have_handshake_fragment(s, type, buf, len, peek)))
+                return ret;
+
+        /* Now s->d1->handshake_fragment_len == 0 if type == SSL3_RT_HANDSHAKE. */
+
+        if (!s->in_handshake && SSL_in_init(s))
+                {
+                /* type == SSL3_RT_APPLICATION_DATA */
+                i=s->handshake_func(s);
+                if (i < 0) return(i);
+                if (i == 0)
+                        {
+                        SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
+                        return(-1);
+                        }
+                }
+
+start:
+        s->rwstate=SSL_NOTHING;
+
+        /* s->s3->rrec.type         - is the type of record
+         * s->s3->rrec.data,    - data
+         * s->s3->rrec.off,     - offset into 'data' for next read
+         * s->s3->rrec.length,  - number of bytes. */
+        rr = &(s->s3->rrec);
+
+        /* get new packet if necessary */
+        if ((rr->length == 0) || (s->rstate == SSL_ST_READ_BODY))
+                {
+                ret=dtls1_get_record(s);
+                if (ret <= 0) 
+                        {
+                        ret = dtls1_read_failed(s, ret);
+                        /* anything other than a timeout is an error */
+                        if (ret <= 0)  
+                                return(ret);
+                        else
+                                goto start;
+                        }
+                }
+
+        /* we now have a packet which can be read and processed */
+
+        if (s->s3->change_cipher_spec /* set when we receive ChangeCipherSpec,
+                                       * reset by ssl3_get_finished */
+                && (rr->type != SSL3_RT_HANDSHAKE))
+                {
+                al=SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_DATA_BETWEEN_CCS_AND_FINISHED);
+                goto err;
+                }
+
+        /* If the other end has shut down, throw anything we read away
+         * (even in 'peek' mode) */
+        if (s->shutdown & SSL_RECEIVED_SHUTDOWN)
+                {
+                rr->length=0;
+                s->rwstate=SSL_NOTHING;
+                return(0);
+                }
+
+
+        if (type == rr->type) /* SSL3_RT_APPLICATION_DATA or SSL3_RT_HANDSHAKE */
+                {
+                /* make sure that we are not getting application data when we
+                 * are doing a handshake for the first time */
+                if (SSL_in_init(s) && (type == SSL3_RT_APPLICATION_DATA) &&
+                        (s->enc_read_ctx == NULL))
+                        {
+                        al=SSL_AD_UNEXPECTED_MESSAGE;
+                        SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_APP_DATA_IN_HANDSHAKE);
+                        goto f_err;
+                        }
+
+                if (len <= 0) return(len);
+
+                if ((unsigned int)len > rr->length)
+                        n = rr->length;
+                else
+                        n = (unsigned int)len;
+
+                memcpy(buf,&(rr->data[rr->off]),n);
+                if (!peek)
+                        {
+                        rr->length-=n;
+                        rr->off+=n;
+                        if (rr->length == 0)
+                                {
+                                s->rstate=SSL_ST_READ_HEADER;
+                                rr->off=0;
+                                }
+                        }
+                return(n);
+                }
+
+
+        /* If we get here, then type != rr->type; if we have a handshake
+         * message, then it was unexpected (Hello Request or Client Hello). */
+
+        /* In case of record types for which we have 'fragment' storage,
+         * fill that so that we can process the data at a fixed place.
+         */
+                {
+                unsigned int k, dest_maxlen = 0;
+                unsigned char *dest = NULL;
+                unsigned int *dest_len = NULL;
+
+                if (rr->type == SSL3_RT_HANDSHAKE)
+                        {
+                        dest_maxlen = sizeof s->d1->handshake_fragment;
+                        dest = s->d1->handshake_fragment;
+                        dest_len = &s->d1->handshake_fragment_len;
+                        }
+                else if (rr->type == SSL3_RT_ALERT)
+                        {
+                        dest_maxlen = sizeof(s->d1->alert_fragment);
+                        dest = s->d1->alert_fragment;
+                        dest_len = &s->d1->alert_fragment_len;
+                        }
+                /* else it's a CCS message, or it's wrong */
+                else if (rr->type != SSL3_RT_CHANGE_CIPHER_SPEC)
+                        {
+                          /* Not certain if this is the right error handling */
+                          al=SSL_AD_UNEXPECTED_MESSAGE;
+                          SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_UNEXPECTED_RECORD);
+                          goto f_err;
+                        }
+
+
+                if (dest_maxlen > 0)
+                        {
+            /* XDTLS:  In a pathalogical case, the Client Hello
+             *  may be fragmented--don't always expect dest_maxlen bytes */
+                        if ( rr->length < dest_maxlen)
+                                {
+                                s->rstate=SSL_ST_READ_HEADER;
+                                rr->length = 0;
+                                goto start;
+                                }
+
+                        /* now move 'n' bytes: */
+                        for ( k = 0; k < dest_maxlen; k++)
+                                {
+                                dest[k] = rr->data[rr->off++];
+                                rr->length--;
+                                }
+                        *dest_len = dest_maxlen;
+                        }
+                }
+
+        /* s->d1->handshake_fragment_len == 12  iff  rr->type == SSL3_RT_HANDSHAKE;
+         * s->d1->alert_fragment_len == 7      iff  rr->type == SSL3_RT_ALERT.
+         * (Possibly rr is 'empty' now, i.e. rr->length may be 0.) */
+
+        /* If we are a client, check for an incoming 'Hello Request': */
+        if ((!s->server) &&
+                (s->d1->handshake_fragment_len >= DTLS1_HM_HEADER_LENGTH) &&
+                (s->d1->handshake_fragment[0] == SSL3_MT_HELLO_REQUEST) &&
+                (s->session != NULL) && (s->session->cipher != NULL))
+                {
+                s->d1->handshake_fragment_len = 0;
+
+                if ((s->d1->handshake_fragment[1] != 0) ||
+                        (s->d1->handshake_fragment[2] != 0) ||
+                        (s->d1->handshake_fragment[3] != 0))
+                        {
+                        al=SSL_AD_DECODE_ERROR;
+                        SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_BAD_HELLO_REQUEST);
+                        goto err;
+                        }
+
+                /* no need to check sequence number on HELLO REQUEST messages */
+
+                if (s->msg_callback)
+                        s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, 
+                                s->d1->handshake_fragment, 4, s, s->msg_callback_arg);
+
+                if (SSL_is_init_finished(s) &&
+                        !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) &&
+                        !s->s3->renegotiate)
+                        {
+                        ssl3_renegotiate(s);
+                        if (ssl3_renegotiate_check(s))
+                                {
+                                i=s->handshake_func(s);
+                                if (i < 0) return(i);
+                                if (i == 0)
+                                        {
+                                        SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
+                                        return(-1);
+                                        }
+
+                                if (!(s->mode & SSL_MODE_AUTO_RETRY))
+                                        {
+                                        if (s->s3->rbuf.left == 0) /* no read-ahead left? */
+                                                {
+                                                BIO *bio;
+                                                /* In the case where we try to read application data,
+                                                 * but we trigger an SSL handshake, we return -1 with
+                                                 * the retry option set.  Otherwise renegotiation may
+                                                 * cause nasty problems in the blocking world */
+                                                s->rwstate=SSL_READING;
+                                                bio=SSL_get_rbio(s);
+                                                BIO_clear_retry_flags(bio);
+                                                BIO_set_retry_read(bio);
+                                                return(-1);
+                                                }
+                                        }
+                                }
+                        }
+                /* we either finished a handshake or ignored the request,
+                 * now try again to obtain the (application) data we were asked for */
+                goto start;
+                }
+
+        if (s->d1->alert_fragment_len >= DTLS1_AL_HEADER_LENGTH)
+                {
+                int alert_level = s->d1->alert_fragment[0];
+                int alert_descr = s->d1->alert_fragment[1];
+
+                s->d1->alert_fragment_len = 0;
+
+                if (s->msg_callback)
+                        s->msg_callback(0, s->version, SSL3_RT_ALERT, 
+                                s->d1->alert_fragment, 2, s, s->msg_callback_arg);
+
+                if (s->info_callback != NULL)
+                        cb=s->info_callback;
+                else if (s->ctx->info_callback != NULL)
+                        cb=s->ctx->info_callback;
+
+                if (cb != NULL)
+                        {
+                        j = (alert_level << 8) | alert_descr;
+                        cb(s, SSL_CB_READ_ALERT, j);
+                        }
+
+                if (alert_level == 1) /* warning */
+                        {
+                        s->s3->warn_alert = alert_descr;
+                        if (alert_descr == SSL_AD_CLOSE_NOTIFY)
+                                {
+                                s->shutdown |= SSL_RECEIVED_SHUTDOWN;
+                                return(0);
+                                }
+#if 0
+            /* XXX: this is a possible improvement in the future */
+                        /* now check if it's a missing record */
+                        if (alert_descr == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE)
+                                {
+                                unsigned short seq;
+                                unsigned int frag_off;
+                                unsigned char *p = &(s->d1->alert_fragment[2]);
+
+                                n2s(p, seq);
+                                n2l3(p, frag_off);
+
+                                dtls1_retransmit_message(s, seq, frag_off, &found);
+                                if ( ! found  && SSL_in_init(s))
+                                        {
+                                        /* fprintf( stderr,"in init = %d\n", SSL_in_init(s)); */
+                                        /* requested a message not yet sent, 
+                                           send an alert ourselves */
+                                        ssl3_send_alert(s,SSL3_AL_WARNING,
+                                                DTLS1_AD_MISSING_HANDSHAKE_MESSAGE);
+                                        }
+                                }
+#endif
+                        }
+                else if (alert_level == 2) /* fatal */
+                        {
+                        char tmp[16];
+
+                        s->rwstate=SSL_NOTHING;
+                        s->s3->fatal_alert = alert_descr;
+                        SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_AD_REASON_OFFSET + alert_descr);
+                        BIO_snprintf(tmp,sizeof tmp,"%d",alert_descr);
+                        ERR_add_error_data(2,"SSL alert number ",tmp);
+                        s->shutdown|=SSL_RECEIVED_SHUTDOWN;
+                        SSL_CTX_remove_session(s->ctx,s->session);
+                        return(0);
+                        }
+                else
+                        {
+                        al=SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_UNKNOWN_ALERT_TYPE);
+                        goto f_err;
+                        }
+
+                goto start;
+                }
+
+        if (s->shutdown & SSL_SENT_SHUTDOWN) /* but we have not received a shutdown */
+                {
+                s->rwstate=SSL_NOTHING;
+                rr->length=0;
+                return(0);
+                }
+
+        if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)
+                {
+                struct ccs_header_st ccs_hdr;
+
+                dtls1_get_ccs_header(rr->data, &ccs_hdr);
+
+                /* 'Change Cipher Spec' is just a single byte, so we know
+                 * exactly what the record payload has to look like */
+                /* XDTLS: check that epoch is consistent */
+                if (    (s->client_version == DTLS1_BAD_VER && rr->length != 3) ||
+                        (s->client_version != DTLS1_BAD_VER && rr->length != DTLS1_CCS_HEADER_LENGTH) || 
+                        (rr->off != 0) || (rr->data[0] != SSL3_MT_CCS))
+                        {
+                        i=SSL_AD_ILLEGAL_PARAMETER;
+                        SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_BAD_CHANGE_CIPHER_SPEC);
+                        goto err;
+                        }
+
+                rr->length=0;
+
+                if (s->msg_callback)
+                        s->msg_callback(0, s->version, SSL3_RT_CHANGE_CIPHER_SPEC, 
+                                rr->data, 1, s, s->msg_callback_arg);
+
+                s->s3->change_cipher_spec=1;
+                if (!ssl3_do_change_cipher_spec(s))
+                        goto err;
+
+                /* do this whenever CCS is processed */
+                dtls1_reset_seq_numbers(s, SSL3_CC_READ);
+
+                if (s->client_version == DTLS1_BAD_VER)
+                        s->d1->handshake_read_seq++;
+
+                goto start;
+                }
+
+        /* Unexpected handshake message (Client Hello, or protocol violation) */
+        if ((s->d1->handshake_fragment_len >= DTLS1_HM_HEADER_LENGTH) && 
+                !s->in_handshake)
+                {
+                struct hm_header_st msg_hdr;
+                
+                /* this may just be a stale retransmit */
+                dtls1_get_message_header(rr->data, &msg_hdr);
+                if( rr->epoch != s->d1->r_epoch)
+                        {
+                        rr->length = 0;
+                        goto start;
+                        }
+
+                if (((s->state&SSL_ST_MASK) == SSL_ST_OK) &&
+                        !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS))
+                        {
+#if 0 /* worked only because C operator preferences are not as expected (and
+       * because this is not really needed for clients except for detecting
+       * protocol violations): */
+                        s->state=SSL_ST_BEFORE|(s->server)
+                                ?SSL_ST_ACCEPT
+                                :SSL_ST_CONNECT;
+#else
+                        s->state = s->server ? SSL_ST_ACCEPT : SSL_ST_CONNECT;
+#endif
+                        s->new_session=1;
+                        }
+                i=s->handshake_func(s);
+                if (i < 0) return(i);
+                if (i == 0)
+                        {
+                        SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
+                        return(-1);
+                        }
+
+                if (!(s->mode & SSL_MODE_AUTO_RETRY))
+                        {
+                        if (s->s3->rbuf.left == 0) /* no read-ahead left? */
+                                {
+                                BIO *bio;
+                                /* In the case where we try to read application data,
+                                 * but we trigger an SSL handshake, we return -1 with
+                                 * the retry option set.  Otherwise renegotiation may
+                                 * cause nasty problems in the blocking world */
+                                s->rwstate=SSL_READING;
+                                bio=SSL_get_rbio(s);
+                                BIO_clear_retry_flags(bio);
+                                BIO_set_retry_read(bio);
+                                return(-1);
+                                }
+                        }
+                goto start;
+                }
+
+        switch (rr->type)
+                {
+        default:
+#ifndef OPENSSL_NO_TLS
+                /* TLS just ignores unknown message types */
+                if (s->version == TLS1_VERSION)
+                        {
+                        rr->length = 0;
+                        goto start;
+                        }
+#endif
+                al=SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_UNEXPECTED_RECORD);
+                goto f_err;
+        case SSL3_RT_CHANGE_CIPHER_SPEC:
+        case SSL3_RT_ALERT:
+        case SSL3_RT_HANDSHAKE:
+                /* we already handled all of these, with the possible exception
+                 * of SSL3_RT_HANDSHAKE when s->in_handshake is set, but that
+                 * should not happen when type != rr->type */
+                al=SSL_AD_UNEXPECTED_MESSAGE;
+                SSLerr(SSL_F_DTLS1_READ_BYTES,ERR_R_INTERNAL_ERROR);
+                goto f_err;
+        case SSL3_RT_APPLICATION_DATA:
+                /* At this point, we were expecting handshake data,
+                 * but have application data.  If the library was
+                 * running inside ssl3_read() (i.e. in_read_app_data
+                 * is set) and it makes sense to read application data
+                 * at this point (session renegotiation not yet started),
+                 * we will indulge it.
+                 */
+                if (s->s3->in_read_app_data &&
+                        (s->s3->total_renegotiations != 0) &&
+                        ((
+                                (s->state & SSL_ST_CONNECT) &&
+                                (s->state >= SSL3_ST_CW_CLNT_HELLO_A) &&
+                                (s->state <= SSL3_ST_CR_SRVR_HELLO_A)
+                                ) || (
+                                        (s->state & SSL_ST_ACCEPT) &&
+                                        (s->state <= SSL3_ST_SW_HELLO_REQ_A) &&
+                                        (s->state >= SSL3_ST_SR_CLNT_HELLO_A)
+                                        )
+                                ))
+                        {
+                        s->s3->in_read_app_data=2;
+                        return(-1);
+                        }
+                else
+                        {
+                        al=SSL_AD_UNEXPECTED_MESSAGE;
+                        SSLerr(SSL_F_DTLS1_READ_BYTES,SSL_R_UNEXPECTED_RECORD);
+                        goto f_err;
+                        }
+                }
+        /* not reached */
+
+f_err:
+        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+err:
+        return(-1);
+        }
+
+int
+dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, int len)
+        {
+        unsigned int n,tot;
+        int i;
+
+        if (SSL_in_init(s) && !s->in_handshake)
+                {
+                i=s->handshake_func(s);
+                if (i < 0) return(i);
+                if (i == 0)
+                        {
+                        SSLerr(SSL_F_DTLS1_WRITE_APP_DATA_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
+                        return -1;
+                        }
+                }
+
+        tot = s->s3->wnum;
+        n = len - tot;
+
+        while( n)
+                {
+                /* dtls1_write_bytes sends one record at a time, sized according to 
+                 * the currently known MTU */
+                i = dtls1_write_bytes(s, type, buf_, len);
+                if (i <= 0) return i;
+                
+                if ((i == (int)n) ||
+                        (type == SSL3_RT_APPLICATION_DATA &&
+                                (s->mode & SSL_MODE_ENABLE_PARTIAL_WRITE)))
+                        {
+                        /* next chunk of data should get another prepended empty fragment
+                         * in ciphersuites with known-IV weakness: */
+                        s->s3->empty_fragment_done = 0;
+                        return tot+i;
+                        }
+
+                tot += i;
+                n-=i;
+                }
+
+        return tot;
+        }
+
+
+        /* this only happens when a client hello is received and a handshake 
+         * is started. */
+static int
+have_handshake_fragment(SSL *s, int type, unsigned char *buf, 
+        int len, int peek)
+        {
+        
+        if ((type == SSL3_RT_HANDSHAKE) && (s->d1->handshake_fragment_len > 0))
+                /* (partially) satisfy request from storage */
+                {
+                unsigned char *src = s->d1->handshake_fragment;
+                unsigned char *dst = buf;
+                unsigned int k,n;
+                
+                /* peek == 0 */
+                n = 0;
+                while ((len > 0) && (s->d1->handshake_fragment_len > 0))
+                        {
+                        *dst++ = *src++;
+                        len--; s->d1->handshake_fragment_len--;
+                        n++;
+                        }
+                /* move any remaining fragment bytes: */
+                for (k = 0; k < s->d1->handshake_fragment_len; k++)
+                        s->d1->handshake_fragment[k] = *src++;
+                return n;
+                }
+        
+        return 0;
+        }
+
+
+
+
+/* Call this to write data in records of type 'type'
+ * It will return <= 0 if not all data has been sent or non-blocking IO.
+ */
+int dtls1_write_bytes(SSL *s, int type, const void *buf_, int len)
+        {
+        const unsigned char *buf=buf_;
+        unsigned int tot,n,nw;
+        int i;
+        unsigned int mtu;
+
+        s->rwstate=SSL_NOTHING;
+        tot=s->s3->wnum;
+
+        n=(len-tot);
+
+        /* handshake layer figures out MTU for itself, but data records
+         * are also sent through this interface, so need to figure out MTU */
+#if 0
+        mtu = BIO_ctrl(SSL_get_wbio(s), BIO_CTRL_DGRAM_GET_MTU, 0, NULL);
+        mtu += DTLS1_HM_HEADER_LENGTH;  /* HM already inserted */
+#endif
+        mtu = s->d1->mtu;
+
+        if (mtu > SSL3_RT_MAX_PLAIN_LENGTH)
+                mtu = SSL3_RT_MAX_PLAIN_LENGTH;
+
+        if (n > mtu)
+                nw=mtu;
+        else
+                nw=n;
+        
+        i=do_dtls1_write(s, type, &(buf[tot]), nw, 0);
+        if (i <= 0)
+                {
+                s->s3->wnum=tot;
+                return i;
+                }
+
+        if ( (int)s->s3->wnum + i == len)
+                s->s3->wnum = 0;
+        else 
+                s->s3->wnum += i;
+
+        return tot + i;
+        }
+
+int do_dtls1_write(SSL *s, int type, const unsigned char *buf, unsigned int len, int create_empty_fragment)
+        {
+        unsigned char *p,*pseq;
+        int i,mac_size,clear=0;
+        int prefix_len = 0;
+        SSL3_RECORD *wr;
+        SSL3_BUFFER *wb;
+        SSL_SESSION *sess;
+        int bs;
+
+        /* first check if there is a SSL3_BUFFER still being written
+         * out.  This will happen with non blocking IO */
+        if (s->s3->wbuf.left != 0)
+                {
+                OPENSSL_assert(0); /* XDTLS:  want to see if we ever get here */
+                return(ssl3_write_pending(s,type,buf,len));
+                }
+
+        /* If we have an alert to send, lets send it */
+        if (s->s3->alert_dispatch)
+                {
+                i=s->method->ssl_dispatch_alert(s);
+                if (i <= 0)
+                        return(i);
+                /* if it went, fall through and send more stuff */
+                }
+
+        if (len == 0 && !create_empty_fragment)
+                return 0;
+
+        wr= &(s->s3->wrec);
+        wb= &(s->s3->wbuf);
+        sess=s->session;
+
+        if (    (sess == NULL) ||
+                (s->enc_write_ctx == NULL) ||
+                (s->write_hash == NULL))
+                clear=1;
+
+        if (clear)
+                mac_size=0;
+        else
+                mac_size=EVP_MD_size(s->write_hash);
+
+        /* DTLS implements explicit IV, so no need for empty fragments */
+#if 0
+        /* 'create_empty_fragment' is true only when this function calls itself */
+        if (!clear && !create_empty_fragment && !s->s3->empty_fragment_done
+                && SSL_version(s) != DTLS1_VERSION)
+                {
+                /* countermeasure against known-IV weakness in CBC ciphersuites
+                 * (see http://www.openssl.org/~bodo/tls-cbc.txt) 
+                 */
+
+                if (s->s3->need_empty_fragments && type == SSL3_RT_APPLICATION_DATA)
+                        {
+                        /* recursive function call with 'create_empty_fragment' set;
+                         * this prepares and buffers the data for an empty fragment
+                         * (these 'prefix_len' bytes are sent out later
+                         * together with the actual payload) */
+                        prefix_len = s->method->do_ssl_write(s, type, buf, 0, 1);
+                        if (prefix_len <= 0)
+                                goto err;
+
+                        if (s->s3->wbuf.len < (size_t)prefix_len + SSL3_RT_MAX_PACKET_SIZE)
+                                {
+                                /* insufficient space */
+                                SSLerr(SSL_F_DO_DTLS1_WRITE, ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+                        }
+                
+                s->s3->empty_fragment_done = 1;
+                }
+#endif
+
+        p = wb->buf + prefix_len;
+
+        /* write the header */
+
+        *(p++)=type&0xff;
+        wr->type=type;
+
+        if (s->client_version == DTLS1_BAD_VER)
+                *(p++) = DTLS1_BAD_VER>>8,
+                *(p++) = DTLS1_BAD_VER&0xff;
+        else
+                *(p++)=(s->version>>8),
+                *(p++)=s->version&0xff;
+
+        /* field where we are to write out packet epoch, seq num and len */
+        pseq=p; 
+        p+=10;
+
+        /* lets setup the record stuff. */
+
+        /* Make space for the explicit IV in case of CBC.
+         * (this is a bit of a boundary violation, but what the heck).
+         */
+        if ( s->enc_write_ctx && 
+                (EVP_CIPHER_mode( s->enc_write_ctx->cipher ) & EVP_CIPH_CBC_MODE))
+                bs = EVP_CIPHER_block_size(s->enc_write_ctx->cipher);
+        else
+                bs = 0;
+
+        wr->data=p + bs;  /* make room for IV in case of CBC */
+        wr->length=(int)len;
+        wr->input=(unsigned char *)buf;
+
+        /* we now 'read' from wr->input, wr->length bytes into
+         * wr->data */
+
+        /* first we compress */
+        if (s->compress != NULL)
+                {
+                if (!ssl3_do_compress(s))
+                        {
+                        SSLerr(SSL_F_DO_DTLS1_WRITE,SSL_R_COMPRESSION_FAILURE);
+                        goto err;
+                        }
+                }
+        else
+                {
+                memcpy(wr->data,wr->input,wr->length);
+                wr->input=wr->data;
+                }
+
+        /* we should still have the output to wr->data and the input
+         * from wr->input.  Length should be wr->length.
+         * wr->data still points in the wb->buf */
+
+        if (mac_size != 0)
+                {
+                s->method->ssl3_enc->mac(s,&(p[wr->length + bs]),1);
+                wr->length+=mac_size;
+                }
+
+        /* this is true regardless of mac size */
+        wr->input=p;
+        wr->data=p;
+
+
+        /* ssl3_enc can only have an error on read */
+        if (bs) /* bs != 0 in case of CBC */
+                {
+                RAND_pseudo_bytes(p,bs);
+                /* master IV and last CBC residue stand for
+                 * the rest of randomness */
+                wr->length += bs;
+                }
+
+        s->method->ssl3_enc->enc(s,1);
+
+        /* record length after mac and block padding */
+/*      if (type == SSL3_RT_APPLICATION_DATA ||
+        (type == SSL3_RT_ALERT && ! SSL_in_init(s))) */
+        
+        /* there's only one epoch between handshake and app data */
+        
+        s2n(s->d1->w_epoch, pseq);
+
+        /* XDTLS: ?? */
+/*      else
+        s2n(s->d1->handshake_epoch, pseq); */
+
+        memcpy(pseq, &(s->s3->write_sequence[2]), 6);
+        pseq+=6;
+        s2n(wr->length,pseq);
+
+        /* we should now have
+         * wr->data pointing to the encrypted data, which is
+         * wr->length long */
+        wr->type=type; /* not needed but helps for debugging */
+        wr->length+=DTLS1_RT_HEADER_LENGTH;
+
+#if 0  /* this is now done at the message layer */
+        /* buffer the record, making it easy to handle retransmits */
+        if ( type == SSL3_RT_HANDSHAKE || type == SSL3_RT_CHANGE_CIPHER_SPEC)
+                dtls1_buffer_record(s, wr->data, wr->length, 
+                        *((PQ_64BIT *)&(s->s3->write_sequence[0])));
+#endif
+
+        ssl3_record_sequence_update(&(s->s3->write_sequence[0]));
+
+        if (create_empty_fragment)
+                {
+                /* we are in a recursive call;
+                 * just return the length, don't write out anything here
+                 */
+                return wr->length;
+                }
+
+        /* now let's set up wb */
+        wb->left = prefix_len + wr->length;
+        wb->offset = 0;
+
+        /* memorize arguments so that ssl3_write_pending can detect bad write retries later */
+        s->s3->wpend_tot=len;
+        s->s3->wpend_buf=buf;
+        s->s3->wpend_type=type;
+        s->s3->wpend_ret=len;
+
+        /* we now just need to write the buffer */
+        return ssl3_write_pending(s,type,buf,len);
+err:
+        return -1;
+        }
+
+
+
+static int dtls1_record_replay_check(SSL *s, DTLS1_BITMAP *bitmap,
+        PQ_64BIT *seq_num)
+        {
+#if PQ_64BIT_IS_INTEGER
+        PQ_64BIT mask = 0x0000000000000001L;
+#endif
+        PQ_64BIT rcd_num, tmp;
+
+        pq_64bit_init(&rcd_num);
+        pq_64bit_init(&tmp);
+
+        /* this is the sequence number for the record just read */
+        pq_64bit_bin2num(&rcd_num, s->s3->read_sequence, 8);
+
+        
+        if (pq_64bit_gt(&rcd_num, &(bitmap->max_seq_num)) ||
+                pq_64bit_eq(&rcd_num, &(bitmap->max_seq_num)))
+                {
+                pq_64bit_assign(seq_num, &rcd_num);
+                pq_64bit_free(&rcd_num);
+                pq_64bit_free(&tmp);
+                return 1;  /* this record is new */
+                }
+
+        pq_64bit_sub(&tmp, &(bitmap->max_seq_num), &rcd_num);
+
+        if ( pq_64bit_get_word(&tmp) > bitmap->length)
+                {
+                pq_64bit_free(&rcd_num);
+                pq_64bit_free(&tmp);
+                return 0;  /* stale, outside the window */
+                }
+
+#if PQ_64BIT_IS_BIGNUM
+        {
+        int offset;
+        pq_64bit_sub(&tmp, &(bitmap->max_seq_num), &rcd_num);
+        pq_64bit_sub_word(&tmp, 1);
+        offset = pq_64bit_get_word(&tmp);
+        if ( pq_64bit_is_bit_set(&(bitmap->map), offset))
+                {
+                pq_64bit_free(&rcd_num);
+                pq_64bit_free(&tmp);
+                return 0;
+                }
+        }
+#else
+        mask <<= (bitmap->max_seq_num - rcd_num - 1);
+        if (bitmap->map & mask)
+                return 0; /* record previously received */
+#endif
+        
+        pq_64bit_assign(seq_num, &rcd_num);
+        pq_64bit_free(&rcd_num);
+        pq_64bit_free(&tmp);
+        return 1;
+        }
+
+
+static void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap)
+        {
+        unsigned int shift;
+        PQ_64BIT rcd_num;
+        PQ_64BIT tmp;
+        PQ_64BIT_CTX *ctx;
+
+        pq_64bit_init(&rcd_num);
+        pq_64bit_init(&tmp);
+
+        pq_64bit_bin2num(&rcd_num, s->s3->read_sequence, 8);
+
+        /* unfortunate code complexity due to 64-bit manipulation support
+         * on 32-bit machines */
+        if ( pq_64bit_gt(&rcd_num, &(bitmap->max_seq_num)) ||
+                pq_64bit_eq(&rcd_num, &(bitmap->max_seq_num)))
+                {
+                pq_64bit_sub(&tmp, &rcd_num, &(bitmap->max_seq_num));
+                pq_64bit_add_word(&tmp, 1);
+
+                shift = (unsigned int)pq_64bit_get_word(&tmp);
+
+                pq_64bit_lshift(&(tmp), &(bitmap->map), shift);
+                pq_64bit_assign(&(bitmap->map), &tmp);
+
+                pq_64bit_set_bit(&(bitmap->map), 0);
+                pq_64bit_add_word(&rcd_num, 1);
+                pq_64bit_assign(&(bitmap->max_seq_num), &rcd_num);
+
+                pq_64bit_assign_word(&tmp, 1);
+                pq_64bit_lshift(&tmp, &tmp, bitmap->length);
+                ctx = pq_64bit_ctx_new(&ctx);
+                pq_64bit_mod(&(bitmap->map), &(bitmap->map), &tmp, ctx);
+                pq_64bit_ctx_free(ctx);
+                }
+        else
+                {
+                pq_64bit_sub(&tmp, &(bitmap->max_seq_num), &rcd_num);
+                pq_64bit_sub_word(&tmp, 1);
+                shift = (unsigned int)pq_64bit_get_word(&tmp);
+
+                pq_64bit_set_bit(&(bitmap->map), shift);
+                }
+
+        pq_64bit_free(&rcd_num);
+        pq_64bit_free(&tmp);
+        }
+
+
+int dtls1_dispatch_alert(SSL *s)
+        {
+        int i,j;
+        void (*cb)(const SSL *ssl,int type,int val)=NULL;
+        unsigned char buf[2 + 2 + 3]; /* alert level + alert desc + message seq +frag_off */
+        unsigned char *ptr = &buf[0];
+
+        s->s3->alert_dispatch=0;
+
+        memset(buf, 0x00, sizeof(buf));
+        *ptr++ = s->s3->send_alert[0];
+        *ptr++ = s->s3->send_alert[1];
+
+        if (s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE)
+                {       
+                s2n(s->d1->handshake_read_seq, ptr);
+#if 0
+                if ( s->d1->r_msg_hdr.frag_off == 0)  /* waiting for a new msg */
+
+                else
+                        s2n(s->d1->r_msg_hdr.seq, ptr); /* partial msg read */
+#endif
+
+#if 0
+                fprintf(stderr, "s->d1->handshake_read_seq = %d, s->d1->r_msg_hdr.seq = %d\n",s->d1->handshake_read_seq,s->d1->r_msg_hdr.seq);
+#endif
+                l2n3(s->d1->r_msg_hdr.frag_off, ptr);
+                }
+
+        i = do_dtls1_write(s, SSL3_RT_ALERT, &buf[0], sizeof(buf), 0);
+        if (i <= 0)
+                {
+                s->s3->alert_dispatch=1;
+                /* fprintf( stderr, "not done with alert\n" ); */
+                }
+        else
+                {
+                if ( s->s3->send_alert[0] == SSL3_AL_FATAL ||
+                        s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE)
+                        (void)BIO_flush(s->wbio);
+
+                if (s->msg_callback)
+                        s->msg_callback(1, s->version, SSL3_RT_ALERT, s->s3->send_alert, 
+                                2, s, s->msg_callback_arg);
+
+                if (s->info_callback != NULL)
+                        cb=s->info_callback;
+                else if (s->ctx->info_callback != NULL)
+                        cb=s->ctx->info_callback;
+
+                if (cb != NULL)
+                        {
+                        j=(s->s3->send_alert[0]<<8)|s->s3->send_alert[1];
+                        cb(s,SSL_CB_WRITE_ALERT,j);
+                        }
+                }
+        return(i);
+        }
+
+
+static DTLS1_BITMAP *
+dtls1_get_bitmap(SSL *s, SSL3_RECORD *rr, unsigned int *is_next_epoch)
+    {
+    
+    *is_next_epoch = 0;
+
+    /* In current epoch, accept HM, CCS, DATA, & ALERT */
+    if (rr->epoch == s->d1->r_epoch)
+        return &s->d1->bitmap;
+
+    /* Only HM and ALERT messages can be from the next epoch */
+    else if (rr->epoch == (unsigned long)(s->d1->r_epoch + 1) &&
+        (rr->type == SSL3_RT_HANDSHAKE ||
+            rr->type == SSL3_RT_ALERT))
+        {
+        *is_next_epoch = 1;
+        return &s->d1->next_bitmap;
+        }
+
+    return NULL;
+    }
+
+#if 0
+static int
+dtls1_record_needs_buffering(SSL *s, SSL3_RECORD *rr, unsigned short *priority,
+        unsigned long *offset)
+        {
+
+        /* alerts are passed up immediately */
+        if ( rr->type == SSL3_RT_APPLICATION_DATA ||
+                rr->type == SSL3_RT_ALERT)
+                return 0;
+
+        /* Only need to buffer if a handshake is underway.
+         * (this implies that Hello Request and Client Hello are passed up
+         * immediately) */
+        if ( SSL_in_init(s))
+                {
+                unsigned char *data = rr->data;
+                /* need to extract the HM/CCS sequence number here */
+                if ( rr->type == SSL3_RT_HANDSHAKE ||
+                        rr->type == SSL3_RT_CHANGE_CIPHER_SPEC)
+                        {
+                        unsigned short seq_num;
+                        struct hm_header_st msg_hdr;
+                        struct ccs_header_st ccs_hdr;
+
+                        if ( rr->type == SSL3_RT_HANDSHAKE)
+                                {
+                                dtls1_get_message_header(data, &msg_hdr);
+                                seq_num = msg_hdr.seq;
+                                *offset = msg_hdr.frag_off;
+                                }
+                        else
+                                {
+                                dtls1_get_ccs_header(data, &ccs_hdr);
+                                seq_num = ccs_hdr.seq;
+                                *offset = 0;
+                                }
+                                
+                        /* this is either a record we're waiting for, or a
+                         * retransmit of something we happened to previously 
+                         * receive (higher layers will drop the repeat silently */
+                        if ( seq_num < s->d1->handshake_read_seq)
+                                return 0;
+                        if (rr->type == SSL3_RT_HANDSHAKE && 
+                                seq_num == s->d1->handshake_read_seq &&
+                                msg_hdr.frag_off < s->d1->r_msg_hdr.frag_off)
+                                return 0;
+                        else if ( seq_num == s->d1->handshake_read_seq &&
+                                (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC ||
+                                        msg_hdr.frag_off == s->d1->r_msg_hdr.frag_off))
+                                return 0;
+                        else
+                                {
+                                *priority = seq_num;
+                                return 1;
+                                }
+                        }
+                else /* unknown record type */
+                        return 0;
+                }
+
+        return 0;
+        }
+#endif
+
+void
+dtls1_reset_seq_numbers(SSL *s, int rw)
+        {
+        unsigned char *seq;
+        unsigned int seq_bytes = sizeof(s->s3->read_sequence);
+
+        if ( rw & SSL3_CC_READ)
+                {
+                seq = s->s3->read_sequence;
+                s->d1->r_epoch++;
+
+                pq_64bit_assign(&(s->d1->bitmap.map), &(s->d1->next_bitmap.map));
+                s->d1->bitmap.length = s->d1->next_bitmap.length;
+                pq_64bit_assign(&(s->d1->bitmap.max_seq_num), 
+                        &(s->d1->next_bitmap.max_seq_num));
+
+                pq_64bit_free(&(s->d1->next_bitmap.map));
+                pq_64bit_free(&(s->d1->next_bitmap.max_seq_num));
+                memset(&(s->d1->next_bitmap), 0x00, sizeof(DTLS1_BITMAP));
+                pq_64bit_init(&(s->d1->next_bitmap.map));
+                pq_64bit_init(&(s->d1->next_bitmap.max_seq_num));
+                }
+        else
+                {
+                seq = s->s3->write_sequence;
+                s->d1->w_epoch++;
+                }
+
+        memset(seq, 0x00, seq_bytes);
+        }
+
+#if PQ_64BIT_IS_INTEGER
+static PQ_64BIT
+bytes_to_long_long(unsigned char *bytes, PQ_64BIT *num)
+       {
+       PQ_64BIT _num;
+
+       _num = (((PQ_64BIT)bytes[0]) << 56) |
+               (((PQ_64BIT)bytes[1]) << 48) |
+               (((PQ_64BIT)bytes[2]) << 40) |
+               (((PQ_64BIT)bytes[3]) << 32) |
+               (((PQ_64BIT)bytes[4]) << 24) |
+               (((PQ_64BIT)bytes[5]) << 16) |
+               (((PQ_64BIT)bytes[6]) <<  8) |
+               (((PQ_64BIT)bytes[7])      );
+
+           *num = _num ;
+       return _num;
+       }
+#endif
+
+
+static void
+dtls1_clear_timeouts(SSL *s)
+        {
+        memset(&(s->d1->timeout), 0x00, sizeof(struct dtls1_timeout_st));
+        }
diff --git a/src/lib/libssl/src/ssl/d1_srvr.c b/src/lib/libssl/src/ssl/d1_srvr.c
new file mode 100644
index 0000000000..927b01f3c4
--- /dev/null
+++ b/src/lib/libssl/src/ssl/d1_srvr.c
@@ -0,0 +1,1147 @@
+/* ssl/d1_srvr.c */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include "ssl_locl.h"
+#include <openssl/buffer.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/md5.h>
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
+#endif
+
+static SSL_METHOD *dtls1_get_server_method(int ver);
+static int dtls1_send_hello_verify_request(SSL *s);
+
+static SSL_METHOD *dtls1_get_server_method(int ver)
+        {
+        if (ver == DTLS1_VERSION)
+                return(DTLSv1_server_method());
+        else
+                return(NULL);
+        }
+
+IMPLEMENT_dtls1_meth_func(DTLSv1_server_method,
+                        dtls1_accept,
+                        ssl_undefined_function,
+                        dtls1_get_server_method)
+
+int dtls1_accept(SSL *s)
+        {
+        BUF_MEM *buf;
+        unsigned long l,Time=(unsigned long)time(NULL);
+        void (*cb)(const SSL *ssl,int type,int val)=NULL;
+        long num1;
+        int ret= -1;
+        int new_state,state,skip=0;
+
+        RAND_add(&Time,sizeof(Time),0);
+        ERR_clear_error();
+        clear_sys_error();
+
+        if (s->info_callback != NULL)
+                cb=s->info_callback;
+        else if (s->ctx->info_callback != NULL)
+                cb=s->ctx->info_callback;
+
+        /* init things to blank */
+        s->in_handshake++;
+        if (!SSL_in_init(s) || SSL_in_before(s)) SSL_clear(s);
+
+        if (s->cert == NULL)
+                {
+                SSLerr(SSL_F_DTLS1_ACCEPT,SSL_R_NO_CERTIFICATE_SET);
+                return(-1);
+                }
+
+        for (;;)
+                {
+                state=s->state;
+
+                switch (s->state)
+                        {
+                case SSL_ST_RENEGOTIATE:
+                        s->new_session=1;
+                        /* s->state=SSL_ST_ACCEPT; */
+
+                case SSL_ST_BEFORE:
+                case SSL_ST_ACCEPT:
+                case SSL_ST_BEFORE|SSL_ST_ACCEPT:
+                case SSL_ST_OK|SSL_ST_ACCEPT:
+
+                        s->server=1;
+                        if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_START,1);
+
+                        if ((s->version & 0xff00) != (DTLS1_VERSION & 0xff00))
+                                {
+                                SSLerr(SSL_F_DTLS1_ACCEPT, ERR_R_INTERNAL_ERROR);
+                                return -1;
+                                }
+                        s->type=SSL_ST_ACCEPT;
+
+                        if (s->init_buf == NULL)
+                                {
+                                if ((buf=BUF_MEM_new()) == NULL)
+                                        {
+                                        ret= -1;
+                                        goto end;
+                                        }
+                                if (!BUF_MEM_grow(buf,SSL3_RT_MAX_PLAIN_LENGTH))
+                                        {
+                                        ret= -1;
+                                        goto end;
+                                        }
+                                s->init_buf=buf;
+                                }
+
+                        if (!ssl3_setup_buffers(s))
+                                {
+                                ret= -1;
+                                goto end;
+                                }
+
+                        s->init_num=0;
+
+                        if (s->state != SSL_ST_RENEGOTIATE)
+                                {
+                                /* Ok, we now need to push on a buffering BIO so that
+                                 * the output is sent in a way that TCP likes :-)
+                                 */
+                                if (!ssl_init_wbio_buffer(s,1)) { ret= -1; goto end; }
+
+                                ssl3_init_finished_mac(s);
+                                s->state=SSL3_ST_SR_CLNT_HELLO_A;
+                                s->ctx->stats.sess_accept++;
+                                }
+                        else
+                                {
+                                /* s->state == SSL_ST_RENEGOTIATE,
+                                 * we will just send a HelloRequest */
+                                s->ctx->stats.sess_accept_renegotiate++;
+                                s->state=SSL3_ST_SW_HELLO_REQ_A;
+                                }
+
+            if ( (SSL_get_options(s) & SSL_OP_COOKIE_EXCHANGE))
+                s->d1->send_cookie = 1;
+            else
+                s->d1->send_cookie = 0;
+
+                        break;
+
+                case SSL3_ST_SW_HELLO_REQ_A:
+                case SSL3_ST_SW_HELLO_REQ_B:
+
+                        s->shutdown=0;
+                        ret=dtls1_send_hello_request(s);
+                        if (ret <= 0) goto end;
+                        s->s3->tmp.next_state=SSL3_ST_SW_HELLO_REQ_C;
+                        s->state=SSL3_ST_SW_FLUSH;
+                        s->init_num=0;
+
+                        ssl3_init_finished_mac(s);
+                        break;
+
+                case SSL3_ST_SW_HELLO_REQ_C:
+                        s->state=SSL_ST_OK;
+                        break;
+
+                case SSL3_ST_SR_CLNT_HELLO_A:
+                case SSL3_ST_SR_CLNT_HELLO_B:
+                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->d1->send_cookie)
+                                s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A;
+                        else
+                                s->state = SSL3_ST_SW_SRVR_HELLO_A;
+
+                        s->init_num=0;
+                        break;
+                        
+                case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A:
+                case DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B:
+
+                        ret = dtls1_send_hello_verify_request(s);
+                        if ( ret <= 0) goto end;
+                        s->d1->send_cookie = 0;
+                        s->state=SSL3_ST_SW_FLUSH;
+                        s->s3->tmp.next_state=SSL3_ST_SR_CLNT_HELLO_A;
+
+                        /* HelloVerifyRequests resets Finished MAC */
+                        if (s->client_version != DTLS1_BAD_VER)
+                                ssl3_init_finished_mac(s);
+                        break;
+                        
+                case SSL3_ST_SW_SRVR_HELLO_A:
+                case SSL3_ST_SW_SRVR_HELLO_B:
+                        ret=dtls1_send_server_hello(s);
+                        if (ret <= 0) goto end;
+
+                        if (s->hit)
+                                s->state=SSL3_ST_SW_CHANGE_A;
+                        else
+                                s->state=SSL3_ST_SW_CERT_A;
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_SW_CERT_A:
+                case SSL3_ST_SW_CERT_B:
+                        /* Check if it is anon DH */
+                        if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
+                                {
+                                ret=dtls1_send_server_certificate(s);
+                                if (ret <= 0) goto end;
+                                }
+                        else
+                                skip=1;
+                        s->state=SSL3_ST_SW_KEY_EXCH_A;
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_SW_KEY_EXCH_A:
+                case SSL3_ST_SW_KEY_EXCH_B:
+                        l=s->s3->tmp.new_cipher->algorithms;
+
+                        /* clear this, it may get reset by
+                         * send_server_key_exchange */
+                        if ((s->options & SSL_OP_EPHEMERAL_RSA)
+#ifndef OPENSSL_NO_KRB5
+                                && !(l & SSL_KRB5)
+#endif /* OPENSSL_NO_KRB5 */
+                                )
+                                /* option SSL_OP_EPHEMERAL_RSA sends temporary RSA key
+                                 * even when forbidden by protocol specs
+                                 * (handshake may fail as clients are not required to
+                                 * be able to handle this) */
+                                s->s3->tmp.use_rsa_tmp=1;
+                        else
+                                s->s3->tmp.use_rsa_tmp=0;
+
+                        /* only send if a DH key exchange, fortezza or
+                         * RSA but we have a sign only certificate */
+                        if (s->s3->tmp.use_rsa_tmp
+                            || (l & (SSL_DH|SSL_kFZA))
+                            || ((l & SSL_kRSA)
+                                && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
+                                    || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
+                                        && EVP_PKEY_size(s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey)*8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
+                                        )
+                                    )
+                                )
+                            )
+                                {
+                                ret=dtls1_send_server_key_exchange(s);
+                                if (ret <= 0) goto end;
+                                }
+                        else
+                                skip=1;
+
+                        s->state=SSL3_ST_SW_CERT_REQ_A;
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_SW_CERT_REQ_A:
+                case SSL3_ST_SW_CERT_REQ_B:
+                        if (/* don't request cert unless asked for it: */
+                                !(s->verify_mode & SSL_VERIFY_PEER) ||
+                                /* if SSL_VERIFY_CLIENT_ONCE is set,
+                                 * don't request cert during re-negotiation: */
+                                ((s->session->peer != NULL) &&
+                                 (s->verify_mode & SSL_VERIFY_CLIENT_ONCE)) ||
+                                /* never request cert in anonymous ciphersuites
+                                 * (see section "Certificate request" in SSL 3 drafts
+                                 * and in RFC 2246): */
+                                ((s->s3->tmp.new_cipher->algorithms & SSL_aNULL) &&
+                                 /* ... except when the application insists on verification
+                                  * (against the specs, but s3_clnt.c accepts this for SSL 3) */
+                                 !(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) ||
+                                 /* never request cert in Kerberos ciphersuites */
+                                (s->s3->tmp.new_cipher->algorithms & SSL_aKRB5))
+                                {
+                                /* no cert request */
+                                skip=1;
+                                s->s3->tmp.cert_request=0;
+                                s->state=SSL3_ST_SW_SRVR_DONE_A;
+                                }
+                        else
+                                {
+                                s->s3->tmp.cert_request=1;
+                                ret=dtls1_send_certificate_request(s);
+                                if (ret <= 0) goto end;
+#ifndef NETSCAPE_HANG_BUG
+                                s->state=SSL3_ST_SW_SRVR_DONE_A;
+#else
+                                s->state=SSL3_ST_SW_FLUSH;
+                                s->s3->tmp.next_state=SSL3_ST_SR_CERT_A;
+#endif
+                                s->init_num=0;
+                                }
+                        break;
+
+                case SSL3_ST_SW_SRVR_DONE_A:
+                case SSL3_ST_SW_SRVR_DONE_B:
+                        ret=dtls1_send_server_done(s);
+                        if (ret <= 0) goto end;
+                        s->s3->tmp.next_state=SSL3_ST_SR_CERT_A;
+                        s->state=SSL3_ST_SW_FLUSH;
+                        s->init_num=0;
+                        break;
+                
+                case SSL3_ST_SW_FLUSH:
+                        /* number of bytes to be flushed */
+                        num1=BIO_ctrl(s->wbio,BIO_CTRL_INFO,0,NULL);
+                        if (num1 > 0)
+                                {
+                                s->rwstate=SSL_WRITING;
+                                num1=BIO_flush(s->wbio);
+                                if (num1 <= 0) { ret= -1; goto end; }
+                                s->rwstate=SSL_NOTHING;
+                                }
+
+                        s->state=s->s3->tmp.next_state;
+                        break;
+
+                case SSL3_ST_SR_CERT_A:
+                case SSL3_ST_SR_CERT_B:
+                        /* Check for second client hello (MS SGC) */
+                        ret = ssl3_check_client_hello(s);
+                        if (ret <= 0)
+                                goto end;
+                        if (ret == 2)
+                                s->state = SSL3_ST_SR_CLNT_HELLO_C;
+                        else {
+                                /* could be sent for a DH cert, even if we
+                                 * have not asked for it :-) */
+                                ret=ssl3_get_client_certificate(s);
+                                if (ret <= 0) goto end;
+                                s->init_num=0;
+                                s->state=SSL3_ST_SR_KEY_EXCH_A;
+                        }
+                        break;
+
+                case SSL3_ST_SR_KEY_EXCH_A:
+                case SSL3_ST_SR_KEY_EXCH_B:
+                        ret=ssl3_get_client_key_exchange(s);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_SR_CERT_VRFY_A;
+                        s->init_num=0;
+
+                        /* We need to get hashes here so if there is
+                         * a client cert, it can be verified */ 
+                        s->method->ssl3_enc->cert_verify_mac(s,
+                                &(s->s3->finish_dgst1),
+                                &(s->s3->tmp.cert_verify_md[0]));
+                        s->method->ssl3_enc->cert_verify_mac(s,
+                                &(s->s3->finish_dgst2),
+                                &(s->s3->tmp.cert_verify_md[MD5_DIGEST_LENGTH]));
+
+                        break;
+
+                case SSL3_ST_SR_CERT_VRFY_A:
+                case SSL3_ST_SR_CERT_VRFY_B:
+
+                        /* we should decide if we expected this one */
+                        ret=ssl3_get_cert_verify(s);
+                        if (ret <= 0) goto end;
+
+                        s->state=SSL3_ST_SR_FINISHED_A;
+                        s->init_num=0;
+                        break;
+
+                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;
+                        if (s->hit)
+                                s->state=SSL_ST_OK;
+                        else
+                                s->state=SSL3_ST_SW_CHANGE_A;
+                        s->init_num=0;
+                        break;
+
+                case SSL3_ST_SW_CHANGE_A:
+                case SSL3_ST_SW_CHANGE_B:
+
+                        s->session->cipher=s->s3->tmp.new_cipher;
+                        if (!s->method->ssl3_enc->setup_key_block(s))
+                                { ret= -1; goto end; }
+
+                        ret=dtls1_send_change_cipher_spec(s,
+                                SSL3_ST_SW_CHANGE_A,SSL3_ST_SW_CHANGE_B);
+
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_SW_FINISHED_A;
+                        s->init_num=0;
+
+                        if (!s->method->ssl3_enc->change_cipher_state(s,
+                                SSL3_CHANGE_CIPHER_SERVER_WRITE))
+                                {
+                                ret= -1;
+                                goto end;
+                                }
+
+                        dtls1_reset_seq_numbers(s, SSL3_CC_WRITE);
+                        break;
+
+                case SSL3_ST_SW_FINISHED_A:
+                case SSL3_ST_SW_FINISHED_B:
+                        ret=dtls1_send_finished(s,
+                                SSL3_ST_SW_FINISHED_A,SSL3_ST_SW_FINISHED_B,
+                                s->method->ssl3_enc->server_finished_label,
+                                s->method->ssl3_enc->server_finished_label_len);
+                        if (ret <= 0) goto end;
+                        s->state=SSL3_ST_SW_FLUSH;
+                        if (s->hit)
+                                s->s3->tmp.next_state=SSL3_ST_SR_FINISHED_A;
+                        else
+                                s->s3->tmp.next_state=SSL_ST_OK;
+                        s->init_num=0;
+                        break;
+
+                case SSL_ST_OK:
+                        /* clean a few things up */
+                        ssl3_cleanup_key_block(s);
+
+#if 0
+                        BUF_MEM_free(s->init_buf);
+                        s->init_buf=NULL;
+#endif
+
+                        /* remove buffering on output */
+                        ssl_free_wbio_buffer(s);
+
+                        s->init_num=0;
+
+                        if (s->new_session == 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->new_session=0;
+                                
+                                ssl_update_cache(s,SSL_SESS_CACHE_SERVER);
+                                
+                                s->ctx->stats.sess_accept_good++;
+                                /* s->server=1; */
+                                s->handshake_func=dtls1_accept;
+
+                                if (cb != NULL) cb(s,SSL_CB_HANDSHAKE_DONE,1);
+                                }
+                        
+                        ret = 1;
+
+                        /* done handshaking, next message is client hello */
+                        s->d1->handshake_read_seq = 0;
+                        /* next message is server hello */
+                        s->d1->handshake_write_seq = 0;
+                        goto end;
+                        /* break; */
+
+                default:
+                        SSLerr(SSL_F_DTLS1_ACCEPT,SSL_R_UNKNOWN_STATE);
+                        ret= -1;
+                        goto end;
+                        /* break; */
+                        }
+                
+                if (!s->s3->tmp.reuse_message && !skip)
+                        {
+                        if (s->debug)
+                                {
+                                if ((ret=BIO_flush(s->wbio)) <= 0)
+                                        goto end;
+                                }
+
+
+                        if ((cb != NULL) && (s->state != state))
+                                {
+                                new_state=s->state;
+                                s->state=state;
+                                cb(s,SSL_CB_ACCEPT_LOOP,1);
+                                s->state=new_state;
+                                }
+                        }
+                skip=0;
+                }
+end:
+        /* BIO_flush(s->wbio); */
+
+        s->in_handshake--;
+        if (cb != NULL)
+                cb(s,SSL_CB_ACCEPT_EXIT,ret);
+        return(ret);
+        }
+
+int dtls1_send_hello_request(SSL *s)
+        {
+        unsigned char *p;
+
+        if (s->state == SSL3_ST_SW_HELLO_REQ_A)
+                {
+                p=(unsigned char *)s->init_buf->data;
+                p = dtls1_set_message_header(s, p, SSL3_MT_HELLO_REQUEST, 0, 0, 0);
+
+                s->state=SSL3_ST_SW_HELLO_REQ_B;
+                /* number of bytes to write */
+                s->init_num=DTLS1_HM_HEADER_LENGTH;
+                s->init_off=0;
+
+                /* no need to buffer this message, since there are no retransmit 
+                 * requests for it */
+                }
+
+        /* SSL3_ST_SW_HELLO_REQ_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+        }
+
+int dtls1_send_hello_verify_request(SSL *s)
+        {
+        unsigned int msg_len;
+        unsigned char *msg, *buf, *p;
+
+        if (s->state == DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A)
+                {
+                buf = (unsigned char *)s->init_buf->data;
+
+                msg = p = &(buf[DTLS1_HM_HEADER_LENGTH]);
+                if (s->client_version == DTLS1_BAD_VER)
+                        *(p++) = DTLS1_BAD_VER>>8,
+                        *(p++) = DTLS1_BAD_VER&0xff;
+                else
+                        *(p++) = s->version >> 8,
+                        *(p++) = s->version & 0xFF;
+
+                if (s->ctx->app_gen_cookie_cb != NULL &&
+                    s->ctx->app_gen_cookie_cb(s, s->d1->cookie, 
+                    &(s->d1->cookie_len)) == 0)
+                        {
+                        SSLerr(SSL_F_DTLS1_SEND_HELLO_VERIFY_REQUEST,ERR_R_INTERNAL_ERROR);
+                        return 0;
+                        }
+                /* else the cookie is assumed to have 
+                 * been initialized by the application */
+
+                *(p++) = (unsigned char) s->d1->cookie_len;
+                memcpy(p, s->d1->cookie, s->d1->cookie_len);
+                p += s->d1->cookie_len;
+                msg_len = p - msg;
+
+                dtls1_set_message_header(s, buf,
+                        DTLS1_MT_HELLO_VERIFY_REQUEST, msg_len, 0, msg_len);
+
+                s->state=DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B;
+                /* number of bytes to write */
+                s->init_num=p-buf;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+                }
+
+        /* s->state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+        }
+
+int dtls1_send_server_hello(SSL *s)
+        {
+        unsigned char *buf;
+        unsigned char *p,*d;
+        int i;
+        unsigned int sl;
+        unsigned long l,Time;
+
+        if (s->state == SSL3_ST_SW_SRVR_HELLO_A)
+                {
+                buf=(unsigned char *)s->init_buf->data;
+                p=s->s3->server_random;
+                Time=(unsigned long)time(NULL);                 /* Time */
+                l2n(Time,p);
+                RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE-sizeof(Time));
+                /* Do the message type and length last */
+                d=p= &(buf[DTLS1_HM_HEADER_LENGTH]);
+
+                if (s->client_version == DTLS1_BAD_VER)
+                        *(p++)=DTLS1_BAD_VER>>8,
+                        *(p++)=DTLS1_BAD_VER&0xff;
+                else
+                        *(p++)=s->version>>8,
+                        *(p++)=s->version&0xff;
+
+                /* Random stuff */
+                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.
+                 */
+                if (!(s->ctx->session_cache_mode & SSL_SESS_CACHE_SERVER))
+                        s->session->session_id_length=0;
+
+                sl=s->session->session_id_length;
+                if (sl > sizeof s->session->session_id)
+                        {
+                        SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
+                        return -1;
+                        }
+                *(p++)=sl;
+                memcpy(p,s->session->session_id,sl);
+                p+=sl;
+
+                /* put the cipher */
+                i=ssl3_put_cipher_by_char(s->s3->tmp.new_cipher,p);
+                p+=i;
+
+                /* put the compression method */
+#ifdef OPENSSL_NO_COMP
+                *(p++)=0;
+#else
+                if (s->s3->tmp.new_compression == NULL)
+                        *(p++)=0;
+                else
+                        *(p++)=s->s3->tmp.new_compression->id;
+#endif
+
+                /* do the header */
+                l=(p-d);
+                d=buf;
+
+                d = dtls1_set_message_header(s, d, SSL3_MT_SERVER_HELLO, l, 0, l);
+
+                s->state=SSL3_ST_CW_CLNT_HELLO_B;
+                /* number of bytes to write */
+                s->init_num=p-buf;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+                }
+
+        /* SSL3_ST_CW_CLNT_HELLO_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+        }
+
+int dtls1_send_server_done(SSL *s)
+        {
+        unsigned char *p;
+
+        if (s->state == SSL3_ST_SW_SRVR_DONE_A)
+                {
+                p=(unsigned char *)s->init_buf->data;
+
+                /* do the header */
+                p = dtls1_set_message_header(s, p, SSL3_MT_SERVER_DONE, 0, 0, 0);
+
+                s->state=SSL3_ST_SW_SRVR_DONE_B;
+                /* number of bytes to write */
+                s->init_num=DTLS1_HM_HEADER_LENGTH;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+                }
+
+        /* SSL3_ST_CW_CLNT_HELLO_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+        }
+
+int dtls1_send_server_key_exchange(SSL *s)
+        {
+#ifndef OPENSSL_NO_RSA
+        unsigned char *q;
+        int j,num;
+        RSA *rsa;
+        unsigned char md_buf[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH];
+        unsigned int u;
+#endif
+#ifndef OPENSSL_NO_DH
+        DH *dh=NULL,*dhp;
+#endif
+        EVP_PKEY *pkey;
+        unsigned char *p,*d;
+        int al,i;
+        unsigned long type;
+        int n;
+        CERT *cert;
+        BIGNUM *r[4];
+        int nr[4],kn;
+        BUF_MEM *buf;
+        EVP_MD_CTX md_ctx;
+
+        EVP_MD_CTX_init(&md_ctx);
+        if (s->state == SSL3_ST_SW_KEY_EXCH_A)
+                {
+                type=s->s3->tmp.new_cipher->algorithms & SSL_MKEY_MASK;
+                cert=s->cert;
+
+                buf=s->init_buf;
+
+                r[0]=r[1]=r[2]=r[3]=NULL;
+                n=0;
+#ifndef OPENSSL_NO_RSA
+                if (type & SSL_kRSA)
+                        {
+                        rsa=cert->rsa_tmp;
+                        if ((rsa == NULL) && (s->cert->rsa_tmp_cb != NULL))
+                                {
+                                rsa=s->cert->rsa_tmp_cb(s,
+                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                                if(rsa == NULL)
+                                {
+                                        al=SSL_AD_HANDSHAKE_FAILURE;
+                                        SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
+                                        goto f_err;
+                                }
+                                RSA_up_ref(rsa);
+                                cert->rsa_tmp=rsa;
+                                }
+                        if (rsa == NULL)
+                                {
+                                al=SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_KEY);
+                                goto f_err;
+                                }
+                        r[0]=rsa->n;
+                        r[1]=rsa->e;
+                        s->s3->tmp.use_rsa_tmp=1;
+                        }
+                else
+#endif
+#ifndef OPENSSL_NO_DH
+                        if (type & SSL_kEDH)
+                        {
+                        dhp=cert->dh_tmp;
+                        if ((dhp == NULL) && (s->cert->dh_tmp_cb != NULL))
+                                dhp=s->cert->dh_tmp_cb(s,
+                                      SSL_C_IS_EXPORT(s->s3->tmp.new_cipher),
+                                      SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher));
+                        if (dhp == NULL)
+                                {
+                                al=SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
+                                goto f_err;
+                                }
+
+                        if (s->s3->tmp.dh != NULL)
+                                {
+                                DH_free(dh);
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+                                goto err;
+                                }
+
+                        if ((dh=DHparams_dup(dhp)) == NULL)
+                                {
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                goto err;
+                                }
+
+                        s->s3->tmp.dh=dh;
+                        if ((dhp->pub_key == NULL ||
+                             dhp->priv_key == NULL ||
+                             (s->options & SSL_OP_SINGLE_DH_USE)))
+                                {
+                                if(!DH_generate_key(dh))
+                                    {
+                                    SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,
+                                           ERR_R_DH_LIB);
+                                    goto err;
+                                    }
+                                }
+                        else
+                                {
+                                dh->pub_key=BN_dup(dhp->pub_key);
+                                dh->priv_key=BN_dup(dhp->priv_key);
+                                if ((dh->pub_key == NULL) ||
+                                        (dh->priv_key == NULL))
+                                        {
+                                        SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
+                                        goto err;
+                                        }
+                                }
+                        r[0]=dh->p;
+                        r[1]=dh->g;
+                        r[2]=dh->pub_key;
+                        }
+                else 
+#endif
+                        {
+                        al=SSL_AD_HANDSHAKE_FAILURE;
+                        SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
+                        goto f_err;
+                        }
+                for (i=0; r[i] != NULL; i++)
+                        {
+                        nr[i]=BN_num_bytes(r[i]);
+                        n+=2+nr[i];
+                        }
+
+                if (!(s->s3->tmp.new_cipher->algorithms & SSL_aNULL))
+                        {
+                        if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher))
+                                == NULL)
+                                {
+                                al=SSL_AD_DECODE_ERROR;
+                                goto f_err;
+                                }
+                        kn=EVP_PKEY_size(pkey);
+                        }
+                else
+                        {
+                        pkey=NULL;
+                        kn=0;
+                        }
+
+                if (!BUF_MEM_grow_clean(buf,n+DTLS1_HM_HEADER_LENGTH+kn))
+                        {
+                        SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_BUF);
+                        goto err;
+                        }
+                d=(unsigned char *)s->init_buf->data;
+                p= &(d[DTLS1_HM_HEADER_LENGTH]);
+
+                for (i=0; r[i] != NULL; i++)
+                        {
+                        s2n(nr[i],p);
+                        BN_bn2bin(r[i],p);
+                        p+=nr[i];
+                        }
+
+                /* not anonymous */
+                if (pkey != NULL)
+                        {
+                        /* n is the length of the params, they start at
+                         * &(d[DTLS1_HM_HEADER_LENGTH]) and p points to the space
+                         * at the end. */
+#ifndef OPENSSL_NO_RSA
+                        if (pkey->type == EVP_PKEY_RSA)
+                                {
+                                q=md_buf;
+                                j=0;
+                                for (num=2; num > 0; num--)
+                                        {
+                                        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);
+                                        EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE);
+                                        EVP_DigestUpdate(&md_ctx,&(d[DTLS1_HM_HEADER_LENGTH]),n);
+                                        EVP_DigestFinal_ex(&md_ctx,q,
+                                                (unsigned int *)&i);
+                                        q+=i;
+                                        j+=i;
+                                        }
+                                if (RSA_sign(NID_md5_sha1, md_buf, j,
+                                        &(p[2]), &u, pkey->pkey.rsa) <= 0)
+                                        {
+                                        SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_RSA);
+                                        goto err;
+                                        }
+                                s2n(u,p);
+                                n+=u+2;
+                                }
+                        else
+#endif
+#if !defined(OPENSSL_NO_DSA)
+                                if (pkey->type == EVP_PKEY_DSA)
+                                {
+                                /* 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[DTLS1_HM_HEADER_LENGTH]),n);
+                                if (!EVP_SignFinal(&md_ctx,&(p[2]),
+                                        (unsigned int *)&i,pkey))
+                                        {
+                                        SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_DSA);
+                                        goto err;
+                                        }
+                                s2n(i,p);
+                                n+=i+2;
+                                }
+                        else
+#endif
+                                {
+                                /* Is this error check actually needed? */
+                                al=SSL_AD_HANDSHAKE_FAILURE;
+                                SSLerr(SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_PKEY_TYPE);
+                                goto f_err;
+                                }
+                        }
+
+                d = dtls1_set_message_header(s, d,
+                        SSL3_MT_SERVER_KEY_EXCHANGE, n, 0, n);
+
+                /* we should now have things packed up, so lets send
+                 * it off */
+                s->init_num=n+DTLS1_HM_HEADER_LENGTH;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+                }
+
+        s->state = SSL3_ST_SW_KEY_EXCH_B;
+        EVP_MD_CTX_cleanup(&md_ctx);
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+f_err:
+        ssl3_send_alert(s,SSL3_AL_FATAL,al);
+err:
+        EVP_MD_CTX_cleanup(&md_ctx);
+        return(-1);
+        }
+
+int dtls1_send_certificate_request(SSL *s)
+        {
+        unsigned char *p,*d;
+        int i,j,nl,off,n;
+        STACK_OF(X509_NAME) *sk=NULL;
+        X509_NAME *name;
+        BUF_MEM *buf;
+        unsigned int msg_len;
+
+        if (s->state == SSL3_ST_SW_CERT_REQ_A)
+                {
+                buf=s->init_buf;
+
+                d=p=(unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH]);
+
+                /* get the list of acceptable cert types */
+                p++;
+                n=ssl3_get_req_cert_type(s,p);
+                d[0]=n;
+                p+=n;
+                n++;
+
+                off=n;
+                p+=2;
+                n+=2;
+
+                sk=SSL_get_client_CA_list(s);
+                nl=0;
+                if (sk != NULL)
+                        {
+                        for (i=0; i<sk_X509_NAME_num(sk); i++)
+                                {
+                                name=sk_X509_NAME_value(sk,i);
+                                j=i2d_X509_NAME(name,NULL);
+                                if (!BUF_MEM_grow_clean(buf,DTLS1_HM_HEADER_LENGTH+n+j+2))
+                                        {
+                                        SSLerr(SSL_F_DTLS1_SEND_CERTIFICATE_REQUEST,ERR_R_BUF_LIB);
+                                        goto err;
+                                        }
+                                p=(unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH+n]);
+                                if (!(s->options & SSL_OP_NETSCAPE_CA_DN_BUG))
+                                        {
+                                        s2n(j,p);
+                                        i2d_X509_NAME(name,&p);
+                                        n+=2+j;
+                                        nl+=2+j;
+                                        }
+                                else
+                                        {
+                                        d=p;
+                                        i2d_X509_NAME(name,&p);
+                                        j-=2; s2n(j,d); j+=2;
+                                        n+=j;
+                                        nl+=j;
+                                        }
+                                }
+                        }
+                /* else no CA names */
+                p=(unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH+off]);
+                s2n(nl,p);
+
+                d=(unsigned char *)buf->data;
+                *(d++)=SSL3_MT_CERTIFICATE_REQUEST;
+                l2n3(n,d);
+                s2n(s->d1->handshake_write_seq,d);
+                s->d1->handshake_write_seq++;
+
+                /* we should now have things packed up, so lets send
+                 * it off */
+
+                s->init_num=n+DTLS1_HM_HEADER_LENGTH;
+                s->init_off=0;
+#ifdef NETSCAPE_HANG_BUG
+/* XXX: what to do about this? */
+                p=(unsigned char *)s->init_buf->data + s->init_num;
+
+                /* do the header */
+                *(p++)=SSL3_MT_SERVER_DONE;
+                *(p++)=0;
+                *(p++)=0;
+                *(p++)=0;
+                s->init_num += 4;
+#endif
+
+                /* XDTLS:  set message header ? */
+                msg_len = s->init_num - DTLS1_HM_HEADER_LENGTH;
+                dtls1_set_message_header(s, (void *)s->init_buf->data,
+                        SSL3_MT_CERTIFICATE_REQUEST, msg_len, 0, msg_len);
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+
+                s->state = SSL3_ST_SW_CERT_REQ_B;
+                }
+
+        /* SSL3_ST_SW_CERT_REQ_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+err:
+        return(-1);
+        }
+
+int dtls1_send_server_certificate(SSL *s)
+        {
+        unsigned long l;
+        X509 *x;
+
+        if (s->state == SSL3_ST_SW_CERT_A)
+                {
+                x=ssl_get_server_send_cert(s);
+                if (x == NULL &&
+                        /* VRS: allow null cert if auth == KRB5 */
+                        (s->s3->tmp.new_cipher->algorithms
+                                & (SSL_MKEY_MASK|SSL_AUTH_MASK))
+                        != (SSL_aKRB5|SSL_kKRB5))
+                        {
+                        SSLerr(SSL_F_DTLS1_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR);
+                        return(0);
+                        }
+
+                l=dtls1_output_cert_chain(s,x);
+                s->state=SSL3_ST_SW_CERT_B;
+                s->init_num=(int)l;
+                s->init_off=0;
+
+                /* buffer the message to handle re-xmits */
+                dtls1_buffer_message(s, 0);
+                }
+
+        /* SSL3_ST_SW_CERT_B */
+        return(dtls1_do_write(s,SSL3_RT_HANDSHAKE));
+        }
diff --git a/src/lib/libssl/src/ssl/dtls1.h b/src/lib/libssl/src/ssl/dtls1.h
new file mode 100644
index 0000000000..a663cf85f2
--- /dev/null
+++ b/src/lib/libssl/src/ssl/dtls1.h
@@ -0,0 +1,211 @@
+/* ssl/dtls1.h */
+/* 
+ * DTLS implementation written by Nagendra Modadugu
+ * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.  
+ */
+/* ====================================================================
+ * Copyright (c) 1999-2005 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+#ifndef HEADER_DTLS1_H 
+#define HEADER_DTLS1_H 
+
+#include <openssl/buffer.h>
+#include <openssl/pqueue.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define DTLS1_VERSION                   0xFEFF
+#define DTLS1_BAD_VER                   0x0100
+
+#define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE    110
+
+/* lengths of messages */
+#define DTLS1_COOKIE_LENGTH                     32
+
+#define DTLS1_RT_HEADER_LENGTH                  13
+
+#define DTLS1_HM_HEADER_LENGTH                  12
+
+#define DTLS1_HM_BAD_FRAGMENT                   -2
+#define DTLS1_HM_FRAGMENT_RETRY                 -3
+
+#define DTLS1_CCS_HEADER_LENGTH                  1
+
+#define DTLS1_AL_HEADER_LENGTH                   7
+
+
+typedef struct dtls1_bitmap_st
+        {
+        PQ_64BIT map;
+        unsigned long length;     /* sizeof the bitmap in bits */
+        PQ_64BIT max_seq_num;  /* max record number seen so far */
+        } DTLS1_BITMAP;
+
+struct hm_header_st
+        {
+        unsigned char type;
+        unsigned long msg_len;
+        unsigned short seq;
+        unsigned long frag_off;
+        unsigned long frag_len;
+        unsigned int is_ccs;
+        };
+
+struct ccs_header_st
+        {
+        unsigned char type;
+        unsigned short seq;
+        };
+
+struct dtls1_timeout_st
+        {
+        /* Number of read timeouts so far */
+        unsigned int read_timeouts;
+        
+        /* Number of write timeouts so far */
+        unsigned int write_timeouts;
+        
+        /* Number of alerts received so far */
+        unsigned int num_alerts;
+        };
+
+typedef struct record_pqueue_st
+        {
+        unsigned short epoch;
+        pqueue q;
+        } record_pqueue;
+
+typedef struct hm_fragment_st
+        {
+        struct hm_header_st msg_header;
+        unsigned char *fragment;
+        } hm_fragment;
+
+typedef struct dtls1_state_st
+        {
+        unsigned int send_cookie;
+        unsigned char cookie[DTLS1_COOKIE_LENGTH];
+        unsigned char rcvd_cookie[DTLS1_COOKIE_LENGTH];
+        unsigned int cookie_len;
+
+        /* 
+         * The current data and handshake epoch.  This is initially
+         * undefined, and starts at zero once the initial handshake is
+         * completed 
+         */
+        unsigned short r_epoch;
+        unsigned short w_epoch;
+
+        /* records being received in the current epoch */
+        DTLS1_BITMAP bitmap;
+
+        /* renegotiation starts a new set of sequence numbers */
+        DTLS1_BITMAP next_bitmap;
+
+        /* handshake message numbers */
+        unsigned short handshake_write_seq;
+        unsigned short next_handshake_write_seq;
+
+        unsigned short handshake_read_seq;
+
+        /* Received handshake records (processed and unprocessed) */
+        record_pqueue unprocessed_rcds;
+        record_pqueue processed_rcds;
+
+        /* Buffered handshake messages */
+        pqueue buffered_messages;
+
+        /* Buffered (sent) handshake records */
+        pqueue sent_messages;
+
+        unsigned int mtu; /* max wire packet size */
+
+        struct hm_header_st w_msg_hdr;
+        struct hm_header_st r_msg_hdr;
+
+        struct dtls1_timeout_st timeout;
+        
+        /* storage for Alert/Handshake protocol data received but not
+         * yet processed by ssl3_read_bytes: */
+        unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
+        unsigned int alert_fragment_len;
+        unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
+        unsigned int handshake_fragment_len;
+
+        unsigned int retransmitting;
+
+        } DTLS1_STATE;
+
+typedef struct dtls1_record_data_st
+        {
+        unsigned char *packet;
+        unsigned int   packet_length;
+        SSL3_BUFFER    rbuf;
+        SSL3_RECORD    rrec;
+        } DTLS1_RECORD_DATA;
+
+
+/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */
+#define DTLS1_TMO_READ_COUNT                      2
+#define DTLS1_TMO_WRITE_COUNT                     2
+
+#define DTLS1_TMO_ALERT_COUNT                     12
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
+
diff --git a/src/lib/libssl/src/test/SHAmix.fax b/src/lib/libssl/src/test/SHAmix.fax
deleted file mode 100644
index 83bcb14126..0000000000
--- a/src/lib/libssl/src/test/SHAmix.fax
+++ /dev/null
@@ -1,129 +0,0 @@
-[L = 64]
-
-Len = 16
-Msg = 98a1
-MD = 74d78642f70ca830bec75fc60a585917e388cfa4cd1d23daab1c4d9ff1010cac3e67275df64db5a6a7c7d0fda24f1fc3eb272678a7c8becff6743ee812129078
-
-Len = 104
-Msg = 35a37a46df4ccbadd815942249
-MD = 6f5589ea195e745654885d50de687d7fe682affc8da1fb09e681540525f04ecb93022361a27759b9e272c883564223c5e4ecafeb0daaf1abce6caa4bd4153379
-
-Len = 352
-Msg = a93aed0fa5e163a82c9a934aebaab8180edf7de0b32f0fe99f9c75ec305b24609334cefa372c7c758262dc8f
-MD = 66a16799d606c569d2fcd70d7d8321ec90ef61711481aaf7d747744ebfd08ec2e7aead49429af7b4ceec6d8e147ed018e034efbe07982699e818db5fc4b1d71a
-
-Len = 1016
-Msg = 433e88eb2f8aba562d15c18126fbdffb81d5d6c9397fa052321f5f78cd629708ba099b540da5451e949eeab8687a8d6ac35c531411cb37144ab5ff6a7eb46f1ab28fbcd2ea0444cd87c57bf7d3c02952dba3d3987da07622c16e7c086d90e88ad3d9d4afee301d2bad915d868f54197b70b23c9fa385c443404fbc9abf7e6a
-MD = 790bc4844e9aeef8938df0ccda17890556a4151817111a526a88919cfb172f0b03c216080c1b60210eb1942097f17b6d0691bf5b018b6d959198d6a694b922c9
-
-Len = 13696
-Msg = 2c46a76a9dfbae1f5e59f085e9c3d4b600c24b2d404d062cf948e75a3d4ab5b137a31397be9eb34b2a03c78367e0b85448891b511ddee1f787cccd498b172cb7e656c044a03ffde8e42478330fbe9c34072a9e99ce31b41757cc820d98e7d564e06694b96b66f4be34c5eadd0ae4e61fe6abbe4d7ccee855104fedee8b451a7fcedb793d469b0094c0ed07c97fda00dd8c1662b44e3ee6775a5ef6368cb662d257be561a5967893433a4b63f97295036a37272176d081545df00852bc5c4162324161296cd51f76433f2df867a5840f2d0c8d5be00b4dc89443d82175bf69c3bdceb97facae2b2ed68e06ae74fef36d8bd1f75f130cba509341dd54079d45de22845cc8e77a022977c7540aa3e779cb1127f39f825d4d78e55a967ef45e7c1dfb02d9999fd15af2914ba47177177d94576f1091a0657d9e04fe81e6be7b631fc1baae66584c9c26ddbb568750d77555c927bcda1fbdc15c7cbe3e3fe88ca13ff12c59b383343c12976708c0e3dff78be0e286dd32eecf20b71a09fee50a9d0b13c85a15b320b162690f399282798aa3291fdd2f9c40ed873e829388466ddd1da42f2de16aaa9272ccf44790cf3c95382c304e25ae8cb2fc9d9869808f3ee7d42cb143bb0c3a55e03db6d1202ca1bdb744e448640c0aa60d3ebbda5c21e623bb080f4a073a48822725d764e51d415aad1d7c5a7f17433d15ac7d849f910c375ee0899f6a576dada42fd651343383f286009902bb62deeeb2514de6af7f09892c20d0b238f6021f03b62444b1e1f21beeb89acfcd7136416fe7bd8f202e76afaf5345311798be7cb25351add2bb044d2380221009c4d1cbbaba4cdc8631dc0144f2778a6aa1eb3d3c81df0b1b2142fce111af8214d049e40f536c5d462b9224a978e82cc6c420e70ecc3cdaffb726a183c793845315f730fa4dac9fe46e4180397107a6a051f7f0a58ceb9bf4df37e1a81c8e9569187228e8037df2e59c52ba815566768bedc8e09d5e7bdc9f2bff23aaaaf133bb5a3332750f6124ce185e29fda0851addfa2c3d52bb6dfb530fd4ee27dd5bfdce5dc2f41debe6740274bc651aecd4023b098a7d622e2296b50d51b79c4e3f521695a9d43f038e8f273405e26584d3db179e7c1758114a3d39970df674580bbf2884405974f0b9c4b0d8b3287a2314f3f81b6991812f354d655f62513c9551b378cc2efa4c3e08b313c56cada52217fb6112eb8299b28445aca8f72e7170a1cd8bbfee4d2145fbe8d49c6af8831c4d4fc7177a50ee55a7b484261504af946c6bd5e1d6b89092f3c487c0568fa07c356fae9b8e831b8320289039746a435b122cfbc4a0d316bf90d481d3b7d979cc50d98c1190af8dc58e0035557dd5e94f437f41fab513202643a77748f76c6b77302bf40c392cd18731da082c99bdedeb70e15cd68bff59619cabcc92adcf122753c55afde0817352bc247d1170b8ddba1ad1b0faadfe0efbfc5fe6334377fa372c3435691f53dfc2ad5e08966b2d3525b1eec2d993a5cd4ff34278bd40dd80313a0727d05e0a932156152f3e11a190d8d69726f5c57d20f811e1e8932e86409ffdac96c6251c2a2976b8757adcac5d2de94931d1cbea866ec8bcba5774f8a7fde792f6acfd0f01356fd66fdf54a416af6a9397e00f848a2e9831627cbcbb52b5a868ec174e69b4cfa1ed72cdf23f39d7eaf4bdb318c188b1f0fe75655e34ad71907cdb77a1a2b162cd7c22d93dc45321eafb17cd60282e83736267b3e1fb249c307d49509f50839942f0f493afd9ef37db053a918e3ec83d801bbdead07554a018b8ba348fe9b7dd92ea7c5fc0e65a644ba19aa1fb6c022ab768ec7cb249ba17b9dda2860bd4aaaa3dc70ec009804141ad5ebc61203658e57a0887ec0fded18d844a96e79ba7e879c4253056f23e205a80ab1471953438f85848f4ab31ab175c089e0bbb97ea0dd6a67385770356741966053735e2cc2ecdd2c8c75cc045181dd7267584b901674b553082b2c58fb8f8be0b99306194a6f069f684535423304d40a268d55784a14260fa9c9cb1306b82f91cbee3c9f43dea9e50903135cc1c6505605a100bfa28564a2057974eef0852b7b72ce264815026d0759f691db618ef760edde73ec888e181403834f7221bb27a69479ec9b28a3fb0c3f68d4467d25712fc48ad78763f9ea6e8a2e85260225ca1b1a38b720e589fafca29f07257c5467cb74ee53189b8c81b784c43e93f98abde1ed53af60b27b13df6ce45001c6e1813de3521028981086f7d88ba13f6fb1a800f312fbe2f842eebe847fd760c394668cfbfd353ec14ca0366eccd7b4cd63318116bdc42e20a632a0d2b8c5cddb37bfc0a239ebe3800a787d2ece077a7968036b3d9b31cd906f888e3ed742cd769033e2c24c5a9e3c10b6d300db5a17dd88
-MD = a86e07bcd19080d4a83e1384bd8189f60a7dd7a6998406ade0bf03f805375bd823c7656dd51cd9d63e542f8ade41f16d73794d60d0906424133778156ee54b95
-
-Len = 100816
-Msg = f8ed40e878dc68ceec52cc8e2868722310fb117ca3a52e1839eb85d308b8aa00ed0bf0b76aec8a70eba4f0d14d2d85c5a0e876ce2c8ee59cb36947def6c40a587aa07b368ca8e8a08367018e45b984de0d7f1aa46b977cc18c0cd9b7bb897cbb2814aa0ce8f8c9843e03c86c19f2ba95dd2ac4a466a93aae4b3b05055ff148517ecf43e286c57744a3e10a14d0c26e139a503e7927aa688c78609170ebe3b54104390e5f6cf538093a67922e7210e77fcb584ec9b6844e829be246a266460cb442bad52ca47255fb8cfe276108c36e02f9acbd3d191d34b93d29ec40d80496d1c1bb5ef036221641200e905598c54bc4abb3527c5a5f6258e59d4bf54a0498c108a2725428efc2047e0096b32dfdc6ec69d5d72f81301f881ca62a66c22e5dab9fd9d90084c0a36b2f3a0123cc5327a3bc7a12fd947ab57169ac533e4b6a2cb80fc65b9b527cff9fba26994c7fafb5102a0acd8f9d246a3a54178c23eaa04c0fdfd3c0cd980d1fc7a72b25d74df9b95c3dedce8ca316870c654f9ebea9b806da9767cf40605a4b0c7fb06f6b3f197bae7d8cde9daf38530e25bc51b68f9aa23ec0e95199b14bca96c91f3db15bf8432f714dc46ac87218691bc66cb3a42f6865e1c30f8394c8e68c0ddf5851ab7c5906a1994a9af6ac1c44d0d6b95ff15d9f77825ccea40fb9e516d45888f2378e045d95d936d541cea9c8ca52fe5f7d0d919b2b1c59a42d06105ea4f2943c05178e59d67351c5b2c0051c93a4045e512884fa656b772cf398af89081546d920fd3d24ebd16310506a786ab33293027394c1bcb7b1efe46b550ac28529646e8d2a5ae65c59345e24b44cd7b06673f3ed3b9008aa568a739c26682fa596b7a655842cc6b2758b583487c78d14a76bdac7033806c5c210828ef313f8efc4072681f5fded748c31a58ac933b4665c445f07d603e0905e49b84aa55146eb1c1c99196413832a05efee2e64d6732fefc629b79b37bb9390fcbed7226b412204bda523b8b8af5c4a8bdb263ef9f3f6c7b9e1de3a1dc257c1f33b3d54a9101be5b4f2a9db319993c2cd137c41e35c434ce52e859afd1a635af4d8852252dc5e28c729b2b4c96a56d57f3f3854ded59fe612b9b3a51fee3fc1c83db673b0cc7433bff2472bc74a2eeb6706605e308690fd072a7042ca6474603711d8310909e47063f46f287260a26c4f11fe492298a0f98d28c45948a4899e08fcf443a6ba36457dd8329314d53ac0fd0819fcfc3357426c5bb8d3dfd706e205a81091cf08f31cd3459854f3d07e503991ba5f067e3c406c6c5396d8257496f4ba3703cb1ba25c2fe4aa54577af782cd57e85a88a2d75c54039e8b7bb559219edd6e81e41acb6d575d6f798afb2cbf7f00abd5c9c7b0fceec79f9a0fb040ebcbb7bff3602df7b71357efacd37aa57019350bb81213508a006160acde3dae5c42f03141887eaca22d7b33d6791febfb619d11ebabb13e6c5378e9a72e852ddccd31cc53a43275966b7042ddc51485ca20e1c456dcc7020cafb5407548b044d332229911fc74d7fb97de25abff7efb431da82de2ed7e25d0dcc06ffc74e57ca93a6a9f64d76a5c39776fe2266f88d6d0229b527525fd2e22a1407e26f94c5bc6adb1e7327f3c8bb8d4c983385c579dd8f5623df8cd6da569c7de73d9210e6b9253a177653a13ece075940fc81016d8c35fa4f6542df5120c174158ff32533476f4e059e35117081a24798fbdd1eb10f82809836f8dbefe755611347f75423dd8571695960c6f66cca71f0a01e8fecbe1183bee3335eff10b4ff8104132040e2145ec3164b2448f60c730887b9d7894e5f7df3f876cb17136c99cf32db1c02fba860937378dbd093c4c5112133781f06c8ca07c527c2c085e8ba5e52b399f2909e217aef6e3035ecafe2caeb1004069dea023af7eab873deb5ebcef2313c9827821bb9f89fd3d1570a569673d3ede86a4fb13dff242eb98450a8917fd8865c56e0a9f11d72394b79808b0429f3a83cf2465161596887fa2d557b367a1de9c7753666b0cca9c30cba9f0a749c03c55cdc7a6d45852c76ce2010de3e7f75d95228efdc79949b238d90b25f983868b7f07f585f7b00e45d9e132f3c09ee84f794d899759be3dabd46a256f4cf8da71270617cc2425b24cef25d1d2f3945afa6f81abfccc858cd02e05619649b1a5347650934105c02622d538447223d136a8a0455cf3c6f61f696b32266197b5cd1d936fd3ad4288520fb4a2f59bf95e659f33210446ef18debeb679dd99de0c3c74a6eb3dd783861f5db4e94a151c42ce27519d0bbbf1f3b1163563ec06c8bfd881d94a3b896fc07352fc97ada73685588a2242da1b718f81bb1077bc70fbd58b8b52163489ae403838b533851bec30ed0ecd97d72d1af534f3703db59f1f563bdc39d690a0e90e545506463a37e84974fd7b256bbb912cb4077d3e3f5bdd4bd2bab713b696c830b1f2185734c4d2dbd49d5372fe8b813ce73f5e01c36bddbb376ef4541033f2b0355613eeda8951ebf7377e08f967902eb7e23c0fa798c6ae52401721053f1095cacb1e9496500e83c412236fc21566090b3a3eee55aa402c0b774802fd81c9e8579761cfcfdfb1aa23786b2dc35dacd5ca8d8d283369f53e4a5db18060c2c6b0c303052aeeffe169fcaf7ecc63090a9ade245045ab9c8aebf738772297caaef5f857322a597846c7370083d409df27612e47b0cb240daa3cfa51c57108612ac0dddb0f59791289ccbdb3a2cb1fa9ac31a23dd5440682fb373bf0c1f41c4fe2185ad7c53eb69552807410053b0c2d40132250e637b8c425e6a35d93333b5b7d0557927b6179c848ec455fd1ab38348c0e96c60b2da49bd15118df64b6ce4fa48fbc555a4b2874141718e731a40b85382ae6e86ead31cea77f83bf5c063bf1febf71688a832d615e09d6f14badedeaeb6ffbfe343fc7274e78cd46a2aaec0a349c5f133291ee57cdcb65c5474e46294de6bb50886bce6c6f44dcb95f2a4761ed2e6c9e7bfed51e0964afab4e0f7e0b07960f2590baae66b1ec9a63ba0fb6c0d27e81508c51487dbbdc9beb8879fd58c188dfc774b3d0ddbd77ee8bdcdfa0ed8a9387728e12b13e8b3c10cc1c132bd822c2147c5ddf9a993aedbf78ec256db1be76644ca8ca7727208bf89732657152d34e948d73c47561d156f773136684d4162d02260300020123d13a95f4f835907c344942ddeccafe2abb7dc4792c4f1e39c24748c63cba933b16be0b8853e058c47a1ae2c4dfff39ec2339b345fe3557d03c1df91a0607a711636c4416ffdb73532aeeb74f237ed8bf971388a0659e4682a46b8327e751034cbf2c87c7828da9d24baf07a742ada34d1ef38ab1e8f2b4f801192c146600709533e61bc2665dc1e9e6441bf3c4f6643bc0c102a10f9a69da5b0e3d0a0c7cb694c682493032b5853f02953b5c2fc0e1348565389762fc2dcfbb34fd305f2d9df080e859396ffcbb7da78aae0a0d72e3de76c774bc6a81c87f2872b6afe97ced5269009304a4992c4add0bbe24e57632e19ad0fe37ae910193aab0aeae32cf6d618ab33eba59f6a04fad00b1d2403396e6fa661d31b695a1b349d62f56c08fe6c6eae7a482177adf341e51d03ea511d7959c721bd20bf371860ecd7fce1d25212891850b85648db0a039e6638d9c78bc958add3e41341536b5007be63fd1f7e3308876bcebcb97dc3b05a7b2eaadd00f8fcc8dcfa7b961bbe727c9aed1626ff786d6a0ffdbd1002cae8a7d047b6181962a686c152b2341c7c58c9f1dab5af424d183ed1c7d003165a1d04ea3683ff31a0f68615af6f91c21f736e67df641ed31b998445afadf9052bbe004d5dad08f62e5d353e42fc35a92242d8414d99dc4e7e81c8c027af686baa5c185e3f99abb3855b22cfdff0a62e2f47a632b7df8e00e0317af5c24ce7c64077bbb15ec27e062070cd3eb8e549ed9112469090ad9a96eb59294b021eed81987178cb2dcff67a9a2e930f6032c753e203380f8a7c987cea393234699de03a1d09ce204f0a8b6d5cf522b6887174fdbccb08f3e7c4fe2f778254465b32766c48812a45151ac37ae354dac87419f9476baa27e24b2f322b2da4ddf579750684a5881bae2269351fb7de59b9d5a4badd8951135f2713dafc57215dc626ee170fae7f20bff98e36b864e1fe0f0f9a300c903069bf0e0b6f2f8e78423cf6063e89dde6c81efcf26ef15510563c84730f611ac879a6628e55115e1a29de6945d37fbe4f803fcf2e344712d9e0d6f6c79f8773a9f199b705235e20a7830ee3357c5dca29d7a6c29a3d2628bf2c42c8f076cc4525301d8e1860729070dc53164d9fa08bf63cc889eed01b0130a7146d860bbc09ead3865a3082db0836a45f5506c3e46e452e298764939226cedfd06700e4e33c6b4a78add601140249596831e97f960b973a4e4dc3fe2813fa34eb47f998ce57270368fb81719a09298a223f7e3931ce5cdfab3f658649533354e982c87dc9e49eacebb5bb4af9a767b4f1c03d774431168cd4fec1b2726f1aae3f9a062a825f3295557eebf3af4784487b869fb049de44d03fee71194fc200af72103b157431935b5ab9bc122773ffd313d52d7acf1078386090fc011de695e71567cfd51c06317d4ff8841ceeb74ad35f4e5f4d20921123cb88bb2079674ad39e133cdfd6478d69c9bddc7a818be5d7b254bd9e0abdb030f52846fdfeae8ff370a51a9c5f6017af3c6c3db17c5c614ea18ab0e3ca0dd5de621217dffa36e5c5318fe191040a50cc3ca620683bc34da6c142e1c50afce28a86b8b66d189adcd755561a647080d93f3ede1cf54c3afb7e863fc8a82a2576d3f79e9b2bb634e598507a3d7d017e0176b7868bff3a3dfb4474b3ce03c401f33929364e727fbf8096b77eb351435c7a113b3215cc6246dd86f1517a7e550cf828900248f7c1754e40fed62477b296a37d3e53231360d012c4908b466e49b0e620c0a5031228009f259b030956ebd70e49357c3c3ac2842b6bd6e3ca5a3e985dc03f7105681fec03b320a7ca753b782ad3b52fd9c8e3bd980b48dd6ec8901dbf756108e85015821c880416e0693e0479cb31c0743450f6d9214afabc4feadb9bcee9def460a58d3a02d9e3039970068b8e3fd0a403a6ca7f2c71ae2b46ab3c731b1e65e2104c47fcb1f69e7c8c6df8c09b33f2e1cd4192faab316a44536dcac608832019f5765cc5240eabe3c87445c980c299a5e7ae0acc2c2ed19fdc8f011515bcb00476b03633c7669db1b44f97f6cd402778e9687c740dbe5686789b79d0b13f784a2a866eb91ab2d66f064c49e8df513ec348fd7272ee548ba08e1f9f99696ffb53677550d59c67f88404f6e610455a422d9cd987493ca5c366a397dccface2bba8e3e99719dafa768956cbf6fd8defc4104b8925878716a0514f70cbf3fa2c2bc2f66fabe654eed3076257e71117665703eb88c79e4c2b94e8e856e7a6ef90ee2a358409db78b98056ce1750eb80725d70e35507fdfa5933a61496ba48fbd5555717b33b59d4ef211fe096aefd478859ffc97a41372023ef114adcae5a8d5e03c21369baf1e7f417cb40326bc6db1cdf0904651dda3c1039a2f1755e7c329f7c03bf33f324206ce6e1638711c8c9a45f153aa1f847cca2a5d3af1d24fe7a1e1094819e8e712cbe10ead1012b7371b35cbcc2bd5b10505fb63bea20ac81d25e83ed0105e7595b6c28400f4d336791ce4a584323d0b455bbed44392c5f86c9d5287593f6986d4b0b8f9974a7a4157859ba801251d3b44b2bad84f29cb87dcf1680d6d10d1bfd59f0c95fb7bd07fdb3ea2fccd6e3ee80af438956ccfe31e750972f893ea5dcaa26d077fb3f09d990c2f41c8707368bba007803621ecd76540cdb8705435d74f4300eee04710a936f241c034709e625b0dd5dae1f6e86d034426819c365a05f5be420cdf4042bbff965a666a5756f67259448ebf742b6ea189fa17a4c3bfaf651d19a8a525f09d9cff637c8fac02eaa58d3ee3f7221da1e61833c0b183cd9f47686f09597e8115b435454acef80c079eafaa22b18927d07bf8b7c5ebfdec9c42a52b7824d45decef41e6184dc2db1505ca6f94172fafc10731706e79b9856dfede353d2eadeceaf72a302e3492d7dc81e3777e4e9e1f3d33cc4402833ffedb241a75a09e9495d671f80ad3acf06823bb04a92b815edd0ca7d01dcb3318c1ae5c62d3e99c0ec37908b45b51dd65f6b45b34ede2d6f553f60a45e20fafcb34ae4dbd375f52a5db9c62650deeee78e955087c2bea75ede7c304347b171fe0c1a2a033894be6e04605271307f307b2a9cf6ae24b8c87ce033a3fa4cf2bacdfcf54fcccb1f580476c7d00c631a8529a9eea2a713610341e0e25609dc8927e51c58a0a9197a54963b5cb95877354f4b8316df02ed2bea367704a12274d96bcbe0d0d728923a368bb8ab98d5db5401894c822632308ddfd309071fb4b477d8eac0ea5dbbc3e3606d8510d9051dfb5e4b7cdcf2c57c1b76902d864c3109c901da53019ed33cea84b407490486ad9f980a8a63df3d2e3921064afea137f35179130db3351f5bc3f5e7d590a5ab08b5415efbd345f9d57b71ade7dca939efa5a12d677b9af0af14468176a43712bde10cb15787c18bf066eaef8abcdea77d3a0c61d6c74ae7b54fe90940d0233e4b874c9a141dcc740d7fff43b9fbbc012a933d890232cf74fccb7ff7eac1148e203c7381b7f1d1429b1b1152ec25cbf7562596eb402a9328e43b5dc5cae36592da5523f0b9907a6817ecd395a7c778daae85bb11372b20641a04250b77b3a0ece885d07faf9622650259b874536d6d2b92181c834dc111b6fcba483167be40ecc922fb87006f63b9e8e632879563f37a8f712db9fa68c1a20ab239c0116fe022fad1279f3288b8e74a16d447e467b6381515814dd3aecab5c2a09c400b44e9100c04c720dc7e8c6d9460002da6c52004c16999975fef8752c2f9c229cbd9e6446b226cc454bd68cd665668a17328bb30f301e92ef5c7a2197a326df5c99b422096de8af231d1d8872e6e505bcfff026d4862f28d4bb3856a66ced22c9b0587451d8da4230a38561b5b1c69b523a4701a2001382aa82fcbd60733a14696a540227db44aef346d6c0a7ae5173604d59eb828614cafc1b8cfecda054dcc7306f73925e6d1af56ed74c51c6cdb66e9fee8d7a0078254fedb0c0f5dc85a4686870709b499eafbc8451aebadf848b0598ce8f955688bd2d6032abe10d1391d67c20a049841f95d2ee0c8deae2bc1baca0c098d8718cba1ddcd968981c47cd98d247aca4f838f3bf16d092eab8be8deb1f8d504d37cc44a8c96c9f22f2698036d4ad3bb48b31f109626565c147d20a4a7dfd61fb918f81548fb4f78875c1d138e819f6822651b93a3c92ad77793fba5222d870ea671f9cac967919d18f96e92778548415b2e170d90b201215354fc48a77e62823a2c2bb354782ad052732f08beb278f751529416f37d83ea26248517ae2ef2ead28c1077908995a2d25db0deaa957bcab39715283287fd626ea7388abccba2d90e364a7ff4284c84f70da68ce1aafb5be0401cb9d45e085aab41892a49e10cbd5baf2c34f5e0ca076f2772abea6f622b66020d546f8c2f134a87f96edbeb9b08394b585f2c2f98aa792f97b43b5f3aa9c34189804a9ecc2cfaeefbd0f967d85a25bf3136fd8132dec38aa82e4af6ff677682f3b62be27a180aeb22f918c24f23bf6f5954e0722324cccd06829fc32ae4fe3aee6e5a03b3651900e13fb0a759e544d033418b6ed40d037b4549a0404792c8fddc317b7f028493c4c91d6773932f8486417544f3d007e5f9e6fc02fadff175303f77f6b0e1f709bb3d3a93b38552ccf62688a39da1a602dd5e122e6f4e9171769ada5255cc5cf938dfefcbe3ab0faca434c42dc8c357e89a3d1488fa3df35c3580b124ba3bf6d0d203d586707eb692150ed05a01bf9de5c4e67bb948088784016394d47abb853f2b6b643a066ad81bcd1735aed4e108a8c1fcd025b548de874eb60de7f3c568728959147d1219e4b830e06ca2bee1f8a035e28a54ee6958d4821a84e5d1e41139905f7ec60fe67ce5f4eccdcc2c3d1e4a753a32dd3004970a4ff3824471822fe2b5010b9b6c6b01336dbf0181a95cba2624663215468519871cc39e8a7f4a151c8bd03363b402020f2fb98069b2cb8cc1b7e930938e7540d95d1d223e47865135793f9eb573660ff79f7ed2fae503e68ba44596ee745fbd8fa562c5c666d174cc01b1961736e18b8b517161ab9c8058026e0ddd6c94aed0086a26e1b959a5e05eb9d8c1ff5b2ef518ca23b4f265db61b499a48cc46bed28d23ffc1e8d9c9e345c06079ad47c88dd4e8e286575bd7f9420ab9c2d5c6685488b8b34d4c9ac04e1427ae0994cf789b48b01d1db9c2fe75fc5187727bb11119f82d0739ce4048467a08cd635bf78cc1b6cc9c28fdc199d351064a81456f81c9e56a43aef7332973804b06b18a26caa62523a7d0acc272ba49124b17bb68800d5756afd34ddb2b7e2dd8a118aac3fcf39d9f853c4d2c4fd3ed5bd25a6604d68d57db93d15aa1160f8a97e6c24238e84f272780966867f9c644ca2775cdac4af0ece036cfa6ebb1cd9d701dd7daec5763c9a4de0385db383a5647918e79c6a6de1f4ee1f6b722c561704c8d7efa4710d78dfce8ad2df0d3d82cbb59cef0bcb001f70bdc6e17af1a720b117fe02bb1dd527b18e6bce70e9447cd0cc85cbcf431fe7c006f5e4ef878a974a93b25f492847c9ae020583c9d412f4124246164d8f080b615e2eee267a7aeb5fa0974de52cefef23cdda7b305a33a91e9b50471ceb72dae337c485d636e28d6ee31f5705983808b1567d4d4ae820ec445c56e6a404cad6b408691475397c0dd6cfad232106ba96e5104052700a653e21f9ac6d79578a9f52548f426a1e81dd45bae30acdd4d22a2dafd633564d6b2f45e7d35413503c955cb0a9784b42ae8c2a5933a6729f3922f969a158540dcd201ecb6e32f88b5b4921914a2e8f424c8b031f115ea5d23a21e6f22439ffd7e5d11b08df729f65613b4f6ad3edbc9a066a5e712ecbddfa6fa764cdf170c0485f82d924a99b7e7ad8dc44c1f93e49b6469a9af3de5691944413f1417b753bcb84d5b7a34f362c383cbc802b0c88bd23a7ac471b9287571c42081b1134bfc8ce104a550942ab1f2a074cb00a90558d6e841ff15cfde6951f03e450a1bfc90dec6c513fcb2692ddccc31d22e5274d41036656183c72fce208e44920776f196193137ac67d6d65ce9cfaae774f23a86e6ee8ff3a4e9422a4667d971906e5496a4e80278774899c882708611bad282f6c1d666bc5e7c40082b43a6e98d494a18e9b3cf7f154fdbf90d786e59e83b72ad0ab893c49aca50ed37ea5202e650fda54f5c46ca2a35c476f4b009c5e6733232275abd1341199b63d22386c484cb95c43ea90e609c407bc79ddd00609cc2eb0d82848db239b249f164b7ea384d0239fe1e64d04955b9297472cafa2ff272c5c78100aaa86cdd8120556f25652a3c12da5853338e3be8f505d93ea03cd1cae7e78e95befdc0e26b760d11e05403c348e0523fe036381408033c009a8e1f117af5100a6eb91f08307df465c20bc1dd029875ef7e49338689f602d98f2dc690a57a6f2864e57098f8bd723574944ad3688b292db6d01387a16493912722ac8f91fd12b748899bdaeabdf0479df788eda440d7bf30d1c25d78d757f00b74bb556506637fc1ab87162f05d464e63a6272db3fe56e9357275035d6b6bee32bd92c4a1dc94778551e94ee1d8854f767bfac3811bd0287672aaa01ea18c25650f05a68cbacd9158e479b508e72df778589e1e03dc543b60bb3b10399e5c50de9e728e69774fb3f5fea757ddefccd0f9da75afe4b67f9c54aaaaf646e858fb001a6deed0a8a769ecef0689c988de566b6015fb8c40aeb5f2df7ea4bee60e8e69d15c4a4aa5411dbe63fbdd6418cf025d87f37362f15e22aba83abe1a3de9857c71c2234023b969eacc0bc526363b7f30b092ca114f2a6cefb34394d146866ac86a33fc497a8cb8e2a5bac398579ff7958878421fb08fff4f8f3deb8c9641b8de392647df3017a5467f9d7b23036935ec6e188dd6dbfb544b8a9e04a4b3c7fa1e4d1d9879daf69986b8083e6eb023a4b5eff80fef17f8f65433c882a21565a919448e6091d1b61013fdaf9fc3e45bbe827c9b4ab10b05600a1961e81d31c7404f8e0d32bfcac2937eaed811db167dfdc29286b0d51bad2bcdb9dea76eaf495a31a7fe717c1c98be374a36271cdd06ed06c02ef4c3c06cb42f73b3332ed488416010e6bf2f4dc4dade6e2e61f19e9306bf941868f59fa0939005743dd647f0a04b576a7e71d4c383c479453501e18ec56d7cb79fe31ff534afbd8609ed701ef163f9de31bc58114399fa0f22b62c66c380e8a10c34b7e731df2a8d39dcf36fbf3a66d67b973e3a94bf6ee0bd96f5c76baa76492032fdd2f59ecaee403d486f543f2cd7ae7b0dabe1b5566e681cd40d384a94349e9668650a6f2d2daf86c59a7b02ba466cd03ce1d50c3f0ca4c02dc4b3d1c0e7b9a77df9eae0bfcffa32117d7e05adc7195f4278c93497401629897a58d08ad7141ea52e0163f14992d7a284e7b875ce4640b4dd48ceedad1ea17d8ab1e760773044845e0899602f1bdfff4d42ab80c0765d1a8bde2ba0a830c050923956d06c80b182264ad19ae4f7c39e43195f7d421bdcda00e3eb5ec5ef2ec91d69df691ba7fe250352acf01fa92af5e2c634b9c7c97889e9147e869acc153d88cdc18908f882f371ba9c1e13c26e9cb8e3cbd4c5e1988080ca65a67b3a4c3460cfadbec904d853fddd2f5375b6070941fca53cc106b5748480213cfbdc1c34320a0478b05f76fd0454c75eca069cb1fa7b21704dab67dc40d041c8a1040db378e76655636ad725219c049e6536982d6ee9f11dd032280e622547c7ff44a938a1f233c356a98182d22d5770fbc871e20bb37483dd5d6ea1551993b95b30774a49b50d411ebe0e8c92834094e23ec2664d822c40e96fb42b8607b62b6949e05edcaa436d0ffac6a8ff384068acfc0220c0b098d368fb8113918a4f8c9de37cece74c8695cef2427e54a6e77ad092a9b7f1d94ac9f0836deff41b905b5dafc58ad6063759b0372a634f69a639e19521825d66a282f489c3172a3659264d0132af3571e637782bb6fe5c0afd24547612166fd3409d0991392fa054ea5bd07a4cd0921a13ad7b62a0b5e6d56cd8adb7f3eaa5c99576941c38aff311c49a8c9d8c755869302a2e5e40109c8365a551cd3f859b9421be189d3a0e9ed78830d5cd6a2414e9cc4c25814d94d98f8848e5386d6dbddd65d22b96c5d20020a5dd409c7e5344065871e57e01c91a443501dc8bf619890fe231319b5480c3879dee618d319962596539e2970513fb5c0c8eac3a71ff99962779cf1d7e916566d0e29d121c5cec5d7302a18ed00be9316f3de8c669a64c2a960a588f9c8a42690f6867cda7146e8ce27aa6a7fb27606eed9df6a235a42d17ce71627446e206e879de56025a66556263f06684dedcfd6f083d6a707e5fc8f8212d716e062f0f7fd0c2fc62bea93d68581265a803c31cac3f8ac8939c5f8c464ebd19df42c7e8998494af614c8383294f3f3883f2404ac10404759e182a038c97aea04a85530ec005e203807c5bc30fa9f5339b32fb0427e64915e29a25bb25ac60b92256470e7de5298d42c6b88995f8d2fb704e49d55b66b71e237af90fcbfd71d9093e1a543da2e9911ac4102346dc4704859cb33ac5f5dce2b3331a9dc9fb506461a5436c89bf90d39afcf93cbca4cfc35da6ddb112243928246ae0d1ba269b0fce0468d3ecabbdb925c9ea3241e2dbdc6b151fb4aa724a42f98b0248171fa01fa103f116d0e7deb65dc359b09126f9a420300fd209508ec7a50be56d5b470e387d0c52a1d104625f9571ce1404d1b7af3fb00475b95f752ab96610be112d33ded48624015781e7198f4dcdf917839471fbedb43c34efabe09941fab6b342cf672a29dbb1eed0db788dbfcfcc63bcfe80f7718571f691818dd6f839e3cc282f85f03fe0400171cdf1235049fa53de7450b4c40ed398d5a486f52124c1c63de2afc950e81839f52d17e2a7d32f82788465a65da6cd763c6360763561ed2bf47749080549b6e2db87514e1ee1c85a0bbd346eb6e3cc29267cbedcad67a287fc5be65ec59ba8b6854b31c83dfc5155187d4150685c5c2c342ed68b01ac9e44b60f0c100a347a0f93074dd37d8956fe2f43110dda66e9f9e6185c23dab74cfca21f3ede4bca87687549ea02662f45dfa0ad27f9959a120cacb7c419810e1b1a50fad31c12c47d5bbc61bad77044aa541d29faa6126c60ef088b82eead17a52843307d4bf798b853d90d14c5347ff10615381d85e964331b7a123d15a77a6790d93e920052ddb4db4baaac5e2b27b66ff955e53b8308151c81da4711189ccf0eb393c5bbccfa1f6c94a8d5f4bcd266fc6a12061967ce836ca042257368f567dc42de6ce0be84449234a6163b72069f25b7ead4b2003e1a7665e87ccf211abe94175d1c11bff2c0b6bc110194d34aab96934ef59804cd26e4434ba166d9833fb091be37b139cc10748b881c93690528a96ccccd2dbe024510b8da37dceab567dc52706461c486a0463369cbb99bcca2e8a4d2e005c45401964722a4b3ed37c351c9f21685e8992c9634349379f41796deebffc2928058c8ef6ea37c6e4970dedb78d1c2a00ea9e1ff1e7708470a6c60e6a2b1e966aa872776afdb238e97f716b3df8dfd42bf0f7ceb52bf9eb33731bdba5987b8f48b4599d67b383e77413107857e951ae0625059e5616ccb41131df9a480efd5beab3a9c99615921caedc53dbad675c00ba1030577db1d22731677914fa958b44792cc9c19e2ac71ebe61a05ee67ae7116e39e1c0d103f18bbc9d531164360d901da8234d29fb0b37cd2a60c7aa2adb2a4b297ea2fb14122ad95bd4592ef86c88fdae1e37dc8e44ad03c0fcdfa3801e93796771c5a2ec1e4ab12a64b3ffe48e7442c6224661ed5cc987aada6e778399941f7b20f16f94fb346b916be87f005c9c13789741602039d38270643cce3c347565eef5ee09139330301951c15756be47994de6f1802dc5131b9b011051b1d87d744756831a71cc8528487f032fee9dbffccc751e6a1ee6d07bb218b3a7ec6bf5740ead7a47b6907d7aa95b79aecedf4a637ead8fc6fb8654c93d13ee79f5d6258dcc61993aebc65e4fc14eea7d006e31f6e9f60e3bca8ce52ec559876fd20255e507daa99b185671ce1ac11d448c30bcdf97b9617195e0ccd2d15246308dd6cda74a8071114327fe203b1adbaa780f3243105c5111636a51dce966f5652e39d4f91abbbb4576234d6cacc3ec57cef2dd4dda49a6c33d12bb7595fd5ab5bb15b40301f34ddfb831a5dbf62218f496c003227fe6282e2ac054c45e7f3fc93e51b3ee8690f08612395095a0a12729d663eded879d9ffb325c62f2cb546a48bed51ae232fa6ce28a2494c132a6e09d98c2e3d478d5d2d15dce2e2665e4a3db448931068b99899c2bd8ba87349b0cf9e3c52cffdcf58a59b4fe0089b298b42ad7553f831bd60f5cfa3e09102fe773e4c05412973a678f3b3ed420433cd664dc7f218e816a17c5c9013ecb84abf2dd073557dbc41b92a91e0339d57b8b077a9a44d56427fec5748c47c1460b2e2412094db6d0ad06dea0aa0c1368592594bf0b2f590a9d6149e44dd4adc4cb42e5d9940d59397b83b33b88604c210694e3fbd84795c80c1b09ddb3b1ec8bef6e9dfc4d7f295e551a79436007ca48aa605ef5a89571e59cb26f2766e564e39d3bb441deaa0c8664549881d90a77256c0f6c77241fd6ab74b0e2890f78ff16fd2f9271ef96ebfbd0b878ba9c703900752b7447f4efaa60bd9dc9cd5673a36b39d49f54274caf03c0cf82b95141fa20ed3ce02ebf0dd74d9eff8eb9e2dd3a2976b244b12fd33ee75c1f1c459f86a1cefbc817f42d7f43ba406098165cbeab99df4fe751ae3382efce32af252e461652c7598161e74fd8eeca474fab6b1ede039935f2fd4d7562623b90a422a78941f47a76863d95857c33653d1b42b806bbafcfeccb7bb4a0c58acebf6104b2570afc3ca88e4fdf2719cf39c964a1ea7d2ae4a7fadc938abc95adac495093f6b959b1347501606b3f960b6d739291aa8c13eb49e98b0f78d2b91400b6d8961cb6165c8b684738e4d4db2f2ac30ddaa03a5e0cde4142b625e81907f08c60d7cb5729456806c89ff0efd08397423e44738ff38f8e88684f3a099dcda455521caca37ab4f4d9ed5d37975d4fdd778b97cc93babc804864a35e3a2db04598152e67a2f1f157681c3962d46ada23ea5d9a524f9cdbdd08a07a3a85b1f6fbde11d5a35c7743b83bbefd19aedf6d92241d16aeca7f33cc51839b75f111e8edaeaed808daf2f43fdb3c6f032ea45052ac31d4870c4d0d76aa75d0b88635ce449054013f234c4a16cffc58c95ba1cb8a0a0399861eecb1039bdedfab4d05f0270c6b16f03f6b8e629f687f133ebf2662c7f930530746679aac2791f54d6a95bfab5be0c33739074ed4e7ae88dde4a8036a7d6095cf41776366b6ae3f8f4a0734f48c275e129cfffff5e0abd042f99a957bf6f0f47fc7288750f4fe30198f8cad7067b36cd87ebca08abd3f9475e7443f83cca91a1ebfc42ef3494871f51f6d52a5524b9391c687571be5327c7c94ee2a096653acb410917fd51e56a92be4f24c1db6b97b465ca84c31c04c2f61eae07e952eb6554aa4d8a380d9ee81c1c462c360fcc3cdff2867a953b655562cd06162af8b99bbe662e0c27ce4d9a1c1a907def48a3231c2110c930a2f1498e32dbbfee0e5c5869332f3024fa5dfb0327a27c663cacd4e9902de34dd93529e90eb347bafa5035f56fc578e8386c7571d1f0ba335225ecd8be026b4544ad70f3af11501a53119ee39a8558ca0ed5b3d897ffb9cf0fcab55a0942d3bf7bc6b94ea27a6b748f2cfda431f35252c44610b7e843ed91ebf7e8fe10638f04f52d6d5a7752ec62350efcb7c473f80b1f2a26805151e8346d39d23551e92fbe372df7979c3f756bbb43f6bed09bbc6b65fe6fd241ae1c2f1a0d0b805c582853b85502968f9478e9a84895f9d4ef01ec4f3f571e57cd0bda68ee1f6f7e14fb6e0f4ef8c7dff6796472a935294fc27b16216966d5021339ded059687355b42b55926854bbfbd9f974a0c26eadbfca8a6183093996cf252894e6db910c71ca3ab2e82d90d371c36b92c9409cf7937bb266ea9b29c41d774aa522e103cb30bbabfe872b57beb027623742806aa7694a859ede9bc1fd7b9e32880b064b0030fce1a0e5cdf3ce558a5feaa32e323dbfab6661c5878c9377ee52a615b7c17bf1228e328aa20f92d070c71561969e1af532e76835fb0436810c3d87b982217edfb1143bfc3405ac9f6f3a50145608dfa8658b0ab642a347255c55b59cd1c5897b2cf625a0f0706c30ca1c1321e90cec57b7c3d1bd1af455e3732db80643383c41eaa6781f63da6233360ee720cc04d171ae2445b0c071e339d547f7ac32f407d29ec7abce0a9e1ef5276544877bab2f84bd2eef47ffa66f96e7170cd54d836c9badbc59435146031502c1a3cc744a470f693636d9050c5b894d2d6047df60eb0bac16d905d46cbf017ca69d66427cb88036eca4ea9d0e579f6bfd8a4a850703a0fe49d39c107c9358e98689fb62bd0475aab4b2031446b437c7f9e373caf0270a28d7b15c71f02079dde401e26175bb6e392106a9072021f0e5c5145a1db6f595b032faed8551f6e2ce318db1ab513db876a3eb42d225014949c19543e9c5dfd2290e28c5d72c87223f0195ffbcba1c02c7d0087721efd2af6881dee7dba7565e07abc35bc3fa41c6a4d6a313222ac6dbb117c69c62db2691c68869ac5fc5e987b0ae4335f815c73ea4235da2582dde81d6fdae5911617daef847be17f2bc09edd88830eac03977f89179fe03eb2dc3b38df43803ca2d38455232549110f4580ec3cc04c0d8cfe493013d2cde47c506ef6a8dfc42d998f70378fac5ce4709345926dc477e9e339d8c87ff6287ea6e2873e14d538cdc3f2a47e0e37a2601652f5b665b616a7d1ef3537a3327a76f93990f7694e6484e7a52a10e9eea2edc92b99406abfb2b11ec86667c7af4a333dfe900bf071d1bbcf4f0ad768fae4f450c53817c507d26e926e753e3395201d3ad89061f16706d841994abad283f0db74cada25beb5fe46f48669a62e0b849cb77097e1b4578b45062af4a071b04f0cfddf87519cf2bfa10ebb4b860239ff187e6dad73806ae968e6ac0f738baa88edb3ae4883a9e59be7a6b222c5f54818f95578daff9fc7a7aba8c4a41a699923e85ddf24a32bb71c808516f64d506058a70539276d57984d75161cba7d53a4a864c51a249a6b8fcad5738dd0055ba8468b56579ba5f102642df65c598490f3a0c9b1064f4eb1962c4c38bfb7d55d496a0b0f7b3f90b42f733d112c89176aaf937eea4bada845f3ca4e9b56b3a5a06b4c90fa4c1914ea47020c2f32531e270007ed389246906ecf2c4465f7cc5d6a347583dd73341ad97199021819be81100d867d628323ef7552db945e4c0be604cf6c4a8197958bcbd6c1879387d3286dff979632c54baba2a35ea84efd7726b662b94fae61464d069e0103692599fb86fdc3a06e01c6ae3deb3de6fdb21806c716e5f82b784e4ad3f0e2de629a18e3a2309003dfde9dde8e5101b83312f76e811277afc286b56879f4eb80468e58c60bc088284d05d725ddfe3185b7c51b472a7ff7db3930839142d4a452ddab628e07d43375801d7c6a711a55b452748d770b84ede35920c1ac74b595baef963d21df9418533fcf959593ccf5afccc753e86c4ae231eafe77a158c2472143faf169db29bf2b53c3288d8b3c9added65778095f85e2cb471ab58362041f0a27d874c42bbb06385a0403ca193cba67cf70029cdb7e73c7e2267b856fa0b8dd4c706b45e7174659b0ee2891df911724324f7ca5daf07c912b9b2abff762e62a1817688757492975db7185c4695f3a90895634b8d07453b36dd95197abc31d5d153dfb0d0ec92639540e99d6590f9b394f14c93a5e829fbb33616e810f59c502be44a13b700fd3009545e34c211abf9afe1bb8ced793c6f516d40010649f83a78ddbe9b71d8596582997d0aa54192e1200db61dade30500d72a184ca7dfcbfb80e5442f489d316cc8b75005564835d4b11c482e2c4d0d160f14a8b13ae0a0fb0ba5e3b782770aaca357df0e1c4d1c3b28b776a8b3e0da1abfd4f7190673fca1e1c5a31c688d6e8ddb21300e4178d07c4e854a718ac3f672b0120d6a54c16957c9ec8c444208e47737bc4eeb0bf2d801eb2fcb72f91fe988aa75f38e6cf26e858dc2a718580ff5d281d13e8fc3e3bc30c75c0193481c39c375a5b06b962d9491f3f1fb80f1cb27067f0709e0b0730573a9b5f5bdbee1708ad84b4ceb1a9a61e4c41e90655764057bfa07b8c81cc83a315be1aed6a49715479c0fd0f53f625fe6c7f36fadd001149ab978532e4d0de3d1a38934c74265b161899843704fad16ffc6189f42a5cadec98603e0f98c6889bd4a559079e074cb40678fad4690a20d988735280a1ee8ea71275069132101b35c18ecc9d3c6eceb4cfe9b165e4b6acc17d4f113ef8283c0fb6506f5635401e916d4f7e7bc3cf49aed166587a0c72cdbe673f467d81bc2e9cd08cd8dd16d90b353481df31e89b45e8b
-MD = be3cfa6c965b2ee4e6fb0236665b0b95f66c8da8b338375b7393672283b0e50b96112d7cb76fffaa6db8ea4a7687fc6234dc1ee52e764d69ba8ac40c0f51beba
-
-[L = 48]
-
-Len = 16
-Msg = 3a35
-MD = 87bea682792f6bb4977fe1b92e0cc7017413dd263732c3604f0ebd63c2817ce5ddc5d78c0137f614a06e72ab1cab2f4c
-
-Len = 104
-Msg = 7db15b3ee240b45d4610950996
-MD = 7311a6356ab38a690c0b3a1581c3e7b6de418996c05e79849891b061c51d53dffc0fff2b8ad1c1eff165aee5ef6e18ff
-
-Len = 352
-Msg = d2a1efc725c46cd6a19760f49edf0bae823c1b4992ae2260085746cf65833bd008e56e64002383f51f960239
-MD = adb1778360ec659e90609e74b6af219a01a024f216b68aa944841429ed5b03b139444b8b848f73fd5f350ef02d46b6ce
-
-Len = 1016
-Msg = d11ad1253592c094746da7b5c88d329bc3ce1929913b8be07e82d3f6b7a536a855f31ad197376eba6f2f4534413fc4e4e7673fdff8739f774a710754b568b7c61a473059a41c98aa4e86617aa66d2601d0f0d584cd9f132afeebdc0ce3da6a8b290059e6e4aa080c195c42ae7f7e1e99865223439929b0a3a0d79b46ca6419
-MD = 0cbec7be7299f48f043c3d1aacf833b4258c32190a21a8ac2471666b4a51b63cc77fff6e081aaf5ef21b1b7523d65763
-
-Len = 13696
-Msg = 2f7a9929dffaa4a4dcfeea1fc37b18e3cf935abbaa17cf9d834b3a8d61e9fabfb7683cfc387d6f46ece3f8bf845827c7ebe86a651d6dc1e83c5772cee1a9fee4b04453af2f68430bd87835126cfd1b3f8beea4d3822fb27864570e255cb65b414197480b6bc20a39c5450adf2474da93d72f6ecf8063899722d3755b7a19f71e93e782d89593ab19ddd3ddf053c54e0bf832311fbf132e8b9e540f38e4d9bcc3cdbf69de54e40ef348a9170ba2f65def167f568ce846889c0161448342fe907718a465e451bc1b0f2e4f21f9b911f186589f43dea305811473837c063b915d849c20deb43323bab4b64e61823f1df119e71962dd975700391b411f8778980a3080ba3c14a321d32c082d416ddd2345f0eb751a516d44ee55222395cfa11e7fc4edfbe7cd49bf4ebd4d7428843a2ad5538b3cd201ccd431aeafb146a65d28a4870a6948a7cc0413b0adac7e8dff3a898aeff5f4b65d10b28ceb749bd354c061c3008ec569d5f90a4d4f5caa51d35b49dc4028e738c8ff5939fef3fa202fed9ebef6f2c7dd0ba41cdb5c0c16985f96fd93a65d134fb4a90ffc0fb6cc5396b843c2151bb7c9170f2fa4fb44292a4af28df5481de0c3c917ba1c46467a35302738158493fbf6a0422cee558d4bce3d78e14b4fefb65bb05043e2cc2a6a8ea64565ff6ce2fd2c4f43fc02926ee44ee02fe1dce25cfde0115c9396c9ea06269f17b2caf58e2332cc1c8528d9705c70da1f76f22aeb1d1b93449180640fb5c4c4a708bc4621d7d2bed5b1a752191cfdd45086d34f247ed1df0f24e7c620de32bdfc4d1f882380d2cd7467c926f48abc75cbfac8788f88cd9dc5361517a5eb36311e6b39e21a85fba2038fd47d860f776697bb19cdb5a4d6746fae507e274399c91648537d905015e58910117e5914f44ebcb00e771d38b30c1473e1232d4e222cebceb4810c48e83e0fd4c852f4fffcd643c0ef9e4fae2d0ebc6f102f3f749b02a5e3a61517d53b539cc24120df3957a633d50369d46c0c226f8924cae51dcaf54d716f61385fd8cf38c2c311a32bcd6594d6930133dc18ef36a9671ba8b179abe95f588ef74e8558ebbc974dc73c26bb6eaae78ef464181e18b71f4b0f986ecc8495a9c4dc0b0b96be9806fbd3d32952ca3b4737a06ed6561e9c9581a33a720123fbaa2a70fc3233b83e56444f5aa0cfaf70fb24be6118404f3e11e6ea004cf2d079a3e93a8ac1d4e297cf4fc43851dd26314a7ed6a5a784b386daa26e50c64692f7db28c21d82234289bb45bad5042236667e6d70a24bc9525c3adcb793a6a5725d9b10911e3bc8e3fd604db7998346e7f7dd1815c0cbb735a977bd4b32b5b976932bc92ef3b56bcadc089045ec95f241cdb0a84c67f1f76353da6cb493bb27a881d37a2106b8b3010cf935eb3601ce4dce3e449eff8331e444ab117a20809a1010db4cf3be0c488f777b6532df908112e3d11592f04a0cc16232d62340cbb8b5268a662b8278d37c03d848a04f0ab498f5af43b0a20e310197b7e1395a65299fac29f051bcc5fcd09a5605bfee370ee8ea21f5807d9748acca815a44d81796d68b0014eed3bb6a94233fc51725de3809ac6f538beaacf8cbe3d96aca21a7a763a957f8892f22c6d086d9af2e5ac9d90321e186584f17e964c90739559ddd034df076c4aa38c2b78aab6dec8ef6be9adf33bfb66f159ec4826653ee6cb483539c47a4a1d95663e6cc7a42a3bf628623a4c9500a59a50a312aa104b198ce5f3e58952bb79ff1ccfa9ddba2fd4705e91b5acaddab9d6522d7666264ac5f533b6d8ac4512d8371c69c06b6d322b046ae2a0a20aec1c3bfb05f3d91b9044cabdd873abb5f2b0e3e19740df31e39828f9ff9bbb20b73541a7a70b8174ce4e43e0d356e629cdbc6c08d29bd7acb6a4347823075683ce9d7de4ab3ddda6572b175951f30a15263355fe9641b3322df7dd52077402a884cd472e6d0b6c34cd63ab63cec8760c7ebe384f7cc31066bbdb7a3417425e039c4d340166e4bba4839076ac9457c87459c57957d0a06dced2f7a18acd22b7295785dafa435a2a8a2c3a1fa05d115fe129d19fc44c5a29bf15b4d9c2b375bc8e591f92756cfc573a39b8fccb8395cad7617b11f14a60e2dbf69b897844cbbcb70363010f6e1bc0590ea594aa924597dbb32a868b55551789f82437180b85661809089d34a168d44b4d788dba23b13542715843eee797366d9ce7793e72331735bc78cd61b13421a568ba3e66926921c04e9d00888ba7ddeb474db63813756ea4a02c1823083e36ebd2d32d5c88cdebb98d511304cc276c7799cf84a1699ccac9569b13f530c762732e6bd0f8415001b2c02d11dff36660b717054b16df49ba38425e3764a56052ffddecdfc686aff22079897376cc15591e11579fe4feeccb55f
-MD = 70e1259106fc7a7c6be11d95fb673bfaf0074e342fdaefb458faf4619e7f0edbd68d509b9ca7243d2e5e039d42ee3b47
-
-Len = 100816
-Msg = 5f464d3301c5e0871d6b41b002dcd09abc80a805de3482d97f3fd7b9838745da1c0534168f76b93c3c53bbabd904541ffe5179cae619dea77446140b7400f47d242141c7f2e9894d88f44c9e066861498e7394f206f594a419790d697f6a11187f84bc6fb288186109343eb11172bec076d041a4c7306d7978c009fc2d2d62563614ed3555ba2d21c8fcd70e8389352dbe4ec808af3231ce990452eb05b1b0dc4fbb1b4265e69235cc3561dae4148c386cd770474863a84a822b2e5f905fc255d55f90bd6a760d441dc52240ba7d8c888a5283891a2c99963d1fe680549d6267cdea92cfead167f6c49663668f2bfdc61fa647f5abf3ce5ad2c6c175dbd456ba41436aa06f5f68f5c88e6b74ea86a79934bd05b486210d3d470a0967ad6d67f7385260578088d7e63197849354f651aad07e04ed301f1fe7a6d2047d50ce5dc6bbffbb1da6b47d740898f4eb54e3c5a1fbd18ec93254cc01f705fce04e6100ced132c519674b2345547804a372b5c925bd9ee9701527db33408d37b72f8d18b882d3c4744eb58f011d21fce336d426de1fcd5e09610216248b51fe2b79b96c2bd6ca0155e05a8a516b7a24d529a9a475284735bd9c4c437ddf399864b64fc5d0d6ffc4e5a7a3dbdd476bc39ed29a0a92e1f2b6b3506c2be5452d4f896db6eb4f895b554b2af64c4cb8dc2369b91022dc50b7291404cc9605c31569c32756a64ff8c4fbb0f1bca346c7b58a5c6774b2fc7f7fd50741d34c8564d92f396b97be782923ff3c855ea9757bde419f632c8399763003b58ee9140c2d62e914c1e1fa742661a9166d42267edc40905b35a25d5c3cb3fb457376b7422896df7bb19c23e8f764416731d2e20cf2c1beb8663c07edd8f105e078e2fed05c5e5897c430017fa2160f565a75a4c5c64a15dd7d644bf355d169ae2696ae5ed1a39e8f81055cdf315e5b0c6f9235515fc4dbf30281ef17b83a6ed604f89293904bf78c7183fcb0ab236cb1f8935e59c51559217efabc000b165d819b717118a03facb61a13a99b194f8b6c7ddfe5850127d79078397a56564c7ed6716a129409680434061b2a4782c9006587de927c1ae09d6778a5f1c39fc419fe10493eb0d4ad492fbd05485eee7913c59df82fe7182af2cf06a6e8edf06676200077bd1408f5c1cec537cb8566470cb44895826d04ec20f0aba4297c501add65c75d5767ad2ab63aa81b7b66f01b32590f1d55b7e50e6df1ee077a19c8c895f5ef62d452cc336e9aee171fa997ddcedd7af86e6cc37722fb5838a46c5e58e7f700edfb7c6bf832171d9581f660752867118e9535a6118635709d6f1c1cb21b938068958e956149d9bffc67f355cb88205d4894ba97c3e3c8be9fa2d20abe79f3f93a6a2f4f56fd075bb49a4b7dc83630e58c32a29d757fdbcaa607352f65483cf2cb4208a3bf94ca7a25e2a4e05279be31c33696c10fa4971d1b64ee938dd299f483e5c098845749a3b706a787529bf2ca56693d0a7a98243e6482a43e1f5d3086ca1b00368d8ead5ed2d0fb79b1e2f537ab9340809ca3a9b5eb2900390432293008ab7086c2811d33de0648be5597ef002c7c462b5e0f4e0b1720a98b2299ad7aa55eb78f0c77c2ab4371385f280107ae40ebf814a8223dc74f31483c63d9e4ed09fc7e5a51bac34d69d97163116a66c84ea9fe4263269b71fd228555ae3cf5109c4d6ced7b9049a2b8069bd2f71834d6c07fffbd7561939188bc07dcea08086bc7182a5270427c3199bf5fb5c4549861fd32a38ec81c4ab058c777dc01864787f0275f911a17838272cd65135f66baf06d8d93bc439eeb55d50b7c5adafed8eb8140b4b05f59871dacf954f4b096c30b7857774fcd319c096750bf605db8e31fe02cd1b9294eaf8bb009d4609f2cdb3a8657f650501b8553765de8f572fb91ac77b35db35f402453e5c58f60146f2906ff56b9c6b3a5d0bb6afb9e2201110919ac9c01a7e9750dfdb2f72afbf7a8d6f64b1c68b9de17a2c9abf289eef24074eee9b1649caf3693118165503a30200993d271aa31b8b92606a10a52612dd1fab495b82f9a98cade18b9d8a723a71ceb63fd1d27372bd281f9b40aa1839b0cc2f2177a09aa8e7b159ac118d7c145e7a4f032e788d21facde2b4dbc1d5d2238f530d9bf9bd2798f611d03ed8919f0c85bc2da99750b7a8d6322d2e66ff6ab9ebaf7424e8c1c3f4fe92be61f65359106395f5ef995e925be3868ad513f561f873acdbaf18590c903d64bd275121c11ea655124d091740887868544c5348664399d3da96e2e35fff34f062fb939d656bc072096e510b40b2f75ff010af68d64fd0acc778e2e13c9667de266b1816c4ac449521b02bbb217002c604be72e73051aa9048d192e3210a68769dd2693e5d44951711aed3a751240d42f8925844131daa36c51d7d59bbaf99623fddf1649db954705fd6f3405e63894f5258c9ffecf83208c2c90cc55b1a8d2972ea6b3a049ee54942b50526b7930953986e428b2c75e47ed870bba68dbfa624dd94112f3059da0a80c583baeb570fe8314f5c66501b34116c81148dd22396fcd6479da49f7e952c8084f97d6803ff85c3787222064ca368f596a1ebb6dab20a03916b3ab071c927d87fc10ecc4e7ab4a5761e3eadaea4de1a0dee30aa39a9e4dbee047201d7d8a4df1284cf668ae3ed7dc4cb2cc4b5cae9307353fd2ae4c105c5d9f3bb021535fc3ae9bf3ff54ddda8b2e1037cd9d69822df436dc1c750a9f557d1a3a63fbe73c64261dae0c70bba6edb57519f5b957f138d1aa5fefe01b73c1851aea42938147bac2762527a492cb85da43014c876e223b05597354d7c9b328df67f354d168a84ce86dff57d8a870db034196dbeff83ebef80bbe52425a8810f2c9fea29ee688a201cce4a5f447be789a3881a9da3b6c491288e8f1091719032608b332e0410f4576597e17e0b5dde305f069be2e80d565bb979a3915488f88e3ebb90e81c264bcaddd72b8843af4a4ae31f723d50fa0995b027c334c351128913bb93e67b1b08f101f6b8dc8202b44fbc3d3dfb530f66e5a8f35e69725c86998c05ac87c561a4706e90fa095adab4a566da4fab82bff6b20076e5bdf62dbd6614245b6a6f8cb6bf60106f8d12b9c3e26f8127dc547e2181531ce980a3273f452892110cfe1ea834a30f99d66e026a9d22dc76fc3cec8fda2d7fea701deb84dd45c97dcde57a017693e90983a156f11c4d168d89c06d8a32dbfa590adadd16850854f24bba315b0bbf372f03711a20163afa0c137383b9120b26c59f5e9e7cd2ccaf0ef4e0d70d5a81748ad441ee5fe178e14317cab184fe178fb0cc0d82105d2f423467fdcda0f9871b9d84882609248356f3053a99866dad9f9b0f8c4a897a8cb8f30365a7ae5f3ca6e772d863d445e6d57c6a478e35d719d0e4e84f3a30b1816ddb55bcd79df21ea0e95da72a19cc1fe74fc576120bc108be3ed4cae3bea889fb4ddd67efe858a994237378eb623dab070d954ac780c1e6d2095383c98ba622cbdb18fb53260979fb2672c21a4600f4bf06583a112d303096d4e30e7e1060d869f386eba3cf7aec3052ca17593dcc9969fa9cd88179c262770211cf53f53f175037a5cd445d239cee48f7ed0aa1d715a22ac18a8aeecf191d415e4afd92b76c091803f4c757a9e89f696ab7b11ad6d5f24774e4a004dcb0e3f33705dd8150431f051016af37647b9e44b10bef114276d4b1055b634461c655a82a847639a038ec9f58876e84e9a2955b696e072d8054c3f81173473604d5fcc0a75b4a340dba0c375beb87b8b01a0f2de232bbb8371c3a9d27a0ce521c4c43dd3bdeebf92f42f87d88978d5b4e3e563cba0e5f59dd29c31096885b113ea5c57e66a3be015b703bc26d3fd1d51a7c14f85f65747ac909d7e30c8e800be27eebf4a62e42e538ae30b6883907cebb7fc5e150bc9da3a138f394e817df9a9e44420078f30d0d3d6981ca581791a097a5e3982c983d5cec239096c7d8cc55c87242026d769ef1d04eb96e5b5001e3358af88d417cc61f107659791a35d8b5f7a5767ae24d5b2ba7aa12230076db1f1b9b6f213dceea62949d98bc5db38743b23a59ea75dbe4231a285678f5f07facc053c2048022fcb01f15e8c100d64a877ecd56d196a6ac60ae35e0e09a517224ba409ba7b70d8f9fe65bc427b212a4e9b3cb17b0d332267cea4f3bea7c1e550f7ffe567b20e3057aa0ebb560d00d28e2f7aff718a9f2d4d044f0d20709bb9ad567c98cff7c4810e8c542370cf90a491bc1088f69998d59f344b74db6c1bdb61f284e99b517a11452ca0bb37c7bae77fca6514b341066086e600f098a32a92935380a173c9182a2513584c54ff67e580dfe16b508acf1729a3d649ff1eae286bffd688fe658612d6c8e69e6e7f7de4ba85ec54747cdc42b1f23546b7e490e31280f066e52fac117fd3b0792e4de62d5843ee98c7201529455c85b169fdb90cb05e3403cf2f737148bd20a53c73880880a14ffff37d62130e682e50bc7210ea6c1f0c27656cc1785a0d9ce93ff94dbc5b2877519d9bac4a339e98ec594a7cc76f4ddf994fee8070dd4b8e0fe0e51b93105fcf566f83d914dd862b4ce78de7e9e16f142234bd969ff8005dddc641dcd3c7cfbdd6113cd3ba34a9503a0f433899e90e158abde2ed4ed4b3711c991577c5aafeaa982bce80835f8e6d7c7975571fafb1499991646bc499ec32930367d4b1de76ff656442cab987bdecdbcc2b2bc35ce01816594bfa4b6e33080caa41dbdf8ebf2205649f98a2d3bf331fb16b9ecd1824eacbbc9f81297b115b4d36aa7496e05f7d40d4edd1886c1bac10cf3f97840a03277e6369e7a7e90d932050ab8720fce076de5c355fb17959bd75cfaeff325b0737f8f5b1160de0b0184ba04afcc30bca77a6a37e29662302d01858c0bc1d32b883011b7df5a387805296cd91bbc835a3e76152d017ee929d4cbf137eb78db89d71617dd76cb00707aacb8088ac77a1f52ed710331193edb29933a7efd8cc153e6adfc2c6637e88cd86b06036b8177847b4d086b0ff9b5dc91f3cbd1c08217023d7449253c25331594f0f16a3c5f2e122e0145c4ec94f096b45a1fd0b2dd3f1d51e58978471782a336eae49d7bc4e050d1c6a391658f71a1f752c0ec6302bc2dba9e3766359359ce34955a2db86740c90d09cc50e92dbb76e17a39955fa7108bddeaddaf860d1aff14acec8b609ac1d336270a940604209df91cf45be72edee04277d694a6f968ae6d8e065702f3d607f3baf8db4ab7637fa4c78bb0b7fe69937eb1dcb616fca564a5a521e12df71fefbc321187159bd6a47b066a3440ba634de9153a94546b63aa33aed9da2018e1f30628df37f5360ca4f2660a46ffd73e58183e8abffdea25f7bdf798a2b7cddeaa481bcc6e682a67e99143066963d96d4a928a478951dd6ec59b1be8cb23aa688e1867738aecdd9afade39c92c0b2572bdde84eb912ed990ac618834c412231216fdb84f1e01b3f8414fc6dd0f646fd0fa62bb0157b3535e1497c9272df1cc5dcd4e6ab9a8456222655c56ac73fe0d2aa8b599035daddf0986a45b1a59510abe19a11b6dba065c8bcf8a85d20a3681c2414dab7c036cc1358b1dba98d6ae62c5948c36b5b3e307a6f860c0c822ac724a5c917ed5f98ece548a7a741d366868e6c676394c3659f7f6786594196dde332543376f9ba0724b091d30f431f91d919417e5bf7ba1e9a21cb80f6c204c3a58d59d960a5788b5cba5abd7c7518f4c5170115125de97009a6c3fc4d5773e4f57fdd433eb7422c7c4dccee57a1679633ced3b5f08df763d4577983c5ca8b49bc4e08fa76f8bff36daf0fed068db47f0c87e0e45d518dffe37c129cc6e2f5f9e0430185723098e715284a42f302a6b8368a4f2dc16f534d1e5db9d0b86659fc4ba6f16c982774115d02a57684c7e5489b1f491584b0f0546e4194a6041f5e5be3bfff3852a4fc772d83491023a61a37228ef6260edc0d1cb972cba610d5ad1d92d554700771d8236ef55e983765ed8eb21e7de7c8bb51aee9368758454fee4a3f32179c1e54af1d069e0b9728cd0554351907e018146511e4d6f0450b57c8ebd21c71450116296bdfc779945da60b9192c5bb9a67b1f04d94992df4cbb3e30732dc8af2177fef17e0b7d01740b8a64db16bc29c1e589b6bdfc967edeb2ce8a649ba892bc856a929f0b837a838ca7f917a52436ea3d20e72afacc5b9d58a7fd0fefd96787c65ffa7f910d6d0ada63d64d5c4679960e7f06aeb8c70dfef954f8e39efdb629b72979be208d616071289cfaa0756a4bb5eea5c7baf8fe7a31501e7e2d67d708d461c0c93e85f03afd70bd9e16437171e01a34f475e4b5a58d13ce4e2fba72bbba93403f3f8981e0bbd6a8a6223327bf096c44b36e0ccbf7592a98c1fa67f198b628787ec80aaef848b4fea158c715799e6f458327f399e6420f0e7821f2dc4663bbea065c7bdfe830b6102e2e7193381b9dc7f2381ba808c43b8fdf3addab4b5fa81564716f7d46e0349d9b27b559710d723c7ef2f79eb55c3a9d75b99ae6fde6877b278b583f8ae3cae776b914b0cae0772397fd19b6a27676c7ca02cd07f4b4d49bbe1ec87f2ac7e39e5f7712319c31271dbbbaf4b826af8a9f4acab696c62719f7a6a032c4bcf90922a3c630647b7c1c7b78b10afbd863f07486561a0bc8d9b1ff5fc41998a7e3c604e24af1c1df2da1dd5d83eefa2e4012f7fb5959ef9339574367deff73723484b5a969c8c23dc251a3b887f34b9ea09c9a1838e8aaabb254445d7556dda257dfd5579737fe1dd6c67f3851ca68b011e7cb7b6958d588f143828f0bb24fceca31b47b77d1ce05e75ab05b55d6c9f9107f0c738f2cf8a1629f7e9b2694324e082503937ff8ca7c5098f770289af7d038dcedcf0ed77c8b82e2a9003a6f3db69e14131e144f6be7cf0bb5353ea96aebd78befbc6ceae9bdde97823cdbc5ca8ef8a993a9d9383aee9f2d6a18fc64ab92990672ea2dc9b89ed248aacf7f1a513da43fe5953335afe76d78867a066f226ae9c727c6c60671c50a50732698ef7a492d51998eb6da5368a667baf6d12b77eb36686ee0ca239dc6f3598be0bda79e47f0891fe4d8989df8c685480de11c148a2b44c8a6bea3a50b09be557c51f545a09a30e9362cf3080e6a6bee3dbad370ce24f6c5a6f8091007ca195057fa3af8f99703a601086c2a1ffe55fde4c2c4153dbff8d6601ab68743c0d50d021b0b3099535ba6c40f866ca3ff0df7c19d709a3f58b57b40ab5e43556a8c0c1938c875267bb39c0db6b45840e8ee7c22bf6b48798bd744f70e42fca343a8bdfbd7f55f275ca5d62c7288756d4861fba68d16d842c5b893c1d8171bb3c8b593387d3426f292ace5cee7753c9f9a12e6bb9af5a24192e4184f7d3d191d862d3c3dace7853eaa235b6369fd164e5a7bddd06daa3eec7fe4130e82478d36f88a0999cba1f251ffb3a7689ea2baf016073193898716a9f933448d7ba8e0968c669bdb7dd5e6e32fd84a6ce9e8632b393f9263532ec2107b4c0d2abdf3abb2de2d63511805eb58a70bc4ded040d76640af60ce7f03b9a682b8dd84ed8a47225a48e0b94ea47828f1c8974cd64e5027d8b13d43519875d2bbe4461a7f0f5b5b8d63a472765405ea9c994225806395e64dff88506f7f7f3b6368d769e6e550d4e3e81efb13771cf403e855f75312f1383ce4c2744d0b4e3735a0f1e1b99eb014fa60c0d1ca9035fbc4403330c2fefa8411fb7c3d6ede5b5c8f4736106bbe01923d483a84f031e9685a3b6a70646a2a5059ce35fa496b3f21fca6047471a5bdd33908cc9328de9fb032347c249bf7093390b750696124621dfa67fd9c7fe85d6e5a4d277ad8f8d169f8b5e8dbee280f8443518bd94abc5ca704e781e6cb1868ba2d6fbbaa850326fbfa5a20e4df6fb5f8ee2728e86a758763a8af21e1f7a8584d3f0b09a0b19fe8fcd37bc4fdf45084d7fd92b80544f29aba52496e2c9a0aa4adeb89820be321cfd2f0a53585a15d04c7fe4ec9be6eb5df419e20b71506c1f642df75c53a9e3b2414fe6102fa8af7be3f6c95de824c31fd6fe8ef9d49e26095a2674a33cb574e9e493939bdeaf5b309b4c51256ef71e95dbbcee0a11991693b533f916e1c82ce86d65d89b6d596017fae944ec364546e78abbcbe4322b83e2fcbb4c5d4ccb54d8642c7eb9e28c08598a356a5c46f8813e6b63ec2f3e3bb721b726361f85a734e0514f4e9c4732991ed3998b1ba8f618c2071d1b943eb0f8766fdb7f0492421429bd380deca3325c8d5c7b6ed16429539ae54f1eba39748f09aa44efb67d863cda304e8653ff7499cfad44dc27807779ef8e63be4b376ec403f3c84eda4e5af31c30f9807762e0980b4e5d9dc406cad4e888bfc3ec4186de8ccfcf631b0ba5831747a1c200d45ea06ac82c7952fd09aaae5dcdf5475da427cbc8c1f71ebe5132f2fcae15975ed6fa14a11b38766e1c446894f31c0496b0e5e96507d28e6e4549d6d78841e40630ef306491a1da60eaea3fb69bffcbf192610e2e07bc1124690fea61980e8ed654c5e796f67d26db5de35b4a2c67427833e360ac2a7d4fe7a5ce572144443ed62ac460c1b19402e85c79e3d80e1c143279b20a66d8dcf2bfe1cc44a0f5aa9b0d9b36c46c2cae148dd0f2ffe9a8e6e7274d1832e57aa39fb40553da6414094e838d613a20ce9307d49f97d904648d6460985b01af769800cff9a940f70729fe40e98feb64ff0a81c5b2b096b1a9d832e440c49e4e3684bd17a5169fe138d2544d9806fec027dd2a67f1856178e090f9bb2f9b314a202e7e95f2e41fa80dccf7b1810e9cbcaed2acc2445d60e26f7d63ee4b28e4299e60ea4fc659e7d6f0de91748bf1ede1fdb2acde9482bb76bf6716847eb2dd7517e0a94f0bbf20f248d2c79fa0f518b67a44d5c4c73a9bbc3816ba85ae8344b5f377649da75cf1857d6e4338a76446c48e52cc7bc7ce283d4252f8fac5e1427299edc33f84798316f77bad4a87849e91a1a23c0b7a86898046e278eaaa15ff33730a6d3f885dfe2d1dc0acda2a9e49a71cfecb7dcaa9e70eaa8fe15d4567a280e8960ba49d5289535907e9f277f96e8e652c21d89e81696dd821db5b7e1e53e160584477aa9e4c0e12160c9956df36cce6f4e724dd543827366010ed3d843cdf4319c1bf968a70e9b1b6bcd8af96c9eb0620c569716b7bc42e13251a6adf8201faa129844b5e1d699cafa1b66a674e732c7662b0410e5bca2704c5ebed7850d0ebb825cfb0627a183cc9643b709aedeac2c06700358400c389f99666ae97ccd37f265da7addeb07df9ccad6fa777d0da2fc47b6235179136bbbb409596841e921eb278142a19e6203c7f235bf8461ccadb4b47dd290d36ac27126c808b866f9531261f1e0f5c458a6bab6f064b4efc432e1c7379f9af19ac34c5c22e76e6e7651e48f9ce44eff542f018397889d896cc9001a63e8e455fbe4a9ee9a740edad894fe1af2bb21a1dd0318e28ba982c12ed69c08835ce17336ad1638af3cfe0ea892ab8e83d3f25e6bd98d5e4d36292992e2122c265a26cbb3931dd4c1b0d0ac5ee19974d0dd45777908bb416cbce52531820effcd7f28e1fb2d3d4d826e1b2673e834485a25af9f9d174f566abc3b36732ceefdd91a7c3885e1d10d51c321ff704d0883905b7539309ba5e7b7a2bfefd0494e90e9da7541ec37858ec05ea9a9ec5672b113cd5ad6ebfc5b8fe40ed7c3f17d8a73703dc89086b4d75c5eaf06b840bb2f5b4519a4fb17bfdca9605f17253f203efffc92da96fde023007d22cdad05d18aecb4bf08085c5ca5eecd21f2b611e7e8a0ef981fe7aa2014f5ac6862fab44011dfd33be8a1226943aa7ae5fee9221b0400d9ac2ce5241b09a68cde6b13c47d50bf310ecb37f25c32770a299020d8500d8a4b5d7621e4379dbd6ef34a9aceefd4055ea6144f54bbfedefb5b5b0fbd1d81c7a51a802072ec3d84f34585f22c1df84caca07849b1ef054cbef9b40848e9fd238761df5358cf55a79a53a1bc749e49ffab7c5bd9a28bf24ad5833facf43bcc3852c1e85cfe47929fc49c325c20d74588eb9833519f192243cf96625057899b70a7c93f8fdbfb60d8129d9c43c95f8782ed8293641ffd21d21d91a0b4db69d766f6d6497e9a414ceb04b65425d6ad6c8811da00639dce8d8030038f2d08330c75b0879aab81bfb3330b950e54c13780d308fceed2a103a1a8b77a923b66aba737654ba7995acd306aa7b80f632184412e2369c353c2132ae614553e626f0a3436959104ba6e0040dc597dfbc3602a49e401bf2249699375b2c722083489f54fcdc1f616a133ef6112a1754818158ff78f245b9046100b0e89407f74145fe336976af971c054f12d98002c68b3aa2bd699fbcd71bc4dc071e430bbf694595a951e01098aaa499be2f70611f248a694539ef8936b2e8b7a3c5de8662436fed1f7bc24a4e5c17a663d9a23b4692993301b08cb3bc10f518eca51081c717ec8dfbb0c2669f7987fe6aa0bd98231d8e8b58951b42537f12884a857e02d62de4fda6b88b6b754b1b27394c6a819e0f92f6b2b2473fe245678e252ed31477cc7ec6895bc361b718fcab3aa550fc9faeccfe77cdb5b151ab1db2e569b5bc923ee26f0b6113504d295112d47218140e44652a10af10a088f95c7cf2fccd040fc93980939122411ec643e26e7d69ced3178402e320fe156e774b75b5afc2f3d6b6ab828bb4993b1436faa5728cec34d66f520f59e82716ed6d1324944c3c91d04d5ffc5a921f4716c39de24768484d0096f7d8dbce35aeec22db11f899e5e7e3d57e7668f35d6c0db3542255d9262137d39ae6cf9bcde254dfccc54a6062fcf8982f781d9ffab2df4f49ec04a72eb9646d63bf9e1799bc0bec0ec7f0675ed9f8dc9b8be15d9f2175dfa1c8bc99071c70ad7bedb10a4143fa91c89f54777f84c9eae9361cf7f4c2b7ab873ee5785a5241db0af86f3c6d7f091623d6dc576d07550a42023633a09c8dfa21d7e70cce64c13f37663f75c47921c246f3f2d1d16a8283ce7697da4cb7e016971a2a1d0c59d6202bc18b7cee3828de597efdab53b33a9fb41aa7b49f1c964512901773bb396ac80e90ba1a94c408b2860065ae9aec64a41d76cf8842d299d0babf14d5840d647d075c34175e26a786f30091a24f1ce8db30137520dce1cfffb6318a0d0fdcac883eac603bf365efa2c806eb4f194cae8c16780342165222192f6ee2e103ae2a31dc08a84dfc89c64d2e9ada7ca1839dfff62ddfb7982c79684cfc821a098bc6bf09f87317209b16d14d45c6f38fc99f7bf9bb73460977bb323665d480c87c687cec052a5f08a2c6744c8e177a8a269b4a47a925b9123cd2c014313edae988f8aeaeb633ee5ba6be7f53fe36da3aa37ab2077f5fd75a82a55a0fe62af213b85e9e7694f78cc2b0e63a8c1b89db484722fc62c688678a511c474f0eff8eef1382946d26de00e5c626ec1d7079445c1b7c6f7f05073249b11fd1fb30257724a14cd7bbf451146bf366de2e826fdf1d25705587c4460040ab963e3bd504755b6aa5b18786b68efd3c8e59e8dbd172346fe7f4a18bac98164669d73984044f3c777368f965763742ab86a3720208c64801c796f6e3a1c4748b81e41ac58dcf6ecfa0453b18fad7e3473604f57f7da302e1fa81ad538d4a0280c4ad092007bb9a7a12907227a936871886c699db97d00a1966fdef64d9f3672f1b792c1edadc6781b391c91bea1bd7275f30859dbd1707b1f554e49ceb874ca06e92ab466efa7eeb6990667a27507a7ba789e24d593ea2af8eccb3862cce58daa63eaf212bdd86c01ed471cfc79b191c481ad773d20e821d18af85a7049034e5a9c660357a4c2808b9a6139f32c55c13282b8d98904f4f027d438189dc9487c96172e50dc1100ccc224e7374cf96ea6731032c43fbc9b367a4d1d0b31aa3fa8eb589672e69f1d9144114bbd508d56c2049ecdbfd7b43545375a099ad2885353d8c550d22dbb738e6fe3f104b444c89475a2cc24d7887daced8fa05006c02dfded01c00707e2ad04c41199c5decc1eae34b0c0abb5a5beee1b5253c3350e1a077682767a0b9124a4df2e8879366fd37fc04d4dbcf89883892f46a65ce3aec22123cbe6b3af6364df1f9f5f9751bc8179b6dcc5c126dd65feb7d11a85994e90ab6342834c79c5f82413e88198c73e932c66e3cb60b6e0c0cf438622e5dc5a1036c38afe9cf13559044a9e90f5fd72a3188ef6b1043f5f4e6b40ea51f6235dcb33b3099b2d8c2e02103235f0476ad51bce6d8a2934068549633e521a3ee4c62c22b042fb86c13c8da849233205a5e277aea1129678c31f5c379a71fe08b72fad9449cb923126dd465d1e0ae8a925374149b8248b3afb69f168f3ae701c00f6ea08fe07f1b5338ce6af2f3156ba6f300310114479f2f6119367c88c12c158b84be13b9c8c7b5dd7c90edb5b3ea1fa5927a25ad6d5596992dcd4877f58a134e05dcd80dde4fc2c2a680cc0ccf3084d3f4970e3603fa6bc5a180fcf1ca4241c0b8a1e7c607dc025016e297e2b0645de4ec2fc49851b9374f3ef99edd897c284a67b647ca8c96fcef935d541e9faf334043ea50b99fb8819ecce039227b624e52d8c20003b5a43808e4990da8e4398c4fc172b983351fd11a13dcd2aae5193d42d46e1b57c92e3e01d23fc968c729f3782d6c07dd5a17af2bda96735c12cc7d8023629fb0125e974425f7914690a7ed26508343ae58c8a439ebb6232049a194768d4594f5d65aca37a5686c2a86dd04bef35d74e0755937ac0ce3ebded1c00c8adabf030e5e4a5f44193b62fcf2f1bfa9dca2a25afaf2f1ec06c5d17ef3526d26d17af3e2f257ded24b177ba41c0ba64fd4fbd5042fbd5961a105e0e9f77f3db13c1b6c5bd9a9d04801a5c00a4c544218a21016c65bdff774a44b1d05256e0693e14d76605d67bd10048d3816caf31a6d10886c88c783538bd93e92bbc4484f3388b61adac4b92b911c76ebb1dd11b7b4e40be032bccff610068746f41e34a1fbfbfe5faf57c8a4331008e2c1cfd69f57e74379ac80eb6769f4ce4196795b835201ce4ec85ebcaf5eaaec242fe6695cbce1d53fde5b002e006bba8c8a1ee57da061ceed0d21bdd57ab0cab9e46bf3764d9a6c3ab19736d43b33f32eb955f9174ee4a54666e7f19cefeb49aac7a59b7370d9ae730b7bb4e08413222f0a66bfdac252fb61bcfa838f262312febfde8add8f6843f1d64ea3da42d4ef986498604d65737a44f5a099338520cdbdb65ce73b110dd4bcf8592a4adc3e0170b13404f99f0ec8f9fb225c1275a921f09369db165e9109dd5be472b9bc1901bfd882d264d9ed8d88b4c8f3b35f88b69e3e4b8ef5debb895be536a3af492d968dc1caf31879d672f70ad9869ea98335cf9e4a2760f955fd3e8099e4b2eb4269e354548f9de9921e50e49f3f5cbd63468b9db0cfdf17250c8f13535d4c0a1f21c87967cd798fe93b9b2960447401ef90db22c3adfba0f55f5585ad37040e8d6745184dd536d5a26edec365bd6edff1bcc616cdea3bfc8b9d98c0ef9a626054e361194cd05b2287612399f6d3d3be2f71555f14ad2893af6f60ab61adef663c3c2464ade671dd5ebc71935aad290573588fe6e11f48cd2b7db62e4b9932890d1b96e1b83eff70f026d199db75fb1e83197c937b672613c66ea131f485b4318e27c079b4018d4205484993bf50ce70275b244f2caf47cb47eb2a9ca59afbc78809a912eb56a4bb65cae4694f682c6329c690003a1c355f779b5857a60091b1c3685995a366cb43d753a704d3e59c5f5003c78feed877351e27334b3fdefe5907edd9eb25588a42248b9c4a93efa7cc63bad1e5900b95b70436c35eb85cc8251c4030fab9556920141cca24d6acd3122b92b7e868dc174bf071117958a4797fc90866aca685f1456fab397ae647ab9970348082bd74865bab7f248568db98ced7ed84e8360fa91afde3f23509e6b4caf948349ad9fb6a4efe0a0468302cae7a0f999195af1c19058669fc3b88b2780b9075dc180298498caeb7ba0cf8bd42eb36b1959d5ad3ca6fd1e85f76abd27ec5fb637ee38173ad7d86304d5708b6dc8817e099e77f5d43c1a70624cdb96e4e6103bb25e59eb51d894d1dc533a74005bb79cca35b66e10c61d06b5227fcb071457025d605a0862218ca252b871f8343ec231dbee15688aeb914c0f16ebabe6edb0a489b2bd10d4392c6f1863bb6a62181de7cef61997ab02f3bad0a893cc0cd8a99cd7b3f7773085f0929de36b5d124e3729140c375de9a2d0cd9a360cadf17b9e45b7f2adbdff9e75b743b62642ed67aa703b8ef33dcf51a50edc7dbab42d3d2b49badd2457a9f92847aa6a60ae2beae457a5fce1a9e485ecf907be22913893cd1350f20fc6c81c94be426eaf01864e813a03e4674491b61516bc95d8a77c15f03d0adfc4adc27f27a5ac4165ff6518eda1a5c408708f78a9e26b834179804a312148d4f75f21a77d78387139da40c0a6293c2a59d0162437d68504f189ed970c5abb9ffc6d8e1be2b0877c7f24b1dc273b1765bfc5ce6f4b8d99a96d5b1c92ee53a39f685b304313d909c1ba8130d20d51c824cec420b0315229df295f75b453a6c131afaae0c36d7c4fff70623638a4f7ded5eb7db58d95deb6249a29b171d8ce651556dee8037bf4ca74453a4a76aab7cc07ba44e55de57dbef8542c3851ea353fb8e259ee89bbecf9ce8d8bd6227afc0028afac48a7acd9b4e8cbe982eb1475917ad6be4cdca9cf6e7cddd971b2924f2bb730264801685d387485e41993c3fa0af9987e8b52c21688fd9a9595ad8d1b9f41e0457be18492aa09f69e64e2954d1ca3cc1d32b2915cd9cf6862ca79c80beb47347c4cceadf48a37b29b1d6de4e94717d60cdb4293fcf170bba388bddf7a9035a15d433f20fd697c3e4c8b8c5f590ab44aefdda94681407008ea48d03ff21e9bbb4ae7a9aa37c855fe3537c44106e8079f18c24d2584474bd4a99367660ce6f7e6d7c294961e174366e7babc569d5f80572a21a4bd7086629363e0c9ee2599c8b8863c96613ae6c32cc67ccafc66e1cce79654567ad08e62e9abc99e44d6a79ca4d8de15b7f8a763a4741676af0e1f3bd4e002c8fa1ebfbb3bd3a65ae68a80c230422f98f6e1e9837252e045eafd585ba389958297d59aea1e8e1f665fcbc5f7ff449996aa712dc0faf582cf3caf3dbae80594f9f07fc06de63d9d672d14d7ac4662b4a54f40d4aab2de766910be2fc7f6f679b5708790b5376498d3baf0463dca2f093b51bb7e9f3e7033ba0384af0174becc3bb477bc5e86959a12a5e8924adf0bffdf5e5b9c1cf24d232881ad5c05c5c0f50318ea83d8683339ca6a583c52198c00f7c1abbda282e7fd3b179297338ecf9c923a3a87a130dfc06164e9b4c1fe11d51b382643de44b30a6831dee119241d1b6f84f2484784fdf65e41f78c38e15fb4b00e45df1edc40e3467cdcda351a4c0a0185ac4649e91024377e1c331587a8586cc0a4dfe29e14004c3536d305f5dee0eeb8c2f216c1b8d27375b239f6458e08980badd6d82e9ee9e007578c0a3b48288d9ad0ec3c934a99a8c5741149af937dc82bdb545df26428b87fc935c05f1a4964a8408539f267e23de9bc498e2a4b0083cdb7c8e27de6252bfaf680a6d5b7ec1a6dac6d7d537334a95f1553324a0739414dbdb50445a767b0f589fd4c33b35905577ef5a53b0f097191f9cee4836a908748779941de2a78fe1bde0c2efd9f48cbf232ce101d9df93d3ed40d036ae7aedc3a5ff619abd1c159ca8d2dbda7de13b4ca62576c7f925c52925eae2d7500dc969fe14c0a335ff95a7df1d276a6f242765c781208d59edb5848d412b11638b27ce5a61b8209075976c2a6aae88f6e6d8704fe9e83b425dec4defeeb3cd311b8c5a818d51f917a8a4525361791d5c4fd5d70704d4b9fa9df1ea119882f400e682753a41931712c043c120a98f0fe786a600b47befefc9d64cc5bbe8a16c191490874e258760c9e4fd215bebf848e0b4d35521f53ec5f9308644b785171fc4cc3ff886e034bd833d59dbcacebdae8f00e43c151bcb24d1d226d1cc19ecf349361530a81ba3168af3df5536fbe52b3b93621f57959df298e5b4d3c14928d2ef7b9c977c7dda54242d17f8661978a62d94d565b00abc199790b9b25fbfd4a3ffc35c95ccafe35d9a138a2c24d17f06ae2cc376e822317f16fcbcd56e23f84ec135dc935e58c61b34cfbf5a36cb00350483b6bac786030e5c5045a6b61c9aba7dfaa4f7fb21897539863ee865ae061a77c0359915de3aacb3b5dc8cfe53c4d17b393c2b6bb23652f36390407922969d510cc97b99d1df4361530aef10707d7a021b2d9576b2d49ca88b3cc83ad1baa6d88ef8c81c08f8baaf515637b21ace9d5cc8fd9fe4ca6c3aa129caea7060791d566f4de8662b90f9e5d849cdadf9bd23cf6737b07ca105142663c30de27adcea11d64d433fe1ace84b0f6917c8b655f2a421602f07e0a7127e61ae9859c5e9f652ec82416fd2566f291f417ecdf99bf3231d02864e2e5a1cf34c13f59de9aa2760d8734bbda79576c62f566b8269990e9384a41c1634271acb4c7a8b768f276685c3a8c7f20872e56b683244b1af562c3e7dcf592a9915f44f886cc2ac5f679c07d5aa1fd69cf3a460f25c722073da336a310aa551062d92c7297002060072af2f3500b9310c239bedf45c5e985c2e0d60c7dd68522376dc7b560fb34d1b5089450c32ffcbff07b35a96bb6fe01259a06868d00af697f8bbb238d03d49570a109181c9576c1ea9d2ee02000cc23e63d6c93c6cf3050bbb15b6f73b09c25da62e5abd4c2bdb1110e1f25db39f04885595cd6a388c4726c8d4cdbad87d80d42fcaeae843e2e17f44c9aed25c8f6f9736c7ba1bbd3b839126de40a930024a65aacb872936e446114e706a868444cb140e53d976816983f3dd1d57eeca01eab8211b7aa8ae99d26e35c06ea4b226e0a6e52172a40e7f0df5f67759ae2ee026749ba10b8e33694c3e01a001526f9d75f6c419cdccece3ea3f78d69014e509c741214581034bbc7e2bbaf76db8421154abb2233117a1ffe2786b21424576e295c9baef262e80fa2edb69aff800b3ea436eb827e8adb73abc48d740b86c69d557b16e874038598b25f616afeb4f4a900be7dd0d38b5b6fb4259c51a3aaf4748d7a445f518485ed72b25c7df8ed0906b74bd29bd6a5724ac3a503c990f3697a5db484821f68718470810862728a80ce34599a41fc5bd8bb46dd845a4812ae1532c457ef4211d0e41835e5a6f030247614822571c930c727ba397e723d6b3aeba9244f054e331c82e65b74c9f6504c74b4301499a1a6f6269a3352aff57f88442d4eda42a82ebcf7776c5629f97d6160bffdd8282a40ce2e6375b161e4c22ee53bce7a45f4774aa827e2da657e1a1bc07445f0bbd770b7a5a25b1b469fd58715510dbf8d97af4e1b9459a20b08a8d3fa9d92feb32db95b22d36de0bc8b1c397b09970a6826392fd8392b2d790dcc1295888f42ac81ad213c7328b2324b28be7cc1f4fb8414a7785472f1dd3e11d66017b1756d1697be92490e15f056346d7e9126a1f35fd76cb016fe2841c8996a3507c4fffe7fc45026df10b03b86fb6cf26e8418926a030b5fa62748fbb728fa19dc2f8947468c1477750771e442e4a9d25b76d359211c05df788ade5b7824f8770b5dac0819737dec916ee59b28a49666ee8b7ca81386eec8049542f18a3207e51bdbc291470eeefecac385c096a
-MD = b70acba01bd715f542859a4224d035eb177fe7b34d5447e099acd1716ba6d00f515bd02021b5b3015d736b04687544de
-
-[L = 32]
-
-Len = 16
-Msg = 43cd
-MD = 7c5f9ed821a021ef1850dd4e0b179a656fbe27b104463720f467db32bbfab5a4
-
-Len = 104
-Msg = 5f75a437ce0698a7d8151c3fe0
-MD = 774782a9c3023dcef8b2cb83f7994324e3cca35323419b3914a9b6bc3ace5ce1
-
-Len = 352
-Msg = f88bac738d1e3e10f75e46e3fe026d7e423fdcf3d7e4028b33a291bb4aabca53f780fbf99e0346d610d4a38f
-MD = f114f1a390bfc30f34652751f3a38e8bdc9597625e363689459b80082eb34009
-
-Len = 488
-Msg = 832e5b78a73a1012ee62e00621db7f4d248893007c6e5d6e0e689c6b291baeebc72df9cf10b289fe20e7fab80a2399271d0ac63766049da875eed56264
-MD = 7d00fe393c308eadb8c0a4f771d409e17c9a796e63b45fc8e84c0cb2bdb62532
-
-Len = 13976
-Msg = deab57cdeb41974037a9bef5e292894038264eb4d8993d4d1501e6ef9c68fb0f571f57b0925640925deae9a6317e3bc4d6cdd5a0833e52fb48baca16a9ba9b6c8ca469a0555763b54f04c87d4e41aa549258f30eefe5a52d2ba06657a8773b0842e094857b6d8911d6a0636280025e56356fade362b4bf4c875cc19be0c6644b447be0454dbf390eb966c03e10e9de3487b90d0825d327c12495e3c89ad09c9d591e55c91376fb14c2fde9f7461fb25450df1a65806b65f3caf4d5c81ebc6e664871fcf915b9578bb70ee6776acc62205888dce2baa4024941209e81b4b35f0eda1bdcbd9ab1d6db6140bda4c41776fe675d5c681da5852d50c246dda4ddf9fdd7c5fdfeec85ff6c883c78689c2977584406a1ddef977606c182d6c33561c39c071668a2515e5aa6f4aa1faa392aed95b82ab32b79a15e3b5a07551ab068455131b72493126470f26c30b852e4415e1d8b719b3803ecc336e4facbcc5d1908851f4f39b776bec8b6b9794d47e5965458858560eed5a0305e260240c0849d93a19787b0f8c795eb5ba32be573845256ae6d0b0a3336e42a1beac8bdde6d1b6e0b6207903d4b105f4af2ef89bd099ded870daea2f170e03bd5f6f4490e60bc222d4876e16d4c58aeea6e6c400dbb9e9f4b2b142f0fc9bdeaf4132ded38a4a8366e107cac7210945fa2df4b124be37ef76290e5b9758aa3bfe0091bb0448206323584c2f833e0edfbdc0c33075fc9647a3404ca490bfab94302a0679a1a42fe9fec6af0cd98038b09ffbecd2832b579b2294f6ae5b96328fdc0a0b9b3a32cba04fa8bae3389c3951173bdc17caaefe526aa386f98670b177683d0b804c5875fe9c7afa233ee66349c9fd1b60bb0becf5e1d887e67fd3baf34b4f90d94699d18d6bb9d77d4af358f31edc254de2d6c5fe3ec07425c633b18c1b9e3606b78b40b543e1fd31fb578cf58c45744fc073fbf3c7d7d607e815379a5fc565892d81560eab8fb5f1ae6771b998c592e6d288014f13ab283d53fcbfa66e31a9d107308402191fac2cf2b799c7dae91b93a7676898b8a6e516a86eac58ed8f6d8ed2fd4d38031e4a4466dc8798b90c48e6adb6b4391d47872443cfaffa542b4b132f6c3408f0081af8692aadb4c9bbd55053ea56d8b82998f6b4b41d331891acfe6af1bb0d6679989978368ea463743b514866d2d01fb9950e8990867bc14f1db1142254adeccf3da812949cd03cd1d569e9d0bab7ca7405cc21096e3cd4d007cbb9629372e98584b4c6b97ad0bc314e1ab6ac71184ee555c01973570ed9b115bed956f9e4e349083013098b1e483f0fe44d5e9849f38a2f7ae152b36a266ea1faf263ea8c706632ba8629602187379546fc6b82e57ededd6d074c15c771754710731e07c207899eb47e8d7c72ffd768c36257d373375ffa06f9b3f0af11417f9ff9f9b44e1f1f96ae8aaa429af88b14da1da81c7bb38a0fe9372ed6a9ac6fb5e9e56b82593d94c5192904450227bf040b7ce0904789f979845e112a1f995c849ec3f7e49bd975a474e8201630f40fc0d80e76019f110ae158cd0f8da96ea4561f24237d8e795ebf52368218bff3e9d5b040ecd2caef4ab1e7127e53bfa2b3b4fb74829f9993ac703192aedef79dd9ad24c2c976638b4575afbce22ecacc273ba43379ed55ceeb51838b0adb80585bd1b5f2707ee16b67a7232adf7163415b24b9ff9dc94b7197fdc89e2a90d2b9eccde45e965edd064dc0d1eadabe11b8ec3aad2742b5d3323ebf913a92817749090c20758f98aef2544d4c8b48874e8936d7ee492d5585675c214deeb74fd67c4d170ac5e0aeefa607c6e37abd4f8238e776fde3921afab75cbd8f392d3e88da057903ce2e140797f4a85737bd89455e6aa27c7535687b78cd0ea59848e006c8de9c9c0cbc7a9f5e977be850adc710503ce4ba7c7bd0b042297f518abec6c8ef451c33e030251f506cbc3744228b6bb4dab86877d9e6019a0ea9f39ed37557b3b5527c171da5f013e0d3c480a038cff2c087d6e5d41b17e6c8f90c334b5e2b9ccbe9d4efd99fba1f907d00a49b71b5a08aedb644fed24bcf04e71be67b03cd20d53ccef8f854f5e9f7f28c1e98a8a53496646713bebe15a93f1ea336e6e8a4e68de5dab0fe880bf983eec75d1c5027357f6669e098411e0bc3ea2293138f5b34425f78b6508b94d4c0cc32ee9afaa409a26e5f2a1fddcd6d5ff42a89755a58b08f243957a2e208e24b055f51992ab447bc06876eba169c545fa71b88a0fc15d1e0be9d334a1dd0c86f44bd149b42c07608a9a30d0b7e13574f8d862f2ac72b2ed38904d7cab194fdb9e4dcb615f5610b24e202a36866baccac01fadb575df11dd43e00a3b92fcdd8c7702ea49d951e7dad2a56c075730b4af1ceda2bcb2310256f28312579fad40ff471336ea6a44143edfcffc297258d48bd2ea47efab8f0dc00f1e6dba1a55009ed627b7
-MD = 6e5905b22cb95e48b73c5a885f5463f554d81257bd26301c4393d57fff1c8323
-
-Len = 48824
-Msg = 5223e2fece634a95e1e7c83ad4a11a0478f4a41572bd66c2d7902cf4f94404cd80b1f58fbcb8eeba3984fd759410c12f8ee922865f363f684df5a8787c87ceb3086fb8535157f7f39653dbf5c66ae7219253838ec77cf1c6db518225c5ba0a8212e5911236474b8820ddcb8111b87320adb82ff553986324aa2a21c37ce4a083c89ce9931290d4c1fea933e31d014d7507a28e83aa917ccae10bed1a490e77fe501b299f8e3b78e659407ce1934d5d68c7980800746f26ffa9794ef1d23f793bd2eab7fe524e213e58280f441ba48b40162305335b3a480c2afeac11c27f8d817792fd7805d4b61224eb52d35c0fbf471bcaede505fbc9398b216f43bfd69b1a669a61d44fd21faae410af58ff95e1c3ff1528de1aba93cef56bff4d714d8c4cc88a4ddcda52444ec1208d99ab3fd9fde98c1ee6437d8d138f62c5f782eb4660c5eb28564b5b0d46e3a2546009148f3d02b837c5284e9f508290270b97b9b29e84445a0b4df662d9711e6b73c11cebcb7120dc427034b1ccf57d8e4f5bbdb84d2e1d4bc3862a2b51931d3c9a7a5fd6ee5f4c7327c338abd011af638d730141b6eafe63469eff50f473262e9fdce636eff4c5663acb6075a4fdb00c8b8a8d3322e1700a5b3e7db90b36c1a94991b8f51657121b442db6f890e208f312466778d73bfaa8cc0ead4edd0776155f3eddf9abb1bbfc0c94421adce83d7ee94f99f61e1f25a55fb596f8b40ccedbaa8e5e2cf629496f5ca60bc4cf36d917da4e2b973eb57869dddc409dd66d5061f22642743fe843defa0b19dfb2f56425abeb234181267b5c0d2ab4268c538510feb191bbcd1631b0af6c7451cd4c641025cd8bde2d9ab6e6b948f97c1ee6f35098d553e8e9da9b4d437125046864633f109d6a558b38b270a7dd1785d44d248a863a91e3db5c0a1d7ec133decb65e81c3402c98ee329f660a092172bf6b1a02491895394ebc506882805a6c93e767c0e58a5af717d950a206c0f0055cb39ed88816a9fe3613d15f608e486ac08bfa67d462d24e6a0a37716d3fbdaeb9c0e951c1e847fb884ebc1cfe707dc6e7269eed1c44331d5957bc4ac9dfeaed4b157204a3080fafb9df8917b8d15aff9c49cdc739b8fdc26a546794991c183fa523d14797e051894f48b0d62c2b70834467ff9c993b82fc1152c1f5479ec6144c7e8fb10d1bce26bd1cdbeec4e95ee073f3bcc3c7367328e30543d371b27509a577f5c79f14d5f687ce62b82f856695af9f7dd350543ec763de75b593f1859e44c2ac01ba65f98743cfddd8a89a38115badcb51a0ff5655f830c0122af6a830aec13ae5eb89a93755b3a5a6eca233f21cb12db545a24a5334becb8fa32c3d7f5805faeaaeea85a551fc62c94807faa6474c0d74cae79b5d8ddae07498fcc5b8b4f394867112ef5fad1c9da66765ecbc7fc0f3269d29c9c38817c77778f2c19b5a3c705fde9d76a4eb86aed4a7369a832ad267312903462397f7b8fecfa8b195cc2316cd53e48c3371ed2ecaa3e484b8ecd2e22b1aee910c51ed5d71198936266f5a00655d82c089f49295feda0a2bcc1a54ec8adf565acc3a8b2d74c30eafbbd843c59e67f293f6d8296cf7b611f01b57dafec6e2d4d411a633918068c38ef47b72ceff1fae772891141c3bc496824509d78165c1e4cd4b4989321a8722643eed69950dc120fa8da3e53c3181f252d7c4cd2cedf8f086f788ee77a98ab5b019828aa02108f49ea4a51f457f7adfd2220d3e59d5f4a29194e8f5eac40ff80312ff6888ff6393c3fc0914b08c1b9990d247ad80a441558db1ee1203e07353dd99a885a7ff5d791af2548815dde0ca1f56f89d39ef6b93dbcd0cd54b854173903c12649587433f0425fbcbddfb66ebce3eb4800dfddfe7fc44d9b23a3916b1db68c187da4dd13ff0157352814b1a792de7fff855761abc6fb7b93b48525fa90fbe3a51dea974069f3f5fdea86387eccee13f58a8eeb8abc6a43fd30e9788c3bd9ae1751b30a82d420225b2abdb1bc121b9073380be16107188d20be54f2e9c658d5b443869ea0e991c496104086290b6edcc1b656adf94f0d42458750fbd8d88040c518ebbb644f4dc4f7c6971d8d60eee0272df7b51a3d5248b4b264fb22195ad891fb6ac994ae5c0bc6714ae0b0b9a484edc576638b78ee89b568195a8f33ed8362128c30f9b0c7804b3ce1355abc96b15aa55c1e16a9e9ec90d1f580e7cb412a7e85d8585bfb950acd4de5865214ce4db7f6314d81784c588c1482d5f28c5fb62e7dd7aa8237ce9396ccde3a616754414cdf7b5a958c1eb7f25a48c2781b4e0dba220f8c350d7b02ece252b94f5e2e766189c4ac1a8e67f00acacead402316196a9b0a673e24a33f18b7cb6be4a066d33e1c93abd8252feb1c8d9cff134ac0c0861150a463264e316172d0b8e7d6043f2bbf71bf97fa7f9070ca3a21b93853ec55ab67a96db884c2113bea0822a70ea46f9ae5501eb55ec74eaa3179fa96d7842092d9e023844ed96f3c9fc35bbc8ee953d677c636fdd578fd5507719e0c55702fed2eaf4f32b35ec29a7a515bbc8bf61f9baf89a77aeb8bc6f247706c41d398cae5ec80b76abc3a5380001aea500eb31b10160139d5a8e8f1a976dd2dde5ce439a29dba24d370536a14bb87cf201e088e5e3397b3b61477c6a41e22a98af53cc34bc8c55f15d7924e7e32fed4d3c3ddc2ac8eb1dfc438218c08c6a6a8eea888b208f6092dd9f9df49e7ede8bf11051afd23b0b983a81bcc8d00f7d1f2b27cb04c03aeee59c7df23a17775ae5984eda788eb2015680ac5610fb1380b4e7d7a9cda6178dca98690449f5551b66ad2826cab2b662f56903fc95b4611bc86f7a834a34ddc3be7bf142c8baa096abaa3cd51ad0c0b6d15e590eab9e50a4c60c91061f1ed6373d91974c1ad9d263110a0d43fd8b596396cafc0ae70b7ac24a59bba090a6994ec483db7ed4c572f723670a11c724e8ffa2497d8fccae37eaa1d14ac1537eaf80efbd2e597b2ffac97f2bc3cd2c4017f170544dfbb0d9109478fddf06ec0981542bc8107a725be25070d2cab4716f4edfad75fddd582ebd363c49e8efaed9a76ee51f22304eebc232a4f67f865b04f610a628fdb317116666785fe8ca30619a07c83cc449855202d687f162b12d93b63af6e7ddfb7223d4ab998a5f450523c1d521ab76f4aa113cc2967e04a38dae07c51c2d0f44fdc8605c3c53ccee91a2c73dade5dae021cbc87d5cd6e5fbefb65335827311fe1e91921ecd66b2055a6102d7a976308a80c44e6d47a67718c84f2112d65486a558f1f269b91d9f47e3e11d09c0c748625bad2718e3674898abdb19d3644bcdc9317c09a3ac02f514b2a57e6a706362e5f6e8fb16cc83daea0eec85fdc8c367d84c9230730291440a4b109f7034d510a3f70a22dd4fa69e8b65e5fdf87045d560eec71f4e59531c7711d4f8917a96e22ad07346d2f92a13fb4569fa6a075da6e1acad1eac1cb2ef19ab452264de2357c927c6dfae6598cbc821eaf3b8da754ce91a96c702c95b2c308bf3a550cbf4d22d417745b5f17d36608feb826b862747c59d26a0e8eb96547a1852f9fbd095f1c5d20721804941d462f3ee2f0876ee2825c8df24c4f00f0844e50588ac688127013df8eba3c971362dd255420649245e880212cb3d732fb82f866dda090040f28e09cf1c86eea5dc4fbfc373eb69745b4afd841ca8e172d4a8510e7698345fd4cab9ec2ca0453a274720bb2d2e5468bf0d0f85919dd762fe3df969e6c071285e25c2e2a49659b8a78289aee655965bfa3cbca9b292a19a855ec40293185354ff4da9451ccf98abfda07f1137e79bc89d688963081dec641a99656b040637402890f185edb28e7e6a2f65848a6af158f90eea440aa6246a2e6c31f5d220b9846aae2027afe5a7caad6dc16b56463367cd9e73bf22a1d6172145de4565ee369c55e3b99ccbef70fb080a3748340fbe8f6b95ba46e8b76de5a3c4bedc37c55ae24ad02267da26769a3a732badac2e0f3a5393028dd54d78701647582cd04c8310e9f1ff1b433125229547130e1737a1f33604f0d670ea7221097c3eb9c7fa4b8293d7b429af76191ea8e481dc1da31344537a09b33404d782eda1d6f5775500c1d8efc615778baf0905d9fcba1806ef986c40b1c6a72335104376b58266c36f5939a8b95123e8635c0c95e80aaeb97379b1179d6332dc07539b595ec32eebd3a336a1128f3cf2e2924db6d8504a516b62f26d012b7f75cab765c8374a3824da5a405746023b51894649ab422d636513ee809fa181d5b6fbc63351e37a1b14efc8f739e86ca78ae3e280f1c9e4824b2976ec4dd308ede6171a7474c7f530128089bbd75e10f9e57ee17408b4384f99f886a5f63a2320a9b90eb9bf692e1fc449171eae3bb1bb17a6ed937ea57af3c82db84e073b5306683e1d63705b9742a085fb802cf5a1639818417fc2223f476c2566351f4b3b17a822e11255f3c3412dd39190e200727bcd3f9799519ef792ec7c2b0b9d0e2dccf013d436dee63483c2ce83c15c00a76c4d894a60cb90366ecf9e61221ee8bdaec66d715159876d8305b35c81f96ab2cd8f81f4769e9a6e439c08c329036f5d2591ac42f2747bc0e77d4e566358a3271819b6003b290211b9b847ab70e906aed9f86cc38aae27e1098fdc3bd5d84e66c45292183f198bc329cad794aa4e430534511b7d9a75104061b409676a16c1146af0a286e2de8bf51c4a35193581a902bd3224cb9257c961989042538092af92644a63d6d6f6872a29aceca39341ad29dd22354812c4b7c7068b039ac9ca7e6358e662a28be001d4aa697ace540cc3ed3c97b98d8c5a6fd3543ae9a7962c9229b14b0b646229807747064be3e83191cf24092dd67f675638d9f6510486379f47f5eeda870a3187946819ec9ed05e7b325bfd0eed5c9a0f4a2063d63c1a8a0a309f586c94d4a68bbe860ae9599ce204c92cf9d92cb460ff99cff9e5a8b3824786360e1e1861e71158395faeaebe7aa2f61f76190f174aab9a313f0bf4f1befbbb22768b8c22719cf3fa9ec908b576fa4bbc084b1ee5b5a7eddc89b58b45ae7b421d38215aa6e49304323eb4e202655f3c8b16ebd6b03058e75a907ee63fcf6aad5eb96c1e5faea81b88b5eee525c4663af52877c0f759432913b9d48030903e7f9f70e851cd4e20bc56aaf36cb02293d992b38b583b8f0b25a08c3303d8af5b1b37f5127f7021b13934645ef3020e5caadc5e7326ed4ff56f797e26cb986b6512b0cc76f1d8e7be44aaa88e12cbc644f14a7feb979d2ab66907063c51e052d0f8b25d827377fecc5111be0d365e08d17f559e3134cb9db294f1cac03150f4232f853ec15ecde55fd1023b58e83934869796400088e9177e85a2227ee45addd049c1d6b03e5b29dd570496fdb2fde7d8cc74fbb5fe76266ebd90a3b4d57e6e6cb9f0bbdb7ca03ae955915768011c714c909a27ee20135927af55d4feaf2c345d029a54af942da6f85f2103345d059f66864e6b0578111e2ddd5a1cd8bbf4ae35b60747b93f53ec8ec64c10cf4149909b102a2b88712ff3e5ba3611cf96585a6b36fffb64b8c37a114d6b16a53879136eb0b5e003a5a068e3e8422a4fc8d7c77227cce64ebafcde2437166b62ccf486660a7a2ef37012ebacca26ecd5bdf363feeb06aee39050974c25d6a564594c67f56fcf7ed48b07fab4e25ccffe002bbe460325abafe37f23dd9c145b4667f146a1635e462330f02470b35c5a2519f1350c02b263201ec9026cfc57d3659373910e878f2b6c1c5be774df8e01e775d476956c257bd0ccdec17ee939c46e5653d5813eda752ba7bbb245a99a5db1ae55d19692074c2e5820df97c502a4bd1b12929e1be8e9ce6d802347c3e9c4202de6046436c05ab55b2fcb2c227adade6c2046d98102cfd0d859a91f8104eb9f6f155da2acf93df2405bf2c083eafd3ec41d60b810e0bdef6298b21193642a9c0c646bc6771a5c61a25604d96bdb727abd5a7ebe4ddb2a56a6ddece26d8007b26043ad44279c3c8ffb7e6ffb3cd4e10ea2780f509a8a9bc31f99a7e66201195f1543a0a020f754d9a665a29a896faf673df6811379579891374c71b2234fc61e95d4d46f15d44bdb4d7c3b3be3f46410ca46827b8cca976d8866e8ca33c4945d5c87b705588b78015b529843af0b75a7e1e871fd276c1e947d896b92e6181ab7e3ccc7077bb57fe85a6958667d3d7a790f6cde1cebb494c2912478a0eca2bfaad62492e9f1caaa0cc520da08c0d2d910cd44255f4c2ca0646dc89e789a1cf9a28e2f99315d33accb1639cbaf0c94181b85fef648bb4cc7f66dc65b8e90bf5f3b763e58520098febfe7e47bddc2d9cdd5e40dbf4ddb8d51f51bde2e57432266d248d13ed09e62f66794d188f9861c50ec41f0eee30f76f4ece250956733ee97036098db41991a4a3eb7816196c8e447db3a2913bcd992174a7bde1f42d57c764b47f5bc09533760c1ba74943a0dca291f2746bc1fcc573f9a22c72a5eca347b1679683fbc8f32b08d381baf67b7266b14b3ba46a04a3ee45881ac452f64df1bf17f70f4cf9fa4dfed9ae70184679184784a0451d2f5c19c02031e0e4957b4df68b4a069a6f6f6458f6d773924a1841ba664a55c2c3187dd33416cd410e56e4bf8d3671cf737bf67df2a4cc4dcc786872b9e2dc4009fea0e48a749353ac053d80e36357d24d468dd595bc823017c015d7450fe38149370c5decf13b00b6b0e0a2567ac08b45f7b0c8a7c89d227219d051d17a706ccbea49a42035cb327381568eae23b5e2a3b7e8beef6f260d24ab224827ca8ee9d640dd23eee94ed02c9e26abb3053cbfaeadbb1f365a24d8769d92240da842e0b361524020b5c9c22a2fd8602dc9600aaf02b35344309f6bb018a94d4cbc9639ab7430657c4046f0b25df517e31626abeedd58c2e19aa0ae1a43ed2bacad91dc04a2fdf9cc33cc420f4f04379e95988ab36731d5d5402d89fb47e826f4243bb206124364d63564a0872f8d2826eebd9046c7c6f2e7c951e49d4b22a7eec89da1fbed890d63ef15f26422185143c89da3ee269f83e1de11a7467822146042be92295a585e3a09e720ec522e1cbdcb41acf5ac45ee892677ba3ff670d71339a76ed98237be252ae21268e756f05ba0b094a1803f9da84a8a05d0ec9456cf565e1b548cae95eafa0fb01f091935e6eff2413bcb15f605f15270408216fb5b41ed83dfa1454c522375e35bdefe54275f109d0ab450636ac4d8e4d9e27f2d81a15b8cc5e98549254a1c9162918db3e399118f5864774a9d6a2347e1315753071eb1204c8bf5f52b1a0da37e484ebbe545fdfe6b031215678c3b83a19a24d7b661f626beb01eb82b384f02f42bcad4f40addd48db8a92b90d2297e6143702056123286617f86fbef4fea940f648867d790b8f803abc5f4e0e3f4226954c296afd96e287e21b7243d05e743161810da578096521805edd81f68a45500f6a3a1885cb1f45cbd399dde024df65072eb973c827fca13eeaa3f140842016f509aa9ab4603d2457c92cc9aef24950697a0044e3d7c483b8d8391886cd50dff8c2f16de3d6caa7f864c1b3874750781b2b78b545a94b4da0b0036433c6561f5cfea50eae9f5645302eef18238473606e9b9931880d0f6368fa9970d1ffbe59c4454bf97f4a5e8091801b53ee4a209e0642d83605836f69742071aaebd9d813b10f4ccac03851ee9f20cd1351f8e68554c9bc5f58ad19d474ca128edbf561d195e52ddf3c19bee3bb597ac2f92143bafc98bc09fbda6d18dd4ff2a93cd2ba17f54f75c32d3f141468c2baef4e53b6a340286dc2599bf7bb002aa86688e26f5b51a6aaf32e48ffd539d4f3f4bbf0cde2d20138151c82384f9ff29a634ab4e0103d93340bb9a7b0caa108bc7fdc88d7de14abb17e9efdad2b0f304f0bfcbabaeb1b9db75959dbf54930e67aed3a9c8309aa90506b6b9ed4f1d06c4ced19746e206e1e9b8879663bf56bf6c5c920ac5e09e6579b780cb63e1875ef0a731b726864b7ae5705a2d6d343a4a213a05928b7337a59f900fd04472382610e2a8d25383c9ab5804d609e79a88d70eaef3ea22d3aa9100fa2a6e98e97684ade9fe90d6bfc59dc9dec3d3d8db8990bc2123ba92e64253235e9b4d682e8aa04e23fb9bb6248a77c065e93249de829bb2fc5ea9e396461090222816bb29bca37bf86698fb995f62c50110cf418bbe2078a56c5f1ec9fdf3d0b09a719ac253b5bcd00932ae058b86611aff51c8ca8448978615854b69b0216a6eb8050ce199fd9a13aa0fd652570a1b187f61e6831b3a960521c3705da8c5e6c64c7b196ed4a49c2912d77b670b177c6458a7a49ecc1ffd8c57c0978d2a05cd1f1c7ac9514dd14b7b0933a52cefd40b6452ca0903df1f55828025c7e18109a6e0f2ab25724cad2d6f57cb5d894a6a508134731e9b9c61254f64990941f4faf97394b634b91860cc6ec346aa666600d323c849ea4c4a0ef55acbc56495ca004f3fca42ff0ffb11b0e1164c95ab89bf1db3d4f575ff334d4e0d7d50e0c54c422eac5ef78c5a3be95f2e18872540fccfb597211ec79d9d47b6cf41e385b9c2e92122167fe584210f63bf919c620d
-MD = d7c901f0d92a868dced7e2659e90121108611dd7781325fc57e5c336c2279510
-
-[L = 28]
-
-Len = 16
-Msg = 3dd2
-MD = b7399529fe614af98f9ecd73e45790406883cb22e3bdcdf28fadd033
-
-Len = 104
-Msg = 3d232201038fe7d846ac1bd4c6
-MD = d0aee5482c509540a4ea4b902bf42fc8df3af6de42fb14e903d1b2e4
-
-Len = 352
-Msg = 44c98cfc71f82215dadf494d68d1d6b92bb4eb81fa0fbf945a659d9aa2c2302b5c93fd3eedba31e479e29d36
-MD = 56c22e6066cd4c4d6415c5a225257e7f888b317ba4e98eadb72b4be0
-
-Len = 504
-Msg = 02a5c7b1b749d6d49bed302d9439f23ab83020bd4d573906f4190e74216ad33aceab775f71cd31092bba5cfa42f0845bd16fc1b8bed6434dedc92f80b395aa
-MD = 33a84e66cf1ce6970c35807db25e05ca05809e53d4e34cda9bfc0045
-
-Len = 13976
-Msg = bd70deb2cafa75918308d703a6783fe9dc5e3d21de9bfeb6dbb1cd531ed5dafeec463a02abde302d4ae6ab3cdc2f0f94865e38339c88bde507ff71bbea6b30b9851cd8cf599e950b8c8e620c90adccba0033f934ca66ea0a936afdad575bb6235099beff1a632c9114a8045a0919fdc21083880eb05c0d8c489c7810aecef4a41766f67c37557e28a9db9a0d909c2b167ff7eba79693afd3ee3aeace38eb73a5a02a882cf89b123812cf2a0f6d5edd1d14362ce9c43257474def5cce3adbba8cb48e7af9a45e702a182dbf47e8869b3f99e953ba81628e502c60d4f8ffc551c31b3ad6ca85c52164839d5e9d493deee4d4b76604174bdb5655385d34ced2c1b09dd5a486e1f9ac501bc611f9d7aa5c748f496faecc14c6c18e1dfc6aee2991bd0207ea1701219955a751df43dbf66f57904675a0e9e6d7f9a0b8bb82a8f44951117ab2642d6671daf1e5d1639d48aff6a05781c2b5e8976653b0a164445872d393d30355acf0bb49bf2bed4265c9a3b786249afc7a438d706eadb6f90a7f93ad51bde6d2c8e6ff09dacb3dc67ba0d3030c54c8367e1e4280bb5903274191344610de61c3c770c6820a6cc9d826f7c743f88f13580ba23cfc00598fd733b5dd069bde7f10f2b8961c16b69761b0f308dd137f844a67f6054e065863f226141755b96645a291e3fa3fc853b2475fbe1d3b25ca22f4da4425dc95fc855e63d6699b311ebd5fec1c7753e6e81f747c808ec3f618f63eaeb1221075edff0532225c40ccadee304a8997c03920e7ce4e60e4df4d120611296786516dd4d9cdda2077ac52bce0fdf552e1ee89a0133f1f87a6f6f35f5c53958ed806465919a0a5fa42488bf29caf33a0dd469e13abae351d5c6fb1a800ee384da199c823c965d9d5457a3ef8292c4d9b142e3f1fb502da498eb44d95f8c85bcd6871bbdbf004bfdc09ab35758f5e8b6a0d0f366c3b255333c52c8fcd4ecb4536b5f6e72897649f3415443612d72c3436505249a344feeb04883f41f90ade40af119014b3c56fc108f1ab0a77087d9226665d416cd975e9e4605529c032e8926002a70924820c6c7e264a794b2a3beb63d69ae56e017294fad4d611cbd0d3847212a38f22d623eabe3b884a36464d8814286fff52c4dd366f6c2abfc2eb865e0dc9ec6e55ca9d81f1b8cc47e2629bb162e54655bf2a9e156ab0bafb4b8ce96858aeea6e6665607a3f268036f4890dad759486b15e3c9e791429ec8f11bae4ea7c490656fdb0551dcf0b0be017c08bc674bd97d9d701c3ac955e2941ba7d5f2ba122a6f0c1b164b1caf2d50df111fd4287e9e195d181f6f514d7dadbefdd4274edc234025b727680576046842a834b6ad89eccaff5c5209bb91d652357e3750d8bb0165572fb71d09fdfc60f6b1e5d868c67c0edead427e7aeb734e29b96e03ea174b6b1af523feacaf6bd745ceb1bdecec9251958b7f521182daddf62ff6c4f58977adeba81c616ff2e937ca4f16eb9c44e63f9e974709122083ae45524ff87d7a0cca33a90f09b660db0efeb393c61967de2564315827ef1cf42b71c0f822f471713c9d885a3c3281d7c95dbc96f1c6dde0af70ea11232b00a2d215ec8de8fcf84b6193b6ac9d46de660361aabed3371fa44a6f32107f3854262eac355f9ef98701f580b4649175cefc29950e7a0eec958f629999c4b0a98fd4bdaf5c0bd97c963b551f2220bd41ec00b8726836e949e818a49aa1ac5bf12c64fb9991111ce8be3e0cb9605f753dae1a4c84389416f17fb66cecba45d591b22d64e5a4edcde067a088d9ff7f5dbb9dbf324510000c55d50f480a640fb22da9b4862dd81080d61af9560b601edb5e3346263f5f193df97079a27e3f9876078b80ebdcdb17ca4c50aef0c8329c72a7f77584cd963e105eea9c28a2ad4e95c1d018e27d0e720ea59147f59ad796b80b6293da8a55ed47e8abdd37221db0a5eefff31688e2adc294654ab0fddf9c1ffafd4783f01eb539492cb35a77315d0ad19395f47b18298a7b353dcf5bab0b2f193ff73d99310478d2e5c4ff1c68a2493c138818edef73caec9977bd4eda6249c8933953e06d796b288f78b18c343ef561082fd03bf92b084afaaee741de3004abaf746350048294bc52450e31147173f2da13d6ffc5adc718e149f9df3702f414dd3ee88296ae8a0106b071b589e8696401da7993d58a9bf8e5bf417165498c96b4ff5fd2b45bbf88f551688425122a3737ca54b2992fdb4d60957a93097222c3cf4c45dabe18b9d6a69e6f27567d5adec489e4b6812c29a8fa52f1de642b7b0e749c16f54473ed5ca2fdf2199e885fed308fa62a3e0deb7e0b8e439e25b3e9f95d755fdcb7ebee9d73069dd57dd1cdc5145205882023b54f2c9dec6cced9e3f6d24e8cdbb8ef121b8f3eded574d81908e867af5ac82bfb8ed60848b4bfdc1d998bae3a9ca80c1c49601d11a40409c62b1536f01ca67
-MD = 60700d4ef068822d0fe6df450b4aa8e206b2790d6dcf973229a59889
-
-Len = 48824
-Msg = 5fd54472a44e4476d254c0940071ad42dc723354f76ba61f63fbb9df80d1ee56136f51b6982e66c1da83602fc08093506a9e2cf27cb92085ba5c627dd63f59f8850e91a1d86cb1d4ca38ad03160f3c584b128d9b21e935570e086d3815307ab8df396cfa0c100bf6cbfc0fd7a8258fa1a656bc178e02cfdc868540d8e5ad39dd46794a8bdc205e710555ee7421ca7475a4f3232e6a0cd55d4b5d4525f0bd7eb1e455931aeea6918b9fceb2a32706d31a6d7028a85e102f228417e2e7db68317ae155af70eda98c8dc1ecc32a62e294d92855354c1114c5735a3c81e551b63a81650107557f3237bf953989d17c65a0fafd2bb1e32c237f98f55389e8f8b0810e97e201914c487a68403c6d621a98ddc515780435564245d87ce462b8785def699f7f06ebfdf33dd1ed7dd5a3e781348298c7950a387bff7d1878731d7ac66ad9a6607f2c3a3b6843c2852a5e882a8d78ae9dce2a79d595cdf09626dfa6f1dba7d40ed21caa29e304e7dbd559a89bd1f07d84165dc259ef112dc6e2c5a3e82b1c50106983f6c4965c85073c5deddbe6323003d56abb0df590f69010981ab3407e43eeaa29c6156995c492c931fff1b686eda3741a0bfb9094747d1620b2580415d431ffd6c02245f6cb03e39f87e82834dcea59355b2ba663ce145d2514e15e2b2c60cf518ff510c6c3e2f16d2dc523832762ed8352a320462ddd4d6fe755350672038163d996b44ed3b85d64989291bdf39398cb996de785b9614ec5d4bd73efcfa37fd4470b17d6240b8e4c715759286b04c3d7d791e2689927c9f18320ff2e6bc7306c805e23a5de66eced5f1a630cb43dd46db515f837f6b824b99b86c10b6df7fcf22d97be05284edf0e0be597b3f9c63556db031339f79ac9e6c5f8a1cefdbb4b30f5bcd23c2a4dcf791cbfdd6460284c5af0621ab7c5571e40a87c87be459c85ec81d746930dea24f43bb11d6611ea83409d3bf4f987778d8eed1d5b246a2112ef78ef0252f9ae464810c13f02359441d289958b4766807d9a3be0054897d35b01830deec1151f9e3d42f92b80f4aeedd65c78c6e98afc562a3bcf6d72f238c6e94a38f2288ac7929a7a61c92875c1f115c0ed8d261a727f0794f17ceaa3dabc717478f6ce7f2e8b295f000241e154b4575bfac8483f6b62f9ef4e18f7d341a65faad5e2fc1ddaf2b09adebc155ff09e63d5aa5f95206e66c7f4ef2ae3aaf3ea7c93589efa8c552df8d203e0ea181c1703d7023b56e603f33b4adb9bf44f7af290d8081210f327a6c9b0785709346087fd090c42d2b8b2711b9a1a5173eb5e246320ee27867ad6c3eadc4407bada44561a12cf5d53bf0448308bb536a8a525eabc1410c3a34becee25fd6fda453251ec229b53751f2280e142c6b331daa659ab655b78cfb08bf18e40bb02b7f1650eb2dd4ba1707f0aafa219f21c29521581ce249e2e34f5656b0a04c00485079b040e13cbc038bb9f17f47cb8f908591b26bdc28538d8baffe4cc39b17d2ecffbb9698bc2b8b31b08424034c051b535e0cfdf07b7a0a54781e33ba739759991aeb72c0ed992cbe76eb8ec0ab12c182e8b049cbadd6e82e314f1bf15fef5ae95dc86bd64b8556766f8ff62c33492198e454e5ca59ea856d8e095c04da8045522abac865506096ee1cfa1082af08ca09b3533878ea3580b6c0c57a615e0ab768246b3eda96bb6caa01a2648068e21959f843d853e948588e8c0bfda364ef1f9fbd3235c27916562eb0214891eb55ae0e059f4bf7d1838b5942656c27899dec6d67b823a981d1e1e0aaff5323b0e3d69a7dddf9b12d7787ab763a3c7a2697ac65b655aefc4bae7e6444850ad2540d5193b378682c77a4dbf9aa22e517e68cedfd1ba32e3730ecaa2e3f6ae61a4f427d6e69071dd62a9bf6c860980c9d23ce1fa82a1937e6dc1ce3a2de096b680d23d89ee102912ac0bd769c1c02095678dbb00b4430428797cfb966b2f901480811e1b9cde358b6d499c9e93f0961f050465d7b0c70d4961e75a9fe40a24e36eaad27238231dae6d0a17f446c16bce7348e669be563649eba9f23be29adb8b10f462780a066ae573f74e51215a26097b02469c25180890e06acc53ab063c742e08d51359b0a39749b84b9f6be44f3ae3da8e5a2f340a8607d4eed08877d007928d332d6f49502bb5f416c46d866fc87477c58a22d3c5932a8d6298c1151daa032c84ad92f8f90b8053b5aa6f690d1bf682f314471cbf200f3d30959e07adc6488dd17b0be5279e727f3237b8b4b19b31a220dfe63882937f8d5ead677608c42a57217f2239614c521d94559290e3b0ed8055d5474e96564224f6ca6389b40a71337da11e1c307dead8e4eb43252cc2f1c49addb18781cf20acffd3db693b02e5c8ecc949b51b99005529e0149a13390615f5df6e0bcd68e1ca82b0173d25134dbf76dfe92daa085d3f6b1e4d18217df41b70c4c40101884c2886495f2ef8a473bf23cb47ab6533c93cb38c36c6dcf6837f1272fc91a6962b6e1386fb643e1f1d71fc75ab58d5800bf4081217cdce0c7ae9e3d25de543fc4444314f32067eeb147c08c55c5c8158ed11729837547f28a300eccc312260215f50e98c4e3d4170208a50a4a4def1243538f906df8476b0c46d3449be73866d463d422595300e160840daf8c906ae4aac13a64457853b0ea6d8c32f4efe3b48c0b1450250086d459648b0ab14fd3f341a4a803be77e56a811e7a26827eb0a1a9454f90bc6ece665904adaa3cdeb2c4847858fd1d79750e8cd45d8da9163784b8bd06629410502debfed5eca3cf8fef0fa6bdcef6efaaf35a1986d6fd68e0f436dca9442077a4818ebda4606a94a3c93fda46e7ef5ccfef656896a0d3d93566b02ed8c3f6174417cdcb99a415b0c6e9816d94e64b438c295b4bfd69e0d9ad52911de5509971b7370593160629b641d690eb2828bf363857983e3b9098fcd15e66448f786f196685d2ceaa251b17ad06dacd614d9fa78ce0a8b9c1c360b529d0bc1d17ba0b70ea8ac1b8d67f6e5770f0cbaee0b38109d26b09493060dc851f5fef121e83e30aab9c3efc2b8397e8362aefea1708f7ffa14d3656f7f7610f3a629bce14648a593250c6f309c02c6c552bb42984ac58db920dbc7d98f59295f37f3e9b99da55ef074ed65801b390366669b4c7aa1c483ffd23082793f9e5cbe30c34250f63fa3ea2cd097593dc67e8d27b7e4f07e73a9f7b33a5ef6962df1381a038d4f58fdbca9d71ccf640b917f631b75d4a2e8ba46c64a6223f99cee30f47c1a935dccc7f054fc39d3498c824e10cc3ee337e781a3971f0e98295aca611bde701c2359858914248f6bafc88232bbc27bd85883b00990bba7862fd7a7cbd4c86df049071fcd10d686613ec877758d83927cacc530bed9a596b5b21c6fb748c379d676de7e05719a867c9f934b5dad99ed97dcb4e70a9b6542ed5b2f086d9f56fc9752e788785ef8f7837a31e433438cf2f18f58be37fe8412f6d21a5c35000a5efb862926700079413f76ab2c3e79e20b516eba9d8c29897097bee55157936607cabaac41337ea4cc783c0809c875259f8020e16d5045fcc39ac796d11a82f25fcc9579bf0a010200f5745065175fdc15474ed514cc796672c59637c3c8f236cfc9c0978a3db1194680c58c27746090d76ca09f7c48ee4ee7e1d3cf0ea70dbbbd88e30e8814b57404dfd7c33727a0c84cb7bd468b0bcb3c89b526679c00fb0892d2a5e7a3d73698a3db53fd7d78460cdcf24ed22b5f39b8c00b3506541ae4a5b76fae29c1cd5b0f8c3ce142e0af7ae4efe3fa4c438a604bf4a9abb41e3fef1b9227a7dccc3f4d6026ca289b4b1366d9ed546abbbbd5677c8d582e79e2b544f18dc23809ab753313d84dd10fa3ed2f723f0b46277b8877d4f3e0665e88c50caf0f0708b746b736b00c8c83a7d18500384bd035996aebb7da8f09fd6af9b76fde7fbfc0ee854d7ec02950e76abd23ffb27a6ddf1772465016c79b98a61bd3940547b207b6507e32cb9761a5604f0f546834a8edac7ae06910045de218d761a4accea886188f947b57bd876491709028e2e24b075d6b022b51af1880ca16a8c65b7c69e51b2ad580ee058acc0606f0a3a9ea1cd4342bf4be602e941dc4bef1239bb9bccbc8098a6a17d63186c6fa75ec44b6e4fd38a3fe49c5eb995f0cb884e2f3ed6be02515fa605b98453ad935682c3bac6a2971bb68f4094cefeeaceda92dec803ccd3d346f8b40b48f8f489e118a17367801e85c79e9b3bb5d73ac44a8290cdbf83a154f2f125090d42e1a1cb72f5ebbd42da46c7a4d4b9fad9612a4c800de6467ceb74f831e1395dfbf5799a3429ba34754add4b34b5960a5fee8f752dae78450322a1ab3d7102b77e907fc1eec5355991e0c7d6c0866660e5436248edeb1a37c0e769a0764cfbb6354332d6e55103b9235c84eedaff918af3f0213c435c32ab409a4b5c7eed8ab6ca9e313dba459bcfa3ee92e7d669be0526856ac3c06a57fbecbba553a9cb4655a901d98af02b74098e478076655d325bd7639d73d7ae00c62fdc361a997ea4ff5b0eba33096b12f35cc7cc0eea62950b912b47c11b9fb386a47c4c15c0602d304b2541da889cff299a1fd415e7e25c70ee4cd83feea7e6a9c50c75d9b128458513d61ec5d0299ef8c090472fe0850f384938ed44d36f10cc2c1d31daee3f946a2fa18f9982a988fd6ac973b1569313ce3c8ff5746c4dd85a241f1e9dca0e904c091832ca028533a3e34c184edcc510bf22a27f530bdca3d057928a96f72dafc73a9aa6dbf2552598e468735cc5736c67a620e9455483e9cb2108045ad80569582ea93a53b491e528c8df336fb326ad74317bc1dfb8ec30a73af01a5dff3e437b7fe48ba5dbb3e8f01ae0c6fc28675a415f23a796bb6e0ef0efeb4b14cf20d4ad88ad1966da43a76b454dac8687bdd97b89b8f8eede91eb34ca4a0523ea65736ae39341fb32b9b716f25662a37382c16f3b9c346c84f03bef54acd6efb364c6401b07b3f7679e8e7f8c9b77b75e6e98b90f4df88460f1978d19744eecccb743a999aaedd00b5a94018e9d5a56bac9d5d55f6e93bad52e84aa7340cbbf98d56213d9dd3e1970867e3972dc98e61b3cff40b64ec49463ff79a41c82dbbcaa37a82b761f432849aa83a3d3c9a209e2207b87ae9ed9959ffced165fcb0d8873668c3cd8f18ba0f92f7acd2bf50416c22ce11692bf6132eb9f558dc789cf9776da94e48cf48607f19d9a11d5df4db11dbaa67a1d20e9f0c96f5956ee3f906e371c489efc88b0c1e56d881e7bf8dd5d6742622eb873e253dbe54f2e2e6d0e6136941de8c23e9a632727bb5f88c23170316c7aa0df28d8d07589dd6022828834f7ea9b4e5876a1704944aa3186dbf89e0e81767cfba03bfb38c55a9945209c4dfd88272c49d1745dce5ceb40f0a6713b5139dc2fb87a8a4888406d2610b7b910a9e5782ef0df719028d8e50a40a269dc9bee12157038522d06537bb31fc87d21af9ad4b2e7e127bbdb313e0a116010f65126cedadd4a122d15a71cbcccc346f55100e354b997154567fe3caccd50251d137c58fc3a2048dd5883b6af9248b51040c01a80c051b8a151a8878edf0304b5554746d6116b749221a1d0082ac925e6e140f0c3b6a180742ac8a50ce0e93e6399102f151d7c14000369ff52d0b537fdd51bec99e7271b1255c6fbc36d83408c417f6825a8e2a58b9054ab2c3ead69d97ea9947fec32d720653c123ecf51a9a3f0ed88743e3fb7b94aea59d0bf0219ee50825ef220554312cb907edb90e4d85f29e316ad57d3b90d859391fcfc63e6c0fd3ec27d4e1efd6e0b5ca8165cbd6af25ed8792d805f27fce308ca1d51335ed5d727558dafe05486a6f9149b8d3bc022026656714222830be582889e6800c0b170e48ebfd069e711210e4ac7acf07652a6f5051507de68aeffc9540cab5cdac84ceee46059ec23820c04b127266c0bf8df0d2b856be3377ab42592f495980baeddbeed3ba707a85dba64fe36941eefa8fd37204ec8c18df3852febd2b142b1c9a5cd0f9e424cd408ceb7788270899fd793db99ddb8f9ca8df550c513790d8bad37a1d1f4a62c4527bb64c677462c9b093582decea70c7bbe873095536728e7ce05d5cafb5d166a1f03055e918f787fb244c5857e3d7a1009bd37f30f165564a082c1510ed19bb1633811a76da70dac67641c2478c6b335f409ef54a2d0f370c9510d0aabae3cb998bd023778375cbf9cf5ef125afd584c11efbf40bb51839aacd3016e5e4d79f134245f952dbad617c78cb6f5712bd9c0c7e1303db5029640cf9b56e29329c3e6a9e0a2371aac1a437b9b1c4477ec9842aa80eaa22c5eac11b60c661de6ddbb088e844293ab8589c13d938765bbaa44301e4137148dd0257bd4c8c766c5d3bfe53671e9417cd1b52f622870ffd90f4e17b7a4ae1b5601a2edb032e353bca652fb565beea6fb0b2cdcadac71794c662677fb1dc81d116d94f5eced526b37c004b95284cb6aa2ac415754a1f14882595dcf4d3f1d905c6e8c12cf5a9d23d3ab55bdaf9f17d2f03f933e1bab89040753648c426b072b73aee8c2fc0d1c03fce2c656e20d4c96803fb2ef471b912267eecb4d6f342d3513894b94d77767823fe0c7438e51f21bcf16f0e98b94b23a10760271281cf843989824f7061bf834f93fd8d2090f70e939700dcb4d8964a19da39a9601a7e0ed9f55f567fc7d5682d55a9ba0e68861756bb549f2f17c10ff6bd2042a80477f89743d3d762f1dfaf230bb502eab6f4c46b26135ff3bef5faa179bdfbd288e3cadd3d88d8012706e19b7fcc6e9cc2699d3ba0e624e715599480d6b7dbc6eeea0d12a9236444b17285fc7794040dd40c2b2ef175f7f3641664fc9bb7ea6d7eb3489d504f8013d64a23aebcb5ce233405f5ade067dffff253f27e926431ad806703e8fab23656e0b7431916d8d4c72a7d831e3664e5f30839c76c8167b76f3b2dc75a6ef48df515e06ea54ca51de2fd9c5eeabb1610b7eef06a2f3167859cf82e1a5b76be8ed8beee2bba28c3b15af6890d7a37226834ec9f63306a0da11aff918753d8b83fe7220803c070db98195d6d18357233f5504a6e3bd6f30115d3987f93aa5d89aa0b8b577d1fed94da057a6f088233efc0f44f86798896eae9ad0b20c8c9cdd9d72a3f02213f6797800894b864cb44fed009440fa5b0197023929f9bad16f052cc2d87327788a68b9209f46fb4776b092d75713048b5453ccd699d19cafa8e9a93fdab0f0863711916efe3bd81ee71b8e0221e12e9ffe2f6ee1a4dc1a8de6e593480f3c05b3691e916a4a7ca51971eb2f0f693dd10f6b8468f8cf7bcce285938b5a0a76ef86acfa2990f88bdafdc39a065db17b845028ed2b7a9e331c44217de20440e406868f1eca818d0be20248c2948b8f4cb118b2e456e585949139270f57c54715f3297bf714aa7c5f72ed8ddf6a074703ffbf95e45bc81a02c42822c22d2b718f2de5e03d687a4b18d605ef5ae75f9d43c8cb4e77aaa0c0101d978120f29574b22f52783c667f7daab3e1f9cfacf2e68e94a24918e3fe2c4f061deeb64891b5217fe5908e7f389897751839982b7fb736fbfb1232684e93123611b7fc8fbeb74f8815b5ae13240051920f3b6ed34483ff673c467ed7f0a8fbf619796e485affbed0697415d2d0598ba34d5b9e44ffd12a5edc323883a2e28efe9baf860324f2d2016748503eac1888213926b0e0f0335a4b51820a2bd3b42d982ec6ce307b453b6385aed7a735a1e98479394147c40f01c532926e10e1b26a5b395bc150ec4b4daf5b1436bd0baa225583ffc9d9e9d8a354f60fded37b41c7c051daea04e689ab2d4e24d7d07c75c50ccfd6a527e024d1632246c6f40f06b86ffec0b29cf894b665d53d459226b93422d37a8da23587fe884dc3c0f2fb55dea296a9a5b9a0d101f186d9fa6288c912202547cdf958569d2cbf235740eed38d10b0025dbb6de31058e98780d22149c19d4bcaf06dd7353fd91cd1f47e47f45622e1472542be2f63f463d253617eafd4f2ad609f9020884905dd5c22fba53ccc619104b6c0203a7f6c8c26fc80ff6fceb8c0c51600c2e46b4b872e6d597511524545a76cb42278b519d911e6c1320e01682c551e204ccdf91290c52e0836167a5685cbb1af338eb794c10fac92950f3f7956acf28f1ca984e380bcff9876b0c71dc7ce4011d1d0f955da9ca885c6e7bb74c6194dadb0fb9146dd725c8a9574aaf3824b727c9be3fce59c35850b162c17d3013689fca858a0a51d81cf4f30d6a8705bbfe35ff03c34cc7c56aca32140d72c8e8121fc71353596b777b266d75b322c9a97fd2c5d4e2362f19c99de66da7bd9c495c03d9a15b28431a0c051e786fa80f5503a72519e6b419263d72d553d688349c0cf30918eba0622b953a0efce4415c29515c26ba15f00e548ef108afe3f8194aeb965e5e4be94f10df6c45ea5c133a8c3398d09fb80f950b83c1866a1637d2bcc195e05cc32a9233b244cc2b1d4930e66f032cb1163c37b3e58b576ab76de759569797fa9b8bb4fad66aaaa56f09c7a0ce4641d6799d7bb47cf684990ec1e08871458c211a353ccf1285e7429c7b8520180918f7
-MD = 85747c796a910421ecb364b4b4f0e68b49e9217944f6586eac4993ec
-
-[L = 20]
-
-Len = 16
-Msg = 8a61
-MD = 60bdeabf39efdf21ba9c0f94af6552d2ffe699e1
-
-Len = 104
-Msg = 37487aa02b03bdbc6bc62e7e26
-MD = f146072f92dc4a551721a10bf0b01564cc2b43df
-
-Len = 352
-Msg = 6ecd002568bae3bf1873993041bfa292eb94e9ad092d8eb3585be82e8a20cb36a47a06e7a57d301268a4a533
-MD = b0a2d6033cf1d8ff120a605b745d736ee4aa06d2
-
-Len = 504
-Msg = f6dc1d2f6b8e126d99939664693d8709513f97d730074ec2794e536d94ede79c81f2b2ecbff3c2c26ca2d181ada2c60050997f3bb087ce48d956c18dedb227
-MD = 395dd2989edc854746e384f339f0808c515747be
-
-Len = 13976
-Msg = 07a6372c863c7d7c6764e4f05addbbe161762735dfd2d23bf268e2d603cd28de9c369ac379390473e1d3fa7e37af1178cca54fa0f782dfbe68070952b93462ea46c640d43ffe71f5fba42df98f4c48ada0d8aca8753e0731508bc15dff283178ae5c10a6ff132eca5dde63a78d3ac94685152897828eb25a55fdf140fd33fd4e7b03f283e201a1baae8986d25603fb0b2566aab345fb48031d648144dddc2e3556c0ceb1104f348d96ae7dc0152e45c625d21b46e70c31f250c858aec4ab2cf5e79d8c79b0854e0abf5330b9f044113d306161968f4ad6f0973160c9dc296056d5a11523ea2b56fbce8387070fccc639ec1c65ec663b9dc49aa880dc4ddd3020c9d44ff7e8cab6266e436af19b4ecb82010a0f8f9469ef380034a02e3f50051a6a3f233dcfe9d553459dc1bebc538ae0183448c9405c351271dea808d908480e61e9793cca111b4cfb9874b799626a1bd9a0f6e0929ad51b97ad81b2438f5fc255db3a3dfec9f0d8393c6b245b03d3faeb58021db3ad391b17a91174a66db4feef1b4c889699bcbea7928f4d29be2d47f76455c8cb1dc7da9cda41962a28ad8cd7b39965b809e7c7eca1c6792c1ce1c8a4cad6290170e91fcc49fa5ff64ab433b4aa081c8da2d9bbb072f9f18ca455469b946c877e3006b34ffd2219335b30ba2e0980f43cebfb629d0b11fe70dff28883ca012c6ae4855fcefea20a08e189eaeed7eb36ed6db3835976f4e60053205805727c5eec15d0e9f155637a9e66268b9c1c302bcaae6ae88cbb8cf1668a487cc996c4662c4a4e195f094cb31c717165e0e13718f8388957dfe0bf69c70cd0bd763dc38c530b67b9c12244fcab8bd13f602de848a2937699f9ef77944e5f22e3b470601789e1838fbea9359c733aaee2c7082b02ee459b7684ef9bbc200da4b62d368351f5520a65ffa506dc9b097117bb7ae88d04d85fb525e91327689ec0fe86971480c0e864012b1e9f044c7d80a4e48c07320dd4292086e4c71d4c98dd826a9bfced112bfa2beb1ce85cad204451ec45703931bf637d4fe89fe8f485620b7f4b21e011a232ade7a8c92be77925e878ae0bea9723749528fe83cf89ecb9616dae6ca0e8d5754ec6c92abb21108c2f33cdc18c6887c430b72c5b193356494cddccc577bd4c2cd53188f352846edff0c2ac7869cb74bb16a77c0f0f194a7a9477ae15abb890bd0bcfeb0c39381a87f1d05319c7e971c10e9ef687f96450b400e25b4285032892b849fd5db8649cedfb03c88defea063ee144a1ab1f3bf05f59c7db364dc39c11a446c3ce16307d78d50315ba29f5bb9a57438564c8c7b3e367cd37d74b2375a4966f47489dc5448f4979428abd32193d3840aa983d3020a9f29d760fc7493ab2576c90b1934b799c1d0d55e4f2caa78f4ce61930c79dc017c2dea0c5085d73a3b0e4a6f341e9a5061a6658af11e5edf95bdad915ac3619969e39bee15788a8de667f92f4efc84f35082d52d562aa74e12cc7f22d3425b58f5056d74afcf162cd44e65b9ee510ff91af094c3d2d42c3b088536d62a98f1c689edcf3ea3fc228d711c109d76ae83d82d6a34dcfbad563cf3726519b519fd48b51741aa86720836494b7a589c778927047a25d73508adaa401e9a6c0767a675e31c5556cbe35fadc9671359b45e985c3c8af84113989b299ae4474b85e4b5d4b0578ab1e8a2915a8df97c4f52a639fe32272cb91bbfb721505dec46d51383cb8973425a714245c2e37d0577fbe0d66381d9239db1f08a380cf609dc699698e0fada2caeda44d58d766c4f8214b10642b80b8d7d8add7cc41d47108ab7d07dab71069a2d982cc900b331caec317942122158bac6eac9175c2dcba0c04443aa9188832b553f5ca8c336880824d6bc02486a2b4c086665d276aafe3b1b93729829adca50c44466fd5b5cb977aa78fbcf5c0f0da1b09216468a11493ffb39efdeda5d669ae92bee2f2fb250aa1b9cbb11c36c7a6c6dd26cdc3cfd572ffd8c1dd72a13c27a327a34c6b6b3d80fc6c67c72152eec0c8ecbdc1bd5cb829b811e7f29af6d786f4e93dd4c96fdda295a6aa258d7b2fcf291c2d68e0b1866032475964ec0c6f2fa8c2d6a3936ecb187350def4e818507bf157c0e9b33406be7660605af14cccc9c799b4e051d0d0899e53495bb8931a6e2984bc6dbe4e02ec8b4642fc2f1cb5fd5a5520b48cfcb49e1f9533838753554dd98b6a1b8a67409279df477330e5f37367e06247ca5c3ffefd00e693dcc0c9c30754121c9ee88a574915b9e77c104fd2f921c2c096573951407ba9b440423d76bdc6fc978237a6e302cede7f99038ec31500884775556941f1edc30e3a417b0e02cb6fb5bfbe5cdfacf4006411287bedc565fb06f1be987416407dc852254934df4ab59edce476f3506e65be6ce6ddf91038642291fb8e92ba5b1f0b105670905a2c14796110bac6f52455b430a47b8eff61
-MD = 1adccf11e5b7ce2a3ddf71e920138c8647ad699c
-
-Len = 48824
-Msg = cd8490c93613bdf1f284b94b330f6d6f45a39c651d2a160b340e2eb696fc6d1c35e88872845190d141c669de92a97daa5433b1d7b0b899fdef2ce74b8fe72a7296a5b5be26d1dc86520367c730c7400c2fa06f91ab4c48a7bf4ae35a5b9acd5296c4fdf7451b0ad9cc439b4e34f11e5d7ef2bdda376f8dd34d6f092b219dc085dd4c4a6308b8808f588eedbbc7af7f64e83182fc7ca7cf4741a341060a7969d31445834c982fa8739ded4555108acbea1666a83da17f77cc42ee73323eb53203e3b790f81c08e94c44678b6538096ab7b09916e6cf7ceb2af85987f8e4d982dff1ab59b0bdccaae1f405a73366b5c5935dd0b43e2d2894290ceb66a0246dc02de728c5bba30255fb56ce8107c3144246c5156a8fe40ada9126adf67227fa56b66c37be63f532516211ca012977b04a97916f201f1baa2629eda520b51508ab4229df2ceedce406dece0110e0a911464f69e7be38fb91deba0addcdb3161d2799c628f5a57fa1dc37357c947681bd9c36f4832c20ac466c0c245de3b250c33282ea1a02d007f03b34ed427631283eb614db4d521f555136e7e42b4cfbee8134c63dbe3bb79b5a8b9f9f5b9f5ac61cfab1c54d197f1e3ba613f251eed616df952d691b88a16466343ef2d0f63882ddd2d55b8a6786308b2257f5d7b38af166bd7f1339d2d8899c9eda8fa86215850ba547450c267eb3c9147d96c38161a69d1584e521ffa23384313a1debcd37f72ddad02adb3cadce7ee34b7c1f42a15d0d030487daf9488aa7562845a11ee7ffccdb38b300935caa31f78a4ff3dd93403cf0c6a16ca611b58c736aafd33d6dc56f0f47878211d26f6ab801b9453a7f74b44593dae0f047ddbbf2c902891111729edec44f69a05944b18e7a601f41ad24fd6833da3dbe3029bd390de7c9841b2ee2b079b2bd2737518fe1bbec88da64769dc36e4a8bf716c219b2fe059d7dd220c1ed2c59878db5bf8b198e0689edee921ebc0cd2d3853fcf57c363050ce58071c5fda6ebcfbc1bb62e9eb956286291a108bdd4191c4ff47900d6068e1ea26b487649af119b9bb15dfed804836f2196cbe12d8fc86e3d7ce89b52ad49dc9ddbce5b370f73f512bedd853039366612453733740586d1372143b09f21dd4dbe1a2bfc308db8e4098c5e4b0c1e16141ee50e85fafefc4e2529b3c7252af37aee6f86e19df28871686107d7d57dcc812bc077602642d2ecefdd5f694b8f336913210793e4068da2178600b1f41cffb5221c9b4b6298afb47e85701d7b1a44241679d8996f916c81ff437261cfc358b9ec42a2ce16ca3bacb8690d6c1d91cfb3e0bf1e7ba45bd01606df856fd03c7e946f7ab371a89e1fde86d05fdd97bd7b1c583b04c2ed2b5f6815a460645e4e1b4e950bf6bd81dd0352d1048df85266f1696534aff5b1cbc17f15d82cc8e0c0d4f0453f9439094f8e0f7f4bc045b654d9a2f1f44a9c57019f63ecc41021c05b5380675cb56ea8bb691d79ee204d2c4edacde3c1fb3f4996a11d84b035f965e74009e2ab80e2c7ea3c84a834d4971a1e9cf423e4ea67ee526eb3c3e4c2d7372c4290a0741e1fcca5ae4cf36705abe98ac81e98a5419baefcaf3093a7e0449ef1021f88ffb7ad21b2677e41cdda12025b06542c4b2564f15e0b99db43b7c7020028bd829372122cd910227cb07c53cb58fd9dc620c0491f3e2bf883fe6ee8cb1f5b73767977d857e4513e8b5612f6ae4b56014e6a3ad2a065b65472212e2f611743484cfaef860999d1dc5608c58412fab888ad72bb87dd9b55b692f31e252daf8944ec5c02a5a9c23903c50dbd845f2fcc3bc9806af13ca7b025cabe675195b1d56f3fe7d7bca12530bcc0af217efcb03a218bdb6f9726536ea902c8303b02e3ced22be59753588b5f0e2f3419fa5345a942dbcdf3010465384a225ba26cdd0f1d74999c69f336bb6d01fae5cf81cbb8c1a7a29c1eb83ca6b51113bde56b8cfb6a5d72557622a37f039d090a689accd02b57c691174338de8e05bb3620c079705c969c58e56b079dc9eb44eb0fcebe548f5a31f4072a5ed56a2f03107bf40a359b2601eddf53cade66f294cfeaa40a0d94b9c90d15f61852f295d3911f8ea914d015885c8c64540a83badf0021a416c3e37b78236a2ecd1fce4114033416bdd3a36c18ec13250ee9c74c0fc4dd564b3d24a825802d5ae402a53bacace115ae3bbb329be79d1e5e42dbaf0a6446431145fe49b86a8703c7c41f8985d54f12e314c16ff89351d8addf66ebba2783f2d1a11965182aa0b0dd2de53586c5a695c6265c2b173958da648611090557bdebf11a1e042f089fe98e049f4796c60d26be38356fe020d9ace9008410d53a1bb7db78b52ee44bac364213f5c59f1eac4e3314f3423b92fdd7a6156608111ac6ddf58385ec1f3df12061208db98816ac948d803fad10d5ece2018c60faa13de5e5a9033745c824932e53f4122a39f635813545c1b74732cd55642f19ed6deca1585ebf7242c849bde981572a2199066e9c912b2068c8f1c8b936c43ae95c6e22bd7b80dfea05f495d751107da5928e806d0af905c87b5a0795df146af6580d8f9c6a0e2645686d43822ce9b4be0bd5937c097917e048b5af71c7e7521d490f107e9231ee5bd9fbf0727ba87774ed24cd52f471ffb71849ebd55605996515bdcfe95bb1df3541e7c42da4166dd01ec3597634aa6455d15fe14af435e8d7a55ff1682d55a2da867ae63d11fb3fd987fa5d7032ecefc35d3fb9570940e779e13da18070e6df5292f97f2a281f9598101102c955fe4808a2319c85fdef3d55b19e05bb8c2d3da64bafb67a53491513a24f6f0804aa162c8a7db25b38089373fecc45a0eaef65dd9be3b4b7f9436a5423fdcdb5a9b60138fc6a2261225390d9ae0d8ab7f0f7ffff69dca06881d33a637d634358abebb333df41151f239add91abaafc89070cb2159ce3a31655c22e4696c9fa7a7211d1251d4bb21ea4a321a3dbebc29d97f526251e40e548dcd7ed07587719a266f006179dcd22e50b3705152817057b097b043ad63b8d867edc20aea9b4c959ef4ff70f47128cfcc21e31f17978ecacc366f459ac1cc459a3976e4173ca322675f84f18036119ec2f204c3fb554a0b72f7e9d8c882ab147b3d280ca9dff7b9160b1b437b901f03cbc05fe05c6f44824b48aa8da52ae7dda1653fd500f9ccd221843cf76513b3b74d094f14d93a00d7cb954bc4cf2f04f9a35e38edcb1e84f62057647dcb3571f1dd296ca1e049f1746a8a282e85138500e7649db756b2d2ad88f11c471c89dc6be2cd43481013b8d0ae83da2b855cea7be424f8b2325b1850d1fdef03e765458df4513d57c72ba9751e1edc3c4e7f97e3202bb46eec7be89871ba3704aa6c6fc08851e551a3f655fa1fb798d12f003faf31c56b6df399a5dd0ed29ef9e4139dbc254bc5d6051840a859eabaaad56324588fae881fd638d2b70fb3813402df61d941ab495588e5fc3823249bf9a03cf877902394f512de118edaf98843a5445e9073fcfa409df3db0221f1c77e2dd21e74f9e10c9e180dc4ed17010eb949c6d67a22bd5337b2c68f9eccdec778ece728e91353696b742c8f5a3a569f054efb8c1ed478ee9b75e26c768a5816aa6bd08a4c72e745fdb5deb34ecb86b3a84346c1c70f9c16fc45bc0421f0da2f630912d5079f390cc53b78e343310de722b53d2a3b4aa386caa0d7e91986e19c3363426ba30eb5284293af81d00158a3f5233327b40c3b989725ba7dd5b31ac7abf8d3e0b737e843065cd7316dc2f374a00bed4cf9caa0d6e232c854df1bc24c3d484bc6bcb14ec770d5745474dc6ac3b3ddbffc551c9fcc2c56a5e0ae17948457c01e701bf1554022bc2b7d9dd42b2b91172fd85e6874d2d61fc7b3bb3cee2a9bfec09f6d7e98279c6f511f4140b116c856c1438e34bca59fdca2409f025b896a52d68719bf93e82e7d89bbf798991fda0af8d06d17f39eba4bca09c1fe594b537ad4c9b94ab52c895539d639425f9146b24b016368a638e5bba391bc8763cae7c52ff9c496884f1d84e5e08ed451358ecb3c4919dd410e82cac35ae744078287c05c89b42999ea6b8b127d40d53a5722d45139e8bc507a11e7add7fa9ab12cc40afeec008a4668e3e6440f27bb5780936c0e3668ac51262390c79b3f21fd041cf36ba3522f3a552714ff188bfd554c60d0e7d11213cf7d3864a5175d4047c2f3284741f18ec22995a5b82bf62190151bc1529c6d9927f9b0c1dacebd9c2dc406f7f64a973f9a70cff6e3abeebeb46514bbf2ead382f7262d46bd43d88c1b91a9011d1f8ba81fa536a7162aee2b2ec6fc0f2d6efc87b98d2e41e0f946969da659c21053775ece415a34d42b6cfd5bc52259867b411dfb991461ca618052309ca9c96468c2da12dfab0e822ff3bbe7ba281982a239ac19c47024fe1f0e3550cf0975add1f680a9dac9b2c4ab0aed4f409ddda6765eb8a0a9d1e9d07458c69ac8195541219b18efcd06c0001f2ae7fee2d404666a18ca3cb3aa4f0623e86c5b1229f6c2ca28d951111294b91edc52730b6b2c46e000672a7c89b2f38045bd3e37dbb8a75e18687a514dcf740c87a34834d3c3cc8aadf6166ec0c42d2be92f90a3af49633ff23cd80848ceb57ac550eaf9ae496bdc6a2d7cf50fe107895b4a1ed014f78af24eccd6a07420f1dc0df1e7c44b4ba937dd43cab9c798371b148325578d61931766af02b45054bdc2d9fcab2f4b49092f6fff7c27886820739d6140a4a905f0020249e8ae8dd87da1a1e7b1851eb01045aaa72dc8a2bf68055e7aed41d85336648a3405195d2ab61b0e29a770461f32fd05e14c17d72c5252f026a7b9abe7ea9176d3c46f6ed9fb716758d97b41e4f5d81a24538f763d83eecafafc668422612b40cfc32b3354b24755fbe400a2bfed494fe6d0ba0051713b776e67e2f1915e94708e6dc74b398f2f526933aad8fe7dc32faf40022606aebb6e0756b994c3176fae7640ee06d6c67bd54764c4752f1bf831f43e0227cba101174c5554ce26400f333dd8e9f6db1cdf670ce407d7d06c3aef4c0724b62edc8f1ba3e04f0e394d15a73b9255abb4d6ac70303dcf9160d32dc02d4804219ed5c7e3b48402e58ab2f58305f9bb95d2a8759947de96328ed5234cfe7d0b2a9a014df7e4cd0ae48906315f139b8635d2e6bd4aba32e62b8906cdfe5622c411bf0373d0cb07d17bb2bb5b83eae4401c243605fd1df759fd0ddc704ccab5a9776c40fbf6bde0f11b9646c699f26063a9550ac228c9884c277bcadcc0a2c225dc203e28e253c4e464b23d2529d09c7b7dd3c984667372472b615645f294c4e3b0797f9d1c234015b78502d98bfc04f1fa2f16cf3e7221d5794d035e4b172a4d84e679cb1c82df2fb49d3c6668eb1661bed56705096c2371a19d668832808eedd9e5b1256c18fe7ccc494e5e29145d453c553ec86fb7f3a634d0d45661875f2f1005ba5e734c1a976f37cd23450e4606e32d027bc9ec2edd9395e14b2082179bd7b4f9b8caa2d00a2de71d48553f7d4153cb56a1b08f11925e4b11c9281744ae9171f3d6faa3ab3f88c5c34fd23e4f6efeceafdcbc07686ef56efa62c0ad62f1cdcb4d3b5bc508c1f05263bc347158fa5495828f34eb7fcde98fefaa82bafeefed3f4a58968d751c051b52e0047f066de5be533bc3b1e439ab1c8602f6c67503803c8fa113737cb8279f358dbacdf45432b7a654d0e1122cca93420e956661d7275181c75b0d9c20e84c7007dfc49f27bc00007cf4ffa631c892981fd70141d532fcd51de5c23fe0b7a186d0dc296362f235d61698740cc315891cc9342da17843bcde274c17e462263d0e8b4832dd9075a7bbb443d4b26b41e534ad5551ed5ada102175e695363fb48d6b99ac978a3aa6f405d87f983384ce35740e930491d75675337c5dc081e3d301228e61bde5cc169968e5b4350cca2b085f9f75cc4b88497a78cd0a0073d90246c7dc102c7cbf3516498e8a41aa85d8cc5bc285ff66e8338e85ca83fb6889e2bccff52059bb9e92e92c155a349952680ffd0a3c346061a53fdf074417fc90c4d1af7c2acc3ee4b080752cbc9455ba5931b7e910f1e4af0efce905d2cc9c685923ead387fa532c0e8ad92719c76c281cd010e1acce500ae1443838b8afb48af032069dd07aa4df0d56bcb70a64592633699c8658102f1fbca441325e27f1732a7a973d8cb3a0684d72943ef6f1892f2d7ccf39bb6dfe5801ab98653bdbcfbb787bf125253be2624f6cf44177d588bd7b780d9e3f4e3a4e50b8a253fa21abce6a94b9073289c76773b46140f5a6e46b9de9ec066c176f5d1a69f380e1901216617363362d13ebb26ad74fb008ec08841550ff14ca800a1ecf2e007ebaad9f4e0d9664448d60ac0d8544243129fb81c1723b9b4bc2ee971dff736d9fcde0afbfbf5c50a4cc06a4c363998326c17bdc9e2508651dedd9a2a52bd87f8693cfcff60753acf9716c526e8635f12377e36564ae55d0fdb3c7997ec4dbdaa5b4d18c7b660acd95060831795da7d299a5a8d8cf9e92537dbd3ef7f56aebe38fa97c41da6bf0572a0270be7e5a7dcc0be3529339464c811052b65a938e874ea6da469c7d8992ce0aff1c75e82d1621ecb967213c65f2de582cb41de3804c507ddfc708ef3f6096ba4491e431160f98de806d0f334e03cfb7a3bece601099bd971253f3aa0df845da8b478603d5d88533d0cab9c89f2dd9a1404cf8939ffdda652a94093865a85fce2bc3d7babcff7b9f3306bd76b9af80c78ad518f89ee73b7a710da604e72f4927be8d65d06be2e0732fa786a83e27597cfbed9bf98df445499e0746b9f2cb9659ac0a9cef433148521f33b1d78d13c8441c0d1e20fd93ac450a3787a2292bcbd68cd1f961d34937be9a21abaf26f361bf53aa0c095e53c51f3e04d567eabe6e40d96a17c2bcc9230b18f7e079bc549a314b4ae21d30a3341aa205bc75c7f1d21b0a49549c300faeda243d0ce18da5e66c5b663cd705005dd9fea0a9564174abb797d64c58fdab1fae44576d514b75eaa31c9278b15bf9b6df7c6c2873d7a56fb91ab77b83761a09f9e1ddae535622fb87f7462256a60dd39dd3ceb6690b0272920b635ea639daf24f95462c523e5bbd8d8407c61163ab38877d5edfa04c2a78d4d240523ba97c7d01c71783f8748e85164b4dd08c25506a4ed18300b42b7bc6e417f512ae456ceec2ffc83190991a06d4a58ede215babcd3688e1d61f1975016244e80c88ae2aec05c7eeb1c50caca72b3b415b6b870bf5e10bd1ac3ba6b4acb1d1afac554444d94c97e171005fa4ea9c651bb4e527ff58d0c2f90fb453a92d6546a26e9e98395b09e8471bdcf2a145aacb649708cf048a7856ce8cf390c107ff2c66efbf2a76c5b041860ea576103cd8c6b25e50eca9ff6a2fa88083fe9ac0d1fb639c516b9bcdf23c34c6145a705498ff9b9747f15e1c08c63da6efeda4eca02c3f00dfec06c82220c9de840040118dde76be788daf84e6a2f44c81fe6defcc474f99c51c4648d297cbc48f081e0809dbda505d020cbe865e430e0491644ec8c52bd3ab8ce8c4862990f49fe2588caf804ce9500ef42d5a50c057c257168e283e4a4aedbe4ccfaf3eeffb212f9e23d15434d60bf4f455f512e2b655aff3225d1b217c261110cec0400f54dd303d6231d028c2eb649bccc91d30a6391c88bff9d447c3cf35a3467be5957e0ea4d4dc237c9f2c68ce48f658f820a3d72d559b60f233ce538c92cb148808e34fedf2d648c21e7f2ea29a77270c393bda42d869351d6c085d965dc12cbfd0311b8bf604f4391d378781eea3b5f1e0da9d0d8f8de88e56fe47d362cd46f591d3ec0f7cccb85a21f21ddcd4107821ce0ca9ddf99dfdfd9b0c9cd45053e5b1b4385bd8f5b227ada31b5c23e9420014474e8b4494fde7c38edfe70994d97b8cbdfac588df49a49c472fcce78cccc051f31cbbc1e0422878d8d490f3aee28adf1587c38fb7e7d1be54abeaa83cf54b633803a5e669ff4295df8735231ce39631616bd05e0e31117c722c2fd6787003b0bc7fe422a089c89329544e085d71102c1813769450a9f66f160d1702cdb17bd2c6fdf0f722762d193ce83623eeffab17b01b10a31db6e2feb6eb3abdbb2e36320e1a56e44e48d26090afa7f65003a98cbfef590ac3ec89b3eb230557cf6aa566e841806aa2767b21bb26fe001f11ae039e0c9a4bf1bf3d271960f16158eb5bd9ebf0080abd8369d512cab2d1aaae2b14d0ff6ee705a38fb0c801a98b0624cc138fc24834fdf430f33e1760db913da3290f34415c9e3df3e97da1780545ab68ac5a24db89f24d62f4a399728e4144a8c89f47ac2d29e30c49b0bcf790a5e3d3fcd1943c6a28f37251d9dd827a69579e6c17b629c927473b5a07b0a29d9562708d6c8ce576109ad1a3473ffb2047eb069beeec24c114bef392c929038c92abd0e6a19b610e27881361824d57008b7373d0ab76379570ded76c9b8284fe2c247791073c29b2fc6fca05019220ab92856892d3c0dcc6da0b597fe559c162d060d71513ebca050d9638164b9ae271fba5575ade787ec5aee8fc253d1b234b1df561db3e36ac64b9b0100dd6b407043537b2b141f
-MD = 2cbc07b9b9c819b8fd38d8a614a8a9c3fa7e40ee
diff --git a/src/lib/libssl/src/test/SHAmix.req b/src/lib/libssl/src/test/SHAmix.req
deleted file mode 100644
index 453fce20ce..0000000000
--- a/src/lib/libssl/src/test/SHAmix.req
+++ /dev/null
@@ -1,99 +0,0 @@
-[L = 64]
-
-Len = 16
-Msg = 98a1
-
-Len = 104
-Msg = 35a37a46df4ccbadd815942249
-
-Len = 352
-Msg = a93aed0fa5e163a82c9a934aebaab8180edf7de0b32f0fe99f9c75ec305b24609334cefa372c7c758262dc8f
-
-Len = 1016
-Msg = 433e88eb2f8aba562d15c18126fbdffb81d5d6c9397fa052321f5f78cd629708ba099b540da5451e949eeab8687a8d6ac35c531411cb37144ab5ff6a7eb46f1ab28fbcd2ea0444cd87c57bf7d3c02952dba3d3987da07622c16e7c086d90e88ad3d9d4afee301d2bad915d868f54197b70b23c9fa385c443404fbc9abf7e6a
-
-Len = 13696
-Msg = 2c46a76a9dfbae1f5e59f085e9c3d4b600c24b2d404d062cf948e75a3d4ab5b137a31397be9eb34b2a03c78367e0b85448891b511ddee1f787cccd498b172cb7e656c044a03ffde8e42478330fbe9c34072a9e99ce31b41757cc820d98e7d564e06694b96b66f4be34c5eadd0ae4e61fe6abbe4d7ccee855104fedee8b451a7fcedb793d469b0094c0ed07c97fda00dd8c1662b44e3ee6775a5ef6368cb662d257be561a5967893433a4b63f97295036a37272176d081545df00852bc5c4162324161296cd51f76433f2df867a5840f2d0c8d5be00b4dc89443d82175bf69c3bdceb97facae2b2ed68e06ae74fef36d8bd1f75f130cba509341dd54079d45de22845cc8e77a022977c7540aa3e779cb1127f39f825d4d78e55a967ef45e7c1dfb02d9999fd15af2914ba47177177d94576f1091a0657d9e04fe81e6be7b631fc1baae66584c9c26ddbb568750d77555c927bcda1fbdc15c7cbe3e3fe88ca13ff12c59b383343c12976708c0e3dff78be0e286dd32eecf20b71a09fee50a9d0b13c85a15b320b162690f399282798aa3291fdd2f9c40ed873e829388466ddd1da42f2de16aaa9272ccf44790cf3c95382c304e25ae8cb2fc9d9869808f3ee7d42cb143bb0c3a55e03db6d1202ca1bdb744e448640c0aa60d3ebbda5c21e623bb080f4a073a48822725d764e51d415aad1d7c5a7f17433d15ac7d849f910c375ee0899f6a576dada42fd651343383f286009902bb62deeeb2514de6af7f09892c20d0b238f6021f03b62444b1e1f21beeb89acfcd7136416fe7bd8f202e76afaf5345311798be7cb25351add2bb044d2380221009c4d1cbbaba4cdc8631dc0144f2778a6aa1eb3d3c81df0b1b2142fce111af8214d049e40f536c5d462b9224a978e82cc6c420e70ecc3cdaffb726a183c793845315f730fa4dac9fe46e4180397107a6a051f7f0a58ceb9bf4df37e1a81c8e9569187228e8037df2e59c52ba815566768bedc8e09d5e7bdc9f2bff23aaaaf133bb5a3332750f6124ce185e29fda0851addfa2c3d52bb6dfb530fd4ee27dd5bfdce5dc2f41debe6740274bc651aecd4023b098a7d622e2296b50d51b79c4e3f521695a9d43f038e8f273405e26584d3db179e7c1758114a3d39970df674580bbf2884405974f0b9c4b0d8b3287a2314f3f81b6991812f354d655f62513c9551b378cc2efa4c3e08b313c56cada52217fb6112eb8299b28445aca8f72e7170a1cd8bbfee4d2145fbe8d49c6af8831c4d4fc7177a50ee55a7b484261504af946c6bd5e1d6b89092f3c487c0568fa07c356fae9b8e831b8320289039746a435b122cfbc4a0d316bf90d481d3b7d979cc50d98c1190af8dc58e0035557dd5e94f437f41fab513202643a77748f76c6b77302bf40c392cd18731da082c99bdedeb70e15cd68bff59619cabcc92adcf122753c55afde0817352bc247d1170b8ddba1ad1b0faadfe0efbfc5fe6334377fa372c3435691f53dfc2ad5e08966b2d3525b1eec2d993a5cd4ff34278bd40dd80313a0727d05e0a932156152f3e11a190d8d69726f5c57d20f811e1e8932e86409ffdac96c6251c2a2976b8757adcac5d2de94931d1cbea866ec8bcba5774f8a7fde792f6acfd0f01356fd66fdf54a416af6a9397e00f848a2e9831627cbcbb52b5a868ec174e69b4cfa1ed72cdf23f39d7eaf4bdb318c188b1f0fe75655e34ad71907cdb77a1a2b162cd7c22d93dc45321eafb17cd60282e83736267b3e1fb249c307d49509f50839942f0f493afd9ef37db053a918e3ec83d801bbdead07554a018b8ba348fe9b7dd92ea7c5fc0e65a644ba19aa1fb6c022ab768ec7cb249ba17b9dda2860bd4aaaa3dc70ec009804141ad5ebc61203658e57a0887ec0fded18d844a96e79ba7e879c4253056f23e205a80ab1471953438f85848f4ab31ab175c089e0bbb97ea0dd6a67385770356741966053735e2cc2ecdd2c8c75cc045181dd7267584b901674b553082b2c58fb8f8be0b99306194a6f069f684535423304d40a268d55784a14260fa9c9cb1306b82f91cbee3c9f43dea9e50903135cc1c6505605a100bfa28564a2057974eef0852b7b72ce264815026d0759f691db618ef760edde73ec888e181403834f7221bb27a69479ec9b28a3fb0c3f68d4467d25712fc48ad78763f9ea6e8a2e85260225ca1b1a38b720e589fafca29f07257c5467cb74ee53189b8c81b784c43e93f98abde1ed53af60b27b13df6ce45001c6e1813de3521028981086f7d88ba13f6fb1a800f312fbe2f842eebe847fd760c394668cfbfd353ec14ca0366eccd7b4cd63318116bdc42e20a632a0d2b8c5cddb37bfc0a239ebe3800a787d2ece077a7968036b3d9b31cd906f888e3ed742cd769033e2c24c5a9e3c10b6d300db5a17dd88
-
-Len = 100816
-Msg = f8ed40e878dc68ceec52cc8e2868722310fb117ca3a52e1839eb85d308b8aa00ed0bf0b76aec8a70eba4f0d14d2d85c5a0e876ce2c8ee59cb36947def6c40a587aa07b368ca8e8a08367018e45b984de0d7f1aa46b977cc18c0cd9b7bb897cbb2814aa0ce8f8c9843e03c86c19f2ba95dd2ac4a466a93aae4b3b05055ff148517ecf43e286c57744a3e10a14d0c26e139a503e7927aa688c78609170ebe3b54104390e5f6cf538093a67922e7210e77fcb584ec9b6844e829be246a266460cb442bad52ca47255fb8cfe276108c36e02f9acbd3d191d34b93d29ec40d80496d1c1bb5ef036221641200e905598c54bc4abb3527c5a5f6258e59d4bf54a0498c108a2725428efc2047e0096b32dfdc6ec69d5d72f81301f881ca62a66c22e5dab9fd9d90084c0a36b2f3a0123cc5327a3bc7a12fd947ab57169ac533e4b6a2cb80fc65b9b527cff9fba26994c7fafb5102a0acd8f9d246a3a54178c23eaa04c0fdfd3c0cd980d1fc7a72b25d74df9b95c3dedce8ca316870c654f9ebea9b806da9767cf40605a4b0c7fb06f6b3f197bae7d8cde9daf38530e25bc51b68f9aa23ec0e95199b14bca96c91f3db15bf8432f714dc46ac87218691bc66cb3a42f6865e1c30f8394c8e68c0ddf5851ab7c5906a1994a9af6ac1c44d0d6b95ff15d9f77825ccea40fb9e516d45888f2378e045d95d936d541cea9c8ca52fe5f7d0d919b2b1c59a42d06105ea4f2943c05178e59d67351c5b2c0051c93a4045e512884fa656b772cf398af89081546d920fd3d24ebd16310506a786ab33293027394c1bcb7b1efe46b550ac28529646e8d2a5ae65c59345e24b44cd7b06673f3ed3b9008aa568a739c26682fa596b7a655842cc6b2758b583487c78d14a76bdac7033806c5c210828ef313f8efc4072681f5fded748c31a58ac933b4665c445f07d603e0905e49b84aa55146eb1c1c99196413832a05efee2e64d6732fefc629b79b37bb9390fcbed7226b412204bda523b8b8af5c4a8bdb263ef9f3f6c7b9e1de3a1dc257c1f33b3d54a9101be5b4f2a9db319993c2cd137c41e35c434ce52e859afd1a635af4d8852252dc5e28c729b2b4c96a56d57f3f3854ded59fe612b9b3a51fee3fc1c83db673b0cc7433bff2472bc74a2eeb6706605e308690fd072a7042ca6474603711d8310909e47063f46f287260a26c4f11fe492298a0f98d28c45948a4899e08fcf443a6ba36457dd8329314d53ac0fd0819fcfc3357426c5bb8d3dfd706e205a81091cf08f31cd3459854f3d07e503991ba5f067e3c406c6c5396d8257496f4ba3703cb1ba25c2fe4aa54577af782cd57e85a88a2d75c54039e8b7bb559219edd6e81e41acb6d575d6f798afb2cbf7f00abd5c9c7b0fceec79f9a0fb040ebcbb7bff3602df7b71357efacd37aa57019350bb81213508a006160acde3dae5c42f03141887eaca22d7b33d6791febfb619d11ebabb13e6c5378e9a72e852ddccd31cc53a43275966b7042ddc51485ca20e1c456dcc7020cafb5407548b044d332229911fc74d7fb97de25abff7efb431da82de2ed7e25d0dcc06ffc74e57ca93a6a9f64d76a5c39776fe2266f88d6d0229b527525fd2e22a1407e26f94c5bc6adb1e7327f3c8bb8d4c983385c579dd8f5623df8cd6da569c7de73d9210e6b9253a177653a13ece075940fc81016d8c35fa4f6542df5120c174158ff32533476f4e059e35117081a24798fbdd1eb10f82809836f8dbefe755611347f75423dd8571695960c6f66cca71f0a01e8fecbe1183bee3335eff10b4ff8104132040e2145ec3164b2448f60c730887b9d7894e5f7df3f876cb17136c99cf32db1c02fba860937378dbd093c4c5112133781f06c8ca07c527c2c085e8ba5e52b399f2909e217aef6e3035ecafe2caeb1004069dea023af7eab873deb5ebcef2313c9827821bb9f89fd3d1570a569673d3ede86a4fb13dff242eb98450a8917fd8865c56e0a9f11d72394b79808b0429f3a83cf2465161596887fa2d557b367a1de9c7753666b0cca9c30cba9f0a749c03c55cdc7a6d45852c76ce2010de3e7f75d95228efdc79949b238d90b25f983868b7f07f585f7b00e45d9e132f3c09ee84f794d899759be3dabd46a256f4cf8da71270617cc2425b24cef25d1d2f3945afa6f81abfccc858cd02e05619649b1a5347650934105c02622d538447223d136a8a0455cf3c6f61f696b32266197b5cd1d936fd3ad4288520fb4a2f59bf95e659f33210446ef18debeb679dd99de0c3c74a6eb3dd783861f5db4e94a151c42ce27519d0bbbf1f3b1163563ec06c8bfd881d94a3b896fc07352fc97ada73685588a2242da1b718f81bb1077bc70fbd58b8b52163489ae403838b533851bec30ed0ecd97d72d1af534f3703db59f1f563bdc39d690a0e90e545506463a37e84974fd7b256bbb912cb4077d3e3f5bdd4bd2bab713b696c830b1f2185734c4d2dbd49d5372fe8b813ce73f5e01c36bddbb376ef4541033f2b0355613eeda8951ebf7377e08f967902eb7e23c0fa798c6ae52401721053f1095cacb1e9496500e83c412236fc21566090b3a3eee55aa402c0b774802fd81c9e8579761cfcfdfb1aa23786b2dc35dacd5ca8d8d283369f53e4a5db18060c2c6b0c303052aeeffe169fcaf7ecc63090a9ade245045ab9c8aebf738772297caaef5f857322a597846c7370083d409df27612e47b0cb240daa3cfa51c57108612ac0dddb0f59791289ccbdb3a2cb1fa9ac31a23dd5440682fb373bf0c1f41c4fe2185ad7c53eb69552807410053b0c2d40132250e637b8c425e6a35d93333b5b7d0557927b6179c848ec455fd1ab38348c0e96c60b2da49bd15118df64b6ce4fa48fbc555a4b2874141718e731a40b85382ae6e86ead31cea77f83bf5c063bf1febf71688a832d615e09d6f14badedeaeb6ffbfe343fc7274e78cd46a2aaec0a349c5f133291ee57cdcb65c5474e46294de6bb50886bce6c6f44dcb95f2a4761ed2e6c9e7bfed51e0964afab4e0f7e0b07960f2590baae66b1ec9a63ba0fb6c0d27e81508c51487dbbdc9beb8879fd58c188dfc774b3d0ddbd77ee8bdcdfa0ed8a9387728e12b13e8b3c10cc1c132bd822c2147c5ddf9a993aedbf78ec256db1be76644ca8ca7727208bf89732657152d34e948d73c47561d156f773136684d4162d02260300020123d13a95f4f835907c344942ddeccafe2abb7dc4792c4f1e39c24748c63cba933b16be0b8853e058c47a1ae2c4dfff39ec2339b345fe3557d03c1df91a0607a711636c4416ffdb73532aeeb74f237ed8bf971388a0659e4682a46b8327e751034cbf2c87c7828da9d24baf07a742ada34d1ef38ab1e8f2b4f801192c146600709533e61bc2665dc1e9e6441bf3c4f6643bc0c102a10f9a69da5b0e3d0a0c7cb694c682493032b5853f02953b5c2fc0e1348565389762fc2dcfbb34fd305f2d9df080e859396ffcbb7da78aae0a0d72e3de76c774bc6a81c87f2872b6afe97ced5269009304a4992c4add0bbe24e57632e19ad0fe37ae910193aab0aeae32cf6d618ab33eba59f6a04fad00b1d2403396e6fa661d31b695a1b349d62f56c08fe6c6eae7a482177adf341e51d03ea511d7959c721bd20bf371860ecd7fce1d25212891850b85648db0a039e6638d9c78bc958add3e41341536b5007be63fd1f7e3308876bcebcb97dc3b05a7b2eaadd00f8fcc8dcfa7b961bbe727c9aed1626ff786d6a0ffdbd1002cae8a7d047b6181962a686c152b2341c7c58c9f1dab5af424d183ed1c7d003165a1d04ea3683ff31a0f68615af6f91c21f736e67df641ed31b998445afadf9052bbe004d5dad08f62e5d353e42fc35a92242d8414d99dc4e7e81c8c027af686baa5c185e3f99abb3855b22cfdff0a62e2f47a632b7df8e00e0317af5c24ce7c64077bbb15ec27e062070cd3eb8e549ed9112469090ad9a96eb59294b021eed81987178cb2dcff67a9a2e930f6032c753e203380f8a7c987cea393234699de03a1d09ce204f0a8b6d5cf522b6887174fdbccb08f3e7c4fe2f778254465b32766c48812a45151ac37ae354dac87419f9476baa27e24b2f322b2da4ddf579750684a5881bae2269351fb7de59b9d5a4badd8951135f2713dafc57215dc626ee170fae7f20bff98e36b864e1fe0f0f9a300c903069bf0e0b6f2f8e78423cf6063e89dde6c81efcf26ef15510563c84730f611ac879a6628e55115e1a29de6945d37fbe4f803fcf2e344712d9e0d6f6c79f8773a9f199b705235e20a7830ee3357c5dca29d7a6c29a3d2628bf2c42c8f076cc4525301d8e1860729070dc53164d9fa08bf63cc889eed01b0130a7146d860bbc09ead3865a3082db0836a45f5506c3e46e452e298764939226cedfd06700e4e33c6b4a78add601140249596831e97f960b973a4e4dc3fe2813fa34eb47f998ce57270368fb81719a09298a223f7e3931ce5cdfab3f658649533354e982c87dc9e49eacebb5bb4af9a767b4f1c03d774431168cd4fec1b2726f1aae3f9a062a825f3295557eebf3af4784487b869fb049de44d03fee71194fc200af72103b157431935b5ab9bc122773ffd313d52d7acf1078386090fc011de695e71567cfd51c06317d4ff8841ceeb74ad35f4e5f4d20921123cb88bb2079674ad39e133cdfd6478d69c9bddc7a818be5d7b254bd9e0abdb030f52846fdfeae8ff370a51a9c5f6017af3c6c3db17c5c614ea18ab0e3ca0dd5de621217dffa36e5c5318fe191040a50cc3ca620683bc34da6c142e1c50afce28a86b8b66d189adcd755561a647080d93f3ede1cf54c3afb7e863fc8a82a2576d3f79e9b2bb634e598507a3d7d017e0176b7868bff3a3dfb4474b3ce03c401f33929364e727fbf8096b77eb351435c7a113b3215cc6246dd86f1517a7e550cf828900248f7c1754e40fed62477b296a37d3e53231360d012c4908b466e49b0e620c0a5031228009f259b030956ebd70e49357c3c3ac2842b6bd6e3ca5a3e985dc03f7105681fec03b320a7ca753b782ad3b52fd9c8e3bd980b48dd6ec8901dbf756108e85015821c880416e0693e0479cb31c0743450f6d9214afabc4feadb9bcee9def460a58d3a02d9e3039970068b8e3fd0a403a6ca7f2c71ae2b46ab3c731b1e65e2104c47fcb1f69e7c8c6df8c09b33f2e1cd4192faab316a44536dcac608832019f5765cc5240eabe3c87445c980c299a5e7ae0acc2c2ed19fdc8f011515bcb00476b03633c7669db1b44f97f6cd402778e9687c740dbe5686789b79d0b13f784a2a866eb91ab2d66f064c49e8df513ec348fd7272ee548ba08e1f9f99696ffb53677550d59c67f88404f6e610455a422d9cd987493ca5c366a397dccface2bba8e3e99719dafa768956cbf6fd8defc4104b8925878716a0514f70cbf3fa2c2bc2f66fabe654eed3076257e71117665703eb88c79e4c2b94e8e856e7a6ef90ee2a358409db78b98056ce1750eb80725d70e35507fdfa5933a61496ba48fbd5555717b33b59d4ef211fe096aefd478859ffc97a41372023ef114adcae5a8d5e03c21369baf1e7f417cb40326bc6db1cdf0904651dda3c1039a2f1755e7c329f7c03bf33f324206ce6e1638711c8c9a45f153aa1f847cca2a5d3af1d24fe7a1e1094819e8e712cbe10ead1012b7371b35cbcc2bd5b10505fb63bea20ac81d25e83ed0105e7595b6c28400f4d336791ce4a584323d0b455bbed44392c5f86c9d5287593f6986d4b0b8f9974a7a4157859ba801251d3b44b2bad84f29cb87dcf1680d6d10d1bfd59f0c95fb7bd07fdb3ea2fccd6e3ee80af438956ccfe31e750972f893ea5dcaa26d077fb3f09d990c2f41c8707368bba007803621ecd76540cdb8705435d74f4300eee04710a936f241c034709e625b0dd5dae1f6e86d034426819c365a05f5be420cdf4042bbff965a666a5756f67259448ebf742b6ea189fa17a4c3bfaf651d19a8a525f09d9cff637c8fac02eaa58d3ee3f7221da1e61833c0b183cd9f47686f09597e8115b435454acef80c079eafaa22b18927d07bf8b7c5ebfdec9c42a52b7824d45decef41e6184dc2db1505ca6f94172fafc10731706e79b9856dfede353d2eadeceaf72a302e3492d7dc81e3777e4e9e1f3d33cc4402833ffedb241a75a09e9495d671f80ad3acf06823bb04a92b815edd0ca7d01dcb3318c1ae5c62d3e99c0ec37908b45b51dd65f6b45b34ede2d6f553f60a45e20fafcb34ae4dbd375f52a5db9c62650deeee78e955087c2bea75ede7c304347b171fe0c1a2a033894be6e04605271307f307b2a9cf6ae24b8c87ce033a3fa4cf2bacdfcf54fcccb1f580476c7d00c631a8529a9eea2a713610341e0e25609dc8927e51c58a0a9197a54963b5cb95877354f4b8316df02ed2bea367704a12274d96bcbe0d0d728923a368bb8ab98d5db5401894c822632308ddfd309071fb4b477d8eac0ea5dbbc3e3606d8510d9051dfb5e4b7cdcf2c57c1b76902d864c3109c901da53019ed33cea84b407490486ad9f980a8a63df3d2e3921064afea137f35179130db3351f5bc3f5e7d590a5ab08b5415efbd345f9d57b71ade7dca939efa5a12d677b9af0af14468176a43712bde10cb15787c18bf066eaef8abcdea77d3a0c61d6c74ae7b54fe90940d0233e4b874c9a141dcc740d7fff43b9fbbc012a933d890232cf74fccb7ff7eac1148e203c7381b7f1d1429b1b1152ec25cbf7562596eb402a9328e43b5dc5cae36592da5523f0b9907a6817ecd395a7c778daae85bb11372b20641a04250b77b3a0ece885d07faf9622650259b874536d6d2b92181c834dc111b6fcba483167be40ecc922fb87006f63b9e8e632879563f37a8f712db9fa68c1a20ab239c0116fe022fad1279f3288b8e74a16d447e467b6381515814dd3aecab5c2a09c400b44e9100c04c720dc7e8c6d9460002da6c52004c16999975fef8752c2f9c229cbd9e6446b226cc454bd68cd665668a17328bb30f301e92ef5c7a2197a326df5c99b422096de8af231d1d8872e6e505bcfff026d4862f28d4bb3856a66ced22c9b0587451d8da4230a38561b5b1c69b523a4701a2001382aa82fcbd60733a14696a540227db44aef346d6c0a7ae5173604d59eb828614cafc1b8cfecda054dcc7306f73925e6d1af56ed74c51c6cdb66e9fee8d7a0078254fedb0c0f5dc85a4686870709b499eafbc8451aebadf848b0598ce8f955688bd2d6032abe10d1391d67c20a049841f95d2ee0c8deae2bc1baca0c098d8718cba1ddcd968981c47cd98d247aca4f838f3bf16d092eab8be8deb1f8d504d37cc44a8c96c9f22f2698036d4ad3bb48b31f109626565c147d20a4a7dfd61fb918f81548fb4f78875c1d138e819f6822651b93a3c92ad77793fba5222d870ea671f9cac967919d18f96e92778548415b2e170d90b201215354fc48a77e62823a2c2bb354782ad052732f08beb278f751529416f37d83ea26248517ae2ef2ead28c1077908995a2d25db0deaa957bcab39715283287fd626ea7388abccba2d90e364a7ff4284c84f70da68ce1aafb5be0401cb9d45e085aab41892a49e10cbd5baf2c34f5e0ca076f2772abea6f622b66020d546f8c2f134a87f96edbeb9b08394b585f2c2f98aa792f97b43b5f3aa9c34189804a9ecc2cfaeefbd0f967d85a25bf3136fd8132dec38aa82e4af6ff677682f3b62be27a180aeb22f918c24f23bf6f5954e0722324cccd06829fc32ae4fe3aee6e5a03b3651900e13fb0a759e544d033418b6ed40d037b4549a0404792c8fddc317b7f028493c4c91d6773932f8486417544f3d007e5f9e6fc02fadff175303f77f6b0e1f709bb3d3a93b38552ccf62688a39da1a602dd5e122e6f4e9171769ada5255cc5cf938dfefcbe3ab0faca434c42dc8c357e89a3d1488fa3df35c3580b124ba3bf6d0d203d586707eb692150ed05a01bf9de5c4e67bb948088784016394d47abb853f2b6b643a066ad81bcd1735aed4e108a8c1fcd025b548de874eb60de7f3c568728959147d1219e4b830e06ca2bee1f8a035e28a54ee6958d4821a84e5d1e41139905f7ec60fe67ce5f4eccdcc2c3d1e4a753a32dd3004970a4ff3824471822fe2b5010b9b6c6b01336dbf0181a95cba2624663215468519871cc39e8a7f4a151c8bd03363b402020f2fb98069b2cb8cc1b7e930938e7540d95d1d223e47865135793f9eb573660ff79f7ed2fae503e68ba44596ee745fbd8fa562c5c666d174cc01b1961736e18b8b517161ab9c8058026e0ddd6c94aed0086a26e1b959a5e05eb9d8c1ff5b2ef518ca23b4f265db61b499a48cc46bed28d23ffc1e8d9c9e345c06079ad47c88dd4e8e286575bd7f9420ab9c2d5c6685488b8b34d4c9ac04e1427ae0994cf789b48b01d1db9c2fe75fc5187727bb11119f82d0739ce4048467a08cd635bf78cc1b6cc9c28fdc199d351064a81456f81c9e56a43aef7332973804b06b18a26caa62523a7d0acc272ba49124b17bb68800d5756afd34ddb2b7e2dd8a118aac3fcf39d9f853c4d2c4fd3ed5bd25a6604d68d57db93d15aa1160f8a97e6c24238e84f272780966867f9c644ca2775cdac4af0ece036cfa6ebb1cd9d701dd7daec5763c9a4de0385db383a5647918e79c6a6de1f4ee1f6b722c561704c8d7efa4710d78dfce8ad2df0d3d82cbb59cef0bcb001f70bdc6e17af1a720b117fe02bb1dd527b18e6bce70e9447cd0cc85cbcf431fe7c006f5e4ef878a974a93b25f492847c9ae020583c9d412f4124246164d8f080b615e2eee267a7aeb5fa0974de52cefef23cdda7b305a33a91e9b50471ceb72dae337c485d636e28d6ee31f5705983808b1567d4d4ae820ec445c56e6a404cad6b408691475397c0dd6cfad232106ba96e5104052700a653e21f9ac6d79578a9f52548f426a1e81dd45bae30acdd4d22a2dafd633564d6b2f45e7d35413503c955cb0a9784b42ae8c2a5933a6729f3922f969a158540dcd201ecb6e32f88b5b4921914a2e8f424c8b031f115ea5d23a21e6f22439ffd7e5d11b08df729f65613b4f6ad3edbc9a066a5e712ecbddfa6fa764cdf170c0485f82d924a99b7e7ad8dc44c1f93e49b6469a9af3de5691944413f1417b753bcb84d5b7a34f362c383cbc802b0c88bd23a7ac471b9287571c42081b1134bfc8ce104a550942ab1f2a074cb00a90558d6e841ff15cfde6951f03e450a1bfc90dec6c513fcb2692ddccc31d22e5274d41036656183c72fce208e44920776f196193137ac67d6d65ce9cfaae774f23a86e6ee8ff3a4e9422a4667d971906e5496a4e80278774899c882708611bad282f6c1d666bc5e7c40082b43a6e98d494a18e9b3cf7f154fdbf90d786e59e83b72ad0ab893c49aca50ed37ea5202e650fda54f5c46ca2a35c476f4b009c5e6733232275abd1341199b63d22386c484cb95c43ea90e609c407bc79ddd00609cc2eb0d82848db239b249f164b7ea384d0239fe1e64d04955b9297472cafa2ff272c5c78100aaa86cdd8120556f25652a3c12da5853338e3be8f505d93ea03cd1cae7e78e95befdc0e26b760d11e05403c348e0523fe036381408033c009a8e1f117af5100a6eb91f08307df465c20bc1dd029875ef7e49338689f602d98f2dc690a57a6f2864e57098f8bd723574944ad3688b292db6d01387a16493912722ac8f91fd12b748899bdaeabdf0479df788eda440d7bf30d1c25d78d757f00b74bb556506637fc1ab87162f05d464e63a6272db3fe56e9357275035d6b6bee32bd92c4a1dc94778551e94ee1d8854f767bfac3811bd0287672aaa01ea18c25650f05a68cbacd9158e479b508e72df778589e1e03dc543b60bb3b10399e5c50de9e728e69774fb3f5fea757ddefccd0f9da75afe4b67f9c54aaaaf646e858fb001a6deed0a8a769ecef0689c988de566b6015fb8c40aeb5f2df7ea4bee60e8e69d15c4a4aa5411dbe63fbdd6418cf025d87f37362f15e22aba83abe1a3de9857c71c2234023b969eacc0bc526363b7f30b092ca114f2a6cefb34394d146866ac86a33fc497a8cb8e2a5bac398579ff7958878421fb08fff4f8f3deb8c9641b8de392647df3017a5467f9d7b23036935ec6e188dd6dbfb544b8a9e04a4b3c7fa1e4d1d9879daf69986b8083e6eb023a4b5eff80fef17f8f65433c882a21565a919448e6091d1b61013fdaf9fc3e45bbe827c9b4ab10b05600a1961e81d31c7404f8e0d32bfcac2937eaed811db167dfdc29286b0d51bad2bcdb9dea76eaf495a31a7fe717c1c98be374a36271cdd06ed06c02ef4c3c06cb42f73b3332ed488416010e6bf2f4dc4dade6e2e61f19e9306bf941868f59fa0939005743dd647f0a04b576a7e71d4c383c479453501e18ec56d7cb79fe31ff534afbd8609ed701ef163f9de31bc58114399fa0f22b62c66c380e8a10c34b7e731df2a8d39dcf36fbf3a66d67b973e3a94bf6ee0bd96f5c76baa76492032fdd2f59ecaee403d486f543f2cd7ae7b0dabe1b5566e681cd40d384a94349e9668650a6f2d2daf86c59a7b02ba466cd03ce1d50c3f0ca4c02dc4b3d1c0e7b9a77df9eae0bfcffa32117d7e05adc7195f4278c93497401629897a58d08ad7141ea52e0163f14992d7a284e7b875ce4640b4dd48ceedad1ea17d8ab1e760773044845e0899602f1bdfff4d42ab80c0765d1a8bde2ba0a830c050923956d06c80b182264ad19ae4f7c39e43195f7d421bdcda00e3eb5ec5ef2ec91d69df691ba7fe250352acf01fa92af5e2c634b9c7c97889e9147e869acc153d88cdc18908f882f371ba9c1e13c26e9cb8e3cbd4c5e1988080ca65a67b3a4c3460cfadbec904d853fddd2f5375b6070941fca53cc106b5748480213cfbdc1c34320a0478b05f76fd0454c75eca069cb1fa7b21704dab67dc40d041c8a1040db378e76655636ad725219c049e6536982d6ee9f11dd032280e622547c7ff44a938a1f233c356a98182d22d5770fbc871e20bb37483dd5d6ea1551993b95b30774a49b50d411ebe0e8c92834094e23ec2664d822c40e96fb42b8607b62b6949e05edcaa436d0ffac6a8ff384068acfc0220c0b098d368fb8113918a4f8c9de37cece74c8695cef2427e54a6e77ad092a9b7f1d94ac9f0836deff41b905b5dafc58ad6063759b0372a634f69a639e19521825d66a282f489c3172a3659264d0132af3571e637782bb6fe5c0afd24547612166fd3409d0991392fa054ea5bd07a4cd0921a13ad7b62a0b5e6d56cd8adb7f3eaa5c99576941c38aff311c49a8c9d8c755869302a2e5e40109c8365a551cd3f859b9421be189d3a0e9ed78830d5cd6a2414e9cc4c25814d94d98f8848e5386d6dbddd65d22b96c5d20020a5dd409c7e5344065871e57e01c91a443501dc8bf619890fe231319b5480c3879dee618d319962596539e2970513fb5c0c8eac3a71ff99962779cf1d7e916566d0e29d121c5cec5d7302a18ed00be9316f3de8c669a64c2a960a588f9c8a42690f6867cda7146e8ce27aa6a7fb27606eed9df6a235a42d17ce71627446e206e879de56025a66556263f06684dedcfd6f083d6a707e5fc8f8212d716e062f0f7fd0c2fc62bea93d68581265a803c31cac3f8ac8939c5f8c464ebd19df42c7e8998494af614c8383294f3f3883f2404ac10404759e182a038c97aea04a85530ec005e203807c5bc30fa9f5339b32fb0427e64915e29a25bb25ac60b92256470e7de5298d42c6b88995f8d2fb704e49d55b66b71e237af90fcbfd71d9093e1a543da2e9911ac4102346dc4704859cb33ac5f5dce2b3331a9dc9fb506461a5436c89bf90d39afcf93cbca4cfc35da6ddb112243928246ae0d1ba269b0fce0468d3ecabbdb925c9ea3241e2dbdc6b151fb4aa724a42f98b0248171fa01fa103f116d0e7deb65dc359b09126f9a420300fd209508ec7a50be56d5b470e387d0c52a1d104625f9571ce1404d1b7af3fb00475b95f752ab96610be112d33ded48624015781e7198f4dcdf917839471fbedb43c34efabe09941fab6b342cf672a29dbb1eed0db788dbfcfcc63bcfe80f7718571f691818dd6f839e3cc282f85f03fe0400171cdf1235049fa53de7450b4c40ed398d5a486f52124c1c63de2afc950e81839f52d17e2a7d32f82788465a65da6cd763c6360763561ed2bf47749080549b6e2db87514e1ee1c85a0bbd346eb6e3cc29267cbedcad67a287fc5be65ec59ba8b6854b31c83dfc5155187d4150685c5c2c342ed68b01ac9e44b60f0c100a347a0f93074dd37d8956fe2f43110dda66e9f9e6185c23dab74cfca21f3ede4bca87687549ea02662f45dfa0ad27f9959a120cacb7c419810e1b1a50fad31c12c47d5bbc61bad77044aa541d29faa6126c60ef088b82eead17a52843307d4bf798b853d90d14c5347ff10615381d85e964331b7a123d15a77a6790d93e920052ddb4db4baaac5e2b27b66ff955e53b8308151c81da4711189ccf0eb393c5bbccfa1f6c94a8d5f4bcd266fc6a12061967ce836ca042257368f567dc42de6ce0be84449234a6163b72069f25b7ead4b2003e1a7665e87ccf211abe94175d1c11bff2c0b6bc110194d34aab96934ef59804cd26e4434ba166d9833fb091be37b139cc10748b881c93690528a96ccccd2dbe024510b8da37dceab567dc52706461c486a0463369cbb99bcca2e8a4d2e005c45401964722a4b3ed37c351c9f21685e8992c9634349379f41796deebffc2928058c8ef6ea37c6e4970dedb78d1c2a00ea9e1ff1e7708470a6c60e6a2b1e966aa872776afdb238e97f716b3df8dfd42bf0f7ceb52bf9eb33731bdba5987b8f48b4599d67b383e77413107857e951ae0625059e5616ccb41131df9a480efd5beab3a9c99615921caedc53dbad675c00ba1030577db1d22731677914fa958b44792cc9c19e2ac71ebe61a05ee67ae7116e39e1c0d103f18bbc9d531164360d901da8234d29fb0b37cd2a60c7aa2adb2a4b297ea2fb14122ad95bd4592ef86c88fdae1e37dc8e44ad03c0fcdfa3801e93796771c5a2ec1e4ab12a64b3ffe48e7442c6224661ed5cc987aada6e778399941f7b20f16f94fb346b916be87f005c9c13789741602039d38270643cce3c347565eef5ee09139330301951c15756be47994de6f1802dc5131b9b011051b1d87d744756831a71cc8528487f032fee9dbffccc751e6a1ee6d07bb218b3a7ec6bf5740ead7a47b6907d7aa95b79aecedf4a637ead8fc6fb8654c93d13ee79f5d6258dcc61993aebc65e4fc14eea7d006e31f6e9f60e3bca8ce52ec559876fd20255e507daa99b185671ce1ac11d448c30bcdf97b9617195e0ccd2d15246308dd6cda74a8071114327fe203b1adbaa780f3243105c5111636a51dce966f5652e39d4f91abbbb4576234d6cacc3ec57cef2dd4dda49a6c33d12bb7595fd5ab5bb15b40301f34ddfb831a5dbf62218f496c003227fe6282e2ac054c45e7f3fc93e51b3ee8690f08612395095a0a12729d663eded879d9ffb325c62f2cb546a48bed51ae232fa6ce28a2494c132a6e09d98c2e3d478d5d2d15dce2e2665e4a3db448931068b99899c2bd8ba87349b0cf9e3c52cffdcf58a59b4fe0089b298b42ad7553f831bd60f5cfa3e09102fe773e4c05412973a678f3b3ed420433cd664dc7f218e816a17c5c9013ecb84abf2dd073557dbc41b92a91e0339d57b8b077a9a44d56427fec5748c47c1460b2e2412094db6d0ad06dea0aa0c1368592594bf0b2f590a9d6149e44dd4adc4cb42e5d9940d59397b83b33b88604c210694e3fbd84795c80c1b09ddb3b1ec8bef6e9dfc4d7f295e551a79436007ca48aa605ef5a89571e59cb26f2766e564e39d3bb441deaa0c8664549881d90a77256c0f6c77241fd6ab74b0e2890f78ff16fd2f9271ef96ebfbd0b878ba9c703900752b7447f4efaa60bd9dc9cd5673a36b39d49f54274caf03c0cf82b95141fa20ed3ce02ebf0dd74d9eff8eb9e2dd3a2976b244b12fd33ee75c1f1c459f86a1cefbc817f42d7f43ba406098165cbeab99df4fe751ae3382efce32af252e461652c7598161e74fd8eeca474fab6b1ede039935f2fd4d7562623b90a422a78941f47a76863d95857c33653d1b42b806bbafcfeccb7bb4a0c58acebf6104b2570afc3ca88e4fdf2719cf39c964a1ea7d2ae4a7fadc938abc95adac495093f6b959b1347501606b3f960b6d739291aa8c13eb49e98b0f78d2b91400b6d8961cb6165c8b684738e4d4db2f2ac30ddaa03a5e0cde4142b625e81907f08c60d7cb5729456806c89ff0efd08397423e44738ff38f8e88684f3a099dcda455521caca37ab4f4d9ed5d37975d4fdd778b97cc93babc804864a35e3a2db04598152e67a2f1f157681c3962d46ada23ea5d9a524f9cdbdd08a07a3a85b1f6fbde11d5a35c7743b83bbefd19aedf6d92241d16aeca7f33cc51839b75f111e8edaeaed808daf2f43fdb3c6f032ea45052ac31d4870c4d0d76aa75d0b88635ce449054013f234c4a16cffc58c95ba1cb8a0a0399861eecb1039bdedfab4d05f0270c6b16f03f6b8e629f687f133ebf2662c7f930530746679aac2791f54d6a95bfab5be0c33739074ed4e7ae88dde4a8036a7d6095cf41776366b6ae3f8f4a0734f48c275e129cfffff5e0abd042f99a957bf6f0f47fc7288750f4fe30198f8cad7067b36cd87ebca08abd3f9475e7443f83cca91a1ebfc42ef3494871f51f6d52a5524b9391c687571be5327c7c94ee2a096653acb410917fd51e56a92be4f24c1db6b97b465ca84c31c04c2f61eae07e952eb6554aa4d8a380d9ee81c1c462c360fcc3cdff2867a953b655562cd06162af8b99bbe662e0c27ce4d9a1c1a907def48a3231c2110c930a2f1498e32dbbfee0e5c5869332f3024fa5dfb0327a27c663cacd4e9902de34dd93529e90eb347bafa5035f56fc578e8386c7571d1f0ba335225ecd8be026b4544ad70f3af11501a53119ee39a8558ca0ed5b3d897ffb9cf0fcab55a0942d3bf7bc6b94ea27a6b748f2cfda431f35252c44610b7e843ed91ebf7e8fe10638f04f52d6d5a7752ec62350efcb7c473f80b1f2a26805151e8346d39d23551e92fbe372df7979c3f756bbb43f6bed09bbc6b65fe6fd241ae1c2f1a0d0b805c582853b85502968f9478e9a84895f9d4ef01ec4f3f571e57cd0bda68ee1f6f7e14fb6e0f4ef8c7dff6796472a935294fc27b16216966d5021339ded059687355b42b55926854bbfbd9f974a0c26eadbfca8a6183093996cf252894e6db910c71ca3ab2e82d90d371c36b92c9409cf7937bb266ea9b29c41d774aa522e103cb30bbabfe872b57beb027623742806aa7694a859ede9bc1fd7b9e32880b064b0030fce1a0e5cdf3ce558a5feaa32e323dbfab6661c5878c9377ee52a615b7c17bf1228e328aa20f92d070c71561969e1af532e76835fb0436810c3d87b982217edfb1143bfc3405ac9f6f3a50145608dfa8658b0ab642a347255c55b59cd1c5897b2cf625a0f0706c30ca1c1321e90cec57b7c3d1bd1af455e3732db80643383c41eaa6781f63da6233360ee720cc04d171ae2445b0c071e339d547f7ac32f407d29ec7abce0a9e1ef5276544877bab2f84bd2eef47ffa66f96e7170cd54d836c9badbc59435146031502c1a3cc744a470f693636d9050c5b894d2d6047df60eb0bac16d905d46cbf017ca69d66427cb88036eca4ea9d0e579f6bfd8a4a850703a0fe49d39c107c9358e98689fb62bd0475aab4b2031446b437c7f9e373caf0270a28d7b15c71f02079dde401e26175bb6e392106a9072021f0e5c5145a1db6f595b032faed8551f6e2ce318db1ab513db876a3eb42d225014949c19543e9c5dfd2290e28c5d72c87223f0195ffbcba1c02c7d0087721efd2af6881dee7dba7565e07abc35bc3fa41c6a4d6a313222ac6dbb117c69c62db2691c68869ac5fc5e987b0ae4335f815c73ea4235da2582dde81d6fdae5911617daef847be17f2bc09edd88830eac03977f89179fe03eb2dc3b38df43803ca2d38455232549110f4580ec3cc04c0d8cfe493013d2cde47c506ef6a8dfc42d998f70378fac5ce4709345926dc477e9e339d8c87ff6287ea6e2873e14d538cdc3f2a47e0e37a2601652f5b665b616a7d1ef3537a3327a76f93990f7694e6484e7a52a10e9eea2edc92b99406abfb2b11ec86667c7af4a333dfe900bf071d1bbcf4f0ad768fae4f450c53817c507d26e926e753e3395201d3ad89061f16706d841994abad283f0db74cada25beb5fe46f48669a62e0b849cb77097e1b4578b45062af4a071b04f0cfddf87519cf2bfa10ebb4b860239ff187e6dad73806ae968e6ac0f738baa88edb3ae4883a9e59be7a6b222c5f54818f95578daff9fc7a7aba8c4a41a699923e85ddf24a32bb71c808516f64d506058a70539276d57984d75161cba7d53a4a864c51a249a6b8fcad5738dd0055ba8468b56579ba5f102642df65c598490f3a0c9b1064f4eb1962c4c38bfb7d55d496a0b0f7b3f90b42f733d112c89176aaf937eea4bada845f3ca4e9b56b3a5a06b4c90fa4c1914ea47020c2f32531e270007ed389246906ecf2c4465f7cc5d6a347583dd73341ad97199021819be81100d867d628323ef7552db945e4c0be604cf6c4a8197958bcbd6c1879387d3286dff979632c54baba2a35ea84efd7726b662b94fae61464d069e0103692599fb86fdc3a06e01c6ae3deb3de6fdb21806c716e5f82b784e4ad3f0e2de629a18e3a2309003dfde9dde8e5101b83312f76e811277afc286b56879f4eb80468e58c60bc088284d05d725ddfe3185b7c51b472a7ff7db3930839142d4a452ddab628e07d43375801d7c6a711a55b452748d770b84ede35920c1ac74b595baef963d21df9418533fcf959593ccf5afccc753e86c4ae231eafe77a158c2472143faf169db29bf2b53c3288d8b3c9added65778095f85e2cb471ab58362041f0a27d874c42bbb06385a0403ca193cba67cf70029cdb7e73c7e2267b856fa0b8dd4c706b45e7174659b0ee2891df911724324f7ca5daf07c912b9b2abff762e62a1817688757492975db7185c4695f3a90895634b8d07453b36dd95197abc31d5d153dfb0d0ec92639540e99d6590f9b394f14c93a5e829fbb33616e810f59c502be44a13b700fd3009545e34c211abf9afe1bb8ced793c6f516d40010649f83a78ddbe9b71d8596582997d0aa54192e1200db61dade30500d72a184ca7dfcbfb80e5442f489d316cc8b75005564835d4b11c482e2c4d0d160f14a8b13ae0a0fb0ba5e3b782770aaca357df0e1c4d1c3b28b776a8b3e0da1abfd4f7190673fca1e1c5a31c688d6e8ddb21300e4178d07c4e854a718ac3f672b0120d6a54c16957c9ec8c444208e47737bc4eeb0bf2d801eb2fcb72f91fe988aa75f38e6cf26e858dc2a718580ff5d281d13e8fc3e3bc30c75c0193481c39c375a5b06b962d9491f3f1fb80f1cb27067f0709e0b0730573a9b5f5bdbee1708ad84b4ceb1a9a61e4c41e90655764057bfa07b8c81cc83a315be1aed6a49715479c0fd0f53f625fe6c7f36fadd001149ab978532e4d0de3d1a38934c74265b161899843704fad16ffc6189f42a5cadec98603e0f98c6889bd4a559079e074cb40678fad4690a20d988735280a1ee8ea71275069132101b35c18ecc9d3c6eceb4cfe9b165e4b6acc17d4f113ef8283c0fb6506f5635401e916d4f7e7bc3cf49aed166587a0c72cdbe673f467d81bc2e9cd08cd8dd16d90b353481df31e89b45e8b
-
-[L = 48]
-
-Len = 16
-Msg = 3a35
-
-Len = 104
-Msg = 7db15b3ee240b45d4610950996
-
-Len = 352
-Msg = d2a1efc725c46cd6a19760f49edf0bae823c1b4992ae2260085746cf65833bd008e56e64002383f51f960239
-
-Len = 1016
-Msg = d11ad1253592c094746da7b5c88d329bc3ce1929913b8be07e82d3f6b7a536a855f31ad197376eba6f2f4534413fc4e4e7673fdff8739f774a710754b568b7c61a473059a41c98aa4e86617aa66d2601d0f0d584cd9f132afeebdc0ce3da6a8b290059e6e4aa080c195c42ae7f7e1e99865223439929b0a3a0d79b46ca6419
-
-Len = 13696
-Msg = 2f7a9929dffaa4a4dcfeea1fc37b18e3cf935abbaa17cf9d834b3a8d61e9fabfb7683cfc387d6f46ece3f8bf845827c7ebe86a651d6dc1e83c5772cee1a9fee4b04453af2f68430bd87835126cfd1b3f8beea4d3822fb27864570e255cb65b414197480b6bc20a39c5450adf2474da93d72f6ecf8063899722d3755b7a19f71e93e782d89593ab19ddd3ddf053c54e0bf832311fbf132e8b9e540f38e4d9bcc3cdbf69de54e40ef348a9170ba2f65def167f568ce846889c0161448342fe907718a465e451bc1b0f2e4f21f9b911f186589f43dea305811473837c063b915d849c20deb43323bab4b64e61823f1df119e71962dd975700391b411f8778980a3080ba3c14a321d32c082d416ddd2345f0eb751a516d44ee55222395cfa11e7fc4edfbe7cd49bf4ebd4d7428843a2ad5538b3cd201ccd431aeafb146a65d28a4870a6948a7cc0413b0adac7e8dff3a898aeff5f4b65d10b28ceb749bd354c061c3008ec569d5f90a4d4f5caa51d35b49dc4028e738c8ff5939fef3fa202fed9ebef6f2c7dd0ba41cdb5c0c16985f96fd93a65d134fb4a90ffc0fb6cc5396b843c2151bb7c9170f2fa4fb44292a4af28df5481de0c3c917ba1c46467a35302738158493fbf6a0422cee558d4bce3d78e14b4fefb65bb05043e2cc2a6a8ea64565ff6ce2fd2c4f43fc02926ee44ee02fe1dce25cfde0115c9396c9ea06269f17b2caf58e2332cc1c8528d9705c70da1f76f22aeb1d1b93449180640fb5c4c4a708bc4621d7d2bed5b1a752191cfdd45086d34f247ed1df0f24e7c620de32bdfc4d1f882380d2cd7467c926f48abc75cbfac8788f88cd9dc5361517a5eb36311e6b39e21a85fba2038fd47d860f776697bb19cdb5a4d6746fae507e274399c91648537d905015e58910117e5914f44ebcb00e771d38b30c1473e1232d4e222cebceb4810c48e83e0fd4c852f4fffcd643c0ef9e4fae2d0ebc6f102f3f749b02a5e3a61517d53b539cc24120df3957a633d50369d46c0c226f8924cae51dcaf54d716f61385fd8cf38c2c311a32bcd6594d6930133dc18ef36a9671ba8b179abe95f588ef74e8558ebbc974dc73c26bb6eaae78ef464181e18b71f4b0f986ecc8495a9c4dc0b0b96be9806fbd3d32952ca3b4737a06ed6561e9c9581a33a720123fbaa2a70fc3233b83e56444f5aa0cfaf70fb24be6118404f3e11e6ea004cf2d079a3e93a8ac1d4e297cf4fc43851dd26314a7ed6a5a784b386daa26e50c64692f7db28c21d82234289bb45bad5042236667e6d70a24bc9525c3adcb793a6a5725d9b10911e3bc8e3fd604db7998346e7f7dd1815c0cbb735a977bd4b32b5b976932bc92ef3b56bcadc089045ec95f241cdb0a84c67f1f76353da6cb493bb27a881d37a2106b8b3010cf935eb3601ce4dce3e449eff8331e444ab117a20809a1010db4cf3be0c488f777b6532df908112e3d11592f04a0cc16232d62340cbb8b5268a662b8278d37c03d848a04f0ab498f5af43b0a20e310197b7e1395a65299fac29f051bcc5fcd09a5605bfee370ee8ea21f5807d9748acca815a44d81796d68b0014eed3bb6a94233fc51725de3809ac6f538beaacf8cbe3d96aca21a7a763a957f8892f22c6d086d9af2e5ac9d90321e186584f17e964c90739559ddd034df076c4aa38c2b78aab6dec8ef6be9adf33bfb66f159ec4826653ee6cb483539c47a4a1d95663e6cc7a42a3bf628623a4c9500a59a50a312aa104b198ce5f3e58952bb79ff1ccfa9ddba2fd4705e91b5acaddab9d6522d7666264ac5f533b6d8ac4512d8371c69c06b6d322b046ae2a0a20aec1c3bfb05f3d91b9044cabdd873abb5f2b0e3e19740df31e39828f9ff9bbb20b73541a7a70b8174ce4e43e0d356e629cdbc6c08d29bd7acb6a4347823075683ce9d7de4ab3ddda6572b175951f30a15263355fe9641b3322df7dd52077402a884cd472e6d0b6c34cd63ab63cec8760c7ebe384f7cc31066bbdb7a3417425e039c4d340166e4bba4839076ac9457c87459c57957d0a06dced2f7a18acd22b7295785dafa435a2a8a2c3a1fa05d115fe129d19fc44c5a29bf15b4d9c2b375bc8e591f92756cfc573a39b8fccb8395cad7617b11f14a60e2dbf69b897844cbbcb70363010f6e1bc0590ea594aa924597dbb32a868b55551789f82437180b85661809089d34a168d44b4d788dba23b13542715843eee797366d9ce7793e72331735bc78cd61b13421a568ba3e66926921c04e9d00888ba7ddeb474db63813756ea4a02c1823083e36ebd2d32d5c88cdebb98d511304cc276c7799cf84a1699ccac9569b13f530c762732e6bd0f8415001b2c02d11dff36660b717054b16df49ba38425e3764a56052ffddecdfc686aff22079897376cc15591e11579fe4feeccb55f
-
-Len = 100816
-Msg = 5f464d3301c5e0871d6b41b002dcd09abc80a805de3482d97f3fd7b9838745da1c0534168f76b93c3c53bbabd904541ffe5179cae619dea77446140b7400f47d242141c7f2e9894d88f44c9e066861498e7394f206f594a419790d697f6a11187f84bc6fb288186109343eb11172bec076d041a4c7306d7978c009fc2d2d62563614ed3555ba2d21c8fcd70e8389352dbe4ec808af3231ce990452eb05b1b0dc4fbb1b4265e69235cc3561dae4148c386cd770474863a84a822b2e5f905fc255d55f90bd6a760d441dc52240ba7d8c888a5283891a2c99963d1fe680549d6267cdea92cfead167f6c49663668f2bfdc61fa647f5abf3ce5ad2c6c175dbd456ba41436aa06f5f68f5c88e6b74ea86a79934bd05b486210d3d470a0967ad6d67f7385260578088d7e63197849354f651aad07e04ed301f1fe7a6d2047d50ce5dc6bbffbb1da6b47d740898f4eb54e3c5a1fbd18ec93254cc01f705fce04e6100ced132c519674b2345547804a372b5c925bd9ee9701527db33408d37b72f8d18b882d3c4744eb58f011d21fce336d426de1fcd5e09610216248b51fe2b79b96c2bd6ca0155e05a8a516b7a24d529a9a475284735bd9c4c437ddf399864b64fc5d0d6ffc4e5a7a3dbdd476bc39ed29a0a92e1f2b6b3506c2be5452d4f896db6eb4f895b554b2af64c4cb8dc2369b91022dc50b7291404cc9605c31569c32756a64ff8c4fbb0f1bca346c7b58a5c6774b2fc7f7fd50741d34c8564d92f396b97be782923ff3c855ea9757bde419f632c8399763003b58ee9140c2d62e914c1e1fa742661a9166d42267edc40905b35a25d5c3cb3fb457376b7422896df7bb19c23e8f764416731d2e20cf2c1beb8663c07edd8f105e078e2fed05c5e5897c430017fa2160f565a75a4c5c64a15dd7d644bf355d169ae2696ae5ed1a39e8f81055cdf315e5b0c6f9235515fc4dbf30281ef17b83a6ed604f89293904bf78c7183fcb0ab236cb1f8935e59c51559217efabc000b165d819b717118a03facb61a13a99b194f8b6c7ddfe5850127d79078397a56564c7ed6716a129409680434061b2a4782c9006587de927c1ae09d6778a5f1c39fc419fe10493eb0d4ad492fbd05485eee7913c59df82fe7182af2cf06a6e8edf06676200077bd1408f5c1cec537cb8566470cb44895826d04ec20f0aba4297c501add65c75d5767ad2ab63aa81b7b66f01b32590f1d55b7e50e6df1ee077a19c8c895f5ef62d452cc336e9aee171fa997ddcedd7af86e6cc37722fb5838a46c5e58e7f700edfb7c6bf832171d9581f660752867118e9535a6118635709d6f1c1cb21b938068958e956149d9bffc67f355cb88205d4894ba97c3e3c8be9fa2d20abe79f3f93a6a2f4f56fd075bb49a4b7dc83630e58c32a29d757fdbcaa607352f65483cf2cb4208a3bf94ca7a25e2a4e05279be31c33696c10fa4971d1b64ee938dd299f483e5c098845749a3b706a787529bf2ca56693d0a7a98243e6482a43e1f5d3086ca1b00368d8ead5ed2d0fb79b1e2f537ab9340809ca3a9b5eb2900390432293008ab7086c2811d33de0648be5597ef002c7c462b5e0f4e0b1720a98b2299ad7aa55eb78f0c77c2ab4371385f280107ae40ebf814a8223dc74f31483c63d9e4ed09fc7e5a51bac34d69d97163116a66c84ea9fe4263269b71fd228555ae3cf5109c4d6ced7b9049a2b8069bd2f71834d6c07fffbd7561939188bc07dcea08086bc7182a5270427c3199bf5fb5c4549861fd32a38ec81c4ab058c777dc01864787f0275f911a17838272cd65135f66baf06d8d93bc439eeb55d50b7c5adafed8eb8140b4b05f59871dacf954f4b096c30b7857774fcd319c096750bf605db8e31fe02cd1b9294eaf8bb009d4609f2cdb3a8657f650501b8553765de8f572fb91ac77b35db35f402453e5c58f60146f2906ff56b9c6b3a5d0bb6afb9e2201110919ac9c01a7e9750dfdb2f72afbf7a8d6f64b1c68b9de17a2c9abf289eef24074eee9b1649caf3693118165503a30200993d271aa31b8b92606a10a52612dd1fab495b82f9a98cade18b9d8a723a71ceb63fd1d27372bd281f9b40aa1839b0cc2f2177a09aa8e7b159ac118d7c145e7a4f032e788d21facde2b4dbc1d5d2238f530d9bf9bd2798f611d03ed8919f0c85bc2da99750b7a8d6322d2e66ff6ab9ebaf7424e8c1c3f4fe92be61f65359106395f5ef995e925be3868ad513f561f873acdbaf18590c903d64bd275121c11ea655124d091740887868544c5348664399d3da96e2e35fff34f062fb939d656bc072096e510b40b2f75ff010af68d64fd0acc778e2e13c9667de266b1816c4ac449521b02bbb217002c604be72e73051aa9048d192e3210a68769dd2693e5d44951711aed3a751240d42f8925844131daa36c51d7d59bbaf99623fddf1649db954705fd6f3405e63894f5258c9ffecf83208c2c90cc55b1a8d2972ea6b3a049ee54942b50526b7930953986e428b2c75e47ed870bba68dbfa624dd94112f3059da0a80c583baeb570fe8314f5c66501b34116c81148dd22396fcd6479da49f7e952c8084f97d6803ff85c3787222064ca368f596a1ebb6dab20a03916b3ab071c927d87fc10ecc4e7ab4a5761e3eadaea4de1a0dee30aa39a9e4dbee047201d7d8a4df1284cf668ae3ed7dc4cb2cc4b5cae9307353fd2ae4c105c5d9f3bb021535fc3ae9bf3ff54ddda8b2e1037cd9d69822df436dc1c750a9f557d1a3a63fbe73c64261dae0c70bba6edb57519f5b957f138d1aa5fefe01b73c1851aea42938147bac2762527a492cb85da43014c876e223b05597354d7c9b328df67f354d168a84ce86dff57d8a870db034196dbeff83ebef80bbe52425a8810f2c9fea29ee688a201cce4a5f447be789a3881a9da3b6c491288e8f1091719032608b332e0410f4576597e17e0b5dde305f069be2e80d565bb979a3915488f88e3ebb90e81c264bcaddd72b8843af4a4ae31f723d50fa0995b027c334c351128913bb93e67b1b08f101f6b8dc8202b44fbc3d3dfb530f66e5a8f35e69725c86998c05ac87c561a4706e90fa095adab4a566da4fab82bff6b20076e5bdf62dbd6614245b6a6f8cb6bf60106f8d12b9c3e26f8127dc547e2181531ce980a3273f452892110cfe1ea834a30f99d66e026a9d22dc76fc3cec8fda2d7fea701deb84dd45c97dcde57a017693e90983a156f11c4d168d89c06d8a32dbfa590adadd16850854f24bba315b0bbf372f03711a20163afa0c137383b9120b26c59f5e9e7cd2ccaf0ef4e0d70d5a81748ad441ee5fe178e14317cab184fe178fb0cc0d82105d2f423467fdcda0f9871b9d84882609248356f3053a99866dad9f9b0f8c4a897a8cb8f30365a7ae5f3ca6e772d863d445e6d57c6a478e35d719d0e4e84f3a30b1816ddb55bcd79df21ea0e95da72a19cc1fe74fc576120bc108be3ed4cae3bea889fb4ddd67efe858a994237378eb623dab070d954ac780c1e6d2095383c98ba622cbdb18fb53260979fb2672c21a4600f4bf06583a112d303096d4e30e7e1060d869f386eba3cf7aec3052ca17593dcc9969fa9cd88179c262770211cf53f53f175037a5cd445d239cee48f7ed0aa1d715a22ac18a8aeecf191d415e4afd92b76c091803f4c757a9e89f696ab7b11ad6d5f24774e4a004dcb0e3f33705dd8150431f051016af37647b9e44b10bef114276d4b1055b634461c655a82a847639a038ec9f58876e84e9a2955b696e072d8054c3f81173473604d5fcc0a75b4a340dba0c375beb87b8b01a0f2de232bbb8371c3a9d27a0ce521c4c43dd3bdeebf92f42f87d88978d5b4e3e563cba0e5f59dd29c31096885b113ea5c57e66a3be015b703bc26d3fd1d51a7c14f85f65747ac909d7e30c8e800be27eebf4a62e42e538ae30b6883907cebb7fc5e150bc9da3a138f394e817df9a9e44420078f30d0d3d6981ca581791a097a5e3982c983d5cec239096c7d8cc55c87242026d769ef1d04eb96e5b5001e3358af88d417cc61f107659791a35d8b5f7a5767ae24d5b2ba7aa12230076db1f1b9b6f213dceea62949d98bc5db38743b23a59ea75dbe4231a285678f5f07facc053c2048022fcb01f15e8c100d64a877ecd56d196a6ac60ae35e0e09a517224ba409ba7b70d8f9fe65bc427b212a4e9b3cb17b0d332267cea4f3bea7c1e550f7ffe567b20e3057aa0ebb560d00d28e2f7aff718a9f2d4d044f0d20709bb9ad567c98cff7c4810e8c542370cf90a491bc1088f69998d59f344b74db6c1bdb61f284e99b517a11452ca0bb37c7bae77fca6514b341066086e600f098a32a92935380a173c9182a2513584c54ff67e580dfe16b508acf1729a3d649ff1eae286bffd688fe658612d6c8e69e6e7f7de4ba85ec54747cdc42b1f23546b7e490e31280f066e52fac117fd3b0792e4de62d5843ee98c7201529455c85b169fdb90cb05e3403cf2f737148bd20a53c73880880a14ffff37d62130e682e50bc7210ea6c1f0c27656cc1785a0d9ce93ff94dbc5b2877519d9bac4a339e98ec594a7cc76f4ddf994fee8070dd4b8e0fe0e51b93105fcf566f83d914dd862b4ce78de7e9e16f142234bd969ff8005dddc641dcd3c7cfbdd6113cd3ba34a9503a0f433899e90e158abde2ed4ed4b3711c991577c5aafeaa982bce80835f8e6d7c7975571fafb1499991646bc499ec32930367d4b1de76ff656442cab987bdecdbcc2b2bc35ce01816594bfa4b6e33080caa41dbdf8ebf2205649f98a2d3bf331fb16b9ecd1824eacbbc9f81297b115b4d36aa7496e05f7d40d4edd1886c1bac10cf3f97840a03277e6369e7a7e90d932050ab8720fce076de5c355fb17959bd75cfaeff325b0737f8f5b1160de0b0184ba04afcc30bca77a6a37e29662302d01858c0bc1d32b883011b7df5a387805296cd91bbc835a3e76152d017ee929d4cbf137eb78db89d71617dd76cb00707aacb8088ac77a1f52ed710331193edb29933a7efd8cc153e6adfc2c6637e88cd86b06036b8177847b4d086b0ff9b5dc91f3cbd1c08217023d7449253c25331594f0f16a3c5f2e122e0145c4ec94f096b45a1fd0b2dd3f1d51e58978471782a336eae49d7bc4e050d1c6a391658f71a1f752c0ec6302bc2dba9e3766359359ce34955a2db86740c90d09cc50e92dbb76e17a39955fa7108bddeaddaf860d1aff14acec8b609ac1d336270a940604209df91cf45be72edee04277d694a6f968ae6d8e065702f3d607f3baf8db4ab7637fa4c78bb0b7fe69937eb1dcb616fca564a5a521e12df71fefbc321187159bd6a47b066a3440ba634de9153a94546b63aa33aed9da2018e1f30628df37f5360ca4f2660a46ffd73e58183e8abffdea25f7bdf798a2b7cddeaa481bcc6e682a67e99143066963d96d4a928a478951dd6ec59b1be8cb23aa688e1867738aecdd9afade39c92c0b2572bdde84eb912ed990ac618834c412231216fdb84f1e01b3f8414fc6dd0f646fd0fa62bb0157b3535e1497c9272df1cc5dcd4e6ab9a8456222655c56ac73fe0d2aa8b599035daddf0986a45b1a59510abe19a11b6dba065c8bcf8a85d20a3681c2414dab7c036cc1358b1dba98d6ae62c5948c36b5b3e307a6f860c0c822ac724a5c917ed5f98ece548a7a741d366868e6c676394c3659f7f6786594196dde332543376f9ba0724b091d30f431f91d919417e5bf7ba1e9a21cb80f6c204c3a58d59d960a5788b5cba5abd7c7518f4c5170115125de97009a6c3fc4d5773e4f57fdd433eb7422c7c4dccee57a1679633ced3b5f08df763d4577983c5ca8b49bc4e08fa76f8bff36daf0fed068db47f0c87e0e45d518dffe37c129cc6e2f5f9e0430185723098e715284a42f302a6b8368a4f2dc16f534d1e5db9d0b86659fc4ba6f16c982774115d02a57684c7e5489b1f491584b0f0546e4194a6041f5e5be3bfff3852a4fc772d83491023a61a37228ef6260edc0d1cb972cba610d5ad1d92d554700771d8236ef55e983765ed8eb21e7de7c8bb51aee9368758454fee4a3f32179c1e54af1d069e0b9728cd0554351907e018146511e4d6f0450b57c8ebd21c71450116296bdfc779945da60b9192c5bb9a67b1f04d94992df4cbb3e30732dc8af2177fef17e0b7d01740b8a64db16bc29c1e589b6bdfc967edeb2ce8a649ba892bc856a929f0b837a838ca7f917a52436ea3d20e72afacc5b9d58a7fd0fefd96787c65ffa7f910d6d0ada63d64d5c4679960e7f06aeb8c70dfef954f8e39efdb629b72979be208d616071289cfaa0756a4bb5eea5c7baf8fe7a31501e7e2d67d708d461c0c93e85f03afd70bd9e16437171e01a34f475e4b5a58d13ce4e2fba72bbba93403f3f8981e0bbd6a8a6223327bf096c44b36e0ccbf7592a98c1fa67f198b628787ec80aaef848b4fea158c715799e6f458327f399e6420f0e7821f2dc4663bbea065c7bdfe830b6102e2e7193381b9dc7f2381ba808c43b8fdf3addab4b5fa81564716f7d46e0349d9b27b559710d723c7ef2f79eb55c3a9d75b99ae6fde6877b278b583f8ae3cae776b914b0cae0772397fd19b6a27676c7ca02cd07f4b4d49bbe1ec87f2ac7e39e5f7712319c31271dbbbaf4b826af8a9f4acab696c62719f7a6a032c4bcf90922a3c630647b7c1c7b78b10afbd863f07486561a0bc8d9b1ff5fc41998a7e3c604e24af1c1df2da1dd5d83eefa2e4012f7fb5959ef9339574367deff73723484b5a969c8c23dc251a3b887f34b9ea09c9a1838e8aaabb254445d7556dda257dfd5579737fe1dd6c67f3851ca68b011e7cb7b6958d588f143828f0bb24fceca31b47b77d1ce05e75ab05b55d6c9f9107f0c738f2cf8a1629f7e9b2694324e082503937ff8ca7c5098f770289af7d038dcedcf0ed77c8b82e2a9003a6f3db69e14131e144f6be7cf0bb5353ea96aebd78befbc6ceae9bdde97823cdbc5ca8ef8a993a9d9383aee9f2d6a18fc64ab92990672ea2dc9b89ed248aacf7f1a513da43fe5953335afe76d78867a066f226ae9c727c6c60671c50a50732698ef7a492d51998eb6da5368a667baf6d12b77eb36686ee0ca239dc6f3598be0bda79e47f0891fe4d8989df8c685480de11c148a2b44c8a6bea3a50b09be557c51f545a09a30e9362cf3080e6a6bee3dbad370ce24f6c5a6f8091007ca195057fa3af8f99703a601086c2a1ffe55fde4c2c4153dbff8d6601ab68743c0d50d021b0b3099535ba6c40f866ca3ff0df7c19d709a3f58b57b40ab5e43556a8c0c1938c875267bb39c0db6b45840e8ee7c22bf6b48798bd744f70e42fca343a8bdfbd7f55f275ca5d62c7288756d4861fba68d16d842c5b893c1d8171bb3c8b593387d3426f292ace5cee7753c9f9a12e6bb9af5a24192e4184f7d3d191d862d3c3dace7853eaa235b6369fd164e5a7bddd06daa3eec7fe4130e82478d36f88a0999cba1f251ffb3a7689ea2baf016073193898716a9f933448d7ba8e0968c669bdb7dd5e6e32fd84a6ce9e8632b393f9263532ec2107b4c0d2abdf3abb2de2d63511805eb58a70bc4ded040d76640af60ce7f03b9a682b8dd84ed8a47225a48e0b94ea47828f1c8974cd64e5027d8b13d43519875d2bbe4461a7f0f5b5b8d63a472765405ea9c994225806395e64dff88506f7f7f3b6368d769e6e550d4e3e81efb13771cf403e855f75312f1383ce4c2744d0b4e3735a0f1e1b99eb014fa60c0d1ca9035fbc4403330c2fefa8411fb7c3d6ede5b5c8f4736106bbe01923d483a84f031e9685a3b6a70646a2a5059ce35fa496b3f21fca6047471a5bdd33908cc9328de9fb032347c249bf7093390b750696124621dfa67fd9c7fe85d6e5a4d277ad8f8d169f8b5e8dbee280f8443518bd94abc5ca704e781e6cb1868ba2d6fbbaa850326fbfa5a20e4df6fb5f8ee2728e86a758763a8af21e1f7a8584d3f0b09a0b19fe8fcd37bc4fdf45084d7fd92b80544f29aba52496e2c9a0aa4adeb89820be321cfd2f0a53585a15d04c7fe4ec9be6eb5df419e20b71506c1f642df75c53a9e3b2414fe6102fa8af7be3f6c95de824c31fd6fe8ef9d49e26095a2674a33cb574e9e493939bdeaf5b309b4c51256ef71e95dbbcee0a11991693b533f916e1c82ce86d65d89b6d596017fae944ec364546e78abbcbe4322b83e2fcbb4c5d4ccb54d8642c7eb9e28c08598a356a5c46f8813e6b63ec2f3e3bb721b726361f85a734e0514f4e9c4732991ed3998b1ba8f618c2071d1b943eb0f8766fdb7f0492421429bd380deca3325c8d5c7b6ed16429539ae54f1eba39748f09aa44efb67d863cda304e8653ff7499cfad44dc27807779ef8e63be4b376ec403f3c84eda4e5af31c30f9807762e0980b4e5d9dc406cad4e888bfc3ec4186de8ccfcf631b0ba5831747a1c200d45ea06ac82c7952fd09aaae5dcdf5475da427cbc8c1f71ebe5132f2fcae15975ed6fa14a11b38766e1c446894f31c0496b0e5e96507d28e6e4549d6d78841e40630ef306491a1da60eaea3fb69bffcbf192610e2e07bc1124690fea61980e8ed654c5e796f67d26db5de35b4a2c67427833e360ac2a7d4fe7a5ce572144443ed62ac460c1b19402e85c79e3d80e1c143279b20a66d8dcf2bfe1cc44a0f5aa9b0d9b36c46c2cae148dd0f2ffe9a8e6e7274d1832e57aa39fb40553da6414094e838d613a20ce9307d49f97d904648d6460985b01af769800cff9a940f70729fe40e98feb64ff0a81c5b2b096b1a9d832e440c49e4e3684bd17a5169fe138d2544d9806fec027dd2a67f1856178e090f9bb2f9b314a202e7e95f2e41fa80dccf7b1810e9cbcaed2acc2445d60e26f7d63ee4b28e4299e60ea4fc659e7d6f0de91748bf1ede1fdb2acde9482bb76bf6716847eb2dd7517e0a94f0bbf20f248d2c79fa0f518b67a44d5c4c73a9bbc3816ba85ae8344b5f377649da75cf1857d6e4338a76446c48e52cc7bc7ce283d4252f8fac5e1427299edc33f84798316f77bad4a87849e91a1a23c0b7a86898046e278eaaa15ff33730a6d3f885dfe2d1dc0acda2a9e49a71cfecb7dcaa9e70eaa8fe15d4567a280e8960ba49d5289535907e9f277f96e8e652c21d89e81696dd821db5b7e1e53e160584477aa9e4c0e12160c9956df36cce6f4e724dd543827366010ed3d843cdf4319c1bf968a70e9b1b6bcd8af96c9eb0620c569716b7bc42e13251a6adf8201faa129844b5e1d699cafa1b66a674e732c7662b0410e5bca2704c5ebed7850d0ebb825cfb0627a183cc9643b709aedeac2c06700358400c389f99666ae97ccd37f265da7addeb07df9ccad6fa777d0da2fc47b6235179136bbbb409596841e921eb278142a19e6203c7f235bf8461ccadb4b47dd290d36ac27126c808b866f9531261f1e0f5c458a6bab6f064b4efc432e1c7379f9af19ac34c5c22e76e6e7651e48f9ce44eff542f018397889d896cc9001a63e8e455fbe4a9ee9a740edad894fe1af2bb21a1dd0318e28ba982c12ed69c08835ce17336ad1638af3cfe0ea892ab8e83d3f25e6bd98d5e4d36292992e2122c265a26cbb3931dd4c1b0d0ac5ee19974d0dd45777908bb416cbce52531820effcd7f28e1fb2d3d4d826e1b2673e834485a25af9f9d174f566abc3b36732ceefdd91a7c3885e1d10d51c321ff704d0883905b7539309ba5e7b7a2bfefd0494e90e9da7541ec37858ec05ea9a9ec5672b113cd5ad6ebfc5b8fe40ed7c3f17d8a73703dc89086b4d75c5eaf06b840bb2f5b4519a4fb17bfdca9605f17253f203efffc92da96fde023007d22cdad05d18aecb4bf08085c5ca5eecd21f2b611e7e8a0ef981fe7aa2014f5ac6862fab44011dfd33be8a1226943aa7ae5fee9221b0400d9ac2ce5241b09a68cde6b13c47d50bf310ecb37f25c32770a299020d8500d8a4b5d7621e4379dbd6ef34a9aceefd4055ea6144f54bbfedefb5b5b0fbd1d81c7a51a802072ec3d84f34585f22c1df84caca07849b1ef054cbef9b40848e9fd238761df5358cf55a79a53a1bc749e49ffab7c5bd9a28bf24ad5833facf43bcc3852c1e85cfe47929fc49c325c20d74588eb9833519f192243cf96625057899b70a7c93f8fdbfb60d8129d9c43c95f8782ed8293641ffd21d21d91a0b4db69d766f6d6497e9a414ceb04b65425d6ad6c8811da00639dce8d8030038f2d08330c75b0879aab81bfb3330b950e54c13780d308fceed2a103a1a8b77a923b66aba737654ba7995acd306aa7b80f632184412e2369c353c2132ae614553e626f0a3436959104ba6e0040dc597dfbc3602a49e401bf2249699375b2c722083489f54fcdc1f616a133ef6112a1754818158ff78f245b9046100b0e89407f74145fe336976af971c054f12d98002c68b3aa2bd699fbcd71bc4dc071e430bbf694595a951e01098aaa499be2f70611f248a694539ef8936b2e8b7a3c5de8662436fed1f7bc24a4e5c17a663d9a23b4692993301b08cb3bc10f518eca51081c717ec8dfbb0c2669f7987fe6aa0bd98231d8e8b58951b42537f12884a857e02d62de4fda6b88b6b754b1b27394c6a819e0f92f6b2b2473fe245678e252ed31477cc7ec6895bc361b718fcab3aa550fc9faeccfe77cdb5b151ab1db2e569b5bc923ee26f0b6113504d295112d47218140e44652a10af10a088f95c7cf2fccd040fc93980939122411ec643e26e7d69ced3178402e320fe156e774b75b5afc2f3d6b6ab828bb4993b1436faa5728cec34d66f520f59e82716ed6d1324944c3c91d04d5ffc5a921f4716c39de24768484d0096f7d8dbce35aeec22db11f899e5e7e3d57e7668f35d6c0db3542255d9262137d39ae6cf9bcde254dfccc54a6062fcf8982f781d9ffab2df4f49ec04a72eb9646d63bf9e1799bc0bec0ec7f0675ed9f8dc9b8be15d9f2175dfa1c8bc99071c70ad7bedb10a4143fa91c89f54777f84c9eae9361cf7f4c2b7ab873ee5785a5241db0af86f3c6d7f091623d6dc576d07550a42023633a09c8dfa21d7e70cce64c13f37663f75c47921c246f3f2d1d16a8283ce7697da4cb7e016971a2a1d0c59d6202bc18b7cee3828de597efdab53b33a9fb41aa7b49f1c964512901773bb396ac80e90ba1a94c408b2860065ae9aec64a41d76cf8842d299d0babf14d5840d647d075c34175e26a786f30091a24f1ce8db30137520dce1cfffb6318a0d0fdcac883eac603bf365efa2c806eb4f194cae8c16780342165222192f6ee2e103ae2a31dc08a84dfc89c64d2e9ada7ca1839dfff62ddfb7982c79684cfc821a098bc6bf09f87317209b16d14d45c6f38fc99f7bf9bb73460977bb323665d480c87c687cec052a5f08a2c6744c8e177a8a269b4a47a925b9123cd2c014313edae988f8aeaeb633ee5ba6be7f53fe36da3aa37ab2077f5fd75a82a55a0fe62af213b85e9e7694f78cc2b0e63a8c1b89db484722fc62c688678a511c474f0eff8eef1382946d26de00e5c626ec1d7079445c1b7c6f7f05073249b11fd1fb30257724a14cd7bbf451146bf366de2e826fdf1d25705587c4460040ab963e3bd504755b6aa5b18786b68efd3c8e59e8dbd172346fe7f4a18bac98164669d73984044f3c777368f965763742ab86a3720208c64801c796f6e3a1c4748b81e41ac58dcf6ecfa0453b18fad7e3473604f57f7da302e1fa81ad538d4a0280c4ad092007bb9a7a12907227a936871886c699db97d00a1966fdef64d9f3672f1b792c1edadc6781b391c91bea1bd7275f30859dbd1707b1f554e49ceb874ca06e92ab466efa7eeb6990667a27507a7ba789e24d593ea2af8eccb3862cce58daa63eaf212bdd86c01ed471cfc79b191c481ad773d20e821d18af85a7049034e5a9c660357a4c2808b9a6139f32c55c13282b8d98904f4f027d438189dc9487c96172e50dc1100ccc224e7374cf96ea6731032c43fbc9b367a4d1d0b31aa3fa8eb589672e69f1d9144114bbd508d56c2049ecdbfd7b43545375a099ad2885353d8c550d22dbb738e6fe3f104b444c89475a2cc24d7887daced8fa05006c02dfded01c00707e2ad04c41199c5decc1eae34b0c0abb5a5beee1b5253c3350e1a077682767a0b9124a4df2e8879366fd37fc04d4dbcf89883892f46a65ce3aec22123cbe6b3af6364df1f9f5f9751bc8179b6dcc5c126dd65feb7d11a85994e90ab6342834c79c5f82413e88198c73e932c66e3cb60b6e0c0cf438622e5dc5a1036c38afe9cf13559044a9e90f5fd72a3188ef6b1043f5f4e6b40ea51f6235dcb33b3099b2d8c2e02103235f0476ad51bce6d8a2934068549633e521a3ee4c62c22b042fb86c13c8da849233205a5e277aea1129678c31f5c379a71fe08b72fad9449cb923126dd465d1e0ae8a925374149b8248b3afb69f168f3ae701c00f6ea08fe07f1b5338ce6af2f3156ba6f300310114479f2f6119367c88c12c158b84be13b9c8c7b5dd7c90edb5b3ea1fa5927a25ad6d5596992dcd4877f58a134e05dcd80dde4fc2c2a680cc0ccf3084d3f4970e3603fa6bc5a180fcf1ca4241c0b8a1e7c607dc025016e297e2b0645de4ec2fc49851b9374f3ef99edd897c284a67b647ca8c96fcef935d541e9faf334043ea50b99fb8819ecce039227b624e52d8c20003b5a43808e4990da8e4398c4fc172b983351fd11a13dcd2aae5193d42d46e1b57c92e3e01d23fc968c729f3782d6c07dd5a17af2bda96735c12cc7d8023629fb0125e974425f7914690a7ed26508343ae58c8a439ebb6232049a194768d4594f5d65aca37a5686c2a86dd04bef35d74e0755937ac0ce3ebded1c00c8adabf030e5e4a5f44193b62fcf2f1bfa9dca2a25afaf2f1ec06c5d17ef3526d26d17af3e2f257ded24b177ba41c0ba64fd4fbd5042fbd5961a105e0e9f77f3db13c1b6c5bd9a9d04801a5c00a4c544218a21016c65bdff774a44b1d05256e0693e14d76605d67bd10048d3816caf31a6d10886c88c783538bd93e92bbc4484f3388b61adac4b92b911c76ebb1dd11b7b4e40be032bccff610068746f41e34a1fbfbfe5faf57c8a4331008e2c1cfd69f57e74379ac80eb6769f4ce4196795b835201ce4ec85ebcaf5eaaec242fe6695cbce1d53fde5b002e006bba8c8a1ee57da061ceed0d21bdd57ab0cab9e46bf3764d9a6c3ab19736d43b33f32eb955f9174ee4a54666e7f19cefeb49aac7a59b7370d9ae730b7bb4e08413222f0a66bfdac252fb61bcfa838f262312febfde8add8f6843f1d64ea3da42d4ef986498604d65737a44f5a099338520cdbdb65ce73b110dd4bcf8592a4adc3e0170b13404f99f0ec8f9fb225c1275a921f09369db165e9109dd5be472b9bc1901bfd882d264d9ed8d88b4c8f3b35f88b69e3e4b8ef5debb895be536a3af492d968dc1caf31879d672f70ad9869ea98335cf9e4a2760f955fd3e8099e4b2eb4269e354548f9de9921e50e49f3f5cbd63468b9db0cfdf17250c8f13535d4c0a1f21c87967cd798fe93b9b2960447401ef90db22c3adfba0f55f5585ad37040e8d6745184dd536d5a26edec365bd6edff1bcc616cdea3bfc8b9d98c0ef9a626054e361194cd05b2287612399f6d3d3be2f71555f14ad2893af6f60ab61adef663c3c2464ade671dd5ebc71935aad290573588fe6e11f48cd2b7db62e4b9932890d1b96e1b83eff70f026d199db75fb1e83197c937b672613c66ea131f485b4318e27c079b4018d4205484993bf50ce70275b244f2caf47cb47eb2a9ca59afbc78809a912eb56a4bb65cae4694f682c6329c690003a1c355f779b5857a60091b1c3685995a366cb43d753a704d3e59c5f5003c78feed877351e27334b3fdefe5907edd9eb25588a42248b9c4a93efa7cc63bad1e5900b95b70436c35eb85cc8251c4030fab9556920141cca24d6acd3122b92b7e868dc174bf071117958a4797fc90866aca685f1456fab397ae647ab9970348082bd74865bab7f248568db98ced7ed84e8360fa91afde3f23509e6b4caf948349ad9fb6a4efe0a0468302cae7a0f999195af1c19058669fc3b88b2780b9075dc180298498caeb7ba0cf8bd42eb36b1959d5ad3ca6fd1e85f76abd27ec5fb637ee38173ad7d86304d5708b6dc8817e099e77f5d43c1a70624cdb96e4e6103bb25e59eb51d894d1dc533a74005bb79cca35b66e10c61d06b5227fcb071457025d605a0862218ca252b871f8343ec231dbee15688aeb914c0f16ebabe6edb0a489b2bd10d4392c6f1863bb6a62181de7cef61997ab02f3bad0a893cc0cd8a99cd7b3f7773085f0929de36b5d124e3729140c375de9a2d0cd9a360cadf17b9e45b7f2adbdff9e75b743b62642ed67aa703b8ef33dcf51a50edc7dbab42d3d2b49badd2457a9f92847aa6a60ae2beae457a5fce1a9e485ecf907be22913893cd1350f20fc6c81c94be426eaf01864e813a03e4674491b61516bc95d8a77c15f03d0adfc4adc27f27a5ac4165ff6518eda1a5c408708f78a9e26b834179804a312148d4f75f21a77d78387139da40c0a6293c2a59d0162437d68504f189ed970c5abb9ffc6d8e1be2b0877c7f24b1dc273b1765bfc5ce6f4b8d99a96d5b1c92ee53a39f685b304313d909c1ba8130d20d51c824cec420b0315229df295f75b453a6c131afaae0c36d7c4fff70623638a4f7ded5eb7db58d95deb6249a29b171d8ce651556dee8037bf4ca74453a4a76aab7cc07ba44e55de57dbef8542c3851ea353fb8e259ee89bbecf9ce8d8bd6227afc0028afac48a7acd9b4e8cbe982eb1475917ad6be4cdca9cf6e7cddd971b2924f2bb730264801685d387485e41993c3fa0af9987e8b52c21688fd9a9595ad8d1b9f41e0457be18492aa09f69e64e2954d1ca3cc1d32b2915cd9cf6862ca79c80beb47347c4cceadf48a37b29b1d6de4e94717d60cdb4293fcf170bba388bddf7a9035a15d433f20fd697c3e4c8b8c5f590ab44aefdda94681407008ea48d03ff21e9bbb4ae7a9aa37c855fe3537c44106e8079f18c24d2584474bd4a99367660ce6f7e6d7c294961e174366e7babc569d5f80572a21a4bd7086629363e0c9ee2599c8b8863c96613ae6c32cc67ccafc66e1cce79654567ad08e62e9abc99e44d6a79ca4d8de15b7f8a763a4741676af0e1f3bd4e002c8fa1ebfbb3bd3a65ae68a80c230422f98f6e1e9837252e045eafd585ba389958297d59aea1e8e1f665fcbc5f7ff449996aa712dc0faf582cf3caf3dbae80594f9f07fc06de63d9d672d14d7ac4662b4a54f40d4aab2de766910be2fc7f6f679b5708790b5376498d3baf0463dca2f093b51bb7e9f3e7033ba0384af0174becc3bb477bc5e86959a12a5e8924adf0bffdf5e5b9c1cf24d232881ad5c05c5c0f50318ea83d8683339ca6a583c52198c00f7c1abbda282e7fd3b179297338ecf9c923a3a87a130dfc06164e9b4c1fe11d51b382643de44b30a6831dee119241d1b6f84f2484784fdf65e41f78c38e15fb4b00e45df1edc40e3467cdcda351a4c0a0185ac4649e91024377e1c331587a8586cc0a4dfe29e14004c3536d305f5dee0eeb8c2f216c1b8d27375b239f6458e08980badd6d82e9ee9e007578c0a3b48288d9ad0ec3c934a99a8c5741149af937dc82bdb545df26428b87fc935c05f1a4964a8408539f267e23de9bc498e2a4b0083cdb7c8e27de6252bfaf680a6d5b7ec1a6dac6d7d537334a95f1553324a0739414dbdb50445a767b0f589fd4c33b35905577ef5a53b0f097191f9cee4836a908748779941de2a78fe1bde0c2efd9f48cbf232ce101d9df93d3ed40d036ae7aedc3a5ff619abd1c159ca8d2dbda7de13b4ca62576c7f925c52925eae2d7500dc969fe14c0a335ff95a7df1d276a6f242765c781208d59edb5848d412b11638b27ce5a61b8209075976c2a6aae88f6e6d8704fe9e83b425dec4defeeb3cd311b8c5a818d51f917a8a4525361791d5c4fd5d70704d4b9fa9df1ea119882f400e682753a41931712c043c120a98f0fe786a600b47befefc9d64cc5bbe8a16c191490874e258760c9e4fd215bebf848e0b4d35521f53ec5f9308644b785171fc4cc3ff886e034bd833d59dbcacebdae8f00e43c151bcb24d1d226d1cc19ecf349361530a81ba3168af3df5536fbe52b3b93621f57959df298e5b4d3c14928d2ef7b9c977c7dda54242d17f8661978a62d94d565b00abc199790b9b25fbfd4a3ffc35c95ccafe35d9a138a2c24d17f06ae2cc376e822317f16fcbcd56e23f84ec135dc935e58c61b34cfbf5a36cb00350483b6bac786030e5c5045a6b61c9aba7dfaa4f7fb21897539863ee865ae061a77c0359915de3aacb3b5dc8cfe53c4d17b393c2b6bb23652f36390407922969d510cc97b99d1df4361530aef10707d7a021b2d9576b2d49ca88b3cc83ad1baa6d88ef8c81c08f8baaf515637b21ace9d5cc8fd9fe4ca6c3aa129caea7060791d566f4de8662b90f9e5d849cdadf9bd23cf6737b07ca105142663c30de27adcea11d64d433fe1ace84b0f6917c8b655f2a421602f07e0a7127e61ae9859c5e9f652ec82416fd2566f291f417ecdf99bf3231d02864e2e5a1cf34c13f59de9aa2760d8734bbda79576c62f566b8269990e9384a41c1634271acb4c7a8b768f276685c3a8c7f20872e56b683244b1af562c3e7dcf592a9915f44f886cc2ac5f679c07d5aa1fd69cf3a460f25c722073da336a310aa551062d92c7297002060072af2f3500b9310c239bedf45c5e985c2e0d60c7dd68522376dc7b560fb34d1b5089450c32ffcbff07b35a96bb6fe01259a06868d00af697f8bbb238d03d49570a109181c9576c1ea9d2ee02000cc23e63d6c93c6cf3050bbb15b6f73b09c25da62e5abd4c2bdb1110e1f25db39f04885595cd6a388c4726c8d4cdbad87d80d42fcaeae843e2e17f44c9aed25c8f6f9736c7ba1bbd3b839126de40a930024a65aacb872936e446114e706a868444cb140e53d976816983f3dd1d57eeca01eab8211b7aa8ae99d26e35c06ea4b226e0a6e52172a40e7f0df5f67759ae2ee026749ba10b8e33694c3e01a001526f9d75f6c419cdccece3ea3f78d69014e509c741214581034bbc7e2bbaf76db8421154abb2233117a1ffe2786b21424576e295c9baef262e80fa2edb69aff800b3ea436eb827e8adb73abc48d740b86c69d557b16e874038598b25f616afeb4f4a900be7dd0d38b5b6fb4259c51a3aaf4748d7a445f518485ed72b25c7df8ed0906b74bd29bd6a5724ac3a503c990f3697a5db484821f68718470810862728a80ce34599a41fc5bd8bb46dd845a4812ae1532c457ef4211d0e41835e5a6f030247614822571c930c727ba397e723d6b3aeba9244f054e331c82e65b74c9f6504c74b4301499a1a6f6269a3352aff57f88442d4eda42a82ebcf7776c5629f97d6160bffdd8282a40ce2e6375b161e4c22ee53bce7a45f4774aa827e2da657e1a1bc07445f0bbd770b7a5a25b1b469fd58715510dbf8d97af4e1b9459a20b08a8d3fa9d92feb32db95b22d36de0bc8b1c397b09970a6826392fd8392b2d790dcc1295888f42ac81ad213c7328b2324b28be7cc1f4fb8414a7785472f1dd3e11d66017b1756d1697be92490e15f056346d7e9126a1f35fd76cb016fe2841c8996a3507c4fffe7fc45026df10b03b86fb6cf26e8418926a030b5fa62748fbb728fa19dc2f8947468c1477750771e442e4a9d25b76d359211c05df788ade5b7824f8770b5dac0819737dec916ee59b28a49666ee8b7ca81386eec8049542f18a3207e51bdbc291470eeefecac385c096a
-
-[L = 32]
-
-Len = 16
-Msg = 43cd
-
-Len = 104
-Msg = 5f75a437ce0698a7d8151c3fe0
-
-Len = 352
-Msg = f88bac738d1e3e10f75e46e3fe026d7e423fdcf3d7e4028b33a291bb4aabca53f780fbf99e0346d610d4a38f
-
-Len = 488
-Msg = 832e5b78a73a1012ee62e00621db7f4d248893007c6e5d6e0e689c6b291baeebc72df9cf10b289fe20e7fab80a2399271d0ac63766049da875eed56264
-
-Len = 13976
-Msg = deab57cdeb41974037a9bef5e292894038264eb4d8993d4d1501e6ef9c68fb0f571f57b0925640925deae9a6317e3bc4d6cdd5a0833e52fb48baca16a9ba9b6c8ca469a0555763b54f04c87d4e41aa549258f30eefe5a52d2ba06657a8773b0842e094857b6d8911d6a0636280025e56356fade362b4bf4c875cc19be0c6644b447be0454dbf390eb966c03e10e9de3487b90d0825d327c12495e3c89ad09c9d591e55c91376fb14c2fde9f7461fb25450df1a65806b65f3caf4d5c81ebc6e664871fcf915b9578bb70ee6776acc62205888dce2baa4024941209e81b4b35f0eda1bdcbd9ab1d6db6140bda4c41776fe675d5c681da5852d50c246dda4ddf9fdd7c5fdfeec85ff6c883c78689c2977584406a1ddef977606c182d6c33561c39c071668a2515e5aa6f4aa1faa392aed95b82ab32b79a15e3b5a07551ab068455131b72493126470f26c30b852e4415e1d8b719b3803ecc336e4facbcc5d1908851f4f39b776bec8b6b9794d47e5965458858560eed5a0305e260240c0849d93a19787b0f8c795eb5ba32be573845256ae6d0b0a3336e42a1beac8bdde6d1b6e0b6207903d4b105f4af2ef89bd099ded870daea2f170e03bd5f6f4490e60bc222d4876e16d4c58aeea6e6c400dbb9e9f4b2b142f0fc9bdeaf4132ded38a4a8366e107cac7210945fa2df4b124be37ef76290e5b9758aa3bfe0091bb0448206323584c2f833e0edfbdc0c33075fc9647a3404ca490bfab94302a0679a1a42fe9fec6af0cd98038b09ffbecd2832b579b2294f6ae5b96328fdc0a0b9b3a32cba04fa8bae3389c3951173bdc17caaefe526aa386f98670b177683d0b804c5875fe9c7afa233ee66349c9fd1b60bb0becf5e1d887e67fd3baf34b4f90d94699d18d6bb9d77d4af358f31edc254de2d6c5fe3ec07425c633b18c1b9e3606b78b40b543e1fd31fb578cf58c45744fc073fbf3c7d7d607e815379a5fc565892d81560eab8fb5f1ae6771b998c592e6d288014f13ab283d53fcbfa66e31a9d107308402191fac2cf2b799c7dae91b93a7676898b8a6e516a86eac58ed8f6d8ed2fd4d38031e4a4466dc8798b90c48e6adb6b4391d47872443cfaffa542b4b132f6c3408f0081af8692aadb4c9bbd55053ea56d8b82998f6b4b41d331891acfe6af1bb0d6679989978368ea463743b514866d2d01fb9950e8990867bc14f1db1142254adeccf3da812949cd03cd1d569e9d0bab7ca7405cc21096e3cd4d007cbb9629372e98584b4c6b97ad0bc314e1ab6ac71184ee555c01973570ed9b115bed956f9e4e349083013098b1e483f0fe44d5e9849f38a2f7ae152b36a266ea1faf263ea8c706632ba8629602187379546fc6b82e57ededd6d074c15c771754710731e07c207899eb47e8d7c72ffd768c36257d373375ffa06f9b3f0af11417f9ff9f9b44e1f1f96ae8aaa429af88b14da1da81c7bb38a0fe9372ed6a9ac6fb5e9e56b82593d94c5192904450227bf040b7ce0904789f979845e112a1f995c849ec3f7e49bd975a474e8201630f40fc0d80e76019f110ae158cd0f8da96ea4561f24237d8e795ebf52368218bff3e9d5b040ecd2caef4ab1e7127e53bfa2b3b4fb74829f9993ac703192aedef79dd9ad24c2c976638b4575afbce22ecacc273ba43379ed55ceeb51838b0adb80585bd1b5f2707ee16b67a7232adf7163415b24b9ff9dc94b7197fdc89e2a90d2b9eccde45e965edd064dc0d1eadabe11b8ec3aad2742b5d3323ebf913a92817749090c20758f98aef2544d4c8b48874e8936d7ee492d5585675c214deeb74fd67c4d170ac5e0aeefa607c6e37abd4f8238e776fde3921afab75cbd8f392d3e88da057903ce2e140797f4a85737bd89455e6aa27c7535687b78cd0ea59848e006c8de9c9c0cbc7a9f5e977be850adc710503ce4ba7c7bd0b042297f518abec6c8ef451c33e030251f506cbc3744228b6bb4dab86877d9e6019a0ea9f39ed37557b3b5527c171da5f013e0d3c480a038cff2c087d6e5d41b17e6c8f90c334b5e2b9ccbe9d4efd99fba1f907d00a49b71b5a08aedb644fed24bcf04e71be67b03cd20d53ccef8f854f5e9f7f28c1e98a8a53496646713bebe15a93f1ea336e6e8a4e68de5dab0fe880bf983eec75d1c5027357f6669e098411e0bc3ea2293138f5b34425f78b6508b94d4c0cc32ee9afaa409a26e5f2a1fddcd6d5ff42a89755a58b08f243957a2e208e24b055f51992ab447bc06876eba169c545fa71b88a0fc15d1e0be9d334a1dd0c86f44bd149b42c07608a9a30d0b7e13574f8d862f2ac72b2ed38904d7cab194fdb9e4dcb615f5610b24e202a36866baccac01fadb575df11dd43e00a3b92fcdd8c7702ea49d951e7dad2a56c075730b4af1ceda2bcb2310256f28312579fad40ff471336ea6a44143edfcffc297258d48bd2ea47efab8f0dc00f1e6dba1a55009ed627b7
-
-Len = 48824
-Msg = 5223e2fece634a95e1e7c83ad4a11a0478f4a41572bd66c2d7902cf4f94404cd80b1f58fbcb8eeba3984fd759410c12f8ee922865f363f684df5a8787c87ceb3086fb8535157f7f39653dbf5c66ae7219253838ec77cf1c6db518225c5ba0a8212e5911236474b8820ddcb8111b87320adb82ff553986324aa2a21c37ce4a083c89ce9931290d4c1fea933e31d014d7507a28e83aa917ccae10bed1a490e77fe501b299f8e3b78e659407ce1934d5d68c7980800746f26ffa9794ef1d23f793bd2eab7fe524e213e58280f441ba48b40162305335b3a480c2afeac11c27f8d817792fd7805d4b61224eb52d35c0fbf471bcaede505fbc9398b216f43bfd69b1a669a61d44fd21faae410af58ff95e1c3ff1528de1aba93cef56bff4d714d8c4cc88a4ddcda52444ec1208d99ab3fd9fde98c1ee6437d8d138f62c5f782eb4660c5eb28564b5b0d46e3a2546009148f3d02b837c5284e9f508290270b97b9b29e84445a0b4df662d9711e6b73c11cebcb7120dc427034b1ccf57d8e4f5bbdb84d2e1d4bc3862a2b51931d3c9a7a5fd6ee5f4c7327c338abd011af638d730141b6eafe63469eff50f473262e9fdce636eff4c5663acb6075a4fdb00c8b8a8d3322e1700a5b3e7db90b36c1a94991b8f51657121b442db6f890e208f312466778d73bfaa8cc0ead4edd0776155f3eddf9abb1bbfc0c94421adce83d7ee94f99f61e1f25a55fb596f8b40ccedbaa8e5e2cf629496f5ca60bc4cf36d917da4e2b973eb57869dddc409dd66d5061f22642743fe843defa0b19dfb2f56425abeb234181267b5c0d2ab4268c538510feb191bbcd1631b0af6c7451cd4c641025cd8bde2d9ab6e6b948f97c1ee6f35098d553e8e9da9b4d437125046864633f109d6a558b38b270a7dd1785d44d248a863a91e3db5c0a1d7ec133decb65e81c3402c98ee329f660a092172bf6b1a02491895394ebc506882805a6c93e767c0e58a5af717d950a206c0f0055cb39ed88816a9fe3613d15f608e486ac08bfa67d462d24e6a0a37716d3fbdaeb9c0e951c1e847fb884ebc1cfe707dc6e7269eed1c44331d5957bc4ac9dfeaed4b157204a3080fafb9df8917b8d15aff9c49cdc739b8fdc26a546794991c183fa523d14797e051894f48b0d62c2b70834467ff9c993b82fc1152c1f5479ec6144c7e8fb10d1bce26bd1cdbeec4e95ee073f3bcc3c7367328e30543d371b27509a577f5c79f14d5f687ce62b82f856695af9f7dd350543ec763de75b593f1859e44c2ac01ba65f98743cfddd8a89a38115badcb51a0ff5655f830c0122af6a830aec13ae5eb89a93755b3a5a6eca233f21cb12db545a24a5334becb8fa32c3d7f5805faeaaeea85a551fc62c94807faa6474c0d74cae79b5d8ddae07498fcc5b8b4f394867112ef5fad1c9da66765ecbc7fc0f3269d29c9c38817c77778f2c19b5a3c705fde9d76a4eb86aed4a7369a832ad267312903462397f7b8fecfa8b195cc2316cd53e48c3371ed2ecaa3e484b8ecd2e22b1aee910c51ed5d71198936266f5a00655d82c089f49295feda0a2bcc1a54ec8adf565acc3a8b2d74c30eafbbd843c59e67f293f6d8296cf7b611f01b57dafec6e2d4d411a633918068c38ef47b72ceff1fae772891141c3bc496824509d78165c1e4cd4b4989321a8722643eed69950dc120fa8da3e53c3181f252d7c4cd2cedf8f086f788ee77a98ab5b019828aa02108f49ea4a51f457f7adfd2220d3e59d5f4a29194e8f5eac40ff80312ff6888ff6393c3fc0914b08c1b9990d247ad80a441558db1ee1203e07353dd99a885a7ff5d791af2548815dde0ca1f56f89d39ef6b93dbcd0cd54b854173903c12649587433f0425fbcbddfb66ebce3eb4800dfddfe7fc44d9b23a3916b1db68c187da4dd13ff0157352814b1a792de7fff855761abc6fb7b93b48525fa90fbe3a51dea974069f3f5fdea86387eccee13f58a8eeb8abc6a43fd30e9788c3bd9ae1751b30a82d420225b2abdb1bc121b9073380be16107188d20be54f2e9c658d5b443869ea0e991c496104086290b6edcc1b656adf94f0d42458750fbd8d88040c518ebbb644f4dc4f7c6971d8d60eee0272df7b51a3d5248b4b264fb22195ad891fb6ac994ae5c0bc6714ae0b0b9a484edc576638b78ee89b568195a8f33ed8362128c30f9b0c7804b3ce1355abc96b15aa55c1e16a9e9ec90d1f580e7cb412a7e85d8585bfb950acd4de5865214ce4db7f6314d81784c588c1482d5f28c5fb62e7dd7aa8237ce9396ccde3a616754414cdf7b5a958c1eb7f25a48c2781b4e0dba220f8c350d7b02ece252b94f5e2e766189c4ac1a8e67f00acacead402316196a9b0a673e24a33f18b7cb6be4a066d33e1c93abd8252feb1c8d9cff134ac0c0861150a463264e316172d0b8e7d6043f2bbf71bf97fa7f9070ca3a21b93853ec55ab67a96db884c2113bea0822a70ea46f9ae5501eb55ec74eaa3179fa96d7842092d9e023844ed96f3c9fc35bbc8ee953d677c636fdd578fd5507719e0c55702fed2eaf4f32b35ec29a7a515bbc8bf61f9baf89a77aeb8bc6f247706c41d398cae5ec80b76abc3a5380001aea500eb31b10160139d5a8e8f1a976dd2dde5ce439a29dba24d370536a14bb87cf201e088e5e3397b3b61477c6a41e22a98af53cc34bc8c55f15d7924e7e32fed4d3c3ddc2ac8eb1dfc438218c08c6a6a8eea888b208f6092dd9f9df49e7ede8bf11051afd23b0b983a81bcc8d00f7d1f2b27cb04c03aeee59c7df23a17775ae5984eda788eb2015680ac5610fb1380b4e7d7a9cda6178dca98690449f5551b66ad2826cab2b662f56903fc95b4611bc86f7a834a34ddc3be7bf142c8baa096abaa3cd51ad0c0b6d15e590eab9e50a4c60c91061f1ed6373d91974c1ad9d263110a0d43fd8b596396cafc0ae70b7ac24a59bba090a6994ec483db7ed4c572f723670a11c724e8ffa2497d8fccae37eaa1d14ac1537eaf80efbd2e597b2ffac97f2bc3cd2c4017f170544dfbb0d9109478fddf06ec0981542bc8107a725be25070d2cab4716f4edfad75fddd582ebd363c49e8efaed9a76ee51f22304eebc232a4f67f865b04f610a628fdb317116666785fe8ca30619a07c83cc449855202d687f162b12d93b63af6e7ddfb7223d4ab998a5f450523c1d521ab76f4aa113cc2967e04a38dae07c51c2d0f44fdc8605c3c53ccee91a2c73dade5dae021cbc87d5cd6e5fbefb65335827311fe1e91921ecd66b2055a6102d7a976308a80c44e6d47a67718c84f2112d65486a558f1f269b91d9f47e3e11d09c0c748625bad2718e3674898abdb19d3644bcdc9317c09a3ac02f514b2a57e6a706362e5f6e8fb16cc83daea0eec85fdc8c367d84c9230730291440a4b109f7034d510a3f70a22dd4fa69e8b65e5fdf87045d560eec71f4e59531c7711d4f8917a96e22ad07346d2f92a13fb4569fa6a075da6e1acad1eac1cb2ef19ab452264de2357c927c6dfae6598cbc821eaf3b8da754ce91a96c702c95b2c308bf3a550cbf4d22d417745b5f17d36608feb826b862747c59d26a0e8eb96547a1852f9fbd095f1c5d20721804941d462f3ee2f0876ee2825c8df24c4f00f0844e50588ac688127013df8eba3c971362dd255420649245e880212cb3d732fb82f866dda090040f28e09cf1c86eea5dc4fbfc373eb69745b4afd841ca8e172d4a8510e7698345fd4cab9ec2ca0453a274720bb2d2e5468bf0d0f85919dd762fe3df969e6c071285e25c2e2a49659b8a78289aee655965bfa3cbca9b292a19a855ec40293185354ff4da9451ccf98abfda07f1137e79bc89d688963081dec641a99656b040637402890f185edb28e7e6a2f65848a6af158f90eea440aa6246a2e6c31f5d220b9846aae2027afe5a7caad6dc16b56463367cd9e73bf22a1d6172145de4565ee369c55e3b99ccbef70fb080a3748340fbe8f6b95ba46e8b76de5a3c4bedc37c55ae24ad02267da26769a3a732badac2e0f3a5393028dd54d78701647582cd04c8310e9f1ff1b433125229547130e1737a1f33604f0d670ea7221097c3eb9c7fa4b8293d7b429af76191ea8e481dc1da31344537a09b33404d782eda1d6f5775500c1d8efc615778baf0905d9fcba1806ef986c40b1c6a72335104376b58266c36f5939a8b95123e8635c0c95e80aaeb97379b1179d6332dc07539b595ec32eebd3a336a1128f3cf2e2924db6d8504a516b62f26d012b7f75cab765c8374a3824da5a405746023b51894649ab422d636513ee809fa181d5b6fbc63351e37a1b14efc8f739e86ca78ae3e280f1c9e4824b2976ec4dd308ede6171a7474c7f530128089bbd75e10f9e57ee17408b4384f99f886a5f63a2320a9b90eb9bf692e1fc449171eae3bb1bb17a6ed937ea57af3c82db84e073b5306683e1d63705b9742a085fb802cf5a1639818417fc2223f476c2566351f4b3b17a822e11255f3c3412dd39190e200727bcd3f9799519ef792ec7c2b0b9d0e2dccf013d436dee63483c2ce83c15c00a76c4d894a60cb90366ecf9e61221ee8bdaec66d715159876d8305b35c81f96ab2cd8f81f4769e9a6e439c08c329036f5d2591ac42f2747bc0e77d4e566358a3271819b6003b290211b9b847ab70e906aed9f86cc38aae27e1098fdc3bd5d84e66c45292183f198bc329cad794aa4e430534511b7d9a75104061b409676a16c1146af0a286e2de8bf51c4a35193581a902bd3224cb9257c961989042538092af92644a63d6d6f6872a29aceca39341ad29dd22354812c4b7c7068b039ac9ca7e6358e662a28be001d4aa697ace540cc3ed3c97b98d8c5a6fd3543ae9a7962c9229b14b0b646229807747064be3e83191cf24092dd67f675638d9f6510486379f47f5eeda870a3187946819ec9ed05e7b325bfd0eed5c9a0f4a2063d63c1a8a0a309f586c94d4a68bbe860ae9599ce204c92cf9d92cb460ff99cff9e5a8b3824786360e1e1861e71158395faeaebe7aa2f61f76190f174aab9a313f0bf4f1befbbb22768b8c22719cf3fa9ec908b576fa4bbc084b1ee5b5a7eddc89b58b45ae7b421d38215aa6e49304323eb4e202655f3c8b16ebd6b03058e75a907ee63fcf6aad5eb96c1e5faea81b88b5eee525c4663af52877c0f759432913b9d48030903e7f9f70e851cd4e20bc56aaf36cb02293d992b38b583b8f0b25a08c3303d8af5b1b37f5127f7021b13934645ef3020e5caadc5e7326ed4ff56f797e26cb986b6512b0cc76f1d8e7be44aaa88e12cbc644f14a7feb979d2ab66907063c51e052d0f8b25d827377fecc5111be0d365e08d17f559e3134cb9db294f1cac03150f4232f853ec15ecde55fd1023b58e83934869796400088e9177e85a2227ee45addd049c1d6b03e5b29dd570496fdb2fde7d8cc74fbb5fe76266ebd90a3b4d57e6e6cb9f0bbdb7ca03ae955915768011c714c909a27ee20135927af55d4feaf2c345d029a54af942da6f85f2103345d059f66864e6b0578111e2ddd5a1cd8bbf4ae35b60747b93f53ec8ec64c10cf4149909b102a2b88712ff3e5ba3611cf96585a6b36fffb64b8c37a114d6b16a53879136eb0b5e003a5a068e3e8422a4fc8d7c77227cce64ebafcde2437166b62ccf486660a7a2ef37012ebacca26ecd5bdf363feeb06aee39050974c25d6a564594c67f56fcf7ed48b07fab4e25ccffe002bbe460325abafe37f23dd9c145b4667f146a1635e462330f02470b35c5a2519f1350c02b263201ec9026cfc57d3659373910e878f2b6c1c5be774df8e01e775d476956c257bd0ccdec17ee939c46e5653d5813eda752ba7bbb245a99a5db1ae55d19692074c2e5820df97c502a4bd1b12929e1be8e9ce6d802347c3e9c4202de6046436c05ab55b2fcb2c227adade6c2046d98102cfd0d859a91f8104eb9f6f155da2acf93df2405bf2c083eafd3ec41d60b810e0bdef6298b21193642a9c0c646bc6771a5c61a25604d96bdb727abd5a7ebe4ddb2a56a6ddece26d8007b26043ad44279c3c8ffb7e6ffb3cd4e10ea2780f509a8a9bc31f99a7e66201195f1543a0a020f754d9a665a29a896faf673df6811379579891374c71b2234fc61e95d4d46f15d44bdb4d7c3b3be3f46410ca46827b8cca976d8866e8ca33c4945d5c87b705588b78015b529843af0b75a7e1e871fd276c1e947d896b92e6181ab7e3ccc7077bb57fe85a6958667d3d7a790f6cde1cebb494c2912478a0eca2bfaad62492e9f1caaa0cc520da08c0d2d910cd44255f4c2ca0646dc89e789a1cf9a28e2f99315d33accb1639cbaf0c94181b85fef648bb4cc7f66dc65b8e90bf5f3b763e58520098febfe7e47bddc2d9cdd5e40dbf4ddb8d51f51bde2e57432266d248d13ed09e62f66794d188f9861c50ec41f0eee30f76f4ece250956733ee97036098db41991a4a3eb7816196c8e447db3a2913bcd992174a7bde1f42d57c764b47f5bc09533760c1ba74943a0dca291f2746bc1fcc573f9a22c72a5eca347b1679683fbc8f32b08d381baf67b7266b14b3ba46a04a3ee45881ac452f64df1bf17f70f4cf9fa4dfed9ae70184679184784a0451d2f5c19c02031e0e4957b4df68b4a069a6f6f6458f6d773924a1841ba664a55c2c3187dd33416cd410e56e4bf8d3671cf737bf67df2a4cc4dcc786872b9e2dc4009fea0e48a749353ac053d80e36357d24d468dd595bc823017c015d7450fe38149370c5decf13b00b6b0e0a2567ac08b45f7b0c8a7c89d227219d051d17a706ccbea49a42035cb327381568eae23b5e2a3b7e8beef6f260d24ab224827ca8ee9d640dd23eee94ed02c9e26abb3053cbfaeadbb1f365a24d8769d92240da842e0b361524020b5c9c22a2fd8602dc9600aaf02b35344309f6bb018a94d4cbc9639ab7430657c4046f0b25df517e31626abeedd58c2e19aa0ae1a43ed2bacad91dc04a2fdf9cc33cc420f4f04379e95988ab36731d5d5402d89fb47e826f4243bb206124364d63564a0872f8d2826eebd9046c7c6f2e7c951e49d4b22a7eec89da1fbed890d63ef15f26422185143c89da3ee269f83e1de11a7467822146042be92295a585e3a09e720ec522e1cbdcb41acf5ac45ee892677ba3ff670d71339a76ed98237be252ae21268e756f05ba0b094a1803f9da84a8a05d0ec9456cf565e1b548cae95eafa0fb01f091935e6eff2413bcb15f605f15270408216fb5b41ed83dfa1454c522375e35bdefe54275f109d0ab450636ac4d8e4d9e27f2d81a15b8cc5e98549254a1c9162918db3e399118f5864774a9d6a2347e1315753071eb1204c8bf5f52b1a0da37e484ebbe545fdfe6b031215678c3b83a19a24d7b661f626beb01eb82b384f02f42bcad4f40addd48db8a92b90d2297e6143702056123286617f86fbef4fea940f648867d790b8f803abc5f4e0e3f4226954c296afd96e287e21b7243d05e743161810da578096521805edd81f68a45500f6a3a1885cb1f45cbd399dde024df65072eb973c827fca13eeaa3f140842016f509aa9ab4603d2457c92cc9aef24950697a0044e3d7c483b8d8391886cd50dff8c2f16de3d6caa7f864c1b3874750781b2b78b545a94b4da0b0036433c6561f5cfea50eae9f5645302eef18238473606e9b9931880d0f6368fa9970d1ffbe59c4454bf97f4a5e8091801b53ee4a209e0642d83605836f69742071aaebd9d813b10f4ccac03851ee9f20cd1351f8e68554c9bc5f58ad19d474ca128edbf561d195e52ddf3c19bee3bb597ac2f92143bafc98bc09fbda6d18dd4ff2a93cd2ba17f54f75c32d3f141468c2baef4e53b6a340286dc2599bf7bb002aa86688e26f5b51a6aaf32e48ffd539d4f3f4bbf0cde2d20138151c82384f9ff29a634ab4e0103d93340bb9a7b0caa108bc7fdc88d7de14abb17e9efdad2b0f304f0bfcbabaeb1b9db75959dbf54930e67aed3a9c8309aa90506b6b9ed4f1d06c4ced19746e206e1e9b8879663bf56bf6c5c920ac5e09e6579b780cb63e1875ef0a731b726864b7ae5705a2d6d343a4a213a05928b7337a59f900fd04472382610e2a8d25383c9ab5804d609e79a88d70eaef3ea22d3aa9100fa2a6e98e97684ade9fe90d6bfc59dc9dec3d3d8db8990bc2123ba92e64253235e9b4d682e8aa04e23fb9bb6248a77c065e93249de829bb2fc5ea9e396461090222816bb29bca37bf86698fb995f62c50110cf418bbe2078a56c5f1ec9fdf3d0b09a719ac253b5bcd00932ae058b86611aff51c8ca8448978615854b69b0216a6eb8050ce199fd9a13aa0fd652570a1b187f61e6831b3a960521c3705da8c5e6c64c7b196ed4a49c2912d77b670b177c6458a7a49ecc1ffd8c57c0978d2a05cd1f1c7ac9514dd14b7b0933a52cefd40b6452ca0903df1f55828025c7e18109a6e0f2ab25724cad2d6f57cb5d894a6a508134731e9b9c61254f64990941f4faf97394b634b91860cc6ec346aa666600d323c849ea4c4a0ef55acbc56495ca004f3fca42ff0ffb11b0e1164c95ab89bf1db3d4f575ff334d4e0d7d50e0c54c422eac5ef78c5a3be95f2e18872540fccfb597211ec79d9d47b6cf41e385b9c2e92122167fe584210f63bf919c620d
-
-[L = 28]
-
-Len = 16
-Msg = 3dd2
-
-Len = 104
-Msg = 3d232201038fe7d846ac1bd4c6
-
-Len = 352
-Msg = 44c98cfc71f82215dadf494d68d1d6b92bb4eb81fa0fbf945a659d9aa2c2302b5c93fd3eedba31e479e29d36
-
-Len = 504
-Msg = 02a5c7b1b749d6d49bed302d9439f23ab83020bd4d573906f4190e74216ad33aceab775f71cd31092bba5cfa42f0845bd16fc1b8bed6434dedc92f80b395aa
-
-Len = 13976
-Msg = bd70deb2cafa75918308d703a6783fe9dc5e3d21de9bfeb6dbb1cd531ed5dafeec463a02abde302d4ae6ab3cdc2f0f94865e38339c88bde507ff71bbea6b30b9851cd8cf599e950b8c8e620c90adccba0033f934ca66ea0a936afdad575bb6235099beff1a632c9114a8045a0919fdc21083880eb05c0d8c489c7810aecef4a41766f67c37557e28a9db9a0d909c2b167ff7eba79693afd3ee3aeace38eb73a5a02a882cf89b123812cf2a0f6d5edd1d14362ce9c43257474def5cce3adbba8cb48e7af9a45e702a182dbf47e8869b3f99e953ba81628e502c60d4f8ffc551c31b3ad6ca85c52164839d5e9d493deee4d4b76604174bdb5655385d34ced2c1b09dd5a486e1f9ac501bc611f9d7aa5c748f496faecc14c6c18e1dfc6aee2991bd0207ea1701219955a751df43dbf66f57904675a0e9e6d7f9a0b8bb82a8f44951117ab2642d6671daf1e5d1639d48aff6a05781c2b5e8976653b0a164445872d393d30355acf0bb49bf2bed4265c9a3b786249afc7a438d706eadb6f90a7f93ad51bde6d2c8e6ff09dacb3dc67ba0d3030c54c8367e1e4280bb5903274191344610de61c3c770c6820a6cc9d826f7c743f88f13580ba23cfc00598fd733b5dd069bde7f10f2b8961c16b69761b0f308dd137f844a67f6054e065863f226141755b96645a291e3fa3fc853b2475fbe1d3b25ca22f4da4425dc95fc855e63d6699b311ebd5fec1c7753e6e81f747c808ec3f618f63eaeb1221075edff0532225c40ccadee304a8997c03920e7ce4e60e4df4d120611296786516dd4d9cdda2077ac52bce0fdf552e1ee89a0133f1f87a6f6f35f5c53958ed806465919a0a5fa42488bf29caf33a0dd469e13abae351d5c6fb1a800ee384da199c823c965d9d5457a3ef8292c4d9b142e3f1fb502da498eb44d95f8c85bcd6871bbdbf004bfdc09ab35758f5e8b6a0d0f366c3b255333c52c8fcd4ecb4536b5f6e72897649f3415443612d72c3436505249a344feeb04883f41f90ade40af119014b3c56fc108f1ab0a77087d9226665d416cd975e9e4605529c032e8926002a70924820c6c7e264a794b2a3beb63d69ae56e017294fad4d611cbd0d3847212a38f22d623eabe3b884a36464d8814286fff52c4dd366f6c2abfc2eb865e0dc9ec6e55ca9d81f1b8cc47e2629bb162e54655bf2a9e156ab0bafb4b8ce96858aeea6e6665607a3f268036f4890dad759486b15e3c9e791429ec8f11bae4ea7c490656fdb0551dcf0b0be017c08bc674bd97d9d701c3ac955e2941ba7d5f2ba122a6f0c1b164b1caf2d50df111fd4287e9e195d181f6f514d7dadbefdd4274edc234025b727680576046842a834b6ad89eccaff5c5209bb91d652357e3750d8bb0165572fb71d09fdfc60f6b1e5d868c67c0edead427e7aeb734e29b96e03ea174b6b1af523feacaf6bd745ceb1bdecec9251958b7f521182daddf62ff6c4f58977adeba81c616ff2e937ca4f16eb9c44e63f9e974709122083ae45524ff87d7a0cca33a90f09b660db0efeb393c61967de2564315827ef1cf42b71c0f822f471713c9d885a3c3281d7c95dbc96f1c6dde0af70ea11232b00a2d215ec8de8fcf84b6193b6ac9d46de660361aabed3371fa44a6f32107f3854262eac355f9ef98701f580b4649175cefc29950e7a0eec958f629999c4b0a98fd4bdaf5c0bd97c963b551f2220bd41ec00b8726836e949e818a49aa1ac5bf12c64fb9991111ce8be3e0cb9605f753dae1a4c84389416f17fb66cecba45d591b22d64e5a4edcde067a088d9ff7f5dbb9dbf324510000c55d50f480a640fb22da9b4862dd81080d61af9560b601edb5e3346263f5f193df97079a27e3f9876078b80ebdcdb17ca4c50aef0c8329c72a7f77584cd963e105eea9c28a2ad4e95c1d018e27d0e720ea59147f59ad796b80b6293da8a55ed47e8abdd37221db0a5eefff31688e2adc294654ab0fddf9c1ffafd4783f01eb539492cb35a77315d0ad19395f47b18298a7b353dcf5bab0b2f193ff73d99310478d2e5c4ff1c68a2493c138818edef73caec9977bd4eda6249c8933953e06d796b288f78b18c343ef561082fd03bf92b084afaaee741de3004abaf746350048294bc52450e31147173f2da13d6ffc5adc718e149f9df3702f414dd3ee88296ae8a0106b071b589e8696401da7993d58a9bf8e5bf417165498c96b4ff5fd2b45bbf88f551688425122a3737ca54b2992fdb4d60957a93097222c3cf4c45dabe18b9d6a69e6f27567d5adec489e4b6812c29a8fa52f1de642b7b0e749c16f54473ed5ca2fdf2199e885fed308fa62a3e0deb7e0b8e439e25b3e9f95d755fdcb7ebee9d73069dd57dd1cdc5145205882023b54f2c9dec6cced9e3f6d24e8cdbb8ef121b8f3eded574d81908e867af5ac82bfb8ed60848b4bfdc1d998bae3a9ca80c1c49601d11a40409c62b1536f01ca67
-
-Len = 48824
-Msg = 5fd54472a44e4476d254c0940071ad42dc723354f76ba61f63fbb9df80d1ee56136f51b6982e66c1da83602fc08093506a9e2cf27cb92085ba5c627dd63f59f8850e91a1d86cb1d4ca38ad03160f3c584b128d9b21e935570e086d3815307ab8df396cfa0c100bf6cbfc0fd7a8258fa1a656bc178e02cfdc868540d8e5ad39dd46794a8bdc205e710555ee7421ca7475a4f3232e6a0cd55d4b5d4525f0bd7eb1e455931aeea6918b9fceb2a32706d31a6d7028a85e102f228417e2e7db68317ae155af70eda98c8dc1ecc32a62e294d92855354c1114c5735a3c81e551b63a81650107557f3237bf953989d17c65a0fafd2bb1e32c237f98f55389e8f8b0810e97e201914c487a68403c6d621a98ddc515780435564245d87ce462b8785def699f7f06ebfdf33dd1ed7dd5a3e781348298c7950a387bff7d1878731d7ac66ad9a6607f2c3a3b6843c2852a5e882a8d78ae9dce2a79d595cdf09626dfa6f1dba7d40ed21caa29e304e7dbd559a89bd1f07d84165dc259ef112dc6e2c5a3e82b1c50106983f6c4965c85073c5deddbe6323003d56abb0df590f69010981ab3407e43eeaa29c6156995c492c931fff1b686eda3741a0bfb9094747d1620b2580415d431ffd6c02245f6cb03e39f87e82834dcea59355b2ba663ce145d2514e15e2b2c60cf518ff510c6c3e2f16d2dc523832762ed8352a320462ddd4d6fe755350672038163d996b44ed3b85d64989291bdf39398cb996de785b9614ec5d4bd73efcfa37fd4470b17d6240b8e4c715759286b04c3d7d791e2689927c9f18320ff2e6bc7306c805e23a5de66eced5f1a630cb43dd46db515f837f6b824b99b86c10b6df7fcf22d97be05284edf0e0be597b3f9c63556db031339f79ac9e6c5f8a1cefdbb4b30f5bcd23c2a4dcf791cbfdd6460284c5af0621ab7c5571e40a87c87be459c85ec81d746930dea24f43bb11d6611ea83409d3bf4f987778d8eed1d5b246a2112ef78ef0252f9ae464810c13f02359441d289958b4766807d9a3be0054897d35b01830deec1151f9e3d42f92b80f4aeedd65c78c6e98afc562a3bcf6d72f238c6e94a38f2288ac7929a7a61c92875c1f115c0ed8d261a727f0794f17ceaa3dabc717478f6ce7f2e8b295f000241e154b4575bfac8483f6b62f9ef4e18f7d341a65faad5e2fc1ddaf2b09adebc155ff09e63d5aa5f95206e66c7f4ef2ae3aaf3ea7c93589efa8c552df8d203e0ea181c1703d7023b56e603f33b4adb9bf44f7af290d8081210f327a6c9b0785709346087fd090c42d2b8b2711b9a1a5173eb5e246320ee27867ad6c3eadc4407bada44561a12cf5d53bf0448308bb536a8a525eabc1410c3a34becee25fd6fda453251ec229b53751f2280e142c6b331daa659ab655b78cfb08bf18e40bb02b7f1650eb2dd4ba1707f0aafa219f21c29521581ce249e2e34f5656b0a04c00485079b040e13cbc038bb9f17f47cb8f908591b26bdc28538d8baffe4cc39b17d2ecffbb9698bc2b8b31b08424034c051b535e0cfdf07b7a0a54781e33ba739759991aeb72c0ed992cbe76eb8ec0ab12c182e8b049cbadd6e82e314f1bf15fef5ae95dc86bd64b8556766f8ff62c33492198e454e5ca59ea856d8e095c04da8045522abac865506096ee1cfa1082af08ca09b3533878ea3580b6c0c57a615e0ab768246b3eda96bb6caa01a2648068e21959f843d853e948588e8c0bfda364ef1f9fbd3235c27916562eb0214891eb55ae0e059f4bf7d1838b5942656c27899dec6d67b823a981d1e1e0aaff5323b0e3d69a7dddf9b12d7787ab763a3c7a2697ac65b655aefc4bae7e6444850ad2540d5193b378682c77a4dbf9aa22e517e68cedfd1ba32e3730ecaa2e3f6ae61a4f427d6e69071dd62a9bf6c860980c9d23ce1fa82a1937e6dc1ce3a2de096b680d23d89ee102912ac0bd769c1c02095678dbb00b4430428797cfb966b2f901480811e1b9cde358b6d499c9e93f0961f050465d7b0c70d4961e75a9fe40a24e36eaad27238231dae6d0a17f446c16bce7348e669be563649eba9f23be29adb8b10f462780a066ae573f74e51215a26097b02469c25180890e06acc53ab063c742e08d51359b0a39749b84b9f6be44f3ae3da8e5a2f340a8607d4eed08877d007928d332d6f49502bb5f416c46d866fc87477c58a22d3c5932a8d6298c1151daa032c84ad92f8f90b8053b5aa6f690d1bf682f314471cbf200f3d30959e07adc6488dd17b0be5279e727f3237b8b4b19b31a220dfe63882937f8d5ead677608c42a57217f2239614c521d94559290e3b0ed8055d5474e96564224f6ca6389b40a71337da11e1c307dead8e4eb43252cc2f1c49addb18781cf20acffd3db693b02e5c8ecc949b51b99005529e0149a13390615f5df6e0bcd68e1ca82b0173d25134dbf76dfe92daa085d3f6b1e4d18217df41b70c4c40101884c2886495f2ef8a473bf23cb47ab6533c93cb38c36c6dcf6837f1272fc91a6962b6e1386fb643e1f1d71fc75ab58d5800bf4081217cdce0c7ae9e3d25de543fc4444314f32067eeb147c08c55c5c8158ed11729837547f28a300eccc312260215f50e98c4e3d4170208a50a4a4def1243538f906df8476b0c46d3449be73866d463d422595300e160840daf8c906ae4aac13a64457853b0ea6d8c32f4efe3b48c0b1450250086d459648b0ab14fd3f341a4a803be77e56a811e7a26827eb0a1a9454f90bc6ece665904adaa3cdeb2c4847858fd1d79750e8cd45d8da9163784b8bd06629410502debfed5eca3cf8fef0fa6bdcef6efaaf35a1986d6fd68e0f436dca9442077a4818ebda4606a94a3c93fda46e7ef5ccfef656896a0d3d93566b02ed8c3f6174417cdcb99a415b0c6e9816d94e64b438c295b4bfd69e0d9ad52911de5509971b7370593160629b641d690eb2828bf363857983e3b9098fcd15e66448f786f196685d2ceaa251b17ad06dacd614d9fa78ce0a8b9c1c360b529d0bc1d17ba0b70ea8ac1b8d67f6e5770f0cbaee0b38109d26b09493060dc851f5fef121e83e30aab9c3efc2b8397e8362aefea1708f7ffa14d3656f7f7610f3a629bce14648a593250c6f309c02c6c552bb42984ac58db920dbc7d98f59295f37f3e9b99da55ef074ed65801b390366669b4c7aa1c483ffd23082793f9e5cbe30c34250f63fa3ea2cd097593dc67e8d27b7e4f07e73a9f7b33a5ef6962df1381a038d4f58fdbca9d71ccf640b917f631b75d4a2e8ba46c64a6223f99cee30f47c1a935dccc7f054fc39d3498c824e10cc3ee337e781a3971f0e98295aca611bde701c2359858914248f6bafc88232bbc27bd85883b00990bba7862fd7a7cbd4c86df049071fcd10d686613ec877758d83927cacc530bed9a596b5b21c6fb748c379d676de7e05719a867c9f934b5dad99ed97dcb4e70a9b6542ed5b2f086d9f56fc9752e788785ef8f7837a31e433438cf2f18f58be37fe8412f6d21a5c35000a5efb862926700079413f76ab2c3e79e20b516eba9d8c29897097bee55157936607cabaac41337ea4cc783c0809c875259f8020e16d5045fcc39ac796d11a82f25fcc9579bf0a010200f5745065175fdc15474ed514cc796672c59637c3c8f236cfc9c0978a3db1194680c58c27746090d76ca09f7c48ee4ee7e1d3cf0ea70dbbbd88e30e8814b57404dfd7c33727a0c84cb7bd468b0bcb3c89b526679c00fb0892d2a5e7a3d73698a3db53fd7d78460cdcf24ed22b5f39b8c00b3506541ae4a5b76fae29c1cd5b0f8c3ce142e0af7ae4efe3fa4c438a604bf4a9abb41e3fef1b9227a7dccc3f4d6026ca289b4b1366d9ed546abbbbd5677c8d582e79e2b544f18dc23809ab753313d84dd10fa3ed2f723f0b46277b8877d4f3e0665e88c50caf0f0708b746b736b00c8c83a7d18500384bd035996aebb7da8f09fd6af9b76fde7fbfc0ee854d7ec02950e76abd23ffb27a6ddf1772465016c79b98a61bd3940547b207b6507e32cb9761a5604f0f546834a8edac7ae06910045de218d761a4accea886188f947b57bd876491709028e2e24b075d6b022b51af1880ca16a8c65b7c69e51b2ad580ee058acc0606f0a3a9ea1cd4342bf4be602e941dc4bef1239bb9bccbc8098a6a17d63186c6fa75ec44b6e4fd38a3fe49c5eb995f0cb884e2f3ed6be02515fa605b98453ad935682c3bac6a2971bb68f4094cefeeaceda92dec803ccd3d346f8b40b48f8f489e118a17367801e85c79e9b3bb5d73ac44a8290cdbf83a154f2f125090d42e1a1cb72f5ebbd42da46c7a4d4b9fad9612a4c800de6467ceb74f831e1395dfbf5799a3429ba34754add4b34b5960a5fee8f752dae78450322a1ab3d7102b77e907fc1eec5355991e0c7d6c0866660e5436248edeb1a37c0e769a0764cfbb6354332d6e55103b9235c84eedaff918af3f0213c435c32ab409a4b5c7eed8ab6ca9e313dba459bcfa3ee92e7d669be0526856ac3c06a57fbecbba553a9cb4655a901d98af02b74098e478076655d325bd7639d73d7ae00c62fdc361a997ea4ff5b0eba33096b12f35cc7cc0eea62950b912b47c11b9fb386a47c4c15c0602d304b2541da889cff299a1fd415e7e25c70ee4cd83feea7e6a9c50c75d9b128458513d61ec5d0299ef8c090472fe0850f384938ed44d36f10cc2c1d31daee3f946a2fa18f9982a988fd6ac973b1569313ce3c8ff5746c4dd85a241f1e9dca0e904c091832ca028533a3e34c184edcc510bf22a27f530bdca3d057928a96f72dafc73a9aa6dbf2552598e468735cc5736c67a620e9455483e9cb2108045ad80569582ea93a53b491e528c8df336fb326ad74317bc1dfb8ec30a73af01a5dff3e437b7fe48ba5dbb3e8f01ae0c6fc28675a415f23a796bb6e0ef0efeb4b14cf20d4ad88ad1966da43a76b454dac8687bdd97b89b8f8eede91eb34ca4a0523ea65736ae39341fb32b9b716f25662a37382c16f3b9c346c84f03bef54acd6efb364c6401b07b3f7679e8e7f8c9b77b75e6e98b90f4df88460f1978d19744eecccb743a999aaedd00b5a94018e9d5a56bac9d5d55f6e93bad52e84aa7340cbbf98d56213d9dd3e1970867e3972dc98e61b3cff40b64ec49463ff79a41c82dbbcaa37a82b761f432849aa83a3d3c9a209e2207b87ae9ed9959ffced165fcb0d8873668c3cd8f18ba0f92f7acd2bf50416c22ce11692bf6132eb9f558dc789cf9776da94e48cf48607f19d9a11d5df4db11dbaa67a1d20e9f0c96f5956ee3f906e371c489efc88b0c1e56d881e7bf8dd5d6742622eb873e253dbe54f2e2e6d0e6136941de8c23e9a632727bb5f88c23170316c7aa0df28d8d07589dd6022828834f7ea9b4e5876a1704944aa3186dbf89e0e81767cfba03bfb38c55a9945209c4dfd88272c49d1745dce5ceb40f0a6713b5139dc2fb87a8a4888406d2610b7b910a9e5782ef0df719028d8e50a40a269dc9bee12157038522d06537bb31fc87d21af9ad4b2e7e127bbdb313e0a116010f65126cedadd4a122d15a71cbcccc346f55100e354b997154567fe3caccd50251d137c58fc3a2048dd5883b6af9248b51040c01a80c051b8a151a8878edf0304b5554746d6116b749221a1d0082ac925e6e140f0c3b6a180742ac8a50ce0e93e6399102f151d7c14000369ff52d0b537fdd51bec99e7271b1255c6fbc36d83408c417f6825a8e2a58b9054ab2c3ead69d97ea9947fec32d720653c123ecf51a9a3f0ed88743e3fb7b94aea59d0bf0219ee50825ef220554312cb907edb90e4d85f29e316ad57d3b90d859391fcfc63e6c0fd3ec27d4e1efd6e0b5ca8165cbd6af25ed8792d805f27fce308ca1d51335ed5d727558dafe05486a6f9149b8d3bc022026656714222830be582889e6800c0b170e48ebfd069e711210e4ac7acf07652a6f5051507de68aeffc9540cab5cdac84ceee46059ec23820c04b127266c0bf8df0d2b856be3377ab42592f495980baeddbeed3ba707a85dba64fe36941eefa8fd37204ec8c18df3852febd2b142b1c9a5cd0f9e424cd408ceb7788270899fd793db99ddb8f9ca8df550c513790d8bad37a1d1f4a62c4527bb64c677462c9b093582decea70c7bbe873095536728e7ce05d5cafb5d166a1f03055e918f787fb244c5857e3d7a1009bd37f30f165564a082c1510ed19bb1633811a76da70dac67641c2478c6b335f409ef54a2d0f370c9510d0aabae3cb998bd023778375cbf9cf5ef125afd584c11efbf40bb51839aacd3016e5e4d79f134245f952dbad617c78cb6f5712bd9c0c7e1303db5029640cf9b56e29329c3e6a9e0a2371aac1a437b9b1c4477ec9842aa80eaa22c5eac11b60c661de6ddbb088e844293ab8589c13d938765bbaa44301e4137148dd0257bd4c8c766c5d3bfe53671e9417cd1b52f622870ffd90f4e17b7a4ae1b5601a2edb032e353bca652fb565beea6fb0b2cdcadac71794c662677fb1dc81d116d94f5eced526b37c004b95284cb6aa2ac415754a1f14882595dcf4d3f1d905c6e8c12cf5a9d23d3ab55bdaf9f17d2f03f933e1bab89040753648c426b072b73aee8c2fc0d1c03fce2c656e20d4c96803fb2ef471b912267eecb4d6f342d3513894b94d77767823fe0c7438e51f21bcf16f0e98b94b23a10760271281cf843989824f7061bf834f93fd8d2090f70e939700dcb4d8964a19da39a9601a7e0ed9f55f567fc7d5682d55a9ba0e68861756bb549f2f17c10ff6bd2042a80477f89743d3d762f1dfaf230bb502eab6f4c46b26135ff3bef5faa179bdfbd288e3cadd3d88d8012706e19b7fcc6e9cc2699d3ba0e624e715599480d6b7dbc6eeea0d12a9236444b17285fc7794040dd40c2b2ef175f7f3641664fc9bb7ea6d7eb3489d504f8013d64a23aebcb5ce233405f5ade067dffff253f27e926431ad806703e8fab23656e0b7431916d8d4c72a7d831e3664e5f30839c76c8167b76f3b2dc75a6ef48df515e06ea54ca51de2fd9c5eeabb1610b7eef06a2f3167859cf82e1a5b76be8ed8beee2bba28c3b15af6890d7a37226834ec9f63306a0da11aff918753d8b83fe7220803c070db98195d6d18357233f5504a6e3bd6f30115d3987f93aa5d89aa0b8b577d1fed94da057a6f088233efc0f44f86798896eae9ad0b20c8c9cdd9d72a3f02213f6797800894b864cb44fed009440fa5b0197023929f9bad16f052cc2d87327788a68b9209f46fb4776b092d75713048b5453ccd699d19cafa8e9a93fdab0f0863711916efe3bd81ee71b8e0221e12e9ffe2f6ee1a4dc1a8de6e593480f3c05b3691e916a4a7ca51971eb2f0f693dd10f6b8468f8cf7bcce285938b5a0a76ef86acfa2990f88bdafdc39a065db17b845028ed2b7a9e331c44217de20440e406868f1eca818d0be20248c2948b8f4cb118b2e456e585949139270f57c54715f3297bf714aa7c5f72ed8ddf6a074703ffbf95e45bc81a02c42822c22d2b718f2de5e03d687a4b18d605ef5ae75f9d43c8cb4e77aaa0c0101d978120f29574b22f52783c667f7daab3e1f9cfacf2e68e94a24918e3fe2c4f061deeb64891b5217fe5908e7f389897751839982b7fb736fbfb1232684e93123611b7fc8fbeb74f8815b5ae13240051920f3b6ed34483ff673c467ed7f0a8fbf619796e485affbed0697415d2d0598ba34d5b9e44ffd12a5edc323883a2e28efe9baf860324f2d2016748503eac1888213926b0e0f0335a4b51820a2bd3b42d982ec6ce307b453b6385aed7a735a1e98479394147c40f01c532926e10e1b26a5b395bc150ec4b4daf5b1436bd0baa225583ffc9d9e9d8a354f60fded37b41c7c051daea04e689ab2d4e24d7d07c75c50ccfd6a527e024d1632246c6f40f06b86ffec0b29cf894b665d53d459226b93422d37a8da23587fe884dc3c0f2fb55dea296a9a5b9a0d101f186d9fa6288c912202547cdf958569d2cbf235740eed38d10b0025dbb6de31058e98780d22149c19d4bcaf06dd7353fd91cd1f47e47f45622e1472542be2f63f463d253617eafd4f2ad609f9020884905dd5c22fba53ccc619104b6c0203a7f6c8c26fc80ff6fceb8c0c51600c2e46b4b872e6d597511524545a76cb42278b519d911e6c1320e01682c551e204ccdf91290c52e0836167a5685cbb1af338eb794c10fac92950f3f7956acf28f1ca984e380bcff9876b0c71dc7ce4011d1d0f955da9ca885c6e7bb74c6194dadb0fb9146dd725c8a9574aaf3824b727c9be3fce59c35850b162c17d3013689fca858a0a51d81cf4f30d6a8705bbfe35ff03c34cc7c56aca32140d72c8e8121fc71353596b777b266d75b322c9a97fd2c5d4e2362f19c99de66da7bd9c495c03d9a15b28431a0c051e786fa80f5503a72519e6b419263d72d553d688349c0cf30918eba0622b953a0efce4415c29515c26ba15f00e548ef108afe3f8194aeb965e5e4be94f10df6c45ea5c133a8c3398d09fb80f950b83c1866a1637d2bcc195e05cc32a9233b244cc2b1d4930e66f032cb1163c37b3e58b576ab76de759569797fa9b8bb4fad66aaaa56f09c7a0ce4641d6799d7bb47cf684990ec1e08871458c211a353ccf1285e7429c7b8520180918f7
-
-[L = 20]
-
-Len = 16
-Msg = 8a61
-
-Len = 104
-Msg = 37487aa02b03bdbc6bc62e7e26
-
-Len = 352
-Msg = 6ecd002568bae3bf1873993041bfa292eb94e9ad092d8eb3585be82e8a20cb36a47a06e7a57d301268a4a533
-
-Len = 504
-Msg = f6dc1d2f6b8e126d99939664693d8709513f97d730074ec2794e536d94ede79c81f2b2ecbff3c2c26ca2d181ada2c60050997f3bb087ce48d956c18dedb227
-
-Len = 13976
-Msg = 07a6372c863c7d7c6764e4f05addbbe161762735dfd2d23bf268e2d603cd28de9c369ac379390473e1d3fa7e37af1178cca54fa0f782dfbe68070952b93462ea46c640d43ffe71f5fba42df98f4c48ada0d8aca8753e0731508bc15dff283178ae5c10a6ff132eca5dde63a78d3ac94685152897828eb25a55fdf140fd33fd4e7b03f283e201a1baae8986d25603fb0b2566aab345fb48031d648144dddc2e3556c0ceb1104f348d96ae7dc0152e45c625d21b46e70c31f250c858aec4ab2cf5e79d8c79b0854e0abf5330b9f044113d306161968f4ad6f0973160c9dc296056d5a11523ea2b56fbce8387070fccc639ec1c65ec663b9dc49aa880dc4ddd3020c9d44ff7e8cab6266e436af19b4ecb82010a0f8f9469ef380034a02e3f50051a6a3f233dcfe9d553459dc1bebc538ae0183448c9405c351271dea808d908480e61e9793cca111b4cfb9874b799626a1bd9a0f6e0929ad51b97ad81b2438f5fc255db3a3dfec9f0d8393c6b245b03d3faeb58021db3ad391b17a91174a66db4feef1b4c889699bcbea7928f4d29be2d47f76455c8cb1dc7da9cda41962a28ad8cd7b39965b809e7c7eca1c6792c1ce1c8a4cad6290170e91fcc49fa5ff64ab433b4aa081c8da2d9bbb072f9f18ca455469b946c877e3006b34ffd2219335b30ba2e0980f43cebfb629d0b11fe70dff28883ca012c6ae4855fcefea20a08e189eaeed7eb36ed6db3835976f4e60053205805727c5eec15d0e9f155637a9e66268b9c1c302bcaae6ae88cbb8cf1668a487cc996c4662c4a4e195f094cb31c717165e0e13718f8388957dfe0bf69c70cd0bd763dc38c530b67b9c12244fcab8bd13f602de848a2937699f9ef77944e5f22e3b470601789e1838fbea9359c733aaee2c7082b02ee459b7684ef9bbc200da4b62d368351f5520a65ffa506dc9b097117bb7ae88d04d85fb525e91327689ec0fe86971480c0e864012b1e9f044c7d80a4e48c07320dd4292086e4c71d4c98dd826a9bfced112bfa2beb1ce85cad204451ec45703931bf637d4fe89fe8f485620b7f4b21e011a232ade7a8c92be77925e878ae0bea9723749528fe83cf89ecb9616dae6ca0e8d5754ec6c92abb21108c2f33cdc18c6887c430b72c5b193356494cddccc577bd4c2cd53188f352846edff0c2ac7869cb74bb16a77c0f0f194a7a9477ae15abb890bd0bcfeb0c39381a87f1d05319c7e971c10e9ef687f96450b400e25b4285032892b849fd5db8649cedfb03c88defea063ee144a1ab1f3bf05f59c7db364dc39c11a446c3ce16307d78d50315ba29f5bb9a57438564c8c7b3e367cd37d74b2375a4966f47489dc5448f4979428abd32193d3840aa983d3020a9f29d760fc7493ab2576c90b1934b799c1d0d55e4f2caa78f4ce61930c79dc017c2dea0c5085d73a3b0e4a6f341e9a5061a6658af11e5edf95bdad915ac3619969e39bee15788a8de667f92f4efc84f35082d52d562aa74e12cc7f22d3425b58f5056d74afcf162cd44e65b9ee510ff91af094c3d2d42c3b088536d62a98f1c689edcf3ea3fc228d711c109d76ae83d82d6a34dcfbad563cf3726519b519fd48b51741aa86720836494b7a589c778927047a25d73508adaa401e9a6c0767a675e31c5556cbe35fadc9671359b45e985c3c8af84113989b299ae4474b85e4b5d4b0578ab1e8a2915a8df97c4f52a639fe32272cb91bbfb721505dec46d51383cb8973425a714245c2e37d0577fbe0d66381d9239db1f08a380cf609dc699698e0fada2caeda44d58d766c4f8214b10642b80b8d7d8add7cc41d47108ab7d07dab71069a2d982cc900b331caec317942122158bac6eac9175c2dcba0c04443aa9188832b553f5ca8c336880824d6bc02486a2b4c086665d276aafe3b1b93729829adca50c44466fd5b5cb977aa78fbcf5c0f0da1b09216468a11493ffb39efdeda5d669ae92bee2f2fb250aa1b9cbb11c36c7a6c6dd26cdc3cfd572ffd8c1dd72a13c27a327a34c6b6b3d80fc6c67c72152eec0c8ecbdc1bd5cb829b811e7f29af6d786f4e93dd4c96fdda295a6aa258d7b2fcf291c2d68e0b1866032475964ec0c6f2fa8c2d6a3936ecb187350def4e818507bf157c0e9b33406be7660605af14cccc9c799b4e051d0d0899e53495bb8931a6e2984bc6dbe4e02ec8b4642fc2f1cb5fd5a5520b48cfcb49e1f9533838753554dd98b6a1b8a67409279df477330e5f37367e06247ca5c3ffefd00e693dcc0c9c30754121c9ee88a574915b9e77c104fd2f921c2c096573951407ba9b440423d76bdc6fc978237a6e302cede7f99038ec31500884775556941f1edc30e3a417b0e02cb6fb5bfbe5cdfacf4006411287bedc565fb06f1be987416407dc852254934df4ab59edce476f3506e65be6ce6ddf91038642291fb8e92ba5b1f0b105670905a2c14796110bac6f52455b430a47b8eff61
-
-Len = 48824
-Msg = cd8490c93613bdf1f284b94b330f6d6f45a39c651d2a160b340e2eb696fc6d1c35e88872845190d141c669de92a97daa5433b1d7b0b899fdef2ce74b8fe72a7296a5b5be26d1dc86520367c730c7400c2fa06f91ab4c48a7bf4ae35a5b9acd5296c4fdf7451b0ad9cc439b4e34f11e5d7ef2bdda376f8dd34d6f092b219dc085dd4c4a6308b8808f588eedbbc7af7f64e83182fc7ca7cf4741a341060a7969d31445834c982fa8739ded4555108acbea1666a83da17f77cc42ee73323eb53203e3b790f81c08e94c44678b6538096ab7b09916e6cf7ceb2af85987f8e4d982dff1ab59b0bdccaae1f405a73366b5c5935dd0b43e2d2894290ceb66a0246dc02de728c5bba30255fb56ce8107c3144246c5156a8fe40ada9126adf67227fa56b66c37be63f532516211ca012977b04a97916f201f1baa2629eda520b51508ab4229df2ceedce406dece0110e0a911464f69e7be38fb91deba0addcdb3161d2799c628f5a57fa1dc37357c947681bd9c36f4832c20ac466c0c245de3b250c33282ea1a02d007f03b34ed427631283eb614db4d521f555136e7e42b4cfbee8134c63dbe3bb79b5a8b9f9f5b9f5ac61cfab1c54d197f1e3ba613f251eed616df952d691b88a16466343ef2d0f63882ddd2d55b8a6786308b2257f5d7b38af166bd7f1339d2d8899c9eda8fa86215850ba547450c267eb3c9147d96c38161a69d1584e521ffa23384313a1debcd37f72ddad02adb3cadce7ee34b7c1f42a15d0d030487daf9488aa7562845a11ee7ffccdb38b300935caa31f78a4ff3dd93403cf0c6a16ca611b58c736aafd33d6dc56f0f47878211d26f6ab801b9453a7f74b44593dae0f047ddbbf2c902891111729edec44f69a05944b18e7a601f41ad24fd6833da3dbe3029bd390de7c9841b2ee2b079b2bd2737518fe1bbec88da64769dc36e4a8bf716c219b2fe059d7dd220c1ed2c59878db5bf8b198e0689edee921ebc0cd2d3853fcf57c363050ce58071c5fda6ebcfbc1bb62e9eb956286291a108bdd4191c4ff47900d6068e1ea26b487649af119b9bb15dfed804836f2196cbe12d8fc86e3d7ce89b52ad49dc9ddbce5b370f73f512bedd853039366612453733740586d1372143b09f21dd4dbe1a2bfc308db8e4098c5e4b0c1e16141ee50e85fafefc4e2529b3c7252af37aee6f86e19df28871686107d7d57dcc812bc077602642d2ecefdd5f694b8f336913210793e4068da2178600b1f41cffb5221c9b4b6298afb47e85701d7b1a44241679d8996f916c81ff437261cfc358b9ec42a2ce16ca3bacb8690d6c1d91cfb3e0bf1e7ba45bd01606df856fd03c7e946f7ab371a89e1fde86d05fdd97bd7b1c583b04c2ed2b5f6815a460645e4e1b4e950bf6bd81dd0352d1048df85266f1696534aff5b1cbc17f15d82cc8e0c0d4f0453f9439094f8e0f7f4bc045b654d9a2f1f44a9c57019f63ecc41021c05b5380675cb56ea8bb691d79ee204d2c4edacde3c1fb3f4996a11d84b035f965e74009e2ab80e2c7ea3c84a834d4971a1e9cf423e4ea67ee526eb3c3e4c2d7372c4290a0741e1fcca5ae4cf36705abe98ac81e98a5419baefcaf3093a7e0449ef1021f88ffb7ad21b2677e41cdda12025b06542c4b2564f15e0b99db43b7c7020028bd829372122cd910227cb07c53cb58fd9dc620c0491f3e2bf883fe6ee8cb1f5b73767977d857e4513e8b5612f6ae4b56014e6a3ad2a065b65472212e2f611743484cfaef860999d1dc5608c58412fab888ad72bb87dd9b55b692f31e252daf8944ec5c02a5a9c23903c50dbd845f2fcc3bc9806af13ca7b025cabe675195b1d56f3fe7d7bca12530bcc0af217efcb03a218bdb6f9726536ea902c8303b02e3ced22be59753588b5f0e2f3419fa5345a942dbcdf3010465384a225ba26cdd0f1d74999c69f336bb6d01fae5cf81cbb8c1a7a29c1eb83ca6b51113bde56b8cfb6a5d72557622a37f039d090a689accd02b57c691174338de8e05bb3620c079705c969c58e56b079dc9eb44eb0fcebe548f5a31f4072a5ed56a2f03107bf40a359b2601eddf53cade66f294cfeaa40a0d94b9c90d15f61852f295d3911f8ea914d015885c8c64540a83badf0021a416c3e37b78236a2ecd1fce4114033416bdd3a36c18ec13250ee9c74c0fc4dd564b3d24a825802d5ae402a53bacace115ae3bbb329be79d1e5e42dbaf0a6446431145fe49b86a8703c7c41f8985d54f12e314c16ff89351d8addf66ebba2783f2d1a11965182aa0b0dd2de53586c5a695c6265c2b173958da648611090557bdebf11a1e042f089fe98e049f4796c60d26be38356fe020d9ace9008410d53a1bb7db78b52ee44bac364213f5c59f1eac4e3314f3423b92fdd7a6156608111ac6ddf58385ec1f3df12061208db98816ac948d803fad10d5ece2018c60faa13de5e5a9033745c824932e53f4122a39f635813545c1b74732cd55642f19ed6deca1585ebf7242c849bde981572a2199066e9c912b2068c8f1c8b936c43ae95c6e22bd7b80dfea05f495d751107da5928e806d0af905c87b5a0795df146af6580d8f9c6a0e2645686d43822ce9b4be0bd5937c097917e048b5af71c7e7521d490f107e9231ee5bd9fbf0727ba87774ed24cd52f471ffb71849ebd55605996515bdcfe95bb1df3541e7c42da4166dd01ec3597634aa6455d15fe14af435e8d7a55ff1682d55a2da867ae63d11fb3fd987fa5d7032ecefc35d3fb9570940e779e13da18070e6df5292f97f2a281f9598101102c955fe4808a2319c85fdef3d55b19e05bb8c2d3da64bafb67a53491513a24f6f0804aa162c8a7db25b38089373fecc45a0eaef65dd9be3b4b7f9436a5423fdcdb5a9b60138fc6a2261225390d9ae0d8ab7f0f7ffff69dca06881d33a637d634358abebb333df41151f239add91abaafc89070cb2159ce3a31655c22e4696c9fa7a7211d1251d4bb21ea4a321a3dbebc29d97f526251e40e548dcd7ed07587719a266f006179dcd22e50b3705152817057b097b043ad63b8d867edc20aea9b4c959ef4ff70f47128cfcc21e31f17978ecacc366f459ac1cc459a3976e4173ca322675f84f18036119ec2f204c3fb554a0b72f7e9d8c882ab147b3d280ca9dff7b9160b1b437b901f03cbc05fe05c6f44824b48aa8da52ae7dda1653fd500f9ccd221843cf76513b3b74d094f14d93a00d7cb954bc4cf2f04f9a35e38edcb1e84f62057647dcb3571f1dd296ca1e049f1746a8a282e85138500e7649db756b2d2ad88f11c471c89dc6be2cd43481013b8d0ae83da2b855cea7be424f8b2325b1850d1fdef03e765458df4513d57c72ba9751e1edc3c4e7f97e3202bb46eec7be89871ba3704aa6c6fc08851e551a3f655fa1fb798d12f003faf31c56b6df399a5dd0ed29ef9e4139dbc254bc5d6051840a859eabaaad56324588fae881fd638d2b70fb3813402df61d941ab495588e5fc3823249bf9a03cf877902394f512de118edaf98843a5445e9073fcfa409df3db0221f1c77e2dd21e74f9e10c9e180dc4ed17010eb949c6d67a22bd5337b2c68f9eccdec778ece728e91353696b742c8f5a3a569f054efb8c1ed478ee9b75e26c768a5816aa6bd08a4c72e745fdb5deb34ecb86b3a84346c1c70f9c16fc45bc0421f0da2f630912d5079f390cc53b78e343310de722b53d2a3b4aa386caa0d7e91986e19c3363426ba30eb5284293af81d00158a3f5233327b40c3b989725ba7dd5b31ac7abf8d3e0b737e843065cd7316dc2f374a00bed4cf9caa0d6e232c854df1bc24c3d484bc6bcb14ec770d5745474dc6ac3b3ddbffc551c9fcc2c56a5e0ae17948457c01e701bf1554022bc2b7d9dd42b2b91172fd85e6874d2d61fc7b3bb3cee2a9bfec09f6d7e98279c6f511f4140b116c856c1438e34bca59fdca2409f025b896a52d68719bf93e82e7d89bbf798991fda0af8d06d17f39eba4bca09c1fe594b537ad4c9b94ab52c895539d639425f9146b24b016368a638e5bba391bc8763cae7c52ff9c496884f1d84e5e08ed451358ecb3c4919dd410e82cac35ae744078287c05c89b42999ea6b8b127d40d53a5722d45139e8bc507a11e7add7fa9ab12cc40afeec008a4668e3e6440f27bb5780936c0e3668ac51262390c79b3f21fd041cf36ba3522f3a552714ff188bfd554c60d0e7d11213cf7d3864a5175d4047c2f3284741f18ec22995a5b82bf62190151bc1529c6d9927f9b0c1dacebd9c2dc406f7f64a973f9a70cff6e3abeebeb46514bbf2ead382f7262d46bd43d88c1b91a9011d1f8ba81fa536a7162aee2b2ec6fc0f2d6efc87b98d2e41e0f946969da659c21053775ece415a34d42b6cfd5bc52259867b411dfb991461ca618052309ca9c96468c2da12dfab0e822ff3bbe7ba281982a239ac19c47024fe1f0e3550cf0975add1f680a9dac9b2c4ab0aed4f409ddda6765eb8a0a9d1e9d07458c69ac8195541219b18efcd06c0001f2ae7fee2d404666a18ca3cb3aa4f0623e86c5b1229f6c2ca28d951111294b91edc52730b6b2c46e000672a7c89b2f38045bd3e37dbb8a75e18687a514dcf740c87a34834d3c3cc8aadf6166ec0c42d2be92f90a3af49633ff23cd80848ceb57ac550eaf9ae496bdc6a2d7cf50fe107895b4a1ed014f78af24eccd6a07420f1dc0df1e7c44b4ba937dd43cab9c798371b148325578d61931766af02b45054bdc2d9fcab2f4b49092f6fff7c27886820739d6140a4a905f0020249e8ae8dd87da1a1e7b1851eb01045aaa72dc8a2bf68055e7aed41d85336648a3405195d2ab61b0e29a770461f32fd05e14c17d72c5252f026a7b9abe7ea9176d3c46f6ed9fb716758d97b41e4f5d81a24538f763d83eecafafc668422612b40cfc32b3354b24755fbe400a2bfed494fe6d0ba0051713b776e67e2f1915e94708e6dc74b398f2f526933aad8fe7dc32faf40022606aebb6e0756b994c3176fae7640ee06d6c67bd54764c4752f1bf831f43e0227cba101174c5554ce26400f333dd8e9f6db1cdf670ce407d7d06c3aef4c0724b62edc8f1ba3e04f0e394d15a73b9255abb4d6ac70303dcf9160d32dc02d4804219ed5c7e3b48402e58ab2f58305f9bb95d2a8759947de96328ed5234cfe7d0b2a9a014df7e4cd0ae48906315f139b8635d2e6bd4aba32e62b8906cdfe5622c411bf0373d0cb07d17bb2bb5b83eae4401c243605fd1df759fd0ddc704ccab5a9776c40fbf6bde0f11b9646c699f26063a9550ac228c9884c277bcadcc0a2c225dc203e28e253c4e464b23d2529d09c7b7dd3c984667372472b615645f294c4e3b0797f9d1c234015b78502d98bfc04f1fa2f16cf3e7221d5794d035e4b172a4d84e679cb1c82df2fb49d3c6668eb1661bed56705096c2371a19d668832808eedd9e5b1256c18fe7ccc494e5e29145d453c553ec86fb7f3a634d0d45661875f2f1005ba5e734c1a976f37cd23450e4606e32d027bc9ec2edd9395e14b2082179bd7b4f9b8caa2d00a2de71d48553f7d4153cb56a1b08f11925e4b11c9281744ae9171f3d6faa3ab3f88c5c34fd23e4f6efeceafdcbc07686ef56efa62c0ad62f1cdcb4d3b5bc508c1f05263bc347158fa5495828f34eb7fcde98fefaa82bafeefed3f4a58968d751c051b52e0047f066de5be533bc3b1e439ab1c8602f6c67503803c8fa113737cb8279f358dbacdf45432b7a654d0e1122cca93420e956661d7275181c75b0d9c20e84c7007dfc49f27bc00007cf4ffa631c892981fd70141d532fcd51de5c23fe0b7a186d0dc296362f235d61698740cc315891cc9342da17843bcde274c17e462263d0e8b4832dd9075a7bbb443d4b26b41e534ad5551ed5ada102175e695363fb48d6b99ac978a3aa6f405d87f983384ce35740e930491d75675337c5dc081e3d301228e61bde5cc169968e5b4350cca2b085f9f75cc4b88497a78cd0a0073d90246c7dc102c7cbf3516498e8a41aa85d8cc5bc285ff66e8338e85ca83fb6889e2bccff52059bb9e92e92c155a349952680ffd0a3c346061a53fdf074417fc90c4d1af7c2acc3ee4b080752cbc9455ba5931b7e910f1e4af0efce905d2cc9c685923ead387fa532c0e8ad92719c76c281cd010e1acce500ae1443838b8afb48af032069dd07aa4df0d56bcb70a64592633699c8658102f1fbca441325e27f1732a7a973d8cb3a0684d72943ef6f1892f2d7ccf39bb6dfe5801ab98653bdbcfbb787bf125253be2624f6cf44177d588bd7b780d9e3f4e3a4e50b8a253fa21abce6a94b9073289c76773b46140f5a6e46b9de9ec066c176f5d1a69f380e1901216617363362d13ebb26ad74fb008ec08841550ff14ca800a1ecf2e007ebaad9f4e0d9664448d60ac0d8544243129fb81c1723b9b4bc2ee971dff736d9fcde0afbfbf5c50a4cc06a4c363998326c17bdc9e2508651dedd9a2a52bd87f8693cfcff60753acf9716c526e8635f12377e36564ae55d0fdb3c7997ec4dbdaa5b4d18c7b660acd95060831795da7d299a5a8d8cf9e92537dbd3ef7f56aebe38fa97c41da6bf0572a0270be7e5a7dcc0be3529339464c811052b65a938e874ea6da469c7d8992ce0aff1c75e82d1621ecb967213c65f2de582cb41de3804c507ddfc708ef3f6096ba4491e431160f98de806d0f334e03cfb7a3bece601099bd971253f3aa0df845da8b478603d5d88533d0cab9c89f2dd9a1404cf8939ffdda652a94093865a85fce2bc3d7babcff7b9f3306bd76b9af80c78ad518f89ee73b7a710da604e72f4927be8d65d06be2e0732fa786a83e27597cfbed9bf98df445499e0746b9f2cb9659ac0a9cef433148521f33b1d78d13c8441c0d1e20fd93ac450a3787a2292bcbd68cd1f961d34937be9a21abaf26f361bf53aa0c095e53c51f3e04d567eabe6e40d96a17c2bcc9230b18f7e079bc549a314b4ae21d30a3341aa205bc75c7f1d21b0a49549c300faeda243d0ce18da5e66c5b663cd705005dd9fea0a9564174abb797d64c58fdab1fae44576d514b75eaa31c9278b15bf9b6df7c6c2873d7a56fb91ab77b83761a09f9e1ddae535622fb87f7462256a60dd39dd3ceb6690b0272920b635ea639daf24f95462c523e5bbd8d8407c61163ab38877d5edfa04c2a78d4d240523ba97c7d01c71783f8748e85164b4dd08c25506a4ed18300b42b7bc6e417f512ae456ceec2ffc83190991a06d4a58ede215babcd3688e1d61f1975016244e80c88ae2aec05c7eeb1c50caca72b3b415b6b870bf5e10bd1ac3ba6b4acb1d1afac554444d94c97e171005fa4ea9c651bb4e527ff58d0c2f90fb453a92d6546a26e9e98395b09e8471bdcf2a145aacb649708cf048a7856ce8cf390c107ff2c66efbf2a76c5b041860ea576103cd8c6b25e50eca9ff6a2fa88083fe9ac0d1fb639c516b9bcdf23c34c6145a705498ff9b9747f15e1c08c63da6efeda4eca02c3f00dfec06c82220c9de840040118dde76be788daf84e6a2f44c81fe6defcc474f99c51c4648d297cbc48f081e0809dbda505d020cbe865e430e0491644ec8c52bd3ab8ce8c4862990f49fe2588caf804ce9500ef42d5a50c057c257168e283e4a4aedbe4ccfaf3eeffb212f9e23d15434d60bf4f455f512e2b655aff3225d1b217c261110cec0400f54dd303d6231d028c2eb649bccc91d30a6391c88bff9d447c3cf35a3467be5957e0ea4d4dc237c9f2c68ce48f658f820a3d72d559b60f233ce538c92cb148808e34fedf2d648c21e7f2ea29a77270c393bda42d869351d6c085d965dc12cbfd0311b8bf604f4391d378781eea3b5f1e0da9d0d8f8de88e56fe47d362cd46f591d3ec0f7cccb85a21f21ddcd4107821ce0ca9ddf99dfdfd9b0c9cd45053e5b1b4385bd8f5b227ada31b5c23e9420014474e8b4494fde7c38edfe70994d97b8cbdfac588df49a49c472fcce78cccc051f31cbbc1e0422878d8d490f3aee28adf1587c38fb7e7d1be54abeaa83cf54b633803a5e669ff4295df8735231ce39631616bd05e0e31117c722c2fd6787003b0bc7fe422a089c89329544e085d71102c1813769450a9f66f160d1702cdb17bd2c6fdf0f722762d193ce83623eeffab17b01b10a31db6e2feb6eb3abdbb2e36320e1a56e44e48d26090afa7f65003a98cbfef590ac3ec89b3eb230557cf6aa566e841806aa2767b21bb26fe001f11ae039e0c9a4bf1bf3d271960f16158eb5bd9ebf0080abd8369d512cab2d1aaae2b14d0ff6ee705a38fb0c801a98b0624cc138fc24834fdf430f33e1760db913da3290f34415c9e3df3e97da1780545ab68ac5a24db89f24d62f4a399728e4144a8c89f47ac2d29e30c49b0bcf790a5e3d3fcd1943c6a28f37251d9dd827a69579e6c17b629c927473b5a07b0a29d9562708d6c8ce576109ad1a3473ffb2047eb069beeec24c114bef392c929038c92abd0e6a19b610e27881361824d57008b7373d0ab76379570ded76c9b8284fe2c247791073c29b2fc6fca05019220ab92856892d3c0dcc6da0b597fe559c162d060d71513ebca050d9638164b9ae271fba5575ade787ec5aee8fc253d1b234b1df561db3e36ac64b9b0100dd6b407043537b2b141f
diff --git a/src/lib/libssl/src/test/cms-examples.pl b/src/lib/libssl/src/test/cms-examples.pl
new file mode 100644
index 0000000000..2e95b48ba4
--- /dev/null
+++ b/src/lib/libssl/src/test/cms-examples.pl
@@ -0,0 +1,409 @@
+# test/cms-examples.pl
+# Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+# project.
+#
+# ====================================================================
+# Copyright (c) 2008 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
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. All advertising materials mentioning features or use of this
+#    software must display the following acknowledgment:
+#    "This product includes software developed by the OpenSSL Project
+#    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+#
+# 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For written permission, please contact
+#    licensing@OpenSSL.org.
+#
+# 5. Products derived from this software may not be called "OpenSSL"
+#    nor may "OpenSSL" appear in their names without prior written
+#    permission of the OpenSSL Project.
+#
+# 6. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by the OpenSSL Project
+#    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+#
+# THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+# ====================================================================
+
+# Perl script to run tests against S/MIME examples in RFC4134
+# Assumes RFC is in current directory and called "rfc4134.txt"
+
+use MIME::Base64;
+
+my $badttest = 0;
+my $verbose  = 1;
+
+my $cmscmd;
+my $exdir  = "./";
+my $exfile = "./rfc4134.txt";
+
+if (-f "../apps/openssl")
+        {
+        $cmscmd = "../util/shlib_wrap.sh ../apps/openssl cms";
+        }
+elsif (-f "..\\out32dll\\openssl.exe")
+        {
+        $cmscmd = "..\\out32dll\\openssl.exe cms";
+        }
+elsif (-f "..\\out32\\openssl.exe")
+        {
+        $cmscmd = "..\\out32\\openssl.exe cms";
+        }
+
+my @test_list = (
+    [ "3.1.bin"  => "dataout" ],
+    [ "3.2.bin"  => "encode, dataout" ],
+    [ "4.1.bin"  => "encode, verifyder, cont, dss" ],
+    [ "4.2.bin"  => "encode, verifyder, cont, rsa" ],
+    [ "4.3.bin"  => "encode, verifyder, cont_extern, dss" ],
+    [ "4.4.bin"  => "encode, verifyder, cont, dss" ],
+    [ "4.5.bin"  => "verifyder, cont, rsa" ],
+    [ "4.6.bin"  => "encode, verifyder, cont, dss" ],
+    [ "4.7.bin"  => "encode, verifyder, cont, dss" ],
+    [ "4.8.eml"  => "verifymime, dss" ],
+    [ "4.9.eml"  => "verifymime, dss" ],
+    [ "4.10.bin" => "encode, verifyder, cont, dss" ],
+    [ "4.11.bin" => "encode, certsout" ],
+    [ "5.1.bin"  => "encode, envelopeder, cont" ],
+    [ "5.2.bin"  => "encode, envelopeder, cont" ],
+    [ "5.3.eml"  => "envelopemime, cont" ],
+    [ "6.0.bin"  => "encode, digest, cont" ],
+    [ "7.1.bin"  => "encode, encrypted, cont" ],
+    [ "7.2.bin"  => "encode, encrypted, cont" ]
+);
+
+# Extract examples from RFC4134 text.
+# Base64 decode all examples, certificates and
+# private keys are converted to PEM format.
+
+my ( $filename, $data );
+
+my @cleanup = ( "cms.out", "cms.err", "tmp.der", "tmp.txt" );
+
+$data = "";
+
+open( IN, $exfile ) || die "Can't Open RFC examples file $exfile";
+
+while (<IN>) {
+    next unless (/^\|/);
+    s/^\|//;
+    next if (/^\*/);
+    if (/^>(.*)$/) {
+        $filename = $1;
+        next;
+    }
+    if (/^</) {
+        $filename = "$exdir/$filename";
+        if ( $filename =~ /\.bin$/ || $filename =~ /\.eml$/ ) {
+            $data = decode_base64($data);
+            open OUT, ">$filename";
+            binmode OUT;
+            print OUT $data;
+            close OUT;
+            push @cleanup, $filename;
+        }
+        elsif ( $filename =~ /\.cer$/ ) {
+            write_pem( $filename, "CERTIFICATE", $data );
+        }
+        elsif ( $filename =~ /\.pri$/ ) {
+            write_pem( $filename, "PRIVATE KEY", $data );
+        }
+        $data     = "";
+        $filename = "";
+    }
+    else {
+        $data .= $_;
+    }
+
+}
+
+my $secretkey =
+  "73:7c:79:1f:25:ea:d0:e0:46:29:25:43:52:f7:dc:62:91:e5:cb:26:91:7a:da:32";
+
+foreach (@test_list) {
+    my ( $file, $tlist ) = @$_;
+    print "Example file $file:\n";
+    if ( $tlist =~ /encode/ ) {
+        run_reencode_test( $exdir, $file );
+    }
+    if ( $tlist =~ /certsout/ ) {
+        run_certsout_test( $exdir, $file );
+    }
+    if ( $tlist =~ /dataout/ ) {
+        run_dataout_test( $exdir, $file );
+    }
+    if ( $tlist =~ /verify/ ) {
+        run_verify_test( $exdir, $tlist, $file );
+    }
+    if ( $tlist =~ /digest/ ) {
+        run_digest_test( $exdir, $tlist, $file );
+    }
+    if ( $tlist =~ /encrypted/ ) {
+        run_encrypted_test( $exdir, $tlist, $file, $secretkey );
+    }
+    if ( $tlist =~ /envelope/ ) {
+        run_envelope_test( $exdir, $tlist, $file );
+    }
+
+}
+
+foreach (@cleanup) {
+    unlink $_;
+}
+
+if ($badtest) {
+    print "\n$badtest TESTS FAILED!!\n";
+}
+else {
+    print "\n***All tests successful***\n";
+}
+
+sub write_pem {
+    my ( $filename, $str, $data ) = @_;
+
+    $filename =~ s/\.[^.]*$/.pem/;
+
+    push @cleanup, $filename;
+
+    open OUT, ">$filename";
+
+    print OUT "-----BEGIN $str-----\n";
+    print OUT $data;
+    print OUT "-----END $str-----\n";
+
+    close OUT;
+}
+
+sub run_reencode_test {
+    my ( $cmsdir, $tfile ) = @_;
+    unlink "tmp.der";
+
+    system( "$cmscmd -cmsout -inform DER -outform DER"
+          . " -in $cmsdir/$tfile -out tmp.der" );
+
+    if ($?) {
+        print "\tReencode command FAILED!!\n";
+        $badtest++;
+    }
+    elsif ( !cmp_files( "$cmsdir/$tfile", "tmp.der" ) ) {
+        print "\tReencode FAILED!!\n";
+        $badtest++;
+    }
+    else {
+        print "\tReencode passed\n" if $verbose;
+    }
+}
+
+sub run_certsout_test {
+    my ( $cmsdir, $tfile ) = @_;
+    unlink "tmp.der";
+    unlink "tmp.pem";
+
+    system( "$cmscmd -cmsout -inform DER -certsout tmp.pem"
+          . " -in $cmsdir/$tfile -out tmp.der" );
+
+    if ($?) {
+        print "\tCertificate output command FAILED!!\n";
+        $badtest++;
+    }
+    else {
+        print "\tCertificate output passed\n" if $verbose;
+    }
+}
+
+sub run_dataout_test {
+    my ( $cmsdir, $tfile ) = @_;
+    unlink "tmp.txt";
+
+    system(
+        "$cmscmd -data_out -inform DER" . " -in $cmsdir/$tfile -out tmp.txt" );
+
+    if ($?) {
+        print "\tDataout command FAILED!!\n";
+        $badtest++;
+    }
+    elsif ( !cmp_files( "$cmsdir/ExContent.bin", "tmp.txt" ) ) {
+        print "\tDataout compare FAILED!!\n";
+        $badtest++;
+    }
+    else {
+        print "\tDataout passed\n" if $verbose;
+    }
+}
+
+sub run_verify_test {
+    my ( $cmsdir, $tlist, $tfile ) = @_;
+    unlink "tmp.txt";
+
+    $form   = "DER"                     if $tlist =~ /verifyder/;
+    $form   = "SMIME"                   if $tlist =~ /verifymime/;
+    $cafile = "$cmsdir/CarlDSSSelf.pem" if $tlist =~ /dss/;
+    $cafile = "$cmsdir/CarlRSASelf.pem" if $tlist =~ /rsa/;
+
+    $cmd =
+        "$cmscmd -verify -inform $form"
+      . " -CAfile $cafile"
+      . " -in $cmsdir/$tfile -out tmp.txt";
+
+    $cmd .= " -content $cmsdir/ExContent.bin" if $tlist =~ /cont_extern/;
+
+    system("$cmd 2>cms.err 1>cms.out");
+
+    if ($?) {
+        print "\tVerify command FAILED!!\n";
+        $badtest++;
+    }
+    elsif ( $tlist =~ /cont/
+        && !cmp_files( "$cmsdir/ExContent.bin", "tmp.txt" ) )
+    {
+        print "\tVerify content compare FAILED!!\n";
+        $badtest++;
+    }
+    else {
+        print "\tVerify passed\n" if $verbose;
+    }
+}
+
+sub run_envelope_test {
+    my ( $cmsdir, $tlist, $tfile ) = @_;
+    unlink "tmp.txt";
+
+    $form = "DER"   if $tlist =~ /envelopeder/;
+    $form = "SMIME" if $tlist =~ /envelopemime/;
+
+    $cmd =
+        "$cmscmd -decrypt -inform $form"
+      . " -recip $cmsdir/BobRSASignByCarl.pem"
+      . " -inkey $cmsdir/BobPrivRSAEncrypt.pem"
+      . " -in $cmsdir/$tfile -out tmp.txt";
+
+    system("$cmd 2>cms.err 1>cms.out");
+
+    if ($?) {
+        print "\tDecrypt command FAILED!!\n";
+        $badtest++;
+    }
+    elsif ( $tlist =~ /cont/
+        && !cmp_files( "$cmsdir/ExContent.bin", "tmp.txt" ) )
+    {
+        print "\tDecrypt content compare FAILED!!\n";
+        $badtest++;
+    }
+    else {
+        print "\tDecrypt passed\n" if $verbose;
+    }
+}
+
+sub run_digest_test {
+    my ( $cmsdir, $tlist, $tfile ) = @_;
+    unlink "tmp.txt";
+
+    my $cmd =
+      "$cmscmd -digest_verify -inform DER" . " -in $cmsdir/$tfile -out tmp.txt";
+
+    system("$cmd 2>cms.err 1>cms.out");
+
+    if ($?) {
+        print "\tDigest verify command FAILED!!\n";
+        $badtest++;
+    }
+    elsif ( $tlist =~ /cont/
+        && !cmp_files( "$cmsdir/ExContent.bin", "tmp.txt" ) )
+    {
+        print "\tDigest verify content compare FAILED!!\n";
+        $badtest++;
+    }
+    else {
+        print "\tDigest verify passed\n" if $verbose;
+    }
+}
+
+sub run_encrypted_test {
+    my ( $cmsdir, $tlist, $tfile, $key ) = @_;
+    unlink "tmp.txt";
+
+    system( "$cmscmd -EncryptedData_decrypt -inform DER"
+          . " -secretkey $key"
+          . " -in $cmsdir/$tfile -out tmp.txt" );
+
+    if ($?) {
+        print "\tEncrypted Data command FAILED!!\n";
+        $badtest++;
+    }
+    elsif ( $tlist =~ /cont/
+        && !cmp_files( "$cmsdir/ExContent.bin", "tmp.txt" ) )
+    {
+        print "\tEncrypted Data content compare FAILED!!\n";
+        $badtest++;
+    }
+    else {
+        print "\tEncryptedData verify passed\n" if $verbose;
+    }
+}
+
+sub cmp_files {
+    my ( $f1, $f2 ) = @_;
+    my ( $fp1, $fp2 );
+
+    my ( $rd1, $rd2 );
+
+    if ( !open( $fp1, "<$f1" ) ) {
+        print STDERR "Can't Open file $f1\n";
+        return 0;
+    }
+
+    if ( !open( $fp2, "<$f2" ) ) {
+        print STDERR "Can't Open file $f2\n";
+        return 0;
+    }
+
+    binmode $fp1;
+    binmode $fp2;
+
+    my $ret = 0;
+
+    for ( ; ; ) {
+        $n1 = sysread $fp1, $rd1, 4096;
+        $n2 = sysread $fp2, $rd2, 4096;
+        last if ( $n1 != $n2 );
+        last if ( $rd1 ne $rd2 );
+
+        if ( $n1 == 0 ) {
+            $ret = 1;
+            last;
+        }
+
+    }
+
+    close $fp1;
+    close $fp2;
+
+    return $ret;
+
+}
+
diff --git a/src/lib/libssl/src/test/cms-test.pl b/src/lib/libssl/src/test/cms-test.pl
new file mode 100644
index 0000000000..a84e089ddc
--- /dev/null
+++ b/src/lib/libssl/src/test/cms-test.pl
@@ -0,0 +1,453 @@
+# test/cms-test.pl
+# Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+# project.
+#
+# ====================================================================
+# Copyright (c) 2008 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
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. All advertising materials mentioning features or use of this
+#    software must display the following acknowledgment:
+#    "This product includes software developed by the OpenSSL Project
+#    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+#
+# 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission. For written permission, please contact
+#    licensing@OpenSSL.org.
+#
+# 5. Products derived from this software may not be called "OpenSSL"
+#    nor may "OpenSSL" appear in their names without prior written
+#    permission of the OpenSSL Project.
+#
+# 6. Redistributions of any form whatsoever must retain the following
+#    acknowledgment:
+#    "This product includes software developed by the OpenSSL Project
+#    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+#
+# THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+# OF THE POSSIBILITY OF SUCH DAMAGE.
+# ====================================================================
+
+# CMS, PKCS7 consistency test script. Run extensive tests on
+# OpenSSL PKCS#7 and CMS implementations.
+
+my $ossl_path;
+
+if ( -f "../apps/openssl" ) {
+    $ossl_path = "../util/shlib_wrap.sh ../apps/openssl";
+}
+elsif ( -f "..\\out32dll\\openssl.exe" ) {
+    $ossl_path = "..\\out32dll\\openssl.exe";
+}
+elsif ( -f "..\\out32\\openssl.exe" ) {
+    $ossl_path = "..\\out32\\openssl.exe";
+}
+else {
+    die "Can't find OpenSSL executable";
+}
+
+my $pk7cmd   = "$ossl_path smime ";
+my $cmscmd   = "$ossl_path cms ";
+my $smdir    = "smime-certs";
+my $halt_err = 1;
+
+my $badcmd = 0;
+my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
+
+my @smime_pkcs7_tests = (
+
+    [
+        "signed content DER format, RSA key",
+        "-sign -in smcont.txt -outform DER -nodetach"
+          . " -certfile $smdir/smroot.pem"
+          . " -signer $smdir/smrsa1.pem -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "signed detached content DER format, RSA key",
+        "-sign -in smcont.txt -outform DER"
+          . " -signer $smdir/smrsa1.pem -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
+    ],
+
+    [
+        "signed content test streaming BER format, RSA",
+        "-sign -in smcont.txt -outform DER -nodetach"
+          . " -stream -signer $smdir/smrsa1.pem -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "signed content DER format, DSA key",
+        "-sign -in smcont.txt -outform DER -nodetach"
+          . " -signer $smdir/smdsa1.pem -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "signed detached content DER format, DSA key",
+        "-sign -in smcont.txt -outform DER"
+          . " -signer $smdir/smdsa1.pem -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
+    ],
+
+    [
+        "signed detached content DER format, add RSA signer",
+        "-resign -inform DER -in test.cms -outform DER"
+          . " -signer $smdir/smrsa1.pem -out test2.cms",
+        "-verify -in test2.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt -content smcont.txt"
+    ],
+
+    [
+        "signed content test streaming BER format, DSA key",
+        "-sign -in smcont.txt -outform DER -nodetach"
+          . " -stream -signer $smdir/smdsa1.pem -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "signed content test streaming BER format, 2 DSA and 2 RSA keys",
+        "-sign -in smcont.txt -outform DER -nodetach"
+          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
+          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
+          . " -stream -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+"signed content test streaming BER format, 2 DSA and 2 RSA keys, no attributes",
+        "-sign -in smcont.txt -outform DER -noattr -nodetach"
+          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
+          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
+          . " -stream -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "signed content test streaming S/MIME format, 2 DSA and 2 RSA keys",
+        "-sign -in smcont.txt -nodetach"
+          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
+          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
+          . " -stream -out test.cms",
+        "-verify -in test.cms " . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+"signed content test streaming multipart S/MIME format, 2 DSA and 2 RSA keys",
+        "-sign -in smcont.txt"
+          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
+          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
+          . " -stream -out test.cms",
+        "-verify -in test.cms " . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "enveloped content test streaming S/MIME format, 3 recipients",
+        "-encrypt -in smcont.txt"
+          . " -stream -out test.cms"
+          . " $smdir/smrsa1.pem $smdir/smrsa2.pem $smdir/smrsa3.pem ",
+        "-decrypt -recip $smdir/smrsa1.pem -in test.cms -out smtst.txt"
+    ],
+
+    [
+"enveloped content test streaming S/MIME format, 3 recipients, 3rd used",
+        "-encrypt -in smcont.txt"
+          . " -stream -out test.cms"
+          . " $smdir/smrsa1.pem $smdir/smrsa2.pem $smdir/smrsa3.pem ",
+        "-decrypt -recip $smdir/smrsa3.pem -in test.cms -out smtst.txt"
+    ],
+
+    [
+"enveloped content test streaming S/MIME format, 3 recipients, key only used",
+        "-encrypt -in smcont.txt"
+          . " -stream -out test.cms"
+          . " $smdir/smrsa1.pem $smdir/smrsa2.pem $smdir/smrsa3.pem ",
+        "-decrypt -inkey $smdir/smrsa3.pem -in test.cms -out smtst.txt"
+    ],
+
+    [
+"enveloped content test streaming S/MIME format, AES-256 cipher, 3 recipients",
+        "-encrypt -in smcont.txt"
+          . " -aes256 -stream -out test.cms"
+          . " $smdir/smrsa1.pem $smdir/smrsa2.pem $smdir/smrsa3.pem ",
+        "-decrypt -recip $smdir/smrsa1.pem -in test.cms -out smtst.txt"
+    ],
+
+);
+
+my @smime_cms_tests = (
+
+    [
+        "signed content test streaming BER format, 2 DSA and 2 RSA keys, keyid",
+        "-sign -in smcont.txt -outform DER -nodetach -keyid"
+          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
+          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
+          . " -stream -out test.cms",
+        "-verify -in test.cms -inform DER "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "signed content test streaming PEM format, 2 DSA and 2 RSA keys",
+        "-sign -in smcont.txt -outform PEM -nodetach"
+          . " -signer $smdir/smrsa1.pem -signer $smdir/smrsa2.pem"
+          . " -signer $smdir/smdsa1.pem -signer $smdir/smdsa2.pem"
+          . " -stream -out test.cms",
+        "-verify -in test.cms -inform PEM "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "signed content MIME format, RSA key, signed receipt request",
+        "-sign -in smcont.txt -signer $smdir/smrsa1.pem -nodetach"
+          . " -receipt_request_to test@openssl.org -receipt_request_all"
+          . " -out test.cms",
+        "-verify -in test.cms "
+          . " -CAfile $smdir/smroot.pem -out smtst.txt"
+    ],
+
+    [
+        "signed receipt MIME format, RSA key",
+        "-sign_receipt -in test.cms"
+          . " -signer $smdir/smrsa2.pem"
+          . " -out test2.cms",
+        "-verify_receipt test2.cms -in test.cms"
+          . " -CAfile $smdir/smroot.pem"
+    ],
+
+    [
+        "enveloped content test streaming S/MIME format, 3 recipients, keyid",
+        "-encrypt -in smcont.txt"
+          . " -stream -out test.cms -keyid"
+          . " $smdir/smrsa1.pem $smdir/smrsa2.pem $smdir/smrsa3.pem ",
+        "-decrypt -recip $smdir/smrsa1.pem -in test.cms -out smtst.txt"
+    ],
+
+    [
+        "enveloped content test streaming PEM format, KEK",
+        "-encrypt -in smcont.txt -outform PEM -aes128"
+          . " -stream -out test.cms "
+          . " -secretkey 000102030405060708090A0B0C0D0E0F "
+          . " -secretkeyid C0FEE0",
+        "-decrypt -in test.cms -out smtst.txt -inform PEM"
+          . " -secretkey 000102030405060708090A0B0C0D0E0F "
+          . " -secretkeyid C0FEE0"
+    ],
+
+    [
+        "enveloped content test streaming PEM format, KEK, key only",
+        "-encrypt -in smcont.txt -outform PEM -aes128"
+          . " -stream -out test.cms "
+          . " -secretkey 000102030405060708090A0B0C0D0E0F "
+          . " -secretkeyid C0FEE0",
+        "-decrypt -in test.cms -out smtst.txt -inform PEM"
+          . " -secretkey 000102030405060708090A0B0C0D0E0F "
+    ],
+
+    [
+        "data content test streaming PEM format",
+        "-data_create -in smcont.txt -outform PEM -nodetach"
+          . " -stream -out test.cms",
+        "-data_out -in test.cms -inform PEM -out smtst.txt"
+    ],
+
+    [
+        "encrypted content test streaming PEM format, 128 bit RC2 key",
+        "-EncryptedData_encrypt -in smcont.txt -outform PEM"
+          . " -rc2 -secretkey 000102030405060708090A0B0C0D0E0F"
+          . " -stream -out test.cms",
+        "-EncryptedData_decrypt -in test.cms -inform PEM "
+          . " -secretkey 000102030405060708090A0B0C0D0E0F -out smtst.txt"
+    ],
+
+    [
+        "encrypted content test streaming PEM format, 40 bit RC2 key",
+        "-EncryptedData_encrypt -in smcont.txt -outform PEM"
+          . " -rc2 -secretkey 0001020304"
+          . " -stream -out test.cms",
+        "-EncryptedData_decrypt -in test.cms -inform PEM "
+          . " -secretkey 0001020304 -out smtst.txt"
+    ],
+
+    [
+        "encrypted content test streaming PEM format, triple DES key",
+        "-EncryptedData_encrypt -in smcont.txt -outform PEM"
+          . " -des3 -secretkey 000102030405060708090A0B0C0D0E0F1011121314151617"
+          . " -stream -out test.cms",
+        "-EncryptedData_decrypt -in test.cms -inform PEM "
+          . " -secretkey 000102030405060708090A0B0C0D0E0F1011121314151617"
+          . " -out smtst.txt"
+    ],
+
+    [
+        "encrypted content test streaming PEM format, 128 bit AES key",
+        "-EncryptedData_encrypt -in smcont.txt -outform PEM"
+          . " -aes128 -secretkey 000102030405060708090A0B0C0D0E0F"
+          . " -stream -out test.cms",
+        "-EncryptedData_decrypt -in test.cms -inform PEM "
+          . " -secretkey 000102030405060708090A0B0C0D0E0F -out smtst.txt"
+    ],
+
+);
+
+my @smime_cms_comp_tests = (
+
+    [
+        "compressed content test streaming PEM format",
+        "-compress -in smcont.txt -outform PEM -nodetach"
+          . " -stream -out test.cms",
+        "-uncompress -in test.cms -inform PEM -out smtst.txt"
+    ]
+
+);
+
+print "PKCS#7 <=> PKCS#7 consistency tests\n";
+
+run_smime_tests( \$badcmd, \@smime_pkcs7_tests, $pk7cmd, $pk7cmd );
+
+print "CMS => PKCS#7 compatibility tests\n";
+
+run_smime_tests( \$badcmd, \@smime_pkcs7_tests, $cmscmd, $pk7cmd );
+
+print "CMS <= PKCS#7 compatibility tests\n";
+
+run_smime_tests( \$badcmd, \@smime_pkcs7_tests, $pk7cmd, $cmscmd );
+
+print "CMS <=> CMS consistency tests\n";
+
+run_smime_tests( \$badcmd, \@smime_pkcs7_tests, $cmscmd, $cmscmd );
+run_smime_tests( \$badcmd, \@smime_cms_tests,   $cmscmd, $cmscmd );
+
+if ( `$ossl_path version -f` =~ /ZLIB/ ) {
+    run_smime_tests( \$badcmd, \@smime_cms_comp_tests, $cmscmd, $cmscmd );
+}
+else {
+    print "Zlib not supported: compression tests skipped\n";
+}
+
+print "Running modified tests for OpenSSL 0.9.8 cms backport\n" if($ossl8);
+
+if ($badcmd) {
+    print "$badcmd TESTS FAILED!!\n";
+}
+else {
+    print "ALL TESTS SUCCESSFUL.\n";
+}
+
+unlink "test.cms";
+unlink "test2.cms";
+unlink "smtst.txt";
+unlink "cms.out";
+unlink "cms.err";
+
+sub run_smime_tests {
+    my ( $rv, $aref, $scmd, $vcmd ) = @_;
+
+    foreach $smtst (@$aref) {
+        my ( $tnam, $rscmd, $rvcmd ) = @$smtst;
+        if ($ossl8)
+                {
+                # Skip smime resign: 0.9.8 smime doesn't support -resign        
+                next if ($scmd =~ /smime/ && $rscmd =~ /-resign/);
+                # Disable streaming: option not supported in 0.9.8
+                $tnam =~ s/streaming//; 
+                $rscmd =~ s/-stream//;  
+                $rvcmd =~ s/-stream//;
+                }
+        system("$scmd$rscmd 2>cms.err 1>cms.out");
+        if ($?) {
+            print "$tnam: generation error\n";
+            $$rv++;
+            exit 1 if $halt_err;
+            next;
+        }
+        system("$vcmd$rvcmd 2>cms.err 1>cms.out");
+        if ($?) {
+            print "$tnam: verify error\n";
+            $$rv++;
+            exit 1 if $halt_err;
+            next;
+        }
+        if (!cmp_files("smtst.txt", "smcont.txt")) {
+            print "$tnam: content verify error\n";
+            $$rv++;
+            exit 1 if $halt_err;
+            next;
+        }
+        print "$tnam: OK\n";
+    }
+}
+
+sub cmp_files {
+    my ( $f1, $f2 ) = @_;
+    my ( $fp1, $fp2 );
+
+    my ( $rd1, $rd2 );
+
+    if ( !open( $fp1, "<$f1" ) ) {
+        print STDERR "Can't Open file $f1\n";
+        return 0;
+    }
+
+    if ( !open( $fp2, "<$f2" ) ) {
+        print STDERR "Can't Open file $f2\n";
+        return 0;
+    }
+
+    binmode $fp1;
+    binmode $fp2;
+
+    my $ret = 0;
+
+    for ( ; ; ) {
+        $n1 = sysread $fp1, $rd1, 4096;
+        $n2 = sysread $fp2, $rd2, 4096;
+        last if ( $n1 != $n2 );
+        last if ( $rd1 ne $rd2 );
+
+        if ( $n1 == 0 ) {
+            $ret = 1;
+            last;
+        }
+
+    }
+
+    close $fp1;
+    close $fp2;
+
+    return $ret;
+
+}
+
diff --git a/src/lib/libssl/src/test/igetest.c b/src/lib/libssl/src/test/igetest.c
new file mode 100644
index 0000000000..95452d0965
--- /dev/null
+++ b/src/lib/libssl/src/test/igetest.c
@@ -0,0 +1,503 @@
+/* test/igetest.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#include <openssl/aes.h>
+#include <openssl/rand.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#define TEST_SIZE       128
+#define BIG_TEST_SIZE 10240
+
+static void hexdump(FILE *f,const char *title,const unsigned char *s,int l)
+    {
+    int n=0;
+
+    fprintf(f,"%s",title);
+    for( ; n < l ; ++n)
+                {
+                if((n%16) == 0)
+                        fprintf(f,"\n%04x",n);
+                fprintf(f," %02x",s[n]);
+                }
+    fprintf(f,"\n");
+    }
+
+#define MAX_VECTOR_SIZE 64
+
+struct ige_test
+        {
+        const unsigned char key[16];
+        const unsigned char iv[32];
+        const unsigned char in[MAX_VECTOR_SIZE];
+        const unsigned char out[MAX_VECTOR_SIZE];
+        const size_t length;
+        const int encrypt;
+        };
+
+static struct ige_test const ige_test_vectors[] = {
+{ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, /* key */
+  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, /* iv */
+  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* in */
+  { 0x1a, 0x85, 0x19, 0xa6, 0x55, 0x7b, 0xe6, 0x52,
+    0xe9, 0xda, 0x8e, 0x43, 0xda, 0x4e, 0xf4, 0x45,
+    0x3c, 0xf4, 0x56, 0xb4, 0xca, 0x48, 0x8a, 0xa3,
+    0x83, 0xc7, 0x9c, 0x98, 0xb3, 0x47, 0x97, 0xcb }, /* out */
+  32, AES_ENCRYPT }, /* test vector 0 */
+
+{ { 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
+    0x61, 0x6e, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65 }, /* key */
+  { 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
+    0x6e, 0x20, 0x6f, 0x66, 0x20, 0x49, 0x47, 0x45,
+    0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x66, 0x6f,
+    0x72, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x53 }, /* iv */
+  { 0x4c, 0x2e, 0x20, 0x4c, 0x65, 0x74, 0x27, 0x73,
+    0x20, 0x68, 0x6f, 0x70, 0x65, 0x20, 0x42, 0x65,
+    0x6e, 0x20, 0x67, 0x6f, 0x74, 0x20, 0x69, 0x74,
+    0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x21, 0x0a }, /* in */
+  { 0x99, 0x70, 0x64, 0x87, 0xa1, 0xcd, 0xe6, 0x13,
+    0xbc, 0x6d, 0xe0, 0xb6, 0xf2, 0x4b, 0x1c, 0x7a,
+    0xa4, 0x48, 0xc8, 0xb9, 0xc3, 0x40, 0x3e, 0x34,
+    0x67, 0xa8, 0xca, 0xd8, 0x93, 0x40, 0xf5, 0x3b }, /* out */
+  32, AES_DECRYPT }, /* test vector 1 */
+};
+
+struct bi_ige_test
+        {
+        const unsigned char key1[32];
+        const unsigned char key2[32];
+        const unsigned char iv[64];
+        const unsigned char in[MAX_VECTOR_SIZE];
+        const unsigned char out[MAX_VECTOR_SIZE];
+        const size_t keysize;
+        const size_t length;
+        const int encrypt;
+        };
+
+static struct bi_ige_test const bi_ige_test_vectors[] = {
+{ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, /* key1 */
+  { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, /* key2 */
+  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f }, /* iv */
+  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* in */
+  { 0x14, 0x40, 0x6f, 0xae, 0xa2, 0x79, 0xf2, 0x56,
+        0x1f, 0x86, 0xeb, 0x3b, 0x7d, 0xff, 0x53, 0xdc,
+        0x4e, 0x27, 0x0c, 0x03, 0xde, 0x7c, 0xe5, 0x16,
+        0x6a, 0x9c, 0x20, 0x33, 0x9d, 0x33, 0xfe, 0x12 }, /* out */
+  16, 32, AES_ENCRYPT }, /* test vector 0 */
+{ { 0x58, 0x0a, 0x06, 0xe9, 0x97, 0x07, 0x59, 0x5c,
+        0x9e, 0x19, 0xd2, 0xa7, 0xbb, 0x40, 0x2b, 0x7a,
+        0xc7, 0xd8, 0x11, 0x9e, 0x4c, 0x51, 0x35, 0x75,
+        0x64, 0x28, 0x0f, 0x23, 0xad, 0x74, 0xac, 0x37 }, /* key1 */
+  { 0xd1, 0x80, 0xa0, 0x31, 0x47, 0xa3, 0x11, 0x13,
+        0x86, 0x26, 0x9e, 0x6d, 0xff, 0xaf, 0x72, 0x74,
+        0x5b, 0xa2, 0x35, 0x81, 0xd2, 0xa6, 0x3d, 0x21,
+        0x67, 0x7b, 0x58, 0xa8, 0x18, 0xf9, 0x72, 0xe4 }, /* key2 */
+  { 0x80, 0x3d, 0xbd, 0x4c, 0xe6, 0x7b, 0x06, 0xa9,
+        0x53, 0x35, 0xd5, 0x7e, 0x71, 0xc1, 0x70, 0x70,
+        0x74, 0x9a, 0x00, 0x28, 0x0c, 0xbf, 0x6c, 0x42,
+        0x9b, 0xa4, 0xdd, 0x65, 0x11, 0x77, 0x7c, 0x67,
+        0xfe, 0x76, 0x0a, 0xf0, 0xd5, 0xc6, 0x6e, 0x6a,
+        0xe7, 0x5e, 0x4c, 0xf2, 0x7e, 0x9e, 0xf9, 0x20,
+        0x0e, 0x54, 0x6f, 0x2d, 0x8a, 0x8d, 0x7e, 0xbd,
+        0x48, 0x79, 0x37, 0x99, 0xff, 0x27, 0x93, 0xa3 }, /* iv */
+  { 0xf1, 0x54, 0x3d, 0xca, 0xfe, 0xb5, 0xef, 0x1c,
+        0x4f, 0xa6, 0x43, 0xf6, 0xe6, 0x48, 0x57, 0xf0,
+        0xee, 0x15, 0x7f, 0xe3, 0xe7, 0x2f, 0xd0, 0x2f,
+        0x11, 0x95, 0x7a, 0x17, 0x00, 0xab, 0xa7, 0x0b,
+        0xbe, 0x44, 0x09, 0x9c, 0xcd, 0xac, 0xa8, 0x52,
+        0xa1, 0x8e, 0x7b, 0x75, 0xbc, 0xa4, 0x92, 0x5a,
+        0xab, 0x46, 0xd3, 0x3a, 0xa0, 0xd5, 0x35, 0x1c,
+        0x55, 0xa4, 0xb3, 0xa8, 0x40, 0x81, 0xa5, 0x0b}, /* in */
+  { 0x42, 0xe5, 0x28, 0x30, 0x31, 0xc2, 0xa0, 0x23,
+        0x68, 0x49, 0x4e, 0xb3, 0x24, 0x59, 0x92, 0x79,
+        0xc1, 0xa5, 0xcc, 0xe6, 0x76, 0x53, 0xb1, 0xcf,
+        0x20, 0x86, 0x23, 0xe8, 0x72, 0x55, 0x99, 0x92,
+        0x0d, 0x16, 0x1c, 0x5a, 0x2f, 0xce, 0xcb, 0x51,
+        0xe2, 0x67, 0xfa, 0x10, 0xec, 0xcd, 0x3d, 0x67,
+        0xa5, 0xe6, 0xf7, 0x31, 0x26, 0xb0, 0x0d, 0x76,
+        0x5e, 0x28, 0xdc, 0x7f, 0x01, 0xc5, 0xa5, 0x4c}, /* out */
+  32, 64, AES_ENCRYPT }, /* test vector 1 */
+
+};
+
+static int run_test_vectors(void)
+        {
+        int n;
+        int errs = 0;
+
+        for(n=0 ; n < sizeof(ige_test_vectors)/sizeof(ige_test_vectors[0]) ; ++n)
+                {
+                const struct ige_test * const v = &ige_test_vectors[n];
+                AES_KEY key;
+                unsigned char buf[MAX_VECTOR_SIZE];
+                unsigned char iv[AES_BLOCK_SIZE*2];
+
+                assert(v->length <= MAX_VECTOR_SIZE);
+
+                if(v->encrypt == AES_ENCRYPT)
+                        AES_set_encrypt_key(v->key, 8*sizeof v->key, &key);
+                else
+                        AES_set_decrypt_key(v->key, 8*sizeof v->key, &key);
+                memcpy(iv, v->iv, sizeof iv);
+                AES_ige_encrypt(v->in, buf, v->length, &key, iv, v->encrypt);
+
+                if(memcmp(v->out, buf, v->length))
+                        {
+                        printf("IGE test vector %d failed\n", n);
+                        hexdump(stdout, "key", v->key, sizeof v->key);
+                        hexdump(stdout, "iv", v->iv, sizeof v->iv);
+                        hexdump(stdout, "in", v->in, v->length);
+                        hexdump(stdout, "expected", v->out, v->length);
+                        hexdump(stdout, "got", buf, v->length);
+
+                        ++errs;
+                        }
+
+                /* try with in == out */
+                memcpy(iv, v->iv, sizeof iv);
+                memcpy(buf, v->in, v->length);
+                AES_ige_encrypt(buf, buf, v->length, &key, iv, v->encrypt);
+
+                if(memcmp(v->out, buf, v->length))
+                        {
+                        printf("IGE test vector %d failed (with in == out)\n", n);
+                        hexdump(stdout, "key", v->key, sizeof v->key);
+                        hexdump(stdout, "iv", v->iv, sizeof v->iv);
+                        hexdump(stdout, "in", v->in, v->length);
+                        hexdump(stdout, "expected", v->out, v->length);
+                        hexdump(stdout, "got", buf, v->length);
+
+                        ++errs;
+                        }
+                }
+
+        for(n=0 ; n < sizeof(bi_ige_test_vectors)/sizeof(bi_ige_test_vectors[0])
+                        ; ++n)
+                {
+                const struct bi_ige_test * const v = &bi_ige_test_vectors[n];
+                AES_KEY key1;
+                AES_KEY key2;
+                unsigned char buf[MAX_VECTOR_SIZE];
+
+                assert(v->length <= MAX_VECTOR_SIZE);
+
+                if(v->encrypt == AES_ENCRYPT)
+                        {
+                        AES_set_encrypt_key(v->key1, 8*v->keysize, &key1);
+                        AES_set_encrypt_key(v->key2, 8*v->keysize, &key2);
+                        }
+                else
+                        {
+                        AES_set_decrypt_key(v->key1, 8*v->keysize, &key1);
+                        AES_set_decrypt_key(v->key2, 8*v->keysize, &key2);
+                        }
+
+                AES_bi_ige_encrypt(v->in, buf, v->length, &key1, &key2, v->iv,
+                                                   v->encrypt);
+
+                if(memcmp(v->out, buf, v->length))
+                        {
+                        printf("Bidirectional IGE test vector %d failed\n", n);
+                        hexdump(stdout, "key 1", v->key1, sizeof v->key1);
+                        hexdump(stdout, "key 2", v->key2, sizeof v->key2);
+                        hexdump(stdout, "iv", v->iv, sizeof v->iv);
+                        hexdump(stdout, "in", v->in, v->length);
+                        hexdump(stdout, "expected", v->out, v->length);
+                        hexdump(stdout, "got", buf, v->length);
+
+                        ++errs;
+                        }
+                }
+
+        return errs;
+        }
+
+int main(int argc, char **argv)
+        {
+        unsigned char rkey[16];
+        unsigned char rkey2[16];
+        AES_KEY key;
+        AES_KEY key2;
+        unsigned char plaintext[BIG_TEST_SIZE];
+        unsigned char ciphertext[BIG_TEST_SIZE];
+        unsigned char checktext[BIG_TEST_SIZE];
+        unsigned char iv[AES_BLOCK_SIZE*4];
+        unsigned char saved_iv[AES_BLOCK_SIZE*4];
+        int err = 0;
+        int n;
+        unsigned matches;
+
+        assert(BIG_TEST_SIZE >= TEST_SIZE);
+
+        RAND_pseudo_bytes(rkey, sizeof rkey);
+        RAND_pseudo_bytes(plaintext, sizeof plaintext);
+        RAND_pseudo_bytes(iv, sizeof iv);
+        memcpy(saved_iv, iv, sizeof saved_iv);
+
+        /* Forward IGE only... */
+
+        /* Straight encrypt/decrypt */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, iv,
+                                        AES_ENCRYPT);
+
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, iv,
+                                        AES_DECRYPT);
+
+        if(memcmp(checktext, plaintext, TEST_SIZE))
+                {
+                printf("Encrypt+decrypt doesn't match\n");
+                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
+                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
+                ++err;
+                }
+
+        /* Now check encrypt chaining works */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE/2, &key, iv,
+                                        AES_ENCRYPT);
+        AES_ige_encrypt(plaintext+TEST_SIZE/2,
+                                        ciphertext+TEST_SIZE/2, TEST_SIZE/2,
+                                        &key, iv, AES_ENCRYPT);
+
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, iv,
+                                        AES_DECRYPT);
+
+        if(memcmp(checktext, plaintext, TEST_SIZE))
+                {
+                printf("Chained encrypt+decrypt doesn't match\n");
+                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
+                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
+                ++err;
+                }
+
+        /* And check decrypt chaining */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE/2, &key, iv,
+                                        AES_ENCRYPT);
+        AES_ige_encrypt(plaintext+TEST_SIZE/2,
+                                        ciphertext+TEST_SIZE/2, TEST_SIZE/2,
+                                        &key, iv, AES_ENCRYPT);
+
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE/2, &key, iv,
+                                        AES_DECRYPT);
+        AES_ige_encrypt(ciphertext+TEST_SIZE/2,
+                                        checktext+TEST_SIZE/2, TEST_SIZE/2, &key, iv,
+                                        AES_DECRYPT);
+
+        if(memcmp(checktext, plaintext, TEST_SIZE))
+                {
+                printf("Chained encrypt+chained decrypt doesn't match\n");
+                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
+                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
+                ++err;
+                }
+
+        /* make sure garble extends forwards only */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
+                                        AES_ENCRYPT);
+
+        /* corrupt halfway through */
+        ++ciphertext[sizeof ciphertext/2];
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
+                                        AES_DECRYPT);
+
+        matches=0;
+        for(n=0 ; n < sizeof checktext ; ++n)
+                if(checktext[n] == plaintext[n])
+                        ++matches;
+
+        if(matches > sizeof checktext/2+sizeof checktext/100)
+                {
+                printf("More than 51%% matches after garbling\n");
+                ++err;
+                }
+
+        if(matches < sizeof checktext/2)
+                {
+                printf("Garble extends backwards!\n");
+                ++err;
+                }
+
+        /* Bi-directional IGE */
+
+        /* Note that we don't have to recover the IV, because chaining isn't */
+        /* possible with biIGE, so the IV is not updated. */
+
+        RAND_pseudo_bytes(rkey2, sizeof rkey2);
+
+        /* Straight encrypt/decrypt */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_bi_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, &key2, iv,
+                                           AES_ENCRYPT);
+
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_bi_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, &key2, iv,
+                                           AES_DECRYPT);
+
+        if(memcmp(checktext, plaintext, TEST_SIZE))
+                {
+                printf("Encrypt+decrypt doesn't match\n");
+                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
+                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
+                ++err;
+                }
+
+        /* make sure garble extends both ways */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
+                                        AES_ENCRYPT);
+
+        /* corrupt halfway through */
+        ++ciphertext[sizeof ciphertext/2];
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
+                                        AES_DECRYPT);
+
+        matches=0;
+        for(n=0 ; n < sizeof checktext ; ++n)
+                if(checktext[n] == plaintext[n])
+                        ++matches;
+
+        if(matches > sizeof checktext/100)
+                {
+                printf("More than 1%% matches after bidirectional garbling\n");
+                ++err;
+                }
+
+        /* make sure garble extends both ways (2) */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
+                                        AES_ENCRYPT);
+
+        /* corrupt right at the end */
+        ++ciphertext[sizeof ciphertext-1];
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
+                                        AES_DECRYPT);
+
+        matches=0;
+        for(n=0 ; n < sizeof checktext ; ++n)
+                if(checktext[n] == plaintext[n])
+                        ++matches;
+
+        if(matches > sizeof checktext/100)
+                {
+                printf("More than 1%% matches after bidirectional garbling (2)\n");
+                ++err;
+                }
+
+        /* make sure garble extends both ways (3) */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
+                                        AES_ENCRYPT);
+
+        /* corrupt right at the start */
+        ++ciphertext[0];
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
+                                        AES_DECRYPT);
+
+        matches=0;
+        for(n=0 ; n < sizeof checktext ; ++n)
+                if(checktext[n] == plaintext[n])
+                        ++matches;
+
+        if(matches > sizeof checktext/100)
+                {
+                printf("More than 1%% matches after bidirectional garbling (3)\n");
+                ++err;
+                }
+
+        err += run_test_vectors();
+
+        return err;
+        }
diff --git a/src/lib/libssl/src/test/smcont.txt b/src/lib/libssl/src/test/smcont.txt
new file mode 100644
index 0000000000..e837c0b75b
--- /dev/null
+++ b/src/lib/libssl/src/test/smcont.txt
@@ -0,0 +1 @@
+Some test content for OpenSSL CMS
\ No newline at end of file
diff --git a/src/lib/libssl/src/test/smime-certs/smdsa1.pem b/src/lib/libssl/src/test/smime-certs/smdsa1.pem
new file mode 100644
index 0000000000..d5677dbfbe
--- /dev/null
+++ b/src/lib/libssl/src/test/smime-certs/smdsa1.pem
@@ -0,0 +1,34 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBuwIBAAKBgQDFJfsIPOIawMO5biw+AoYUhNVxReBOLQosU3Qv4B8krac0BNr3
+OjSGLh1wZxHqhlAE0QmasTaKojuk20nNWeFnczSz6vDl0IVJEhS8VYor5kt9gLqt
+GcoAgsf4gRDIutJyQDaNn3IVY89uXUVIoexvQeLQDBCgQPC5O8rJdqBwtwIVAK2J
+jt+dqk07eQUE59koYUEKyNorAoGBAI4IEpusf8G14kCHmRtnHXM2tG5EWJDmW6Qt
+wjqvWp1GKUx5WFy1tVWR9nl5rL0Di+kNdENo+SkKj7h3uDulGOI6T0mQYbV2h1IK
++FMOGnOqvZ8eNTE2n4PGTo5puZ63LBm+QYrQsrNiUY4vakLFQ2rEK/SLwdsDFK4Z
+SJCBQw5zAoGATQlPPF+OeU8nu3rsdXGDiZdJzOkuCce3KQfTABA9C+Dk4CVcvBdd
+YRLGpnykumkNTO1sTO+4/Gphsuje1ujK9td4UEhdYqylCe5QjEMrszDlJtelDQF9
+C0yhdjKGTP0kxofLhsGckcuQvcKEKffT2pDDKJIy4vWQO0UyJl1vjLcCFG2uiGGx
+9fMUZq1v0ePD4Wo0Xkxo
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAw2gAwIBAgIJAMtotfHYdEsWMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKEw1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDExRUZXN0IFMv
+TUlNRSBSU0EgUm9vdDAeFw0wODAyMjIxMzUzMDlaFw0xNjA1MTAxMzUzMDlaMEUx
+CzAJBgNVBAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMR4wHAYDVQQDDBVU
+ZXN0IFMvTUlNRSBFRSBEU0EgIzEwggG3MIIBLAYHKoZIzjgEATCCAR8CgYEAxSX7
+CDziGsDDuW4sPgKGFITVcUXgTi0KLFN0L+AfJK2nNATa9zo0hi4dcGcR6oZQBNEJ
+mrE2iqI7pNtJzVnhZ3M0s+rw5dCFSRIUvFWKK+ZLfYC6rRnKAILH+IEQyLrSckA2
+jZ9yFWPPbl1FSKHsb0Hi0AwQoEDwuTvKyXagcLcCFQCtiY7fnapNO3kFBOfZKGFB
+CsjaKwKBgQCOCBKbrH/BteJAh5kbZx1zNrRuRFiQ5lukLcI6r1qdRilMeVhctbVV
+kfZ5eay9A4vpDXRDaPkpCo+4d7g7pRjiOk9JkGG1dodSCvhTDhpzqr2fHjUxNp+D
+xk6OabmetywZvkGK0LKzYlGOL2pCxUNqxCv0i8HbAxSuGUiQgUMOcwOBhAACgYBN
+CU88X455Tye7eux1cYOJl0nM6S4Jx7cpB9MAED0L4OTgJVy8F11hEsamfKS6aQ1M
+7WxM77j8amGy6N7W6Mr213hQSF1irKUJ7lCMQyuzMOUm16UNAX0LTKF2MoZM/STG
+h8uGwZyRy5C9woQp99PakMMokjLi9ZA7RTImXW+Mt6OBgzCBgDAdBgNVHQ4EFgQU
+4Qfbhpi5yqXaXuCLXj427mR25MkwHwYDVR0jBBgwFoAUE89Lp7uJLrM4Vxd2xput
+aFvl7RcwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBsAwIAYDVR0RBBkwF4EV
+c21pbWVkc2ExQG9wZW5zc2wub3JnMA0GCSqGSIb3DQEBBQUAA4GBAFrdUzKK1pWO
+kd02S423KUBc4GWWyiGlVoEO7WxVhHLJ8sm67X7OtJOwe0UGt+Nc5qLtyJYSirw8
+phjiTdNpQCTJ8+Kc56tWkJ6H7NAI4vTJtPL5BM/EmeYrVSU9JI9xhqpyKw9IBD+n
+hRJ79W9FaiJRvaAOX+TkyTukJrxAWRyv
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/test/smime-certs/smdsa2.pem b/src/lib/libssl/src/test/smime-certs/smdsa2.pem
new file mode 100644
index 0000000000..ef86c115d7
--- /dev/null
+++ b/src/lib/libssl/src/test/smime-certs/smdsa2.pem
@@ -0,0 +1,34 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBvAIBAAKBgQDFJfsIPOIawMO5biw+AoYUhNVxReBOLQosU3Qv4B8krac0BNr3
+OjSGLh1wZxHqhlAE0QmasTaKojuk20nNWeFnczSz6vDl0IVJEhS8VYor5kt9gLqt
+GcoAgsf4gRDIutJyQDaNn3IVY89uXUVIoexvQeLQDBCgQPC5O8rJdqBwtwIVAK2J
+jt+dqk07eQUE59koYUEKyNorAoGBAI4IEpusf8G14kCHmRtnHXM2tG5EWJDmW6Qt
+wjqvWp1GKUx5WFy1tVWR9nl5rL0Di+kNdENo+SkKj7h3uDulGOI6T0mQYbV2h1IK
++FMOGnOqvZ8eNTE2n4PGTo5puZ63LBm+QYrQsrNiUY4vakLFQ2rEK/SLwdsDFK4Z
+SJCBQw5zAoGBAIPmO8BtJ+Yac58trrPwq9b/6VW3jQTWzTLWSH84/QQdqQa+Pz3v
+It/+hHM0daNF5uls8ICsPL1aLXmRx0pHvIyb0aAzYae4T4Jv/COPDMTdKbA1uitJ
+VbkGZrm+LIrs7I9lOkb4T0vI6kL/XdOCXY1469zsqCgJ/O2ibn6mq0nWAhR716o2
+Nf8SimTZYB0/CKje6M5ufA==
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDpTCCAw6gAwIBAgIJAMtotfHYdEsXMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKEw1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDExRUZXN0IFMv
+TUlNRSBSU0EgUm9vdDAeFw0wODAyMjIxMzUzMDlaFw0xNjA1MTAxMzUzMDlaMEUx
+CzAJBgNVBAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMR4wHAYDVQQDDBVU
+ZXN0IFMvTUlNRSBFRSBEU0EgIzIwggG4MIIBLAYHKoZIzjgEATCCAR8CgYEAxSX7
+CDziGsDDuW4sPgKGFITVcUXgTi0KLFN0L+AfJK2nNATa9zo0hi4dcGcR6oZQBNEJ
+mrE2iqI7pNtJzVnhZ3M0s+rw5dCFSRIUvFWKK+ZLfYC6rRnKAILH+IEQyLrSckA2
+jZ9yFWPPbl1FSKHsb0Hi0AwQoEDwuTvKyXagcLcCFQCtiY7fnapNO3kFBOfZKGFB
+CsjaKwKBgQCOCBKbrH/BteJAh5kbZx1zNrRuRFiQ5lukLcI6r1qdRilMeVhctbVV
+kfZ5eay9A4vpDXRDaPkpCo+4d7g7pRjiOk9JkGG1dodSCvhTDhpzqr2fHjUxNp+D
+xk6OabmetywZvkGK0LKzYlGOL2pCxUNqxCv0i8HbAxSuGUiQgUMOcwOBhQACgYEA
+g+Y7wG0n5hpzny2us/Cr1v/pVbeNBNbNMtZIfzj9BB2pBr4/Pe8i3/6EczR1o0Xm
+6WzwgKw8vVoteZHHSke8jJvRoDNhp7hPgm/8I48MxN0psDW6K0lVuQZmub4siuzs
+j2U6RvhPS8jqQv9d04JdjXjr3OyoKAn87aJufqarSdajgYMwgYAwHQYDVR0OBBYE
+FHsAGNfVltSYUq4hC+YVYwsYtA+dMB8GA1UdIwQYMBaAFBPPS6e7iS6zOFcXdsab
+rWhb5e0XMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgbAMCAGA1UdEQQZMBeB
+FXNtaW1lZHNhMkBvcGVuc3NsLm9yZzANBgkqhkiG9w0BAQUFAAOBgQCx9BtCbaYF
+FXjLClkuKXbESaDZA1biPgY25i00FsUzARuhCpqD2v+0tu5c33ZzIhL6xlvBRU5l
+6Atw/xpZhae+hdBEtxPJoGekLLrHOau7Md3XwDjV4lFgcEJkWZoaSOOIK+4D5jF0
+jZWtHjnwEzuLYlo7ScHSsbcQfjH0M1TP5A==
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/test/smime-certs/smdsa3.pem b/src/lib/libssl/src/test/smime-certs/smdsa3.pem
new file mode 100644
index 0000000000..eeb848dabc
--- /dev/null
+++ b/src/lib/libssl/src/test/smime-certs/smdsa3.pem
@@ -0,0 +1,34 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBvAIBAAKBgQDFJfsIPOIawMO5biw+AoYUhNVxReBOLQosU3Qv4B8krac0BNr3
+OjSGLh1wZxHqhlAE0QmasTaKojuk20nNWeFnczSz6vDl0IVJEhS8VYor5kt9gLqt
+GcoAgsf4gRDIutJyQDaNn3IVY89uXUVIoexvQeLQDBCgQPC5O8rJdqBwtwIVAK2J
+jt+dqk07eQUE59koYUEKyNorAoGBAI4IEpusf8G14kCHmRtnHXM2tG5EWJDmW6Qt
+wjqvWp1GKUx5WFy1tVWR9nl5rL0Di+kNdENo+SkKj7h3uDulGOI6T0mQYbV2h1IK
++FMOGnOqvZ8eNTE2n4PGTo5puZ63LBm+QYrQsrNiUY4vakLFQ2rEK/SLwdsDFK4Z
+SJCBQw5zAoGAYzOpPmh8Je1IDauEXhgaLz14wqYUHHcrj2VWVJ6fRm8GhdQFJSI7
+GUk08pgKZSKic2lNqxuzW7/vFxKQ/nvzfytY16b+2i+BR4Q6yvMzCebE1hHVg0Ju
+TwfUMwoFEOhYP6ZwHSUiQl9IBMH9TNJCMwYMxfY+VOrURFsjGTRUgpwCFQCIGt5g
+Y+XZd0Sv69CatDIRYWvaIA==
+-----END DSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAw2gAwIBAgIJAMtotfHYdEsYMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKEw1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDExRUZXN0IFMv
+TUlNRSBSU0EgUm9vdDAeFw0wODAyMjIxMzUzMDlaFw0xNjA1MTAxMzUzMDlaMEUx
+CzAJBgNVBAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMR4wHAYDVQQDDBVU
+ZXN0IFMvTUlNRSBFRSBEU0EgIzMwggG3MIIBLAYHKoZIzjgEATCCAR8CgYEAxSX7
+CDziGsDDuW4sPgKGFITVcUXgTi0KLFN0L+AfJK2nNATa9zo0hi4dcGcR6oZQBNEJ
+mrE2iqI7pNtJzVnhZ3M0s+rw5dCFSRIUvFWKK+ZLfYC6rRnKAILH+IEQyLrSckA2
+jZ9yFWPPbl1FSKHsb0Hi0AwQoEDwuTvKyXagcLcCFQCtiY7fnapNO3kFBOfZKGFB
+CsjaKwKBgQCOCBKbrH/BteJAh5kbZx1zNrRuRFiQ5lukLcI6r1qdRilMeVhctbVV
+kfZ5eay9A4vpDXRDaPkpCo+4d7g7pRjiOk9JkGG1dodSCvhTDhpzqr2fHjUxNp+D
+xk6OabmetywZvkGK0LKzYlGOL2pCxUNqxCv0i8HbAxSuGUiQgUMOcwOBhAACgYBj
+M6k+aHwl7UgNq4ReGBovPXjCphQcdyuPZVZUnp9GbwaF1AUlIjsZSTTymAplIqJz
+aU2rG7Nbv+8XEpD+e/N/K1jXpv7aL4FHhDrK8zMJ5sTWEdWDQm5PB9QzCgUQ6Fg/
+pnAdJSJCX0gEwf1M0kIzBgzF9j5U6tREWyMZNFSCnKOBgzCBgDAdBgNVHQ4EFgQU
+VhpVXqQ/EzUMdxLvP7o9EhJ8h70wHwYDVR0jBBgwFoAUE89Lp7uJLrM4Vxd2xput
+aFvl7RcwDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBsAwIAYDVR0RBBkwF4EV
+c21pbWVkc2EzQG9wZW5zc2wub3JnMA0GCSqGSIb3DQEBBQUAA4GBACM9e75EQa8m
+k/AZkH/tROqf3yeqijULl9x8FjFatqoY+29OM6oMGM425IqSkKd2ipz7OxO0SShu
+rE0O3edS7DvYBwvhWPviRaYBMyZ4iFJVup+fOzoYK/j/bASxS3BHQBwb2r4rhe25
+OlTyyFEk7DJyW18YFOG97S1P52oQ5f5x
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/test/smime-certs/smdsap.pem b/src/lib/libssl/src/test/smime-certs/smdsap.pem
new file mode 100644
index 0000000000..249706c8c7
--- /dev/null
+++ b/src/lib/libssl/src/test/smime-certs/smdsap.pem
@@ -0,0 +1,9 @@
+-----BEGIN DSA PARAMETERS-----
+MIIBHwKBgQDFJfsIPOIawMO5biw+AoYUhNVxReBOLQosU3Qv4B8krac0BNr3OjSG
+Lh1wZxHqhlAE0QmasTaKojuk20nNWeFnczSz6vDl0IVJEhS8VYor5kt9gLqtGcoA
+gsf4gRDIutJyQDaNn3IVY89uXUVIoexvQeLQDBCgQPC5O8rJdqBwtwIVAK2Jjt+d
+qk07eQUE59koYUEKyNorAoGBAI4IEpusf8G14kCHmRtnHXM2tG5EWJDmW6Qtwjqv
+Wp1GKUx5WFy1tVWR9nl5rL0Di+kNdENo+SkKj7h3uDulGOI6T0mQYbV2h1IK+FMO
+GnOqvZ8eNTE2n4PGTo5puZ63LBm+QYrQsrNiUY4vakLFQ2rEK/SLwdsDFK4ZSJCB
+Qw5z
+-----END DSA PARAMETERS-----
diff --git a/src/lib/libssl/src/test/smime-certs/smroot.pem b/src/lib/libssl/src/test/smime-certs/smroot.pem
new file mode 100644
index 0000000000..a59eb2684c
--- /dev/null
+++ b/src/lib/libssl/src/test/smime-certs/smroot.pem
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDBV1Z/Q5gPF7lojc8pKUdyz5+Jf2B3vs4he6egekugWnoJduki
+9Lnae/JchB/soIX0co3nLc11NuFFlnAWJNMDJr08l5AHAJLYNHevF5l/f9oDQwvZ
+speKh1xpIAJNqCTzVeQ/ZLx6/GccIXV/xDuKIiovqJTPgR5WPkYKaw++lQIDAQAB
+AoGALXnUj5SflJU4+B2652ydMKUjWl0KnL/VjkyejgGV/j6py8Ybaixz9q8Gv7oY
+JDlRqMC1HfZJCFQDQrHy5VJ+CywA/H9WrqKo/Ch9U4tJAZtkig1Cmay/BAYixVu0
+xBeim10aKF6hxHH4Chg9We+OCuzWBWJhqveNjuDedL/i7JUCQQDlejovcwBUCbhJ
+U12qKOwlaboolWbl7yF3XdckTJZg7+1UqQHZH5jYZlLZyZxiaC92SNV0SyTLJZnS
+Jh5CO+VDAkEA16/pPcuVtMMz/R6SSPpRSIAa1stLs0mFSs3NpR4pdm0n42mu05pO
+1tJEt3a1g7zkreQBf53+Dwb+lA841EkjRwJBAIFmt0DifKDnCkBu/jZh9SfzwsH3
+3Zpzik+hXxxdA7+ODCrdUul449vDd5zQD5t+XKU61QNLDGhxv5e9XvrCg7kCQH/a
+3ldsVF0oDaxxL+QkxoREtCQ5tLEd1u7F2q6Tl56FDE0pe6Ih6bQ8RtG+g9EI60IN
+U7oTrOO5kLWx5E0q4ccCQAZVgoenn9MhRU1agKOCuM6LT2DxReTu4XztJzynej+8
+0J93n3ebanB1MlRpn1XJwhQ7gAC8ImaQKLJK5jdJzFc=
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICaTCCAdKgAwIBAgIJAP6VN47boiXRMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKEw1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDExRUZXN0IFMv
+TUlNRSBSU0EgUm9vdDAeFw0wODAyMjIxMzUzMDdaFw0xNjA1MTExMzUzMDdaMEQx
+CzAJBgNVBAYTAlVLMRYwFAYDVQQKEw1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDExRU
+ZXN0IFMvTUlNRSBSU0EgUm9vdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
+wVdWf0OYDxe5aI3PKSlHcs+fiX9gd77OIXunoHpLoFp6CXbpIvS52nvyXIQf7KCF
+9HKN5y3NdTbhRZZwFiTTAya9PJeQBwCS2DR3rxeZf3/aA0ML2bKXiodcaSACTagk
+81XkP2S8evxnHCF1f8Q7iiIqL6iUz4EeVj5GCmsPvpUCAwEAAaNjMGEwHQYDVR0O
+BBYEFBPPS6e7iS6zOFcXdsabrWhb5e0XMB8GA1UdIwQYMBaAFBPPS6e7iS6zOFcX
+dsabrWhb5e0XMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqG
+SIb3DQEBBQUAA4GBAIECprq5viDvnDbkyOaiSr9ubMUmWqvycfAJMdPZRKcOZczS
+l+L9R9lF3JSqbt3knOe9u6bGDBOTY2285PdCCuHRVMk2Af1f6El1fqAlRUwNqipp
+r68sWFuRqrcRNtk6QQvXfkOhrqQBuDa7te/OVQLa2lGN9Dr2mQsD8ijctatG
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/test/smime-certs/smrsa1.pem b/src/lib/libssl/src/test/smime-certs/smrsa1.pem
new file mode 100644
index 0000000000..2cf3148e33
--- /dev/null
+++ b/src/lib/libssl/src/test/smime-certs/smrsa1.pem
@@ -0,0 +1,31 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQC6A978j4pmPgUtUQqF+bjh6vdhwGOGZSD7xXgFTMjm88twfv+E
+ixkq2KXSDjD0ZXoQbdOaSbvGRQrIJpG2NGiKAFdYNrP025kCCdh5wF/aEI7KLEm7
+JlHwXpQsuj4wkMgmkFjL3Ty4Z55aNH+2pPQIa0k+ENJXm2gDuhqgBmduAwIDAQAB
+AoGBAJMuYu51aO2THyeHGwt81uOytcCbqGP7eoib62ZOJhxPRGYjpmuqX+R9/V5i
+KiwGavm63JYUx0WO9YP+uIZxm1BUATzkgkS74u5LP6ajhkZh6/Bck1oIYYkbVOXl
+JVrdENuH6U7nupznsyYgONByo+ykFPVUGmutgiaC7NMVo/MxAkEA6KLejWXdCIEn
+xr7hGph9NlvY9xuRIMexRV/WrddcFfCdjI1PciIupgrIkR65M9yr7atm1iU6/aRf
+KOr8rLZsSQJBAMyyXN71NsDNx4BP6rtJ/LJMP0BylznWkA7zWfGCbAYn9VhZVlSY
+Eu9Gyr7quD1ix7G3kInKVYOEEOpockBLz+sCQQCedyMmKjcQLfpMVYW8uhbAynvW
+h36qV5yXZxszO7nMcCTBsxhk5IfmLv5EbCs3+p9avCDGyoGOeUMg+kC33WORAkAg
+oUIarH4o5+SoeJTTfCzTA0KF9H5U0vYt2+73h7HOnWoHxl3zqDZEfEVvf50U8/0f
+QELDJETTbScBJtsnkq43AkEA38etvoZ2i4FJvvo7R/9gWBHVEcrGzcsCBYrNnIR1
+SZLRwHEGaiOK1wxMsWzqp7PJwL9z/M8A8DyOFBx3GPOniA==
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICizCCAfSgAwIBAgIJAMtotfHYdEsTMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKEw1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDExRUZXN0IFMv
+TUlNRSBSU0EgUm9vdDAeFw0wODAyMjIxMzUzMDhaFw0xNjA1MTAxMzUzMDhaMEUx
+CzAJBgNVBAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMR4wHAYDVQQDDBVU
+ZXN0IFMvTUlNRSBFRSBSU0EgIzEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALoD3vyPimY+BS1RCoX5uOHq92HAY4ZlIPvFeAVMyObzy3B+/4SLGSrYpdIOMPRl
+ehBt05pJu8ZFCsgmkbY0aIoAV1g2s/TbmQIJ2HnAX9oQjsosSbsmUfBelCy6PjCQ
+yCaQWMvdPLhnnlo0f7ak9AhrST4Q0lebaAO6GqAGZ24DAgMBAAGjgYMwgYAwHQYD
+VR0OBBYEFE2vMvKz5jrC7Lbdg68XwZ95iL/QMB8GA1UdIwQYMBaAFBPPS6e7iS6z
+OFcXdsabrWhb5e0XMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXgMCAGA1Ud
+EQQZMBeBFXNtaW1lcnNhMUBvcGVuc3NsLm9yZzANBgkqhkiG9w0BAQUFAAOBgQAi
+O3GOkUl646oLnOimc36i9wxZ1tejsqs8vMjJ0Pym6Uq9FE2JoGzJ6OhB1GOsEVmj
+9cQ5UNQcRYL3cqOFtl6f4Dpu/lhzfbaqgmLjv29G1mS0uuTZrixhlyCXjwcbOkNC
+I/+wvHHENYIK5+T/79M9LaZ2Qk4F9MNE1VMljdz9Qw==
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/test/smime-certs/smrsa2.pem b/src/lib/libssl/src/test/smime-certs/smrsa2.pem
new file mode 100644
index 0000000000..d41f69c82f
--- /dev/null
+++ b/src/lib/libssl/src/test/smime-certs/smrsa2.pem
@@ -0,0 +1,31 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCwBfryW4Vu5U9wNIDKspJO/N9YF4CcTlrCUyzVlKgb+8urHlSe
+59i5verR9IOCCXkemjOzZ/3nALTGqYZlnEvHp0Rjk+KdKXnKBIB+SRPpeu3LcXMT
+WPgsThPa0UQxedNKG0g6aG+kLhsDlFBCoxd09jJtSpb9jmroJOq0ZYEHLwIDAQAB
+AoGAKa/w4677Je1W5+r3SYoLDnvi5TkDs4D3C6ipKJgBTEdQz+DqB4w/DpZE4551
++rkFn1LDxcxuHGRVa+tAMhZW97fwq9YUbjVZEyOz79qrX+BMyl/NbHkf1lIKDo3q
+dWalzQvop7nbzeLC+VmmviwZfLQUbA61AQl3jm4dswT4XykCQQDloDadEv/28NTx
+bvvywvyGuvJkCkEIycm4JrIInvwsd76h/chZ3oymrqzc7hkEtK6kThqlS5y+WXl6
+QzPruTKTAkEAxD2ro/VUoN+scIVaLmn0RBmZ67+9Pdn6pNSfjlK3s0T0EM6/iUWS
+M06l6L9wFS3/ceu1tIifsh9BeqOGTa+udQJARIFnybTBaIqw/NZ/lA1YCVn8tpvY
+iyaoZ6gjtS65TQrsdKeh/i3HCHNUXxUpoZ3F/H7QtD+6o49ODou+EbVOwQJAVmex
+A2gp8wuJKaINqxIL81AybZLnCCzKJ3lXJ5tUNyLNM/lUbGStktm2Q1zHRQwTxV07
+jFn7trn8YrtNjzcjYQJAUKIJRt38A8Jw3HoPT+D0WS2IgxjVL0eYGsZX1lyeammG
+6rfnQ3u5uP7mEK2EH2o8mDUpAE0gclWBU9UkKxJsGA==
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICizCCAfSgAwIBAgIJAMtotfHYdEsUMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKEw1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDExRUZXN0IFMv
+TUlNRSBSU0EgUm9vdDAeFw0wODAyMjIxMzUzMDhaFw0xNjA1MTAxMzUzMDhaMEUx
+CzAJBgNVBAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMR4wHAYDVQQDDBVU
+ZXN0IFMvTUlNRSBFRSBSU0EgIzIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALAF+vJbhW7lT3A0gMqykk7831gXgJxOWsJTLNWUqBv7y6seVJ7n2Lm96tH0g4IJ
+eR6aM7Nn/ecAtMaphmWcS8enRGOT4p0pecoEgH5JE+l67ctxcxNY+CxOE9rRRDF5
+00obSDpob6QuGwOUUEKjF3T2Mm1Klv2Oaugk6rRlgQcvAgMBAAGjgYMwgYAwHQYD
+VR0OBBYEFIL/u+mEvaw7RuKLRuElfVkxSQjYMB8GA1UdIwQYMBaAFBPPS6e7iS6z
+OFcXdsabrWhb5e0XMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXgMCAGA1Ud
+EQQZMBeBFXNtaW1lcnNhMkBvcGVuc3NsLm9yZzANBgkqhkiG9w0BAQUFAAOBgQC2
+rXR5bm/9RtOMQPleNpd3y6uUX3oy+0CafK5Yl3PMnItjjnKJ0l1/DbLbDj2twehe
+ewaB8CROcBCA3AMLSmGvPKgUCFMGtWam3328M4fBHzon5ka7qDXzM+imkAly/Yx2
+YNdR/aNOug+5sXygHmTSKqiCpQjOIClzXoPVVeEVHw==
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/test/smime-certs/smrsa3.pem b/src/lib/libssl/src/test/smime-certs/smrsa3.pem
new file mode 100644
index 0000000000..c8cbe55151
--- /dev/null
+++ b/src/lib/libssl/src/test/smime-certs/smrsa3.pem
@@ -0,0 +1,31 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQC6syTZtZNe1hRScFc4PUVyVLsr7+C1HDIZnOHmwFoLayX6RHwy
+ep/TkdwiPHnemVLuwvpSjLMLZkXy/J764kSHJrNeVl3UvmCVCOm40hAtK1+F39pM
+h8phkbPPD7i+hwq4/Vs79o46nzwbVKmzgoZBJhZ+codujUSYM3LjJ4aq+wIDAQAB
+AoGAE1Zixrnr3bLGwBMqtYSDIOhtyos59whImCaLr17U9MHQWS+mvYO98if1aQZi
+iQ/QazJ+wvYXxWJ+dEB+JvYwqrGeuAU6He/rAb4OShG4FPVU2D19gzRnaButWMeT
+/1lgXV08hegGBL7RQNaN7b0viFYMcKnSghleMP0/q+Y/oaECQQDkXEwDYJW13X9p
+ijS20ykWdY5lLknjkHRhhOYux0rlhOqsyMZjoUmwI2m0qj9yrIysKhrk4MZaM/uC
+hy0xp3hdAkEA0Uv/UY0Kwsgc+W6YxeypECtg1qCE6FBib8n4iFy/6VcWqhvE5xrs
+OdhKv9/p6aLjLneGd1sU+F8eS9LGyKIbNwJBAJPgbNzXA7uUZriqZb5qeTXxBDfj
+RLfXSHYKAKEULxz3+JvRHB9SR4yHMiFrCdExiZrHXUkPgYLSHLGG5a4824UCQD6T
+9XvhquUARkGCAuWy0/3Eqoihp/t6BWSdQ9Upviu7YUhtUxsyXo0REZB7F4pGrJx5
+GlhXgFaewgUzuUHFzlMCQCzJMMWslWpoLntnR6sMhBMhBFHSw+Y5CbxBmFrdtSkd
+VdtNO1VuDCTxjjW7W3Khj7LX4KZ1ye/5jfAgnnnXisc=
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIICizCCAfSgAwIBAgIJAMtotfHYdEsVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
+BAYTAlVLMRYwFAYDVQQKEw1PcGVuU1NMIEdyb3VwMR0wGwYDVQQDExRUZXN0IFMv
+TUlNRSBSU0EgUm9vdDAeFw0wODAyMjIxMzUzMDlaFw0xNjA1MTAxMzUzMDlaMEUx
+CzAJBgNVBAYTAlVLMRYwFAYDVQQKDA1PcGVuU1NMIEdyb3VwMR4wHAYDVQQDDBVU
+ZXN0IFMvTUlNRSBFRSBSU0EgIzMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALqzJNm1k17WFFJwVzg9RXJUuyvv4LUcMhmc4ebAWgtrJfpEfDJ6n9OR3CI8ed6Z
+Uu7C+lKMswtmRfL8nvriRIcms15WXdS+YJUI6bjSEC0rX4Xf2kyHymGRs88PuL6H
+Crj9Wzv2jjqfPBtUqbOChkEmFn5yh26NRJgzcuMnhqr7AgMBAAGjgYMwgYAwHQYD
+VR0OBBYEFDsSFjNtYZzd0tTHafNS7tneQQj6MB8GA1UdIwQYMBaAFBPPS6e7iS6z
+OFcXdsabrWhb5e0XMAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXgMCAGA1Ud
+EQQZMBeBFXNtaW1lcnNhM0BvcGVuc3NsLm9yZzANBgkqhkiG9w0BAQUFAAOBgQBE
+tUDB+1Dqigu4p1xtdq7JRK6S+gfA7RWmhz0j2scb2zhpS12h37JLHsidGeKAzZYq
+jUjOrH/j3xcV5AnuJoqImJaN23nzzxtR4qGGX2mrq6EtObzdEGgCUaizsGM+0slJ
+PYxcy8KeY/63B1BpYhj2RjGkL6HrvuAaxVORa3acoA==
+-----END CERTIFICATE-----
diff --git a/src/lib/libssl/src/test/testfipsssl b/src/lib/libssl/src/test/testfipsssl
deleted file mode 100644
index c4836edc25..0000000000
--- a/src/lib/libssl/src/test/testfipsssl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "" ]; then
-  key=../apps/server.pem
-else
-  key="$1"
-fi
-if [ "$2" = "" ]; then
-  cert=../apps/server.pem
-else
-  cert="$2"
-fi
-
-ciphers="DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:EXP1024-DHE-DSS-DES-CBC-SHA:EXP1024-DES-CBC-SHA:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA"
-
-ssltest="../util/shlib_wrap.sh ./ssltest -F -key $key -cert $cert -c_key $key -c_cert $cert -cipher $ciphers"
-
-if ../util/shlib_wrap.sh ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then
-  dsa_cert=YES
-else
-  dsa_cert=NO
-fi
-
-if [ "$3" = "" ]; then
-  CA="-CApath ../certs"
-else
-  CA="-CAfile $3"
-fi
-
-if [ "$4" = "" ]; then
-  extra=""
-else
-  extra="$4"
-fi
-
-#############################################################################
-
-echo test ssl3 is forbidden in FIPS mode
-$ssltest -ssl3 $extra && exit 1
-
-echo test ssl2 is forbidden in FIPS mode
-$ssltest -ssl2 $extra && exit 1
-
-echo test tls1
-$ssltest -tls1 $extra || exit 1
-
-echo test tls1 with server authentication
-$ssltest -tls1 -server_auth $CA $extra || exit 1
-
-echo test tls1 with client authentication
-$ssltest -tls1 -client_auth $CA $extra || exit 1
-
-echo test tls1 with both client and server authentication
-$ssltest -tls1 -server_auth -client_auth $CA $extra || exit 1
-
-echo test tls1 via BIO pair
-$ssltest -bio_pair -tls1 $extra || exit 1
-
-echo test tls1 with server authentication via BIO pair
-$ssltest -bio_pair -tls1 -server_auth $CA $extra || exit 1
-
-echo test tls1 with client authentication via BIO pair
-$ssltest -bio_pair -tls1 -client_auth $CA $extra || exit 1
-
-echo test tls1 with both client and server authentication via BIO pair
-$ssltest -bio_pair -tls1 -server_auth -client_auth $CA $extra || exit 1
-
-# note that all the below actually choose TLS...
-
-if [ $dsa_cert = NO ]; then
-  echo test sslv2/sslv3 w/o DHE via BIO pair
-  $ssltest -bio_pair -no_dhe $extra || exit 1
-fi
-
-echo test sslv2/sslv3 with 1024bit DHE via BIO pair
-$ssltest -bio_pair -dhe1024dsa -v $extra || exit 1
-
-echo test sslv2/sslv3 with server authentication
-$ssltest -bio_pair -server_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with client authentication via BIO pair
-$ssltest -bio_pair -client_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication via BIO pair
-$ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication via BIO pair and app verify
-$ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
-
-#############################################################################
-
-if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
-  echo skipping anonymous DH tests
-else
-  echo test tls1 with 1024bit anonymous DH, multiple handshakes
-  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
-fi
-
-if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then
-  echo skipping RSA tests
-else
-  echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
-  ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
-
-  if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
-    echo skipping RSA+DHE tests
-  else
-    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
-    ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
-  fi
-fi
-
-exit 0
diff --git a/src/lib/libssl/src/util/checkhash.pl b/src/lib/libssl/src/util/checkhash.pl
deleted file mode 100644
index c61fa72178..0000000000
--- a/src/lib/libssl/src/util/checkhash.pl
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env perl -w
-
-my $package = caller;
-
-if (!(defined $package))
-        {
-        my $retval = check_hashes(@ARGV);
-        exit $retval;
-        }
-
-1;
-
-sub check_hashes
-        {
-
-        my @args = @_;
-
-        my $change_dir = "";
-        my $check_program = "sha/fips_standalone_sha1";
-
-        my $verbose = 0;
-        my $badfiles = 0;
-        my $rebuild = 0;
-        my $force_rewrite = 0;
-        my $hash_file = "fipshashes.c";
-        my $recurse = 0;
-
-        my @fingerprint_files;
-
-        while (@args)
-                {
-                my $arg = $args[0];
-                if ($arg eq "-chdir")
-                        {
-                        shift @args;
-                        $change_dir = shift @args;
-                        }
-                elsif ($arg eq "-rebuild")
-                        {
-                        shift @args;
-                        $rebuild = 1;
-                        }
-                elsif ($arg eq "-verbose")
-                        {
-                        shift @args;
-                        $verbose = 1;
-                        }
-                elsif ($arg eq "-force-rewrite")
-                        {
-                        shift @args;
-                        $force_rewrite = 1;
-                        }
-                elsif ($arg eq "-hash_file")
-                        {
-                        shift @args;
-                        $hash_file = shift @args;
-                        }
-                elsif ($arg eq "-recurse")
-                        {
-                        shift @args;
-                        $recurse = 1;
-                        }
-                elsif ($arg eq "-program_path")
-                        {
-                        shift @args;
-                        $check_program = shift @args;
-                        }
-                else
-                        {
-                        print STDERR "Unknown Option $arg";
-                        return 1;
-                        }
-
-                }
-
-        chdir $change_dir if $change_dir ne "";
-
-        if ($recurse)
-                {
-                @fingerprint_files = ("fingerprint.sha1",
-                                        <*/fingerprint.sha1>);
-                }
-        else
-                {
-                push @fingerprint_files, $hash_file;
-                }
-
-        foreach $fp (@fingerprint_files)
-                {
-                if (!open(IN, "$fp"))
-                        {
-                        print STDERR "Can't open file $fp";
-                        return 1;
-                        }
-                print STDERR "Opening Fingerprint file $fp\n" if $verbose;
-                my $dir = $fp;
-                $dir =~ s/[^\/]*$//;
-                while (<IN>)
-                        {
-                        chomp;
-                        if (!(($file, $hash) = /^\"HMAC-SHA1\((.*)\)\s*=\s*(\w*)\",$/))
-                                {
-                                /^\"/ || next;
-                                print STDERR "FATAL: Invalid syntax in file $fp\n";
-                                print STDERR "Line:\n$_\n";
-                                fatal_error();
-                                return 1;
-                                }
-                        if (!$rebuild && length($hash) != 40)
-                                {
-                                print STDERR "FATAL: Invalid hash length in $fp for file $file\n";
-                                fatal_error();
-                                return 1;
-                                }
-                        push @hashed_files, "$dir$file";
-                        if (exists $hashes{"$dir$file"})
-                                {
-                                print STDERR "FATAL: Duplicate Hash file $dir$file\n";
-                                fatal_error();
-                                return 1;
-                                }
-                        if (! -r "$dir$file")
-                                {
-                                print STDERR "FATAL: Can't access $dir$file\n";
-                                fatal_error();
-                                return 1;
-                                }
-                        $hashes{"$dir$file"} = $hash;
-                        }
-                close IN;
-                }
-
-        @checked_hashes = `$check_program @hashed_files`;
-
-        if ($? != 0)
-                {
-                print STDERR "Error running hash program $check_program\n";
-                fatal_error();
-                return 1;
-                }
-
-        if (@checked_hashes != @hashed_files)
-                {
-                print STDERR "FATAL: hash count incorrect\n";
-                fatal_error();
-                return 1;
-                }
-
-        foreach (@checked_hashes)
-                {
-                chomp;
-                if (!(($file, $hash) = /^HMAC-SHA1\((.*)\)\s*=\s*(\w*)$/))
-                        {
-                        print STDERR "FATAL: Invalid syntax in file $fp\n";
-                        print STDERR "Line:\n$_\n";
-                        fatal_error();
-                        return 1;
-                        }
-                if (length($hash) != 40)
-                        {
-                        print STDERR "FATAL: Invalid hash length for file $file\n";
-                        fatal_error();
-                        return 1;
-                        }
-                if ($hash ne $hashes{$file})
-                        {
-                        if ($rebuild)
-                                {
-                                print STDERR "Updating hash on file $file\n";
-                                $hashes{$file} = $hash;
-                                }
-                        else
-                                {
-                                print STDERR "Hash check failed for file $file\n";
-                                }
-                        $badfiles++;
-                        }
-                elsif ($verbose)
-                        { print "Hash Check OK for $file\n";}
-                }
-                
-
-        if ($badfiles && !$rebuild)
-                {
-                print STDERR "FATAL: hash mismatch on $badfiles files\n";
-                fatal_error();
-                return 1;
-                }
-
-        if ($badfiles || $force_rewrite)
-                {
-                print "Updating Hash file $hash_file\n";
-                if (!open(OUT, ">$hash_file"))
-                        {
-                        print STDERR "Error rewriting $hash_file";
-                        return 1;
-                        }
-                print OUT "const char * const FIPS_source_hashes[] = {\n";
-                foreach (@hashed_files)
-                        {
-                        print OUT "\"HMAC-SHA1($_)= $hashes{$_}\",\n";
-                        }
-                print OUT "};\n";
-                close OUT;
-                }
-
-        if (!$badfiles)
-                {
-                print "FIPS hash check successful\n";
-                }
-
-        return 0;
-
-        }
-
-
-sub fatal_error
-        {
-        print STDERR "*** Your source code does not match the FIPS validated source ***\n";
-        }
-
-
diff --git a/src/lib/libssl/src/util/copy.pl b/src/lib/libssl/src/util/copy.pl
new file mode 100644
index 0000000000..e20b45530a
--- /dev/null
+++ b/src/lib/libssl/src/util/copy.pl
@@ -0,0 +1,59 @@
+#!/usr/local/bin/perl
+
+use Fcntl;
+
+
+# copy.pl
+
+# Perl script 'copy' comment. On Windows the built in "copy" command also
+# copies timestamps: this messes up Makefile dependencies.
+
+my $arg;
+
+foreach $arg (@ARGV) {
+        $arg =~ s|\\|/|g;       # compensate for bug/feature in cygwin glob...
+        foreach (glob $arg)
+                {
+                push @filelist, $_;
+                }
+}
+
+$fnum = @filelist;
+
+if ($fnum <= 1)
+        {
+        die "Need at least two filenames";
+        }
+
+$dest = pop @filelist;
+        
+if ($fnum > 2 && ! -d $dest)
+        {
+        die "Destination must be a directory";
+        }
+
+foreach (@filelist)
+        {
+        if (-d $dest)
+                {
+                $dfile = $_;
+                $dfile =~ s|^.*[/\\]([^/\\]*)$|$1|;
+                $dfile = "$dest/$dfile";
+                }
+        else
+                {
+                $dfile = $dest;
+                }
+        sysopen(IN, $_, O_RDONLY|O_BINARY) || die "Can't Open $_";
+        sysopen(OUT, $dfile, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY)
+                                        || die "Can't Open $dfile";
+        while (sysread IN, $buf, 10240)
+                {
+                syswrite(OUT, $buf, length($buf));
+                }
+        close(IN);
+        close(OUT);
+        print "Copying: $_ to $dfile\n";
+        }
+                
+
diff --git a/src/lib/libssl/src/util/extract-section.pl b/src/lib/libssl/src/util/extract-section.pl
new file mode 100644
index 0000000000..7a0ba4f69a
--- /dev/null
+++ b/src/lib/libssl/src/util/extract-section.pl
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+while(<STDIN>) {
+        if (/=for\s+comment\s+openssl_manual_section:(\S+)/)
+                {
+                print "$1\n";
+                exit 0;
+                }
+}
+
+print "$ARGV[0]\n";
+
diff --git a/src/lib/libssl/src/util/fipslink.pl b/src/lib/libssl/src/util/fipslink.pl
deleted file mode 100644
index a893833c5c..0000000000
--- a/src/lib/libssl/src/util/fipslink.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/perl
-
-sub check_env
-        {
-        my @ret;
-        foreach (@_)
-                {
-                die "Environment variable $_ not defined!\n" unless exists $ENV{$_};
-                push @ret, $ENV{$_};
-                }
-        return @ret;
-        }
-
-
-my ($fips_cc,$fips_cc_args, $fips_link,$fips_target, $fips_libdir, $sha1_exe)
-         = check_env("FIPS_CC", "FIPS_CC_ARGS", "FIPS_LINK", "FIPS_TARGET",
-                "FIPSLIB_D", "FIPS_SHA1_EXE");
-
-
-
-if (exists $ENV{"PREMAIN_DSO_EXE"})
-        {
-        $fips_premain_dso = $ENV{"PREMAIN_DSO_EXE"};
-        }
-        else
-        {
-        $fips_premain_dso = "";
-        }
-
-check_hash($sha1_exe, "fips_premain.c");
-check_hash($sha1_exe, "fipscanister.o");
-
-
-print "Integrity check OK\n";
-
-print "$fips_cc $fips_cc_args $fips_libdir/fips_premain.c\n";
-system "$fips_cc $fips_cc_args $fips_libdir/fips_premain.c";
-die "First stage Compile failure" if $? != 0;
-
-print "$fips_link @ARGV\n";
-system "$fips_link @ARGV";
-die "First stage Link failure" if $? != 0;
-
-
-print "$fips_premain_dso $fips_target\n";
-$fips_hash=`$fips_premain_dso $fips_target`;
-chomp $fips_hash;
-die "Get hash failure" if $? != 0;
-
-
-print "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fips_premain.c\n";
-system "$fips_cc -DHMAC_SHA1_SIG=\\\"$fips_hash\\\" $fips_cc_args $fips_libdir/fips_premain.c";
-die "Second stage Compile failure" if $? != 0;
-
-
-print "$fips_link @ARGV\n";
-system "$fips_link @ARGV";
-die "Second stage Link failure" if $? != 0;
-
-sub check_hash
-        {
-        my ($sha1_exe, $filename) = @_;
-        my ($hashfile, $hashval);
-
-        open(IN, "${fips_libdir}/${filename}.sha1") || die "Cannot open file hash file ${fips_libdir}/${filename}.sha1";
-        $hashfile = <IN>;
-        close IN;
-        $hashval = `$sha1_exe ${fips_libdir}/$filename`;
-        chomp $hashfile;
-        chomp $hashval;
-        $hashfile =~ s/^.*=\s+//;
-        $hashval =~ s/^.*=\s+//;
-        die "Invalid hash syntax in file" if (length($hashfile) != 40);
-        die "Invalid hash received for file" if (length($hashval) != 40);
-        die "***HASH VALUE MISMATCH FOR FILE $filename ***" if ($hashval ne $hashfile); 
-        }
-
-
diff --git a/src/lib/libssl/src/util/pl/BC-16.pl b/src/lib/libssl/src/util/pl/BC-16.pl
deleted file mode 100644
index 8030653daa..0000000000
--- a/src/lib/libssl/src/util/pl/BC-16.pl
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/usr/local/bin/perl
-# VCw16lib.pl - the file for Visual C++ 1.52b for windows, static libraries
-#
-
-$o='\\';
-$cp='copy';
-$rm='del';
-
-# C compiler stuff
-$cc='bcc';
-
-if ($debug)
-        { $op="-v "; }
-else    { $op="-O "; }
-
-$cflags="-d -ml $op -DL_ENDIAN";
-# I add the stack opt
-$base_lflags="/c /C";
-$lflags="$base_lflags";
-
-if ($win16)
-        {
-        $shlib=1;
-        $cflags.=" -DOPENSSL_SYSNAME_WIN16";
-        $app_cflag="-W";
-        $lib_cflag="-WD";
-        $lflags.="/Twe";
-        }
-else
-        {
-        $cflags.=" -DOENSSL_SYSNAME_MSDOS";
-        $lflags.=" /Tde";
-        }
-
-if ($shlib)
-        {
-        $mlflags=" /Twd $base_lflags"; # stack if defined in .def file
-        $libs="libw ldllcew";
-        $no_asm=1;
-        }
-else
-        { $mlflags=''; }
-
-$obj='.obj';
-$ofile="-o";
-
-# EXE linking stuff
-$link="tlink";
-$efile="";
-$exep='.exe';
-$ex_libs="CL";
-$ex_libs.=$no_sock?"":" winsock.lib";
-
-$app_ex_obj="C0L.obj ";
-$shlib_ex_obj="" if ($shlib);
-
-# static library stuff
-$mklib='tlib';
-$ranlib='echo no ranlib';
-$plib="";
-$libp=".lib";
-$shlibp=($shlib)?".dll":".lib";
-$lfile='';
-
-$asm='bcc -c -B -Tml';
-$afile='/o';
-if ($no_asm || $fips)
-        {
-        $bn_asm_obj='';
-        $bn_asm_src='';
-        }
-elsif ($asmbits == 32)
-        {
-        $bn_asm_obj='crypto\bn\asm\x86w32.obj';
-        $bn_asm_src='crypto\bn\asm\x86w32.asm';
-        }
-else
-        {
-        $bn_asm_obj='crypto\bn\asm\x86w16.obj';
-        $bn_asm_src='crypto\bn\asm\x86w16.asm';
-        }
-
-sub do_lib_rule
-        {
-        local($target,$name,$shlib)=@_;
-        local($ret,$Name);
-
-        $taget =~ s/\//$o/g if $o ne '/';
-        ($Name=$name) =~ tr/a-z/A-Z/;
-
-        $ret.="$target: \$(${Name}OBJ)\n";
-        $ret.="\t\$(RM) \$(O_$Name)\n";
-
-        # Due to a pathetic line length limit, I unwrap the args.
-        local($lib_names)="";
-        local($dll_names)="";
-        foreach $_ (sort split(/\s+/,$Vars{"${Name}OBJ"}))
-                {
-                $lib_names.="  +$_ &\n";
-                $dll_names.="  $_\n";
-                }
-
-        if (!$shlib)
-                {
-                $ret.="\t\$(MKLIB) $target & <<|\n$lib_names\n,\n|\n";
-                }
-        else
-                {
-                local($ex)=($Name eq "SSL")?' $(L_CRYPTO) winsock':"";
-                $ret.="\t\$(LINK) \$(MLFLAGS) @&&|\n";
-                $ret.=$dll_names;
-                $ret.="\n  $target\n\n  $ex $libs\nms$o${name}16.def;\n|\n";
-                ($out_lib=$target) =~ s/O_/L_/;
-                $ret.="\timplib /nowep $out_lib $target\n\n";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_link_rule
-        {
-        local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
-        local($ret,$f,$_,@f);
-
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($target);
-        $ret.="$target: $files $dep_libs\n";
-        $ret.="  \$(LINK) @&&|";
-        
-        # Due to a pathetic line length limit, I have to unwrap the args.
-        $ret.=" \$(LFLAGS) ";
-        if ($files =~ /\(([^)]*)\)$/)
-                {
-                $ret.=" \$(APP_EX_OBJ)";
-                foreach $_ (sort split(/\s+/,$Vars{$1}))
-                        { $ret.="\n  $r $_ +"; }
-                chop($ret);
-                $ret.="\n";
-                }
-        else
-                { $ret.="\n $r \$(APP_EX_OBJ) $files\n"; }
-        $ret.="  $target\n\n  $libs\n\n|\n";
-        if (defined $sha1file)
-                {
-                $ret.="  $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-1;
diff --git a/src/lib/libssl/src/util/pl/VC-16.pl b/src/lib/libssl/src/util/pl/VC-16.pl
deleted file mode 100644
index 564ba3fd08..0000000000
--- a/src/lib/libssl/src/util/pl/VC-16.pl
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/local/bin/perl
-# VCw16lib.pl - the file for Visual C++ 1.52b for windows, static libraries
-#
-
-$ssl=   "ssleay16";
-$crypto="libeay16";
-
-$o='\\';
-$cp='copy';
-$rm='del';
-
-# C compiler stuff
-$cc='cl';
-
-$out_def="out16";
-$tmp_def="tmp16";
-$inc_def="inc16";
-
-if ($debug)
-        {
-        $op="/Od /Zi /Zd";
-        $base_lflags="/CO";
-        }
-else    {
-        $op="/G2 /f- /Ocgnotb2";
-        }
-$base_lflags.=" /FARCALL /NOLOGO /NOD /SEG:1024 /ONERROR:NOEXE /NOE /PACKC:60000";
-if ($win16) { $base_lflags.=" /PACKD:60000"; }
-
-$cflags="/ALw /Gx- /Gt256 /Gf $op /W3 /WX -DL_ENDIAN /nologo";
-# I add the stack opt
-$lflags="$base_lflags /STACK:20000";
-
-if ($win16)
-        {
-        $cflags.=" -DOPENSSL_SYSNAME_WIN16";
-        $app_cflag="/Gw /FPi87";
-        $lib_cflag="/Gw";
-        $lib_cflag.=" -D_WINDLL -D_DLL" if $shlib;
-        $lib_cflag.=" -DWIN16TTY" if !$shlib;
-        $lflags.=" /ALIGN:256";
-        $ex_libs.="oldnames llibcewq libw";
-        }
-else
-        {
-        $no_sock=1;
-        $cflags.=" -DMSDOS";
-        $lflags.=" /EXEPACK";
-        $ex_libs.="oldnames.lib llibce.lib";
-        }
-
-if ($shlib)
-        {
-        $mlflags="$base_lflags";
-        $libs="oldnames ldllcew libw";
-        $shlib_ex_obj="";
-#       $no_asm=1;
-        $out_def="out16dll";
-        $tmp_def="tmp16dll";
-        }
-else
-        { $mlflags=''; }
-
-$app_ex_obj="";
-
-$obj='.obj';
-$ofile="/Fo";
-
-# EXE linking stuff
-$link="link";
-$efile="";
-$exep='.exe';
-$ex_libs.=$no_sock?"":" winsock";
-
-# static library stuff
-$mklib='lib /PAGESIZE:1024';
-$ranlib='';
-$plib="";
-$libp=".lib";
-$shlibp=($shlib)?".dll":".lib";
-$lfile='';
-
-$asm='ml /Cp /c /Cx';
-$afile='/Fo';
-
-$bn_asm_obj='';
-$bn_asm_src='';
-$des_enc_obj='';
-$des_enc_src='';
-$bf_enc_obj='';
-$bf_enc_src='';
-
-if (!$no_asm && !$fips)
-        {
-        if ($asmbits == 32)
-                {
-                $bn_asm_obj='crypto\bn\asm\x86w32.obj';
-                $bn_asm_src='crypto\bn\asm\x86w32.asm';
-                }
-        else
-                {
-                $bn_asm_obj='crypto\bn\asm\x86w16.obj';
-                $bn_asm_src='crypto\bn\asm\x86w16.asm';
-                }
-        }
-
-sub do_lib_rule
-        {
-        local($objs,$target,$name,$shlib)=@_;
-        local($ret,$Name);
-
-        $taget =~ s/\//$o/g if $o ne '/';
-        ($Name=$name) =~ tr/a-z/A-Z/;
-
-#       $target="\$(LIB_D)$o$target";
-        $ret.="$target: $objs\n";
-#       $ret.="\t\$(RM) \$(O_$Name)\n";
-
-        # Due to a pathetic line length limit, I unwrap the args.
-        local($lib_names)="";
-        local($dll_names)="  \$(SHLIB_EX_OBJ) +\n";
-        ($obj)= ($objs =~ /\((.*)\)/);
-        foreach $_ (sort split(/\s+/,$Vars{$obj}))
-                {
-                $lib_names.="+$_ &\n";
-                $dll_names.="  $_ +\n";
-                }
-
-        if (!$shlib)
-                {
-                $ret.="\tdel $target\n";
-                $ret.="\t\$(MKLIB) @<<\n$target\ny\n$lib_names\n\n<<\n";
-                }
-        else
-                {
-                local($ex)=($target =~ /O_SSL/)?'$(L_CRYPTO)':"";
-                $ex.=' winsock';
-                $ret.="\t\$(LINK) \$(MLFLAGS) @<<\n";
-                $ret.=$dll_names;
-                $ret.="\n  $target\n\n  $ex $libs\nms$o${name}.def;\n<<\n";
-                ($out_lib=$target) =~ s/O_/L_/;
-                $ret.="\timplib /noignorecase /nowep $out_lib $target\n";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_link_rule
-        {
-        local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
-        local($ret,$f,$_,@f);
-        
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($targer);
-        $ret.="$target: $files $dep_libs\n";
-        $ret.="  \$(LINK) \$(LFLAGS) @<<\n";
-        
-        # Due to a pathetic line length limit, I have to unwrap the args.
-        if ($files =~ /\(([^)]*)\)$/)
-                {
-                @a=('$(APP_EX_OBJ)');
-                push(@a,sort split(/\s+/,$Vars{$1}));
-                for $_ (@a)
-                        { $ret.="  $_ +\n"; }
-                }
-        else
-                { $ret.="  \$(APP_EX_OBJ) $files"; }
-        $ret.="\n  $target\n\n  $libs\n\n<<\n";
-        if (defined $sha1file)
-                {
-                $ret.="  $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-1;
diff --git a/src/lib/libssl/src/util/pl/VC-32-GMAKE.pl b/src/lib/libssl/src/util/pl/VC-32-GMAKE.pl
deleted file mode 100644
index b5bbcac6c2..0000000000
--- a/src/lib/libssl/src/util/pl/VC-32-GMAKE.pl
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/local/bin/perl
-# VCw32lib.pl - the file for Visual C++ 4.[01] for windows NT, static libraries
-#
-
-
-if ($fips && !$shlib)
-        {
-        $crypto="libeayfips32";
-        $crypto_compat = "libeaycompat32.lib";
-        }
-else
-        {
-        $crypto="libeay32";
-        }
-$ssl=   "ssleay32";
-
-$o='/';
-#$cp='copy nul+';       # Timestamps get stuffed otherwise
-#$rm='del';
-
-$cp='cp';
-$rm='rm';
-
-$zlib_lib="zlib1.lib";
-
-# C compiler stuff
-$cc='cl';
-$cflags=' -MD -W3 -WX -Ox -O2 -Ob2 -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
-$cflags.=' -D_CRT_SECURE_NO_DEPRECATE';         # shut up VC8
-$cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';        # shut up VC8
-$lflags="-nologo -subsystem:console -machine:I386 -opt:ref";
-$mlflags='';
-
-$out_def="gmout32";
-$tmp_def="gmtmp32";
-$inc_def="gminc32";
-
-if ($debug)
-        {
-        $cflags=" -MDd -W3 -WX -Zi -Yd -Od -nologo -DOPENSSL_SYSNAME_WIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32";
-        $lflags.=" -debug";
-        $mlflags.=' -debug';
-        }
-$cflags .= " -DOPENSSL_SYSNAME_WINNT" if $NT == 1;
-
-$obj='.obj';
-$ofile="-Fo";
-
-# EXE linking stuff
-$link="link";
-$efile="-out:";
-$exep='.exe';
-if ($no_sock)
-        { $ex_libs=""; }
-else    { $ex_libs="wsock32.lib user32.lib gdi32.lib"; }
-
-# static library stuff
-$mklib='lib';
-$ranlib='';
-$plib="";
-$libp=".lib";
-$shlibp=($shlib)?".dll":".lib";
-$lfile='-out:';
-
-$shlib_ex_obj="";
-$app_ex_obj="setargv.obj";
-if ($nasm) {
-        $asm='nasmw -f win32';
-        $afile='-o ';
-} else {
-        $asm='ml -Cp -coff -c -Cx';
-        $asm.=" -Zi" if $debug;
-        $afile='-Fo';
-}
-
-$bn_asm_obj='';
-$bn_asm_src='';
-$des_enc_obj='';
-$des_enc_src='';
-$bf_enc_obj='';
-$bf_enc_src='';
-
-if (!$no_asm && !$fips)
-        {
-        $bn_asm_obj='crypto/bn/asm/bn_win32.obj';
-        $bn_asm_src='crypto/bn/asm/bn_win32.asm';
-        $des_enc_obj='crypto/des/asm/d_win32.obj crypto/des/asm/y_win32.obj';
-        $des_enc_src='crypto/des/asm/d_win32.asm crypto/des/asm/y_win32.asm';
-        $bf_enc_obj='crypto/bf/asm/b_win32.obj';
-        $bf_enc_src='crypto/bf/asm/b_win32.asm';
-        $cast_enc_obj='crypto/cast/asm/c_win32.obj';
-        $cast_enc_src='crypto/cast/asm/c_win32.asm';
-        $rc4_enc_obj='crypto/rc4/asm/r4_win32.obj';
-        $rc4_enc_src='crypto/rc4/asm/r4_win32.asm';
-        $rc5_enc_obj='crypto/rc5/asm/r5_win32.obj';
-        $rc5_enc_src='crypto/rc5/asm/r5_win32.asm';
-        $md5_asm_obj='crypto/md5/asm/m5_win32.obj';
-        $md5_asm_src='crypto/md5/asm/m5_win32.asm';
-        $sha1_asm_obj='crypto/sha/asm/s1_win32.obj';
-        $sha1_asm_src='crypto/sha/asm/s1_win32.asm';
-        $rmd160_asm_obj='crypto/ripemd/asm/rm_win32.obj';
-        $rmd160_asm_src='crypto/ripemd/asm/rm_win32.asm';
-        $cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM";
-        }
-
-if ($shlib)
-        {
-        $mlflags.=" $lflags -dll";
-#       $cflags =~ s| -MD| -MT|;
-        $lib_cflag=" -D_WINDLL";
-        $out_def="gmout32dll";
-        $tmp_def="gmtmp32dll";
-        }
-
-$cflags.=" -Fd$out_def";
-
-sub do_lib_rule
-        {
-        local($objs,$target,$name,$shlib,$ign,$base_addr, $fips_get_sig, $fips_premain_src)=@_;
-        local($ret,$Name);
-
-        $taget =~ s/\//$o/g if $o ne '/';
-        ($Name=$name) =~ tr/a-z/A-Z/;
-        my $base_arg;
-        if ($base_addr ne "")
-                {
-                $base_arg= " -base:$base_addr";
-                }
-        else
-                {
-                $base_arg = "";
-                }
-
-
-#       $target="\$(LIB_D)$o$target";
-        if (!$shlib)
-                {
-#               $ret.="\t\$(RM) \$(O_$Name)\n";
-                $ret.="$target: $objs\n";
-                $ex =' advapi32.lib';
-                $ret.="\t\$(MKLIB) $lfile$target $objs $ex\n\n";
-                }
-        else
-                {
-                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
-                $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
-                $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
-                if (defined $fips_get_sig)
-                        {
-                        $ret.="$target: \$(O_FIPSCANISTER) $objs $fips_get_sig\n";
-                        $ret.="\tFIPS_LINK=\$(LINK) ";
-                        $ret.="FIPS_CC=\$(CC) ";
-                        $ret.="FIPS_CC_ARGS=\"-Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\" ";
-                        $ret.="FIPS_PREMAIN_DSO=$fips_get_sig ";
-                        $ret.="FIPS_TARGET=$target ";
-                        $ret.="FIPS_LIBDIR=\$(FIPSLIB_D) ";
-                        $ret.="\$(FIPSLINK) \$(MLFLAGS) $base_arg $efile$target ";
-                        $ret.="-def:ms/${Name}.def \$(SHLIB_EX_OBJ) $objs ";
-                        $ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n\n";
-                        }
-                else
-                        {
-                        $ret.="$target: $objs\n";
-                        $ret.="\t\$(LINK) \$(MLFLAGS) $base_arg $efile$target /def:ms/${Name}.def \$(SHLIB_EX_OBJ) $objs $ex\n\n";
-                        }
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_link_rule
-        {
-        local($target,$files,$dep_libs,$libs,$standalone)=@_;
-        local($ret,$_);
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($targer);
-        if ($standalone)
-                {
-                $ret.="$target: $files $dep_libs\n";
-                $ret.="\t\$(LINK) \$(LFLAGS) $efile$target ";
-                $ret.="$files $libs\n\n";
-                }
-        elsif ($fips && !$shlib)
-                {
-                $ret.="$target: \$(O_FIPSCANISTER) $files $dep_libs\n";
-                $ret.="\tFIPS_LINK=\$(LINK) ";
-                $ret.="FIPS_CC=\$(CC) ";
-                $ret.="FIPS_CC_ARGS=\"-Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\" ";
-                $ret.="FIPS_PREMAIN_DSO= ";
-                $ret.="FIPS_TARGET=$target ";
-                $ret.="FIPS_LIBDIR=\$(FIPSLIB_D) ";
-                $ret.=" \$(FIPSLINK) \$(LFLAGS) $efile$target ";
-                $ret.="\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n\n";
-                }
-        else
-                {
-                $ret.="$target: $files $dep_libs\n";
-                $ret.="\t\$(LINK) \$(LFLAGS) $efile$target ";
-                $ret.="\$(APP_EX_OBJ) $files $libs\n\n";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_rlink_rule
-        {
-        local($target,$files,$check_hash, $deps)=@_;
-        local($ret,$_);
-
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($targer);
-        $ret.="$target: $check_hash $files $deps\n";
-        $ret.="\t\$(PERL) util${o}checkhash.pl -chdir fips-1.0 -program_path ..$o$check_hash\n";
-        $ret.="\t\$(MKCANISTER) $target $files\n";
-        $ret.="\t$check_hash $target > $target.sha1\n";
-        $ret.="\t\$(CP) fips-1.0${o}fips_premain.c \$(FIPSLIB_D)\n";
-        $ret.="\t$check_hash \$(FIPSLIB_D)${o}fips_premain.c > \$(FIPSLIB_D)${o}fips_premain.c.sha1\n\n";
-        return($ret);
-        }
-
-
-1;
diff --git a/src/lib/libssl/src/util/pl/VC-CE.pl b/src/lib/libssl/src/util/pl/VC-CE.pl
deleted file mode 100644
index 2fd0c4dd32..0000000000
--- a/src/lib/libssl/src/util/pl/VC-CE.pl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/local/bin/perl
-# VC-CE.pl - the file for eMbedded Visual C++ 3.0 for windows CE, static libraries
-#
-
-$ssl=   "ssleay32";
-$crypto="libeay32";
-$RSAref="RSAref32";
-
-$o='\\';
-$cp='copy nul+';        # Timestamps get stuffed otherwise
-$rm='del';
-
-# C compiler stuff
-$cc='$(CC)';
-$cflags=' /W3 /WX /Ox /O2 /Ob2 /Gs0 /GF /Gy /nologo $(WCETARGETDEFS) -DUNICODE -D_UNICODE -DWIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include';
-$lflags='/nologo /subsystem:windowsce,$(WCELDVERSION) /machine:$(WCELDMACHINE) /opt:ref';
-$mlflags='';
-
-$out_def='out32_$(TARGETCPU)';
-$tmp_def='tmp32_$(TARGETCPU)';
-$inc_def="inc32";
-
-if ($debug)
-        {
-        $cflags=" /MDd /W3 /WX /Zi /Yd /Od /nologo -DWIN32 -D_DEBUG -DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DDEBUG -DDSO_WIN32";
-        $lflags.=" /debug";
-        $mlflags.=' /debug';
-        }
-
-$obj='.obj';
-$ofile="/Fo";
-
-# EXE linking stuff
-$link="link";
-$efile="/out:";
-$exep='.exe';
-if ($no_sock)
-        { $ex_libs=""; }
-else    { $ex_libs='winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib $(WCELDFLAGS)'; }
-
-# static library stuff
-$mklib='lib';
-$ranlib='';
-$plib="";
-$libp=".lib";
-$shlibp=($shlib)?".dll":".lib";
-$lfile='/out:';
-
-$shlib_ex_obj="";
-$app_ex_obj="";
-$app_ex_obj="";
-
-$bn_asm_obj='';
-$bn_asm_src='';
-$des_enc_obj='';
-$des_enc_src='';
-$bf_enc_obj='';
-$bf_enc_src='';
-
-if ($shlib)
-        {
-        $mlflags.=" $lflags /dll";
-#       $cflags =~ s| /MD| /MT|;
-        $lib_cflag=" -D_WINDLL -D_DLL";
-        $out_def='out32dll_$(TARGETCPU)';
-        $tmp_def='tmp32dll_$(TARGETCPU)';
-        }
-
-$cflags.=" /Fd$out_def";
-
-sub do_lib_rule
-        {
-        local($objs,$target,$name,$shlib)=@_;
-        local($ret,$Name);
-
-        $taget =~ s/\//$o/g if $o ne '/';
-        ($Name=$name) =~ tr/a-z/A-Z/;
-
-#       $target="\$(LIB_D)$o$target";
-        $ret.="$target: $objs\n";
-        if (!$shlib)
-                {
-#               $ret.="\t\$(RM) \$(O_$Name)\n";
-                $ex =' ';
-                $ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs $ex\n<<\n";
-                }
-        else
-                {
-                local($ex)=($target =~ /O_SSL/)?' $(L_CRYPTO)':'';
-#               $ex.=' winsock.lib coredll.lib $(WCECOMPAT)/lib/wcecompatex.lib';
-                $ex.=' winsock.lib $(WCECOMPAT)/lib/wcecompatex.lib';
-                $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target /def:ms/${Name}.def @<<\n  \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-sub do_link_rule
-        {
-        local($target,$files,$dep_libs,$libs,$sha1file,$openssl)=@_;
-        local($ret,$_);
-        
-        $file =~ s/\//$o/g if $o ne '/';
-        $n=&bname($targer);
-        $ret.="$target: $files $dep_libs\n";
-        $ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n";
-        $ret.="  \$(APP_EX_OBJ) $files $libs\n<<\n";
-        if (defined $sha1file)
-                {
-                $ret.="  $openssl sha1 -hmac etaonrishdlcupfm -binary $target > $sha1file";
-                }
-        $ret.="\n";
-        return($ret);
-        }
-
-1;
diff --git a/src/lib/libssl/src/util/pl/netware.pl b/src/lib/libssl/src/util/pl/netware.pl
new file mode 100644
index 0000000000..173c9919f2
--- /dev/null
+++ b/src/lib/libssl/src/util/pl/netware.pl
@@ -0,0 +1,526 @@
+# Metrowerks Codewarrior or gcc / nlmconv for NetWare
+#
+
+$version_header = "crypto/opensslv.h";
+open(IN, "$version_header") or die "Couldn't open $version_header: $!";
+while (<IN>) {
+  if (/^#define[\s\t]+OPENSSL_VERSION_NUMBER[\s\t]+0x(\d)(\d{2})(\d{2})(\d{2})/)
+  {
+    # die "OpenSSL version detected: $1.$2.$3.$4\n";
+    #$nlmvernum = "$1,$2,$3";
+    $nlmvernum = "$1,".($2*10+$3).",".($4*1);
+    #$nlmverstr = "$1.".($2*1).".".($3*1).($4?(chr(96+$4)):"");
+    break;
+  }
+}
+close(IN) or die "Couldn't close $version_header: $!";
+
+$readme_file = "README";
+open(IN, $readme_file) or die "Couldn't open $readme_file: $!";
+while (<IN>) {
+  if (/^[\s\t]+OpenSSL[\s\t]+(\d)\.(\d{1,2})\.(\d{1,2})([a-z])(.*)/)
+  {
+    #$nlmvernum = "$1,$2,$3";
+    #$nlmvernum = "$1,".($2*10+$3).",".($4*1);
+    $nlmverstr = "$1.$2.$3$4$5";
+  }
+  elsif (/^[\s\t]+(Copyright \(c\) \d{4}\-\d{4} The OpenSSL Project)$/)
+  {
+    $nlmcpystr = $1;
+  }
+  break if ($nlmvernum && $nlmcpystr);
+}
+close(IN) or die "Couldn't close $readme_file: $!";
+
+# Define stacksize here
+$nlmstack = "32768";
+
+# some default settings here in case we failed to find them in README
+$nlmvernum = "1,0,0" if (!$nlmvernum);
+$nlmverstr = "OpenSSL" if (!$nlmverstr);
+$nlmcpystr = "Copyright (c) 1998-now The OpenSSL Project" if (!$nlmcpystr);
+
+# die "OpenSSL copyright: $nlmcpystr\nOpenSSL verstring: $nlmverstr\nOpenSSL vernumber: $nlmvernum\n";
+
+# The import files and other misc imports needed to link
+@misc_imports = ("GetProcessSwitchCount", "RunningProcess",
+                 "GetSuperHighResolutionTimer");
+if ($LIBC)
+{
+   @import_files = ("libc.imp");
+   @module_files = ("libc");
+   $libarch = "LIBC";
+}
+else
+{
+   # clib build
+   @import_files = ("clib.imp");
+   push(@import_files, "socklib.imp") if ($BSDSOCK);
+   @module_files = ("clib");
+   # push(@misc_imports, "_rt_modu64%16", "_rt_divu64%16");
+   $libarch = "CLIB";
+}
+if ($BSDSOCK)
+{
+   $libarch .= "-BSD";
+}
+else
+{
+   $libarch .= "-WS2";
+   push(@import_files, "ws2nlm.imp");
+}
+
+# The "IMPORTS" environment variable must be set and point to the location
+# where import files (*.imp) can be found.
+# Example:  set IMPORTS=c:\ndk\nwsdk\imports
+$import_path = $ENV{"IMPORTS"} || die ("IMPORTS environment variable not set\n");
+
+
+# The "PRELUDE" environment variable must be set and point to the location
+# and name of the prelude source to link with ( nwpre.obj is recommended ).
+# Example: set PRELUDE=c:\codewar\novell support\metrowerks support\libraries\runtime\nwpre.obj
+$prelude = $ENV{"PRELUDE"} || die ("PRELUDE environment variable not set\n");
+
+# The "INCLUDES" environment variable must be set and point to the location
+# where import files (*.imp) can be found.
+$include_path = $ENV{"INCLUDE"} || die ("INCLUDES environment variable not set\n");
+$include_path =~ s/\\/\//g;
+$include_path = join(" -I", split(/;/, $include_path));
+
+# check for gcc compiler
+$gnuc = $ENV{"GNUC"};
+
+#$ssl=   "ssleay32";
+#$crypto="libeay32";
+
+if ($gnuc)
+{
+   # C compiler
+   $cc='gcc';
+   # Linker
+   $link='nlmconv';
+   # librarian
+   $mklib='ar';
+   $o='/';
+   # cp command
+   $cp='cp -af';
+   # rm command
+   $rm='rm -f';
+   # mv command
+   $mv='mv -f';
+   # mkdir command
+   $mkdir='gmkdir';
+   #$ranlib='ranlib';
+}
+else
+{
+   # C compiler
+   $cc='mwccnlm';
+   # Linker
+   $link='mwldnlm';
+   # librarian
+   $mklib='mwldnlm';
+   # Path separator
+   $o='\\';
+   # cp command
+   $cp='copy >nul:';
+   # rm command
+   $rm='del /f /q';
+}
+
+# assembler
+if ($nw_nasm)
+{
+   if ($gnuc)
+   {
+      $asm="nasmw -s -f elf";
+   }
+   else
+   {
+      $asm="nasmw -s -f coff";
+   }
+   $afile="-o ";
+   $asm.=" -g" if $debug;
+}
+elsif ($nw_mwasm)
+{
+   $asm="mwasmnlm -maxerrors 20";
+   $afile="-o ";
+   $asm.=" -g" if $debug;
+}
+elsif ($nw_masm)
+{
+# masm assembly settings - it should be possible to use masm but haven't
+# got it working.
+# $asm='ml /Cp /coff /c /Cx';
+# $asm.=" /Zi" if $debug;
+# $afile='/Fo';
+   die("Support for masm assembler not yet functional\n");
+}
+else
+{
+   $asm="";
+   $afile="";
+}
+
+
+
+if ($gnuc)
+{
+   # compile flags for GNUC
+   # additional flags based upon debug | non-debug
+   if ($debug)
+   {
+      $cflags="-g -DDEBUG";
+   }
+   else
+   {
+      $cflags="-O2";
+   }
+   $cflags.=" -nostdinc -I$include_path \\
+         -fno-builtin -fpcc-struct-return -fno-strict-aliasing \\
+         -funsigned-char -Wall -Wno-unused -Wno-uninitialized";
+
+   # link flags
+   $lflags="-T";
+}
+else
+{
+   # compile flags for CodeWarrior
+   # additional flags based upon debug | non-debug
+   if ($debug)
+   {
+      $cflags="-opt off -g -sym internal -DDEBUG";
+   }
+   else
+   {
+   # CodeWarrior compiler has a problem with optimizations for floating
+   # points - no optimizations until further investigation
+   #      $cflags="-opt all";
+   }
+
+   # NOTES: Several c files in the crypto subdirectory include headers from
+   #        their local directories.  Metrowerks wouldn't find these h files
+   #        without adding individual include directives as compile flags
+   #        or modifying the c files.  Instead of adding individual include
+   #        paths for each subdirectory a recursive include directive
+   #        is used ( -ir crypto ).
+   #
+   #        A similar issue exists for the engines and apps subdirectories.
+   #
+   #        Turned off the "possible" warnings ( -w nopossible ).  Metrowerks
+   #        complained a lot about various stuff.  May want to turn back
+   #        on for further development.
+   $cflags.=" -nostdinc -ir crypto -ir engines -ir apps -I$include_path \\
+         -msgstyle gcc -align 4 -processor pentium -char unsigned \\
+         -w on -w nolargeargs -w nopossible -w nounusedarg -w nounusedexpr \\
+         -w noimplicitconv -relax_pointers -nosyspath -maxerrors 20";
+
+   # link flags
+   $lflags="-msgstyle gcc -zerobss -nostdlib -sym internal -commandfile";
+}
+
+# common defines
+$cflags.=" -DL_ENDIAN -DOPENSSL_SYSNAME_NETWARE -U_WIN32";
+
+# If LibC build add in NKS_LIBC define and set the entry/exit
+# routines - The default entry/exit routines are for CLib and don't exist
+# in LibC
+if ($LIBC)
+{
+   $cflags.=" -DNETWARE_LIBC";
+   $nlmstart = "_LibCPrelude";
+   $nlmexit = "_LibCPostlude";
+   @nlm_flags = ("pseudopreemption", "flag_on 64");
+}
+else
+{
+   $cflags.=" -DNETWARE_CLIB";
+   $nlmstart = "_Prelude";
+   $nlmexit = "_Stop";
+}
+
+# If BSD Socket support is requested, set a define for the compiler
+if ($BSDSOCK)
+{
+   $cflags.=" -DNETWARE_BSDSOCK";
+   if (!$LIBC)
+   {
+      $cflags.=" -DNETDB_USE_INTERNET";
+   }
+}
+
+
+# linking stuff
+# for the output directories use the mk1mf.pl values with "_nw" appended
+if ($shlib)
+{
+   if ($LIBC)
+   {
+      $out_def.="_nw_libc_nlm";
+      $tmp_def.="_nw_libc_nlm";
+      $inc_def.="_nw_libc_nlm";
+   }
+   else  # NETWARE_CLIB
+   {
+      $out_def.="_nw_clib_nlm";
+      $tmp_def.="_nw_clib_nlm";
+      $inc_def.="_nw_clib_nlm";
+   }
+}
+else
+{
+   if ($gnuc) # GNUC Tools
+   {
+      $libp=".a";
+      $shlibp=".a";
+      $lib_flags="-cr";
+   }
+   else       # CodeWarrior
+   {
+      $libp=".lib";
+      $shlibp=".lib";
+      $lib_flags="-nodefaults -type library -o";
+   }
+   if ($LIBC)
+   {
+      $out_def.="_nw_libc";
+      $tmp_def.="_nw_libc";
+      $inc_def.="_nw_libc";
+   }
+   else  # NETWARE_CLIB
+   {
+      $out_def.="_nw_clib";
+      $tmp_def.="_nw_clib";
+      $inc_def.="_nw_clib";
+   }
+}
+
+# used by mk1mf.pl
+$obj='.o';
+$ofile='-o ';
+$efile='';
+$exep='.nlm';
+$ex_libs='';
+
+if (!$no_asm)
+{
+   $bn_asm_obj="\$(OBJ_D)${o}bn-nw${obj}";
+   $bn_asm_src="crypto${o}bn${o}asm${o}bn-nw.asm";
+   $bnco_asm_obj="\$(OBJ_D)${o}co-nw${obj}";
+   $bnco_asm_src="crypto${o}bn${o}asm${o}co-nw.asm";
+   $aes_asm_obj="\$(OBJ_D)${o}a-nw${obj}";
+   $aes_asm_src="crypto${o}aes${o}asm${o}a-nw.asm";
+   $des_enc_obj="\$(OBJ_D)${o}d-nw${obj} \$(OBJ_D)${o}y-nw${obj}";
+   $des_enc_src="crypto${o}des${o}asm${o}d-nw.asm crypto${o}des${o}asm${o}y-nw.asm";
+   $bf_enc_obj="\$(OBJ_D)${o}b-nw${obj}";
+   $bf_enc_src="crypto${o}bf${o}asm${o}b-nw.asm";
+   $cast_enc_obj="\$(OBJ_D)${o}c-nw${obj}";
+   $cast_enc_src="crypto${o}cast${o}asm${o}c-nw.asm";
+   $rc4_enc_obj="\$(OBJ_D)${o}r4-nw${obj}";
+   $rc4_enc_src="crypto${o}rc4${o}asm${o}r4-nw.asm";
+   $rc5_enc_obj="\$(OBJ_D)${o}r5-nw${obj}";
+   $rc5_enc_src="crypto${o}rc5${o}asm${o}r5-nw.asm";
+   $md5_asm_obj="\$(OBJ_D)${o}m5-nw${obj}";
+   $md5_asm_src="crypto${o}md5${o}asm${o}m5-nw.asm";
+   $sha1_asm_obj="\$(OBJ_D)${o}s1-nw${obj}";
+   $sha1_asm_src="crypto${o}sha${o}asm${o}s1-nw.asm";
+   $rmd160_asm_obj="\$(OBJ_D)${o}rm-nw${obj}";
+   $rmd160_asm_src="crypto${o}ripemd${o}asm${o}rm-nw.asm";
+   $cpuid_asm_obj="\$(OBJ_D)${o}x86cpuid-nw${obj}";
+   $cpuid_asm_src="crypto${o}x86cpuid-nw.asm";
+   $cflags.=" -DOPENSSL_CPUID_OBJ -DBN_ASM -DOPENSSL_BN_ASM_PART_WORDS -DMD5_ASM -DSHA1_ASM";
+   $cflags.=" -DAES_ASM -DRMD160_ASM";
+}
+else
+{
+   $bn_asm_obj='';
+   $bn_asm_src='';
+   $bnco_asm_obj='';
+   $bnco_asm_src='';
+   $aes_asm_obj='';
+   $aes_asm_src='';
+   $des_enc_obj='';
+   $des_enc_src='';
+   $bf_enc_obj='';
+   $bf_enc_src='';
+   $cast_enc_obj='';
+   $cast_enc_src='';
+   $rc4_enc_obj='';
+   $rc4_enc_src='';
+   $rc5_enc_obj='';
+   $rc5_enc_src='';
+   $md5_asm_obj='';
+   $md5_asm_src='';
+   $sha1_asm_obj='';
+   $sha1_asm_src='';
+   $rmd160_asm_obj='';
+   $rmd160_asm_src='';
+   $cpuid_asm_obj='';
+   $cpuid_asm_src='';
+}
+
+# create the *.def linker command files in \openssl\netware\ directory
+sub do_def_file
+{
+   # strip off the leading path
+   my($target) = bname(shift);
+   my($i);
+
+   if ($target =~ /(.*).nlm/)
+   {
+      $target = $1;
+   }
+
+   # special case for openssl - the mk1mf.pl defines E_EXE = openssl
+   if ($target =~ /E_EXE/)
+   {
+      $target =~ s/\$\(E_EXE\)/openssl/;
+   }
+
+   # Note: originally tried to use full path ( \openssl\netware\$target.def )
+   # Metrowerks linker choked on this with an assertion failure. bug???
+   #
+   my($def_file) = "netware${o}$target.def";
+
+   open(DEF_OUT, ">$def_file") || die("unable to open file $def_file\n");
+
+   print( DEF_OUT "# command file generated by netware.pl for NLM target.\n" );
+   print( DEF_OUT "# do not edit this file - all your changes will be lost!!\n" );
+   print( DEF_OUT "#\n");
+   print( DEF_OUT "DESCRIPTION \"$target ($libarch) - OpenSSL $nlmverstr\"\n");
+   print( DEF_OUT "COPYRIGHT \"$nlmcpystr\"\n");
+   print( DEF_OUT "VERSION $nlmvernum\n");
+   print( DEF_OUT "STACK $nlmstack\n");
+   print( DEF_OUT "START $nlmstart\n");
+   print( DEF_OUT "EXIT $nlmexit\n");
+
+   # special case for openssl
+   if ($target eq "openssl")
+   {
+      print( DEF_OUT "SCREENNAME \"OpenSSL $nlmverstr\"\n");
+   }
+   else
+   {
+      print( DEF_OUT "SCREENNAME \"DEFAULT\"\n");
+   }
+
+   foreach $i (@misc_imports)
+   {
+      print( DEF_OUT "IMPORT $i\n");
+   }
+
+   foreach $i (@import_files)
+   {
+      print( DEF_OUT "IMPORT \@$import_path${o}$i\n");
+   }
+
+   foreach $i (@module_files)
+   {
+      print( DEF_OUT "MODULE $i\n");
+   }
+
+   foreach $i (@nlm_flags)
+   {
+      print( DEF_OUT "$i\n");
+   }
+
+   if ($gnuc)
+   {
+      if ($target =~ /openssl/)
+      {
+         print( DEF_OUT "INPUT ${tmp_def}${o}openssl${obj}\n");
+         print( DEF_OUT "INPUT ${tmp_def}${o}openssl${libp}\n");
+      }
+      else
+      {
+         print( DEF_OUT "INPUT ${tmp_def}${o}${target}${obj}\n");
+      }
+      print( DEF_OUT "INPUT $prelude\n");
+      print( DEF_OUT "INPUT ${out_def}${o}${ssl}${libp} ${out_def}${o}${crypto}${libp}\n");
+      print( DEF_OUT "OUTPUT $target.nlm\n");
+   }
+
+   close(DEF_OUT);
+   return($def_file);
+}
+
+sub do_lib_rule
+{
+   my($objs,$target,$name,$shlib)=@_;
+   my($ret);
+
+   $ret.="$target: $objs\n";
+   if (!$shlib)
+   {
+      $ret.="\t\@echo Building Lib: $name\n";
+      $ret.="\t\$(MKLIB) $lib_flags $target $objs\n";
+      $ret.="\t\@echo .\n"
+   }
+   else
+   {
+      die( "Building as NLM not currently supported!" );
+   }
+
+   $ret.="\n";
+   return($ret);
+}
+
+sub do_link_rule
+{
+   my($target,$files,$dep_libs,$libs)=@_;
+   my($ret);
+   my($def_file) = do_def_file($target);
+
+   $ret.="$target: $files $dep_libs\n";
+
+   # NOTE:  When building the test nlms no screen name is given
+   #  which causes the console screen to be used.  By using the console
+   #  screen there is no "<press any key to continue>" message which
+   #  requires user interaction.  The test script ( do_tests.pl ) needs
+   #  to be able to run the tests without requiring user interaction.
+   #
+   #  However, the sample program "openssl.nlm" is used by the tests and is
+   #  a interactive sample so a screen is desired when not be run by the
+   #  tests.  To solve the problem, two versions of the program are built:
+   #    openssl2 - no screen used by tests
+   #    openssl - default screen - use for normal interactive modes
+   #
+
+   # special case for openssl - the mk1mf.pl defines E_EXE = openssl
+   if ($target =~ /E_EXE/)
+   {
+      my($target2) = $target;
+
+      $target2 =~ s/\(E_EXE\)/\(E_EXE\)2/;
+
+      # openssl2
+      my($def_file2) = do_def_file($target2);
+
+      if ($gnuc)
+      {
+         $ret.="\t\$(MKLIB) $lib_flags \$(TMP_D)${o}\$(E_EXE).a \$(filter-out \$(TMP_D)${o}\$(E_EXE)${obj},$files)\n";
+         $ret.="\t\$(LINK) \$(LFLAGS) $def_file2\n";
+         $ret.="\t\@$mv \$(E_EXE)2.nlm \$(TEST_D)\n";
+      }
+      else
+      {
+         $ret.="\t\$(LINK) \$(LFLAGS) $def_file2 $files \"$prelude\" $libs -o $target2\n";
+      }
+   }
+   if ($gnuc)
+   {
+      $ret.="\t\$(LINK) \$(LFLAGS) $def_file\n";
+      $ret.="\t\@$mv \$(\@F) \$(TEST_D)\n";
+   }
+   else
+   {
+      $ret.="\t\$(LINK) \$(LFLAGS) $def_file $files \"$prelude\" $libs -o $target\n";
+   }
+
+   $ret.="\n";
+   return($ret);
+
+}
+
+1;
diff --git a/src/lib/libssl/test/SHAmix.fax b/src/lib/libssl/test/SHAmix.fax
deleted file mode 100644
index 83bcb14126..0000000000
--- a/src/lib/libssl/test/SHAmix.fax
+++ /dev/null
@@ -1,129 +0,0 @@
-[L = 64]
-
-Len = 16
-Msg = 98a1
-MD = 74d78642f70ca830bec75fc60a585917e388cfa4cd1d23daab1c4d9ff1010cac3e67275df64db5a6a7c7d0fda24f1fc3eb272678a7c8becff6743ee812129078
-
-Len = 104
-Msg = 35a37a46df4ccbadd815942249
-MD = 6f5589ea195e745654885d50de687d7fe682affc8da1fb09e681540525f04ecb93022361a27759b9e272c883564223c5e4ecafeb0daaf1abce6caa4bd4153379
-
-Len = 352
-Msg = a93aed0fa5e163a82c9a934aebaab8180edf7de0b32f0fe99f9c75ec305b24609334cefa372c7c758262dc8f
-MD = 66a16799d606c569d2fcd70d7d8321ec90ef61711481aaf7d747744ebfd08ec2e7aead49429af7b4ceec6d8e147ed018e034efbe07982699e818db5fc4b1d71a
-
-Len = 1016
-Msg = 433e88eb2f8aba562d15c18126fbdffb81d5d6c9397fa052321f5f78cd629708ba099b540da5451e949eeab8687a8d6ac35c531411cb37144ab5ff6a7eb46f1ab28fbcd2ea0444cd87c57bf7d3c02952dba3d3987da07622c16e7c086d90e88ad3d9d4afee301d2bad915d868f54197b70b23c9fa385c443404fbc9abf7e6a
-MD = 790bc4844e9aeef8938df0ccda17890556a4151817111a526a88919cfb172f0b03c216080c1b60210eb1942097f17b6d0691bf5b018b6d959198d6a694b922c9
-
-Len = 13696
-Msg = 2c46a76a9dfbae1f5e59f085e9c3d4b600c24b2d404d062cf948e75a3d4ab5b137a31397be9eb34b2a03c78367e0b85448891b511ddee1f787cccd498b172cb7e656c044a03ffde8e42478330fbe9c34072a9e99ce31b41757cc820d98e7d564e06694b96b66f4be34c5eadd0ae4e61fe6abbe4d7ccee855104fedee8b451a7fcedb793d469b0094c0ed07c97fda00dd8c1662b44e3ee6775a5ef6368cb662d257be561a5967893433a4b63f97295036a37272176d081545df00852bc5c4162324161296cd51f76433f2df867a5840f2d0c8d5be00b4dc89443d82175bf69c3bdceb97facae2b2ed68e06ae74fef36d8bd1f75f130cba509341dd54079d45de22845cc8e77a022977c7540aa3e779cb1127f39f825d4d78e55a967ef45e7c1dfb02d9999fd15af2914ba47177177d94576f1091a0657d9e04fe81e6be7b631fc1baae66584c9c26ddbb568750d77555c927bcda1fbdc15c7cbe3e3fe88ca13ff12c59b383343c12976708c0e3dff78be0e286dd32eecf20b71a09fee50a9d0b13c85a15b320b162690f399282798aa3291fdd2f9c40ed873e829388466ddd1da42f2de16aaa9272ccf44790cf3c95382c304e25ae8cb2fc9d9869808f3ee7d42cb143bb0c3a55e03db6d1202ca1bdb744e448640c0aa60d3ebbda5c21e623bb080f4a073a48822725d764e51d415aad1d7c5a7f17433d15ac7d849f910c375ee0899f6a576dada42fd651343383f286009902bb62deeeb2514de6af7f09892c20d0b238f6021f03b62444b1e1f21beeb89acfcd7136416fe7bd8f202e76afaf5345311798be7cb25351add2bb044d2380221009c4d1cbbaba4cdc8631dc0144f2778a6aa1eb3d3c81df0b1b2142fce111af8214d049e40f536c5d462b9224a978e82cc6c420e70ecc3cdaffb726a183c793845315f730fa4dac9fe46e4180397107a6a051f7f0a58ceb9bf4df37e1a81c8e9569187228e8037df2e59c52ba815566768bedc8e09d5e7bdc9f2bff23aaaaf133bb5a3332750f6124ce185e29fda0851addfa2c3d52bb6dfb530fd4ee27dd5bfdce5dc2f41debe6740274bc651aecd4023b098a7d622e2296b50d51b79c4e3f521695a9d43f038e8f273405e26584d3db179e7c1758114a3d39970df674580bbf2884405974f0b9c4b0d8b3287a2314f3f81b6991812f354d655f62513c9551b378cc2efa4c3e08b313c56cada52217fb6112eb8299b28445aca8f72e7170a1cd8bbfee4d2145fbe8d49c6af8831c4d4fc7177a50ee55a7b484261504af946c6bd5e1d6b89092f3c487c0568fa07c356fae9b8e831b8320289039746a435b122cfbc4a0d316bf90d481d3b7d979cc50d98c1190af8dc58e0035557dd5e94f437f41fab513202643a77748f76c6b77302bf40c392cd18731da082c99bdedeb70e15cd68bff59619cabcc92adcf122753c55afde0817352bc247d1170b8ddba1ad1b0faadfe0efbfc5fe6334377fa372c3435691f53dfc2ad5e08966b2d3525b1eec2d993a5cd4ff34278bd40dd80313a0727d05e0a932156152f3e11a190d8d69726f5c57d20f811e1e8932e86409ffdac96c6251c2a2976b8757adcac5d2de94931d1cbea866ec8bcba5774f8a7fde792f6acfd0f01356fd66fdf54a416af6a9397e00f848a2e9831627cbcbb52b5a868ec174e69b4cfa1ed72cdf23f39d7eaf4bdb318c188b1f0fe75655e34ad71907cdb77a1a2b162cd7c22d93dc45321eafb17cd60282e83736267b3e1fb249c307d49509f50839942f0f493afd9ef37db053a918e3ec83d801bbdead07554a018b8ba348fe9b7dd92ea7c5fc0e65a644ba19aa1fb6c022ab768ec7cb249ba17b9dda2860bd4aaaa3dc70ec009804141ad5ebc61203658e57a0887ec0fded18d844a96e79ba7e879c4253056f23e205a80ab1471953438f85848f4ab31ab175c089e0bbb97ea0dd6a67385770356741966053735e2cc2ecdd2c8c75cc045181dd7267584b901674b553082b2c58fb8f8be0b99306194a6f069f684535423304d40a268d55784a14260fa9c9cb1306b82f91cbee3c9f43dea9e50903135cc1c6505605a100bfa28564a2057974eef0852b7b72ce264815026d0759f691db618ef760edde73ec888e181403834f7221bb27a69479ec9b28a3fb0c3f68d4467d25712fc48ad78763f9ea6e8a2e85260225ca1b1a38b720e589fafca29f07257c5467cb74ee53189b8c81b784c43e93f98abde1ed53af60b27b13df6ce45001c6e1813de3521028981086f7d88ba13f6fb1a800f312fbe2f842eebe847fd760c394668cfbfd353ec14ca0366eccd7b4cd63318116bdc42e20a632a0d2b8c5cddb37bfc0a239ebe3800a787d2ece077a7968036b3d9b31cd906f888e3ed742cd769033e2c24c5a9e3c10b6d300db5a17dd88
-MD = a86e07bcd19080d4a83e1384bd8189f60a7dd7a6998406ade0bf03f805375bd823c7656dd51cd9d63e542f8ade41f16d73794d60d0906424133778156ee54b95
-
-Len = 100816
-Msg = f8ed40e878dc68ceec52cc8e2868722310fb117ca3a52e1839eb85d308b8aa00ed0bf0b76aec8a70eba4f0d14d2d85c5a0e876ce2c8ee59cb36947def6c40a587aa07b368ca8e8a08367018e45b984de0d7f1aa46b977cc18c0cd9b7bb897cbb2814aa0ce8f8c9843e03c86c19f2ba95dd2ac4a466a93aae4b3b05055ff148517ecf43e286c57744a3e10a14d0c26e139a503e7927aa688c78609170ebe3b54104390e5f6cf538093a67922e7210e77fcb584ec9b6844e829be246a266460cb442bad52ca47255fb8cfe276108c36e02f9acbd3d191d34b93d29ec40d80496d1c1bb5ef036221641200e905598c54bc4abb3527c5a5f6258e59d4bf54a0498c108a2725428efc2047e0096b32dfdc6ec69d5d72f81301f881ca62a66c22e5dab9fd9d90084c0a36b2f3a0123cc5327a3bc7a12fd947ab57169ac533e4b6a2cb80fc65b9b527cff9fba26994c7fafb5102a0acd8f9d246a3a54178c23eaa04c0fdfd3c0cd980d1fc7a72b25d74df9b95c3dedce8ca316870c654f9ebea9b806da9767cf40605a4b0c7fb06f6b3f197bae7d8cde9daf38530e25bc51b68f9aa23ec0e95199b14bca96c91f3db15bf8432f714dc46ac87218691bc66cb3a42f6865e1c30f8394c8e68c0ddf5851ab7c5906a1994a9af6ac1c44d0d6b95ff15d9f77825ccea40fb9e516d45888f2378e045d95d936d541cea9c8ca52fe5f7d0d919b2b1c59a42d06105ea4f2943c05178e59d67351c5b2c0051c93a4045e512884fa656b772cf398af89081546d920fd3d24ebd16310506a786ab33293027394c1bcb7b1efe46b550ac28529646e8d2a5ae65c59345e24b44cd7b06673f3ed3b9008aa568a739c26682fa596b7a655842cc6b2758b583487c78d14a76bdac7033806c5c210828ef313f8efc4072681f5fded748c31a58ac933b4665c445f07d603e0905e49b84aa55146eb1c1c99196413832a05efee2e64d6732fefc629b79b37bb9390fcbed7226b412204bda523b8b8af5c4a8bdb263ef9f3f6c7b9e1de3a1dc257c1f33b3d54a9101be5b4f2a9db319993c2cd137c41e35c434ce52e859afd1a635af4d8852252dc5e28c729b2b4c96a56d57f3f3854ded59fe612b9b3a51fee3fc1c83db673b0cc7433bff2472bc74a2eeb6706605e308690fd072a7042ca6474603711d8310909e47063f46f287260a26c4f11fe492298a0f98d28c45948a4899e08fcf443a6ba36457dd8329314d53ac0fd0819fcfc3357426c5bb8d3dfd706e205a81091cf08f31cd3459854f3d07e503991ba5f067e3c406c6c5396d8257496f4ba3703cb1ba25c2fe4aa54577af782cd57e85a88a2d75c54039e8b7bb559219edd6e81e41acb6d575d6f798afb2cbf7f00abd5c9c7b0fceec79f9a0fb040ebcbb7bff3602df7b71357efacd37aa57019350bb81213508a006160acde3dae5c42f03141887eaca22d7b33d6791febfb619d11ebabb13e6c5378e9a72e852ddccd31cc53a43275966b7042ddc51485ca20e1c456dcc7020cafb5407548b044d332229911fc74d7fb97de25abff7efb431da82de2ed7e25d0dcc06ffc74e57ca93a6a9f64d76a5c39776fe2266f88d6d0229b527525fd2e22a1407e26f94c5bc6adb1e7327f3c8bb8d4c983385c579dd8f5623df8cd6da569c7de73d9210e6b9253a177653a13ece075940fc81016d8c35fa4f6542df5120c174158ff32533476f4e059e35117081a24798fbdd1eb10f82809836f8dbefe755611347f75423dd8571695960c6f66cca71f0a01e8fecbe1183bee3335eff10b4ff8104132040e2145ec3164b2448f60c730887b9d7894e5f7df3f876cb17136c99cf32db1c02fba860937378dbd093c4c5112133781f06c8ca07c527c2c085e8ba5e52b399f2909e217aef6e3035ecafe2caeb1004069dea023af7eab873deb5ebcef2313c9827821bb9f89fd3d1570a569673d3ede86a4fb13dff242eb98450a8917fd8865c56e0a9f11d72394b79808b0429f3a83cf2465161596887fa2d557b367a1de9c7753666b0cca9c30cba9f0a749c03c55cdc7a6d45852c76ce2010de3e7f75d95228efdc79949b238d90b25f983868b7f07f585f7b00e45d9e132f3c09ee84f794d899759be3dabd46a256f4cf8da71270617cc2425b24cef25d1d2f3945afa6f81abfccc858cd02e05619649b1a5347650934105c02622d538447223d136a8a0455cf3c6f61f696b32266197b5cd1d936fd3ad4288520fb4a2f59bf95e659f33210446ef18debeb679dd99de0c3c74a6eb3dd783861f5db4e94a151c42ce27519d0bbbf1f3b1163563ec06c8bfd881d94a3b896fc07352fc97ada73685588a2242da1b718f81bb1077bc70fbd58b8b52163489ae403838b533851bec30ed0ecd97d72d1af534f3703db59f1f563bdc39d690a0e90e545506463a37e84974fd7b256bbb912cb4077d3e3f5bdd4bd2bab713b696c830b1f2185734c4d2dbd49d5372fe8b813ce73f5e01c36bddbb376ef4541033f2b0355613eeda8951ebf7377e08f967902eb7e23c0fa798c6ae52401721053f1095cacb1e9496500e83c412236fc21566090b3a3eee55aa402c0b774802fd81c9e8579761cfcfdfb1aa23786b2dc35dacd5ca8d8d283369f53e4a5db18060c2c6b0c303052aeeffe169fcaf7ecc63090a9ade245045ab9c8aebf738772297caaef5f857322a597846c7370083d409df27612e47b0cb240daa3cfa51c57108612ac0dddb0f59791289ccbdb3a2cb1fa9ac31a23dd5440682fb373bf0c1f41c4fe2185ad7c53eb69552807410053b0c2d40132250e637b8c425e6a35d93333b5b7d0557927b6179c848ec455fd1ab38348c0e96c60b2da49bd15118df64b6ce4fa48fbc555a4b2874141718e731a40b85382ae6e86ead31cea77f83bf5c063bf1febf71688a832d615e09d6f14badedeaeb6ffbfe343fc7274e78cd46a2aaec0a349c5f133291ee57cdcb65c5474e46294de6bb50886bce6c6f44dcb95f2a4761ed2e6c9e7bfed51e0964afab4e0f7e0b07960f2590baae66b1ec9a63ba0fb6c0d27e81508c51487dbbdc9beb8879fd58c188dfc774b3d0ddbd77ee8bdcdfa0ed8a9387728e12b13e8b3c10cc1c132bd822c2147c5ddf9a993aedbf78ec256db1be76644ca8ca7727208bf89732657152d34e948d73c47561d156f773136684d4162d02260300020123d13a95f4f835907c344942ddeccafe2abb7dc4792c4f1e39c24748c63cba933b16be0b8853e058c47a1ae2c4dfff39ec2339b345fe3557d03c1df91a0607a711636c4416ffdb73532aeeb74f237ed8bf971388a0659e4682a46b8327e751034cbf2c87c7828da9d24baf07a742ada34d1ef38ab1e8f2b4f801192c146600709533e61bc2665dc1e9e6441bf3c4f6643bc0c102a10f9a69da5b0e3d0a0c7cb694c682493032b5853f02953b5c2fc0e1348565389762fc2dcfbb34fd305f2d9df080e859396ffcbb7da78aae0a0d72e3de76c774bc6a81c87f2872b6afe97ced5269009304a4992c4add0bbe24e57632e19ad0fe37ae910193aab0aeae32cf6d618ab33eba59f6a04fad00b1d2403396e6fa661d31b695a1b349d62f56c08fe6c6eae7a482177adf341e51d03ea511d7959c721bd20bf371860ecd7fce1d25212891850b85648db0a039e6638d9c78bc958add3e41341536b5007be63fd1f7e3308876bcebcb97dc3b05a7b2eaadd00f8fcc8dcfa7b961bbe727c9aed1626ff786d6a0ffdbd1002cae8a7d047b6181962a686c152b2341c7c58c9f1dab5af424d183ed1c7d003165a1d04ea3683ff31a0f68615af6f91c21f736e67df641ed31b998445afadf9052bbe004d5dad08f62e5d353e42fc35a92242d8414d99dc4e7e81c8c027af686baa5c185e3f99abb3855b22cfdff0a62e2f47a632b7df8e00e0317af5c24ce7c64077bbb15ec27e062070cd3eb8e549ed9112469090ad9a96eb59294b021eed81987178cb2dcff67a9a2e930f6032c753e203380f8a7c987cea393234699de03a1d09ce204f0a8b6d5cf522b6887174fdbccb08f3e7c4fe2f778254465b32766c48812a45151ac37ae354dac87419f9476baa27e24b2f322b2da4ddf579750684a5881bae2269351fb7de59b9d5a4badd8951135f2713dafc57215dc626ee170fae7f20bff98e36b864e1fe0f0f9a300c903069bf0e0b6f2f8e78423cf6063e89dde6c81efcf26ef15510563c84730f611ac879a6628e55115e1a29de6945d37fbe4f803fcf2e344712d9e0d6f6c79f8773a9f199b705235e20a7830ee3357c5dca29d7a6c29a3d2628bf2c42c8f076cc4525301d8e1860729070dc53164d9fa08bf63cc889eed01b0130a7146d860bbc09ead3865a3082db0836a45f5506c3e46e452e298764939226cedfd06700e4e33c6b4a78add601140249596831e97f960b973a4e4dc3fe2813fa34eb47f998ce57270368fb81719a09298a223f7e3931ce5cdfab3f658649533354e982c87dc9e49eacebb5bb4af9a767b4f1c03d774431168cd4fec1b2726f1aae3f9a062a825f3295557eebf3af4784487b869fb049de44d03fee71194fc200af72103b157431935b5ab9bc122773ffd313d52d7acf1078386090fc011de695e71567cfd51c06317d4ff8841ceeb74ad35f4e5f4d20921123cb88bb2079674ad39e133cdfd6478d69c9bddc7a818be5d7b254bd9e0abdb030f52846fdfeae8ff370a51a9c5f6017af3c6c3db17c5c614ea18ab0e3ca0dd5de621217dffa36e5c5318fe191040a50cc3ca620683bc34da6c142e1c50afce28a86b8b66d189adcd755561a647080d93f3ede1cf54c3afb7e863fc8a82a2576d3f79e9b2bb634e598507a3d7d017e0176b7868bff3a3dfb4474b3ce03c401f33929364e727fbf8096b77eb351435c7a113b3215cc6246dd86f1517a7e550cf828900248f7c1754e40fed62477b296a37d3e53231360d012c4908b466e49b0e620c0a5031228009f259b030956ebd70e49357c3c3ac2842b6bd6e3ca5a3e985dc03f7105681fec03b320a7ca753b782ad3b52fd9c8e3bd980b48dd6ec8901dbf756108e85015821c880416e0693e0479cb31c0743450f6d9214afabc4feadb9bcee9def460a58d3a02d9e3039970068b8e3fd0a403a6ca7f2c71ae2b46ab3c731b1e65e2104c47fcb1f69e7c8c6df8c09b33f2e1cd4192faab316a44536dcac608832019f5765cc5240eabe3c87445c980c299a5e7ae0acc2c2ed19fdc8f011515bcb00476b03633c7669db1b44f97f6cd402778e9687c740dbe5686789b79d0b13f784a2a866eb91ab2d66f064c49e8df513ec348fd7272ee548ba08e1f9f99696ffb53677550d59c67f88404f6e610455a422d9cd987493ca5c366a397dccface2bba8e3e99719dafa768956cbf6fd8defc4104b8925878716a0514f70cbf3fa2c2bc2f66fabe654eed3076257e71117665703eb88c79e4c2b94e8e856e7a6ef90ee2a358409db78b98056ce1750eb80725d70e35507fdfa5933a61496ba48fbd5555717b33b59d4ef211fe096aefd478859ffc97a41372023ef114adcae5a8d5e03c21369baf1e7f417cb40326bc6db1cdf0904651dda3c1039a2f1755e7c329f7c03bf33f324206ce6e1638711c8c9a45f153aa1f847cca2a5d3af1d24fe7a1e1094819e8e712cbe10ead1012b7371b35cbcc2bd5b10505fb63bea20ac81d25e83ed0105e7595b6c28400f4d336791ce4a584323d0b455bbed44392c5f86c9d5287593f6986d4b0b8f9974a7a4157859ba801251d3b44b2bad84f29cb87dcf1680d6d10d1bfd59f0c95fb7bd07fdb3ea2fccd6e3ee80af438956ccfe31e750972f893ea5dcaa26d077fb3f09d990c2f41c8707368bba007803621ecd76540cdb8705435d74f4300eee04710a936f241c034709e625b0dd5dae1f6e86d034426819c365a05f5be420cdf4042bbff965a666a5756f67259448ebf742b6ea189fa17a4c3bfaf651d19a8a525f09d9cff637c8fac02eaa58d3ee3f7221da1e61833c0b183cd9f47686f09597e8115b435454acef80c079eafaa22b18927d07bf8b7c5ebfdec9c42a52b7824d45decef41e6184dc2db1505ca6f94172fafc10731706e79b9856dfede353d2eadeceaf72a302e3492d7dc81e3777e4e9e1f3d33cc4402833ffedb241a75a09e9495d671f80ad3acf06823bb04a92b815edd0ca7d01dcb3318c1ae5c62d3e99c0ec37908b45b51dd65f6b45b34ede2d6f553f60a45e20fafcb34ae4dbd375f52a5db9c62650deeee78e955087c2bea75ede7c304347b171fe0c1a2a033894be6e04605271307f307b2a9cf6ae24b8c87ce033a3fa4cf2bacdfcf54fcccb1f580476c7d00c631a8529a9eea2a713610341e0e25609dc8927e51c58a0a9197a54963b5cb95877354f4b8316df02ed2bea367704a12274d96bcbe0d0d728923a368bb8ab98d5db5401894c822632308ddfd309071fb4b477d8eac0ea5dbbc3e3606d8510d9051dfb5e4b7cdcf2c57c1b76902d864c3109c901da53019ed33cea84b407490486ad9f980a8a63df3d2e3921064afea137f35179130db3351f5bc3f5e7d590a5ab08b5415efbd345f9d57b71ade7dca939efa5a12d677b9af0af14468176a43712bde10cb15787c18bf066eaef8abcdea77d3a0c61d6c74ae7b54fe90940d0233e4b874c9a141dcc740d7fff43b9fbbc012a933d890232cf74fccb7ff7eac1148e203c7381b7f1d1429b1b1152ec25cbf7562596eb402a9328e43b5dc5cae36592da5523f0b9907a6817ecd395a7c778daae85bb11372b20641a04250b77b3a0ece885d07faf9622650259b874536d6d2b92181c834dc111b6fcba483167be40ecc922fb87006f63b9e8e632879563f37a8f712db9fa68c1a20ab239c0116fe022fad1279f3288b8e74a16d447e467b6381515814dd3aecab5c2a09c400b44e9100c04c720dc7e8c6d9460002da6c52004c16999975fef8752c2f9c229cbd9e6446b226cc454bd68cd665668a17328bb30f301e92ef5c7a2197a326df5c99b422096de8af231d1d8872e6e505bcfff026d4862f28d4bb3856a66ced22c9b0587451d8da4230a38561b5b1c69b523a4701a2001382aa82fcbd60733a14696a540227db44aef346d6c0a7ae5173604d59eb828614cafc1b8cfecda054dcc7306f73925e6d1af56ed74c51c6cdb66e9fee8d7a0078254fedb0c0f5dc85a4686870709b499eafbc8451aebadf848b0598ce8f955688bd2d6032abe10d1391d67c20a049841f95d2ee0c8deae2bc1baca0c098d8718cba1ddcd968981c47cd98d247aca4f838f3bf16d092eab8be8deb1f8d504d37cc44a8c96c9f22f2698036d4ad3bb48b31f109626565c147d20a4a7dfd61fb918f81548fb4f78875c1d138e819f6822651b93a3c92ad77793fba5222d870ea671f9cac967919d18f96e92778548415b2e170d90b201215354fc48a77e62823a2c2bb354782ad052732f08beb278f751529416f37d83ea26248517ae2ef2ead28c1077908995a2d25db0deaa957bcab39715283287fd626ea7388abccba2d90e364a7ff4284c84f70da68ce1aafb5be0401cb9d45e085aab41892a49e10cbd5baf2c34f5e0ca076f2772abea6f622b66020d546f8c2f134a87f96edbeb9b08394b585f2c2f98aa792f97b43b5f3aa9c34189804a9ecc2cfaeefbd0f967d85a25bf3136fd8132dec38aa82e4af6ff677682f3b62be27a180aeb22f918c24f23bf6f5954e0722324cccd06829fc32ae4fe3aee6e5a03b3651900e13fb0a759e544d033418b6ed40d037b4549a0404792c8fddc317b7f028493c4c91d6773932f8486417544f3d007e5f9e6fc02fadff175303f77f6b0e1f709bb3d3a93b38552ccf62688a39da1a602dd5e122e6f4e9171769ada5255cc5cf938dfefcbe3ab0faca434c42dc8c357e89a3d1488fa3df35c3580b124ba3bf6d0d203d586707eb692150ed05a01bf9de5c4e67bb948088784016394d47abb853f2b6b643a066ad81bcd1735aed4e108a8c1fcd025b548de874eb60de7f3c568728959147d1219e4b830e06ca2bee1f8a035e28a54ee6958d4821a84e5d1e41139905f7ec60fe67ce5f4eccdcc2c3d1e4a753a32dd3004970a4ff3824471822fe2b5010b9b6c6b01336dbf0181a95cba2624663215468519871cc39e8a7f4a151c8bd03363b402020f2fb98069b2cb8cc1b7e930938e7540d95d1d223e47865135793f9eb573660ff79f7ed2fae503e68ba44596ee745fbd8fa562c5c666d174cc01b1961736e18b8b517161ab9c8058026e0ddd6c94aed0086a26e1b959a5e05eb9d8c1ff5b2ef518ca23b4f265db61b499a48cc46bed28d23ffc1e8d9c9e345c06079ad47c88dd4e8e286575bd7f9420ab9c2d5c6685488b8b34d4c9ac04e1427ae0994cf789b48b01d1db9c2fe75fc5187727bb11119f82d0739ce4048467a08cd635bf78cc1b6cc9c28fdc199d351064a81456f81c9e56a43aef7332973804b06b18a26caa62523a7d0acc272ba49124b17bb68800d5756afd34ddb2b7e2dd8a118aac3fcf39d9f853c4d2c4fd3ed5bd25a6604d68d57db93d15aa1160f8a97e6c24238e84f272780966867f9c644ca2775cdac4af0ece036cfa6ebb1cd9d701dd7daec5763c9a4de0385db383a5647918e79c6a6de1f4ee1f6b722c561704c8d7efa4710d78dfce8ad2df0d3d82cbb59cef0bcb001f70bdc6e17af1a720b117fe02bb1dd527b18e6bce70e9447cd0cc85cbcf431fe7c006f5e4ef878a974a93b25f492847c9ae020583c9d412f4124246164d8f080b615e2eee267a7aeb5fa0974de52cefef23cdda7b305a33a91e9b50471ceb72dae337c485d636e28d6ee31f5705983808b1567d4d4ae820ec445c56e6a404cad6b408691475397c0dd6cfad232106ba96e5104052700a653e21f9ac6d79578a9f52548f426a1e81dd45bae30acdd4d22a2dafd633564d6b2f45e7d35413503c955cb0a9784b42ae8c2a5933a6729f3922f969a158540dcd201ecb6e32f88b5b4921914a2e8f424c8b031f115ea5d23a21e6f22439ffd7e5d11b08df729f65613b4f6ad3edbc9a066a5e712ecbddfa6fa764cdf170c0485f82d924a99b7e7ad8dc44c1f93e49b6469a9af3de5691944413f1417b753bcb84d5b7a34f362c383cbc802b0c88bd23a7ac471b9287571c42081b1134bfc8ce104a550942ab1f2a074cb00a90558d6e841ff15cfde6951f03e450a1bfc90dec6c513fcb2692ddccc31d22e5274d41036656183c72fce208e44920776f196193137ac67d6d65ce9cfaae774f23a86e6ee8ff3a4e9422a4667d971906e5496a4e80278774899c882708611bad282f6c1d666bc5e7c40082b43a6e98d494a18e9b3cf7f154fdbf90d786e59e83b72ad0ab893c49aca50ed37ea5202e650fda54f5c46ca2a35c476f4b009c5e6733232275abd1341199b63d22386c484cb95c43ea90e609c407bc79ddd00609cc2eb0d82848db239b249f164b7ea384d0239fe1e64d04955b9297472cafa2ff272c5c78100aaa86cdd8120556f25652a3c12da5853338e3be8f505d93ea03cd1cae7e78e95befdc0e26b760d11e05403c348e0523fe036381408033c009a8e1f117af5100a6eb91f08307df465c20bc1dd029875ef7e49338689f602d98f2dc690a57a6f2864e57098f8bd723574944ad3688b292db6d01387a16493912722ac8f91fd12b748899bdaeabdf0479df788eda440d7bf30d1c25d78d757f00b74bb556506637fc1ab87162f05d464e63a6272db3fe56e9357275035d6b6bee32bd92c4a1dc94778551e94ee1d8854f767bfac3811bd0287672aaa01ea18c25650f05a68cbacd9158e479b508e72df778589e1e03dc543b60bb3b10399e5c50de9e728e69774fb3f5fea757ddefccd0f9da75afe4b67f9c54aaaaf646e858fb001a6deed0a8a769ecef0689c988de566b6015fb8c40aeb5f2df7ea4bee60e8e69d15c4a4aa5411dbe63fbdd6418cf025d87f37362f15e22aba83abe1a3de9857c71c2234023b969eacc0bc526363b7f30b092ca114f2a6cefb34394d146866ac86a33fc497a8cb8e2a5bac398579ff7958878421fb08fff4f8f3deb8c9641b8de392647df3017a5467f9d7b23036935ec6e188dd6dbfb544b8a9e04a4b3c7fa1e4d1d9879daf69986b8083e6eb023a4b5eff80fef17f8f65433c882a21565a919448e6091d1b61013fdaf9fc3e45bbe827c9b4ab10b05600a1961e81d31c7404f8e0d32bfcac2937eaed811db167dfdc29286b0d51bad2bcdb9dea76eaf495a31a7fe717c1c98be374a36271cdd06ed06c02ef4c3c06cb42f73b3332ed488416010e6bf2f4dc4dade6e2e61f19e9306bf941868f59fa0939005743dd647f0a04b576a7e71d4c383c479453501e18ec56d7cb79fe31ff534afbd8609ed701ef163f9de31bc58114399fa0f22b62c66c380e8a10c34b7e731df2a8d39dcf36fbf3a66d67b973e3a94bf6ee0bd96f5c76baa76492032fdd2f59ecaee403d486f543f2cd7ae7b0dabe1b5566e681cd40d384a94349e9668650a6f2d2daf86c59a7b02ba466cd03ce1d50c3f0ca4c02dc4b3d1c0e7b9a77df9eae0bfcffa32117d7e05adc7195f4278c93497401629897a58d08ad7141ea52e0163f14992d7a284e7b875ce4640b4dd48ceedad1ea17d8ab1e760773044845e0899602f1bdfff4d42ab80c0765d1a8bde2ba0a830c050923956d06c80b182264ad19ae4f7c39e43195f7d421bdcda00e3eb5ec5ef2ec91d69df691ba7fe250352acf01fa92af5e2c634b9c7c97889e9147e869acc153d88cdc18908f882f371ba9c1e13c26e9cb8e3cbd4c5e1988080ca65a67b3a4c3460cfadbec904d853fddd2f5375b6070941fca53cc106b5748480213cfbdc1c34320a0478b05f76fd0454c75eca069cb1fa7b21704dab67dc40d041c8a1040db378e76655636ad725219c049e6536982d6ee9f11dd032280e622547c7ff44a938a1f233c356a98182d22d5770fbc871e20bb37483dd5d6ea1551993b95b30774a49b50d411ebe0e8c92834094e23ec2664d822c40e96fb42b8607b62b6949e05edcaa436d0ffac6a8ff384068acfc0220c0b098d368fb8113918a4f8c9de37cece74c8695cef2427e54a6e77ad092a9b7f1d94ac9f0836deff41b905b5dafc58ad6063759b0372a634f69a639e19521825d66a282f489c3172a3659264d0132af3571e637782bb6fe5c0afd24547612166fd3409d0991392fa054ea5bd07a4cd0921a13ad7b62a0b5e6d56cd8adb7f3eaa5c99576941c38aff311c49a8c9d8c755869302a2e5e40109c8365a551cd3f859b9421be189d3a0e9ed78830d5cd6a2414e9cc4c25814d94d98f8848e5386d6dbddd65d22b96c5d20020a5dd409c7e5344065871e57e01c91a443501dc8bf619890fe231319b5480c3879dee618d319962596539e2970513fb5c0c8eac3a71ff99962779cf1d7e916566d0e29d121c5cec5d7302a18ed00be9316f3de8c669a64c2a960a588f9c8a42690f6867cda7146e8ce27aa6a7fb27606eed9df6a235a42d17ce71627446e206e879de56025a66556263f06684dedcfd6f083d6a707e5fc8f8212d716e062f0f7fd0c2fc62bea93d68581265a803c31cac3f8ac8939c5f8c464ebd19df42c7e8998494af614c8383294f3f3883f2404ac10404759e182a038c97aea04a85530ec005e203807c5bc30fa9f5339b32fb0427e64915e29a25bb25ac60b92256470e7de5298d42c6b88995f8d2fb704e49d55b66b71e237af90fcbfd71d9093e1a543da2e9911ac4102346dc4704859cb33ac5f5dce2b3331a9dc9fb506461a5436c89bf90d39afcf93cbca4cfc35da6ddb112243928246ae0d1ba269b0fce0468d3ecabbdb925c9ea3241e2dbdc6b151fb4aa724a42f98b0248171fa01fa103f116d0e7deb65dc359b09126f9a420300fd209508ec7a50be56d5b470e387d0c52a1d104625f9571ce1404d1b7af3fb00475b95f752ab96610be112d33ded48624015781e7198f4dcdf917839471fbedb43c34efabe09941fab6b342cf672a29dbb1eed0db788dbfcfcc63bcfe80f7718571f691818dd6f839e3cc282f85f03fe0400171cdf1235049fa53de7450b4c40ed398d5a486f52124c1c63de2afc950e81839f52d17e2a7d32f82788465a65da6cd763c6360763561ed2bf47749080549b6e2db87514e1ee1c85a0bbd346eb6e3cc29267cbedcad67a287fc5be65ec59ba8b6854b31c83dfc5155187d4150685c5c2c342ed68b01ac9e44b60f0c100a347a0f93074dd37d8956fe2f43110dda66e9f9e6185c23dab74cfca21f3ede4bca87687549ea02662f45dfa0ad27f9959a120cacb7c419810e1b1a50fad31c12c47d5bbc61bad77044aa541d29faa6126c60ef088b82eead17a52843307d4bf798b853d90d14c5347ff10615381d85e964331b7a123d15a77a6790d93e920052ddb4db4baaac5e2b27b66ff955e53b8308151c81da4711189ccf0eb393c5bbccfa1f6c94a8d5f4bcd266fc6a12061967ce836ca042257368f567dc42de6ce0be84449234a6163b72069f25b7ead4b2003e1a7665e87ccf211abe94175d1c11bff2c0b6bc110194d34aab96934ef59804cd26e4434ba166d9833fb091be37b139cc10748b881c93690528a96ccccd2dbe024510b8da37dceab567dc52706461c486a0463369cbb99bcca2e8a4d2e005c45401964722a4b3ed37c351c9f21685e8992c9634349379f41796deebffc2928058c8ef6ea37c6e4970dedb78d1c2a00ea9e1ff1e7708470a6c60e6a2b1e966aa872776afdb238e97f716b3df8dfd42bf0f7ceb52bf9eb33731bdba5987b8f48b4599d67b383e77413107857e951ae0625059e5616ccb41131df9a480efd5beab3a9c99615921caedc53dbad675c00ba1030577db1d22731677914fa958b44792cc9c19e2ac71ebe61a05ee67ae7116e39e1c0d103f18bbc9d531164360d901da8234d29fb0b37cd2a60c7aa2adb2a4b297ea2fb14122ad95bd4592ef86c88fdae1e37dc8e44ad03c0fcdfa3801e93796771c5a2ec1e4ab12a64b3ffe48e7442c6224661ed5cc987aada6e778399941f7b20f16f94fb346b916be87f005c9c13789741602039d38270643cce3c347565eef5ee09139330301951c15756be47994de6f1802dc5131b9b011051b1d87d744756831a71cc8528487f032fee9dbffccc751e6a1ee6d07bb218b3a7ec6bf5740ead7a47b6907d7aa95b79aecedf4a637ead8fc6fb8654c93d13ee79f5d6258dcc61993aebc65e4fc14eea7d006e31f6e9f60e3bca8ce52ec559876fd20255e507daa99b185671ce1ac11d448c30bcdf97b9617195e0ccd2d15246308dd6cda74a8071114327fe203b1adbaa780f3243105c5111636a51dce966f5652e39d4f91abbbb4576234d6cacc3ec57cef2dd4dda49a6c33d12bb7595fd5ab5bb15b40301f34ddfb831a5dbf62218f496c003227fe6282e2ac054c45e7f3fc93e51b3ee8690f08612395095a0a12729d663eded879d9ffb325c62f2cb546a48bed51ae232fa6ce28a2494c132a6e09d98c2e3d478d5d2d15dce2e2665e4a3db448931068b99899c2bd8ba87349b0cf9e3c52cffdcf58a59b4fe0089b298b42ad7553f831bd60f5cfa3e09102fe773e4c05412973a678f3b3ed420433cd664dc7f218e816a17c5c9013ecb84abf2dd073557dbc41b92a91e0339d57b8b077a9a44d56427fec5748c47c1460b2e2412094db6d0ad06dea0aa0c1368592594bf0b2f590a9d6149e44dd4adc4cb42e5d9940d59397b83b33b88604c210694e3fbd84795c80c1b09ddb3b1ec8bef6e9dfc4d7f295e551a79436007ca48aa605ef5a89571e59cb26f2766e564e39d3bb441deaa0c8664549881d90a77256c0f6c77241fd6ab74b0e2890f78ff16fd2f9271ef96ebfbd0b878ba9c703900752b7447f4efaa60bd9dc9cd5673a36b39d49f54274caf03c0cf82b95141fa20ed3ce02ebf0dd74d9eff8eb9e2dd3a2976b244b12fd33ee75c1f1c459f86a1cefbc817f42d7f43ba406098165cbeab99df4fe751ae3382efce32af252e461652c7598161e74fd8eeca474fab6b1ede039935f2fd4d7562623b90a422a78941f47a76863d95857c33653d1b42b806bbafcfeccb7bb4a0c58acebf6104b2570afc3ca88e4fdf2719cf39c964a1ea7d2ae4a7fadc938abc95adac495093f6b959b1347501606b3f960b6d739291aa8c13eb49e98b0f78d2b91400b6d8961cb6165c8b684738e4d4db2f2ac30ddaa03a5e0cde4142b625e81907f08c60d7cb5729456806c89ff0efd08397423e44738ff38f8e88684f3a099dcda455521caca37ab4f4d9ed5d37975d4fdd778b97cc93babc804864a35e3a2db04598152e67a2f1f157681c3962d46ada23ea5d9a524f9cdbdd08a07a3a85b1f6fbde11d5a35c7743b83bbefd19aedf6d92241d16aeca7f33cc51839b75f111e8edaeaed808daf2f43fdb3c6f032ea45052ac31d4870c4d0d76aa75d0b88635ce449054013f234c4a16cffc58c95ba1cb8a0a0399861eecb1039bdedfab4d05f0270c6b16f03f6b8e629f687f133ebf2662c7f930530746679aac2791f54d6a95bfab5be0c33739074ed4e7ae88dde4a8036a7d6095cf41776366b6ae3f8f4a0734f48c275e129cfffff5e0abd042f99a957bf6f0f47fc7288750f4fe30198f8cad7067b36cd87ebca08abd3f9475e7443f83cca91a1ebfc42ef3494871f51f6d52a5524b9391c687571be5327c7c94ee2a096653acb410917fd51e56a92be4f24c1db6b97b465ca84c31c04c2f61eae07e952eb6554aa4d8a380d9ee81c1c462c360fcc3cdff2867a953b655562cd06162af8b99bbe662e0c27ce4d9a1c1a907def48a3231c2110c930a2f1498e32dbbfee0e5c5869332f3024fa5dfb0327a27c663cacd4e9902de34dd93529e90eb347bafa5035f56fc578e8386c7571d1f0ba335225ecd8be026b4544ad70f3af11501a53119ee39a8558ca0ed5b3d897ffb9cf0fcab55a0942d3bf7bc6b94ea27a6b748f2cfda431f35252c44610b7e843ed91ebf7e8fe10638f04f52d6d5a7752ec62350efcb7c473f80b1f2a26805151e8346d39d23551e92fbe372df7979c3f756bbb43f6bed09bbc6b65fe6fd241ae1c2f1a0d0b805c582853b85502968f9478e9a84895f9d4ef01ec4f3f571e57cd0bda68ee1f6f7e14fb6e0f4ef8c7dff6796472a935294fc27b16216966d5021339ded059687355b42b55926854bbfbd9f974a0c26eadbfca8a6183093996cf252894e6db910c71ca3ab2e82d90d371c36b92c9409cf7937bb266ea9b29c41d774aa522e103cb30bbabfe872b57beb027623742806aa7694a859ede9bc1fd7b9e32880b064b0030fce1a0e5cdf3ce558a5feaa32e323dbfab6661c5878c9377ee52a615b7c17bf1228e328aa20f92d070c71561969e1af532e76835fb0436810c3d87b982217edfb1143bfc3405ac9f6f3a50145608dfa8658b0ab642a347255c55b59cd1c5897b2cf625a0f0706c30ca1c1321e90cec57b7c3d1bd1af455e3732db80643383c41eaa6781f63da6233360ee720cc04d171ae2445b0c071e339d547f7ac32f407d29ec7abce0a9e1ef5276544877bab2f84bd2eef47ffa66f96e7170cd54d836c9badbc59435146031502c1a3cc744a470f693636d9050c5b894d2d6047df60eb0bac16d905d46cbf017ca69d66427cb88036eca4ea9d0e579f6bfd8a4a850703a0fe49d39c107c9358e98689fb62bd0475aab4b2031446b437c7f9e373caf0270a28d7b15c71f02079dde401e26175bb6e392106a9072021f0e5c5145a1db6f595b032faed8551f6e2ce318db1ab513db876a3eb42d225014949c19543e9c5dfd2290e28c5d72c87223f0195ffbcba1c02c7d0087721efd2af6881dee7dba7565e07abc35bc3fa41c6a4d6a313222ac6dbb117c69c62db2691c68869ac5fc5e987b0ae4335f815c73ea4235da2582dde81d6fdae5911617daef847be17f2bc09edd88830eac03977f89179fe03eb2dc3b38df43803ca2d38455232549110f4580ec3cc04c0d8cfe493013d2cde47c506ef6a8dfc42d998f70378fac5ce4709345926dc477e9e339d8c87ff6287ea6e2873e14d538cdc3f2a47e0e37a2601652f5b665b616a7d1ef3537a3327a76f93990f7694e6484e7a52a10e9eea2edc92b99406abfb2b11ec86667c7af4a333dfe900bf071d1bbcf4f0ad768fae4f450c53817c507d26e926e753e3395201d3ad89061f16706d841994abad283f0db74cada25beb5fe46f48669a62e0b849cb77097e1b4578b45062af4a071b04f0cfddf87519cf2bfa10ebb4b860239ff187e6dad73806ae968e6ac0f738baa88edb3ae4883a9e59be7a6b222c5f54818f95578daff9fc7a7aba8c4a41a699923e85ddf24a32bb71c808516f64d506058a70539276d57984d75161cba7d53a4a864c51a249a6b8fcad5738dd0055ba8468b56579ba5f102642df65c598490f3a0c9b1064f4eb1962c4c38bfb7d55d496a0b0f7b3f90b42f733d112c89176aaf937eea4bada845f3ca4e9b56b3a5a06b4c90fa4c1914ea47020c2f32531e270007ed389246906ecf2c4465f7cc5d6a347583dd73341ad97199021819be81100d867d628323ef7552db945e4c0be604cf6c4a8197958bcbd6c1879387d3286dff979632c54baba2a35ea84efd7726b662b94fae61464d069e0103692599fb86fdc3a06e01c6ae3deb3de6fdb21806c716e5f82b784e4ad3f0e2de629a18e3a2309003dfde9dde8e5101b83312f76e811277afc286b56879f4eb80468e58c60bc088284d05d725ddfe3185b7c51b472a7ff7db3930839142d4a452ddab628e07d43375801d7c6a711a55b452748d770b84ede35920c1ac74b595baef963d21df9418533fcf959593ccf5afccc753e86c4ae231eafe77a158c2472143faf169db29bf2b53c3288d8b3c9added65778095f85e2cb471ab58362041f0a27d874c42bbb06385a0403ca193cba67cf70029cdb7e73c7e2267b856fa0b8dd4c706b45e7174659b0ee2891df911724324f7ca5daf07c912b9b2abff762e62a1817688757492975db7185c4695f3a90895634b8d07453b36dd95197abc31d5d153dfb0d0ec92639540e99d6590f9b394f14c93a5e829fbb33616e810f59c502be44a13b700fd3009545e34c211abf9afe1bb8ced793c6f516d40010649f83a78ddbe9b71d8596582997d0aa54192e1200db61dade30500d72a184ca7dfcbfb80e5442f489d316cc8b75005564835d4b11c482e2c4d0d160f14a8b13ae0a0fb0ba5e3b782770aaca357df0e1c4d1c3b28b776a8b3e0da1abfd4f7190673fca1e1c5a31c688d6e8ddb21300e4178d07c4e854a718ac3f672b0120d6a54c16957c9ec8c444208e47737bc4eeb0bf2d801eb2fcb72f91fe988aa75f38e6cf26e858dc2a718580ff5d281d13e8fc3e3bc30c75c0193481c39c375a5b06b962d9491f3f1fb80f1cb27067f0709e0b0730573a9b5f5bdbee1708ad84b4ceb1a9a61e4c41e90655764057bfa07b8c81cc83a315be1aed6a49715479c0fd0f53f625fe6c7f36fadd001149ab978532e4d0de3d1a38934c74265b161899843704fad16ffc6189f42a5cadec98603e0f98c6889bd4a559079e074cb40678fad4690a20d988735280a1ee8ea71275069132101b35c18ecc9d3c6eceb4cfe9b165e4b6acc17d4f113ef8283c0fb6506f5635401e916d4f7e7bc3cf49aed166587a0c72cdbe673f467d81bc2e9cd08cd8dd16d90b353481df31e89b45e8b
-MD = be3cfa6c965b2ee4e6fb0236665b0b95f66c8da8b338375b7393672283b0e50b96112d7cb76fffaa6db8ea4a7687fc6234dc1ee52e764d69ba8ac40c0f51beba
-
-[L = 48]
-
-Len = 16
-Msg = 3a35
-MD = 87bea682792f6bb4977fe1b92e0cc7017413dd263732c3604f0ebd63c2817ce5ddc5d78c0137f614a06e72ab1cab2f4c
-
-Len = 104
-Msg = 7db15b3ee240b45d4610950996
-MD = 7311a6356ab38a690c0b3a1581c3e7b6de418996c05e79849891b061c51d53dffc0fff2b8ad1c1eff165aee5ef6e18ff
-
-Len = 352
-Msg = d2a1efc725c46cd6a19760f49edf0bae823c1b4992ae2260085746cf65833bd008e56e64002383f51f960239
-MD = adb1778360ec659e90609e74b6af219a01a024f216b68aa944841429ed5b03b139444b8b848f73fd5f350ef02d46b6ce
-
-Len = 1016
-Msg = d11ad1253592c094746da7b5c88d329bc3ce1929913b8be07e82d3f6b7a536a855f31ad197376eba6f2f4534413fc4e4e7673fdff8739f774a710754b568b7c61a473059a41c98aa4e86617aa66d2601d0f0d584cd9f132afeebdc0ce3da6a8b290059e6e4aa080c195c42ae7f7e1e99865223439929b0a3a0d79b46ca6419
-MD = 0cbec7be7299f48f043c3d1aacf833b4258c32190a21a8ac2471666b4a51b63cc77fff6e081aaf5ef21b1b7523d65763
-
-Len = 13696
-Msg = 2f7a9929dffaa4a4dcfeea1fc37b18e3cf935abbaa17cf9d834b3a8d61e9fabfb7683cfc387d6f46ece3f8bf845827c7ebe86a651d6dc1e83c5772cee1a9fee4b04453af2f68430bd87835126cfd1b3f8beea4d3822fb27864570e255cb65b414197480b6bc20a39c5450adf2474da93d72f6ecf8063899722d3755b7a19f71e93e782d89593ab19ddd3ddf053c54e0bf832311fbf132e8b9e540f38e4d9bcc3cdbf69de54e40ef348a9170ba2f65def167f568ce846889c0161448342fe907718a465e451bc1b0f2e4f21f9b911f186589f43dea305811473837c063b915d849c20deb43323bab4b64e61823f1df119e71962dd975700391b411f8778980a3080ba3c14a321d32c082d416ddd2345f0eb751a516d44ee55222395cfa11e7fc4edfbe7cd49bf4ebd4d7428843a2ad5538b3cd201ccd431aeafb146a65d28a4870a6948a7cc0413b0adac7e8dff3a898aeff5f4b65d10b28ceb749bd354c061c3008ec569d5f90a4d4f5caa51d35b49dc4028e738c8ff5939fef3fa202fed9ebef6f2c7dd0ba41cdb5c0c16985f96fd93a65d134fb4a90ffc0fb6cc5396b843c2151bb7c9170f2fa4fb44292a4af28df5481de0c3c917ba1c46467a35302738158493fbf6a0422cee558d4bce3d78e14b4fefb65bb05043e2cc2a6a8ea64565ff6ce2fd2c4f43fc02926ee44ee02fe1dce25cfde0115c9396c9ea06269f17b2caf58e2332cc1c8528d9705c70da1f76f22aeb1d1b93449180640fb5c4c4a708bc4621d7d2bed5b1a752191cfdd45086d34f247ed1df0f24e7c620de32bdfc4d1f882380d2cd7467c926f48abc75cbfac8788f88cd9dc5361517a5eb36311e6b39e21a85fba2038fd47d860f776697bb19cdb5a4d6746fae507e274399c91648537d905015e58910117e5914f44ebcb00e771d38b30c1473e1232d4e222cebceb4810c48e83e0fd4c852f4fffcd643c0ef9e4fae2d0ebc6f102f3f749b02a5e3a61517d53b539cc24120df3957a633d50369d46c0c226f8924cae51dcaf54d716f61385fd8cf38c2c311a32bcd6594d6930133dc18ef36a9671ba8b179abe95f588ef74e8558ebbc974dc73c26bb6eaae78ef464181e18b71f4b0f986ecc8495a9c4dc0b0b96be9806fbd3d32952ca3b4737a06ed6561e9c9581a33a720123fbaa2a70fc3233b83e56444f5aa0cfaf70fb24be6118404f3e11e6ea004cf2d079a3e93a8ac1d4e297cf4fc43851dd26314a7ed6a5a784b386daa26e50c64692f7db28c21d82234289bb45bad5042236667e6d70a24bc9525c3adcb793a6a5725d9b10911e3bc8e3fd604db7998346e7f7dd1815c0cbb735a977bd4b32b5b976932bc92ef3b56bcadc089045ec95f241cdb0a84c67f1f76353da6cb493bb27a881d37a2106b8b3010cf935eb3601ce4dce3e449eff8331e444ab117a20809a1010db4cf3be0c488f777b6532df908112e3d11592f04a0cc16232d62340cbb8b5268a662b8278d37c03d848a04f0ab498f5af43b0a20e310197b7e1395a65299fac29f051bcc5fcd09a5605bfee370ee8ea21f5807d9748acca815a44d81796d68b0014eed3bb6a94233fc51725de3809ac6f538beaacf8cbe3d96aca21a7a763a957f8892f22c6d086d9af2e5ac9d90321e186584f17e964c90739559ddd034df076c4aa38c2b78aab6dec8ef6be9adf33bfb66f159ec4826653ee6cb483539c47a4a1d95663e6cc7a42a3bf628623a4c9500a59a50a312aa104b198ce5f3e58952bb79ff1ccfa9ddba2fd4705e91b5acaddab9d6522d7666264ac5f533b6d8ac4512d8371c69c06b6d322b046ae2a0a20aec1c3bfb05f3d91b9044cabdd873abb5f2b0e3e19740df31e39828f9ff9bbb20b73541a7a70b8174ce4e43e0d356e629cdbc6c08d29bd7acb6a4347823075683ce9d7de4ab3ddda6572b175951f30a15263355fe9641b3322df7dd52077402a884cd472e6d0b6c34cd63ab63cec8760c7ebe384f7cc31066bbdb7a3417425e039c4d340166e4bba4839076ac9457c87459c57957d0a06dced2f7a18acd22b7295785dafa435a2a8a2c3a1fa05d115fe129d19fc44c5a29bf15b4d9c2b375bc8e591f92756cfc573a39b8fccb8395cad7617b11f14a60e2dbf69b897844cbbcb70363010f6e1bc0590ea594aa924597dbb32a868b55551789f82437180b85661809089d34a168d44b4d788dba23b13542715843eee797366d9ce7793e72331735bc78cd61b13421a568ba3e66926921c04e9d00888ba7ddeb474db63813756ea4a02c1823083e36ebd2d32d5c88cdebb98d511304cc276c7799cf84a1699ccac9569b13f530c762732e6bd0f8415001b2c02d11dff36660b717054b16df49ba38425e3764a56052ffddecdfc686aff22079897376cc15591e11579fe4feeccb55f
-MD = 70e1259106fc7a7c6be11d95fb673bfaf0074e342fdaefb458faf4619e7f0edbd68d509b9ca7243d2e5e039d42ee3b47
-
-Len = 100816
-Msg = 5f464d3301c5e0871d6b41b002dcd09abc80a805de3482d97f3fd7b9838745da1c0534168f76b93c3c53bbabd904541ffe5179cae619dea77446140b7400f47d242141c7f2e9894d88f44c9e066861498e7394f206f594a419790d697f6a11187f84bc6fb288186109343eb11172bec076d041a4c7306d7978c009fc2d2d62563614ed3555ba2d21c8fcd70e8389352dbe4ec808af3231ce990452eb05b1b0dc4fbb1b4265e69235cc3561dae4148c386cd770474863a84a822b2e5f905fc255d55f90bd6a760d441dc52240ba7d8c888a5283891a2c99963d1fe680549d6267cdea92cfead167f6c49663668f2bfdc61fa647f5abf3ce5ad2c6c175dbd456ba41436aa06f5f68f5c88e6b74ea86a79934bd05b486210d3d470a0967ad6d67f7385260578088d7e63197849354f651aad07e04ed301f1fe7a6d2047d50ce5dc6bbffbb1da6b47d740898f4eb54e3c5a1fbd18ec93254cc01f705fce04e6100ced132c519674b2345547804a372b5c925bd9ee9701527db33408d37b72f8d18b882d3c4744eb58f011d21fce336d426de1fcd5e09610216248b51fe2b79b96c2bd6ca0155e05a8a516b7a24d529a9a475284735bd9c4c437ddf399864b64fc5d0d6ffc4e5a7a3dbdd476bc39ed29a0a92e1f2b6b3506c2be5452d4f896db6eb4f895b554b2af64c4cb8dc2369b91022dc50b7291404cc9605c31569c32756a64ff8c4fbb0f1bca346c7b58a5c6774b2fc7f7fd50741d34c8564d92f396b97be782923ff3c855ea9757bde419f632c8399763003b58ee9140c2d62e914c1e1fa742661a9166d42267edc40905b35a25d5c3cb3fb457376b7422896df7bb19c23e8f764416731d2e20cf2c1beb8663c07edd8f105e078e2fed05c5e5897c430017fa2160f565a75a4c5c64a15dd7d644bf355d169ae2696ae5ed1a39e8f81055cdf315e5b0c6f9235515fc4dbf30281ef17b83a6ed604f89293904bf78c7183fcb0ab236cb1f8935e59c51559217efabc000b165d819b717118a03facb61a13a99b194f8b6c7ddfe5850127d79078397a56564c7ed6716a129409680434061b2a4782c9006587de927c1ae09d6778a5f1c39fc419fe10493eb0d4ad492fbd05485eee7913c59df82fe7182af2cf06a6e8edf06676200077bd1408f5c1cec537cb8566470cb44895826d04ec20f0aba4297c501add65c75d5767ad2ab63aa81b7b66f01b32590f1d55b7e50e6df1ee077a19c8c895f5ef62d452cc336e9aee171fa997ddcedd7af86e6cc37722fb5838a46c5e58e7f700edfb7c6bf832171d9581f660752867118e9535a6118635709d6f1c1cb21b938068958e956149d9bffc67f355cb88205d4894ba97c3e3c8be9fa2d20abe79f3f93a6a2f4f56fd075bb49a4b7dc83630e58c32a29d757fdbcaa607352f65483cf2cb4208a3bf94ca7a25e2a4e05279be31c33696c10fa4971d1b64ee938dd299f483e5c098845749a3b706a787529bf2ca56693d0a7a98243e6482a43e1f5d3086ca1b00368d8ead5ed2d0fb79b1e2f537ab9340809ca3a9b5eb2900390432293008ab7086c2811d33de0648be5597ef002c7c462b5e0f4e0b1720a98b2299ad7aa55eb78f0c77c2ab4371385f280107ae40ebf814a8223dc74f31483c63d9e4ed09fc7e5a51bac34d69d97163116a66c84ea9fe4263269b71fd228555ae3cf5109c4d6ced7b9049a2b8069bd2f71834d6c07fffbd7561939188bc07dcea08086bc7182a5270427c3199bf5fb5c4549861fd32a38ec81c4ab058c777dc01864787f0275f911a17838272cd65135f66baf06d8d93bc439eeb55d50b7c5adafed8eb8140b4b05f59871dacf954f4b096c30b7857774fcd319c096750bf605db8e31fe02cd1b9294eaf8bb009d4609f2cdb3a8657f650501b8553765de8f572fb91ac77b35db35f402453e5c58f60146f2906ff56b9c6b3a5d0bb6afb9e2201110919ac9c01a7e9750dfdb2f72afbf7a8d6f64b1c68b9de17a2c9abf289eef24074eee9b1649caf3693118165503a30200993d271aa31b8b92606a10a52612dd1fab495b82f9a98cade18b9d8a723a71ceb63fd1d27372bd281f9b40aa1839b0cc2f2177a09aa8e7b159ac118d7c145e7a4f032e788d21facde2b4dbc1d5d2238f530d9bf9bd2798f611d03ed8919f0c85bc2da99750b7a8d6322d2e66ff6ab9ebaf7424e8c1c3f4fe92be61f65359106395f5ef995e925be3868ad513f561f873acdbaf18590c903d64bd275121c11ea655124d091740887868544c5348664399d3da96e2e35fff34f062fb939d656bc072096e510b40b2f75ff010af68d64fd0acc778e2e13c9667de266b1816c4ac449521b02bbb217002c604be72e73051aa9048d192e3210a68769dd2693e5d44951711aed3a751240d42f8925844131daa36c51d7d59bbaf99623fddf1649db954705fd6f3405e63894f5258c9ffecf83208c2c90cc55b1a8d2972ea6b3a049ee54942b50526b7930953986e428b2c75e47ed870bba68dbfa624dd94112f3059da0a80c583baeb570fe8314f5c66501b34116c81148dd22396fcd6479da49f7e952c8084f97d6803ff85c3787222064ca368f596a1ebb6dab20a03916b3ab071c927d87fc10ecc4e7ab4a5761e3eadaea4de1a0dee30aa39a9e4dbee047201d7d8a4df1284cf668ae3ed7dc4cb2cc4b5cae9307353fd2ae4c105c5d9f3bb021535fc3ae9bf3ff54ddda8b2e1037cd9d69822df436dc1c750a9f557d1a3a63fbe73c64261dae0c70bba6edb57519f5b957f138d1aa5fefe01b73c1851aea42938147bac2762527a492cb85da43014c876e223b05597354d7c9b328df67f354d168a84ce86dff57d8a870db034196dbeff83ebef80bbe52425a8810f2c9fea29ee688a201cce4a5f447be789a3881a9da3b6c491288e8f1091719032608b332e0410f4576597e17e0b5dde305f069be2e80d565bb979a3915488f88e3ebb90e81c264bcaddd72b8843af4a4ae31f723d50fa0995b027c334c351128913bb93e67b1b08f101f6b8dc8202b44fbc3d3dfb530f66e5a8f35e69725c86998c05ac87c561a4706e90fa095adab4a566da4fab82bff6b20076e5bdf62dbd6614245b6a6f8cb6bf60106f8d12b9c3e26f8127dc547e2181531ce980a3273f452892110cfe1ea834a30f99d66e026a9d22dc76fc3cec8fda2d7fea701deb84dd45c97dcde57a017693e90983a156f11c4d168d89c06d8a32dbfa590adadd16850854f24bba315b0bbf372f03711a20163afa0c137383b9120b26c59f5e9e7cd2ccaf0ef4e0d70d5a81748ad441ee5fe178e14317cab184fe178fb0cc0d82105d2f423467fdcda0f9871b9d84882609248356f3053a99866dad9f9b0f8c4a897a8cb8f30365a7ae5f3ca6e772d863d445e6d57c6a478e35d719d0e4e84f3a30b1816ddb55bcd79df21ea0e95da72a19cc1fe74fc576120bc108be3ed4cae3bea889fb4ddd67efe858a994237378eb623dab070d954ac780c1e6d2095383c98ba622cbdb18fb53260979fb2672c21a4600f4bf06583a112d303096d4e30e7e1060d869f386eba3cf7aec3052ca17593dcc9969fa9cd88179c262770211cf53f53f175037a5cd445d239cee48f7ed0aa1d715a22ac18a8aeecf191d415e4afd92b76c091803f4c757a9e89f696ab7b11ad6d5f24774e4a004dcb0e3f33705dd8150431f051016af37647b9e44b10bef114276d4b1055b634461c655a82a847639a038ec9f58876e84e9a2955b696e072d8054c3f81173473604d5fcc0a75b4a340dba0c375beb87b8b01a0f2de232bbb8371c3a9d27a0ce521c4c43dd3bdeebf92f42f87d88978d5b4e3e563cba0e5f59dd29c31096885b113ea5c57e66a3be015b703bc26d3fd1d51a7c14f85f65747ac909d7e30c8e800be27eebf4a62e42e538ae30b6883907cebb7fc5e150bc9da3a138f394e817df9a9e44420078f30d0d3d6981ca581791a097a5e3982c983d5cec239096c7d8cc55c87242026d769ef1d04eb96e5b5001e3358af88d417cc61f107659791a35d8b5f7a5767ae24d5b2ba7aa12230076db1f1b9b6f213dceea62949d98bc5db38743b23a59ea75dbe4231a285678f5f07facc053c2048022fcb01f15e8c100d64a877ecd56d196a6ac60ae35e0e09a517224ba409ba7b70d8f9fe65bc427b212a4e9b3cb17b0d332267cea4f3bea7c1e550f7ffe567b20e3057aa0ebb560d00d28e2f7aff718a9f2d4d044f0d20709bb9ad567c98cff7c4810e8c542370cf90a491bc1088f69998d59f344b74db6c1bdb61f284e99b517a11452ca0bb37c7bae77fca6514b341066086e600f098a32a92935380a173c9182a2513584c54ff67e580dfe16b508acf1729a3d649ff1eae286bffd688fe658612d6c8e69e6e7f7de4ba85ec54747cdc42b1f23546b7e490e31280f066e52fac117fd3b0792e4de62d5843ee98c7201529455c85b169fdb90cb05e3403cf2f737148bd20a53c73880880a14ffff37d62130e682e50bc7210ea6c1f0c27656cc1785a0d9ce93ff94dbc5b2877519d9bac4a339e98ec594a7cc76f4ddf994fee8070dd4b8e0fe0e51b93105fcf566f83d914dd862b4ce78de7e9e16f142234bd969ff8005dddc641dcd3c7cfbdd6113cd3ba34a9503a0f433899e90e158abde2ed4ed4b3711c991577c5aafeaa982bce80835f8e6d7c7975571fafb1499991646bc499ec32930367d4b1de76ff656442cab987bdecdbcc2b2bc35ce01816594bfa4b6e33080caa41dbdf8ebf2205649f98a2d3bf331fb16b9ecd1824eacbbc9f81297b115b4d36aa7496e05f7d40d4edd1886c1bac10cf3f97840a03277e6369e7a7e90d932050ab8720fce076de5c355fb17959bd75cfaeff325b0737f8f5b1160de0b0184ba04afcc30bca77a6a37e29662302d01858c0bc1d32b883011b7df5a387805296cd91bbc835a3e76152d017ee929d4cbf137eb78db89d71617dd76cb00707aacb8088ac77a1f52ed710331193edb29933a7efd8cc153e6adfc2c6637e88cd86b06036b8177847b4d086b0ff9b5dc91f3cbd1c08217023d7449253c25331594f0f16a3c5f2e122e0145c4ec94f096b45a1fd0b2dd3f1d51e58978471782a336eae49d7bc4e050d1c6a391658f71a1f752c0ec6302bc2dba9e3766359359ce34955a2db86740c90d09cc50e92dbb76e17a39955fa7108bddeaddaf860d1aff14acec8b609ac1d336270a940604209df91cf45be72edee04277d694a6f968ae6d8e065702f3d607f3baf8db4ab7637fa4c78bb0b7fe69937eb1dcb616fca564a5a521e12df71fefbc321187159bd6a47b066a3440ba634de9153a94546b63aa33aed9da2018e1f30628df37f5360ca4f2660a46ffd73e58183e8abffdea25f7bdf798a2b7cddeaa481bcc6e682a67e99143066963d96d4a928a478951dd6ec59b1be8cb23aa688e1867738aecdd9afade39c92c0b2572bdde84eb912ed990ac618834c412231216fdb84f1e01b3f8414fc6dd0f646fd0fa62bb0157b3535e1497c9272df1cc5dcd4e6ab9a8456222655c56ac73fe0d2aa8b599035daddf0986a45b1a59510abe19a11b6dba065c8bcf8a85d20a3681c2414dab7c036cc1358b1dba98d6ae62c5948c36b5b3e307a6f860c0c822ac724a5c917ed5f98ece548a7a741d366868e6c676394c3659f7f6786594196dde332543376f9ba0724b091d30f431f91d919417e5bf7ba1e9a21cb80f6c204c3a58d59d960a5788b5cba5abd7c7518f4c5170115125de97009a6c3fc4d5773e4f57fdd433eb7422c7c4dccee57a1679633ced3b5f08df763d4577983c5ca8b49bc4e08fa76f8bff36daf0fed068db47f0c87e0e45d518dffe37c129cc6e2f5f9e0430185723098e715284a42f302a6b8368a4f2dc16f534d1e5db9d0b86659fc4ba6f16c982774115d02a57684c7e5489b1f491584b0f0546e4194a6041f5e5be3bfff3852a4fc772d83491023a61a37228ef6260edc0d1cb972cba610d5ad1d92d554700771d8236ef55e983765ed8eb21e7de7c8bb51aee9368758454fee4a3f32179c1e54af1d069e0b9728cd0554351907e018146511e4d6f0450b57c8ebd21c71450116296bdfc779945da60b9192c5bb9a67b1f04d94992df4cbb3e30732dc8af2177fef17e0b7d01740b8a64db16bc29c1e589b6bdfc967edeb2ce8a649ba892bc856a929f0b837a838ca7f917a52436ea3d20e72afacc5b9d58a7fd0fefd96787c65ffa7f910d6d0ada63d64d5c4679960e7f06aeb8c70dfef954f8e39efdb629b72979be208d616071289cfaa0756a4bb5eea5c7baf8fe7a31501e7e2d67d708d461c0c93e85f03afd70bd9e16437171e01a34f475e4b5a58d13ce4e2fba72bbba93403f3f8981e0bbd6a8a6223327bf096c44b36e0ccbf7592a98c1fa67f198b628787ec80aaef848b4fea158c715799e6f458327f399e6420f0e7821f2dc4663bbea065c7bdfe830b6102e2e7193381b9dc7f2381ba808c43b8fdf3addab4b5fa81564716f7d46e0349d9b27b559710d723c7ef2f79eb55c3a9d75b99ae6fde6877b278b583f8ae3cae776b914b0cae0772397fd19b6a27676c7ca02cd07f4b4d49bbe1ec87f2ac7e39e5f7712319c31271dbbbaf4b826af8a9f4acab696c62719f7a6a032c4bcf90922a3c630647b7c1c7b78b10afbd863f07486561a0bc8d9b1ff5fc41998a7e3c604e24af1c1df2da1dd5d83eefa2e4012f7fb5959ef9339574367deff73723484b5a969c8c23dc251a3b887f34b9ea09c9a1838e8aaabb254445d7556dda257dfd5579737fe1dd6c67f3851ca68b011e7cb7b6958d588f143828f0bb24fceca31b47b77d1ce05e75ab05b55d6c9f9107f0c738f2cf8a1629f7e9b2694324e082503937ff8ca7c5098f770289af7d038dcedcf0ed77c8b82e2a9003a6f3db69e14131e144f6be7cf0bb5353ea96aebd78befbc6ceae9bdde97823cdbc5ca8ef8a993a9d9383aee9f2d6a18fc64ab92990672ea2dc9b89ed248aacf7f1a513da43fe5953335afe76d78867a066f226ae9c727c6c60671c50a50732698ef7a492d51998eb6da5368a667baf6d12b77eb36686ee0ca239dc6f3598be0bda79e47f0891fe4d8989df8c685480de11c148a2b44c8a6bea3a50b09be557c51f545a09a30e9362cf3080e6a6bee3dbad370ce24f6c5a6f8091007ca195057fa3af8f99703a601086c2a1ffe55fde4c2c4153dbff8d6601ab68743c0d50d021b0b3099535ba6c40f866ca3ff0df7c19d709a3f58b57b40ab5e43556a8c0c1938c875267bb39c0db6b45840e8ee7c22bf6b48798bd744f70e42fca343a8bdfbd7f55f275ca5d62c7288756d4861fba68d16d842c5b893c1d8171bb3c8b593387d3426f292ace5cee7753c9f9a12e6bb9af5a24192e4184f7d3d191d862d3c3dace7853eaa235b6369fd164e5a7bddd06daa3eec7fe4130e82478d36f88a0999cba1f251ffb3a7689ea2baf016073193898716a9f933448d7ba8e0968c669bdb7dd5e6e32fd84a6ce9e8632b393f9263532ec2107b4c0d2abdf3abb2de2d63511805eb58a70bc4ded040d76640af60ce7f03b9a682b8dd84ed8a47225a48e0b94ea47828f1c8974cd64e5027d8b13d43519875d2bbe4461a7f0f5b5b8d63a472765405ea9c994225806395e64dff88506f7f7f3b6368d769e6e550d4e3e81efb13771cf403e855f75312f1383ce4c2744d0b4e3735a0f1e1b99eb014fa60c0d1ca9035fbc4403330c2fefa8411fb7c3d6ede5b5c8f4736106bbe01923d483a84f031e9685a3b6a70646a2a5059ce35fa496b3f21fca6047471a5bdd33908cc9328de9fb032347c249bf7093390b750696124621dfa67fd9c7fe85d6e5a4d277ad8f8d169f8b5e8dbee280f8443518bd94abc5ca704e781e6cb1868ba2d6fbbaa850326fbfa5a20e4df6fb5f8ee2728e86a758763a8af21e1f7a8584d3f0b09a0b19fe8fcd37bc4fdf45084d7fd92b80544f29aba52496e2c9a0aa4adeb89820be321cfd2f0a53585a15d04c7fe4ec9be6eb5df419e20b71506c1f642df75c53a9e3b2414fe6102fa8af7be3f6c95de824c31fd6fe8ef9d49e26095a2674a33cb574e9e493939bdeaf5b309b4c51256ef71e95dbbcee0a11991693b533f916e1c82ce86d65d89b6d596017fae944ec364546e78abbcbe4322b83e2fcbb4c5d4ccb54d8642c7eb9e28c08598a356a5c46f8813e6b63ec2f3e3bb721b726361f85a734e0514f4e9c4732991ed3998b1ba8f618c2071d1b943eb0f8766fdb7f0492421429bd380deca3325c8d5c7b6ed16429539ae54f1eba39748f09aa44efb67d863cda304e8653ff7499cfad44dc27807779ef8e63be4b376ec403f3c84eda4e5af31c30f9807762e0980b4e5d9dc406cad4e888bfc3ec4186de8ccfcf631b0ba5831747a1c200d45ea06ac82c7952fd09aaae5dcdf5475da427cbc8c1f71ebe5132f2fcae15975ed6fa14a11b38766e1c446894f31c0496b0e5e96507d28e6e4549d6d78841e40630ef306491a1da60eaea3fb69bffcbf192610e2e07bc1124690fea61980e8ed654c5e796f67d26db5de35b4a2c67427833e360ac2a7d4fe7a5ce572144443ed62ac460c1b19402e85c79e3d80e1c143279b20a66d8dcf2bfe1cc44a0f5aa9b0d9b36c46c2cae148dd0f2ffe9a8e6e7274d1832e57aa39fb40553da6414094e838d613a20ce9307d49f97d904648d6460985b01af769800cff9a940f70729fe40e98feb64ff0a81c5b2b096b1a9d832e440c49e4e3684bd17a5169fe138d2544d9806fec027dd2a67f1856178e090f9bb2f9b314a202e7e95f2e41fa80dccf7b1810e9cbcaed2acc2445d60e26f7d63ee4b28e4299e60ea4fc659e7d6f0de91748bf1ede1fdb2acde9482bb76bf6716847eb2dd7517e0a94f0bbf20f248d2c79fa0f518b67a44d5c4c73a9bbc3816ba85ae8344b5f377649da75cf1857d6e4338a76446c48e52cc7bc7ce283d4252f8fac5e1427299edc33f84798316f77bad4a87849e91a1a23c0b7a86898046e278eaaa15ff33730a6d3f885dfe2d1dc0acda2a9e49a71cfecb7dcaa9e70eaa8fe15d4567a280e8960ba49d5289535907e9f277f96e8e652c21d89e81696dd821db5b7e1e53e160584477aa9e4c0e12160c9956df36cce6f4e724dd543827366010ed3d843cdf4319c1bf968a70e9b1b6bcd8af96c9eb0620c569716b7bc42e13251a6adf8201faa129844b5e1d699cafa1b66a674e732c7662b0410e5bca2704c5ebed7850d0ebb825cfb0627a183cc9643b709aedeac2c06700358400c389f99666ae97ccd37f265da7addeb07df9ccad6fa777d0da2fc47b6235179136bbbb409596841e921eb278142a19e6203c7f235bf8461ccadb4b47dd290d36ac27126c808b866f9531261f1e0f5c458a6bab6f064b4efc432e1c7379f9af19ac34c5c22e76e6e7651e48f9ce44eff542f018397889d896cc9001a63e8e455fbe4a9ee9a740edad894fe1af2bb21a1dd0318e28ba982c12ed69c08835ce17336ad1638af3cfe0ea892ab8e83d3f25e6bd98d5e4d36292992e2122c265a26cbb3931dd4c1b0d0ac5ee19974d0dd45777908bb416cbce52531820effcd7f28e1fb2d3d4d826e1b2673e834485a25af9f9d174f566abc3b36732ceefdd91a7c3885e1d10d51c321ff704d0883905b7539309ba5e7b7a2bfefd0494e90e9da7541ec37858ec05ea9a9ec5672b113cd5ad6ebfc5b8fe40ed7c3f17d8a73703dc89086b4d75c5eaf06b840bb2f5b4519a4fb17bfdca9605f17253f203efffc92da96fde023007d22cdad05d18aecb4bf08085c5ca5eecd21f2b611e7e8a0ef981fe7aa2014f5ac6862fab44011dfd33be8a1226943aa7ae5fee9221b0400d9ac2ce5241b09a68cde6b13c47d50bf310ecb37f25c32770a299020d8500d8a4b5d7621e4379dbd6ef34a9aceefd4055ea6144f54bbfedefb5b5b0fbd1d81c7a51a802072ec3d84f34585f22c1df84caca07849b1ef054cbef9b40848e9fd238761df5358cf55a79a53a1bc749e49ffab7c5bd9a28bf24ad5833facf43bcc3852c1e85cfe47929fc49c325c20d74588eb9833519f192243cf96625057899b70a7c93f8fdbfb60d8129d9c43c95f8782ed8293641ffd21d21d91a0b4db69d766f6d6497e9a414ceb04b65425d6ad6c8811da00639dce8d8030038f2d08330c75b0879aab81bfb3330b950e54c13780d308fceed2a103a1a8b77a923b66aba737654ba7995acd306aa7b80f632184412e2369c353c2132ae614553e626f0a3436959104ba6e0040dc597dfbc3602a49e401bf2249699375b2c722083489f54fcdc1f616a133ef6112a1754818158ff78f245b9046100b0e89407f74145fe336976af971c054f12d98002c68b3aa2bd699fbcd71bc4dc071e430bbf694595a951e01098aaa499be2f70611f248a694539ef8936b2e8b7a3c5de8662436fed1f7bc24a4e5c17a663d9a23b4692993301b08cb3bc10f518eca51081c717ec8dfbb0c2669f7987fe6aa0bd98231d8e8b58951b42537f12884a857e02d62de4fda6b88b6b754b1b27394c6a819e0f92f6b2b2473fe245678e252ed31477cc7ec6895bc361b718fcab3aa550fc9faeccfe77cdb5b151ab1db2e569b5bc923ee26f0b6113504d295112d47218140e44652a10af10a088f95c7cf2fccd040fc93980939122411ec643e26e7d69ced3178402e320fe156e774b75b5afc2f3d6b6ab828bb4993b1436faa5728cec34d66f520f59e82716ed6d1324944c3c91d04d5ffc5a921f4716c39de24768484d0096f7d8dbce35aeec22db11f899e5e7e3d57e7668f35d6c0db3542255d9262137d39ae6cf9bcde254dfccc54a6062fcf8982f781d9ffab2df4f49ec04a72eb9646d63bf9e1799bc0bec0ec7f0675ed9f8dc9b8be15d9f2175dfa1c8bc99071c70ad7bedb10a4143fa91c89f54777f84c9eae9361cf7f4c2b7ab873ee5785a5241db0af86f3c6d7f091623d6dc576d07550a42023633a09c8dfa21d7e70cce64c13f37663f75c47921c246f3f2d1d16a8283ce7697da4cb7e016971a2a1d0c59d6202bc18b7cee3828de597efdab53b33a9fb41aa7b49f1c964512901773bb396ac80e90ba1a94c408b2860065ae9aec64a41d76cf8842d299d0babf14d5840d647d075c34175e26a786f30091a24f1ce8db30137520dce1cfffb6318a0d0fdcac883eac603bf365efa2c806eb4f194cae8c16780342165222192f6ee2e103ae2a31dc08a84dfc89c64d2e9ada7ca1839dfff62ddfb7982c79684cfc821a098bc6bf09f87317209b16d14d45c6f38fc99f7bf9bb73460977bb323665d480c87c687cec052a5f08a2c6744c8e177a8a269b4a47a925b9123cd2c014313edae988f8aeaeb633ee5ba6be7f53fe36da3aa37ab2077f5fd75a82a55a0fe62af213b85e9e7694f78cc2b0e63a8c1b89db484722fc62c688678a511c474f0eff8eef1382946d26de00e5c626ec1d7079445c1b7c6f7f05073249b11fd1fb30257724a14cd7bbf451146bf366de2e826fdf1d25705587c4460040ab963e3bd504755b6aa5b18786b68efd3c8e59e8dbd172346fe7f4a18bac98164669d73984044f3c777368f965763742ab86a3720208c64801c796f6e3a1c4748b81e41ac58dcf6ecfa0453b18fad7e3473604f57f7da302e1fa81ad538d4a0280c4ad092007bb9a7a12907227a936871886c699db97d00a1966fdef64d9f3672f1b792c1edadc6781b391c91bea1bd7275f30859dbd1707b1f554e49ceb874ca06e92ab466efa7eeb6990667a27507a7ba789e24d593ea2af8eccb3862cce58daa63eaf212bdd86c01ed471cfc79b191c481ad773d20e821d18af85a7049034e5a9c660357a4c2808b9a6139f32c55c13282b8d98904f4f027d438189dc9487c96172e50dc1100ccc224e7374cf96ea6731032c43fbc9b367a4d1d0b31aa3fa8eb589672e69f1d9144114bbd508d56c2049ecdbfd7b43545375a099ad2885353d8c550d22dbb738e6fe3f104b444c89475a2cc24d7887daced8fa05006c02dfded01c00707e2ad04c41199c5decc1eae34b0c0abb5a5beee1b5253c3350e1a077682767a0b9124a4df2e8879366fd37fc04d4dbcf89883892f46a65ce3aec22123cbe6b3af6364df1f9f5f9751bc8179b6dcc5c126dd65feb7d11a85994e90ab6342834c79c5f82413e88198c73e932c66e3cb60b6e0c0cf438622e5dc5a1036c38afe9cf13559044a9e90f5fd72a3188ef6b1043f5f4e6b40ea51f6235dcb33b3099b2d8c2e02103235f0476ad51bce6d8a2934068549633e521a3ee4c62c22b042fb86c13c8da849233205a5e277aea1129678c31f5c379a71fe08b72fad9449cb923126dd465d1e0ae8a925374149b8248b3afb69f168f3ae701c00f6ea08fe07f1b5338ce6af2f3156ba6f300310114479f2f6119367c88c12c158b84be13b9c8c7b5dd7c90edb5b3ea1fa5927a25ad6d5596992dcd4877f58a134e05dcd80dde4fc2c2a680cc0ccf3084d3f4970e3603fa6bc5a180fcf1ca4241c0b8a1e7c607dc025016e297e2b0645de4ec2fc49851b9374f3ef99edd897c284a67b647ca8c96fcef935d541e9faf334043ea50b99fb8819ecce039227b624e52d8c20003b5a43808e4990da8e4398c4fc172b983351fd11a13dcd2aae5193d42d46e1b57c92e3e01d23fc968c729f3782d6c07dd5a17af2bda96735c12cc7d8023629fb0125e974425f7914690a7ed26508343ae58c8a439ebb6232049a194768d4594f5d65aca37a5686c2a86dd04bef35d74e0755937ac0ce3ebded1c00c8adabf030e5e4a5f44193b62fcf2f1bfa9dca2a25afaf2f1ec06c5d17ef3526d26d17af3e2f257ded24b177ba41c0ba64fd4fbd5042fbd5961a105e0e9f77f3db13c1b6c5bd9a9d04801a5c00a4c544218a21016c65bdff774a44b1d05256e0693e14d76605d67bd10048d3816caf31a6d10886c88c783538bd93e92bbc4484f3388b61adac4b92b911c76ebb1dd11b7b4e40be032bccff610068746f41e34a1fbfbfe5faf57c8a4331008e2c1cfd69f57e74379ac80eb6769f4ce4196795b835201ce4ec85ebcaf5eaaec242fe6695cbce1d53fde5b002e006bba8c8a1ee57da061ceed0d21bdd57ab0cab9e46bf3764d9a6c3ab19736d43b33f32eb955f9174ee4a54666e7f19cefeb49aac7a59b7370d9ae730b7bb4e08413222f0a66bfdac252fb61bcfa838f262312febfde8add8f6843f1d64ea3da42d4ef986498604d65737a44f5a099338520cdbdb65ce73b110dd4bcf8592a4adc3e0170b13404f99f0ec8f9fb225c1275a921f09369db165e9109dd5be472b9bc1901bfd882d264d9ed8d88b4c8f3b35f88b69e3e4b8ef5debb895be536a3af492d968dc1caf31879d672f70ad9869ea98335cf9e4a2760f955fd3e8099e4b2eb4269e354548f9de9921e50e49f3f5cbd63468b9db0cfdf17250c8f13535d4c0a1f21c87967cd798fe93b9b2960447401ef90db22c3adfba0f55f5585ad37040e8d6745184dd536d5a26edec365bd6edff1bcc616cdea3bfc8b9d98c0ef9a626054e361194cd05b2287612399f6d3d3be2f71555f14ad2893af6f60ab61adef663c3c2464ade671dd5ebc71935aad290573588fe6e11f48cd2b7db62e4b9932890d1b96e1b83eff70f026d199db75fb1e83197c937b672613c66ea131f485b4318e27c079b4018d4205484993bf50ce70275b244f2caf47cb47eb2a9ca59afbc78809a912eb56a4bb65cae4694f682c6329c690003a1c355f779b5857a60091b1c3685995a366cb43d753a704d3e59c5f5003c78feed877351e27334b3fdefe5907edd9eb25588a42248b9c4a93efa7cc63bad1e5900b95b70436c35eb85cc8251c4030fab9556920141cca24d6acd3122b92b7e868dc174bf071117958a4797fc90866aca685f1456fab397ae647ab9970348082bd74865bab7f248568db98ced7ed84e8360fa91afde3f23509e6b4caf948349ad9fb6a4efe0a0468302cae7a0f999195af1c19058669fc3b88b2780b9075dc180298498caeb7ba0cf8bd42eb36b1959d5ad3ca6fd1e85f76abd27ec5fb637ee38173ad7d86304d5708b6dc8817e099e77f5d43c1a70624cdb96e4e6103bb25e59eb51d894d1dc533a74005bb79cca35b66e10c61d06b5227fcb071457025d605a0862218ca252b871f8343ec231dbee15688aeb914c0f16ebabe6edb0a489b2bd10d4392c6f1863bb6a62181de7cef61997ab02f3bad0a893cc0cd8a99cd7b3f7773085f0929de36b5d124e3729140c375de9a2d0cd9a360cadf17b9e45b7f2adbdff9e75b743b62642ed67aa703b8ef33dcf51a50edc7dbab42d3d2b49badd2457a9f92847aa6a60ae2beae457a5fce1a9e485ecf907be22913893cd1350f20fc6c81c94be426eaf01864e813a03e4674491b61516bc95d8a77c15f03d0adfc4adc27f27a5ac4165ff6518eda1a5c408708f78a9e26b834179804a312148d4f75f21a77d78387139da40c0a6293c2a59d0162437d68504f189ed970c5abb9ffc6d8e1be2b0877c7f24b1dc273b1765bfc5ce6f4b8d99a96d5b1c92ee53a39f685b304313d909c1ba8130d20d51c824cec420b0315229df295f75b453a6c131afaae0c36d7c4fff70623638a4f7ded5eb7db58d95deb6249a29b171d8ce651556dee8037bf4ca74453a4a76aab7cc07ba44e55de57dbef8542c3851ea353fb8e259ee89bbecf9ce8d8bd6227afc0028afac48a7acd9b4e8cbe982eb1475917ad6be4cdca9cf6e7cddd971b2924f2bb730264801685d387485e41993c3fa0af9987e8b52c21688fd9a9595ad8d1b9f41e0457be18492aa09f69e64e2954d1ca3cc1d32b2915cd9cf6862ca79c80beb47347c4cceadf48a37b29b1d6de4e94717d60cdb4293fcf170bba388bddf7a9035a15d433f20fd697c3e4c8b8c5f590ab44aefdda94681407008ea48d03ff21e9bbb4ae7a9aa37c855fe3537c44106e8079f18c24d2584474bd4a99367660ce6f7e6d7c294961e174366e7babc569d5f80572a21a4bd7086629363e0c9ee2599c8b8863c96613ae6c32cc67ccafc66e1cce79654567ad08e62e9abc99e44d6a79ca4d8de15b7f8a763a4741676af0e1f3bd4e002c8fa1ebfbb3bd3a65ae68a80c230422f98f6e1e9837252e045eafd585ba389958297d59aea1e8e1f665fcbc5f7ff449996aa712dc0faf582cf3caf3dbae80594f9f07fc06de63d9d672d14d7ac4662b4a54f40d4aab2de766910be2fc7f6f679b5708790b5376498d3baf0463dca2f093b51bb7e9f3e7033ba0384af0174becc3bb477bc5e86959a12a5e8924adf0bffdf5e5b9c1cf24d232881ad5c05c5c0f50318ea83d8683339ca6a583c52198c00f7c1abbda282e7fd3b179297338ecf9c923a3a87a130dfc06164e9b4c1fe11d51b382643de44b30a6831dee119241d1b6f84f2484784fdf65e41f78c38e15fb4b00e45df1edc40e3467cdcda351a4c0a0185ac4649e91024377e1c331587a8586cc0a4dfe29e14004c3536d305f5dee0eeb8c2f216c1b8d27375b239f6458e08980badd6d82e9ee9e007578c0a3b48288d9ad0ec3c934a99a8c5741149af937dc82bdb545df26428b87fc935c05f1a4964a8408539f267e23de9bc498e2a4b0083cdb7c8e27de6252bfaf680a6d5b7ec1a6dac6d7d537334a95f1553324a0739414dbdb50445a767b0f589fd4c33b35905577ef5a53b0f097191f9cee4836a908748779941de2a78fe1bde0c2efd9f48cbf232ce101d9df93d3ed40d036ae7aedc3a5ff619abd1c159ca8d2dbda7de13b4ca62576c7f925c52925eae2d7500dc969fe14c0a335ff95a7df1d276a6f242765c781208d59edb5848d412b11638b27ce5a61b8209075976c2a6aae88f6e6d8704fe9e83b425dec4defeeb3cd311b8c5a818d51f917a8a4525361791d5c4fd5d70704d4b9fa9df1ea119882f400e682753a41931712c043c120a98f0fe786a600b47befefc9d64cc5bbe8a16c191490874e258760c9e4fd215bebf848e0b4d35521f53ec5f9308644b785171fc4cc3ff886e034bd833d59dbcacebdae8f00e43c151bcb24d1d226d1cc19ecf349361530a81ba3168af3df5536fbe52b3b93621f57959df298e5b4d3c14928d2ef7b9c977c7dda54242d17f8661978a62d94d565b00abc199790b9b25fbfd4a3ffc35c95ccafe35d9a138a2c24d17f06ae2cc376e822317f16fcbcd56e23f84ec135dc935e58c61b34cfbf5a36cb00350483b6bac786030e5c5045a6b61c9aba7dfaa4f7fb21897539863ee865ae061a77c0359915de3aacb3b5dc8cfe53c4d17b393c2b6bb23652f36390407922969d510cc97b99d1df4361530aef10707d7a021b2d9576b2d49ca88b3cc83ad1baa6d88ef8c81c08f8baaf515637b21ace9d5cc8fd9fe4ca6c3aa129caea7060791d566f4de8662b90f9e5d849cdadf9bd23cf6737b07ca105142663c30de27adcea11d64d433fe1ace84b0f6917c8b655f2a421602f07e0a7127e61ae9859c5e9f652ec82416fd2566f291f417ecdf99bf3231d02864e2e5a1cf34c13f59de9aa2760d8734bbda79576c62f566b8269990e9384a41c1634271acb4c7a8b768f276685c3a8c7f20872e56b683244b1af562c3e7dcf592a9915f44f886cc2ac5f679c07d5aa1fd69cf3a460f25c722073da336a310aa551062d92c7297002060072af2f3500b9310c239bedf45c5e985c2e0d60c7dd68522376dc7b560fb34d1b5089450c32ffcbff07b35a96bb6fe01259a06868d00af697f8bbb238d03d49570a109181c9576c1ea9d2ee02000cc23e63d6c93c6cf3050bbb15b6f73b09c25da62e5abd4c2bdb1110e1f25db39f04885595cd6a388c4726c8d4cdbad87d80d42fcaeae843e2e17f44c9aed25c8f6f9736c7ba1bbd3b839126de40a930024a65aacb872936e446114e706a868444cb140e53d976816983f3dd1d57eeca01eab8211b7aa8ae99d26e35c06ea4b226e0a6e52172a40e7f0df5f67759ae2ee026749ba10b8e33694c3e01a001526f9d75f6c419cdccece3ea3f78d69014e509c741214581034bbc7e2bbaf76db8421154abb2233117a1ffe2786b21424576e295c9baef262e80fa2edb69aff800b3ea436eb827e8adb73abc48d740b86c69d557b16e874038598b25f616afeb4f4a900be7dd0d38b5b6fb4259c51a3aaf4748d7a445f518485ed72b25c7df8ed0906b74bd29bd6a5724ac3a503c990f3697a5db484821f68718470810862728a80ce34599a41fc5bd8bb46dd845a4812ae1532c457ef4211d0e41835e5a6f030247614822571c930c727ba397e723d6b3aeba9244f054e331c82e65b74c9f6504c74b4301499a1a6f6269a3352aff57f88442d4eda42a82ebcf7776c5629f97d6160bffdd8282a40ce2e6375b161e4c22ee53bce7a45f4774aa827e2da657e1a1bc07445f0bbd770b7a5a25b1b469fd58715510dbf8d97af4e1b9459a20b08a8d3fa9d92feb32db95b22d36de0bc8b1c397b09970a6826392fd8392b2d790dcc1295888f42ac81ad213c7328b2324b28be7cc1f4fb8414a7785472f1dd3e11d66017b1756d1697be92490e15f056346d7e9126a1f35fd76cb016fe2841c8996a3507c4fffe7fc45026df10b03b86fb6cf26e8418926a030b5fa62748fbb728fa19dc2f8947468c1477750771e442e4a9d25b76d359211c05df788ade5b7824f8770b5dac0819737dec916ee59b28a49666ee8b7ca81386eec8049542f18a3207e51bdbc291470eeefecac385c096a
-MD = b70acba01bd715f542859a4224d035eb177fe7b34d5447e099acd1716ba6d00f515bd02021b5b3015d736b04687544de
-
-[L = 32]
-
-Len = 16
-Msg = 43cd
-MD = 7c5f9ed821a021ef1850dd4e0b179a656fbe27b104463720f467db32bbfab5a4
-
-Len = 104
-Msg = 5f75a437ce0698a7d8151c3fe0
-MD = 774782a9c3023dcef8b2cb83f7994324e3cca35323419b3914a9b6bc3ace5ce1
-
-Len = 352
-Msg = f88bac738d1e3e10f75e46e3fe026d7e423fdcf3d7e4028b33a291bb4aabca53f780fbf99e0346d610d4a38f
-MD = f114f1a390bfc30f34652751f3a38e8bdc9597625e363689459b80082eb34009
-
-Len = 488
-Msg = 832e5b78a73a1012ee62e00621db7f4d248893007c6e5d6e0e689c6b291baeebc72df9cf10b289fe20e7fab80a2399271d0ac63766049da875eed56264
-MD = 7d00fe393c308eadb8c0a4f771d409e17c9a796e63b45fc8e84c0cb2bdb62532
-
-Len = 13976
-Msg = deab57cdeb41974037a9bef5e292894038264eb4d8993d4d1501e6ef9c68fb0f571f57b0925640925deae9a6317e3bc4d6cdd5a0833e52fb48baca16a9ba9b6c8ca469a0555763b54f04c87d4e41aa549258f30eefe5a52d2ba06657a8773b0842e094857b6d8911d6a0636280025e56356fade362b4bf4c875cc19be0c6644b447be0454dbf390eb966c03e10e9de3487b90d0825d327c12495e3c89ad09c9d591e55c91376fb14c2fde9f7461fb25450df1a65806b65f3caf4d5c81ebc6e664871fcf915b9578bb70ee6776acc62205888dce2baa4024941209e81b4b35f0eda1bdcbd9ab1d6db6140bda4c41776fe675d5c681da5852d50c246dda4ddf9fdd7c5fdfeec85ff6c883c78689c2977584406a1ddef977606c182d6c33561c39c071668a2515e5aa6f4aa1faa392aed95b82ab32b79a15e3b5a07551ab068455131b72493126470f26c30b852e4415e1d8b719b3803ecc336e4facbcc5d1908851f4f39b776bec8b6b9794d47e5965458858560eed5a0305e260240c0849d93a19787b0f8c795eb5ba32be573845256ae6d0b0a3336e42a1beac8bdde6d1b6e0b6207903d4b105f4af2ef89bd099ded870daea2f170e03bd5f6f4490e60bc222d4876e16d4c58aeea6e6c400dbb9e9f4b2b142f0fc9bdeaf4132ded38a4a8366e107cac7210945fa2df4b124be37ef76290e5b9758aa3bfe0091bb0448206323584c2f833e0edfbdc0c33075fc9647a3404ca490bfab94302a0679a1a42fe9fec6af0cd98038b09ffbecd2832b579b2294f6ae5b96328fdc0a0b9b3a32cba04fa8bae3389c3951173bdc17caaefe526aa386f98670b177683d0b804c5875fe9c7afa233ee66349c9fd1b60bb0becf5e1d887e67fd3baf34b4f90d94699d18d6bb9d77d4af358f31edc254de2d6c5fe3ec07425c633b18c1b9e3606b78b40b543e1fd31fb578cf58c45744fc073fbf3c7d7d607e815379a5fc565892d81560eab8fb5f1ae6771b998c592e6d288014f13ab283d53fcbfa66e31a9d107308402191fac2cf2b799c7dae91b93a7676898b8a6e516a86eac58ed8f6d8ed2fd4d38031e4a4466dc8798b90c48e6adb6b4391d47872443cfaffa542b4b132f6c3408f0081af8692aadb4c9bbd55053ea56d8b82998f6b4b41d331891acfe6af1bb0d6679989978368ea463743b514866d2d01fb9950e8990867bc14f1db1142254adeccf3da812949cd03cd1d569e9d0bab7ca7405cc21096e3cd4d007cbb9629372e98584b4c6b97ad0bc314e1ab6ac71184ee555c01973570ed9b115bed956f9e4e349083013098b1e483f0fe44d5e9849f38a2f7ae152b36a266ea1faf263ea8c706632ba8629602187379546fc6b82e57ededd6d074c15c771754710731e07c207899eb47e8d7c72ffd768c36257d373375ffa06f9b3f0af11417f9ff9f9b44e1f1f96ae8aaa429af88b14da1da81c7bb38a0fe9372ed6a9ac6fb5e9e56b82593d94c5192904450227bf040b7ce0904789f979845e112a1f995c849ec3f7e49bd975a474e8201630f40fc0d80e76019f110ae158cd0f8da96ea4561f24237d8e795ebf52368218bff3e9d5b040ecd2caef4ab1e7127e53bfa2b3b4fb74829f9993ac703192aedef79dd9ad24c2c976638b4575afbce22ecacc273ba43379ed55ceeb51838b0adb80585bd1b5f2707ee16b67a7232adf7163415b24b9ff9dc94b7197fdc89e2a90d2b9eccde45e965edd064dc0d1eadabe11b8ec3aad2742b5d3323ebf913a92817749090c20758f98aef2544d4c8b48874e8936d7ee492d5585675c214deeb74fd67c4d170ac5e0aeefa607c6e37abd4f8238e776fde3921afab75cbd8f392d3e88da057903ce2e140797f4a85737bd89455e6aa27c7535687b78cd0ea59848e006c8de9c9c0cbc7a9f5e977be850adc710503ce4ba7c7bd0b042297f518abec6c8ef451c33e030251f506cbc3744228b6bb4dab86877d9e6019a0ea9f39ed37557b3b5527c171da5f013e0d3c480a038cff2c087d6e5d41b17e6c8f90c334b5e2b9ccbe9d4efd99fba1f907d00a49b71b5a08aedb644fed24bcf04e71be67b03cd20d53ccef8f854f5e9f7f28c1e98a8a53496646713bebe15a93f1ea336e6e8a4e68de5dab0fe880bf983eec75d1c5027357f6669e098411e0bc3ea2293138f5b34425f78b6508b94d4c0cc32ee9afaa409a26e5f2a1fddcd6d5ff42a89755a58b08f243957a2e208e24b055f51992ab447bc06876eba169c545fa71b88a0fc15d1e0be9d334a1dd0c86f44bd149b42c07608a9a30d0b7e13574f8d862f2ac72b2ed38904d7cab194fdb9e4dcb615f5610b24e202a36866baccac01fadb575df11dd43e00a3b92fcdd8c7702ea49d951e7dad2a56c075730b4af1ceda2bcb2310256f28312579fad40ff471336ea6a44143edfcffc297258d48bd2ea47efab8f0dc00f1e6dba1a55009ed627b7
-MD = 6e5905b22cb95e48b73c5a885f5463f554d81257bd26301c4393d57fff1c8323
-
-Len = 48824
-Msg = 5223e2fece634a95e1e7c83ad4a11a0478f4a41572bd66c2d7902cf4f94404cd80b1f58fbcb8eeba3984fd759410c12f8ee922865f363f684df5a8787c87ceb3086fb8535157f7f39653dbf5c66ae7219253838ec77cf1c6db518225c5ba0a8212e5911236474b8820ddcb8111b87320adb82ff553986324aa2a21c37ce4a083c89ce9931290d4c1fea933e31d014d7507a28e83aa917ccae10bed1a490e77fe501b299f8e3b78e659407ce1934d5d68c7980800746f26ffa9794ef1d23f793bd2eab7fe524e213e58280f441ba48b40162305335b3a480c2afeac11c27f8d817792fd7805d4b61224eb52d35c0fbf471bcaede505fbc9398b216f43bfd69b1a669a61d44fd21faae410af58ff95e1c3ff1528de1aba93cef56bff4d714d8c4cc88a4ddcda52444ec1208d99ab3fd9fde98c1ee6437d8d138f62c5f782eb4660c5eb28564b5b0d46e3a2546009148f3d02b837c5284e9f508290270b97b9b29e84445a0b4df662d9711e6b73c11cebcb7120dc427034b1ccf57d8e4f5bbdb84d2e1d4bc3862a2b51931d3c9a7a5fd6ee5f4c7327c338abd011af638d730141b6eafe63469eff50f473262e9fdce636eff4c5663acb6075a4fdb00c8b8a8d3322e1700a5b3e7db90b36c1a94991b8f51657121b442db6f890e208f312466778d73bfaa8cc0ead4edd0776155f3eddf9abb1bbfc0c94421adce83d7ee94f99f61e1f25a55fb596f8b40ccedbaa8e5e2cf629496f5ca60bc4cf36d917da4e2b973eb57869dddc409dd66d5061f22642743fe843defa0b19dfb2f56425abeb234181267b5c0d2ab4268c538510feb191bbcd1631b0af6c7451cd4c641025cd8bde2d9ab6e6b948f97c1ee6f35098d553e8e9da9b4d437125046864633f109d6a558b38b270a7dd1785d44d248a863a91e3db5c0a1d7ec133decb65e81c3402c98ee329f660a092172bf6b1a02491895394ebc506882805a6c93e767c0e58a5af717d950a206c0f0055cb39ed88816a9fe3613d15f608e486ac08bfa67d462d24e6a0a37716d3fbdaeb9c0e951c1e847fb884ebc1cfe707dc6e7269eed1c44331d5957bc4ac9dfeaed4b157204a3080fafb9df8917b8d15aff9c49cdc739b8fdc26a546794991c183fa523d14797e051894f48b0d62c2b70834467ff9c993b82fc1152c1f5479ec6144c7e8fb10d1bce26bd1cdbeec4e95ee073f3bcc3c7367328e30543d371b27509a577f5c79f14d5f687ce62b82f856695af9f7dd350543ec763de75b593f1859e44c2ac01ba65f98743cfddd8a89a38115badcb51a0ff5655f830c0122af6a830aec13ae5eb89a93755b3a5a6eca233f21cb12db545a24a5334becb8fa32c3d7f5805faeaaeea85a551fc62c94807faa6474c0d74cae79b5d8ddae07498fcc5b8b4f394867112ef5fad1c9da66765ecbc7fc0f3269d29c9c38817c77778f2c19b5a3c705fde9d76a4eb86aed4a7369a832ad267312903462397f7b8fecfa8b195cc2316cd53e48c3371ed2ecaa3e484b8ecd2e22b1aee910c51ed5d71198936266f5a00655d82c089f49295feda0a2bcc1a54ec8adf565acc3a8b2d74c30eafbbd843c59e67f293f6d8296cf7b611f01b57dafec6e2d4d411a633918068c38ef47b72ceff1fae772891141c3bc496824509d78165c1e4cd4b4989321a8722643eed69950dc120fa8da3e53c3181f252d7c4cd2cedf8f086f788ee77a98ab5b019828aa02108f49ea4a51f457f7adfd2220d3e59d5f4a29194e8f5eac40ff80312ff6888ff6393c3fc0914b08c1b9990d247ad80a441558db1ee1203e07353dd99a885a7ff5d791af2548815dde0ca1f56f89d39ef6b93dbcd0cd54b854173903c12649587433f0425fbcbddfb66ebce3eb4800dfddfe7fc44d9b23a3916b1db68c187da4dd13ff0157352814b1a792de7fff855761abc6fb7b93b48525fa90fbe3a51dea974069f3f5fdea86387eccee13f58a8eeb8abc6a43fd30e9788c3bd9ae1751b30a82d420225b2abdb1bc121b9073380be16107188d20be54f2e9c658d5b443869ea0e991c496104086290b6edcc1b656adf94f0d42458750fbd8d88040c518ebbb644f4dc4f7c6971d8d60eee0272df7b51a3d5248b4b264fb22195ad891fb6ac994ae5c0bc6714ae0b0b9a484edc576638b78ee89b568195a8f33ed8362128c30f9b0c7804b3ce1355abc96b15aa55c1e16a9e9ec90d1f580e7cb412a7e85d8585bfb950acd4de5865214ce4db7f6314d81784c588c1482d5f28c5fb62e7dd7aa8237ce9396ccde3a616754414cdf7b5a958c1eb7f25a48c2781b4e0dba220f8c350d7b02ece252b94f5e2e766189c4ac1a8e67f00acacead402316196a9b0a673e24a33f18b7cb6be4a066d33e1c93abd8252feb1c8d9cff134ac0c0861150a463264e316172d0b8e7d6043f2bbf71bf97fa7f9070ca3a21b93853ec55ab67a96db884c2113bea0822a70ea46f9ae5501eb55ec74eaa3179fa96d7842092d9e023844ed96f3c9fc35bbc8ee953d677c636fdd578fd5507719e0c55702fed2eaf4f32b35ec29a7a515bbc8bf61f9baf89a77aeb8bc6f247706c41d398cae5ec80b76abc3a5380001aea500eb31b10160139d5a8e8f1a976dd2dde5ce439a29dba24d370536a14bb87cf201e088e5e3397b3b61477c6a41e22a98af53cc34bc8c55f15d7924e7e32fed4d3c3ddc2ac8eb1dfc438218c08c6a6a8eea888b208f6092dd9f9df49e7ede8bf11051afd23b0b983a81bcc8d00f7d1f2b27cb04c03aeee59c7df23a17775ae5984eda788eb2015680ac5610fb1380b4e7d7a9cda6178dca98690449f5551b66ad2826cab2b662f56903fc95b4611bc86f7a834a34ddc3be7bf142c8baa096abaa3cd51ad0c0b6d15e590eab9e50a4c60c91061f1ed6373d91974c1ad9d263110a0d43fd8b596396cafc0ae70b7ac24a59bba090a6994ec483db7ed4c572f723670a11c724e8ffa2497d8fccae37eaa1d14ac1537eaf80efbd2e597b2ffac97f2bc3cd2c4017f170544dfbb0d9109478fddf06ec0981542bc8107a725be25070d2cab4716f4edfad75fddd582ebd363c49e8efaed9a76ee51f22304eebc232a4f67f865b04f610a628fdb317116666785fe8ca30619a07c83cc449855202d687f162b12d93b63af6e7ddfb7223d4ab998a5f450523c1d521ab76f4aa113cc2967e04a38dae07c51c2d0f44fdc8605c3c53ccee91a2c73dade5dae021cbc87d5cd6e5fbefb65335827311fe1e91921ecd66b2055a6102d7a976308a80c44e6d47a67718c84f2112d65486a558f1f269b91d9f47e3e11d09c0c748625bad2718e3674898abdb19d3644bcdc9317c09a3ac02f514b2a57e6a706362e5f6e8fb16cc83daea0eec85fdc8c367d84c9230730291440a4b109f7034d510a3f70a22dd4fa69e8b65e5fdf87045d560eec71f4e59531c7711d4f8917a96e22ad07346d2f92a13fb4569fa6a075da6e1acad1eac1cb2ef19ab452264de2357c927c6dfae6598cbc821eaf3b8da754ce91a96c702c95b2c308bf3a550cbf4d22d417745b5f17d36608feb826b862747c59d26a0e8eb96547a1852f9fbd095f1c5d20721804941d462f3ee2f0876ee2825c8df24c4f00f0844e50588ac688127013df8eba3c971362dd255420649245e880212cb3d732fb82f866dda090040f28e09cf1c86eea5dc4fbfc373eb69745b4afd841ca8e172d4a8510e7698345fd4cab9ec2ca0453a274720bb2d2e5468bf0d0f85919dd762fe3df969e6c071285e25c2e2a49659b8a78289aee655965bfa3cbca9b292a19a855ec40293185354ff4da9451ccf98abfda07f1137e79bc89d688963081dec641a99656b040637402890f185edb28e7e6a2f65848a6af158f90eea440aa6246a2e6c31f5d220b9846aae2027afe5a7caad6dc16b56463367cd9e73bf22a1d6172145de4565ee369c55e3b99ccbef70fb080a3748340fbe8f6b95ba46e8b76de5a3c4bedc37c55ae24ad02267da26769a3a732badac2e0f3a5393028dd54d78701647582cd04c8310e9f1ff1b433125229547130e1737a1f33604f0d670ea7221097c3eb9c7fa4b8293d7b429af76191ea8e481dc1da31344537a09b33404d782eda1d6f5775500c1d8efc615778baf0905d9fcba1806ef986c40b1c6a72335104376b58266c36f5939a8b95123e8635c0c95e80aaeb97379b1179d6332dc07539b595ec32eebd3a336a1128f3cf2e2924db6d8504a516b62f26d012b7f75cab765c8374a3824da5a405746023b51894649ab422d636513ee809fa181d5b6fbc63351e37a1b14efc8f739e86ca78ae3e280f1c9e4824b2976ec4dd308ede6171a7474c7f530128089bbd75e10f9e57ee17408b4384f99f886a5f63a2320a9b90eb9bf692e1fc449171eae3bb1bb17a6ed937ea57af3c82db84e073b5306683e1d63705b9742a085fb802cf5a1639818417fc2223f476c2566351f4b3b17a822e11255f3c3412dd39190e200727bcd3f9799519ef792ec7c2b0b9d0e2dccf013d436dee63483c2ce83c15c00a76c4d894a60cb90366ecf9e61221ee8bdaec66d715159876d8305b35c81f96ab2cd8f81f4769e9a6e439c08c329036f5d2591ac42f2747bc0e77d4e566358a3271819b6003b290211b9b847ab70e906aed9f86cc38aae27e1098fdc3bd5d84e66c45292183f198bc329cad794aa4e430534511b7d9a75104061b409676a16c1146af0a286e2de8bf51c4a35193581a902bd3224cb9257c961989042538092af92644a63d6d6f6872a29aceca39341ad29dd22354812c4b7c7068b039ac9ca7e6358e662a28be001d4aa697ace540cc3ed3c97b98d8c5a6fd3543ae9a7962c9229b14b0b646229807747064be3e83191cf24092dd67f675638d9f6510486379f47f5eeda870a3187946819ec9ed05e7b325bfd0eed5c9a0f4a2063d63c1a8a0a309f586c94d4a68bbe860ae9599ce204c92cf9d92cb460ff99cff9e5a8b3824786360e1e1861e71158395faeaebe7aa2f61f76190f174aab9a313f0bf4f1befbbb22768b8c22719cf3fa9ec908b576fa4bbc084b1ee5b5a7eddc89b58b45ae7b421d38215aa6e49304323eb4e202655f3c8b16ebd6b03058e75a907ee63fcf6aad5eb96c1e5faea81b88b5eee525c4663af52877c0f759432913b9d48030903e7f9f70e851cd4e20bc56aaf36cb02293d992b38b583b8f0b25a08c3303d8af5b1b37f5127f7021b13934645ef3020e5caadc5e7326ed4ff56f797e26cb986b6512b0cc76f1d8e7be44aaa88e12cbc644f14a7feb979d2ab66907063c51e052d0f8b25d827377fecc5111be0d365e08d17f559e3134cb9db294f1cac03150f4232f853ec15ecde55fd1023b58e83934869796400088e9177e85a2227ee45addd049c1d6b03e5b29dd570496fdb2fde7d8cc74fbb5fe76266ebd90a3b4d57e6e6cb9f0bbdb7ca03ae955915768011c714c909a27ee20135927af55d4feaf2c345d029a54af942da6f85f2103345d059f66864e6b0578111e2ddd5a1cd8bbf4ae35b60747b93f53ec8ec64c10cf4149909b102a2b88712ff3e5ba3611cf96585a6b36fffb64b8c37a114d6b16a53879136eb0b5e003a5a068e3e8422a4fc8d7c77227cce64ebafcde2437166b62ccf486660a7a2ef37012ebacca26ecd5bdf363feeb06aee39050974c25d6a564594c67f56fcf7ed48b07fab4e25ccffe002bbe460325abafe37f23dd9c145b4667f146a1635e462330f02470b35c5a2519f1350c02b263201ec9026cfc57d3659373910e878f2b6c1c5be774df8e01e775d476956c257bd0ccdec17ee939c46e5653d5813eda752ba7bbb245a99a5db1ae55d19692074c2e5820df97c502a4bd1b12929e1be8e9ce6d802347c3e9c4202de6046436c05ab55b2fcb2c227adade6c2046d98102cfd0d859a91f8104eb9f6f155da2acf93df2405bf2c083eafd3ec41d60b810e0bdef6298b21193642a9c0c646bc6771a5c61a25604d96bdb727abd5a7ebe4ddb2a56a6ddece26d8007b26043ad44279c3c8ffb7e6ffb3cd4e10ea2780f509a8a9bc31f99a7e66201195f1543a0a020f754d9a665a29a896faf673df6811379579891374c71b2234fc61e95d4d46f15d44bdb4d7c3b3be3f46410ca46827b8cca976d8866e8ca33c4945d5c87b705588b78015b529843af0b75a7e1e871fd276c1e947d896b92e6181ab7e3ccc7077bb57fe85a6958667d3d7a790f6cde1cebb494c2912478a0eca2bfaad62492e9f1caaa0cc520da08c0d2d910cd44255f4c2ca0646dc89e789a1cf9a28e2f99315d33accb1639cbaf0c94181b85fef648bb4cc7f66dc65b8e90bf5f3b763e58520098febfe7e47bddc2d9cdd5e40dbf4ddb8d51f51bde2e57432266d248d13ed09e62f66794d188f9861c50ec41f0eee30f76f4ece250956733ee97036098db41991a4a3eb7816196c8e447db3a2913bcd992174a7bde1f42d57c764b47f5bc09533760c1ba74943a0dca291f2746bc1fcc573f9a22c72a5eca347b1679683fbc8f32b08d381baf67b7266b14b3ba46a04a3ee45881ac452f64df1bf17f70f4cf9fa4dfed9ae70184679184784a0451d2f5c19c02031e0e4957b4df68b4a069a6f6f6458f6d773924a1841ba664a55c2c3187dd33416cd410e56e4bf8d3671cf737bf67df2a4cc4dcc786872b9e2dc4009fea0e48a749353ac053d80e36357d24d468dd595bc823017c015d7450fe38149370c5decf13b00b6b0e0a2567ac08b45f7b0c8a7c89d227219d051d17a706ccbea49a42035cb327381568eae23b5e2a3b7e8beef6f260d24ab224827ca8ee9d640dd23eee94ed02c9e26abb3053cbfaeadbb1f365a24d8769d92240da842e0b361524020b5c9c22a2fd8602dc9600aaf02b35344309f6bb018a94d4cbc9639ab7430657c4046f0b25df517e31626abeedd58c2e19aa0ae1a43ed2bacad91dc04a2fdf9cc33cc420f4f04379e95988ab36731d5d5402d89fb47e826f4243bb206124364d63564a0872f8d2826eebd9046c7c6f2e7c951e49d4b22a7eec89da1fbed890d63ef15f26422185143c89da3ee269f83e1de11a7467822146042be92295a585e3a09e720ec522e1cbdcb41acf5ac45ee892677ba3ff670d71339a76ed98237be252ae21268e756f05ba0b094a1803f9da84a8a05d0ec9456cf565e1b548cae95eafa0fb01f091935e6eff2413bcb15f605f15270408216fb5b41ed83dfa1454c522375e35bdefe54275f109d0ab450636ac4d8e4d9e27f2d81a15b8cc5e98549254a1c9162918db3e399118f5864774a9d6a2347e1315753071eb1204c8bf5f52b1a0da37e484ebbe545fdfe6b031215678c3b83a19a24d7b661f626beb01eb82b384f02f42bcad4f40addd48db8a92b90d2297e6143702056123286617f86fbef4fea940f648867d790b8f803abc5f4e0e3f4226954c296afd96e287e21b7243d05e743161810da578096521805edd81f68a45500f6a3a1885cb1f45cbd399dde024df65072eb973c827fca13eeaa3f140842016f509aa9ab4603d2457c92cc9aef24950697a0044e3d7c483b8d8391886cd50dff8c2f16de3d6caa7f864c1b3874750781b2b78b545a94b4da0b0036433c6561f5cfea50eae9f5645302eef18238473606e9b9931880d0f6368fa9970d1ffbe59c4454bf97f4a5e8091801b53ee4a209e0642d83605836f69742071aaebd9d813b10f4ccac03851ee9f20cd1351f8e68554c9bc5f58ad19d474ca128edbf561d195e52ddf3c19bee3bb597ac2f92143bafc98bc09fbda6d18dd4ff2a93cd2ba17f54f75c32d3f141468c2baef4e53b6a340286dc2599bf7bb002aa86688e26f5b51a6aaf32e48ffd539d4f3f4bbf0cde2d20138151c82384f9ff29a634ab4e0103d93340bb9a7b0caa108bc7fdc88d7de14abb17e9efdad2b0f304f0bfcbabaeb1b9db75959dbf54930e67aed3a9c8309aa90506b6b9ed4f1d06c4ced19746e206e1e9b8879663bf56bf6c5c920ac5e09e6579b780cb63e1875ef0a731b726864b7ae5705a2d6d343a4a213a05928b7337a59f900fd04472382610e2a8d25383c9ab5804d609e79a88d70eaef3ea22d3aa9100fa2a6e98e97684ade9fe90d6bfc59dc9dec3d3d8db8990bc2123ba92e64253235e9b4d682e8aa04e23fb9bb6248a77c065e93249de829bb2fc5ea9e396461090222816bb29bca37bf86698fb995f62c50110cf418bbe2078a56c5f1ec9fdf3d0b09a719ac253b5bcd00932ae058b86611aff51c8ca8448978615854b69b0216a6eb8050ce199fd9a13aa0fd652570a1b187f61e6831b3a960521c3705da8c5e6c64c7b196ed4a49c2912d77b670b177c6458a7a49ecc1ffd8c57c0978d2a05cd1f1c7ac9514dd14b7b0933a52cefd40b6452ca0903df1f55828025c7e18109a6e0f2ab25724cad2d6f57cb5d894a6a508134731e9b9c61254f64990941f4faf97394b634b91860cc6ec346aa666600d323c849ea4c4a0ef55acbc56495ca004f3fca42ff0ffb11b0e1164c95ab89bf1db3d4f575ff334d4e0d7d50e0c54c422eac5ef78c5a3be95f2e18872540fccfb597211ec79d9d47b6cf41e385b9c2e92122167fe584210f63bf919c620d
-MD = d7c901f0d92a868dced7e2659e90121108611dd7781325fc57e5c336c2279510
-
-[L = 28]
-
-Len = 16
-Msg = 3dd2
-MD = b7399529fe614af98f9ecd73e45790406883cb22e3bdcdf28fadd033
-
-Len = 104
-Msg = 3d232201038fe7d846ac1bd4c6
-MD = d0aee5482c509540a4ea4b902bf42fc8df3af6de42fb14e903d1b2e4
-
-Len = 352
-Msg = 44c98cfc71f82215dadf494d68d1d6b92bb4eb81fa0fbf945a659d9aa2c2302b5c93fd3eedba31e479e29d36
-MD = 56c22e6066cd4c4d6415c5a225257e7f888b317ba4e98eadb72b4be0
-
-Len = 504
-Msg = 02a5c7b1b749d6d49bed302d9439f23ab83020bd4d573906f4190e74216ad33aceab775f71cd31092bba5cfa42f0845bd16fc1b8bed6434dedc92f80b395aa
-MD = 33a84e66cf1ce6970c35807db25e05ca05809e53d4e34cda9bfc0045
-
-Len = 13976
-Msg = bd70deb2cafa75918308d703a6783fe9dc5e3d21de9bfeb6dbb1cd531ed5dafeec463a02abde302d4ae6ab3cdc2f0f94865e38339c88bde507ff71bbea6b30b9851cd8cf599e950b8c8e620c90adccba0033f934ca66ea0a936afdad575bb6235099beff1a632c9114a8045a0919fdc21083880eb05c0d8c489c7810aecef4a41766f67c37557e28a9db9a0d909c2b167ff7eba79693afd3ee3aeace38eb73a5a02a882cf89b123812cf2a0f6d5edd1d14362ce9c43257474def5cce3adbba8cb48e7af9a45e702a182dbf47e8869b3f99e953ba81628e502c60d4f8ffc551c31b3ad6ca85c52164839d5e9d493deee4d4b76604174bdb5655385d34ced2c1b09dd5a486e1f9ac501bc611f9d7aa5c748f496faecc14c6c18e1dfc6aee2991bd0207ea1701219955a751df43dbf66f57904675a0e9e6d7f9a0b8bb82a8f44951117ab2642d6671daf1e5d1639d48aff6a05781c2b5e8976653b0a164445872d393d30355acf0bb49bf2bed4265c9a3b786249afc7a438d706eadb6f90a7f93ad51bde6d2c8e6ff09dacb3dc67ba0d3030c54c8367e1e4280bb5903274191344610de61c3c770c6820a6cc9d826f7c743f88f13580ba23cfc00598fd733b5dd069bde7f10f2b8961c16b69761b0f308dd137f844a67f6054e065863f226141755b96645a291e3fa3fc853b2475fbe1d3b25ca22f4da4425dc95fc855e63d6699b311ebd5fec1c7753e6e81f747c808ec3f618f63eaeb1221075edff0532225c40ccadee304a8997c03920e7ce4e60e4df4d120611296786516dd4d9cdda2077ac52bce0fdf552e1ee89a0133f1f87a6f6f35f5c53958ed806465919a0a5fa42488bf29caf33a0dd469e13abae351d5c6fb1a800ee384da199c823c965d9d5457a3ef8292c4d9b142e3f1fb502da498eb44d95f8c85bcd6871bbdbf004bfdc09ab35758f5e8b6a0d0f366c3b255333c52c8fcd4ecb4536b5f6e72897649f3415443612d72c3436505249a344feeb04883f41f90ade40af119014b3c56fc108f1ab0a77087d9226665d416cd975e9e4605529c032e8926002a70924820c6c7e264a794b2a3beb63d69ae56e017294fad4d611cbd0d3847212a38f22d623eabe3b884a36464d8814286fff52c4dd366f6c2abfc2eb865e0dc9ec6e55ca9d81f1b8cc47e2629bb162e54655bf2a9e156ab0bafb4b8ce96858aeea6e6665607a3f268036f4890dad759486b15e3c9e791429ec8f11bae4ea7c490656fdb0551dcf0b0be017c08bc674bd97d9d701c3ac955e2941ba7d5f2ba122a6f0c1b164b1caf2d50df111fd4287e9e195d181f6f514d7dadbefdd4274edc234025b727680576046842a834b6ad89eccaff5c5209bb91d652357e3750d8bb0165572fb71d09fdfc60f6b1e5d868c67c0edead427e7aeb734e29b96e03ea174b6b1af523feacaf6bd745ceb1bdecec9251958b7f521182daddf62ff6c4f58977adeba81c616ff2e937ca4f16eb9c44e63f9e974709122083ae45524ff87d7a0cca33a90f09b660db0efeb393c61967de2564315827ef1cf42b71c0f822f471713c9d885a3c3281d7c95dbc96f1c6dde0af70ea11232b00a2d215ec8de8fcf84b6193b6ac9d46de660361aabed3371fa44a6f32107f3854262eac355f9ef98701f580b4649175cefc29950e7a0eec958f629999c4b0a98fd4bdaf5c0bd97c963b551f2220bd41ec00b8726836e949e818a49aa1ac5bf12c64fb9991111ce8be3e0cb9605f753dae1a4c84389416f17fb66cecba45d591b22d64e5a4edcde067a088d9ff7f5dbb9dbf324510000c55d50f480a640fb22da9b4862dd81080d61af9560b601edb5e3346263f5f193df97079a27e3f9876078b80ebdcdb17ca4c50aef0c8329c72a7f77584cd963e105eea9c28a2ad4e95c1d018e27d0e720ea59147f59ad796b80b6293da8a55ed47e8abdd37221db0a5eefff31688e2adc294654ab0fddf9c1ffafd4783f01eb539492cb35a77315d0ad19395f47b18298a7b353dcf5bab0b2f193ff73d99310478d2e5c4ff1c68a2493c138818edef73caec9977bd4eda6249c8933953e06d796b288f78b18c343ef561082fd03bf92b084afaaee741de3004abaf746350048294bc52450e31147173f2da13d6ffc5adc718e149f9df3702f414dd3ee88296ae8a0106b071b589e8696401da7993d58a9bf8e5bf417165498c96b4ff5fd2b45bbf88f551688425122a3737ca54b2992fdb4d60957a93097222c3cf4c45dabe18b9d6a69e6f27567d5adec489e4b6812c29a8fa52f1de642b7b0e749c16f54473ed5ca2fdf2199e885fed308fa62a3e0deb7e0b8e439e25b3e9f95d755fdcb7ebee9d73069dd57dd1cdc5145205882023b54f2c9dec6cced9e3f6d24e8cdbb8ef121b8f3eded574d81908e867af5ac82bfb8ed60848b4bfdc1d998bae3a9ca80c1c49601d11a40409c62b1536f01ca67
-MD = 60700d4ef068822d0fe6df450b4aa8e206b2790d6dcf973229a59889
-
-Len = 48824
-Msg = 5fd54472a44e4476d254c0940071ad42dc723354f76ba61f63fbb9df80d1ee56136f51b6982e66c1da83602fc08093506a9e2cf27cb92085ba5c627dd63f59f8850e91a1d86cb1d4ca38ad03160f3c584b128d9b21e935570e086d3815307ab8df396cfa0c100bf6cbfc0fd7a8258fa1a656bc178e02cfdc868540d8e5ad39dd46794a8bdc205e710555ee7421ca7475a4f3232e6a0cd55d4b5d4525f0bd7eb1e455931aeea6918b9fceb2a32706d31a6d7028a85e102f228417e2e7db68317ae155af70eda98c8dc1ecc32a62e294d92855354c1114c5735a3c81e551b63a81650107557f3237bf953989d17c65a0fafd2bb1e32c237f98f55389e8f8b0810e97e201914c487a68403c6d621a98ddc515780435564245d87ce462b8785def699f7f06ebfdf33dd1ed7dd5a3e781348298c7950a387bff7d1878731d7ac66ad9a6607f2c3a3b6843c2852a5e882a8d78ae9dce2a79d595cdf09626dfa6f1dba7d40ed21caa29e304e7dbd559a89bd1f07d84165dc259ef112dc6e2c5a3e82b1c50106983f6c4965c85073c5deddbe6323003d56abb0df590f69010981ab3407e43eeaa29c6156995c492c931fff1b686eda3741a0bfb9094747d1620b2580415d431ffd6c02245f6cb03e39f87e82834dcea59355b2ba663ce145d2514e15e2b2c60cf518ff510c6c3e2f16d2dc523832762ed8352a320462ddd4d6fe755350672038163d996b44ed3b85d64989291bdf39398cb996de785b9614ec5d4bd73efcfa37fd4470b17d6240b8e4c715759286b04c3d7d791e2689927c9f18320ff2e6bc7306c805e23a5de66eced5f1a630cb43dd46db515f837f6b824b99b86c10b6df7fcf22d97be05284edf0e0be597b3f9c63556db031339f79ac9e6c5f8a1cefdbb4b30f5bcd23c2a4dcf791cbfdd6460284c5af0621ab7c5571e40a87c87be459c85ec81d746930dea24f43bb11d6611ea83409d3bf4f987778d8eed1d5b246a2112ef78ef0252f9ae464810c13f02359441d289958b4766807d9a3be0054897d35b01830deec1151f9e3d42f92b80f4aeedd65c78c6e98afc562a3bcf6d72f238c6e94a38f2288ac7929a7a61c92875c1f115c0ed8d261a727f0794f17ceaa3dabc717478f6ce7f2e8b295f000241e154b4575bfac8483f6b62f9ef4e18f7d341a65faad5e2fc1ddaf2b09adebc155ff09e63d5aa5f95206e66c7f4ef2ae3aaf3ea7c93589efa8c552df8d203e0ea181c1703d7023b56e603f33b4adb9bf44f7af290d8081210f327a6c9b0785709346087fd090c42d2b8b2711b9a1a5173eb5e246320ee27867ad6c3eadc4407bada44561a12cf5d53bf0448308bb536a8a525eabc1410c3a34becee25fd6fda453251ec229b53751f2280e142c6b331daa659ab655b78cfb08bf18e40bb02b7f1650eb2dd4ba1707f0aafa219f21c29521581ce249e2e34f5656b0a04c00485079b040e13cbc038bb9f17f47cb8f908591b26bdc28538d8baffe4cc39b17d2ecffbb9698bc2b8b31b08424034c051b535e0cfdf07b7a0a54781e33ba739759991aeb72c0ed992cbe76eb8ec0ab12c182e8b049cbadd6e82e314f1bf15fef5ae95dc86bd64b8556766f8ff62c33492198e454e5ca59ea856d8e095c04da8045522abac865506096ee1cfa1082af08ca09b3533878ea3580b6c0c57a615e0ab768246b3eda96bb6caa01a2648068e21959f843d853e948588e8c0bfda364ef1f9fbd3235c27916562eb0214891eb55ae0e059f4bf7d1838b5942656c27899dec6d67b823a981d1e1e0aaff5323b0e3d69a7dddf9b12d7787ab763a3c7a2697ac65b655aefc4bae7e6444850ad2540d5193b378682c77a4dbf9aa22e517e68cedfd1ba32e3730ecaa2e3f6ae61a4f427d6e69071dd62a9bf6c860980c9d23ce1fa82a1937e6dc1ce3a2de096b680d23d89ee102912ac0bd769c1c02095678dbb00b4430428797cfb966b2f901480811e1b9cde358b6d499c9e93f0961f050465d7b0c70d4961e75a9fe40a24e36eaad27238231dae6d0a17f446c16bce7348e669be563649eba9f23be29adb8b10f462780a066ae573f74e51215a26097b02469c25180890e06acc53ab063c742e08d51359b0a39749b84b9f6be44f3ae3da8e5a2f340a8607d4eed08877d007928d332d6f49502bb5f416c46d866fc87477c58a22d3c5932a8d6298c1151daa032c84ad92f8f90b8053b5aa6f690d1bf682f314471cbf200f3d30959e07adc6488dd17b0be5279e727f3237b8b4b19b31a220dfe63882937f8d5ead677608c42a57217f2239614c521d94559290e3b0ed8055d5474e96564224f6ca6389b40a71337da11e1c307dead8e4eb43252cc2f1c49addb18781cf20acffd3db693b02e5c8ecc949b51b99005529e0149a13390615f5df6e0bcd68e1ca82b0173d25134dbf76dfe92daa085d3f6b1e4d18217df41b70c4c40101884c2886495f2ef8a473bf23cb47ab6533c93cb38c36c6dcf6837f1272fc91a6962b6e1386fb643e1f1d71fc75ab58d5800bf4081217cdce0c7ae9e3d25de543fc4444314f32067eeb147c08c55c5c8158ed11729837547f28a300eccc312260215f50e98c4e3d4170208a50a4a4def1243538f906df8476b0c46d3449be73866d463d422595300e160840daf8c906ae4aac13a64457853b0ea6d8c32f4efe3b48c0b1450250086d459648b0ab14fd3f341a4a803be77e56a811e7a26827eb0a1a9454f90bc6ece665904adaa3cdeb2c4847858fd1d79750e8cd45d8da9163784b8bd06629410502debfed5eca3cf8fef0fa6bdcef6efaaf35a1986d6fd68e0f436dca9442077a4818ebda4606a94a3c93fda46e7ef5ccfef656896a0d3d93566b02ed8c3f6174417cdcb99a415b0c6e9816d94e64b438c295b4bfd69e0d9ad52911de5509971b7370593160629b641d690eb2828bf363857983e3b9098fcd15e66448f786f196685d2ceaa251b17ad06dacd614d9fa78ce0a8b9c1c360b529d0bc1d17ba0b70ea8ac1b8d67f6e5770f0cbaee0b38109d26b09493060dc851f5fef121e83e30aab9c3efc2b8397e8362aefea1708f7ffa14d3656f7f7610f3a629bce14648a593250c6f309c02c6c552bb42984ac58db920dbc7d98f59295f37f3e9b99da55ef074ed65801b390366669b4c7aa1c483ffd23082793f9e5cbe30c34250f63fa3ea2cd097593dc67e8d27b7e4f07e73a9f7b33a5ef6962df1381a038d4f58fdbca9d71ccf640b917f631b75d4a2e8ba46c64a6223f99cee30f47c1a935dccc7f054fc39d3498c824e10cc3ee337e781a3971f0e98295aca611bde701c2359858914248f6bafc88232bbc27bd85883b00990bba7862fd7a7cbd4c86df049071fcd10d686613ec877758d83927cacc530bed9a596b5b21c6fb748c379d676de7e05719a867c9f934b5dad99ed97dcb4e70a9b6542ed5b2f086d9f56fc9752e788785ef8f7837a31e433438cf2f18f58be37fe8412f6d21a5c35000a5efb862926700079413f76ab2c3e79e20b516eba9d8c29897097bee55157936607cabaac41337ea4cc783c0809c875259f8020e16d5045fcc39ac796d11a82f25fcc9579bf0a010200f5745065175fdc15474ed514cc796672c59637c3c8f236cfc9c0978a3db1194680c58c27746090d76ca09f7c48ee4ee7e1d3cf0ea70dbbbd88e30e8814b57404dfd7c33727a0c84cb7bd468b0bcb3c89b526679c00fb0892d2a5e7a3d73698a3db53fd7d78460cdcf24ed22b5f39b8c00b3506541ae4a5b76fae29c1cd5b0f8c3ce142e0af7ae4efe3fa4c438a604bf4a9abb41e3fef1b9227a7dccc3f4d6026ca289b4b1366d9ed546abbbbd5677c8d582e79e2b544f18dc23809ab753313d84dd10fa3ed2f723f0b46277b8877d4f3e0665e88c50caf0f0708b746b736b00c8c83a7d18500384bd035996aebb7da8f09fd6af9b76fde7fbfc0ee854d7ec02950e76abd23ffb27a6ddf1772465016c79b98a61bd3940547b207b6507e32cb9761a5604f0f546834a8edac7ae06910045de218d761a4accea886188f947b57bd876491709028e2e24b075d6b022b51af1880ca16a8c65b7c69e51b2ad580ee058acc0606f0a3a9ea1cd4342bf4be602e941dc4bef1239bb9bccbc8098a6a17d63186c6fa75ec44b6e4fd38a3fe49c5eb995f0cb884e2f3ed6be02515fa605b98453ad935682c3bac6a2971bb68f4094cefeeaceda92dec803ccd3d346f8b40b48f8f489e118a17367801e85c79e9b3bb5d73ac44a8290cdbf83a154f2f125090d42e1a1cb72f5ebbd42da46c7a4d4b9fad9612a4c800de6467ceb74f831e1395dfbf5799a3429ba34754add4b34b5960a5fee8f752dae78450322a1ab3d7102b77e907fc1eec5355991e0c7d6c0866660e5436248edeb1a37c0e769a0764cfbb6354332d6e55103b9235c84eedaff918af3f0213c435c32ab409a4b5c7eed8ab6ca9e313dba459bcfa3ee92e7d669be0526856ac3c06a57fbecbba553a9cb4655a901d98af02b74098e478076655d325bd7639d73d7ae00c62fdc361a997ea4ff5b0eba33096b12f35cc7cc0eea62950b912b47c11b9fb386a47c4c15c0602d304b2541da889cff299a1fd415e7e25c70ee4cd83feea7e6a9c50c75d9b128458513d61ec5d0299ef8c090472fe0850f384938ed44d36f10cc2c1d31daee3f946a2fa18f9982a988fd6ac973b1569313ce3c8ff5746c4dd85a241f1e9dca0e904c091832ca028533a3e34c184edcc510bf22a27f530bdca3d057928a96f72dafc73a9aa6dbf2552598e468735cc5736c67a620e9455483e9cb2108045ad80569582ea93a53b491e528c8df336fb326ad74317bc1dfb8ec30a73af01a5dff3e437b7fe48ba5dbb3e8f01ae0c6fc28675a415f23a796bb6e0ef0efeb4b14cf20d4ad88ad1966da43a76b454dac8687bdd97b89b8f8eede91eb34ca4a0523ea65736ae39341fb32b9b716f25662a37382c16f3b9c346c84f03bef54acd6efb364c6401b07b3f7679e8e7f8c9b77b75e6e98b90f4df88460f1978d19744eecccb743a999aaedd00b5a94018e9d5a56bac9d5d55f6e93bad52e84aa7340cbbf98d56213d9dd3e1970867e3972dc98e61b3cff40b64ec49463ff79a41c82dbbcaa37a82b761f432849aa83a3d3c9a209e2207b87ae9ed9959ffced165fcb0d8873668c3cd8f18ba0f92f7acd2bf50416c22ce11692bf6132eb9f558dc789cf9776da94e48cf48607f19d9a11d5df4db11dbaa67a1d20e9f0c96f5956ee3f906e371c489efc88b0c1e56d881e7bf8dd5d6742622eb873e253dbe54f2e2e6d0e6136941de8c23e9a632727bb5f88c23170316c7aa0df28d8d07589dd6022828834f7ea9b4e5876a1704944aa3186dbf89e0e81767cfba03bfb38c55a9945209c4dfd88272c49d1745dce5ceb40f0a6713b5139dc2fb87a8a4888406d2610b7b910a9e5782ef0df719028d8e50a40a269dc9bee12157038522d06537bb31fc87d21af9ad4b2e7e127bbdb313e0a116010f65126cedadd4a122d15a71cbcccc346f55100e354b997154567fe3caccd50251d137c58fc3a2048dd5883b6af9248b51040c01a80c051b8a151a8878edf0304b5554746d6116b749221a1d0082ac925e6e140f0c3b6a180742ac8a50ce0e93e6399102f151d7c14000369ff52d0b537fdd51bec99e7271b1255c6fbc36d83408c417f6825a8e2a58b9054ab2c3ead69d97ea9947fec32d720653c123ecf51a9a3f0ed88743e3fb7b94aea59d0bf0219ee50825ef220554312cb907edb90e4d85f29e316ad57d3b90d859391fcfc63e6c0fd3ec27d4e1efd6e0b5ca8165cbd6af25ed8792d805f27fce308ca1d51335ed5d727558dafe05486a6f9149b8d3bc022026656714222830be582889e6800c0b170e48ebfd069e711210e4ac7acf07652a6f5051507de68aeffc9540cab5cdac84ceee46059ec23820c04b127266c0bf8df0d2b856be3377ab42592f495980baeddbeed3ba707a85dba64fe36941eefa8fd37204ec8c18df3852febd2b142b1c9a5cd0f9e424cd408ceb7788270899fd793db99ddb8f9ca8df550c513790d8bad37a1d1f4a62c4527bb64c677462c9b093582decea70c7bbe873095536728e7ce05d5cafb5d166a1f03055e918f787fb244c5857e3d7a1009bd37f30f165564a082c1510ed19bb1633811a76da70dac67641c2478c6b335f409ef54a2d0f370c9510d0aabae3cb998bd023778375cbf9cf5ef125afd584c11efbf40bb51839aacd3016e5e4d79f134245f952dbad617c78cb6f5712bd9c0c7e1303db5029640cf9b56e29329c3e6a9e0a2371aac1a437b9b1c4477ec9842aa80eaa22c5eac11b60c661de6ddbb088e844293ab8589c13d938765bbaa44301e4137148dd0257bd4c8c766c5d3bfe53671e9417cd1b52f622870ffd90f4e17b7a4ae1b5601a2edb032e353bca652fb565beea6fb0b2cdcadac71794c662677fb1dc81d116d94f5eced526b37c004b95284cb6aa2ac415754a1f14882595dcf4d3f1d905c6e8c12cf5a9d23d3ab55bdaf9f17d2f03f933e1bab89040753648c426b072b73aee8c2fc0d1c03fce2c656e20d4c96803fb2ef471b912267eecb4d6f342d3513894b94d77767823fe0c7438e51f21bcf16f0e98b94b23a10760271281cf843989824f7061bf834f93fd8d2090f70e939700dcb4d8964a19da39a9601a7e0ed9f55f567fc7d5682d55a9ba0e68861756bb549f2f17c10ff6bd2042a80477f89743d3d762f1dfaf230bb502eab6f4c46b26135ff3bef5faa179bdfbd288e3cadd3d88d8012706e19b7fcc6e9cc2699d3ba0e624e715599480d6b7dbc6eeea0d12a9236444b17285fc7794040dd40c2b2ef175f7f3641664fc9bb7ea6d7eb3489d504f8013d64a23aebcb5ce233405f5ade067dffff253f27e926431ad806703e8fab23656e0b7431916d8d4c72a7d831e3664e5f30839c76c8167b76f3b2dc75a6ef48df515e06ea54ca51de2fd9c5eeabb1610b7eef06a2f3167859cf82e1a5b76be8ed8beee2bba28c3b15af6890d7a37226834ec9f63306a0da11aff918753d8b83fe7220803c070db98195d6d18357233f5504a6e3bd6f30115d3987f93aa5d89aa0b8b577d1fed94da057a6f088233efc0f44f86798896eae9ad0b20c8c9cdd9d72a3f02213f6797800894b864cb44fed009440fa5b0197023929f9bad16f052cc2d87327788a68b9209f46fb4776b092d75713048b5453ccd699d19cafa8e9a93fdab0f0863711916efe3bd81ee71b8e0221e12e9ffe2f6ee1a4dc1a8de6e593480f3c05b3691e916a4a7ca51971eb2f0f693dd10f6b8468f8cf7bcce285938b5a0a76ef86acfa2990f88bdafdc39a065db17b845028ed2b7a9e331c44217de20440e406868f1eca818d0be20248c2948b8f4cb118b2e456e585949139270f57c54715f3297bf714aa7c5f72ed8ddf6a074703ffbf95e45bc81a02c42822c22d2b718f2de5e03d687a4b18d605ef5ae75f9d43c8cb4e77aaa0c0101d978120f29574b22f52783c667f7daab3e1f9cfacf2e68e94a24918e3fe2c4f061deeb64891b5217fe5908e7f389897751839982b7fb736fbfb1232684e93123611b7fc8fbeb74f8815b5ae13240051920f3b6ed34483ff673c467ed7f0a8fbf619796e485affbed0697415d2d0598ba34d5b9e44ffd12a5edc323883a2e28efe9baf860324f2d2016748503eac1888213926b0e0f0335a4b51820a2bd3b42d982ec6ce307b453b6385aed7a735a1e98479394147c40f01c532926e10e1b26a5b395bc150ec4b4daf5b1436bd0baa225583ffc9d9e9d8a354f60fded37b41c7c051daea04e689ab2d4e24d7d07c75c50ccfd6a527e024d1632246c6f40f06b86ffec0b29cf894b665d53d459226b93422d37a8da23587fe884dc3c0f2fb55dea296a9a5b9a0d101f186d9fa6288c912202547cdf958569d2cbf235740eed38d10b0025dbb6de31058e98780d22149c19d4bcaf06dd7353fd91cd1f47e47f45622e1472542be2f63f463d253617eafd4f2ad609f9020884905dd5c22fba53ccc619104b6c0203a7f6c8c26fc80ff6fceb8c0c51600c2e46b4b872e6d597511524545a76cb42278b519d911e6c1320e01682c551e204ccdf91290c52e0836167a5685cbb1af338eb794c10fac92950f3f7956acf28f1ca984e380bcff9876b0c71dc7ce4011d1d0f955da9ca885c6e7bb74c6194dadb0fb9146dd725c8a9574aaf3824b727c9be3fce59c35850b162c17d3013689fca858a0a51d81cf4f30d6a8705bbfe35ff03c34cc7c56aca32140d72c8e8121fc71353596b777b266d75b322c9a97fd2c5d4e2362f19c99de66da7bd9c495c03d9a15b28431a0c051e786fa80f5503a72519e6b419263d72d553d688349c0cf30918eba0622b953a0efce4415c29515c26ba15f00e548ef108afe3f8194aeb965e5e4be94f10df6c45ea5c133a8c3398d09fb80f950b83c1866a1637d2bcc195e05cc32a9233b244cc2b1d4930e66f032cb1163c37b3e58b576ab76de759569797fa9b8bb4fad66aaaa56f09c7a0ce4641d6799d7bb47cf684990ec1e08871458c211a353ccf1285e7429c7b8520180918f7
-MD = 85747c796a910421ecb364b4b4f0e68b49e9217944f6586eac4993ec
-
-[L = 20]
-
-Len = 16
-Msg = 8a61
-MD = 60bdeabf39efdf21ba9c0f94af6552d2ffe699e1
-
-Len = 104
-Msg = 37487aa02b03bdbc6bc62e7e26
-MD = f146072f92dc4a551721a10bf0b01564cc2b43df
-
-Len = 352
-Msg = 6ecd002568bae3bf1873993041bfa292eb94e9ad092d8eb3585be82e8a20cb36a47a06e7a57d301268a4a533
-MD = b0a2d6033cf1d8ff120a605b745d736ee4aa06d2
-
-Len = 504
-Msg = f6dc1d2f6b8e126d99939664693d8709513f97d730074ec2794e536d94ede79c81f2b2ecbff3c2c26ca2d181ada2c60050997f3bb087ce48d956c18dedb227
-MD = 395dd2989edc854746e384f339f0808c515747be
-
-Len = 13976
-Msg = 07a6372c863c7d7c6764e4f05addbbe161762735dfd2d23bf268e2d603cd28de9c369ac379390473e1d3fa7e37af1178cca54fa0f782dfbe68070952b93462ea46c640d43ffe71f5fba42df98f4c48ada0d8aca8753e0731508bc15dff283178ae5c10a6ff132eca5dde63a78d3ac94685152897828eb25a55fdf140fd33fd4e7b03f283e201a1baae8986d25603fb0b2566aab345fb48031d648144dddc2e3556c0ceb1104f348d96ae7dc0152e45c625d21b46e70c31f250c858aec4ab2cf5e79d8c79b0854e0abf5330b9f044113d306161968f4ad6f0973160c9dc296056d5a11523ea2b56fbce8387070fccc639ec1c65ec663b9dc49aa880dc4ddd3020c9d44ff7e8cab6266e436af19b4ecb82010a0f8f9469ef380034a02e3f50051a6a3f233dcfe9d553459dc1bebc538ae0183448c9405c351271dea808d908480e61e9793cca111b4cfb9874b799626a1bd9a0f6e0929ad51b97ad81b2438f5fc255db3a3dfec9f0d8393c6b245b03d3faeb58021db3ad391b17a91174a66db4feef1b4c889699bcbea7928f4d29be2d47f76455c8cb1dc7da9cda41962a28ad8cd7b39965b809e7c7eca1c6792c1ce1c8a4cad6290170e91fcc49fa5ff64ab433b4aa081c8da2d9bbb072f9f18ca455469b946c877e3006b34ffd2219335b30ba2e0980f43cebfb629d0b11fe70dff28883ca012c6ae4855fcefea20a08e189eaeed7eb36ed6db3835976f4e60053205805727c5eec15d0e9f155637a9e66268b9c1c302bcaae6ae88cbb8cf1668a487cc996c4662c4a4e195f094cb31c717165e0e13718f8388957dfe0bf69c70cd0bd763dc38c530b67b9c12244fcab8bd13f602de848a2937699f9ef77944e5f22e3b470601789e1838fbea9359c733aaee2c7082b02ee459b7684ef9bbc200da4b62d368351f5520a65ffa506dc9b097117bb7ae88d04d85fb525e91327689ec0fe86971480c0e864012b1e9f044c7d80a4e48c07320dd4292086e4c71d4c98dd826a9bfced112bfa2beb1ce85cad204451ec45703931bf637d4fe89fe8f485620b7f4b21e011a232ade7a8c92be77925e878ae0bea9723749528fe83cf89ecb9616dae6ca0e8d5754ec6c92abb21108c2f33cdc18c6887c430b72c5b193356494cddccc577bd4c2cd53188f352846edff0c2ac7869cb74bb16a77c0f0f194a7a9477ae15abb890bd0bcfeb0c39381a87f1d05319c7e971c10e9ef687f96450b400e25b4285032892b849fd5db8649cedfb03c88defea063ee144a1ab1f3bf05f59c7db364dc39c11a446c3ce16307d78d50315ba29f5bb9a57438564c8c7b3e367cd37d74b2375a4966f47489dc5448f4979428abd32193d3840aa983d3020a9f29d760fc7493ab2576c90b1934b799c1d0d55e4f2caa78f4ce61930c79dc017c2dea0c5085d73a3b0e4a6f341e9a5061a6658af11e5edf95bdad915ac3619969e39bee15788a8de667f92f4efc84f35082d52d562aa74e12cc7f22d3425b58f5056d74afcf162cd44e65b9ee510ff91af094c3d2d42c3b088536d62a98f1c689edcf3ea3fc228d711c109d76ae83d82d6a34dcfbad563cf3726519b519fd48b51741aa86720836494b7a589c778927047a25d73508adaa401e9a6c0767a675e31c5556cbe35fadc9671359b45e985c3c8af84113989b299ae4474b85e4b5d4b0578ab1e8a2915a8df97c4f52a639fe32272cb91bbfb721505dec46d51383cb8973425a714245c2e37d0577fbe0d66381d9239db1f08a380cf609dc699698e0fada2caeda44d58d766c4f8214b10642b80b8d7d8add7cc41d47108ab7d07dab71069a2d982cc900b331caec317942122158bac6eac9175c2dcba0c04443aa9188832b553f5ca8c336880824d6bc02486a2b4c086665d276aafe3b1b93729829adca50c44466fd5b5cb977aa78fbcf5c0f0da1b09216468a11493ffb39efdeda5d669ae92bee2f2fb250aa1b9cbb11c36c7a6c6dd26cdc3cfd572ffd8c1dd72a13c27a327a34c6b6b3d80fc6c67c72152eec0c8ecbdc1bd5cb829b811e7f29af6d786f4e93dd4c96fdda295a6aa258d7b2fcf291c2d68e0b1866032475964ec0c6f2fa8c2d6a3936ecb187350def4e818507bf157c0e9b33406be7660605af14cccc9c799b4e051d0d0899e53495bb8931a6e2984bc6dbe4e02ec8b4642fc2f1cb5fd5a5520b48cfcb49e1f9533838753554dd98b6a1b8a67409279df477330e5f37367e06247ca5c3ffefd00e693dcc0c9c30754121c9ee88a574915b9e77c104fd2f921c2c096573951407ba9b440423d76bdc6fc978237a6e302cede7f99038ec31500884775556941f1edc30e3a417b0e02cb6fb5bfbe5cdfacf4006411287bedc565fb06f1be987416407dc852254934df4ab59edce476f3506e65be6ce6ddf91038642291fb8e92ba5b1f0b105670905a2c14796110bac6f52455b430a47b8eff61
-MD = 1adccf11e5b7ce2a3ddf71e920138c8647ad699c
-
-Len = 48824
-Msg = cd8490c93613bdf1f284b94b330f6d6f45a39c651d2a160b340e2eb696fc6d1c35e88872845190d141c669de92a97daa5433b1d7b0b899fdef2ce74b8fe72a7296a5b5be26d1dc86520367c730c7400c2fa06f91ab4c48a7bf4ae35a5b9acd5296c4fdf7451b0ad9cc439b4e34f11e5d7ef2bdda376f8dd34d6f092b219dc085dd4c4a6308b8808f588eedbbc7af7f64e83182fc7ca7cf4741a341060a7969d31445834c982fa8739ded4555108acbea1666a83da17f77cc42ee73323eb53203e3b790f81c08e94c44678b6538096ab7b09916e6cf7ceb2af85987f8e4d982dff1ab59b0bdccaae1f405a73366b5c5935dd0b43e2d2894290ceb66a0246dc02de728c5bba30255fb56ce8107c3144246c5156a8fe40ada9126adf67227fa56b66c37be63f532516211ca012977b04a97916f201f1baa2629eda520b51508ab4229df2ceedce406dece0110e0a911464f69e7be38fb91deba0addcdb3161d2799c628f5a57fa1dc37357c947681bd9c36f4832c20ac466c0c245de3b250c33282ea1a02d007f03b34ed427631283eb614db4d521f555136e7e42b4cfbee8134c63dbe3bb79b5a8b9f9f5b9f5ac61cfab1c54d197f1e3ba613f251eed616df952d691b88a16466343ef2d0f63882ddd2d55b8a6786308b2257f5d7b38af166bd7f1339d2d8899c9eda8fa86215850ba547450c267eb3c9147d96c38161a69d1584e521ffa23384313a1debcd37f72ddad02adb3cadce7ee34b7c1f42a15d0d030487daf9488aa7562845a11ee7ffccdb38b300935caa31f78a4ff3dd93403cf0c6a16ca611b58c736aafd33d6dc56f0f47878211d26f6ab801b9453a7f74b44593dae0f047ddbbf2c902891111729edec44f69a05944b18e7a601f41ad24fd6833da3dbe3029bd390de7c9841b2ee2b079b2bd2737518fe1bbec88da64769dc36e4a8bf716c219b2fe059d7dd220c1ed2c59878db5bf8b198e0689edee921ebc0cd2d3853fcf57c363050ce58071c5fda6ebcfbc1bb62e9eb956286291a108bdd4191c4ff47900d6068e1ea26b487649af119b9bb15dfed804836f2196cbe12d8fc86e3d7ce89b52ad49dc9ddbce5b370f73f512bedd853039366612453733740586d1372143b09f21dd4dbe1a2bfc308db8e4098c5e4b0c1e16141ee50e85fafefc4e2529b3c7252af37aee6f86e19df28871686107d7d57dcc812bc077602642d2ecefdd5f694b8f336913210793e4068da2178600b1f41cffb5221c9b4b6298afb47e85701d7b1a44241679d8996f916c81ff437261cfc358b9ec42a2ce16ca3bacb8690d6c1d91cfb3e0bf1e7ba45bd01606df856fd03c7e946f7ab371a89e1fde86d05fdd97bd7b1c583b04c2ed2b5f6815a460645e4e1b4e950bf6bd81dd0352d1048df85266f1696534aff5b1cbc17f15d82cc8e0c0d4f0453f9439094f8e0f7f4bc045b654d9a2f1f44a9c57019f63ecc41021c05b5380675cb56ea8bb691d79ee204d2c4edacde3c1fb3f4996a11d84b035f965e74009e2ab80e2c7ea3c84a834d4971a1e9cf423e4ea67ee526eb3c3e4c2d7372c4290a0741e1fcca5ae4cf36705abe98ac81e98a5419baefcaf3093a7e0449ef1021f88ffb7ad21b2677e41cdda12025b06542c4b2564f15e0b99db43b7c7020028bd829372122cd910227cb07c53cb58fd9dc620c0491f3e2bf883fe6ee8cb1f5b73767977d857e4513e8b5612f6ae4b56014e6a3ad2a065b65472212e2f611743484cfaef860999d1dc5608c58412fab888ad72bb87dd9b55b692f31e252daf8944ec5c02a5a9c23903c50dbd845f2fcc3bc9806af13ca7b025cabe675195b1d56f3fe7d7bca12530bcc0af217efcb03a218bdb6f9726536ea902c8303b02e3ced22be59753588b5f0e2f3419fa5345a942dbcdf3010465384a225ba26cdd0f1d74999c69f336bb6d01fae5cf81cbb8c1a7a29c1eb83ca6b51113bde56b8cfb6a5d72557622a37f039d090a689accd02b57c691174338de8e05bb3620c079705c969c58e56b079dc9eb44eb0fcebe548f5a31f4072a5ed56a2f03107bf40a359b2601eddf53cade66f294cfeaa40a0d94b9c90d15f61852f295d3911f8ea914d015885c8c64540a83badf0021a416c3e37b78236a2ecd1fce4114033416bdd3a36c18ec13250ee9c74c0fc4dd564b3d24a825802d5ae402a53bacace115ae3bbb329be79d1e5e42dbaf0a6446431145fe49b86a8703c7c41f8985d54f12e314c16ff89351d8addf66ebba2783f2d1a11965182aa0b0dd2de53586c5a695c6265c2b173958da648611090557bdebf11a1e042f089fe98e049f4796c60d26be38356fe020d9ace9008410d53a1bb7db78b52ee44bac364213f5c59f1eac4e3314f3423b92fdd7a6156608111ac6ddf58385ec1f3df12061208db98816ac948d803fad10d5ece2018c60faa13de5e5a9033745c824932e53f4122a39f635813545c1b74732cd55642f19ed6deca1585ebf7242c849bde981572a2199066e9c912b2068c8f1c8b936c43ae95c6e22bd7b80dfea05f495d751107da5928e806d0af905c87b5a0795df146af6580d8f9c6a0e2645686d43822ce9b4be0bd5937c097917e048b5af71c7e7521d490f107e9231ee5bd9fbf0727ba87774ed24cd52f471ffb71849ebd55605996515bdcfe95bb1df3541e7c42da4166dd01ec3597634aa6455d15fe14af435e8d7a55ff1682d55a2da867ae63d11fb3fd987fa5d7032ecefc35d3fb9570940e779e13da18070e6df5292f97f2a281f9598101102c955fe4808a2319c85fdef3d55b19e05bb8c2d3da64bafb67a53491513a24f6f0804aa162c8a7db25b38089373fecc45a0eaef65dd9be3b4b7f9436a5423fdcdb5a9b60138fc6a2261225390d9ae0d8ab7f0f7ffff69dca06881d33a637d634358abebb333df41151f239add91abaafc89070cb2159ce3a31655c22e4696c9fa7a7211d1251d4bb21ea4a321a3dbebc29d97f526251e40e548dcd7ed07587719a266f006179dcd22e50b3705152817057b097b043ad63b8d867edc20aea9b4c959ef4ff70f47128cfcc21e31f17978ecacc366f459ac1cc459a3976e4173ca322675f84f18036119ec2f204c3fb554a0b72f7e9d8c882ab147b3d280ca9dff7b9160b1b437b901f03cbc05fe05c6f44824b48aa8da52ae7dda1653fd500f9ccd221843cf76513b3b74d094f14d93a00d7cb954bc4cf2f04f9a35e38edcb1e84f62057647dcb3571f1dd296ca1e049f1746a8a282e85138500e7649db756b2d2ad88f11c471c89dc6be2cd43481013b8d0ae83da2b855cea7be424f8b2325b1850d1fdef03e765458df4513d57c72ba9751e1edc3c4e7f97e3202bb46eec7be89871ba3704aa6c6fc08851e551a3f655fa1fb798d12f003faf31c56b6df399a5dd0ed29ef9e4139dbc254bc5d6051840a859eabaaad56324588fae881fd638d2b70fb3813402df61d941ab495588e5fc3823249bf9a03cf877902394f512de118edaf98843a5445e9073fcfa409df3db0221f1c77e2dd21e74f9e10c9e180dc4ed17010eb949c6d67a22bd5337b2c68f9eccdec778ece728e91353696b742c8f5a3a569f054efb8c1ed478ee9b75e26c768a5816aa6bd08a4c72e745fdb5deb34ecb86b3a84346c1c70f9c16fc45bc0421f0da2f630912d5079f390cc53b78e343310de722b53d2a3b4aa386caa0d7e91986e19c3363426ba30eb5284293af81d00158a3f5233327b40c3b989725ba7dd5b31ac7abf8d3e0b737e843065cd7316dc2f374a00bed4cf9caa0d6e232c854df1bc24c3d484bc6bcb14ec770d5745474dc6ac3b3ddbffc551c9fcc2c56a5e0ae17948457c01e701bf1554022bc2b7d9dd42b2b91172fd85e6874d2d61fc7b3bb3cee2a9bfec09f6d7e98279c6f511f4140b116c856c1438e34bca59fdca2409f025b896a52d68719bf93e82e7d89bbf798991fda0af8d06d17f39eba4bca09c1fe594b537ad4c9b94ab52c895539d639425f9146b24b016368a638e5bba391bc8763cae7c52ff9c496884f1d84e5e08ed451358ecb3c4919dd410e82cac35ae744078287c05c89b42999ea6b8b127d40d53a5722d45139e8bc507a11e7add7fa9ab12cc40afeec008a4668e3e6440f27bb5780936c0e3668ac51262390c79b3f21fd041cf36ba3522f3a552714ff188bfd554c60d0e7d11213cf7d3864a5175d4047c2f3284741f18ec22995a5b82bf62190151bc1529c6d9927f9b0c1dacebd9c2dc406f7f64a973f9a70cff6e3abeebeb46514bbf2ead382f7262d46bd43d88c1b91a9011d1f8ba81fa536a7162aee2b2ec6fc0f2d6efc87b98d2e41e0f946969da659c21053775ece415a34d42b6cfd5bc52259867b411dfb991461ca618052309ca9c96468c2da12dfab0e822ff3bbe7ba281982a239ac19c47024fe1f0e3550cf0975add1f680a9dac9b2c4ab0aed4f409ddda6765eb8a0a9d1e9d07458c69ac8195541219b18efcd06c0001f2ae7fee2d404666a18ca3cb3aa4f0623e86c5b1229f6c2ca28d951111294b91edc52730b6b2c46e000672a7c89b2f38045bd3e37dbb8a75e18687a514dcf740c87a34834d3c3cc8aadf6166ec0c42d2be92f90a3af49633ff23cd80848ceb57ac550eaf9ae496bdc6a2d7cf50fe107895b4a1ed014f78af24eccd6a07420f1dc0df1e7c44b4ba937dd43cab9c798371b148325578d61931766af02b45054bdc2d9fcab2f4b49092f6fff7c27886820739d6140a4a905f0020249e8ae8dd87da1a1e7b1851eb01045aaa72dc8a2bf68055e7aed41d85336648a3405195d2ab61b0e29a770461f32fd05e14c17d72c5252f026a7b9abe7ea9176d3c46f6ed9fb716758d97b41e4f5d81a24538f763d83eecafafc668422612b40cfc32b3354b24755fbe400a2bfed494fe6d0ba0051713b776e67e2f1915e94708e6dc74b398f2f526933aad8fe7dc32faf40022606aebb6e0756b994c3176fae7640ee06d6c67bd54764c4752f1bf831f43e0227cba101174c5554ce26400f333dd8e9f6db1cdf670ce407d7d06c3aef4c0724b62edc8f1ba3e04f0e394d15a73b9255abb4d6ac70303dcf9160d32dc02d4804219ed5c7e3b48402e58ab2f58305f9bb95d2a8759947de96328ed5234cfe7d0b2a9a014df7e4cd0ae48906315f139b8635d2e6bd4aba32e62b8906cdfe5622c411bf0373d0cb07d17bb2bb5b83eae4401c243605fd1df759fd0ddc704ccab5a9776c40fbf6bde0f11b9646c699f26063a9550ac228c9884c277bcadcc0a2c225dc203e28e253c4e464b23d2529d09c7b7dd3c984667372472b615645f294c4e3b0797f9d1c234015b78502d98bfc04f1fa2f16cf3e7221d5794d035e4b172a4d84e679cb1c82df2fb49d3c6668eb1661bed56705096c2371a19d668832808eedd9e5b1256c18fe7ccc494e5e29145d453c553ec86fb7f3a634d0d45661875f2f1005ba5e734c1a976f37cd23450e4606e32d027bc9ec2edd9395e14b2082179bd7b4f9b8caa2d00a2de71d48553f7d4153cb56a1b08f11925e4b11c9281744ae9171f3d6faa3ab3f88c5c34fd23e4f6efeceafdcbc07686ef56efa62c0ad62f1cdcb4d3b5bc508c1f05263bc347158fa5495828f34eb7fcde98fefaa82bafeefed3f4a58968d751c051b52e0047f066de5be533bc3b1e439ab1c8602f6c67503803c8fa113737cb8279f358dbacdf45432b7a654d0e1122cca93420e956661d7275181c75b0d9c20e84c7007dfc49f27bc00007cf4ffa631c892981fd70141d532fcd51de5c23fe0b7a186d0dc296362f235d61698740cc315891cc9342da17843bcde274c17e462263d0e8b4832dd9075a7bbb443d4b26b41e534ad5551ed5ada102175e695363fb48d6b99ac978a3aa6f405d87f983384ce35740e930491d75675337c5dc081e3d301228e61bde5cc169968e5b4350cca2b085f9f75cc4b88497a78cd0a0073d90246c7dc102c7cbf3516498e8a41aa85d8cc5bc285ff66e8338e85ca83fb6889e2bccff52059bb9e92e92c155a349952680ffd0a3c346061a53fdf074417fc90c4d1af7c2acc3ee4b080752cbc9455ba5931b7e910f1e4af0efce905d2cc9c685923ead387fa532c0e8ad92719c76c281cd010e1acce500ae1443838b8afb48af032069dd07aa4df0d56bcb70a64592633699c8658102f1fbca441325e27f1732a7a973d8cb3a0684d72943ef6f1892f2d7ccf39bb6dfe5801ab98653bdbcfbb787bf125253be2624f6cf44177d588bd7b780d9e3f4e3a4e50b8a253fa21abce6a94b9073289c76773b46140f5a6e46b9de9ec066c176f5d1a69f380e1901216617363362d13ebb26ad74fb008ec08841550ff14ca800a1ecf2e007ebaad9f4e0d9664448d60ac0d8544243129fb81c1723b9b4bc2ee971dff736d9fcde0afbfbf5c50a4cc06a4c363998326c17bdc9e2508651dedd9a2a52bd87f8693cfcff60753acf9716c526e8635f12377e36564ae55d0fdb3c7997ec4dbdaa5b4d18c7b660acd95060831795da7d299a5a8d8cf9e92537dbd3ef7f56aebe38fa97c41da6bf0572a0270be7e5a7dcc0be3529339464c811052b65a938e874ea6da469c7d8992ce0aff1c75e82d1621ecb967213c65f2de582cb41de3804c507ddfc708ef3f6096ba4491e431160f98de806d0f334e03cfb7a3bece601099bd971253f3aa0df845da8b478603d5d88533d0cab9c89f2dd9a1404cf8939ffdda652a94093865a85fce2bc3d7babcff7b9f3306bd76b9af80c78ad518f89ee73b7a710da604e72f4927be8d65d06be2e0732fa786a83e27597cfbed9bf98df445499e0746b9f2cb9659ac0a9cef433148521f33b1d78d13c8441c0d1e20fd93ac450a3787a2292bcbd68cd1f961d34937be9a21abaf26f361bf53aa0c095e53c51f3e04d567eabe6e40d96a17c2bcc9230b18f7e079bc549a314b4ae21d30a3341aa205bc75c7f1d21b0a49549c300faeda243d0ce18da5e66c5b663cd705005dd9fea0a9564174abb797d64c58fdab1fae44576d514b75eaa31c9278b15bf9b6df7c6c2873d7a56fb91ab77b83761a09f9e1ddae535622fb87f7462256a60dd39dd3ceb6690b0272920b635ea639daf24f95462c523e5bbd8d8407c61163ab38877d5edfa04c2a78d4d240523ba97c7d01c71783f8748e85164b4dd08c25506a4ed18300b42b7bc6e417f512ae456ceec2ffc83190991a06d4a58ede215babcd3688e1d61f1975016244e80c88ae2aec05c7eeb1c50caca72b3b415b6b870bf5e10bd1ac3ba6b4acb1d1afac554444d94c97e171005fa4ea9c651bb4e527ff58d0c2f90fb453a92d6546a26e9e98395b09e8471bdcf2a145aacb649708cf048a7856ce8cf390c107ff2c66efbf2a76c5b041860ea576103cd8c6b25e50eca9ff6a2fa88083fe9ac0d1fb639c516b9bcdf23c34c6145a705498ff9b9747f15e1c08c63da6efeda4eca02c3f00dfec06c82220c9de840040118dde76be788daf84e6a2f44c81fe6defcc474f99c51c4648d297cbc48f081e0809dbda505d020cbe865e430e0491644ec8c52bd3ab8ce8c4862990f49fe2588caf804ce9500ef42d5a50c057c257168e283e4a4aedbe4ccfaf3eeffb212f9e23d15434d60bf4f455f512e2b655aff3225d1b217c261110cec0400f54dd303d6231d028c2eb649bccc91d30a6391c88bff9d447c3cf35a3467be5957e0ea4d4dc237c9f2c68ce48f658f820a3d72d559b60f233ce538c92cb148808e34fedf2d648c21e7f2ea29a77270c393bda42d869351d6c085d965dc12cbfd0311b8bf604f4391d378781eea3b5f1e0da9d0d8f8de88e56fe47d362cd46f591d3ec0f7cccb85a21f21ddcd4107821ce0ca9ddf99dfdfd9b0c9cd45053e5b1b4385bd8f5b227ada31b5c23e9420014474e8b4494fde7c38edfe70994d97b8cbdfac588df49a49c472fcce78cccc051f31cbbc1e0422878d8d490f3aee28adf1587c38fb7e7d1be54abeaa83cf54b633803a5e669ff4295df8735231ce39631616bd05e0e31117c722c2fd6787003b0bc7fe422a089c89329544e085d71102c1813769450a9f66f160d1702cdb17bd2c6fdf0f722762d193ce83623eeffab17b01b10a31db6e2feb6eb3abdbb2e36320e1a56e44e48d26090afa7f65003a98cbfef590ac3ec89b3eb230557cf6aa566e841806aa2767b21bb26fe001f11ae039e0c9a4bf1bf3d271960f16158eb5bd9ebf0080abd8369d512cab2d1aaae2b14d0ff6ee705a38fb0c801a98b0624cc138fc24834fdf430f33e1760db913da3290f34415c9e3df3e97da1780545ab68ac5a24db89f24d62f4a399728e4144a8c89f47ac2d29e30c49b0bcf790a5e3d3fcd1943c6a28f37251d9dd827a69579e6c17b629c927473b5a07b0a29d9562708d6c8ce576109ad1a3473ffb2047eb069beeec24c114bef392c929038c92abd0e6a19b610e27881361824d57008b7373d0ab76379570ded76c9b8284fe2c247791073c29b2fc6fca05019220ab92856892d3c0dcc6da0b597fe559c162d060d71513ebca050d9638164b9ae271fba5575ade787ec5aee8fc253d1b234b1df561db3e36ac64b9b0100dd6b407043537b2b141f
-MD = 2cbc07b9b9c819b8fd38d8a614a8a9c3fa7e40ee
diff --git a/src/lib/libssl/test/SHAmix.req b/src/lib/libssl/test/SHAmix.req
deleted file mode 100644
index 453fce20ce..0000000000
--- a/src/lib/libssl/test/SHAmix.req
+++ /dev/null
@@ -1,99 +0,0 @@
-[L = 64]
-
-Len = 16
-Msg = 98a1
-
-Len = 104
-Msg = 35a37a46df4ccbadd815942249
-
-Len = 352
-Msg = a93aed0fa5e163a82c9a934aebaab8180edf7de0b32f0fe99f9c75ec305b24609334cefa372c7c758262dc8f
-
-Len = 1016
-Msg = 433e88eb2f8aba562d15c18126fbdffb81d5d6c9397fa052321f5f78cd629708ba099b540da5451e949eeab8687a8d6ac35c531411cb37144ab5ff6a7eb46f1ab28fbcd2ea0444cd87c57bf7d3c02952dba3d3987da07622c16e7c086d90e88ad3d9d4afee301d2bad915d868f54197b70b23c9fa385c443404fbc9abf7e6a
-
-Len = 13696
-Msg = 2c46a76a9dfbae1f5e59f085e9c3d4b600c24b2d404d062cf948e75a3d4ab5b137a31397be9eb34b2a03c78367e0b85448891b511ddee1f787cccd498b172cb7e656c044a03ffde8e42478330fbe9c34072a9e99ce31b41757cc820d98e7d564e06694b96b66f4be34c5eadd0ae4e61fe6abbe4d7ccee855104fedee8b451a7fcedb793d469b0094c0ed07c97fda00dd8c1662b44e3ee6775a5ef6368cb662d257be561a5967893433a4b63f97295036a37272176d081545df00852bc5c4162324161296cd51f76433f2df867a5840f2d0c8d5be00b4dc89443d82175bf69c3bdceb97facae2b2ed68e06ae74fef36d8bd1f75f130cba509341dd54079d45de22845cc8e77a022977c7540aa3e779cb1127f39f825d4d78e55a967ef45e7c1dfb02d9999fd15af2914ba47177177d94576f1091a0657d9e04fe81e6be7b631fc1baae66584c9c26ddbb568750d77555c927bcda1fbdc15c7cbe3e3fe88ca13ff12c59b383343c12976708c0e3dff78be0e286dd32eecf20b71a09fee50a9d0b13c85a15b320b162690f399282798aa3291fdd2f9c40ed873e829388466ddd1da42f2de16aaa9272ccf44790cf3c95382c304e25ae8cb2fc9d9869808f3ee7d42cb143bb0c3a55e03db6d1202ca1bdb744e448640c0aa60d3ebbda5c21e623bb080f4a073a48822725d764e51d415aad1d7c5a7f17433d15ac7d849f910c375ee0899f6a576dada42fd651343383f286009902bb62deeeb2514de6af7f09892c20d0b238f6021f03b62444b1e1f21beeb89acfcd7136416fe7bd8f202e76afaf5345311798be7cb25351add2bb044d2380221009c4d1cbbaba4cdc8631dc0144f2778a6aa1eb3d3c81df0b1b2142fce111af8214d049e40f536c5d462b9224a978e82cc6c420e70ecc3cdaffb726a183c793845315f730fa4dac9fe46e4180397107a6a051f7f0a58ceb9bf4df37e1a81c8e9569187228e8037df2e59c52ba815566768bedc8e09d5e7bdc9f2bff23aaaaf133bb5a3332750f6124ce185e29fda0851addfa2c3d52bb6dfb530fd4ee27dd5bfdce5dc2f41debe6740274bc651aecd4023b098a7d622e2296b50d51b79c4e3f521695a9d43f038e8f273405e26584d3db179e7c1758114a3d39970df674580bbf2884405974f0b9c4b0d8b3287a2314f3f81b6991812f354d655f62513c9551b378cc2efa4c3e08b313c56cada52217fb6112eb8299b28445aca8f72e7170a1cd8bbfee4d2145fbe8d49c6af8831c4d4fc7177a50ee55a7b484261504af946c6bd5e1d6b89092f3c487c0568fa07c356fae9b8e831b8320289039746a435b122cfbc4a0d316bf90d481d3b7d979cc50d98c1190af8dc58e0035557dd5e94f437f41fab513202643a77748f76c6b77302bf40c392cd18731da082c99bdedeb70e15cd68bff59619cabcc92adcf122753c55afde0817352bc247d1170b8ddba1ad1b0faadfe0efbfc5fe6334377fa372c3435691f53dfc2ad5e08966b2d3525b1eec2d993a5cd4ff34278bd40dd80313a0727d05e0a932156152f3e11a190d8d69726f5c57d20f811e1e8932e86409ffdac96c6251c2a2976b8757adcac5d2de94931d1cbea866ec8bcba5774f8a7fde792f6acfd0f01356fd66fdf54a416af6a9397e00f848a2e9831627cbcbb52b5a868ec174e69b4cfa1ed72cdf23f39d7eaf4bdb318c188b1f0fe75655e34ad71907cdb77a1a2b162cd7c22d93dc45321eafb17cd60282e83736267b3e1fb249c307d49509f50839942f0f493afd9ef37db053a918e3ec83d801bbdead07554a018b8ba348fe9b7dd92ea7c5fc0e65a644ba19aa1fb6c022ab768ec7cb249ba17b9dda2860bd4aaaa3dc70ec009804141ad5ebc61203658e57a0887ec0fded18d844a96e79ba7e879c4253056f23e205a80ab1471953438f85848f4ab31ab175c089e0bbb97ea0dd6a67385770356741966053735e2cc2ecdd2c8c75cc045181dd7267584b901674b553082b2c58fb8f8be0b99306194a6f069f684535423304d40a268d55784a14260fa9c9cb1306b82f91cbee3c9f43dea9e50903135cc1c6505605a100bfa28564a2057974eef0852b7b72ce264815026d0759f691db618ef760edde73ec888e181403834f7221bb27a69479ec9b28a3fb0c3f68d4467d25712fc48ad78763f9ea6e8a2e85260225ca1b1a38b720e589fafca29f07257c5467cb74ee53189b8c81b784c43e93f98abde1ed53af60b27b13df6ce45001c6e1813de3521028981086f7d88ba13f6fb1a800f312fbe2f842eebe847fd760c394668cfbfd353ec14ca0366eccd7b4cd63318116bdc42e20a632a0d2b8c5cddb37bfc0a239ebe3800a787d2ece077a7968036b3d9b31cd906f888e3ed742cd769033e2c24c5a9e3c10b6d300db5a17dd88
-
-Len = 100816
-Msg = f8ed40e878dc68ceec52cc8e2868722310fb117ca3a52e1839eb85d308b8aa00ed0bf0b76aec8a70eba4f0d14d2d85c5a0e876ce2c8ee59cb36947def6c40a587aa07b368ca8e8a08367018e45b984de0d7f1aa46b977cc18c0cd9b7bb897cbb2814aa0ce8f8c9843e03c86c19f2ba95dd2ac4a466a93aae4b3b05055ff148517ecf43e286c57744a3e10a14d0c26e139a503e7927aa688c78609170ebe3b54104390e5f6cf538093a67922e7210e77fcb584ec9b6844e829be246a266460cb442bad52ca47255fb8cfe276108c36e02f9acbd3d191d34b93d29ec40d80496d1c1bb5ef036221641200e905598c54bc4abb3527c5a5f6258e59d4bf54a0498c108a2725428efc2047e0096b32dfdc6ec69d5d72f81301f881ca62a66c22e5dab9fd9d90084c0a36b2f3a0123cc5327a3bc7a12fd947ab57169ac533e4b6a2cb80fc65b9b527cff9fba26994c7fafb5102a0acd8f9d246a3a54178c23eaa04c0fdfd3c0cd980d1fc7a72b25d74df9b95c3dedce8ca316870c654f9ebea9b806da9767cf40605a4b0c7fb06f6b3f197bae7d8cde9daf38530e25bc51b68f9aa23ec0e95199b14bca96c91f3db15bf8432f714dc46ac87218691bc66cb3a42f6865e1c30f8394c8e68c0ddf5851ab7c5906a1994a9af6ac1c44d0d6b95ff15d9f77825ccea40fb9e516d45888f2378e045d95d936d541cea9c8ca52fe5f7d0d919b2b1c59a42d06105ea4f2943c05178e59d67351c5b2c0051c93a4045e512884fa656b772cf398af89081546d920fd3d24ebd16310506a786ab33293027394c1bcb7b1efe46b550ac28529646e8d2a5ae65c59345e24b44cd7b06673f3ed3b9008aa568a739c26682fa596b7a655842cc6b2758b583487c78d14a76bdac7033806c5c210828ef313f8efc4072681f5fded748c31a58ac933b4665c445f07d603e0905e49b84aa55146eb1c1c99196413832a05efee2e64d6732fefc629b79b37bb9390fcbed7226b412204bda523b8b8af5c4a8bdb263ef9f3f6c7b9e1de3a1dc257c1f33b3d54a9101be5b4f2a9db319993c2cd137c41e35c434ce52e859afd1a635af4d8852252dc5e28c729b2b4c96a56d57f3f3854ded59fe612b9b3a51fee3fc1c83db673b0cc7433bff2472bc74a2eeb6706605e308690fd072a7042ca6474603711d8310909e47063f46f287260a26c4f11fe492298a0f98d28c45948a4899e08fcf443a6ba36457dd8329314d53ac0fd0819fcfc3357426c5bb8d3dfd706e205a81091cf08f31cd3459854f3d07e503991ba5f067e3c406c6c5396d8257496f4ba3703cb1ba25c2fe4aa54577af782cd57e85a88a2d75c54039e8b7bb559219edd6e81e41acb6d575d6f798afb2cbf7f00abd5c9c7b0fceec79f9a0fb040ebcbb7bff3602df7b71357efacd37aa57019350bb81213508a006160acde3dae5c42f03141887eaca22d7b33d6791febfb619d11ebabb13e6c5378e9a72e852ddccd31cc53a43275966b7042ddc51485ca20e1c456dcc7020cafb5407548b044d332229911fc74d7fb97de25abff7efb431da82de2ed7e25d0dcc06ffc74e57ca93a6a9f64d76a5c39776fe2266f88d6d0229b527525fd2e22a1407e26f94c5bc6adb1e7327f3c8bb8d4c983385c579dd8f5623df8cd6da569c7de73d9210e6b9253a177653a13ece075940fc81016d8c35fa4f6542df5120c174158ff32533476f4e059e35117081a24798fbdd1eb10f82809836f8dbefe755611347f75423dd8571695960c6f66cca71f0a01e8fecbe1183bee3335eff10b4ff8104132040e2145ec3164b2448f60c730887b9d7894e5f7df3f876cb17136c99cf32db1c02fba860937378dbd093c4c5112133781f06c8ca07c527c2c085e8ba5e52b399f2909e217aef6e3035ecafe2caeb1004069dea023af7eab873deb5ebcef2313c9827821bb9f89fd3d1570a569673d3ede86a4fb13dff242eb98450a8917fd8865c56e0a9f11d72394b79808b0429f3a83cf2465161596887fa2d557b367a1de9c7753666b0cca9c30cba9f0a749c03c55cdc7a6d45852c76ce2010de3e7f75d95228efdc79949b238d90b25f983868b7f07f585f7b00e45d9e132f3c09ee84f794d899759be3dabd46a256f4cf8da71270617cc2425b24cef25d1d2f3945afa6f81abfccc858cd02e05619649b1a5347650934105c02622d538447223d136a8a0455cf3c6f61f696b32266197b5cd1d936fd3ad4288520fb4a2f59bf95e659f33210446ef18debeb679dd99de0c3c74a6eb3dd783861f5db4e94a151c42ce27519d0bbbf1f3b1163563ec06c8bfd881d94a3b896fc07352fc97ada73685588a2242da1b718f81bb1077bc70fbd58b8b52163489ae403838b533851bec30ed0ecd97d72d1af534f3703db59f1f563bdc39d690a0e90e545506463a37e84974fd7b256bbb912cb4077d3e3f5bdd4bd2bab713b696c830b1f2185734c4d2dbd49d5372fe8b813ce73f5e01c36bddbb376ef4541033f2b0355613eeda8951ebf7377e08f967902eb7e23c0fa798c6ae52401721053f1095cacb1e9496500e83c412236fc21566090b3a3eee55aa402c0b774802fd81c9e8579761cfcfdfb1aa23786b2dc35dacd5ca8d8d283369f53e4a5db18060c2c6b0c303052aeeffe169fcaf7ecc63090a9ade245045ab9c8aebf738772297caaef5f857322a597846c7370083d409df27612e47b0cb240daa3cfa51c57108612ac0dddb0f59791289ccbdb3a2cb1fa9ac31a23dd5440682fb373bf0c1f41c4fe2185ad7c53eb69552807410053b0c2d40132250e637b8c425e6a35d93333b5b7d0557927b6179c848ec455fd1ab38348c0e96c60b2da49bd15118df64b6ce4fa48fbc555a4b2874141718e731a40b85382ae6e86ead31cea77f83bf5c063bf1febf71688a832d615e09d6f14badedeaeb6ffbfe343fc7274e78cd46a2aaec0a349c5f133291ee57cdcb65c5474e46294de6bb50886bce6c6f44dcb95f2a4761ed2e6c9e7bfed51e0964afab4e0f7e0b07960f2590baae66b1ec9a63ba0fb6c0d27e81508c51487dbbdc9beb8879fd58c188dfc774b3d0ddbd77ee8bdcdfa0ed8a9387728e12b13e8b3c10cc1c132bd822c2147c5ddf9a993aedbf78ec256db1be76644ca8ca7727208bf89732657152d34e948d73c47561d156f773136684d4162d02260300020123d13a95f4f835907c344942ddeccafe2abb7dc4792c4f1e39c24748c63cba933b16be0b8853e058c47a1ae2c4dfff39ec2339b345fe3557d03c1df91a0607a711636c4416ffdb73532aeeb74f237ed8bf971388a0659e4682a46b8327e751034cbf2c87c7828da9d24baf07a742ada34d1ef38ab1e8f2b4f801192c146600709533e61bc2665dc1e9e6441bf3c4f6643bc0c102a10f9a69da5b0e3d0a0c7cb694c682493032b5853f02953b5c2fc0e1348565389762fc2dcfbb34fd305f2d9df080e859396ffcbb7da78aae0a0d72e3de76c774bc6a81c87f2872b6afe97ced5269009304a4992c4add0bbe24e57632e19ad0fe37ae910193aab0aeae32cf6d618ab33eba59f6a04fad00b1d2403396e6fa661d31b695a1b349d62f56c08fe6c6eae7a482177adf341e51d03ea511d7959c721bd20bf371860ecd7fce1d25212891850b85648db0a039e6638d9c78bc958add3e41341536b5007be63fd1f7e3308876bcebcb97dc3b05a7b2eaadd00f8fcc8dcfa7b961bbe727c9aed1626ff786d6a0ffdbd1002cae8a7d047b6181962a686c152b2341c7c58c9f1dab5af424d183ed1c7d003165a1d04ea3683ff31a0f68615af6f91c21f736e67df641ed31b998445afadf9052bbe004d5dad08f62e5d353e42fc35a92242d8414d99dc4e7e81c8c027af686baa5c185e3f99abb3855b22cfdff0a62e2f47a632b7df8e00e0317af5c24ce7c64077bbb15ec27e062070cd3eb8e549ed9112469090ad9a96eb59294b021eed81987178cb2dcff67a9a2e930f6032c753e203380f8a7c987cea393234699de03a1d09ce204f0a8b6d5cf522b6887174fdbccb08f3e7c4fe2f778254465b32766c48812a45151ac37ae354dac87419f9476baa27e24b2f322b2da4ddf579750684a5881bae2269351fb7de59b9d5a4badd8951135f2713dafc57215dc626ee170fae7f20bff98e36b864e1fe0f0f9a300c903069bf0e0b6f2f8e78423cf6063e89dde6c81efcf26ef15510563c84730f611ac879a6628e55115e1a29de6945d37fbe4f803fcf2e344712d9e0d6f6c79f8773a9f199b705235e20a7830ee3357c5dca29d7a6c29a3d2628bf2c42c8f076cc4525301d8e1860729070dc53164d9fa08bf63cc889eed01b0130a7146d860bbc09ead3865a3082db0836a45f5506c3e46e452e298764939226cedfd06700e4e33c6b4a78add601140249596831e97f960b973a4e4dc3fe2813fa34eb47f998ce57270368fb81719a09298a223f7e3931ce5cdfab3f658649533354e982c87dc9e49eacebb5bb4af9a767b4f1c03d774431168cd4fec1b2726f1aae3f9a062a825f3295557eebf3af4784487b869fb049de44d03fee71194fc200af72103b157431935b5ab9bc122773ffd313d52d7acf1078386090fc011de695e71567cfd51c06317d4ff8841ceeb74ad35f4e5f4d20921123cb88bb2079674ad39e133cdfd6478d69c9bddc7a818be5d7b254bd9e0abdb030f52846fdfeae8ff370a51a9c5f6017af3c6c3db17c5c614ea18ab0e3ca0dd5de621217dffa36e5c5318fe191040a50cc3ca620683bc34da6c142e1c50afce28a86b8b66d189adcd755561a647080d93f3ede1cf54c3afb7e863fc8a82a2576d3f79e9b2bb634e598507a3d7d017e0176b7868bff3a3dfb4474b3ce03c401f33929364e727fbf8096b77eb351435c7a113b3215cc6246dd86f1517a7e550cf828900248f7c1754e40fed62477b296a37d3e53231360d012c4908b466e49b0e620c0a5031228009f259b030956ebd70e49357c3c3ac2842b6bd6e3ca5a3e985dc03f7105681fec03b320a7ca753b782ad3b52fd9c8e3bd980b48dd6ec8901dbf756108e85015821c880416e0693e0479cb31c0743450f6d9214afabc4feadb9bcee9def460a58d3a02d9e3039970068b8e3fd0a403a6ca7f2c71ae2b46ab3c731b1e65e2104c47fcb1f69e7c8c6df8c09b33f2e1cd4192faab316a44536dcac608832019f5765cc5240eabe3c87445c980c299a5e7ae0acc2c2ed19fdc8f011515bcb00476b03633c7669db1b44f97f6cd402778e9687c740dbe5686789b79d0b13f784a2a866eb91ab2d66f064c49e8df513ec348fd7272ee548ba08e1f9f99696ffb53677550d59c67f88404f6e610455a422d9cd987493ca5c366a397dccface2bba8e3e99719dafa768956cbf6fd8defc4104b8925878716a0514f70cbf3fa2c2bc2f66fabe654eed3076257e71117665703eb88c79e4c2b94e8e856e7a6ef90ee2a358409db78b98056ce1750eb80725d70e35507fdfa5933a61496ba48fbd5555717b33b59d4ef211fe096aefd478859ffc97a41372023ef114adcae5a8d5e03c21369baf1e7f417cb40326bc6db1cdf0904651dda3c1039a2f1755e7c329f7c03bf33f324206ce6e1638711c8c9a45f153aa1f847cca2a5d3af1d24fe7a1e1094819e8e712cbe10ead1012b7371b35cbcc2bd5b10505fb63bea20ac81d25e83ed0105e7595b6c28400f4d336791ce4a584323d0b455bbed44392c5f86c9d5287593f6986d4b0b8f9974a7a4157859ba801251d3b44b2bad84f29cb87dcf1680d6d10d1bfd59f0c95fb7bd07fdb3ea2fccd6e3ee80af438956ccfe31e750972f893ea5dcaa26d077fb3f09d990c2f41c8707368bba007803621ecd76540cdb8705435d74f4300eee04710a936f241c034709e625b0dd5dae1f6e86d034426819c365a05f5be420cdf4042bbff965a666a5756f67259448ebf742b6ea189fa17a4c3bfaf651d19a8a525f09d9cff637c8fac02eaa58d3ee3f7221da1e61833c0b183cd9f47686f09597e8115b435454acef80c079eafaa22b18927d07bf8b7c5ebfdec9c42a52b7824d45decef41e6184dc2db1505ca6f94172fafc10731706e79b9856dfede353d2eadeceaf72a302e3492d7dc81e3777e4e9e1f3d33cc4402833ffedb241a75a09e9495d671f80ad3acf06823bb04a92b815edd0ca7d01dcb3318c1ae5c62d3e99c0ec37908b45b51dd65f6b45b34ede2d6f553f60a45e20fafcb34ae4dbd375f52a5db9c62650deeee78e955087c2bea75ede7c304347b171fe0c1a2a033894be6e04605271307f307b2a9cf6ae24b8c87ce033a3fa4cf2bacdfcf54fcccb1f580476c7d00c631a8529a9eea2a713610341e0e25609dc8927e51c58a0a9197a54963b5cb95877354f4b8316df02ed2bea367704a12274d96bcbe0d0d728923a368bb8ab98d5db5401894c822632308ddfd309071fb4b477d8eac0ea5dbbc3e3606d8510d9051dfb5e4b7cdcf2c57c1b76902d864c3109c901da53019ed33cea84b407490486ad9f980a8a63df3d2e3921064afea137f35179130db3351f5bc3f5e7d590a5ab08b5415efbd345f9d57b71ade7dca939efa5a12d677b9af0af14468176a43712bde10cb15787c18bf066eaef8abcdea77d3a0c61d6c74ae7b54fe90940d0233e4b874c9a141dcc740d7fff43b9fbbc012a933d890232cf74fccb7ff7eac1148e203c7381b7f1d1429b1b1152ec25cbf7562596eb402a9328e43b5dc5cae36592da5523f0b9907a6817ecd395a7c778daae85bb11372b20641a04250b77b3a0ece885d07faf9622650259b874536d6d2b92181c834dc111b6fcba483167be40ecc922fb87006f63b9e8e632879563f37a8f712db9fa68c1a20ab239c0116fe022fad1279f3288b8e74a16d447e467b6381515814dd3aecab5c2a09c400b44e9100c04c720dc7e8c6d9460002da6c52004c16999975fef8752c2f9c229cbd9e6446b226cc454bd68cd665668a17328bb30f301e92ef5c7a2197a326df5c99b422096de8af231d1d8872e6e505bcfff026d4862f28d4bb3856a66ced22c9b0587451d8da4230a38561b5b1c69b523a4701a2001382aa82fcbd60733a14696a540227db44aef346d6c0a7ae5173604d59eb828614cafc1b8cfecda054dcc7306f73925e6d1af56ed74c51c6cdb66e9fee8d7a0078254fedb0c0f5dc85a4686870709b499eafbc8451aebadf848b0598ce8f955688bd2d6032abe10d1391d67c20a049841f95d2ee0c8deae2bc1baca0c098d8718cba1ddcd968981c47cd98d247aca4f838f3bf16d092eab8be8deb1f8d504d37cc44a8c96c9f22f2698036d4ad3bb48b31f109626565c147d20a4a7dfd61fb918f81548fb4f78875c1d138e819f6822651b93a3c92ad77793fba5222d870ea671f9cac967919d18f96e92778548415b2e170d90b201215354fc48a77e62823a2c2bb354782ad052732f08beb278f751529416f37d83ea26248517ae2ef2ead28c1077908995a2d25db0deaa957bcab39715283287fd626ea7388abccba2d90e364a7ff4284c84f70da68ce1aafb5be0401cb9d45e085aab41892a49e10cbd5baf2c34f5e0ca076f2772abea6f622b66020d546f8c2f134a87f96edbeb9b08394b585f2c2f98aa792f97b43b5f3aa9c34189804a9ecc2cfaeefbd0f967d85a25bf3136fd8132dec38aa82e4af6ff677682f3b62be27a180aeb22f918c24f23bf6f5954e0722324cccd06829fc32ae4fe3aee6e5a03b3651900e13fb0a759e544d033418b6ed40d037b4549a0404792c8fddc317b7f028493c4c91d6773932f8486417544f3d007e5f9e6fc02fadff175303f77f6b0e1f709bb3d3a93b38552ccf62688a39da1a602dd5e122e6f4e9171769ada5255cc5cf938dfefcbe3ab0faca434c42dc8c357e89a3d1488fa3df35c3580b124ba3bf6d0d203d586707eb692150ed05a01bf9de5c4e67bb948088784016394d47abb853f2b6b643a066ad81bcd1735aed4e108a8c1fcd025b548de874eb60de7f3c568728959147d1219e4b830e06ca2bee1f8a035e28a54ee6958d4821a84e5d1e41139905f7ec60fe67ce5f4eccdcc2c3d1e4a753a32dd3004970a4ff3824471822fe2b5010b9b6c6b01336dbf0181a95cba2624663215468519871cc39e8a7f4a151c8bd03363b402020f2fb98069b2cb8cc1b7e930938e7540d95d1d223e47865135793f9eb573660ff79f7ed2fae503e68ba44596ee745fbd8fa562c5c666d174cc01b1961736e18b8b517161ab9c8058026e0ddd6c94aed0086a26e1b959a5e05eb9d8c1ff5b2ef518ca23b4f265db61b499a48cc46bed28d23ffc1e8d9c9e345c06079ad47c88dd4e8e286575bd7f9420ab9c2d5c6685488b8b34d4c9ac04e1427ae0994cf789b48b01d1db9c2fe75fc5187727bb11119f82d0739ce4048467a08cd635bf78cc1b6cc9c28fdc199d351064a81456f81c9e56a43aef7332973804b06b18a26caa62523a7d0acc272ba49124b17bb68800d5756afd34ddb2b7e2dd8a118aac3fcf39d9f853c4d2c4fd3ed5bd25a6604d68d57db93d15aa1160f8a97e6c24238e84f272780966867f9c644ca2775cdac4af0ece036cfa6ebb1cd9d701dd7daec5763c9a4de0385db383a5647918e79c6a6de1f4ee1f6b722c561704c8d7efa4710d78dfce8ad2df0d3d82cbb59cef0bcb001f70bdc6e17af1a720b117fe02bb1dd527b18e6bce70e9447cd0cc85cbcf431fe7c006f5e4ef878a974a93b25f492847c9ae020583c9d412f4124246164d8f080b615e2eee267a7aeb5fa0974de52cefef23cdda7b305a33a91e9b50471ceb72dae337c485d636e28d6ee31f5705983808b1567d4d4ae820ec445c56e6a404cad6b408691475397c0dd6cfad232106ba96e5104052700a653e21f9ac6d79578a9f52548f426a1e81dd45bae30acdd4d22a2dafd633564d6b2f45e7d35413503c955cb0a9784b42ae8c2a5933a6729f3922f969a158540dcd201ecb6e32f88b5b4921914a2e8f424c8b031f115ea5d23a21e6f22439ffd7e5d11b08df729f65613b4f6ad3edbc9a066a5e712ecbddfa6fa764cdf170c0485f82d924a99b7e7ad8dc44c1f93e49b6469a9af3de5691944413f1417b753bcb84d5b7a34f362c383cbc802b0c88bd23a7ac471b9287571c42081b1134bfc8ce104a550942ab1f2a074cb00a90558d6e841ff15cfde6951f03e450a1bfc90dec6c513fcb2692ddccc31d22e5274d41036656183c72fce208e44920776f196193137ac67d6d65ce9cfaae774f23a86e6ee8ff3a4e9422a4667d971906e5496a4e80278774899c882708611bad282f6c1d666bc5e7c40082b43a6e98d494a18e9b3cf7f154fdbf90d786e59e83b72ad0ab893c49aca50ed37ea5202e650fda54f5c46ca2a35c476f4b009c5e6733232275abd1341199b63d22386c484cb95c43ea90e609c407bc79ddd00609cc2eb0d82848db239b249f164b7ea384d0239fe1e64d04955b9297472cafa2ff272c5c78100aaa86cdd8120556f25652a3c12da5853338e3be8f505d93ea03cd1cae7e78e95befdc0e26b760d11e05403c348e0523fe036381408033c009a8e1f117af5100a6eb91f08307df465c20bc1dd029875ef7e49338689f602d98f2dc690a57a6f2864e57098f8bd723574944ad3688b292db6d01387a16493912722ac8f91fd12b748899bdaeabdf0479df788eda440d7bf30d1c25d78d757f00b74bb556506637fc1ab87162f05d464e63a6272db3fe56e9357275035d6b6bee32bd92c4a1dc94778551e94ee1d8854f767bfac3811bd0287672aaa01ea18c25650f05a68cbacd9158e479b508e72df778589e1e03dc543b60bb3b10399e5c50de9e728e69774fb3f5fea757ddefccd0f9da75afe4b67f9c54aaaaf646e858fb001a6deed0a8a769ecef0689c988de566b6015fb8c40aeb5f2df7ea4bee60e8e69d15c4a4aa5411dbe63fbdd6418cf025d87f37362f15e22aba83abe1a3de9857c71c2234023b969eacc0bc526363b7f30b092ca114f2a6cefb34394d146866ac86a33fc497a8cb8e2a5bac398579ff7958878421fb08fff4f8f3deb8c9641b8de392647df3017a5467f9d7b23036935ec6e188dd6dbfb544b8a9e04a4b3c7fa1e4d1d9879daf69986b8083e6eb023a4b5eff80fef17f8f65433c882a21565a919448e6091d1b61013fdaf9fc3e45bbe827c9b4ab10b05600a1961e81d31c7404f8e0d32bfcac2937eaed811db167dfdc29286b0d51bad2bcdb9dea76eaf495a31a7fe717c1c98be374a36271cdd06ed06c02ef4c3c06cb42f73b3332ed488416010e6bf2f4dc4dade6e2e61f19e9306bf941868f59fa0939005743dd647f0a04b576a7e71d4c383c479453501e18ec56d7cb79fe31ff534afbd8609ed701ef163f9de31bc58114399fa0f22b62c66c380e8a10c34b7e731df2a8d39dcf36fbf3a66d67b973e3a94bf6ee0bd96f5c76baa76492032fdd2f59ecaee403d486f543f2cd7ae7b0dabe1b5566e681cd40d384a94349e9668650a6f2d2daf86c59a7b02ba466cd03ce1d50c3f0ca4c02dc4b3d1c0e7b9a77df9eae0bfcffa32117d7e05adc7195f4278c93497401629897a58d08ad7141ea52e0163f14992d7a284e7b875ce4640b4dd48ceedad1ea17d8ab1e760773044845e0899602f1bdfff4d42ab80c0765d1a8bde2ba0a830c050923956d06c80b182264ad19ae4f7c39e43195f7d421bdcda00e3eb5ec5ef2ec91d69df691ba7fe250352acf01fa92af5e2c634b9c7c97889e9147e869acc153d88cdc18908f882f371ba9c1e13c26e9cb8e3cbd4c5e1988080ca65a67b3a4c3460cfadbec904d853fddd2f5375b6070941fca53cc106b5748480213cfbdc1c34320a0478b05f76fd0454c75eca069cb1fa7b21704dab67dc40d041c8a1040db378e76655636ad725219c049e6536982d6ee9f11dd032280e622547c7ff44a938a1f233c356a98182d22d5770fbc871e20bb37483dd5d6ea1551993b95b30774a49b50d411ebe0e8c92834094e23ec2664d822c40e96fb42b8607b62b6949e05edcaa436d0ffac6a8ff384068acfc0220c0b098d368fb8113918a4f8c9de37cece74c8695cef2427e54a6e77ad092a9b7f1d94ac9f0836deff41b905b5dafc58ad6063759b0372a634f69a639e19521825d66a282f489c3172a3659264d0132af3571e637782bb6fe5c0afd24547612166fd3409d0991392fa054ea5bd07a4cd0921a13ad7b62a0b5e6d56cd8adb7f3eaa5c99576941c38aff311c49a8c9d8c755869302a2e5e40109c8365a551cd3f859b9421be189d3a0e9ed78830d5cd6a2414e9cc4c25814d94d98f8848e5386d6dbddd65d22b96c5d20020a5dd409c7e5344065871e57e01c91a443501dc8bf619890fe231319b5480c3879dee618d319962596539e2970513fb5c0c8eac3a71ff99962779cf1d7e916566d0e29d121c5cec5d7302a18ed00be9316f3de8c669a64c2a960a588f9c8a42690f6867cda7146e8ce27aa6a7fb27606eed9df6a235a42d17ce71627446e206e879de56025a66556263f06684dedcfd6f083d6a707e5fc8f8212d716e062f0f7fd0c2fc62bea93d68581265a803c31cac3f8ac8939c5f8c464ebd19df42c7e8998494af614c8383294f3f3883f2404ac10404759e182a038c97aea04a85530ec005e203807c5bc30fa9f5339b32fb0427e64915e29a25bb25ac60b92256470e7de5298d42c6b88995f8d2fb704e49d55b66b71e237af90fcbfd71d9093e1a543da2e9911ac4102346dc4704859cb33ac5f5dce2b3331a9dc9fb506461a5436c89bf90d39afcf93cbca4cfc35da6ddb112243928246ae0d1ba269b0fce0468d3ecabbdb925c9ea3241e2dbdc6b151fb4aa724a42f98b0248171fa01fa103f116d0e7deb65dc359b09126f9a420300fd209508ec7a50be56d5b470e387d0c52a1d104625f9571ce1404d1b7af3fb00475b95f752ab96610be112d33ded48624015781e7198f4dcdf917839471fbedb43c34efabe09941fab6b342cf672a29dbb1eed0db788dbfcfcc63bcfe80f7718571f691818dd6f839e3cc282f85f03fe0400171cdf1235049fa53de7450b4c40ed398d5a486f52124c1c63de2afc950e81839f52d17e2a7d32f82788465a65da6cd763c6360763561ed2bf47749080549b6e2db87514e1ee1c85a0bbd346eb6e3cc29267cbedcad67a287fc5be65ec59ba8b6854b31c83dfc5155187d4150685c5c2c342ed68b01ac9e44b60f0c100a347a0f93074dd37d8956fe2f43110dda66e9f9e6185c23dab74cfca21f3ede4bca87687549ea02662f45dfa0ad27f9959a120cacb7c419810e1b1a50fad31c12c47d5bbc61bad77044aa541d29faa6126c60ef088b82eead17a52843307d4bf798b853d90d14c5347ff10615381d85e964331b7a123d15a77a6790d93e920052ddb4db4baaac5e2b27b66ff955e53b8308151c81da4711189ccf0eb393c5bbccfa1f6c94a8d5f4bcd266fc6a12061967ce836ca042257368f567dc42de6ce0be84449234a6163b72069f25b7ead4b2003e1a7665e87ccf211abe94175d1c11bff2c0b6bc110194d34aab96934ef59804cd26e4434ba166d9833fb091be37b139cc10748b881c93690528a96ccccd2dbe024510b8da37dceab567dc52706461c486a0463369cbb99bcca2e8a4d2e005c45401964722a4b3ed37c351c9f21685e8992c9634349379f41796deebffc2928058c8ef6ea37c6e4970dedb78d1c2a00ea9e1ff1e7708470a6c60e6a2b1e966aa872776afdb238e97f716b3df8dfd42bf0f7ceb52bf9eb33731bdba5987b8f48b4599d67b383e77413107857e951ae0625059e5616ccb41131df9a480efd5beab3a9c99615921caedc53dbad675c00ba1030577db1d22731677914fa958b44792cc9c19e2ac71ebe61a05ee67ae7116e39e1c0d103f18bbc9d531164360d901da8234d29fb0b37cd2a60c7aa2adb2a4b297ea2fb14122ad95bd4592ef86c88fdae1e37dc8e44ad03c0fcdfa3801e93796771c5a2ec1e4ab12a64b3ffe48e7442c6224661ed5cc987aada6e778399941f7b20f16f94fb346b916be87f005c9c13789741602039d38270643cce3c347565eef5ee09139330301951c15756be47994de6f1802dc5131b9b011051b1d87d744756831a71cc8528487f032fee9dbffccc751e6a1ee6d07bb218b3a7ec6bf5740ead7a47b6907d7aa95b79aecedf4a637ead8fc6fb8654c93d13ee79f5d6258dcc61993aebc65e4fc14eea7d006e31f6e9f60e3bca8ce52ec559876fd20255e507daa99b185671ce1ac11d448c30bcdf97b9617195e0ccd2d15246308dd6cda74a8071114327fe203b1adbaa780f3243105c5111636a51dce966f5652e39d4f91abbbb4576234d6cacc3ec57cef2dd4dda49a6c33d12bb7595fd5ab5bb15b40301f34ddfb831a5dbf62218f496c003227fe6282e2ac054c45e7f3fc93e51b3ee8690f08612395095a0a12729d663eded879d9ffb325c62f2cb546a48bed51ae232fa6ce28a2494c132a6e09d98c2e3d478d5d2d15dce2e2665e4a3db448931068b99899c2bd8ba87349b0cf9e3c52cffdcf58a59b4fe0089b298b42ad7553f831bd60f5cfa3e09102fe773e4c05412973a678f3b3ed420433cd664dc7f218e816a17c5c9013ecb84abf2dd073557dbc41b92a91e0339d57b8b077a9a44d56427fec5748c47c1460b2e2412094db6d0ad06dea0aa0c1368592594bf0b2f590a9d6149e44dd4adc4cb42e5d9940d59397b83b33b88604c210694e3fbd84795c80c1b09ddb3b1ec8bef6e9dfc4d7f295e551a79436007ca48aa605ef5a89571e59cb26f2766e564e39d3bb441deaa0c8664549881d90a77256c0f6c77241fd6ab74b0e2890f78ff16fd2f9271ef96ebfbd0b878ba9c703900752b7447f4efaa60bd9dc9cd5673a36b39d49f54274caf03c0cf82b95141fa20ed3ce02ebf0dd74d9eff8eb9e2dd3a2976b244b12fd33ee75c1f1c459f86a1cefbc817f42d7f43ba406098165cbeab99df4fe751ae3382efce32af252e461652c7598161e74fd8eeca474fab6b1ede039935f2fd4d7562623b90a422a78941f47a76863d95857c33653d1b42b806bbafcfeccb7bb4a0c58acebf6104b2570afc3ca88e4fdf2719cf39c964a1ea7d2ae4a7fadc938abc95adac495093f6b959b1347501606b3f960b6d739291aa8c13eb49e98b0f78d2b91400b6d8961cb6165c8b684738e4d4db2f2ac30ddaa03a5e0cde4142b625e81907f08c60d7cb5729456806c89ff0efd08397423e44738ff38f8e88684f3a099dcda455521caca37ab4f4d9ed5d37975d4fdd778b97cc93babc804864a35e3a2db04598152e67a2f1f157681c3962d46ada23ea5d9a524f9cdbdd08a07a3a85b1f6fbde11d5a35c7743b83bbefd19aedf6d92241d16aeca7f33cc51839b75f111e8edaeaed808daf2f43fdb3c6f032ea45052ac31d4870c4d0d76aa75d0b88635ce449054013f234c4a16cffc58c95ba1cb8a0a0399861eecb1039bdedfab4d05f0270c6b16f03f6b8e629f687f133ebf2662c7f930530746679aac2791f54d6a95bfab5be0c33739074ed4e7ae88dde4a8036a7d6095cf41776366b6ae3f8f4a0734f48c275e129cfffff5e0abd042f99a957bf6f0f47fc7288750f4fe30198f8cad7067b36cd87ebca08abd3f9475e7443f83cca91a1ebfc42ef3494871f51f6d52a5524b9391c687571be5327c7c94ee2a096653acb410917fd51e56a92be4f24c1db6b97b465ca84c31c04c2f61eae07e952eb6554aa4d8a380d9ee81c1c462c360fcc3cdff2867a953b655562cd06162af8b99bbe662e0c27ce4d9a1c1a907def48a3231c2110c930a2f1498e32dbbfee0e5c5869332f3024fa5dfb0327a27c663cacd4e9902de34dd93529e90eb347bafa5035f56fc578e8386c7571d1f0ba335225ecd8be026b4544ad70f3af11501a53119ee39a8558ca0ed5b3d897ffb9cf0fcab55a0942d3bf7bc6b94ea27a6b748f2cfda431f35252c44610b7e843ed91ebf7e8fe10638f04f52d6d5a7752ec62350efcb7c473f80b1f2a26805151e8346d39d23551e92fbe372df7979c3f756bbb43f6bed09bbc6b65fe6fd241ae1c2f1a0d0b805c582853b85502968f9478e9a84895f9d4ef01ec4f3f571e57cd0bda68ee1f6f7e14fb6e0f4ef8c7dff6796472a935294fc27b16216966d5021339ded059687355b42b55926854bbfbd9f974a0c26eadbfca8a6183093996cf252894e6db910c71ca3ab2e82d90d371c36b92c9409cf7937bb266ea9b29c41d774aa522e103cb30bbabfe872b57beb027623742806aa7694a859ede9bc1fd7b9e32880b064b0030fce1a0e5cdf3ce558a5feaa32e323dbfab6661c5878c9377ee52a615b7c17bf1228e328aa20f92d070c71561969e1af532e76835fb0436810c3d87b982217edfb1143bfc3405ac9f6f3a50145608dfa8658b0ab642a347255c55b59cd1c5897b2cf625a0f0706c30ca1c1321e90cec57b7c3d1bd1af455e3732db80643383c41eaa6781f63da6233360ee720cc04d171ae2445b0c071e339d547f7ac32f407d29ec7abce0a9e1ef5276544877bab2f84bd2eef47ffa66f96e7170cd54d836c9badbc59435146031502c1a3cc744a470f693636d9050c5b894d2d6047df60eb0bac16d905d46cbf017ca69d66427cb88036eca4ea9d0e579f6bfd8a4a850703a0fe49d39c107c9358e98689fb62bd0475aab4b2031446b437c7f9e373caf0270a28d7b15c71f02079dde401e26175bb6e392106a9072021f0e5c5145a1db6f595b032faed8551f6e2ce318db1ab513db876a3eb42d225014949c19543e9c5dfd2290e28c5d72c87223f0195ffbcba1c02c7d0087721efd2af6881dee7dba7565e07abc35bc3fa41c6a4d6a313222ac6dbb117c69c62db2691c68869ac5fc5e987b0ae4335f815c73ea4235da2582dde81d6fdae5911617daef847be17f2bc09edd88830eac03977f89179fe03eb2dc3b38df43803ca2d38455232549110f4580ec3cc04c0d8cfe493013d2cde47c506ef6a8dfc42d998f70378fac5ce4709345926dc477e9e339d8c87ff6287ea6e2873e14d538cdc3f2a47e0e37a2601652f5b665b616a7d1ef3537a3327a76f93990f7694e6484e7a52a10e9eea2edc92b99406abfb2b11ec86667c7af4a333dfe900bf071d1bbcf4f0ad768fae4f450c53817c507d26e926e753e3395201d3ad89061f16706d841994abad283f0db74cada25beb5fe46f48669a62e0b849cb77097e1b4578b45062af4a071b04f0cfddf87519cf2bfa10ebb4b860239ff187e6dad73806ae968e6ac0f738baa88edb3ae4883a9e59be7a6b222c5f54818f95578daff9fc7a7aba8c4a41a699923e85ddf24a32bb71c808516f64d506058a70539276d57984d75161cba7d53a4a864c51a249a6b8fcad5738dd0055ba8468b56579ba5f102642df65c598490f3a0c9b1064f4eb1962c4c38bfb7d55d496a0b0f7b3f90b42f733d112c89176aaf937eea4bada845f3ca4e9b56b3a5a06b4c90fa4c1914ea47020c2f32531e270007ed389246906ecf2c4465f7cc5d6a347583dd73341ad97199021819be81100d867d628323ef7552db945e4c0be604cf6c4a8197958bcbd6c1879387d3286dff979632c54baba2a35ea84efd7726b662b94fae61464d069e0103692599fb86fdc3a06e01c6ae3deb3de6fdb21806c716e5f82b784e4ad3f0e2de629a18e3a2309003dfde9dde8e5101b83312f76e811277afc286b56879f4eb80468e58c60bc088284d05d725ddfe3185b7c51b472a7ff7db3930839142d4a452ddab628e07d43375801d7c6a711a55b452748d770b84ede35920c1ac74b595baef963d21df9418533fcf959593ccf5afccc753e86c4ae231eafe77a158c2472143faf169db29bf2b53c3288d8b3c9added65778095f85e2cb471ab58362041f0a27d874c42bbb06385a0403ca193cba67cf70029cdb7e73c7e2267b856fa0b8dd4c706b45e7174659b0ee2891df911724324f7ca5daf07c912b9b2abff762e62a1817688757492975db7185c4695f3a90895634b8d07453b36dd95197abc31d5d153dfb0d0ec92639540e99d6590f9b394f14c93a5e829fbb33616e810f59c502be44a13b700fd3009545e34c211abf9afe1bb8ced793c6f516d40010649f83a78ddbe9b71d8596582997d0aa54192e1200db61dade30500d72a184ca7dfcbfb80e5442f489d316cc8b75005564835d4b11c482e2c4d0d160f14a8b13ae0a0fb0ba5e3b782770aaca357df0e1c4d1c3b28b776a8b3e0da1abfd4f7190673fca1e1c5a31c688d6e8ddb21300e4178d07c4e854a718ac3f672b0120d6a54c16957c9ec8c444208e47737bc4eeb0bf2d801eb2fcb72f91fe988aa75f38e6cf26e858dc2a718580ff5d281d13e8fc3e3bc30c75c0193481c39c375a5b06b962d9491f3f1fb80f1cb27067f0709e0b0730573a9b5f5bdbee1708ad84b4ceb1a9a61e4c41e90655764057bfa07b8c81cc83a315be1aed6a49715479c0fd0f53f625fe6c7f36fadd001149ab978532e4d0de3d1a38934c74265b161899843704fad16ffc6189f42a5cadec98603e0f98c6889bd4a559079e074cb40678fad4690a20d988735280a1ee8ea71275069132101b35c18ecc9d3c6eceb4cfe9b165e4b6acc17d4f113ef8283c0fb6506f5635401e916d4f7e7bc3cf49aed166587a0c72cdbe673f467d81bc2e9cd08cd8dd16d90b353481df31e89b45e8b
-
-[L = 48]
-
-Len = 16
-Msg = 3a35
-
-Len = 104
-Msg = 7db15b3ee240b45d4610950996
-
-Len = 352
-Msg = d2a1efc725c46cd6a19760f49edf0bae823c1b4992ae2260085746cf65833bd008e56e64002383f51f960239
-
-Len = 1016
-Msg = d11ad1253592c094746da7b5c88d329bc3ce1929913b8be07e82d3f6b7a536a855f31ad197376eba6f2f4534413fc4e4e7673fdff8739f774a710754b568b7c61a473059a41c98aa4e86617aa66d2601d0f0d584cd9f132afeebdc0ce3da6a8b290059e6e4aa080c195c42ae7f7e1e99865223439929b0a3a0d79b46ca6419
-
-Len = 13696
-Msg = 2f7a9929dffaa4a4dcfeea1fc37b18e3cf935abbaa17cf9d834b3a8d61e9fabfb7683cfc387d6f46ece3f8bf845827c7ebe86a651d6dc1e83c5772cee1a9fee4b04453af2f68430bd87835126cfd1b3f8beea4d3822fb27864570e255cb65b414197480b6bc20a39c5450adf2474da93d72f6ecf8063899722d3755b7a19f71e93e782d89593ab19ddd3ddf053c54e0bf832311fbf132e8b9e540f38e4d9bcc3cdbf69de54e40ef348a9170ba2f65def167f568ce846889c0161448342fe907718a465e451bc1b0f2e4f21f9b911f186589f43dea305811473837c063b915d849c20deb43323bab4b64e61823f1df119e71962dd975700391b411f8778980a3080ba3c14a321d32c082d416ddd2345f0eb751a516d44ee55222395cfa11e7fc4edfbe7cd49bf4ebd4d7428843a2ad5538b3cd201ccd431aeafb146a65d28a4870a6948a7cc0413b0adac7e8dff3a898aeff5f4b65d10b28ceb749bd354c061c3008ec569d5f90a4d4f5caa51d35b49dc4028e738c8ff5939fef3fa202fed9ebef6f2c7dd0ba41cdb5c0c16985f96fd93a65d134fb4a90ffc0fb6cc5396b843c2151bb7c9170f2fa4fb44292a4af28df5481de0c3c917ba1c46467a35302738158493fbf6a0422cee558d4bce3d78e14b4fefb65bb05043e2cc2a6a8ea64565ff6ce2fd2c4f43fc02926ee44ee02fe1dce25cfde0115c9396c9ea06269f17b2caf58e2332cc1c8528d9705c70da1f76f22aeb1d1b93449180640fb5c4c4a708bc4621d7d2bed5b1a752191cfdd45086d34f247ed1df0f24e7c620de32bdfc4d1f882380d2cd7467c926f48abc75cbfac8788f88cd9dc5361517a5eb36311e6b39e21a85fba2038fd47d860f776697bb19cdb5a4d6746fae507e274399c91648537d905015e58910117e5914f44ebcb00e771d38b30c1473e1232d4e222cebceb4810c48e83e0fd4c852f4fffcd643c0ef9e4fae2d0ebc6f102f3f749b02a5e3a61517d53b539cc24120df3957a633d50369d46c0c226f8924cae51dcaf54d716f61385fd8cf38c2c311a32bcd6594d6930133dc18ef36a9671ba8b179abe95f588ef74e8558ebbc974dc73c26bb6eaae78ef464181e18b71f4b0f986ecc8495a9c4dc0b0b96be9806fbd3d32952ca3b4737a06ed6561e9c9581a33a720123fbaa2a70fc3233b83e56444f5aa0cfaf70fb24be6118404f3e11e6ea004cf2d079a3e93a8ac1d4e297cf4fc43851dd26314a7ed6a5a784b386daa26e50c64692f7db28c21d82234289bb45bad5042236667e6d70a24bc9525c3adcb793a6a5725d9b10911e3bc8e3fd604db7998346e7f7dd1815c0cbb735a977bd4b32b5b976932bc92ef3b56bcadc089045ec95f241cdb0a84c67f1f76353da6cb493bb27a881d37a2106b8b3010cf935eb3601ce4dce3e449eff8331e444ab117a20809a1010db4cf3be0c488f777b6532df908112e3d11592f04a0cc16232d62340cbb8b5268a662b8278d37c03d848a04f0ab498f5af43b0a20e310197b7e1395a65299fac29f051bcc5fcd09a5605bfee370ee8ea21f5807d9748acca815a44d81796d68b0014eed3bb6a94233fc51725de3809ac6f538beaacf8cbe3d96aca21a7a763a957f8892f22c6d086d9af2e5ac9d90321e186584f17e964c90739559ddd034df076c4aa38c2b78aab6dec8ef6be9adf33bfb66f159ec4826653ee6cb483539c47a4a1d95663e6cc7a42a3bf628623a4c9500a59a50a312aa104b198ce5f3e58952bb79ff1ccfa9ddba2fd4705e91b5acaddab9d6522d7666264ac5f533b6d8ac4512d8371c69c06b6d322b046ae2a0a20aec1c3bfb05f3d91b9044cabdd873abb5f2b0e3e19740df31e39828f9ff9bbb20b73541a7a70b8174ce4e43e0d356e629cdbc6c08d29bd7acb6a4347823075683ce9d7de4ab3ddda6572b175951f30a15263355fe9641b3322df7dd52077402a884cd472e6d0b6c34cd63ab63cec8760c7ebe384f7cc31066bbdb7a3417425e039c4d340166e4bba4839076ac9457c87459c57957d0a06dced2f7a18acd22b7295785dafa435a2a8a2c3a1fa05d115fe129d19fc44c5a29bf15b4d9c2b375bc8e591f92756cfc573a39b8fccb8395cad7617b11f14a60e2dbf69b897844cbbcb70363010f6e1bc0590ea594aa924597dbb32a868b55551789f82437180b85661809089d34a168d44b4d788dba23b13542715843eee797366d9ce7793e72331735bc78cd61b13421a568ba3e66926921c04e9d00888ba7ddeb474db63813756ea4a02c1823083e36ebd2d32d5c88cdebb98d511304cc276c7799cf84a1699ccac9569b13f530c762732e6bd0f8415001b2c02d11dff36660b717054b16df49ba38425e3764a56052ffddecdfc686aff22079897376cc15591e11579fe4feeccb55f
-
-Len = 100816
-Msg = 5f464d3301c5e0871d6b41b002dcd09abc80a805de3482d97f3fd7b9838745da1c0534168f76b93c3c53bbabd904541ffe5179cae619dea77446140b7400f47d242141c7f2e9894d88f44c9e066861498e7394f206f594a419790d697f6a11187f84bc6fb288186109343eb11172bec076d041a4c7306d7978c009fc2d2d62563614ed3555ba2d21c8fcd70e8389352dbe4ec808af3231ce990452eb05b1b0dc4fbb1b4265e69235cc3561dae4148c386cd770474863a84a822b2e5f905fc255d55f90bd6a760d441dc52240ba7d8c888a5283891a2c99963d1fe680549d6267cdea92cfead167f6c49663668f2bfdc61fa647f5abf3ce5ad2c6c175dbd456ba41436aa06f5f68f5c88e6b74ea86a79934bd05b486210d3d470a0967ad6d67f7385260578088d7e63197849354f651aad07e04ed301f1fe7a6d2047d50ce5dc6bbffbb1da6b47d740898f4eb54e3c5a1fbd18ec93254cc01f705fce04e6100ced132c519674b2345547804a372b5c925bd9ee9701527db33408d37b72f8d18b882d3c4744eb58f011d21fce336d426de1fcd5e09610216248b51fe2b79b96c2bd6ca0155e05a8a516b7a24d529a9a475284735bd9c4c437ddf399864b64fc5d0d6ffc4e5a7a3dbdd476bc39ed29a0a92e1f2b6b3506c2be5452d4f896db6eb4f895b554b2af64c4cb8dc2369b91022dc50b7291404cc9605c31569c32756a64ff8c4fbb0f1bca346c7b58a5c6774b2fc7f7fd50741d34c8564d92f396b97be782923ff3c855ea9757bde419f632c8399763003b58ee9140c2d62e914c1e1fa742661a9166d42267edc40905b35a25d5c3cb3fb457376b7422896df7bb19c23e8f764416731d2e20cf2c1beb8663c07edd8f105e078e2fed05c5e5897c430017fa2160f565a75a4c5c64a15dd7d644bf355d169ae2696ae5ed1a39e8f81055cdf315e5b0c6f9235515fc4dbf30281ef17b83a6ed604f89293904bf78c7183fcb0ab236cb1f8935e59c51559217efabc000b165d819b717118a03facb61a13a99b194f8b6c7ddfe5850127d79078397a56564c7ed6716a129409680434061b2a4782c9006587de927c1ae09d6778a5f1c39fc419fe10493eb0d4ad492fbd05485eee7913c59df82fe7182af2cf06a6e8edf06676200077bd1408f5c1cec537cb8566470cb44895826d04ec20f0aba4297c501add65c75d5767ad2ab63aa81b7b66f01b32590f1d55b7e50e6df1ee077a19c8c895f5ef62d452cc336e9aee171fa997ddcedd7af86e6cc37722fb5838a46c5e58e7f700edfb7c6bf832171d9581f660752867118e9535a6118635709d6f1c1cb21b938068958e956149d9bffc67f355cb88205d4894ba97c3e3c8be9fa2d20abe79f3f93a6a2f4f56fd075bb49a4b7dc83630e58c32a29d757fdbcaa607352f65483cf2cb4208a3bf94ca7a25e2a4e05279be31c33696c10fa4971d1b64ee938dd299f483e5c098845749a3b706a787529bf2ca56693d0a7a98243e6482a43e1f5d3086ca1b00368d8ead5ed2d0fb79b1e2f537ab9340809ca3a9b5eb2900390432293008ab7086c2811d33de0648be5597ef002c7c462b5e0f4e0b1720a98b2299ad7aa55eb78f0c77c2ab4371385f280107ae40ebf814a8223dc74f31483c63d9e4ed09fc7e5a51bac34d69d97163116a66c84ea9fe4263269b71fd228555ae3cf5109c4d6ced7b9049a2b8069bd2f71834d6c07fffbd7561939188bc07dcea08086bc7182a5270427c3199bf5fb5c4549861fd32a38ec81c4ab058c777dc01864787f0275f911a17838272cd65135f66baf06d8d93bc439eeb55d50b7c5adafed8eb8140b4b05f59871dacf954f4b096c30b7857774fcd319c096750bf605db8e31fe02cd1b9294eaf8bb009d4609f2cdb3a8657f650501b8553765de8f572fb91ac77b35db35f402453e5c58f60146f2906ff56b9c6b3a5d0bb6afb9e2201110919ac9c01a7e9750dfdb2f72afbf7a8d6f64b1c68b9de17a2c9abf289eef24074eee9b1649caf3693118165503a30200993d271aa31b8b92606a10a52612dd1fab495b82f9a98cade18b9d8a723a71ceb63fd1d27372bd281f9b40aa1839b0cc2f2177a09aa8e7b159ac118d7c145e7a4f032e788d21facde2b4dbc1d5d2238f530d9bf9bd2798f611d03ed8919f0c85bc2da99750b7a8d6322d2e66ff6ab9ebaf7424e8c1c3f4fe92be61f65359106395f5ef995e925be3868ad513f561f873acdbaf18590c903d64bd275121c11ea655124d091740887868544c5348664399d3da96e2e35fff34f062fb939d656bc072096e510b40b2f75ff010af68d64fd0acc778e2e13c9667de266b1816c4ac449521b02bbb217002c604be72e73051aa9048d192e3210a68769dd2693e5d44951711aed3a751240d42f8925844131daa36c51d7d59bbaf99623fddf1649db954705fd6f3405e63894f5258c9ffecf83208c2c90cc55b1a8d2972ea6b3a049ee54942b50526b7930953986e428b2c75e47ed870bba68dbfa624dd94112f3059da0a80c583baeb570fe8314f5c66501b34116c81148dd22396fcd6479da49f7e952c8084f97d6803ff85c3787222064ca368f596a1ebb6dab20a03916b3ab071c927d87fc10ecc4e7ab4a5761e3eadaea4de1a0dee30aa39a9e4dbee047201d7d8a4df1284cf668ae3ed7dc4cb2cc4b5cae9307353fd2ae4c105c5d9f3bb021535fc3ae9bf3ff54ddda8b2e1037cd9d69822df436dc1c750a9f557d1a3a63fbe73c64261dae0c70bba6edb57519f5b957f138d1aa5fefe01b73c1851aea42938147bac2762527a492cb85da43014c876e223b05597354d7c9b328df67f354d168a84ce86dff57d8a870db034196dbeff83ebef80bbe52425a8810f2c9fea29ee688a201cce4a5f447be789a3881a9da3b6c491288e8f1091719032608b332e0410f4576597e17e0b5dde305f069be2e80d565bb979a3915488f88e3ebb90e81c264bcaddd72b8843af4a4ae31f723d50fa0995b027c334c351128913bb93e67b1b08f101f6b8dc8202b44fbc3d3dfb530f66e5a8f35e69725c86998c05ac87c561a4706e90fa095adab4a566da4fab82bff6b20076e5bdf62dbd6614245b6a6f8cb6bf60106f8d12b9c3e26f8127dc547e2181531ce980a3273f452892110cfe1ea834a30f99d66e026a9d22dc76fc3cec8fda2d7fea701deb84dd45c97dcde57a017693e90983a156f11c4d168d89c06d8a32dbfa590adadd16850854f24bba315b0bbf372f03711a20163afa0c137383b9120b26c59f5e9e7cd2ccaf0ef4e0d70d5a81748ad441ee5fe178e14317cab184fe178fb0cc0d82105d2f423467fdcda0f9871b9d84882609248356f3053a99866dad9f9b0f8c4a897a8cb8f30365a7ae5f3ca6e772d863d445e6d57c6a478e35d719d0e4e84f3a30b1816ddb55bcd79df21ea0e95da72a19cc1fe74fc576120bc108be3ed4cae3bea889fb4ddd67efe858a994237378eb623dab070d954ac780c1e6d2095383c98ba622cbdb18fb53260979fb2672c21a4600f4bf06583a112d303096d4e30e7e1060d869f386eba3cf7aec3052ca17593dcc9969fa9cd88179c262770211cf53f53f175037a5cd445d239cee48f7ed0aa1d715a22ac18a8aeecf191d415e4afd92b76c091803f4c757a9e89f696ab7b11ad6d5f24774e4a004dcb0e3f33705dd8150431f051016af37647b9e44b10bef114276d4b1055b634461c655a82a847639a038ec9f58876e84e9a2955b696e072d8054c3f81173473604d5fcc0a75b4a340dba0c375beb87b8b01a0f2de232bbb8371c3a9d27a0ce521c4c43dd3bdeebf92f42f87d88978d5b4e3e563cba0e5f59dd29c31096885b113ea5c57e66a3be015b703bc26d3fd1d51a7c14f85f65747ac909d7e30c8e800be27eebf4a62e42e538ae30b6883907cebb7fc5e150bc9da3a138f394e817df9a9e44420078f30d0d3d6981ca581791a097a5e3982c983d5cec239096c7d8cc55c87242026d769ef1d04eb96e5b5001e3358af88d417cc61f107659791a35d8b5f7a5767ae24d5b2ba7aa12230076db1f1b9b6f213dceea62949d98bc5db38743b23a59ea75dbe4231a285678f5f07facc053c2048022fcb01f15e8c100d64a877ecd56d196a6ac60ae35e0e09a517224ba409ba7b70d8f9fe65bc427b212a4e9b3cb17b0d332267cea4f3bea7c1e550f7ffe567b20e3057aa0ebb560d00d28e2f7aff718a9f2d4d044f0d20709bb9ad567c98cff7c4810e8c542370cf90a491bc1088f69998d59f344b74db6c1bdb61f284e99b517a11452ca0bb37c7bae77fca6514b341066086e600f098a32a92935380a173c9182a2513584c54ff67e580dfe16b508acf1729a3d649ff1eae286bffd688fe658612d6c8e69e6e7f7de4ba85ec54747cdc42b1f23546b7e490e31280f066e52fac117fd3b0792e4de62d5843ee98c7201529455c85b169fdb90cb05e3403cf2f737148bd20a53c73880880a14ffff37d62130e682e50bc7210ea6c1f0c27656cc1785a0d9ce93ff94dbc5b2877519d9bac4a339e98ec594a7cc76f4ddf994fee8070dd4b8e0fe0e51b93105fcf566f83d914dd862b4ce78de7e9e16f142234bd969ff8005dddc641dcd3c7cfbdd6113cd3ba34a9503a0f433899e90e158abde2ed4ed4b3711c991577c5aafeaa982bce80835f8e6d7c7975571fafb1499991646bc499ec32930367d4b1de76ff656442cab987bdecdbcc2b2bc35ce01816594bfa4b6e33080caa41dbdf8ebf2205649f98a2d3bf331fb16b9ecd1824eacbbc9f81297b115b4d36aa7496e05f7d40d4edd1886c1bac10cf3f97840a03277e6369e7a7e90d932050ab8720fce076de5c355fb17959bd75cfaeff325b0737f8f5b1160de0b0184ba04afcc30bca77a6a37e29662302d01858c0bc1d32b883011b7df5a387805296cd91bbc835a3e76152d017ee929d4cbf137eb78db89d71617dd76cb00707aacb8088ac77a1f52ed710331193edb29933a7efd8cc153e6adfc2c6637e88cd86b06036b8177847b4d086b0ff9b5dc91f3cbd1c08217023d7449253c25331594f0f16a3c5f2e122e0145c4ec94f096b45a1fd0b2dd3f1d51e58978471782a336eae49d7bc4e050d1c6a391658f71a1f752c0ec6302bc2dba9e3766359359ce34955a2db86740c90d09cc50e92dbb76e17a39955fa7108bddeaddaf860d1aff14acec8b609ac1d336270a940604209df91cf45be72edee04277d694a6f968ae6d8e065702f3d607f3baf8db4ab7637fa4c78bb0b7fe69937eb1dcb616fca564a5a521e12df71fefbc321187159bd6a47b066a3440ba634de9153a94546b63aa33aed9da2018e1f30628df37f5360ca4f2660a46ffd73e58183e8abffdea25f7bdf798a2b7cddeaa481bcc6e682a67e99143066963d96d4a928a478951dd6ec59b1be8cb23aa688e1867738aecdd9afade39c92c0b2572bdde84eb912ed990ac618834c412231216fdb84f1e01b3f8414fc6dd0f646fd0fa62bb0157b3535e1497c9272df1cc5dcd4e6ab9a8456222655c56ac73fe0d2aa8b599035daddf0986a45b1a59510abe19a11b6dba065c8bcf8a85d20a3681c2414dab7c036cc1358b1dba98d6ae62c5948c36b5b3e307a6f860c0c822ac724a5c917ed5f98ece548a7a741d366868e6c676394c3659f7f6786594196dde332543376f9ba0724b091d30f431f91d919417e5bf7ba1e9a21cb80f6c204c3a58d59d960a5788b5cba5abd7c7518f4c5170115125de97009a6c3fc4d5773e4f57fdd433eb7422c7c4dccee57a1679633ced3b5f08df763d4577983c5ca8b49bc4e08fa76f8bff36daf0fed068db47f0c87e0e45d518dffe37c129cc6e2f5f9e0430185723098e715284a42f302a6b8368a4f2dc16f534d1e5db9d0b86659fc4ba6f16c982774115d02a57684c7e5489b1f491584b0f0546e4194a6041f5e5be3bfff3852a4fc772d83491023a61a37228ef6260edc0d1cb972cba610d5ad1d92d554700771d8236ef55e983765ed8eb21e7de7c8bb51aee9368758454fee4a3f32179c1e54af1d069e0b9728cd0554351907e018146511e4d6f0450b57c8ebd21c71450116296bdfc779945da60b9192c5bb9a67b1f04d94992df4cbb3e30732dc8af2177fef17e0b7d01740b8a64db16bc29c1e589b6bdfc967edeb2ce8a649ba892bc856a929f0b837a838ca7f917a52436ea3d20e72afacc5b9d58a7fd0fefd96787c65ffa7f910d6d0ada63d64d5c4679960e7f06aeb8c70dfef954f8e39efdb629b72979be208d616071289cfaa0756a4bb5eea5c7baf8fe7a31501e7e2d67d708d461c0c93e85f03afd70bd9e16437171e01a34f475e4b5a58d13ce4e2fba72bbba93403f3f8981e0bbd6a8a6223327bf096c44b36e0ccbf7592a98c1fa67f198b628787ec80aaef848b4fea158c715799e6f458327f399e6420f0e7821f2dc4663bbea065c7bdfe830b6102e2e7193381b9dc7f2381ba808c43b8fdf3addab4b5fa81564716f7d46e0349d9b27b559710d723c7ef2f79eb55c3a9d75b99ae6fde6877b278b583f8ae3cae776b914b0cae0772397fd19b6a27676c7ca02cd07f4b4d49bbe1ec87f2ac7e39e5f7712319c31271dbbbaf4b826af8a9f4acab696c62719f7a6a032c4bcf90922a3c630647b7c1c7b78b10afbd863f07486561a0bc8d9b1ff5fc41998a7e3c604e24af1c1df2da1dd5d83eefa2e4012f7fb5959ef9339574367deff73723484b5a969c8c23dc251a3b887f34b9ea09c9a1838e8aaabb254445d7556dda257dfd5579737fe1dd6c67f3851ca68b011e7cb7b6958d588f143828f0bb24fceca31b47b77d1ce05e75ab05b55d6c9f9107f0c738f2cf8a1629f7e9b2694324e082503937ff8ca7c5098f770289af7d038dcedcf0ed77c8b82e2a9003a6f3db69e14131e144f6be7cf0bb5353ea96aebd78befbc6ceae9bdde97823cdbc5ca8ef8a993a9d9383aee9f2d6a18fc64ab92990672ea2dc9b89ed248aacf7f1a513da43fe5953335afe76d78867a066f226ae9c727c6c60671c50a50732698ef7a492d51998eb6da5368a667baf6d12b77eb36686ee0ca239dc6f3598be0bda79e47f0891fe4d8989df8c685480de11c148a2b44c8a6bea3a50b09be557c51f545a09a30e9362cf3080e6a6bee3dbad370ce24f6c5a6f8091007ca195057fa3af8f99703a601086c2a1ffe55fde4c2c4153dbff8d6601ab68743c0d50d021b0b3099535ba6c40f866ca3ff0df7c19d709a3f58b57b40ab5e43556a8c0c1938c875267bb39c0db6b45840e8ee7c22bf6b48798bd744f70e42fca343a8bdfbd7f55f275ca5d62c7288756d4861fba68d16d842c5b893c1d8171bb3c8b593387d3426f292ace5cee7753c9f9a12e6bb9af5a24192e4184f7d3d191d862d3c3dace7853eaa235b6369fd164e5a7bddd06daa3eec7fe4130e82478d36f88a0999cba1f251ffb3a7689ea2baf016073193898716a9f933448d7ba8e0968c669bdb7dd5e6e32fd84a6ce9e8632b393f9263532ec2107b4c0d2abdf3abb2de2d63511805eb58a70bc4ded040d76640af60ce7f03b9a682b8dd84ed8a47225a48e0b94ea47828f1c8974cd64e5027d8b13d43519875d2bbe4461a7f0f5b5b8d63a472765405ea9c994225806395e64dff88506f7f7f3b6368d769e6e550d4e3e81efb13771cf403e855f75312f1383ce4c2744d0b4e3735a0f1e1b99eb014fa60c0d1ca9035fbc4403330c2fefa8411fb7c3d6ede5b5c8f4736106bbe01923d483a84f031e9685a3b6a70646a2a5059ce35fa496b3f21fca6047471a5bdd33908cc9328de9fb032347c249bf7093390b750696124621dfa67fd9c7fe85d6e5a4d277ad8f8d169f8b5e8dbee280f8443518bd94abc5ca704e781e6cb1868ba2d6fbbaa850326fbfa5a20e4df6fb5f8ee2728e86a758763a8af21e1f7a8584d3f0b09a0b19fe8fcd37bc4fdf45084d7fd92b80544f29aba52496e2c9a0aa4adeb89820be321cfd2f0a53585a15d04c7fe4ec9be6eb5df419e20b71506c1f642df75c53a9e3b2414fe6102fa8af7be3f6c95de824c31fd6fe8ef9d49e26095a2674a33cb574e9e493939bdeaf5b309b4c51256ef71e95dbbcee0a11991693b533f916e1c82ce86d65d89b6d596017fae944ec364546e78abbcbe4322b83e2fcbb4c5d4ccb54d8642c7eb9e28c08598a356a5c46f8813e6b63ec2f3e3bb721b726361f85a734e0514f4e9c4732991ed3998b1ba8f618c2071d1b943eb0f8766fdb7f0492421429bd380deca3325c8d5c7b6ed16429539ae54f1eba39748f09aa44efb67d863cda304e8653ff7499cfad44dc27807779ef8e63be4b376ec403f3c84eda4e5af31c30f9807762e0980b4e5d9dc406cad4e888bfc3ec4186de8ccfcf631b0ba5831747a1c200d45ea06ac82c7952fd09aaae5dcdf5475da427cbc8c1f71ebe5132f2fcae15975ed6fa14a11b38766e1c446894f31c0496b0e5e96507d28e6e4549d6d78841e40630ef306491a1da60eaea3fb69bffcbf192610e2e07bc1124690fea61980e8ed654c5e796f67d26db5de35b4a2c67427833e360ac2a7d4fe7a5ce572144443ed62ac460c1b19402e85c79e3d80e1c143279b20a66d8dcf2bfe1cc44a0f5aa9b0d9b36c46c2cae148dd0f2ffe9a8e6e7274d1832e57aa39fb40553da6414094e838d613a20ce9307d49f97d904648d6460985b01af769800cff9a940f70729fe40e98feb64ff0a81c5b2b096b1a9d832e440c49e4e3684bd17a5169fe138d2544d9806fec027dd2a67f1856178e090f9bb2f9b314a202e7e95f2e41fa80dccf7b1810e9cbcaed2acc2445d60e26f7d63ee4b28e4299e60ea4fc659e7d6f0de91748bf1ede1fdb2acde9482bb76bf6716847eb2dd7517e0a94f0bbf20f248d2c79fa0f518b67a44d5c4c73a9bbc3816ba85ae8344b5f377649da75cf1857d6e4338a76446c48e52cc7bc7ce283d4252f8fac5e1427299edc33f84798316f77bad4a87849e91a1a23c0b7a86898046e278eaaa15ff33730a6d3f885dfe2d1dc0acda2a9e49a71cfecb7dcaa9e70eaa8fe15d4567a280e8960ba49d5289535907e9f277f96e8e652c21d89e81696dd821db5b7e1e53e160584477aa9e4c0e12160c9956df36cce6f4e724dd543827366010ed3d843cdf4319c1bf968a70e9b1b6bcd8af96c9eb0620c569716b7bc42e13251a6adf8201faa129844b5e1d699cafa1b66a674e732c7662b0410e5bca2704c5ebed7850d0ebb825cfb0627a183cc9643b709aedeac2c06700358400c389f99666ae97ccd37f265da7addeb07df9ccad6fa777d0da2fc47b6235179136bbbb409596841e921eb278142a19e6203c7f235bf8461ccadb4b47dd290d36ac27126c808b866f9531261f1e0f5c458a6bab6f064b4efc432e1c7379f9af19ac34c5c22e76e6e7651e48f9ce44eff542f018397889d896cc9001a63e8e455fbe4a9ee9a740edad894fe1af2bb21a1dd0318e28ba982c12ed69c08835ce17336ad1638af3cfe0ea892ab8e83d3f25e6bd98d5e4d36292992e2122c265a26cbb3931dd4c1b0d0ac5ee19974d0dd45777908bb416cbce52531820effcd7f28e1fb2d3d4d826e1b2673e834485a25af9f9d174f566abc3b36732ceefdd91a7c3885e1d10d51c321ff704d0883905b7539309ba5e7b7a2bfefd0494e90e9da7541ec37858ec05ea9a9ec5672b113cd5ad6ebfc5b8fe40ed7c3f17d8a73703dc89086b4d75c5eaf06b840bb2f5b4519a4fb17bfdca9605f17253f203efffc92da96fde023007d22cdad05d18aecb4bf08085c5ca5eecd21f2b611e7e8a0ef981fe7aa2014f5ac6862fab44011dfd33be8a1226943aa7ae5fee9221b0400d9ac2ce5241b09a68cde6b13c47d50bf310ecb37f25c32770a299020d8500d8a4b5d7621e4379dbd6ef34a9aceefd4055ea6144f54bbfedefb5b5b0fbd1d81c7a51a802072ec3d84f34585f22c1df84caca07849b1ef054cbef9b40848e9fd238761df5358cf55a79a53a1bc749e49ffab7c5bd9a28bf24ad5833facf43bcc3852c1e85cfe47929fc49c325c20d74588eb9833519f192243cf96625057899b70a7c93f8fdbfb60d8129d9c43c95f8782ed8293641ffd21d21d91a0b4db69d766f6d6497e9a414ceb04b65425d6ad6c8811da00639dce8d8030038f2d08330c75b0879aab81bfb3330b950e54c13780d308fceed2a103a1a8b77a923b66aba737654ba7995acd306aa7b80f632184412e2369c353c2132ae614553e626f0a3436959104ba6e0040dc597dfbc3602a49e401bf2249699375b2c722083489f54fcdc1f616a133ef6112a1754818158ff78f245b9046100b0e89407f74145fe336976af971c054f12d98002c68b3aa2bd699fbcd71bc4dc071e430bbf694595a951e01098aaa499be2f70611f248a694539ef8936b2e8b7a3c5de8662436fed1f7bc24a4e5c17a663d9a23b4692993301b08cb3bc10f518eca51081c717ec8dfbb0c2669f7987fe6aa0bd98231d8e8b58951b42537f12884a857e02d62de4fda6b88b6b754b1b27394c6a819e0f92f6b2b2473fe245678e252ed31477cc7ec6895bc361b718fcab3aa550fc9faeccfe77cdb5b151ab1db2e569b5bc923ee26f0b6113504d295112d47218140e44652a10af10a088f95c7cf2fccd040fc93980939122411ec643e26e7d69ced3178402e320fe156e774b75b5afc2f3d6b6ab828bb4993b1436faa5728cec34d66f520f59e82716ed6d1324944c3c91d04d5ffc5a921f4716c39de24768484d0096f7d8dbce35aeec22db11f899e5e7e3d57e7668f35d6c0db3542255d9262137d39ae6cf9bcde254dfccc54a6062fcf8982f781d9ffab2df4f49ec04a72eb9646d63bf9e1799bc0bec0ec7f0675ed9f8dc9b8be15d9f2175dfa1c8bc99071c70ad7bedb10a4143fa91c89f54777f84c9eae9361cf7f4c2b7ab873ee5785a5241db0af86f3c6d7f091623d6dc576d07550a42023633a09c8dfa21d7e70cce64c13f37663f75c47921c246f3f2d1d16a8283ce7697da4cb7e016971a2a1d0c59d6202bc18b7cee3828de597efdab53b33a9fb41aa7b49f1c964512901773bb396ac80e90ba1a94c408b2860065ae9aec64a41d76cf8842d299d0babf14d5840d647d075c34175e26a786f30091a24f1ce8db30137520dce1cfffb6318a0d0fdcac883eac603bf365efa2c806eb4f194cae8c16780342165222192f6ee2e103ae2a31dc08a84dfc89c64d2e9ada7ca1839dfff62ddfb7982c79684cfc821a098bc6bf09f87317209b16d14d45c6f38fc99f7bf9bb73460977bb323665d480c87c687cec052a5f08a2c6744c8e177a8a269b4a47a925b9123cd2c014313edae988f8aeaeb633ee5ba6be7f53fe36da3aa37ab2077f5fd75a82a55a0fe62af213b85e9e7694f78cc2b0e63a8c1b89db484722fc62c688678a511c474f0eff8eef1382946d26de00e5c626ec1d7079445c1b7c6f7f05073249b11fd1fb30257724a14cd7bbf451146bf366de2e826fdf1d25705587c4460040ab963e3bd504755b6aa5b18786b68efd3c8e59e8dbd172346fe7f4a18bac98164669d73984044f3c777368f965763742ab86a3720208c64801c796f6e3a1c4748b81e41ac58dcf6ecfa0453b18fad7e3473604f57f7da302e1fa81ad538d4a0280c4ad092007bb9a7a12907227a936871886c699db97d00a1966fdef64d9f3672f1b792c1edadc6781b391c91bea1bd7275f30859dbd1707b1f554e49ceb874ca06e92ab466efa7eeb6990667a27507a7ba789e24d593ea2af8eccb3862cce58daa63eaf212bdd86c01ed471cfc79b191c481ad773d20e821d18af85a7049034e5a9c660357a4c2808b9a6139f32c55c13282b8d98904f4f027d438189dc9487c96172e50dc1100ccc224e7374cf96ea6731032c43fbc9b367a4d1d0b31aa3fa8eb589672e69f1d9144114bbd508d56c2049ecdbfd7b43545375a099ad2885353d8c550d22dbb738e6fe3f104b444c89475a2cc24d7887daced8fa05006c02dfded01c00707e2ad04c41199c5decc1eae34b0c0abb5a5beee1b5253c3350e1a077682767a0b9124a4df2e8879366fd37fc04d4dbcf89883892f46a65ce3aec22123cbe6b3af6364df1f9f5f9751bc8179b6dcc5c126dd65feb7d11a85994e90ab6342834c79c5f82413e88198c73e932c66e3cb60b6e0c0cf438622e5dc5a1036c38afe9cf13559044a9e90f5fd72a3188ef6b1043f5f4e6b40ea51f6235dcb33b3099b2d8c2e02103235f0476ad51bce6d8a2934068549633e521a3ee4c62c22b042fb86c13c8da849233205a5e277aea1129678c31f5c379a71fe08b72fad9449cb923126dd465d1e0ae8a925374149b8248b3afb69f168f3ae701c00f6ea08fe07f1b5338ce6af2f3156ba6f300310114479f2f6119367c88c12c158b84be13b9c8c7b5dd7c90edb5b3ea1fa5927a25ad6d5596992dcd4877f58a134e05dcd80dde4fc2c2a680cc0ccf3084d3f4970e3603fa6bc5a180fcf1ca4241c0b8a1e7c607dc025016e297e2b0645de4ec2fc49851b9374f3ef99edd897c284a67b647ca8c96fcef935d541e9faf334043ea50b99fb8819ecce039227b624e52d8c20003b5a43808e4990da8e4398c4fc172b983351fd11a13dcd2aae5193d42d46e1b57c92e3e01d23fc968c729f3782d6c07dd5a17af2bda96735c12cc7d8023629fb0125e974425f7914690a7ed26508343ae58c8a439ebb6232049a194768d4594f5d65aca37a5686c2a86dd04bef35d74e0755937ac0ce3ebded1c00c8adabf030e5e4a5f44193b62fcf2f1bfa9dca2a25afaf2f1ec06c5d17ef3526d26d17af3e2f257ded24b177ba41c0ba64fd4fbd5042fbd5961a105e0e9f77f3db13c1b6c5bd9a9d04801a5c00a4c544218a21016c65bdff774a44b1d05256e0693e14d76605d67bd10048d3816caf31a6d10886c88c783538bd93e92bbc4484f3388b61adac4b92b911c76ebb1dd11b7b4e40be032bccff610068746f41e34a1fbfbfe5faf57c8a4331008e2c1cfd69f57e74379ac80eb6769f4ce4196795b835201ce4ec85ebcaf5eaaec242fe6695cbce1d53fde5b002e006bba8c8a1ee57da061ceed0d21bdd57ab0cab9e46bf3764d9a6c3ab19736d43b33f32eb955f9174ee4a54666e7f19cefeb49aac7a59b7370d9ae730b7bb4e08413222f0a66bfdac252fb61bcfa838f262312febfde8add8f6843f1d64ea3da42d4ef986498604d65737a44f5a099338520cdbdb65ce73b110dd4bcf8592a4adc3e0170b13404f99f0ec8f9fb225c1275a921f09369db165e9109dd5be472b9bc1901bfd882d264d9ed8d88b4c8f3b35f88b69e3e4b8ef5debb895be536a3af492d968dc1caf31879d672f70ad9869ea98335cf9e4a2760f955fd3e8099e4b2eb4269e354548f9de9921e50e49f3f5cbd63468b9db0cfdf17250c8f13535d4c0a1f21c87967cd798fe93b9b2960447401ef90db22c3adfba0f55f5585ad37040e8d6745184dd536d5a26edec365bd6edff1bcc616cdea3bfc8b9d98c0ef9a626054e361194cd05b2287612399f6d3d3be2f71555f14ad2893af6f60ab61adef663c3c2464ade671dd5ebc71935aad290573588fe6e11f48cd2b7db62e4b9932890d1b96e1b83eff70f026d199db75fb1e83197c937b672613c66ea131f485b4318e27c079b4018d4205484993bf50ce70275b244f2caf47cb47eb2a9ca59afbc78809a912eb56a4bb65cae4694f682c6329c690003a1c355f779b5857a60091b1c3685995a366cb43d753a704d3e59c5f5003c78feed877351e27334b3fdefe5907edd9eb25588a42248b9c4a93efa7cc63bad1e5900b95b70436c35eb85cc8251c4030fab9556920141cca24d6acd3122b92b7e868dc174bf071117958a4797fc90866aca685f1456fab397ae647ab9970348082bd74865bab7f248568db98ced7ed84e8360fa91afde3f23509e6b4caf948349ad9fb6a4efe0a0468302cae7a0f999195af1c19058669fc3b88b2780b9075dc180298498caeb7ba0cf8bd42eb36b1959d5ad3ca6fd1e85f76abd27ec5fb637ee38173ad7d86304d5708b6dc8817e099e77f5d43c1a70624cdb96e4e6103bb25e59eb51d894d1dc533a74005bb79cca35b66e10c61d06b5227fcb071457025d605a0862218ca252b871f8343ec231dbee15688aeb914c0f16ebabe6edb0a489b2bd10d4392c6f1863bb6a62181de7cef61997ab02f3bad0a893cc0cd8a99cd7b3f7773085f0929de36b5d124e3729140c375de9a2d0cd9a360cadf17b9e45b7f2adbdff9e75b743b62642ed67aa703b8ef33dcf51a50edc7dbab42d3d2b49badd2457a9f92847aa6a60ae2beae457a5fce1a9e485ecf907be22913893cd1350f20fc6c81c94be426eaf01864e813a03e4674491b61516bc95d8a77c15f03d0adfc4adc27f27a5ac4165ff6518eda1a5c408708f78a9e26b834179804a312148d4f75f21a77d78387139da40c0a6293c2a59d0162437d68504f189ed970c5abb9ffc6d8e1be2b0877c7f24b1dc273b1765bfc5ce6f4b8d99a96d5b1c92ee53a39f685b304313d909c1ba8130d20d51c824cec420b0315229df295f75b453a6c131afaae0c36d7c4fff70623638a4f7ded5eb7db58d95deb6249a29b171d8ce651556dee8037bf4ca74453a4a76aab7cc07ba44e55de57dbef8542c3851ea353fb8e259ee89bbecf9ce8d8bd6227afc0028afac48a7acd9b4e8cbe982eb1475917ad6be4cdca9cf6e7cddd971b2924f2bb730264801685d387485e41993c3fa0af9987e8b52c21688fd9a9595ad8d1b9f41e0457be18492aa09f69e64e2954d1ca3cc1d32b2915cd9cf6862ca79c80beb47347c4cceadf48a37b29b1d6de4e94717d60cdb4293fcf170bba388bddf7a9035a15d433f20fd697c3e4c8b8c5f590ab44aefdda94681407008ea48d03ff21e9bbb4ae7a9aa37c855fe3537c44106e8079f18c24d2584474bd4a99367660ce6f7e6d7c294961e174366e7babc569d5f80572a21a4bd7086629363e0c9ee2599c8b8863c96613ae6c32cc67ccafc66e1cce79654567ad08e62e9abc99e44d6a79ca4d8de15b7f8a763a4741676af0e1f3bd4e002c8fa1ebfbb3bd3a65ae68a80c230422f98f6e1e9837252e045eafd585ba389958297d59aea1e8e1f665fcbc5f7ff449996aa712dc0faf582cf3caf3dbae80594f9f07fc06de63d9d672d14d7ac4662b4a54f40d4aab2de766910be2fc7f6f679b5708790b5376498d3baf0463dca2f093b51bb7e9f3e7033ba0384af0174becc3bb477bc5e86959a12a5e8924adf0bffdf5e5b9c1cf24d232881ad5c05c5c0f50318ea83d8683339ca6a583c52198c00f7c1abbda282e7fd3b179297338ecf9c923a3a87a130dfc06164e9b4c1fe11d51b382643de44b30a6831dee119241d1b6f84f2484784fdf65e41f78c38e15fb4b00e45df1edc40e3467cdcda351a4c0a0185ac4649e91024377e1c331587a8586cc0a4dfe29e14004c3536d305f5dee0eeb8c2f216c1b8d27375b239f6458e08980badd6d82e9ee9e007578c0a3b48288d9ad0ec3c934a99a8c5741149af937dc82bdb545df26428b87fc935c05f1a4964a8408539f267e23de9bc498e2a4b0083cdb7c8e27de6252bfaf680a6d5b7ec1a6dac6d7d537334a95f1553324a0739414dbdb50445a767b0f589fd4c33b35905577ef5a53b0f097191f9cee4836a908748779941de2a78fe1bde0c2efd9f48cbf232ce101d9df93d3ed40d036ae7aedc3a5ff619abd1c159ca8d2dbda7de13b4ca62576c7f925c52925eae2d7500dc969fe14c0a335ff95a7df1d276a6f242765c781208d59edb5848d412b11638b27ce5a61b8209075976c2a6aae88f6e6d8704fe9e83b425dec4defeeb3cd311b8c5a818d51f917a8a4525361791d5c4fd5d70704d4b9fa9df1ea119882f400e682753a41931712c043c120a98f0fe786a600b47befefc9d64cc5bbe8a16c191490874e258760c9e4fd215bebf848e0b4d35521f53ec5f9308644b785171fc4cc3ff886e034bd833d59dbcacebdae8f00e43c151bcb24d1d226d1cc19ecf349361530a81ba3168af3df5536fbe52b3b93621f57959df298e5b4d3c14928d2ef7b9c977c7dda54242d17f8661978a62d94d565b00abc199790b9b25fbfd4a3ffc35c95ccafe35d9a138a2c24d17f06ae2cc376e822317f16fcbcd56e23f84ec135dc935e58c61b34cfbf5a36cb00350483b6bac786030e5c5045a6b61c9aba7dfaa4f7fb21897539863ee865ae061a77c0359915de3aacb3b5dc8cfe53c4d17b393c2b6bb23652f36390407922969d510cc97b99d1df4361530aef10707d7a021b2d9576b2d49ca88b3cc83ad1baa6d88ef8c81c08f8baaf515637b21ace9d5cc8fd9fe4ca6c3aa129caea7060791d566f4de8662b90f9e5d849cdadf9bd23cf6737b07ca105142663c30de27adcea11d64d433fe1ace84b0f6917c8b655f2a421602f07e0a7127e61ae9859c5e9f652ec82416fd2566f291f417ecdf99bf3231d02864e2e5a1cf34c13f59de9aa2760d8734bbda79576c62f566b8269990e9384a41c1634271acb4c7a8b768f276685c3a8c7f20872e56b683244b1af562c3e7dcf592a9915f44f886cc2ac5f679c07d5aa1fd69cf3a460f25c722073da336a310aa551062d92c7297002060072af2f3500b9310c239bedf45c5e985c2e0d60c7dd68522376dc7b560fb34d1b5089450c32ffcbff07b35a96bb6fe01259a06868d00af697f8bbb238d03d49570a109181c9576c1ea9d2ee02000cc23e63d6c93c6cf3050bbb15b6f73b09c25da62e5abd4c2bdb1110e1f25db39f04885595cd6a388c4726c8d4cdbad87d80d42fcaeae843e2e17f44c9aed25c8f6f9736c7ba1bbd3b839126de40a930024a65aacb872936e446114e706a868444cb140e53d976816983f3dd1d57eeca01eab8211b7aa8ae99d26e35c06ea4b226e0a6e52172a40e7f0df5f67759ae2ee026749ba10b8e33694c3e01a001526f9d75f6c419cdccece3ea3f78d69014e509c741214581034bbc7e2bbaf76db8421154abb2233117a1ffe2786b21424576e295c9baef262e80fa2edb69aff800b3ea436eb827e8adb73abc48d740b86c69d557b16e874038598b25f616afeb4f4a900be7dd0d38b5b6fb4259c51a3aaf4748d7a445f518485ed72b25c7df8ed0906b74bd29bd6a5724ac3a503c990f3697a5db484821f68718470810862728a80ce34599a41fc5bd8bb46dd845a4812ae1532c457ef4211d0e41835e5a6f030247614822571c930c727ba397e723d6b3aeba9244f054e331c82e65b74c9f6504c74b4301499a1a6f6269a3352aff57f88442d4eda42a82ebcf7776c5629f97d6160bffdd8282a40ce2e6375b161e4c22ee53bce7a45f4774aa827e2da657e1a1bc07445f0bbd770b7a5a25b1b469fd58715510dbf8d97af4e1b9459a20b08a8d3fa9d92feb32db95b22d36de0bc8b1c397b09970a6826392fd8392b2d790dcc1295888f42ac81ad213c7328b2324b28be7cc1f4fb8414a7785472f1dd3e11d66017b1756d1697be92490e15f056346d7e9126a1f35fd76cb016fe2841c8996a3507c4fffe7fc45026df10b03b86fb6cf26e8418926a030b5fa62748fbb728fa19dc2f8947468c1477750771e442e4a9d25b76d359211c05df788ade5b7824f8770b5dac0819737dec916ee59b28a49666ee8b7ca81386eec8049542f18a3207e51bdbc291470eeefecac385c096a
-
-[L = 32]
-
-Len = 16
-Msg = 43cd
-
-Len = 104
-Msg = 5f75a437ce0698a7d8151c3fe0
-
-Len = 352
-Msg = f88bac738d1e3e10f75e46e3fe026d7e423fdcf3d7e4028b33a291bb4aabca53f780fbf99e0346d610d4a38f
-
-Len = 488
-Msg = 832e5b78a73a1012ee62e00621db7f4d248893007c6e5d6e0e689c6b291baeebc72df9cf10b289fe20e7fab80a2399271d0ac63766049da875eed56264
-
-Len = 13976
-Msg = deab57cdeb41974037a9bef5e292894038264eb4d8993d4d1501e6ef9c68fb0f571f57b0925640925deae9a6317e3bc4d6cdd5a0833e52fb48baca16a9ba9b6c8ca469a0555763b54f04c87d4e41aa549258f30eefe5a52d2ba06657a8773b0842e094857b6d8911d6a0636280025e56356fade362b4bf4c875cc19be0c6644b447be0454dbf390eb966c03e10e9de3487b90d0825d327c12495e3c89ad09c9d591e55c91376fb14c2fde9f7461fb25450df1a65806b65f3caf4d5c81ebc6e664871fcf915b9578bb70ee6776acc62205888dce2baa4024941209e81b4b35f0eda1bdcbd9ab1d6db6140bda4c41776fe675d5c681da5852d50c246dda4ddf9fdd7c5fdfeec85ff6c883c78689c2977584406a1ddef977606c182d6c33561c39c071668a2515e5aa6f4aa1faa392aed95b82ab32b79a15e3b5a07551ab068455131b72493126470f26c30b852e4415e1d8b719b3803ecc336e4facbcc5d1908851f4f39b776bec8b6b9794d47e5965458858560eed5a0305e260240c0849d93a19787b0f8c795eb5ba32be573845256ae6d0b0a3336e42a1beac8bdde6d1b6e0b6207903d4b105f4af2ef89bd099ded870daea2f170e03bd5f6f4490e60bc222d4876e16d4c58aeea6e6c400dbb9e9f4b2b142f0fc9bdeaf4132ded38a4a8366e107cac7210945fa2df4b124be37ef76290e5b9758aa3bfe0091bb0448206323584c2f833e0edfbdc0c33075fc9647a3404ca490bfab94302a0679a1a42fe9fec6af0cd98038b09ffbecd2832b579b2294f6ae5b96328fdc0a0b9b3a32cba04fa8bae3389c3951173bdc17caaefe526aa386f98670b177683d0b804c5875fe9c7afa233ee66349c9fd1b60bb0becf5e1d887e67fd3baf34b4f90d94699d18d6bb9d77d4af358f31edc254de2d6c5fe3ec07425c633b18c1b9e3606b78b40b543e1fd31fb578cf58c45744fc073fbf3c7d7d607e815379a5fc565892d81560eab8fb5f1ae6771b998c592e6d288014f13ab283d53fcbfa66e31a9d107308402191fac2cf2b799c7dae91b93a7676898b8a6e516a86eac58ed8f6d8ed2fd4d38031e4a4466dc8798b90c48e6adb6b4391d47872443cfaffa542b4b132f6c3408f0081af8692aadb4c9bbd55053ea56d8b82998f6b4b41d331891acfe6af1bb0d6679989978368ea463743b514866d2d01fb9950e8990867bc14f1db1142254adeccf3da812949cd03cd1d569e9d0bab7ca7405cc21096e3cd4d007cbb9629372e98584b4c6b97ad0bc314e1ab6ac71184ee555c01973570ed9b115bed956f9e4e349083013098b1e483f0fe44d5e9849f38a2f7ae152b36a266ea1faf263ea8c706632ba8629602187379546fc6b82e57ededd6d074c15c771754710731e07c207899eb47e8d7c72ffd768c36257d373375ffa06f9b3f0af11417f9ff9f9b44e1f1f96ae8aaa429af88b14da1da81c7bb38a0fe9372ed6a9ac6fb5e9e56b82593d94c5192904450227bf040b7ce0904789f979845e112a1f995c849ec3f7e49bd975a474e8201630f40fc0d80e76019f110ae158cd0f8da96ea4561f24237d8e795ebf52368218bff3e9d5b040ecd2caef4ab1e7127e53bfa2b3b4fb74829f9993ac703192aedef79dd9ad24c2c976638b4575afbce22ecacc273ba43379ed55ceeb51838b0adb80585bd1b5f2707ee16b67a7232adf7163415b24b9ff9dc94b7197fdc89e2a90d2b9eccde45e965edd064dc0d1eadabe11b8ec3aad2742b5d3323ebf913a92817749090c20758f98aef2544d4c8b48874e8936d7ee492d5585675c214deeb74fd67c4d170ac5e0aeefa607c6e37abd4f8238e776fde3921afab75cbd8f392d3e88da057903ce2e140797f4a85737bd89455e6aa27c7535687b78cd0ea59848e006c8de9c9c0cbc7a9f5e977be850adc710503ce4ba7c7bd0b042297f518abec6c8ef451c33e030251f506cbc3744228b6bb4dab86877d9e6019a0ea9f39ed37557b3b5527c171da5f013e0d3c480a038cff2c087d6e5d41b17e6c8f90c334b5e2b9ccbe9d4efd99fba1f907d00a49b71b5a08aedb644fed24bcf04e71be67b03cd20d53ccef8f854f5e9f7f28c1e98a8a53496646713bebe15a93f1ea336e6e8a4e68de5dab0fe880bf983eec75d1c5027357f6669e098411e0bc3ea2293138f5b34425f78b6508b94d4c0cc32ee9afaa409a26e5f2a1fddcd6d5ff42a89755a58b08f243957a2e208e24b055f51992ab447bc06876eba169c545fa71b88a0fc15d1e0be9d334a1dd0c86f44bd149b42c07608a9a30d0b7e13574f8d862f2ac72b2ed38904d7cab194fdb9e4dcb615f5610b24e202a36866baccac01fadb575df11dd43e00a3b92fcdd8c7702ea49d951e7dad2a56c075730b4af1ceda2bcb2310256f28312579fad40ff471336ea6a44143edfcffc297258d48bd2ea47efab8f0dc00f1e6dba1a55009ed627b7
-
-Len = 48824
-Msg = 5223e2fece634a95e1e7c83ad4a11a0478f4a41572bd66c2d7902cf4f94404cd80b1f58fbcb8eeba3984fd759410c12f8ee922865f363f684df5a8787c87ceb3086fb8535157f7f39653dbf5c66ae7219253838ec77cf1c6db518225c5ba0a8212e5911236474b8820ddcb8111b87320adb82ff553986324aa2a21c37ce4a083c89ce9931290d4c1fea933e31d014d7507a28e83aa917ccae10bed1a490e77fe501b299f8e3b78e659407ce1934d5d68c7980800746f26ffa9794ef1d23f793bd2eab7fe524e213e58280f441ba48b40162305335b3a480c2afeac11c27f8d817792fd7805d4b61224eb52d35c0fbf471bcaede505fbc9398b216f43bfd69b1a669a61d44fd21faae410af58ff95e1c3ff1528de1aba93cef56bff4d714d8c4cc88a4ddcda52444ec1208d99ab3fd9fde98c1ee6437d8d138f62c5f782eb4660c5eb28564b5b0d46e3a2546009148f3d02b837c5284e9f508290270b97b9b29e84445a0b4df662d9711e6b73c11cebcb7120dc427034b1ccf57d8e4f5bbdb84d2e1d4bc3862a2b51931d3c9a7a5fd6ee5f4c7327c338abd011af638d730141b6eafe63469eff50f473262e9fdce636eff4c5663acb6075a4fdb00c8b8a8d3322e1700a5b3e7db90b36c1a94991b8f51657121b442db6f890e208f312466778d73bfaa8cc0ead4edd0776155f3eddf9abb1bbfc0c94421adce83d7ee94f99f61e1f25a55fb596f8b40ccedbaa8e5e2cf629496f5ca60bc4cf36d917da4e2b973eb57869dddc409dd66d5061f22642743fe843defa0b19dfb2f56425abeb234181267b5c0d2ab4268c538510feb191bbcd1631b0af6c7451cd4c641025cd8bde2d9ab6e6b948f97c1ee6f35098d553e8e9da9b4d437125046864633f109d6a558b38b270a7dd1785d44d248a863a91e3db5c0a1d7ec133decb65e81c3402c98ee329f660a092172bf6b1a02491895394ebc506882805a6c93e767c0e58a5af717d950a206c0f0055cb39ed88816a9fe3613d15f608e486ac08bfa67d462d24e6a0a37716d3fbdaeb9c0e951c1e847fb884ebc1cfe707dc6e7269eed1c44331d5957bc4ac9dfeaed4b157204a3080fafb9df8917b8d15aff9c49cdc739b8fdc26a546794991c183fa523d14797e051894f48b0d62c2b70834467ff9c993b82fc1152c1f5479ec6144c7e8fb10d1bce26bd1cdbeec4e95ee073f3bcc3c7367328e30543d371b27509a577f5c79f14d5f687ce62b82f856695af9f7dd350543ec763de75b593f1859e44c2ac01ba65f98743cfddd8a89a38115badcb51a0ff5655f830c0122af6a830aec13ae5eb89a93755b3a5a6eca233f21cb12db545a24a5334becb8fa32c3d7f5805faeaaeea85a551fc62c94807faa6474c0d74cae79b5d8ddae07498fcc5b8b4f394867112ef5fad1c9da66765ecbc7fc0f3269d29c9c38817c77778f2c19b5a3c705fde9d76a4eb86aed4a7369a832ad267312903462397f7b8fecfa8b195cc2316cd53e48c3371ed2ecaa3e484b8ecd2e22b1aee910c51ed5d71198936266f5a00655d82c089f49295feda0a2bcc1a54ec8adf565acc3a8b2d74c30eafbbd843c59e67f293f6d8296cf7b611f01b57dafec6e2d4d411a633918068c38ef47b72ceff1fae772891141c3bc496824509d78165c1e4cd4b4989321a8722643eed69950dc120fa8da3e53c3181f252d7c4cd2cedf8f086f788ee77a98ab5b019828aa02108f49ea4a51f457f7adfd2220d3e59d5f4a29194e8f5eac40ff80312ff6888ff6393c3fc0914b08c1b9990d247ad80a441558db1ee1203e07353dd99a885a7ff5d791af2548815dde0ca1f56f89d39ef6b93dbcd0cd54b854173903c12649587433f0425fbcbddfb66ebce3eb4800dfddfe7fc44d9b23a3916b1db68c187da4dd13ff0157352814b1a792de7fff855761abc6fb7b93b48525fa90fbe3a51dea974069f3f5fdea86387eccee13f58a8eeb8abc6a43fd30e9788c3bd9ae1751b30a82d420225b2abdb1bc121b9073380be16107188d20be54f2e9c658d5b443869ea0e991c496104086290b6edcc1b656adf94f0d42458750fbd8d88040c518ebbb644f4dc4f7c6971d8d60eee0272df7b51a3d5248b4b264fb22195ad891fb6ac994ae5c0bc6714ae0b0b9a484edc576638b78ee89b568195a8f33ed8362128c30f9b0c7804b3ce1355abc96b15aa55c1e16a9e9ec90d1f580e7cb412a7e85d8585bfb950acd4de5865214ce4db7f6314d81784c588c1482d5f28c5fb62e7dd7aa8237ce9396ccde3a616754414cdf7b5a958c1eb7f25a48c2781b4e0dba220f8c350d7b02ece252b94f5e2e766189c4ac1a8e67f00acacead402316196a9b0a673e24a33f18b7cb6be4a066d33e1c93abd8252feb1c8d9cff134ac0c0861150a463264e316172d0b8e7d6043f2bbf71bf97fa7f9070ca3a21b93853ec55ab67a96db884c2113bea0822a70ea46f9ae5501eb55ec74eaa3179fa96d7842092d9e023844ed96f3c9fc35bbc8ee953d677c636fdd578fd5507719e0c55702fed2eaf4f32b35ec29a7a515bbc8bf61f9baf89a77aeb8bc6f247706c41d398cae5ec80b76abc3a5380001aea500eb31b10160139d5a8e8f1a976dd2dde5ce439a29dba24d370536a14bb87cf201e088e5e3397b3b61477c6a41e22a98af53cc34bc8c55f15d7924e7e32fed4d3c3ddc2ac8eb1dfc438218c08c6a6a8eea888b208f6092dd9f9df49e7ede8bf11051afd23b0b983a81bcc8d00f7d1f2b27cb04c03aeee59c7df23a17775ae5984eda788eb2015680ac5610fb1380b4e7d7a9cda6178dca98690449f5551b66ad2826cab2b662f56903fc95b4611bc86f7a834a34ddc3be7bf142c8baa096abaa3cd51ad0c0b6d15e590eab9e50a4c60c91061f1ed6373d91974c1ad9d263110a0d43fd8b596396cafc0ae70b7ac24a59bba090a6994ec483db7ed4c572f723670a11c724e8ffa2497d8fccae37eaa1d14ac1537eaf80efbd2e597b2ffac97f2bc3cd2c4017f170544dfbb0d9109478fddf06ec0981542bc8107a725be25070d2cab4716f4edfad75fddd582ebd363c49e8efaed9a76ee51f22304eebc232a4f67f865b04f610a628fdb317116666785fe8ca30619a07c83cc449855202d687f162b12d93b63af6e7ddfb7223d4ab998a5f450523c1d521ab76f4aa113cc2967e04a38dae07c51c2d0f44fdc8605c3c53ccee91a2c73dade5dae021cbc87d5cd6e5fbefb65335827311fe1e91921ecd66b2055a6102d7a976308a80c44e6d47a67718c84f2112d65486a558f1f269b91d9f47e3e11d09c0c748625bad2718e3674898abdb19d3644bcdc9317c09a3ac02f514b2a57e6a706362e5f6e8fb16cc83daea0eec85fdc8c367d84c9230730291440a4b109f7034d510a3f70a22dd4fa69e8b65e5fdf87045d560eec71f4e59531c7711d4f8917a96e22ad07346d2f92a13fb4569fa6a075da6e1acad1eac1cb2ef19ab452264de2357c927c6dfae6598cbc821eaf3b8da754ce91a96c702c95b2c308bf3a550cbf4d22d417745b5f17d36608feb826b862747c59d26a0e8eb96547a1852f9fbd095f1c5d20721804941d462f3ee2f0876ee2825c8df24c4f00f0844e50588ac688127013df8eba3c971362dd255420649245e880212cb3d732fb82f866dda090040f28e09cf1c86eea5dc4fbfc373eb69745b4afd841ca8e172d4a8510e7698345fd4cab9ec2ca0453a274720bb2d2e5468bf0d0f85919dd762fe3df969e6c071285e25c2e2a49659b8a78289aee655965bfa3cbca9b292a19a855ec40293185354ff4da9451ccf98abfda07f1137e79bc89d688963081dec641a99656b040637402890f185edb28e7e6a2f65848a6af158f90eea440aa6246a2e6c31f5d220b9846aae2027afe5a7caad6dc16b56463367cd9e73bf22a1d6172145de4565ee369c55e3b99ccbef70fb080a3748340fbe8f6b95ba46e8b76de5a3c4bedc37c55ae24ad02267da26769a3a732badac2e0f3a5393028dd54d78701647582cd04c8310e9f1ff1b433125229547130e1737a1f33604f0d670ea7221097c3eb9c7fa4b8293d7b429af76191ea8e481dc1da31344537a09b33404d782eda1d6f5775500c1d8efc615778baf0905d9fcba1806ef986c40b1c6a72335104376b58266c36f5939a8b95123e8635c0c95e80aaeb97379b1179d6332dc07539b595ec32eebd3a336a1128f3cf2e2924db6d8504a516b62f26d012b7f75cab765c8374a3824da5a405746023b51894649ab422d636513ee809fa181d5b6fbc63351e37a1b14efc8f739e86ca78ae3e280f1c9e4824b2976ec4dd308ede6171a7474c7f530128089bbd75e10f9e57ee17408b4384f99f886a5f63a2320a9b90eb9bf692e1fc449171eae3bb1bb17a6ed937ea57af3c82db84e073b5306683e1d63705b9742a085fb802cf5a1639818417fc2223f476c2566351f4b3b17a822e11255f3c3412dd39190e200727bcd3f9799519ef792ec7c2b0b9d0e2dccf013d436dee63483c2ce83c15c00a76c4d894a60cb90366ecf9e61221ee8bdaec66d715159876d8305b35c81f96ab2cd8f81f4769e9a6e439c08c329036f5d2591ac42f2747bc0e77d4e566358a3271819b6003b290211b9b847ab70e906aed9f86cc38aae27e1098fdc3bd5d84e66c45292183f198bc329cad794aa4e430534511b7d9a75104061b409676a16c1146af0a286e2de8bf51c4a35193581a902bd3224cb9257c961989042538092af92644a63d6d6f6872a29aceca39341ad29dd22354812c4b7c7068b039ac9ca7e6358e662a28be001d4aa697ace540cc3ed3c97b98d8c5a6fd3543ae9a7962c9229b14b0b646229807747064be3e83191cf24092dd67f675638d9f6510486379f47f5eeda870a3187946819ec9ed05e7b325bfd0eed5c9a0f4a2063d63c1a8a0a309f586c94d4a68bbe860ae9599ce204c92cf9d92cb460ff99cff9e5a8b3824786360e1e1861e71158395faeaebe7aa2f61f76190f174aab9a313f0bf4f1befbbb22768b8c22719cf3fa9ec908b576fa4bbc084b1ee5b5a7eddc89b58b45ae7b421d38215aa6e49304323eb4e202655f3c8b16ebd6b03058e75a907ee63fcf6aad5eb96c1e5faea81b88b5eee525c4663af52877c0f759432913b9d48030903e7f9f70e851cd4e20bc56aaf36cb02293d992b38b583b8f0b25a08c3303d8af5b1b37f5127f7021b13934645ef3020e5caadc5e7326ed4ff56f797e26cb986b6512b0cc76f1d8e7be44aaa88e12cbc644f14a7feb979d2ab66907063c51e052d0f8b25d827377fecc5111be0d365e08d17f559e3134cb9db294f1cac03150f4232f853ec15ecde55fd1023b58e83934869796400088e9177e85a2227ee45addd049c1d6b03e5b29dd570496fdb2fde7d8cc74fbb5fe76266ebd90a3b4d57e6e6cb9f0bbdb7ca03ae955915768011c714c909a27ee20135927af55d4feaf2c345d029a54af942da6f85f2103345d059f66864e6b0578111e2ddd5a1cd8bbf4ae35b60747b93f53ec8ec64c10cf4149909b102a2b88712ff3e5ba3611cf96585a6b36fffb64b8c37a114d6b16a53879136eb0b5e003a5a068e3e8422a4fc8d7c77227cce64ebafcde2437166b62ccf486660a7a2ef37012ebacca26ecd5bdf363feeb06aee39050974c25d6a564594c67f56fcf7ed48b07fab4e25ccffe002bbe460325abafe37f23dd9c145b4667f146a1635e462330f02470b35c5a2519f1350c02b263201ec9026cfc57d3659373910e878f2b6c1c5be774df8e01e775d476956c257bd0ccdec17ee939c46e5653d5813eda752ba7bbb245a99a5db1ae55d19692074c2e5820df97c502a4bd1b12929e1be8e9ce6d802347c3e9c4202de6046436c05ab55b2fcb2c227adade6c2046d98102cfd0d859a91f8104eb9f6f155da2acf93df2405bf2c083eafd3ec41d60b810e0bdef6298b21193642a9c0c646bc6771a5c61a25604d96bdb727abd5a7ebe4ddb2a56a6ddece26d8007b26043ad44279c3c8ffb7e6ffb3cd4e10ea2780f509a8a9bc31f99a7e66201195f1543a0a020f754d9a665a29a896faf673df6811379579891374c71b2234fc61e95d4d46f15d44bdb4d7c3b3be3f46410ca46827b8cca976d8866e8ca33c4945d5c87b705588b78015b529843af0b75a7e1e871fd276c1e947d896b92e6181ab7e3ccc7077bb57fe85a6958667d3d7a790f6cde1cebb494c2912478a0eca2bfaad62492e9f1caaa0cc520da08c0d2d910cd44255f4c2ca0646dc89e789a1cf9a28e2f99315d33accb1639cbaf0c94181b85fef648bb4cc7f66dc65b8e90bf5f3b763e58520098febfe7e47bddc2d9cdd5e40dbf4ddb8d51f51bde2e57432266d248d13ed09e62f66794d188f9861c50ec41f0eee30f76f4ece250956733ee97036098db41991a4a3eb7816196c8e447db3a2913bcd992174a7bde1f42d57c764b47f5bc09533760c1ba74943a0dca291f2746bc1fcc573f9a22c72a5eca347b1679683fbc8f32b08d381baf67b7266b14b3ba46a04a3ee45881ac452f64df1bf17f70f4cf9fa4dfed9ae70184679184784a0451d2f5c19c02031e0e4957b4df68b4a069a6f6f6458f6d773924a1841ba664a55c2c3187dd33416cd410e56e4bf8d3671cf737bf67df2a4cc4dcc786872b9e2dc4009fea0e48a749353ac053d80e36357d24d468dd595bc823017c015d7450fe38149370c5decf13b00b6b0e0a2567ac08b45f7b0c8a7c89d227219d051d17a706ccbea49a42035cb327381568eae23b5e2a3b7e8beef6f260d24ab224827ca8ee9d640dd23eee94ed02c9e26abb3053cbfaeadbb1f365a24d8769d92240da842e0b361524020b5c9c22a2fd8602dc9600aaf02b35344309f6bb018a94d4cbc9639ab7430657c4046f0b25df517e31626abeedd58c2e19aa0ae1a43ed2bacad91dc04a2fdf9cc33cc420f4f04379e95988ab36731d5d5402d89fb47e826f4243bb206124364d63564a0872f8d2826eebd9046c7c6f2e7c951e49d4b22a7eec89da1fbed890d63ef15f26422185143c89da3ee269f83e1de11a7467822146042be92295a585e3a09e720ec522e1cbdcb41acf5ac45ee892677ba3ff670d71339a76ed98237be252ae21268e756f05ba0b094a1803f9da84a8a05d0ec9456cf565e1b548cae95eafa0fb01f091935e6eff2413bcb15f605f15270408216fb5b41ed83dfa1454c522375e35bdefe54275f109d0ab450636ac4d8e4d9e27f2d81a15b8cc5e98549254a1c9162918db3e399118f5864774a9d6a2347e1315753071eb1204c8bf5f52b1a0da37e484ebbe545fdfe6b031215678c3b83a19a24d7b661f626beb01eb82b384f02f42bcad4f40addd48db8a92b90d2297e6143702056123286617f86fbef4fea940f648867d790b8f803abc5f4e0e3f4226954c296afd96e287e21b7243d05e743161810da578096521805edd81f68a45500f6a3a1885cb1f45cbd399dde024df65072eb973c827fca13eeaa3f140842016f509aa9ab4603d2457c92cc9aef24950697a0044e3d7c483b8d8391886cd50dff8c2f16de3d6caa7f864c1b3874750781b2b78b545a94b4da0b0036433c6561f5cfea50eae9f5645302eef18238473606e9b9931880d0f6368fa9970d1ffbe59c4454bf97f4a5e8091801b53ee4a209e0642d83605836f69742071aaebd9d813b10f4ccac03851ee9f20cd1351f8e68554c9bc5f58ad19d474ca128edbf561d195e52ddf3c19bee3bb597ac2f92143bafc98bc09fbda6d18dd4ff2a93cd2ba17f54f75c32d3f141468c2baef4e53b6a340286dc2599bf7bb002aa86688e26f5b51a6aaf32e48ffd539d4f3f4bbf0cde2d20138151c82384f9ff29a634ab4e0103d93340bb9a7b0caa108bc7fdc88d7de14abb17e9efdad2b0f304f0bfcbabaeb1b9db75959dbf54930e67aed3a9c8309aa90506b6b9ed4f1d06c4ced19746e206e1e9b8879663bf56bf6c5c920ac5e09e6579b780cb63e1875ef0a731b726864b7ae5705a2d6d343a4a213a05928b7337a59f900fd04472382610e2a8d25383c9ab5804d609e79a88d70eaef3ea22d3aa9100fa2a6e98e97684ade9fe90d6bfc59dc9dec3d3d8db8990bc2123ba92e64253235e9b4d682e8aa04e23fb9bb6248a77c065e93249de829bb2fc5ea9e396461090222816bb29bca37bf86698fb995f62c50110cf418bbe2078a56c5f1ec9fdf3d0b09a719ac253b5bcd00932ae058b86611aff51c8ca8448978615854b69b0216a6eb8050ce199fd9a13aa0fd652570a1b187f61e6831b3a960521c3705da8c5e6c64c7b196ed4a49c2912d77b670b177c6458a7a49ecc1ffd8c57c0978d2a05cd1f1c7ac9514dd14b7b0933a52cefd40b6452ca0903df1f55828025c7e18109a6e0f2ab25724cad2d6f57cb5d894a6a508134731e9b9c61254f64990941f4faf97394b634b91860cc6ec346aa666600d323c849ea4c4a0ef55acbc56495ca004f3fca42ff0ffb11b0e1164c95ab89bf1db3d4f575ff334d4e0d7d50e0c54c422eac5ef78c5a3be95f2e18872540fccfb597211ec79d9d47b6cf41e385b9c2e92122167fe584210f63bf919c620d
-
-[L = 28]
-
-Len = 16
-Msg = 3dd2
-
-Len = 104
-Msg = 3d232201038fe7d846ac1bd4c6
-
-Len = 352
-Msg = 44c98cfc71f82215dadf494d68d1d6b92bb4eb81fa0fbf945a659d9aa2c2302b5c93fd3eedba31e479e29d36
-
-Len = 504
-Msg = 02a5c7b1b749d6d49bed302d9439f23ab83020bd4d573906f4190e74216ad33aceab775f71cd31092bba5cfa42f0845bd16fc1b8bed6434dedc92f80b395aa
-
-Len = 13976
-Msg = bd70deb2cafa75918308d703a6783fe9dc5e3d21de9bfeb6dbb1cd531ed5dafeec463a02abde302d4ae6ab3cdc2f0f94865e38339c88bde507ff71bbea6b30b9851cd8cf599e950b8c8e620c90adccba0033f934ca66ea0a936afdad575bb6235099beff1a632c9114a8045a0919fdc21083880eb05c0d8c489c7810aecef4a41766f67c37557e28a9db9a0d909c2b167ff7eba79693afd3ee3aeace38eb73a5a02a882cf89b123812cf2a0f6d5edd1d14362ce9c43257474def5cce3adbba8cb48e7af9a45e702a182dbf47e8869b3f99e953ba81628e502c60d4f8ffc551c31b3ad6ca85c52164839d5e9d493deee4d4b76604174bdb5655385d34ced2c1b09dd5a486e1f9ac501bc611f9d7aa5c748f496faecc14c6c18e1dfc6aee2991bd0207ea1701219955a751df43dbf66f57904675a0e9e6d7f9a0b8bb82a8f44951117ab2642d6671daf1e5d1639d48aff6a05781c2b5e8976653b0a164445872d393d30355acf0bb49bf2bed4265c9a3b786249afc7a438d706eadb6f90a7f93ad51bde6d2c8e6ff09dacb3dc67ba0d3030c54c8367e1e4280bb5903274191344610de61c3c770c6820a6cc9d826f7c743f88f13580ba23cfc00598fd733b5dd069bde7f10f2b8961c16b69761b0f308dd137f844a67f6054e065863f226141755b96645a291e3fa3fc853b2475fbe1d3b25ca22f4da4425dc95fc855e63d6699b311ebd5fec1c7753e6e81f747c808ec3f618f63eaeb1221075edff0532225c40ccadee304a8997c03920e7ce4e60e4df4d120611296786516dd4d9cdda2077ac52bce0fdf552e1ee89a0133f1f87a6f6f35f5c53958ed806465919a0a5fa42488bf29caf33a0dd469e13abae351d5c6fb1a800ee384da199c823c965d9d5457a3ef8292c4d9b142e3f1fb502da498eb44d95f8c85bcd6871bbdbf004bfdc09ab35758f5e8b6a0d0f366c3b255333c52c8fcd4ecb4536b5f6e72897649f3415443612d72c3436505249a344feeb04883f41f90ade40af119014b3c56fc108f1ab0a77087d9226665d416cd975e9e4605529c032e8926002a70924820c6c7e264a794b2a3beb63d69ae56e017294fad4d611cbd0d3847212a38f22d623eabe3b884a36464d8814286fff52c4dd366f6c2abfc2eb865e0dc9ec6e55ca9d81f1b8cc47e2629bb162e54655bf2a9e156ab0bafb4b8ce96858aeea6e6665607a3f268036f4890dad759486b15e3c9e791429ec8f11bae4ea7c490656fdb0551dcf0b0be017c08bc674bd97d9d701c3ac955e2941ba7d5f2ba122a6f0c1b164b1caf2d50df111fd4287e9e195d181f6f514d7dadbefdd4274edc234025b727680576046842a834b6ad89eccaff5c5209bb91d652357e3750d8bb0165572fb71d09fdfc60f6b1e5d868c67c0edead427e7aeb734e29b96e03ea174b6b1af523feacaf6bd745ceb1bdecec9251958b7f521182daddf62ff6c4f58977adeba81c616ff2e937ca4f16eb9c44e63f9e974709122083ae45524ff87d7a0cca33a90f09b660db0efeb393c61967de2564315827ef1cf42b71c0f822f471713c9d885a3c3281d7c95dbc96f1c6dde0af70ea11232b00a2d215ec8de8fcf84b6193b6ac9d46de660361aabed3371fa44a6f32107f3854262eac355f9ef98701f580b4649175cefc29950e7a0eec958f629999c4b0a98fd4bdaf5c0bd97c963b551f2220bd41ec00b8726836e949e818a49aa1ac5bf12c64fb9991111ce8be3e0cb9605f753dae1a4c84389416f17fb66cecba45d591b22d64e5a4edcde067a088d9ff7f5dbb9dbf324510000c55d50f480a640fb22da9b4862dd81080d61af9560b601edb5e3346263f5f193df97079a27e3f9876078b80ebdcdb17ca4c50aef0c8329c72a7f77584cd963e105eea9c28a2ad4e95c1d018e27d0e720ea59147f59ad796b80b6293da8a55ed47e8abdd37221db0a5eefff31688e2adc294654ab0fddf9c1ffafd4783f01eb539492cb35a77315d0ad19395f47b18298a7b353dcf5bab0b2f193ff73d99310478d2e5c4ff1c68a2493c138818edef73caec9977bd4eda6249c8933953e06d796b288f78b18c343ef561082fd03bf92b084afaaee741de3004abaf746350048294bc52450e31147173f2da13d6ffc5adc718e149f9df3702f414dd3ee88296ae8a0106b071b589e8696401da7993d58a9bf8e5bf417165498c96b4ff5fd2b45bbf88f551688425122a3737ca54b2992fdb4d60957a93097222c3cf4c45dabe18b9d6a69e6f27567d5adec489e4b6812c29a8fa52f1de642b7b0e749c16f54473ed5ca2fdf2199e885fed308fa62a3e0deb7e0b8e439e25b3e9f95d755fdcb7ebee9d73069dd57dd1cdc5145205882023b54f2c9dec6cced9e3f6d24e8cdbb8ef121b8f3eded574d81908e867af5ac82bfb8ed60848b4bfdc1d998bae3a9ca80c1c49601d11a40409c62b1536f01ca67
-
-Len = 48824
-Msg = 5fd54472a44e4476d254c0940071ad42dc723354f76ba61f63fbb9df80d1ee56136f51b6982e66c1da83602fc08093506a9e2cf27cb92085ba5c627dd63f59f8850e91a1d86cb1d4ca38ad03160f3c584b128d9b21e935570e086d3815307ab8df396cfa0c100bf6cbfc0fd7a8258fa1a656bc178e02cfdc868540d8e5ad39dd46794a8bdc205e710555ee7421ca7475a4f3232e6a0cd55d4b5d4525f0bd7eb1e455931aeea6918b9fceb2a32706d31a6d7028a85e102f228417e2e7db68317ae155af70eda98c8dc1ecc32a62e294d92855354c1114c5735a3c81e551b63a81650107557f3237bf953989d17c65a0fafd2bb1e32c237f98f55389e8f8b0810e97e201914c487a68403c6d621a98ddc515780435564245d87ce462b8785def699f7f06ebfdf33dd1ed7dd5a3e781348298c7950a387bff7d1878731d7ac66ad9a6607f2c3a3b6843c2852a5e882a8d78ae9dce2a79d595cdf09626dfa6f1dba7d40ed21caa29e304e7dbd559a89bd1f07d84165dc259ef112dc6e2c5a3e82b1c50106983f6c4965c85073c5deddbe6323003d56abb0df590f69010981ab3407e43eeaa29c6156995c492c931fff1b686eda3741a0bfb9094747d1620b2580415d431ffd6c02245f6cb03e39f87e82834dcea59355b2ba663ce145d2514e15e2b2c60cf518ff510c6c3e2f16d2dc523832762ed8352a320462ddd4d6fe755350672038163d996b44ed3b85d64989291bdf39398cb996de785b9614ec5d4bd73efcfa37fd4470b17d6240b8e4c715759286b04c3d7d791e2689927c9f18320ff2e6bc7306c805e23a5de66eced5f1a630cb43dd46db515f837f6b824b99b86c10b6df7fcf22d97be05284edf0e0be597b3f9c63556db031339f79ac9e6c5f8a1cefdbb4b30f5bcd23c2a4dcf791cbfdd6460284c5af0621ab7c5571e40a87c87be459c85ec81d746930dea24f43bb11d6611ea83409d3bf4f987778d8eed1d5b246a2112ef78ef0252f9ae464810c13f02359441d289958b4766807d9a3be0054897d35b01830deec1151f9e3d42f92b80f4aeedd65c78c6e98afc562a3bcf6d72f238c6e94a38f2288ac7929a7a61c92875c1f115c0ed8d261a727f0794f17ceaa3dabc717478f6ce7f2e8b295f000241e154b4575bfac8483f6b62f9ef4e18f7d341a65faad5e2fc1ddaf2b09adebc155ff09e63d5aa5f95206e66c7f4ef2ae3aaf3ea7c93589efa8c552df8d203e0ea181c1703d7023b56e603f33b4adb9bf44f7af290d8081210f327a6c9b0785709346087fd090c42d2b8b2711b9a1a5173eb5e246320ee27867ad6c3eadc4407bada44561a12cf5d53bf0448308bb536a8a525eabc1410c3a34becee25fd6fda453251ec229b53751f2280e142c6b331daa659ab655b78cfb08bf18e40bb02b7f1650eb2dd4ba1707f0aafa219f21c29521581ce249e2e34f5656b0a04c00485079b040e13cbc038bb9f17f47cb8f908591b26bdc28538d8baffe4cc39b17d2ecffbb9698bc2b8b31b08424034c051b535e0cfdf07b7a0a54781e33ba739759991aeb72c0ed992cbe76eb8ec0ab12c182e8b049cbadd6e82e314f1bf15fef5ae95dc86bd64b8556766f8ff62c33492198e454e5ca59ea856d8e095c04da8045522abac865506096ee1cfa1082af08ca09b3533878ea3580b6c0c57a615e0ab768246b3eda96bb6caa01a2648068e21959f843d853e948588e8c0bfda364ef1f9fbd3235c27916562eb0214891eb55ae0e059f4bf7d1838b5942656c27899dec6d67b823a981d1e1e0aaff5323b0e3d69a7dddf9b12d7787ab763a3c7a2697ac65b655aefc4bae7e6444850ad2540d5193b378682c77a4dbf9aa22e517e68cedfd1ba32e3730ecaa2e3f6ae61a4f427d6e69071dd62a9bf6c860980c9d23ce1fa82a1937e6dc1ce3a2de096b680d23d89ee102912ac0bd769c1c02095678dbb00b4430428797cfb966b2f901480811e1b9cde358b6d499c9e93f0961f050465d7b0c70d4961e75a9fe40a24e36eaad27238231dae6d0a17f446c16bce7348e669be563649eba9f23be29adb8b10f462780a066ae573f74e51215a26097b02469c25180890e06acc53ab063c742e08d51359b0a39749b84b9f6be44f3ae3da8e5a2f340a8607d4eed08877d007928d332d6f49502bb5f416c46d866fc87477c58a22d3c5932a8d6298c1151daa032c84ad92f8f90b8053b5aa6f690d1bf682f314471cbf200f3d30959e07adc6488dd17b0be5279e727f3237b8b4b19b31a220dfe63882937f8d5ead677608c42a57217f2239614c521d94559290e3b0ed8055d5474e96564224f6ca6389b40a71337da11e1c307dead8e4eb43252cc2f1c49addb18781cf20acffd3db693b02e5c8ecc949b51b99005529e0149a13390615f5df6e0bcd68e1ca82b0173d25134dbf76dfe92daa085d3f6b1e4d18217df41b70c4c40101884c2886495f2ef8a473bf23cb47ab6533c93cb38c36c6dcf6837f1272fc91a6962b6e1386fb643e1f1d71fc75ab58d5800bf4081217cdce0c7ae9e3d25de543fc4444314f32067eeb147c08c55c5c8158ed11729837547f28a300eccc312260215f50e98c4e3d4170208a50a4a4def1243538f906df8476b0c46d3449be73866d463d422595300e160840daf8c906ae4aac13a64457853b0ea6d8c32f4efe3b48c0b1450250086d459648b0ab14fd3f341a4a803be77e56a811e7a26827eb0a1a9454f90bc6ece665904adaa3cdeb2c4847858fd1d79750e8cd45d8da9163784b8bd06629410502debfed5eca3cf8fef0fa6bdcef6efaaf35a1986d6fd68e0f436dca9442077a4818ebda4606a94a3c93fda46e7ef5ccfef656896a0d3d93566b02ed8c3f6174417cdcb99a415b0c6e9816d94e64b438c295b4bfd69e0d9ad52911de5509971b7370593160629b641d690eb2828bf363857983e3b9098fcd15e66448f786f196685d2ceaa251b17ad06dacd614d9fa78ce0a8b9c1c360b529d0bc1d17ba0b70ea8ac1b8d67f6e5770f0cbaee0b38109d26b09493060dc851f5fef121e83e30aab9c3efc2b8397e8362aefea1708f7ffa14d3656f7f7610f3a629bce14648a593250c6f309c02c6c552bb42984ac58db920dbc7d98f59295f37f3e9b99da55ef074ed65801b390366669b4c7aa1c483ffd23082793f9e5cbe30c34250f63fa3ea2cd097593dc67e8d27b7e4f07e73a9f7b33a5ef6962df1381a038d4f58fdbca9d71ccf640b917f631b75d4a2e8ba46c64a6223f99cee30f47c1a935dccc7f054fc39d3498c824e10cc3ee337e781a3971f0e98295aca611bde701c2359858914248f6bafc88232bbc27bd85883b00990bba7862fd7a7cbd4c86df049071fcd10d686613ec877758d83927cacc530bed9a596b5b21c6fb748c379d676de7e05719a867c9f934b5dad99ed97dcb4e70a9b6542ed5b2f086d9f56fc9752e788785ef8f7837a31e433438cf2f18f58be37fe8412f6d21a5c35000a5efb862926700079413f76ab2c3e79e20b516eba9d8c29897097bee55157936607cabaac41337ea4cc783c0809c875259f8020e16d5045fcc39ac796d11a82f25fcc9579bf0a010200f5745065175fdc15474ed514cc796672c59637c3c8f236cfc9c0978a3db1194680c58c27746090d76ca09f7c48ee4ee7e1d3cf0ea70dbbbd88e30e8814b57404dfd7c33727a0c84cb7bd468b0bcb3c89b526679c00fb0892d2a5e7a3d73698a3db53fd7d78460cdcf24ed22b5f39b8c00b3506541ae4a5b76fae29c1cd5b0f8c3ce142e0af7ae4efe3fa4c438a604bf4a9abb41e3fef1b9227a7dccc3f4d6026ca289b4b1366d9ed546abbbbd5677c8d582e79e2b544f18dc23809ab753313d84dd10fa3ed2f723f0b46277b8877d4f3e0665e88c50caf0f0708b746b736b00c8c83a7d18500384bd035996aebb7da8f09fd6af9b76fde7fbfc0ee854d7ec02950e76abd23ffb27a6ddf1772465016c79b98a61bd3940547b207b6507e32cb9761a5604f0f546834a8edac7ae06910045de218d761a4accea886188f947b57bd876491709028e2e24b075d6b022b51af1880ca16a8c65b7c69e51b2ad580ee058acc0606f0a3a9ea1cd4342bf4be602e941dc4bef1239bb9bccbc8098a6a17d63186c6fa75ec44b6e4fd38a3fe49c5eb995f0cb884e2f3ed6be02515fa605b98453ad935682c3bac6a2971bb68f4094cefeeaceda92dec803ccd3d346f8b40b48f8f489e118a17367801e85c79e9b3bb5d73ac44a8290cdbf83a154f2f125090d42e1a1cb72f5ebbd42da46c7a4d4b9fad9612a4c800de6467ceb74f831e1395dfbf5799a3429ba34754add4b34b5960a5fee8f752dae78450322a1ab3d7102b77e907fc1eec5355991e0c7d6c0866660e5436248edeb1a37c0e769a0764cfbb6354332d6e55103b9235c84eedaff918af3f0213c435c32ab409a4b5c7eed8ab6ca9e313dba459bcfa3ee92e7d669be0526856ac3c06a57fbecbba553a9cb4655a901d98af02b74098e478076655d325bd7639d73d7ae00c62fdc361a997ea4ff5b0eba33096b12f35cc7cc0eea62950b912b47c11b9fb386a47c4c15c0602d304b2541da889cff299a1fd415e7e25c70ee4cd83feea7e6a9c50c75d9b128458513d61ec5d0299ef8c090472fe0850f384938ed44d36f10cc2c1d31daee3f946a2fa18f9982a988fd6ac973b1569313ce3c8ff5746c4dd85a241f1e9dca0e904c091832ca028533a3e34c184edcc510bf22a27f530bdca3d057928a96f72dafc73a9aa6dbf2552598e468735cc5736c67a620e9455483e9cb2108045ad80569582ea93a53b491e528c8df336fb326ad74317bc1dfb8ec30a73af01a5dff3e437b7fe48ba5dbb3e8f01ae0c6fc28675a415f23a796bb6e0ef0efeb4b14cf20d4ad88ad1966da43a76b454dac8687bdd97b89b8f8eede91eb34ca4a0523ea65736ae39341fb32b9b716f25662a37382c16f3b9c346c84f03bef54acd6efb364c6401b07b3f7679e8e7f8c9b77b75e6e98b90f4df88460f1978d19744eecccb743a999aaedd00b5a94018e9d5a56bac9d5d55f6e93bad52e84aa7340cbbf98d56213d9dd3e1970867e3972dc98e61b3cff40b64ec49463ff79a41c82dbbcaa37a82b761f432849aa83a3d3c9a209e2207b87ae9ed9959ffced165fcb0d8873668c3cd8f18ba0f92f7acd2bf50416c22ce11692bf6132eb9f558dc789cf9776da94e48cf48607f19d9a11d5df4db11dbaa67a1d20e9f0c96f5956ee3f906e371c489efc88b0c1e56d881e7bf8dd5d6742622eb873e253dbe54f2e2e6d0e6136941de8c23e9a632727bb5f88c23170316c7aa0df28d8d07589dd6022828834f7ea9b4e5876a1704944aa3186dbf89e0e81767cfba03bfb38c55a9945209c4dfd88272c49d1745dce5ceb40f0a6713b5139dc2fb87a8a4888406d2610b7b910a9e5782ef0df719028d8e50a40a269dc9bee12157038522d06537bb31fc87d21af9ad4b2e7e127bbdb313e0a116010f65126cedadd4a122d15a71cbcccc346f55100e354b997154567fe3caccd50251d137c58fc3a2048dd5883b6af9248b51040c01a80c051b8a151a8878edf0304b5554746d6116b749221a1d0082ac925e6e140f0c3b6a180742ac8a50ce0e93e6399102f151d7c14000369ff52d0b537fdd51bec99e7271b1255c6fbc36d83408c417f6825a8e2a58b9054ab2c3ead69d97ea9947fec32d720653c123ecf51a9a3f0ed88743e3fb7b94aea59d0bf0219ee50825ef220554312cb907edb90e4d85f29e316ad57d3b90d859391fcfc63e6c0fd3ec27d4e1efd6e0b5ca8165cbd6af25ed8792d805f27fce308ca1d51335ed5d727558dafe05486a6f9149b8d3bc022026656714222830be582889e6800c0b170e48ebfd069e711210e4ac7acf07652a6f5051507de68aeffc9540cab5cdac84ceee46059ec23820c04b127266c0bf8df0d2b856be3377ab42592f495980baeddbeed3ba707a85dba64fe36941eefa8fd37204ec8c18df3852febd2b142b1c9a5cd0f9e424cd408ceb7788270899fd793db99ddb8f9ca8df550c513790d8bad37a1d1f4a62c4527bb64c677462c9b093582decea70c7bbe873095536728e7ce05d5cafb5d166a1f03055e918f787fb244c5857e3d7a1009bd37f30f165564a082c1510ed19bb1633811a76da70dac67641c2478c6b335f409ef54a2d0f370c9510d0aabae3cb998bd023778375cbf9cf5ef125afd584c11efbf40bb51839aacd3016e5e4d79f134245f952dbad617c78cb6f5712bd9c0c7e1303db5029640cf9b56e29329c3e6a9e0a2371aac1a437b9b1c4477ec9842aa80eaa22c5eac11b60c661de6ddbb088e844293ab8589c13d938765bbaa44301e4137148dd0257bd4c8c766c5d3bfe53671e9417cd1b52f622870ffd90f4e17b7a4ae1b5601a2edb032e353bca652fb565beea6fb0b2cdcadac71794c662677fb1dc81d116d94f5eced526b37c004b95284cb6aa2ac415754a1f14882595dcf4d3f1d905c6e8c12cf5a9d23d3ab55bdaf9f17d2f03f933e1bab89040753648c426b072b73aee8c2fc0d1c03fce2c656e20d4c96803fb2ef471b912267eecb4d6f342d3513894b94d77767823fe0c7438e51f21bcf16f0e98b94b23a10760271281cf843989824f7061bf834f93fd8d2090f70e939700dcb4d8964a19da39a9601a7e0ed9f55f567fc7d5682d55a9ba0e68861756bb549f2f17c10ff6bd2042a80477f89743d3d762f1dfaf230bb502eab6f4c46b26135ff3bef5faa179bdfbd288e3cadd3d88d8012706e19b7fcc6e9cc2699d3ba0e624e715599480d6b7dbc6eeea0d12a9236444b17285fc7794040dd40c2b2ef175f7f3641664fc9bb7ea6d7eb3489d504f8013d64a23aebcb5ce233405f5ade067dffff253f27e926431ad806703e8fab23656e0b7431916d8d4c72a7d831e3664e5f30839c76c8167b76f3b2dc75a6ef48df515e06ea54ca51de2fd9c5eeabb1610b7eef06a2f3167859cf82e1a5b76be8ed8beee2bba28c3b15af6890d7a37226834ec9f63306a0da11aff918753d8b83fe7220803c070db98195d6d18357233f5504a6e3bd6f30115d3987f93aa5d89aa0b8b577d1fed94da057a6f088233efc0f44f86798896eae9ad0b20c8c9cdd9d72a3f02213f6797800894b864cb44fed009440fa5b0197023929f9bad16f052cc2d87327788a68b9209f46fb4776b092d75713048b5453ccd699d19cafa8e9a93fdab0f0863711916efe3bd81ee71b8e0221e12e9ffe2f6ee1a4dc1a8de6e593480f3c05b3691e916a4a7ca51971eb2f0f693dd10f6b8468f8cf7bcce285938b5a0a76ef86acfa2990f88bdafdc39a065db17b845028ed2b7a9e331c44217de20440e406868f1eca818d0be20248c2948b8f4cb118b2e456e585949139270f57c54715f3297bf714aa7c5f72ed8ddf6a074703ffbf95e45bc81a02c42822c22d2b718f2de5e03d687a4b18d605ef5ae75f9d43c8cb4e77aaa0c0101d978120f29574b22f52783c667f7daab3e1f9cfacf2e68e94a24918e3fe2c4f061deeb64891b5217fe5908e7f389897751839982b7fb736fbfb1232684e93123611b7fc8fbeb74f8815b5ae13240051920f3b6ed34483ff673c467ed7f0a8fbf619796e485affbed0697415d2d0598ba34d5b9e44ffd12a5edc323883a2e28efe9baf860324f2d2016748503eac1888213926b0e0f0335a4b51820a2bd3b42d982ec6ce307b453b6385aed7a735a1e98479394147c40f01c532926e10e1b26a5b395bc150ec4b4daf5b1436bd0baa225583ffc9d9e9d8a354f60fded37b41c7c051daea04e689ab2d4e24d7d07c75c50ccfd6a527e024d1632246c6f40f06b86ffec0b29cf894b665d53d459226b93422d37a8da23587fe884dc3c0f2fb55dea296a9a5b9a0d101f186d9fa6288c912202547cdf958569d2cbf235740eed38d10b0025dbb6de31058e98780d22149c19d4bcaf06dd7353fd91cd1f47e47f45622e1472542be2f63f463d253617eafd4f2ad609f9020884905dd5c22fba53ccc619104b6c0203a7f6c8c26fc80ff6fceb8c0c51600c2e46b4b872e6d597511524545a76cb42278b519d911e6c1320e01682c551e204ccdf91290c52e0836167a5685cbb1af338eb794c10fac92950f3f7956acf28f1ca984e380bcff9876b0c71dc7ce4011d1d0f955da9ca885c6e7bb74c6194dadb0fb9146dd725c8a9574aaf3824b727c9be3fce59c35850b162c17d3013689fca858a0a51d81cf4f30d6a8705bbfe35ff03c34cc7c56aca32140d72c8e8121fc71353596b777b266d75b322c9a97fd2c5d4e2362f19c99de66da7bd9c495c03d9a15b28431a0c051e786fa80f5503a72519e6b419263d72d553d688349c0cf30918eba0622b953a0efce4415c29515c26ba15f00e548ef108afe3f8194aeb965e5e4be94f10df6c45ea5c133a8c3398d09fb80f950b83c1866a1637d2bcc195e05cc32a9233b244cc2b1d4930e66f032cb1163c37b3e58b576ab76de759569797fa9b8bb4fad66aaaa56f09c7a0ce4641d6799d7bb47cf684990ec1e08871458c211a353ccf1285e7429c7b8520180918f7
-
-[L = 20]
-
-Len = 16
-Msg = 8a61
-
-Len = 104
-Msg = 37487aa02b03bdbc6bc62e7e26
-
-Len = 352
-Msg = 6ecd002568bae3bf1873993041bfa292eb94e9ad092d8eb3585be82e8a20cb36a47a06e7a57d301268a4a533
-
-Len = 504
-Msg = f6dc1d2f6b8e126d99939664693d8709513f97d730074ec2794e536d94ede79c81f2b2ecbff3c2c26ca2d181ada2c60050997f3bb087ce48d956c18dedb227
-
-Len = 13976
-Msg = 07a6372c863c7d7c6764e4f05addbbe161762735dfd2d23bf268e2d603cd28de9c369ac379390473e1d3fa7e37af1178cca54fa0f782dfbe68070952b93462ea46c640d43ffe71f5fba42df98f4c48ada0d8aca8753e0731508bc15dff283178ae5c10a6ff132eca5dde63a78d3ac94685152897828eb25a55fdf140fd33fd4e7b03f283e201a1baae8986d25603fb0b2566aab345fb48031d648144dddc2e3556c0ceb1104f348d96ae7dc0152e45c625d21b46e70c31f250c858aec4ab2cf5e79d8c79b0854e0abf5330b9f044113d306161968f4ad6f0973160c9dc296056d5a11523ea2b56fbce8387070fccc639ec1c65ec663b9dc49aa880dc4ddd3020c9d44ff7e8cab6266e436af19b4ecb82010a0f8f9469ef380034a02e3f50051a6a3f233dcfe9d553459dc1bebc538ae0183448c9405c351271dea808d908480e61e9793cca111b4cfb9874b799626a1bd9a0f6e0929ad51b97ad81b2438f5fc255db3a3dfec9f0d8393c6b245b03d3faeb58021db3ad391b17a91174a66db4feef1b4c889699bcbea7928f4d29be2d47f76455c8cb1dc7da9cda41962a28ad8cd7b39965b809e7c7eca1c6792c1ce1c8a4cad6290170e91fcc49fa5ff64ab433b4aa081c8da2d9bbb072f9f18ca455469b946c877e3006b34ffd2219335b30ba2e0980f43cebfb629d0b11fe70dff28883ca012c6ae4855fcefea20a08e189eaeed7eb36ed6db3835976f4e60053205805727c5eec15d0e9f155637a9e66268b9c1c302bcaae6ae88cbb8cf1668a487cc996c4662c4a4e195f094cb31c717165e0e13718f8388957dfe0bf69c70cd0bd763dc38c530b67b9c12244fcab8bd13f602de848a2937699f9ef77944e5f22e3b470601789e1838fbea9359c733aaee2c7082b02ee459b7684ef9bbc200da4b62d368351f5520a65ffa506dc9b097117bb7ae88d04d85fb525e91327689ec0fe86971480c0e864012b1e9f044c7d80a4e48c07320dd4292086e4c71d4c98dd826a9bfced112bfa2beb1ce85cad204451ec45703931bf637d4fe89fe8f485620b7f4b21e011a232ade7a8c92be77925e878ae0bea9723749528fe83cf89ecb9616dae6ca0e8d5754ec6c92abb21108c2f33cdc18c6887c430b72c5b193356494cddccc577bd4c2cd53188f352846edff0c2ac7869cb74bb16a77c0f0f194a7a9477ae15abb890bd0bcfeb0c39381a87f1d05319c7e971c10e9ef687f96450b400e25b4285032892b849fd5db8649cedfb03c88defea063ee144a1ab1f3bf05f59c7db364dc39c11a446c3ce16307d78d50315ba29f5bb9a57438564c8c7b3e367cd37d74b2375a4966f47489dc5448f4979428abd32193d3840aa983d3020a9f29d760fc7493ab2576c90b1934b799c1d0d55e4f2caa78f4ce61930c79dc017c2dea0c5085d73a3b0e4a6f341e9a5061a6658af11e5edf95bdad915ac3619969e39bee15788a8de667f92f4efc84f35082d52d562aa74e12cc7f22d3425b58f5056d74afcf162cd44e65b9ee510ff91af094c3d2d42c3b088536d62a98f1c689edcf3ea3fc228d711c109d76ae83d82d6a34dcfbad563cf3726519b519fd48b51741aa86720836494b7a589c778927047a25d73508adaa401e9a6c0767a675e31c5556cbe35fadc9671359b45e985c3c8af84113989b299ae4474b85e4b5d4b0578ab1e8a2915a8df97c4f52a639fe32272cb91bbfb721505dec46d51383cb8973425a714245c2e37d0577fbe0d66381d9239db1f08a380cf609dc699698e0fada2caeda44d58d766c4f8214b10642b80b8d7d8add7cc41d47108ab7d07dab71069a2d982cc900b331caec317942122158bac6eac9175c2dcba0c04443aa9188832b553f5ca8c336880824d6bc02486a2b4c086665d276aafe3b1b93729829adca50c44466fd5b5cb977aa78fbcf5c0f0da1b09216468a11493ffb39efdeda5d669ae92bee2f2fb250aa1b9cbb11c36c7a6c6dd26cdc3cfd572ffd8c1dd72a13c27a327a34c6b6b3d80fc6c67c72152eec0c8ecbdc1bd5cb829b811e7f29af6d786f4e93dd4c96fdda295a6aa258d7b2fcf291c2d68e0b1866032475964ec0c6f2fa8c2d6a3936ecb187350def4e818507bf157c0e9b33406be7660605af14cccc9c799b4e051d0d0899e53495bb8931a6e2984bc6dbe4e02ec8b4642fc2f1cb5fd5a5520b48cfcb49e1f9533838753554dd98b6a1b8a67409279df477330e5f37367e06247ca5c3ffefd00e693dcc0c9c30754121c9ee88a574915b9e77c104fd2f921c2c096573951407ba9b440423d76bdc6fc978237a6e302cede7f99038ec31500884775556941f1edc30e3a417b0e02cb6fb5bfbe5cdfacf4006411287bedc565fb06f1be987416407dc852254934df4ab59edce476f3506e65be6ce6ddf91038642291fb8e92ba5b1f0b105670905a2c14796110bac6f52455b430a47b8eff61
-
-Len = 48824
-Msg = cd8490c93613bdf1f284b94b330f6d6f45a39c651d2a160b340e2eb696fc6d1c35e88872845190d141c669de92a97daa5433b1d7b0b899fdef2ce74b8fe72a7296a5b5be26d1dc86520367c730c7400c2fa06f91ab4c48a7bf4ae35a5b9acd5296c4fdf7451b0ad9cc439b4e34f11e5d7ef2bdda376f8dd34d6f092b219dc085dd4c4a6308b8808f588eedbbc7af7f64e83182fc7ca7cf4741a341060a7969d31445834c982fa8739ded4555108acbea1666a83da17f77cc42ee73323eb53203e3b790f81c08e94c44678b6538096ab7b09916e6cf7ceb2af85987f8e4d982dff1ab59b0bdccaae1f405a73366b5c5935dd0b43e2d2894290ceb66a0246dc02de728c5bba30255fb56ce8107c3144246c5156a8fe40ada9126adf67227fa56b66c37be63f532516211ca012977b04a97916f201f1baa2629eda520b51508ab4229df2ceedce406dece0110e0a911464f69e7be38fb91deba0addcdb3161d2799c628f5a57fa1dc37357c947681bd9c36f4832c20ac466c0c245de3b250c33282ea1a02d007f03b34ed427631283eb614db4d521f555136e7e42b4cfbee8134c63dbe3bb79b5a8b9f9f5b9f5ac61cfab1c54d197f1e3ba613f251eed616df952d691b88a16466343ef2d0f63882ddd2d55b8a6786308b2257f5d7b38af166bd7f1339d2d8899c9eda8fa86215850ba547450c267eb3c9147d96c38161a69d1584e521ffa23384313a1debcd37f72ddad02adb3cadce7ee34b7c1f42a15d0d030487daf9488aa7562845a11ee7ffccdb38b300935caa31f78a4ff3dd93403cf0c6a16ca611b58c736aafd33d6dc56f0f47878211d26f6ab801b9453a7f74b44593dae0f047ddbbf2c902891111729edec44f69a05944b18e7a601f41ad24fd6833da3dbe3029bd390de7c9841b2ee2b079b2bd2737518fe1bbec88da64769dc36e4a8bf716c219b2fe059d7dd220c1ed2c59878db5bf8b198e0689edee921ebc0cd2d3853fcf57c363050ce58071c5fda6ebcfbc1bb62e9eb956286291a108bdd4191c4ff47900d6068e1ea26b487649af119b9bb15dfed804836f2196cbe12d8fc86e3d7ce89b52ad49dc9ddbce5b370f73f512bedd853039366612453733740586d1372143b09f21dd4dbe1a2bfc308db8e4098c5e4b0c1e16141ee50e85fafefc4e2529b3c7252af37aee6f86e19df28871686107d7d57dcc812bc077602642d2ecefdd5f694b8f336913210793e4068da2178600b1f41cffb5221c9b4b6298afb47e85701d7b1a44241679d8996f916c81ff437261cfc358b9ec42a2ce16ca3bacb8690d6c1d91cfb3e0bf1e7ba45bd01606df856fd03c7e946f7ab371a89e1fde86d05fdd97bd7b1c583b04c2ed2b5f6815a460645e4e1b4e950bf6bd81dd0352d1048df85266f1696534aff5b1cbc17f15d82cc8e0c0d4f0453f9439094f8e0f7f4bc045b654d9a2f1f44a9c57019f63ecc41021c05b5380675cb56ea8bb691d79ee204d2c4edacde3c1fb3f4996a11d84b035f965e74009e2ab80e2c7ea3c84a834d4971a1e9cf423e4ea67ee526eb3c3e4c2d7372c4290a0741e1fcca5ae4cf36705abe98ac81e98a5419baefcaf3093a7e0449ef1021f88ffb7ad21b2677e41cdda12025b06542c4b2564f15e0b99db43b7c7020028bd829372122cd910227cb07c53cb58fd9dc620c0491f3e2bf883fe6ee8cb1f5b73767977d857e4513e8b5612f6ae4b56014e6a3ad2a065b65472212e2f611743484cfaef860999d1dc5608c58412fab888ad72bb87dd9b55b692f31e252daf8944ec5c02a5a9c23903c50dbd845f2fcc3bc9806af13ca7b025cabe675195b1d56f3fe7d7bca12530bcc0af217efcb03a218bdb6f9726536ea902c8303b02e3ced22be59753588b5f0e2f3419fa5345a942dbcdf3010465384a225ba26cdd0f1d74999c69f336bb6d01fae5cf81cbb8c1a7a29c1eb83ca6b51113bde56b8cfb6a5d72557622a37f039d090a689accd02b57c691174338de8e05bb3620c079705c969c58e56b079dc9eb44eb0fcebe548f5a31f4072a5ed56a2f03107bf40a359b2601eddf53cade66f294cfeaa40a0d94b9c90d15f61852f295d3911f8ea914d015885c8c64540a83badf0021a416c3e37b78236a2ecd1fce4114033416bdd3a36c18ec13250ee9c74c0fc4dd564b3d24a825802d5ae402a53bacace115ae3bbb329be79d1e5e42dbaf0a6446431145fe49b86a8703c7c41f8985d54f12e314c16ff89351d8addf66ebba2783f2d1a11965182aa0b0dd2de53586c5a695c6265c2b173958da648611090557bdebf11a1e042f089fe98e049f4796c60d26be38356fe020d9ace9008410d53a1bb7db78b52ee44bac364213f5c59f1eac4e3314f3423b92fdd7a6156608111ac6ddf58385ec1f3df12061208db98816ac948d803fad10d5ece2018c60faa13de5e5a9033745c824932e53f4122a39f635813545c1b74732cd55642f19ed6deca1585ebf7242c849bde981572a2199066e9c912b2068c8f1c8b936c43ae95c6e22bd7b80dfea05f495d751107da5928e806d0af905c87b5a0795df146af6580d8f9c6a0e2645686d43822ce9b4be0bd5937c097917e048b5af71c7e7521d490f107e9231ee5bd9fbf0727ba87774ed24cd52f471ffb71849ebd55605996515bdcfe95bb1df3541e7c42da4166dd01ec3597634aa6455d15fe14af435e8d7a55ff1682d55a2da867ae63d11fb3fd987fa5d7032ecefc35d3fb9570940e779e13da18070e6df5292f97f2a281f9598101102c955fe4808a2319c85fdef3d55b19e05bb8c2d3da64bafb67a53491513a24f6f0804aa162c8a7db25b38089373fecc45a0eaef65dd9be3b4b7f9436a5423fdcdb5a9b60138fc6a2261225390d9ae0d8ab7f0f7ffff69dca06881d33a637d634358abebb333df41151f239add91abaafc89070cb2159ce3a31655c22e4696c9fa7a7211d1251d4bb21ea4a321a3dbebc29d97f526251e40e548dcd7ed07587719a266f006179dcd22e50b3705152817057b097b043ad63b8d867edc20aea9b4c959ef4ff70f47128cfcc21e31f17978ecacc366f459ac1cc459a3976e4173ca322675f84f18036119ec2f204c3fb554a0b72f7e9d8c882ab147b3d280ca9dff7b9160b1b437b901f03cbc05fe05c6f44824b48aa8da52ae7dda1653fd500f9ccd221843cf76513b3b74d094f14d93a00d7cb954bc4cf2f04f9a35e38edcb1e84f62057647dcb3571f1dd296ca1e049f1746a8a282e85138500e7649db756b2d2ad88f11c471c89dc6be2cd43481013b8d0ae83da2b855cea7be424f8b2325b1850d1fdef03e765458df4513d57c72ba9751e1edc3c4e7f97e3202bb46eec7be89871ba3704aa6c6fc08851e551a3f655fa1fb798d12f003faf31c56b6df399a5dd0ed29ef9e4139dbc254bc5d6051840a859eabaaad56324588fae881fd638d2b70fb3813402df61d941ab495588e5fc3823249bf9a03cf877902394f512de118edaf98843a5445e9073fcfa409df3db0221f1c77e2dd21e74f9e10c9e180dc4ed17010eb949c6d67a22bd5337b2c68f9eccdec778ece728e91353696b742c8f5a3a569f054efb8c1ed478ee9b75e26c768a5816aa6bd08a4c72e745fdb5deb34ecb86b3a84346c1c70f9c16fc45bc0421f0da2f630912d5079f390cc53b78e343310de722b53d2a3b4aa386caa0d7e91986e19c3363426ba30eb5284293af81d00158a3f5233327b40c3b989725ba7dd5b31ac7abf8d3e0b737e843065cd7316dc2f374a00bed4cf9caa0d6e232c854df1bc24c3d484bc6bcb14ec770d5745474dc6ac3b3ddbffc551c9fcc2c56a5e0ae17948457c01e701bf1554022bc2b7d9dd42b2b91172fd85e6874d2d61fc7b3bb3cee2a9bfec09f6d7e98279c6f511f4140b116c856c1438e34bca59fdca2409f025b896a52d68719bf93e82e7d89bbf798991fda0af8d06d17f39eba4bca09c1fe594b537ad4c9b94ab52c895539d639425f9146b24b016368a638e5bba391bc8763cae7c52ff9c496884f1d84e5e08ed451358ecb3c4919dd410e82cac35ae744078287c05c89b42999ea6b8b127d40d53a5722d45139e8bc507a11e7add7fa9ab12cc40afeec008a4668e3e6440f27bb5780936c0e3668ac51262390c79b3f21fd041cf36ba3522f3a552714ff188bfd554c60d0e7d11213cf7d3864a5175d4047c2f3284741f18ec22995a5b82bf62190151bc1529c6d9927f9b0c1dacebd9c2dc406f7f64a973f9a70cff6e3abeebeb46514bbf2ead382f7262d46bd43d88c1b91a9011d1f8ba81fa536a7162aee2b2ec6fc0f2d6efc87b98d2e41e0f946969da659c21053775ece415a34d42b6cfd5bc52259867b411dfb991461ca618052309ca9c96468c2da12dfab0e822ff3bbe7ba281982a239ac19c47024fe1f0e3550cf0975add1f680a9dac9b2c4ab0aed4f409ddda6765eb8a0a9d1e9d07458c69ac8195541219b18efcd06c0001f2ae7fee2d404666a18ca3cb3aa4f0623e86c5b1229f6c2ca28d951111294b91edc52730b6b2c46e000672a7c89b2f38045bd3e37dbb8a75e18687a514dcf740c87a34834d3c3cc8aadf6166ec0c42d2be92f90a3af49633ff23cd80848ceb57ac550eaf9ae496bdc6a2d7cf50fe107895b4a1ed014f78af24eccd6a07420f1dc0df1e7c44b4ba937dd43cab9c798371b148325578d61931766af02b45054bdc2d9fcab2f4b49092f6fff7c27886820739d6140a4a905f0020249e8ae8dd87da1a1e7b1851eb01045aaa72dc8a2bf68055e7aed41d85336648a3405195d2ab61b0e29a770461f32fd05e14c17d72c5252f026a7b9abe7ea9176d3c46f6ed9fb716758d97b41e4f5d81a24538f763d83eecafafc668422612b40cfc32b3354b24755fbe400a2bfed494fe6d0ba0051713b776e67e2f1915e94708e6dc74b398f2f526933aad8fe7dc32faf40022606aebb6e0756b994c3176fae7640ee06d6c67bd54764c4752f1bf831f43e0227cba101174c5554ce26400f333dd8e9f6db1cdf670ce407d7d06c3aef4c0724b62edc8f1ba3e04f0e394d15a73b9255abb4d6ac70303dcf9160d32dc02d4804219ed5c7e3b48402e58ab2f58305f9bb95d2a8759947de96328ed5234cfe7d0b2a9a014df7e4cd0ae48906315f139b8635d2e6bd4aba32e62b8906cdfe5622c411bf0373d0cb07d17bb2bb5b83eae4401c243605fd1df759fd0ddc704ccab5a9776c40fbf6bde0f11b9646c699f26063a9550ac228c9884c277bcadcc0a2c225dc203e28e253c4e464b23d2529d09c7b7dd3c984667372472b615645f294c4e3b0797f9d1c234015b78502d98bfc04f1fa2f16cf3e7221d5794d035e4b172a4d84e679cb1c82df2fb49d3c6668eb1661bed56705096c2371a19d668832808eedd9e5b1256c18fe7ccc494e5e29145d453c553ec86fb7f3a634d0d45661875f2f1005ba5e734c1a976f37cd23450e4606e32d027bc9ec2edd9395e14b2082179bd7b4f9b8caa2d00a2de71d48553f7d4153cb56a1b08f11925e4b11c9281744ae9171f3d6faa3ab3f88c5c34fd23e4f6efeceafdcbc07686ef56efa62c0ad62f1cdcb4d3b5bc508c1f05263bc347158fa5495828f34eb7fcde98fefaa82bafeefed3f4a58968d751c051b52e0047f066de5be533bc3b1e439ab1c8602f6c67503803c8fa113737cb8279f358dbacdf45432b7a654d0e1122cca93420e956661d7275181c75b0d9c20e84c7007dfc49f27bc00007cf4ffa631c892981fd70141d532fcd51de5c23fe0b7a186d0dc296362f235d61698740cc315891cc9342da17843bcde274c17e462263d0e8b4832dd9075a7bbb443d4b26b41e534ad5551ed5ada102175e695363fb48d6b99ac978a3aa6f405d87f983384ce35740e930491d75675337c5dc081e3d301228e61bde5cc169968e5b4350cca2b085f9f75cc4b88497a78cd0a0073d90246c7dc102c7cbf3516498e8a41aa85d8cc5bc285ff66e8338e85ca83fb6889e2bccff52059bb9e92e92c155a349952680ffd0a3c346061a53fdf074417fc90c4d1af7c2acc3ee4b080752cbc9455ba5931b7e910f1e4af0efce905d2cc9c685923ead387fa532c0e8ad92719c76c281cd010e1acce500ae1443838b8afb48af032069dd07aa4df0d56bcb70a64592633699c8658102f1fbca441325e27f1732a7a973d8cb3a0684d72943ef6f1892f2d7ccf39bb6dfe5801ab98653bdbcfbb787bf125253be2624f6cf44177d588bd7b780d9e3f4e3a4e50b8a253fa21abce6a94b9073289c76773b46140f5a6e46b9de9ec066c176f5d1a69f380e1901216617363362d13ebb26ad74fb008ec08841550ff14ca800a1ecf2e007ebaad9f4e0d9664448d60ac0d8544243129fb81c1723b9b4bc2ee971dff736d9fcde0afbfbf5c50a4cc06a4c363998326c17bdc9e2508651dedd9a2a52bd87f8693cfcff60753acf9716c526e8635f12377e36564ae55d0fdb3c7997ec4dbdaa5b4d18c7b660acd95060831795da7d299a5a8d8cf9e92537dbd3ef7f56aebe38fa97c41da6bf0572a0270be7e5a7dcc0be3529339464c811052b65a938e874ea6da469c7d8992ce0aff1c75e82d1621ecb967213c65f2de582cb41de3804c507ddfc708ef3f6096ba4491e431160f98de806d0f334e03cfb7a3bece601099bd971253f3aa0df845da8b478603d5d88533d0cab9c89f2dd9a1404cf8939ffdda652a94093865a85fce2bc3d7babcff7b9f3306bd76b9af80c78ad518f89ee73b7a710da604e72f4927be8d65d06be2e0732fa786a83e27597cfbed9bf98df445499e0746b9f2cb9659ac0a9cef433148521f33b1d78d13c8441c0d1e20fd93ac450a3787a2292bcbd68cd1f961d34937be9a21abaf26f361bf53aa0c095e53c51f3e04d567eabe6e40d96a17c2bcc9230b18f7e079bc549a314b4ae21d30a3341aa205bc75c7f1d21b0a49549c300faeda243d0ce18da5e66c5b663cd705005dd9fea0a9564174abb797d64c58fdab1fae44576d514b75eaa31c9278b15bf9b6df7c6c2873d7a56fb91ab77b83761a09f9e1ddae535622fb87f7462256a60dd39dd3ceb6690b0272920b635ea639daf24f95462c523e5bbd8d8407c61163ab38877d5edfa04c2a78d4d240523ba97c7d01c71783f8748e85164b4dd08c25506a4ed18300b42b7bc6e417f512ae456ceec2ffc83190991a06d4a58ede215babcd3688e1d61f1975016244e80c88ae2aec05c7eeb1c50caca72b3b415b6b870bf5e10bd1ac3ba6b4acb1d1afac554444d94c97e171005fa4ea9c651bb4e527ff58d0c2f90fb453a92d6546a26e9e98395b09e8471bdcf2a145aacb649708cf048a7856ce8cf390c107ff2c66efbf2a76c5b041860ea576103cd8c6b25e50eca9ff6a2fa88083fe9ac0d1fb639c516b9bcdf23c34c6145a705498ff9b9747f15e1c08c63da6efeda4eca02c3f00dfec06c82220c9de840040118dde76be788daf84e6a2f44c81fe6defcc474f99c51c4648d297cbc48f081e0809dbda505d020cbe865e430e0491644ec8c52bd3ab8ce8c4862990f49fe2588caf804ce9500ef42d5a50c057c257168e283e4a4aedbe4ccfaf3eeffb212f9e23d15434d60bf4f455f512e2b655aff3225d1b217c261110cec0400f54dd303d6231d028c2eb649bccc91d30a6391c88bff9d447c3cf35a3467be5957e0ea4d4dc237c9f2c68ce48f658f820a3d72d559b60f233ce538c92cb148808e34fedf2d648c21e7f2ea29a77270c393bda42d869351d6c085d965dc12cbfd0311b8bf604f4391d378781eea3b5f1e0da9d0d8f8de88e56fe47d362cd46f591d3ec0f7cccb85a21f21ddcd4107821ce0ca9ddf99dfdfd9b0c9cd45053e5b1b4385bd8f5b227ada31b5c23e9420014474e8b4494fde7c38edfe70994d97b8cbdfac588df49a49c472fcce78cccc051f31cbbc1e0422878d8d490f3aee28adf1587c38fb7e7d1be54abeaa83cf54b633803a5e669ff4295df8735231ce39631616bd05e0e31117c722c2fd6787003b0bc7fe422a089c89329544e085d71102c1813769450a9f66f160d1702cdb17bd2c6fdf0f722762d193ce83623eeffab17b01b10a31db6e2feb6eb3abdbb2e36320e1a56e44e48d26090afa7f65003a98cbfef590ac3ec89b3eb230557cf6aa566e841806aa2767b21bb26fe001f11ae039e0c9a4bf1bf3d271960f16158eb5bd9ebf0080abd8369d512cab2d1aaae2b14d0ff6ee705a38fb0c801a98b0624cc138fc24834fdf430f33e1760db913da3290f34415c9e3df3e97da1780545ab68ac5a24db89f24d62f4a399728e4144a8c89f47ac2d29e30c49b0bcf790a5e3d3fcd1943c6a28f37251d9dd827a69579e6c17b629c927473b5a07b0a29d9562708d6c8ce576109ad1a3473ffb2047eb069beeec24c114bef392c929038c92abd0e6a19b610e27881361824d57008b7373d0ab76379570ded76c9b8284fe2c247791073c29b2fc6fca05019220ab92856892d3c0dcc6da0b597fe559c162d060d71513ebca050d9638164b9ae271fba5575ade787ec5aee8fc253d1b234b1df561db3e36ac64b9b0100dd6b407043537b2b141f
diff --git a/src/lib/libssl/test/igetest.c b/src/lib/libssl/test/igetest.c
new file mode 100644
index 0000000000..95452d0965
--- /dev/null
+++ b/src/lib/libssl/test/igetest.c
@@ -0,0 +1,503 @@
+/* test/igetest.c -*- mode:C; c-file-style: "eay" -*- */
+/* ====================================================================
+ * Copyright (c) 2006 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
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ */
+
+#include <openssl/aes.h>
+#include <openssl/rand.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+#define TEST_SIZE       128
+#define BIG_TEST_SIZE 10240
+
+static void hexdump(FILE *f,const char *title,const unsigned char *s,int l)
+    {
+    int n=0;
+
+    fprintf(f,"%s",title);
+    for( ; n < l ; ++n)
+                {
+                if((n%16) == 0)
+                        fprintf(f,"\n%04x",n);
+                fprintf(f," %02x",s[n]);
+                }
+    fprintf(f,"\n");
+    }
+
+#define MAX_VECTOR_SIZE 64
+
+struct ige_test
+        {
+        const unsigned char key[16];
+        const unsigned char iv[32];
+        const unsigned char in[MAX_VECTOR_SIZE];
+        const unsigned char out[MAX_VECTOR_SIZE];
+        const size_t length;
+        const int encrypt;
+        };
+
+static struct ige_test const ige_test_vectors[] = {
+{ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, /* key */
+  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, /* iv */
+  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* in */
+  { 0x1a, 0x85, 0x19, 0xa6, 0x55, 0x7b, 0xe6, 0x52,
+    0xe9, 0xda, 0x8e, 0x43, 0xda, 0x4e, 0xf4, 0x45,
+    0x3c, 0xf4, 0x56, 0xb4, 0xca, 0x48, 0x8a, 0xa3,
+    0x83, 0xc7, 0x9c, 0x98, 0xb3, 0x47, 0x97, 0xcb }, /* out */
+  32, AES_ENCRYPT }, /* test vector 0 */
+
+{ { 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20,
+    0x61, 0x6e, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65 }, /* key */
+  { 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
+    0x6e, 0x20, 0x6f, 0x66, 0x20, 0x49, 0x47, 0x45,
+    0x20, 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x66, 0x6f,
+    0x72, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x53, 0x53 }, /* iv */
+  { 0x4c, 0x2e, 0x20, 0x4c, 0x65, 0x74, 0x27, 0x73,
+    0x20, 0x68, 0x6f, 0x70, 0x65, 0x20, 0x42, 0x65,
+    0x6e, 0x20, 0x67, 0x6f, 0x74, 0x20, 0x69, 0x74,
+    0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x21, 0x0a }, /* in */
+  { 0x99, 0x70, 0x64, 0x87, 0xa1, 0xcd, 0xe6, 0x13,
+    0xbc, 0x6d, 0xe0, 0xb6, 0xf2, 0x4b, 0x1c, 0x7a,
+    0xa4, 0x48, 0xc8, 0xb9, 0xc3, 0x40, 0x3e, 0x34,
+    0x67, 0xa8, 0xca, 0xd8, 0x93, 0x40, 0xf5, 0x3b }, /* out */
+  32, AES_DECRYPT }, /* test vector 1 */
+};
+
+struct bi_ige_test
+        {
+        const unsigned char key1[32];
+        const unsigned char key2[32];
+        const unsigned char iv[64];
+        const unsigned char in[MAX_VECTOR_SIZE];
+        const unsigned char out[MAX_VECTOR_SIZE];
+        const size_t keysize;
+        const size_t length;
+        const int encrypt;
+        };
+
+static struct bi_ige_test const bi_ige_test_vectors[] = {
+{ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, /* key1 */
+  { 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, /* key2 */
+  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+    0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+    0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f }, /* iv */
+  { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, /* in */
+  { 0x14, 0x40, 0x6f, 0xae, 0xa2, 0x79, 0xf2, 0x56,
+        0x1f, 0x86, 0xeb, 0x3b, 0x7d, 0xff, 0x53, 0xdc,
+        0x4e, 0x27, 0x0c, 0x03, 0xde, 0x7c, 0xe5, 0x16,
+        0x6a, 0x9c, 0x20, 0x33, 0x9d, 0x33, 0xfe, 0x12 }, /* out */
+  16, 32, AES_ENCRYPT }, /* test vector 0 */
+{ { 0x58, 0x0a, 0x06, 0xe9, 0x97, 0x07, 0x59, 0x5c,
+        0x9e, 0x19, 0xd2, 0xa7, 0xbb, 0x40, 0x2b, 0x7a,
+        0xc7, 0xd8, 0x11, 0x9e, 0x4c, 0x51, 0x35, 0x75,
+        0x64, 0x28, 0x0f, 0x23, 0xad, 0x74, 0xac, 0x37 }, /* key1 */
+  { 0xd1, 0x80, 0xa0, 0x31, 0x47, 0xa3, 0x11, 0x13,
+        0x86, 0x26, 0x9e, 0x6d, 0xff, 0xaf, 0x72, 0x74,
+        0x5b, 0xa2, 0x35, 0x81, 0xd2, 0xa6, 0x3d, 0x21,
+        0x67, 0x7b, 0x58, 0xa8, 0x18, 0xf9, 0x72, 0xe4 }, /* key2 */
+  { 0x80, 0x3d, 0xbd, 0x4c, 0xe6, 0x7b, 0x06, 0xa9,
+        0x53, 0x35, 0xd5, 0x7e, 0x71, 0xc1, 0x70, 0x70,
+        0x74, 0x9a, 0x00, 0x28, 0x0c, 0xbf, 0x6c, 0x42,
+        0x9b, 0xa4, 0xdd, 0x65, 0x11, 0x77, 0x7c, 0x67,
+        0xfe, 0x76, 0x0a, 0xf0, 0xd5, 0xc6, 0x6e, 0x6a,
+        0xe7, 0x5e, 0x4c, 0xf2, 0x7e, 0x9e, 0xf9, 0x20,
+        0x0e, 0x54, 0x6f, 0x2d, 0x8a, 0x8d, 0x7e, 0xbd,
+        0x48, 0x79, 0x37, 0x99, 0xff, 0x27, 0x93, 0xa3 }, /* iv */
+  { 0xf1, 0x54, 0x3d, 0xca, 0xfe, 0xb5, 0xef, 0x1c,
+        0x4f, 0xa6, 0x43, 0xf6, 0xe6, 0x48, 0x57, 0xf0,
+        0xee, 0x15, 0x7f, 0xe3, 0xe7, 0x2f, 0xd0, 0x2f,
+        0x11, 0x95, 0x7a, 0x17, 0x00, 0xab, 0xa7, 0x0b,
+        0xbe, 0x44, 0x09, 0x9c, 0xcd, 0xac, 0xa8, 0x52,
+        0xa1, 0x8e, 0x7b, 0x75, 0xbc, 0xa4, 0x92, 0x5a,
+        0xab, 0x46, 0xd3, 0x3a, 0xa0, 0xd5, 0x35, 0x1c,
+        0x55, 0xa4, 0xb3, 0xa8, 0x40, 0x81, 0xa5, 0x0b}, /* in */
+  { 0x42, 0xe5, 0x28, 0x30, 0x31, 0xc2, 0xa0, 0x23,
+        0x68, 0x49, 0x4e, 0xb3, 0x24, 0x59, 0x92, 0x79,
+        0xc1, 0xa5, 0xcc, 0xe6, 0x76, 0x53, 0xb1, 0xcf,
+        0x20, 0x86, 0x23, 0xe8, 0x72, 0x55, 0x99, 0x92,
+        0x0d, 0x16, 0x1c, 0x5a, 0x2f, 0xce, 0xcb, 0x51,
+        0xe2, 0x67, 0xfa, 0x10, 0xec, 0xcd, 0x3d, 0x67,
+        0xa5, 0xe6, 0xf7, 0x31, 0x26, 0xb0, 0x0d, 0x76,
+        0x5e, 0x28, 0xdc, 0x7f, 0x01, 0xc5, 0xa5, 0x4c}, /* out */
+  32, 64, AES_ENCRYPT }, /* test vector 1 */
+
+};
+
+static int run_test_vectors(void)
+        {
+        int n;
+        int errs = 0;
+
+        for(n=0 ; n < sizeof(ige_test_vectors)/sizeof(ige_test_vectors[0]) ; ++n)
+                {
+                const struct ige_test * const v = &ige_test_vectors[n];
+                AES_KEY key;
+                unsigned char buf[MAX_VECTOR_SIZE];
+                unsigned char iv[AES_BLOCK_SIZE*2];
+
+                assert(v->length <= MAX_VECTOR_SIZE);
+
+                if(v->encrypt == AES_ENCRYPT)
+                        AES_set_encrypt_key(v->key, 8*sizeof v->key, &key);
+                else
+                        AES_set_decrypt_key(v->key, 8*sizeof v->key, &key);
+                memcpy(iv, v->iv, sizeof iv);
+                AES_ige_encrypt(v->in, buf, v->length, &key, iv, v->encrypt);
+
+                if(memcmp(v->out, buf, v->length))
+                        {
+                        printf("IGE test vector %d failed\n", n);
+                        hexdump(stdout, "key", v->key, sizeof v->key);
+                        hexdump(stdout, "iv", v->iv, sizeof v->iv);
+                        hexdump(stdout, "in", v->in, v->length);
+                        hexdump(stdout, "expected", v->out, v->length);
+                        hexdump(stdout, "got", buf, v->length);
+
+                        ++errs;
+                        }
+
+                /* try with in == out */
+                memcpy(iv, v->iv, sizeof iv);
+                memcpy(buf, v->in, v->length);
+                AES_ige_encrypt(buf, buf, v->length, &key, iv, v->encrypt);
+
+                if(memcmp(v->out, buf, v->length))
+                        {
+                        printf("IGE test vector %d failed (with in == out)\n", n);
+                        hexdump(stdout, "key", v->key, sizeof v->key);
+                        hexdump(stdout, "iv", v->iv, sizeof v->iv);
+                        hexdump(stdout, "in", v->in, v->length);
+                        hexdump(stdout, "expected", v->out, v->length);
+                        hexdump(stdout, "got", buf, v->length);
+
+                        ++errs;
+                        }
+                }
+
+        for(n=0 ; n < sizeof(bi_ige_test_vectors)/sizeof(bi_ige_test_vectors[0])
+                        ; ++n)
+                {
+                const struct bi_ige_test * const v = &bi_ige_test_vectors[n];
+                AES_KEY key1;
+                AES_KEY key2;
+                unsigned char buf[MAX_VECTOR_SIZE];
+
+                assert(v->length <= MAX_VECTOR_SIZE);
+
+                if(v->encrypt == AES_ENCRYPT)
+                        {
+                        AES_set_encrypt_key(v->key1, 8*v->keysize, &key1);
+                        AES_set_encrypt_key(v->key2, 8*v->keysize, &key2);
+                        }
+                else
+                        {
+                        AES_set_decrypt_key(v->key1, 8*v->keysize, &key1);
+                        AES_set_decrypt_key(v->key2, 8*v->keysize, &key2);
+                        }
+
+                AES_bi_ige_encrypt(v->in, buf, v->length, &key1, &key2, v->iv,
+                                                   v->encrypt);
+
+                if(memcmp(v->out, buf, v->length))
+                        {
+                        printf("Bidirectional IGE test vector %d failed\n", n);
+                        hexdump(stdout, "key 1", v->key1, sizeof v->key1);
+                        hexdump(stdout, "key 2", v->key2, sizeof v->key2);
+                        hexdump(stdout, "iv", v->iv, sizeof v->iv);
+                        hexdump(stdout, "in", v->in, v->length);
+                        hexdump(stdout, "expected", v->out, v->length);
+                        hexdump(stdout, "got", buf, v->length);
+
+                        ++errs;
+                        }
+                }
+
+        return errs;
+        }
+
+int main(int argc, char **argv)
+        {
+        unsigned char rkey[16];
+        unsigned char rkey2[16];
+        AES_KEY key;
+        AES_KEY key2;
+        unsigned char plaintext[BIG_TEST_SIZE];
+        unsigned char ciphertext[BIG_TEST_SIZE];
+        unsigned char checktext[BIG_TEST_SIZE];
+        unsigned char iv[AES_BLOCK_SIZE*4];
+        unsigned char saved_iv[AES_BLOCK_SIZE*4];
+        int err = 0;
+        int n;
+        unsigned matches;
+
+        assert(BIG_TEST_SIZE >= TEST_SIZE);
+
+        RAND_pseudo_bytes(rkey, sizeof rkey);
+        RAND_pseudo_bytes(plaintext, sizeof plaintext);
+        RAND_pseudo_bytes(iv, sizeof iv);
+        memcpy(saved_iv, iv, sizeof saved_iv);
+
+        /* Forward IGE only... */
+
+        /* Straight encrypt/decrypt */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, iv,
+                                        AES_ENCRYPT);
+
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, iv,
+                                        AES_DECRYPT);
+
+        if(memcmp(checktext, plaintext, TEST_SIZE))
+                {
+                printf("Encrypt+decrypt doesn't match\n");
+                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
+                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
+                ++err;
+                }
+
+        /* Now check encrypt chaining works */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE/2, &key, iv,
+                                        AES_ENCRYPT);
+        AES_ige_encrypt(plaintext+TEST_SIZE/2,
+                                        ciphertext+TEST_SIZE/2, TEST_SIZE/2,
+                                        &key, iv, AES_ENCRYPT);
+
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, iv,
+                                        AES_DECRYPT);
+
+        if(memcmp(checktext, plaintext, TEST_SIZE))
+                {
+                printf("Chained encrypt+decrypt doesn't match\n");
+                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
+                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
+                ++err;
+                }
+
+        /* And check decrypt chaining */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE/2, &key, iv,
+                                        AES_ENCRYPT);
+        AES_ige_encrypt(plaintext+TEST_SIZE/2,
+                                        ciphertext+TEST_SIZE/2, TEST_SIZE/2,
+                                        &key, iv, AES_ENCRYPT);
+
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(ciphertext, checktext, TEST_SIZE/2, &key, iv,
+                                        AES_DECRYPT);
+        AES_ige_encrypt(ciphertext+TEST_SIZE/2,
+                                        checktext+TEST_SIZE/2, TEST_SIZE/2, &key, iv,
+                                        AES_DECRYPT);
+
+        if(memcmp(checktext, plaintext, TEST_SIZE))
+                {
+                printf("Chained encrypt+chained decrypt doesn't match\n");
+                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
+                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
+                ++err;
+                }
+
+        /* make sure garble extends forwards only */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
+                                        AES_ENCRYPT);
+
+        /* corrupt halfway through */
+        ++ciphertext[sizeof ciphertext/2];
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        memcpy(iv, saved_iv, sizeof iv);
+        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
+                                        AES_DECRYPT);
+
+        matches=0;
+        for(n=0 ; n < sizeof checktext ; ++n)
+                if(checktext[n] == plaintext[n])
+                        ++matches;
+
+        if(matches > sizeof checktext/2+sizeof checktext/100)
+                {
+                printf("More than 51%% matches after garbling\n");
+                ++err;
+                }
+
+        if(matches < sizeof checktext/2)
+                {
+                printf("Garble extends backwards!\n");
+                ++err;
+                }
+
+        /* Bi-directional IGE */
+
+        /* Note that we don't have to recover the IV, because chaining isn't */
+        /* possible with biIGE, so the IV is not updated. */
+
+        RAND_pseudo_bytes(rkey2, sizeof rkey2);
+
+        /* Straight encrypt/decrypt */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_bi_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, &key2, iv,
+                                           AES_ENCRYPT);
+
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_bi_ige_encrypt(ciphertext, checktext, TEST_SIZE, &key, &key2, iv,
+                                           AES_DECRYPT);
+
+        if(memcmp(checktext, plaintext, TEST_SIZE))
+                {
+                printf("Encrypt+decrypt doesn't match\n");
+                hexdump(stdout, "Plaintext", plaintext, TEST_SIZE);
+                hexdump(stdout, "Checktext", checktext, TEST_SIZE);
+                ++err;
+                }
+
+        /* make sure garble extends both ways */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
+                                        AES_ENCRYPT);
+
+        /* corrupt halfway through */
+        ++ciphertext[sizeof ciphertext/2];
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
+                                        AES_DECRYPT);
+
+        matches=0;
+        for(n=0 ; n < sizeof checktext ; ++n)
+                if(checktext[n] == plaintext[n])
+                        ++matches;
+
+        if(matches > sizeof checktext/100)
+                {
+                printf("More than 1%% matches after bidirectional garbling\n");
+                ++err;
+                }
+
+        /* make sure garble extends both ways (2) */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
+                                        AES_ENCRYPT);
+
+        /* corrupt right at the end */
+        ++ciphertext[sizeof ciphertext-1];
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
+                                        AES_DECRYPT);
+
+        matches=0;
+        for(n=0 ; n < sizeof checktext ; ++n)
+                if(checktext[n] == plaintext[n])
+                        ++matches;
+
+        if(matches > sizeof checktext/100)
+                {
+                printf("More than 1%% matches after bidirectional garbling (2)\n");
+                ++err;
+                }
+
+        /* make sure garble extends both ways (3) */
+        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
+                                        AES_ENCRYPT);
+
+        /* corrupt right at the start */
+        ++ciphertext[0];
+        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
+        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
+        AES_ige_encrypt(ciphertext, checktext, sizeof checktext, &key, iv,
+                                        AES_DECRYPT);
+
+        matches=0;
+        for(n=0 ; n < sizeof checktext ; ++n)
+                if(checktext[n] == plaintext[n])
+                        ++matches;
+
+        if(matches > sizeof checktext/100)
+                {
+                printf("More than 1%% matches after bidirectional garbling (3)\n");
+                ++err;
+                }
+
+        err += run_test_vectors();
+
+        return err;
+        }
diff --git a/src/lib/libssl/test/testfipsssl b/src/lib/libssl/test/testfipsssl
deleted file mode 100644
index c4836edc25..0000000000
--- a/src/lib/libssl/test/testfipsssl
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "" ]; then
-  key=../apps/server.pem
-else
-  key="$1"
-fi
-if [ "$2" = "" ]; then
-  cert=../apps/server.pem
-else
-  cert="$2"
-fi
-
-ciphers="DHE-RSA-AES256-SHA:DHE-DSS-AES256-SHA:AES256-SHA:EDH-RSA-DES-CBC3-SHA:EDH-DSS-DES-CBC3-SHA:DES-CBC3-SHA:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA:AES128-SHA:EXP1024-DHE-DSS-DES-CBC-SHA:EXP1024-DES-CBC-SHA:EDH-RSA-DES-CBC-SHA:EDH-DSS-DES-CBC-SHA:DES-CBC-SHA:EXP-EDH-RSA-DES-CBC-SHA:EXP-EDH-DSS-DES-CBC-SHA:EXP-DES-CBC-SHA"
-
-ssltest="../util/shlib_wrap.sh ./ssltest -F -key $key -cert $cert -c_key $key -c_cert $cert -cipher $ciphers"
-
-if ../util/shlib_wrap.sh ../apps/openssl x509 -in $cert -text -noout | fgrep 'DSA Public Key' >/dev/null; then
-  dsa_cert=YES
-else
-  dsa_cert=NO
-fi
-
-if [ "$3" = "" ]; then
-  CA="-CApath ../certs"
-else
-  CA="-CAfile $3"
-fi
-
-if [ "$4" = "" ]; then
-  extra=""
-else
-  extra="$4"
-fi
-
-#############################################################################
-
-echo test ssl3 is forbidden in FIPS mode
-$ssltest -ssl3 $extra && exit 1
-
-echo test ssl2 is forbidden in FIPS mode
-$ssltest -ssl2 $extra && exit 1
-
-echo test tls1
-$ssltest -tls1 $extra || exit 1
-
-echo test tls1 with server authentication
-$ssltest -tls1 -server_auth $CA $extra || exit 1
-
-echo test tls1 with client authentication
-$ssltest -tls1 -client_auth $CA $extra || exit 1
-
-echo test tls1 with both client and server authentication
-$ssltest -tls1 -server_auth -client_auth $CA $extra || exit 1
-
-echo test tls1 via BIO pair
-$ssltest -bio_pair -tls1 $extra || exit 1
-
-echo test tls1 with server authentication via BIO pair
-$ssltest -bio_pair -tls1 -server_auth $CA $extra || exit 1
-
-echo test tls1 with client authentication via BIO pair
-$ssltest -bio_pair -tls1 -client_auth $CA $extra || exit 1
-
-echo test tls1 with both client and server authentication via BIO pair
-$ssltest -bio_pair -tls1 -server_auth -client_auth $CA $extra || exit 1
-
-# note that all the below actually choose TLS...
-
-if [ $dsa_cert = NO ]; then
-  echo test sslv2/sslv3 w/o DHE via BIO pair
-  $ssltest -bio_pair -no_dhe $extra || exit 1
-fi
-
-echo test sslv2/sslv3 with 1024bit DHE via BIO pair
-$ssltest -bio_pair -dhe1024dsa -v $extra || exit 1
-
-echo test sslv2/sslv3 with server authentication
-$ssltest -bio_pair -server_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with client authentication via BIO pair
-$ssltest -bio_pair -client_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication via BIO pair
-$ssltest -bio_pair -server_auth -client_auth $CA $extra || exit 1
-
-echo test sslv2/sslv3 with both client and server authentication via BIO pair and app verify
-$ssltest -bio_pair -server_auth -client_auth -app_verify $CA $extra || exit 1
-
-#############################################################################
-
-if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
-  echo skipping anonymous DH tests
-else
-  echo test tls1 with 1024bit anonymous DH, multiple handshakes
-  $ssltest -v -bio_pair -tls1 -cipher ADH -dhe1024dsa -num 10 -f -time $extra || exit 1
-fi
-
-if ../util/shlib_wrap.sh ../apps/openssl no-rsa; then
-  echo skipping RSA tests
-else
-  echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
-  ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
-
-  if ../util/shlib_wrap.sh ../apps/openssl no-dh; then
-    echo skipping RSA+DHE tests
-  else
-    echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
-    ../util/shlib_wrap.sh ./ssltest -v -bio_pair -tls1 -cert ../apps/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
-  fi
-fi
-
-exit 0